Refactoring our middleware

* inlines our sendImage function
* renames routes/avatars to routes/index

Author: rylnd

src/index.ts

@@ -1,4 +1,4 @@
-import routes from './routes/avatars';
+import routes from './routes';
 
 export default routes;
 (module as any).exports = routes;

src/routes/common.ts

@@ -2,14 +2,19 @@ import Router from 'express';
 import uuid from 'uuid';
 
 import { allNames, pathFor } from '../lib/imageFiles';
-import common from './common';
 import { combine } from '../lib/imager';
 import potato from '../lib/potato';
 
 const partTypes = ['eyes', 'nose', 'mouth'];
 
 const router = Router();
 
+const sendImage = ({ stdout, response }) => {
+  response.setHeader('Expires', new Date(Date.now() + 604800000));
+  response.setHeader('Content-Type', 'image/png');
+  stdout.pipe(response);
+};
+
 router.param('id', (req, res, next, id) => {
   const faceParts = potato.parts(id);
   // @ts-ignore
@@ -32,16 +37,16 @@ router.get('/:size?/random', (req, res) => {
   // @ts-ignore
   req.faceParts = faceParts;
 
-  return combine(faceParts, req.params.size, (err, stdout) => {
-    return common.sendImage(err, stdout, req, res);
-  });
+  return combine(faceParts, req.params.size, (err, stdout) =>
+    sendImage({ stdout, response: res }),
+  );
 });
 
 router.get('/:size?/:id', (req, res, next) => {
   // @ts-ignore
-  return combine(req.faceParts, req.params.size, (err, stdout) => {
-    return common.sendImage(err, stdout, req, res, next);
-  });
+  return combine(req.faceParts, req.params.size, (err, stdout) =>
+    sendImage({ stdout, response: res }),
+  );
 });
 
 router.get('/face/:eyes/:nose/:mouth/:color/:size?', (req, res, next) => {
@@ -63,9 +68,9 @@ router.get('/face/:eyes/:nose/:mouth/:color/:size?', (req, res, next) => {
     faceParts[type] = pathFor(type, fileName);
   });
 
-  return combine(faceParts, req.params.size, (err, stdout) => {
-    return common.sendImage(err, stdout, req, res, next);
-  });
+  return combine(faceParts, req.params.size, (err, stdout) =>
+    sendImage({ stdout, response: res }),
+  );
 });
 
 export default router;

src/routes/avatars.ts renamed to src/routes/index.ts

@@ -2,7 +2,7 @@ import express from 'express';
 import path from 'path';
 import favicon from 'serve-favicon';
 
-import avatarsRoutes from '../src/routes/avatars';
+import avatarsRoutes from '../src/routes';
 
 const app = express();
 const port = Number(process.env.PORT) || 3002;