Rewrite middleware to use utils lib

Author: rylnd

src/lib/hashingFunctions.ts

@@ -1,23 +1,14 @@
-import fs from 'fs';
 import path from 'path';
+import { filePaths, fileNames } from 'avatars-utils';
 
-const IMAGE_DIR = path.join(__dirname, '..', 'img');
+const imageDir = path.join(__dirname, '..', 'img');
 
-const imageFiles: (path: string) => string[] = p =>
-  fs.readdirSync(p).filter(fileName => fileName.match(/\.png$/));
+export const imageFilePaths = (type: string): string[] =>
+  filePaths(path.join(imageDir, type));
 
-const imageDir: (type: ImageType) => string = type =>
-  type ? path.join(IMAGE_DIR, type) : IMAGE_DIR;
+export const imageFileNames = (type: string): string[] =>
+  fileNames(path.join(imageDir, type));
 
-export const allNames: (type: ImageType) => string[] = type =>
-  imageFiles(imageDir(type)).map(imageFileName =>
-    imageFileName.replace(/\.png/, ''),
-  );
-
-export const allPaths: (type: ImageType) => string[] = type => {
-  const dir = imageDir(type);
-  return imageFiles(dir).map(file => path.join(dir, file));
-};
-
-export const pathTo: (type: ImageType, name: string) => string = (type, name) =>
-  path.join(imageDir(type), name + '.png');
+export const eyeImages = imageFilePaths('eyes');
+export const noseImages = imageFilePaths('nose');
+export const mouthImages = imageFilePaths('mouth');

src/lib/imageFiles.ts

@@ -1,8 +1,35 @@
-import { sumAndDiff } from './hashingFunctions';
-import { allPaths } from './imageFiles';
-import SlotMachine from './slotMachine';
+import { Hash, hashFactory, sumAndDiff } from 'avatars-utils';
+import { eyeImages, noseImages, mouthImages } from './imageFiles';
 
-const colors = [
+export class Potato {
+  private colorHash: Hash<string>;
+  private eyeHash: Hash<string>;
+  private noseHash: Hash<string>;
+  private mouthHash: Hash<string>;
+
+  constructor(
+    colors: string[],
+    eyes: string[],
+    noses: string[],
+    mouths: string[],
+  ) {
+    this.colorHash = new Hash(colors);
+    this.eyeHash = new Hash(eyes);
+    this.noseHash = new Hash(noses);
+    this.mouthHash = new Hash(mouths, hashFactory(sumAndDiff));
+  }
+
+  public parts(string): Face {
+    return {
+      color: this.colorHash.get(string),
+      eyes: this.eyeHash.get(string),
+      nose: this.noseHash.get(string),
+      mouth: this.mouthHash.get(string),
+    };
+  }
+}
+
+const defaultColors = [
   '#81bef1',
   '#ad8bf2',
   '#bff288',
@@ -14,22 +41,4 @@ const colors = [
   '#f6be5d',
 ];
 
-class Potato {
-  constructor(
-    private colorMachine = new SlotMachine(colors),
-    private eyesMachine = new SlotMachine(allPaths('eyes')),
-    private noseMachine = new SlotMachine(allPaths('nose')),
-    private mouthMachine = new SlotMachine(allPaths('mouth'), sumAndDiff),
-  ) {}
-
-  parts(string): Face {
-    return {
-      color: this.colorMachine.pull(string),
-      eyes: this.eyesMachine.pull(string),
-      nose: this.noseMachine.pull(string),
-      mouth: this.mouthMachine.pull(string),
-    };
-  }
-}
-
-export default new Potato();
+export default new Potato(defaultColors, eyeImages, noseImages, mouthImages);

src/lib/potato.ts

@@ -1,7 +1,7 @@
 import Router from 'express';
 import uuid from 'uuid';
 
-import { allNames, pathTo } from '../lib/imageFiles';
+import { imageFileNames, imageFilePaths } from '../lib/imageFiles';
 import { combine } from '../lib/imager';
 import potato from '../lib/potato';
 
@@ -17,7 +17,7 @@ const sendImage = ({ stdout, response }) => {
 
 router.get('/list', (req, res) => {
   const face = {};
-  imageTypes.forEach(type => (face[type] = allNames(type)));
+  imageTypes.forEach(type => (face[type] = imageFileNames(type)));
 
   return res.set('Content-Type', 'application/json').send({ face });
 });
@@ -43,16 +43,13 @@ router.get('/face/:eyes/:nose/:mouth/:color/:size?', (req, res, next) => {
 
   imageTypes.forEach(type => {
     const requestedName = req.params[type];
-    const names = allNames(type);
-    let name = names[0];
+    const paths = imageFilePaths(type);
+    faceParts[type] =
+      paths.find(path => !!path.match(requestedName)) || paths[0];
 
-    if (names.includes(requestedName)) {
-      name = requestedName;
-    } else if (requestedName === 'x') {
-      name = '';
+    if (requestedName === 'x') {
+      faceParts[type] = '';
     }
-
-    faceParts[type] = pathTo(type, name);
   });
 
   return combine(faceParts, req.params.size, (err, stdout) =>