@autofleet/node-common 2.0.1 → 4.0.0

package/.nvmrc

@@ -0,0 +1 @@
+22.9.0

package/README.md

@@ -1,7 +1,7 @@
 # AutoFleet Node Common
-This respostory is made in order have as much of common code as we can.
+This repository is made in order have as much of common code as we can.
 
-Each line of code used in wrriten in this repo will be used in the enetire AutoFleet system.
+Each line of code used in written in this repo will be used in the entire AutoFleet system.
 
 Make sure you have:
 * Tests
@@ -9,7 +9,7 @@ Make sure you have:
 
 ## Consts
 
-Currently we suppurt:
+Currently we support:
 ```
   {
     'OK'
@@ -18,55 +18,11 @@ Currently we suppurt:
   }
 ```
 
-## Network
-Server 2 Servers communication.
-
-Implemented:
-* Retriving service urls from environment
-* Retry - Using https://github.com/softonic/axios-retry
-* Caching - TBD
-* Syntatic response for fail - TBD
-* Circuit Breaking - TBD
-
-The API is just like [axios](https://github.com/axios/axios) api but the creation of new instance **must** have either `serviceName` or `serviceUrl` in options.
-
-In case `serviceName` used the constractor will look for an environment varible with the the name `<SERVICE_NAME>_SERVICE_HOST`.
-
-For Example:
-```
-const { Network } = require('@autofleet/node-common');
-
-n = new Network({ serviceName: 'TEST' });
-
-n.get('/posts/1');
-```
-.env file:
-```
-RIDE_SERVICE_HOST=jsonplaceholder.typicode.com
-```
-
-To learn more [click here](https://blog.risingstack.com/designing-microservices-architecture-for-failure/).
-
-## Settings
-
-### Adding settings
-For adding new setting you need to add it to the map.js file, please specify 
-* name - descriptive name
-* description - few words about what it does + unit
-* type - supportable types: 'number', 'string', 'json'
-* defaultValue - default value
-* context - 'security' and 'operation' will not show in the simulator configuration
-
-See example.
-
-## DeLorean
-
-Use this model to mock time on server - more info TBD.
-
 ## Publish package
 
 bump the version number in package.json
 and run
 ```
+node --run build
 npm publish
 ```

package/dist/index.cjs

@@ -0,0 +1,2 @@
+'use strict';var express=require('express'),i=require('@autofleet/logger');function _interopDefault(e){return e&&e.__esModule?e:{default:e}}var i__default=/*#__PURE__*/_interopDefault(i);var R=["all","get","post","put","delete","patch","options","head"],f=(n,s)=>async(r,o,e)=>{try{await s(r,o,e);}catch(a){let t=a;if(n.error(t.message),t.statusCode&&t.statusCode<500){o.status(400).json({error:t.message,status:"ERROR"});return}e(t);}},u=({logger:n=i__default.default(),...s})=>{let r=express.Router({mergeParams:true,...s});return R.forEach(e=>{let a=r[e].bind(r),t=(...p)=>a(...p.map(o));r[e]=t;}),r;function o(e){return Array.isArray(e)?e.map(o):typeof e=="function"?f(n,e):e}};var m=Object.freeze({ok:"OK",error:"ERROR",fail:"FAIL"});var x=u;exports.AfRouter=u;exports.Router=x;exports.consts=m;//# sourceMappingURL=index.cjs.map
+//# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/router/index.ts","../src/consts/index.ts","../src/index.ts"],"names":["METHODS","AfEntryPoint","logger","func","req","res","next","err","e","AfRouter","Logger","options","myRouter","Router","method","internalMethod","newMethodHandler","args","argMapper","consts"],"mappings":"2LAKaA,IAAAA,CAAAA,CAAU,CACrB,KAAA,CACA,MACA,MACA,CAAA,KAAA,CACA,QACA,CAAA,OAAA,CACA,UACA,MACF,CAAA,CAEMC,CAAe,CAAA,CAACC,EAA+BC,CAAmG,GAAA,MAAOC,CAAKC,CAAAA,CAAAA,CAAKC,IAAS,CAChL,GAAI,CACF,MAAMH,EAAKC,CAAKC,CAAAA,CAAAA,CAAKC,CAAI,EAC3B,CAAA,MAASC,EAAK,CACZ,IAAMC,CAAID,CAAAA,CAAAA,CAEV,GADAL,CAAO,CAAA,KAAA,CAAMM,CAAE,CAAA,OAAO,EAClBA,CAAE,CAAA,UAAA,EAAcA,CAAE,CAAA,UAAA,CAAa,IAAK,CACtCH,CAAAA,CAAI,MAAO,CAAA,GAAG,EAAE,IAAK,CAAA,CAAE,KAAOG,CAAAA,CAAAA,CAAE,QAAS,MAAQ,CAAA,OAAQ,CAAC,CAAA,CAC1D,MACF,CACAF,CAAAA,CAAKE,CAAC,EACR,CACF,CAGaC,CAAAA,CAAAA,CAAW,CAAC,CAAE,MAAA,CAAAP,EAASQ,kBAAO,EAAA,CAAG,GAAGC,CAAQ,IAAiE,CACxH,IAAMC,CAAWC,CAAAA,cAAAA,CAAO,CAAE,WAAa,CAAA,IAAA,CAAM,GAAGF,CAAQ,CAAC,CACzD,CAAA,OAAAX,CAAQ,CAAA,OAAA,CAASc,GAAW,CAC1B,IAAMC,CAAiBH,CAAAA,CAAAA,CAASE,CAAM,CAAE,CAAA,IAAA,CAAKF,CAAQ,CAAA,CAC/CI,EAA2C,CAAIC,GAAAA,CAAAA,GAAyBF,CAAe,CAAA,GAAGE,EAAK,GAAIC,CAAAA,CAAS,CAAa,CAC/HN,CAAAA,CAAAA,CAASE,CAAM,CAAIE,CAAAA,EACrB,CAAC,CAAA,CACMJ,EAEP,SAASM,CAAAA,CAAUD,CAAwB,CAAA,CACzC,OAAI,KAAM,CAAA,OAAA,CAAQA,CAAI,CAAA,CAAUA,EAAK,GAAIC,CAAAA,CAAS,EAC3C,OAAOD,CAAAA,EAAS,WAAahB,CAAaC,CAAAA,CAAAA,CAAQe,CAAe,CAAA,CAAIA,CAC9E,CACF,EC5CaE,IAAAA,CAAAA,CAAS,OAAO,MAAO,CAAA,CAClC,EAAI,CAAA,IAAA,CACJ,MAAO,OACP,CAAA,IAAA,CAAM,MACR,CAAC,MCCYN,CAASJ,CAAAA","file":"index.cjs","sourcesContent":["import {\n  Router, type Request, type Response, type NextFunction, type Handler, type RouterOptions, type IRouterMatcher,\n} from 'express';\nimport Logger, { type LoggerInstanceManager } from '@autofleet/logger';\n\nexport const METHODS = [\n  'all',\n  'get',\n  'post',\n  'put',\n  'delete',\n  'patch',\n  'options',\n  'head',\n] as const;\n\nconst AfEntryPoint = (logger: LoggerInstanceManager, func: (req: Request, res: Response, nextFn: NextFunction) => void | PromiseLike<void>): Handler => async (req, res, next) => {\n  try {\n    await func(req, res, next);\n  } catch (err) {\n    const e = err as Error & { statusCode?: number };\n    logger.error(e.message);\n    if (e.statusCode && e.statusCode < 500) {\n      res.status(400).json({ error: e.message, status: 'ERROR' });\n      return;\n    }\n    next(e);\n  }\n};\n\n/** @returns a monkey-patched express router that will handle async routes (and force a 400 status for codes <500) */\nexport const AfRouter = ({ logger = Logger(), ...options }: RouterOptions & { logger: LoggerInstanceManager }): Router => {\n  const myRouter = Router({ mergeParams: true, ...options });\n  METHODS.forEach((method) => {\n    const internalMethod = myRouter[method].bind(myRouter);\n    const newMethodHandler: IRouterMatcher<Router> = (...args: [...unknown[]]) => internalMethod(...args.map(argMapper) as [string]);\n    myRouter[method] = newMethodHandler;\n  });\n  return myRouter;\n\n  function argMapper(args: unknown): unknown {\n    if (Array.isArray(args)) return args.map(argMapper);\n    return typeof args === 'function' ? AfEntryPoint(logger, args as Handler) : args;\n  }\n};\n","export const consts = Object.freeze({\n  ok: 'OK',\n  error: 'ERROR',\n  fail: 'FAIL',\n});\n","import { AfRouter } from './router';\n\nexport { AfRouter } from './router';\nexport { consts } from './consts';\n\nexport const Router = AfRouter;\n"]}

package/dist/index.d.cts

@@ -0,0 +1,21 @@
+import * as _autofleet_logger from '@autofleet/logger';
+import { LoggerInstanceManager } from '@autofleet/logger';
+import * as express from 'express';
+import { RouterOptions, Router as Router$1 } from 'express';
+
+/** @returns a monkey-patched express router that will handle async routes (and force a 400 status for codes <500) */
+declare const AfRouter: ({ logger, ...options }: RouterOptions & {
+    logger: LoggerInstanceManager;
+}) => Router$1;
+
+declare const consts: Readonly<{
+    ok: "OK";
+    error: "ERROR";
+    fail: "FAIL";
+}>;
+
+declare const Router: ({ logger, ...options }: express.RouterOptions & {
+    logger: _autofleet_logger.LoggerInstanceManager;
+}) => express.Router;
+
+export { AfRouter, Router, consts };

package/dist/index.d.ts

@@ -0,0 +1,21 @@
+import * as _autofleet_logger from '@autofleet/logger';
+import { LoggerInstanceManager } from '@autofleet/logger';
+import * as express from 'express';
+import { RouterOptions, Router as Router$1 } from 'express';
+
+/** @returns a monkey-patched express router that will handle async routes (and force a 400 status for codes <500) */
+declare const AfRouter: ({ logger, ...options }: RouterOptions & {
+    logger: LoggerInstanceManager;
+}) => Router$1;
+
+declare const consts: Readonly<{
+    ok: "OK";
+    error: "ERROR";
+    fail: "FAIL";
+}>;
+
+declare const Router: ({ logger, ...options }: express.RouterOptions & {
+    logger: _autofleet_logger.LoggerInstanceManager;
+}) => express.Router;
+
+export { AfRouter, Router, consts };

package/dist/index.js

@@ -0,0 +1,2 @@
+import {Router}from'express';import i from'@autofleet/logger';var R=["all","get","post","put","delete","patch","options","head"],f=(n,s)=>async(r,o,e)=>{try{await s(r,o,e);}catch(a){let t=a;if(n.error(t.message),t.statusCode&&t.statusCode<500){o.status(400).json({error:t.message,status:"ERROR"});return}e(t);}},u=({logger:n=i(),...s})=>{let r=Router({mergeParams:true,...s});return R.forEach(e=>{let a=r[e].bind(r),t=(...p)=>a(...p.map(o));r[e]=t;}),r;function o(e){return Array.isArray(e)?e.map(o):typeof e=="function"?f(n,e):e}};var m=Object.freeze({ok:"OK",error:"ERROR",fail:"FAIL"});var x=u;export{u as AfRouter,x as Router,m as consts};//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/router/index.ts","../src/consts/index.ts","../src/index.ts"],"names":["METHODS","AfEntryPoint","logger","func","req","res","next","err","e","AfRouter","Logger","options","myRouter","Router","method","internalMethod","newMethodHandler","args","argMapper","consts"],"mappings":"8DAKaA,IAAAA,CAAAA,CAAU,CACrB,KAAA,CACA,MACA,MACA,CAAA,KAAA,CACA,QACA,CAAA,OAAA,CACA,UACA,MACF,CAAA,CAEMC,CAAe,CAAA,CAACC,EAA+BC,CAAmG,GAAA,MAAOC,CAAKC,CAAAA,CAAAA,CAAKC,IAAS,CAChL,GAAI,CACF,MAAMH,EAAKC,CAAKC,CAAAA,CAAAA,CAAKC,CAAI,EAC3B,CAAA,MAASC,EAAK,CACZ,IAAMC,CAAID,CAAAA,CAAAA,CAEV,GADAL,CAAO,CAAA,KAAA,CAAMM,CAAE,CAAA,OAAO,EAClBA,CAAE,CAAA,UAAA,EAAcA,CAAE,CAAA,UAAA,CAAa,IAAK,CACtCH,CAAAA,CAAI,MAAO,CAAA,GAAG,EAAE,IAAK,CAAA,CAAE,KAAOG,CAAAA,CAAAA,CAAE,QAAS,MAAQ,CAAA,OAAQ,CAAC,CAAA,CAC1D,MACF,CACAF,CAAAA,CAAKE,CAAC,EACR,CACF,CAGaC,CAAAA,CAAAA,CAAW,CAAC,CAAE,MAAA,CAAAP,EAASQ,CAAO,EAAA,CAAG,GAAGC,CAAQ,IAAiE,CACxH,IAAMC,CAAWC,CAAAA,MAAAA,CAAO,CAAE,WAAa,CAAA,IAAA,CAAM,GAAGF,CAAQ,CAAC,CACzD,CAAA,OAAAX,CAAQ,CAAA,OAAA,CAASc,GAAW,CAC1B,IAAMC,CAAiBH,CAAAA,CAAAA,CAASE,CAAM,CAAE,CAAA,IAAA,CAAKF,CAAQ,CAAA,CAC/CI,EAA2C,CAAIC,GAAAA,CAAAA,GAAyBF,CAAe,CAAA,GAAGE,EAAK,GAAIC,CAAAA,CAAS,CAAa,CAC/HN,CAAAA,CAAAA,CAASE,CAAM,CAAIE,CAAAA,EACrB,CAAC,CAAA,CACMJ,EAEP,SAASM,CAAAA,CAAUD,CAAwB,CAAA,CACzC,OAAI,KAAM,CAAA,OAAA,CAAQA,CAAI,CAAA,CAAUA,EAAK,GAAIC,CAAAA,CAAS,EAC3C,OAAOD,CAAAA,EAAS,WAAahB,CAAaC,CAAAA,CAAAA,CAAQe,CAAe,CAAA,CAAIA,CAC9E,CACF,EC5CaE,IAAAA,CAAAA,CAAS,OAAO,MAAO,CAAA,CAClC,EAAI,CAAA,IAAA,CACJ,MAAO,OACP,CAAA,IAAA,CAAM,MACR,CAAC,MCCYN,CAASJ,CAAAA","file":"index.js","sourcesContent":["import {\n  Router, type Request, type Response, type NextFunction, type Handler, type RouterOptions, type IRouterMatcher,\n} from 'express';\nimport Logger, { type LoggerInstanceManager } from '@autofleet/logger';\n\nexport const METHODS = [\n  'all',\n  'get',\n  'post',\n  'put',\n  'delete',\n  'patch',\n  'options',\n  'head',\n] as const;\n\nconst AfEntryPoint = (logger: LoggerInstanceManager, func: (req: Request, res: Response, nextFn: NextFunction) => void | PromiseLike<void>): Handler => async (req, res, next) => {\n  try {\n    await func(req, res, next);\n  } catch (err) {\n    const e = err as Error & { statusCode?: number };\n    logger.error(e.message);\n    if (e.statusCode && e.statusCode < 500) {\n      res.status(400).json({ error: e.message, status: 'ERROR' });\n      return;\n    }\n    next(e);\n  }\n};\n\n/** @returns a monkey-patched express router that will handle async routes (and force a 400 status for codes <500) */\nexport const AfRouter = ({ logger = Logger(), ...options }: RouterOptions & { logger: LoggerInstanceManager }): Router => {\n  const myRouter = Router({ mergeParams: true, ...options });\n  METHODS.forEach((method) => {\n    const internalMethod = myRouter[method].bind(myRouter);\n    const newMethodHandler: IRouterMatcher<Router> = (...args: [...unknown[]]) => internalMethod(...args.map(argMapper) as [string]);\n    myRouter[method] = newMethodHandler;\n  });\n  return myRouter;\n\n  function argMapper(args: unknown): unknown {\n    if (Array.isArray(args)) return args.map(argMapper);\n    return typeof args === 'function' ? AfEntryPoint(logger, args as Handler) : args;\n  }\n};\n","export const consts = Object.freeze({\n  ok: 'OK',\n  error: 'ERROR',\n  fail: 'FAIL',\n});\n","import { AfRouter } from './router';\n\nexport { AfRouter } from './router';\nexport { consts } from './consts';\n\nexport const Router = AfRouter;\n"]}

package/package.json

@@ -1,16 +1,34 @@
 {
   "name": "@autofleet/node-common",
-  "version": "2.0.1",
+  "version": "4.0.0",
   "description": "",
+  "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    "import": {
+      "default": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "require": {
+      "default": "./dist/index.cjs",
+      "types": "./dist/index.d.cts"
+    }
+  },
   "scripts": {
-    "coverage": "jest --coverage --forceExit --runInBand",
-    "test": "jest --forceExit --runInBand",
-    "test-auto": "jest --watch --runInBand",
-    "linter": "./node_modules/.bin/eslint ."
+    "coverage": "vitest --coverage",
+    "test": "vitest",
+    "build": "tsup",
+    "linter": "eslint ."
   },
   "jest": {
-    "setupTestFrameworkScriptFile": "jest-extended",
-    "testURL": "http://localhost:8085/"
+    "setupFilesAfterEnv": [
+      "jest-extended"
+    ],
+    "testEnvironmentOptions": {
+      "url": "http://localhost:8085/"
+    }
   },
   "repository": {
     "type": "git",
@@ -22,28 +40,21 @@
     "url": "https://github.com/Autofleet/node-common/issues"
   },
   "homepage": "https://github.com/Autofleet/node-common",
-  "dependencies": {
-    "@google-cloud/logging-winston": "^4.1.1",
-    "axios": "^0.18.0",
-    "axios-retry": "^3.1.0",
-    "dotenv": "^5.0.1",
-    "event-pubsub": "^4.3.0",
-    "express": "^4.16.2",
-    "jest": "^22.4.4",
-    "mock-socket": "^7.1.0",
-    "node-cache": "^4.2.0",
-    "node-resque": "^5.4.1",
-    "portfinder": "^1.0.13",
-    "qs": "^6.5.2",
-    "timekeeper": "^2.1.2",
-    "winston": "^3.0.0",
-    "ws": "^5.2.1"
-  },
   "devDependencies": {
-    "eslint": "^4.19.1",
-    "eslint-config-airbnb": "^16.1.0",
-    "eslint-plugin-import": "^2.11.0",
-    "jest-extended": "^0.7.1",
-    "nock": "^10.0.2"
+    "@autofleet/logger": "^4.2.1",
+    "@types/express": "^4.17.21",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "@vitest/coverage-v8": "^3.0.6",
+    "eslint": "^8.57.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-import": "^2.29.1",
+    "tsup": "^8.3.6",
+    "typescript": "^5.7.3",
+    "vitest": "^3.0.6"
+  },
+  "peerDependencies": {
+    "@autofleet/logger": ">=4.2.1",
+    "express": "^4.21.2"
   }
 }

package/src/consts/index.test.ts

@@ -0,0 +1,26 @@
+import { describe, expect, it } from 'vitest';
+import { consts } from '.';
+
+describe('consts', () => {
+  it('should be an object', () => {
+    expect(typeof consts).toBe('object');
+  });
+
+  it('should have ok', () => {
+    expect('ok' in consts).toBeTruthy();
+    expect(typeof consts.ok).toBe('string');
+    expect(consts.ok).toBe('OK');
+  });
+
+  it('should have error', () => {
+    expect('error' in consts).toBeTruthy();
+    expect(typeof consts.error).toBe('string');
+    expect(consts.error).toBe('ERROR');
+  });
+
+  it('should have fail', () => {
+    expect('fail' in consts).toBeTruthy();
+    expect(typeof consts.fail).toBe('string');
+    expect(consts.fail).toBe('FAIL');
+  });
+});

package/{consts/index.js → src/consts/index.ts}

@@ -1,5 +1,5 @@
-module.exports = {
+export const consts = Object.freeze({
   ok: 'OK',
   error: 'ERROR',
   fail: 'FAIL',
-};
+});

package/src/index.test.ts

@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest';
+import * as nodeCommon from '.';
+import { consts } from './consts';
+import { AfRouter } from './router';
+
+describe('node-common', () => {
+  it('exports consts', () => {
+    expect(nodeCommon.consts).toBe(consts);
+  });
+
+  it('exports AfRouter', () => {
+    expect(nodeCommon.AfRouter).toBe(AfRouter);
+  });
+
+  it('exports AFRouter aliased as Router', () => {
+    expect(nodeCommon.Router).toBe(AfRouter);
+  });
+});

package/src/index.ts

@@ -0,0 +1,6 @@
+import { AfRouter } from './router';
+
+export { AfRouter } from './router';
+export { consts } from './consts';
+
+export const Router = AfRouter;

package/src/router/index.test.ts

@@ -0,0 +1,149 @@
+import Logger from '@autofleet/logger';
+import type { Request, Response, NextFunction } from 'express';
+import {
+  describe, expect, it, vi,
+} from 'vitest';
+import { AfRouter, METHODS } from '.';
+
+const logger = Logger();
+const noop = () => null;
+
+describe('Router', () => {
+  it('is a function', () => {
+    expect(typeof AfRouter).toBe('function');
+    expect(AfRouter.length).toBe(1);
+  });
+
+  it('returns a Router instance', () => {
+    const router = AfRouter({ logger });
+    expect(typeof router).toBe('function');
+    expect(typeof router.use).toBe('function');
+    expect(typeof router.get).toBe('function');
+    expect(typeof router.post).toBe('function');
+    expect(typeof router.put).toBe('function');
+    expect(typeof router.delete).toBe('function');
+    expect(typeof router.patch).toBe('function');
+    expect(typeof router.options).toBe('function');
+    expect(typeof router.head).toBe('function');
+  });
+
+  describe.each(METHODS)('Route method %s', { timeout: 1000 }, (method) => {
+    it('handles sync routes', async () => {
+      const router = AfRouter({ logger });
+      router[method]('/test', (_req, res) => {
+        res.send('ok');
+      });
+      const { promise, resolve } = Promise.withResolvers<string>();
+      const req = { method, url: '/test', baseUrl: '' };
+      const res = { send: (data: string) => resolve(data) };
+      // @ts-expect-error handle is not typed for an unclear reason.
+      router.handle(req, res, noop);
+      expect(await promise).toBe('ok');
+    });
+
+    it('handles async routes', async () => {
+      const router = AfRouter({ logger });
+      router[method]('/test', async (req, res) => {
+        res.send('ok');
+      });
+      const { promise, resolve } = Promise.withResolvers<string>();
+      const req = { method, url: '/test', baseUrl: '' };
+      const res = { send: (data: string) => resolve(data) };
+      // @ts-expect-error handle is not typed for an unclear reason.
+      router.handle(req, res, noop);
+      expect(await promise).toBe('ok');
+    });
+
+    it('handles arrays of handlers', async () => {
+      const router = AfRouter({ logger });
+      router[method]('/test', [
+        (_req: Request, _res: Response, next: NextFunction) => next(),
+        (_req: Request, res: Response) => res.send('ok'),
+      ]);
+      const { promise, resolve } = Promise.withResolvers<string>();
+      const req = { method, url: '/test', baseUrl: '' };
+      const res = { send: (data: string) => resolve(data) };
+      // @ts-expect-error handle is not typed for an unclear reason.
+      router.handle(req, res, noop);
+      expect(await promise).toBe('ok');
+    });
+
+    it('handles errors', async () => {
+      const router = AfRouter({ logger });
+      const error = new Error('test error');
+      router[method]('/test', () => {
+        throw error;
+      });
+      const { promise, resolve } = Promise.withResolvers();
+      const next = vi.fn(resolve);
+      const req = { method, url: '/test', baseUrl: '' };
+      const res = {};
+      // @ts-expect-error handle is not typed for an unclear reason.
+      router.handle(req, res, next);
+      await promise;
+      expect(next).toHaveBeenCalledExactlyOnceWith(error);
+    });
+
+    it('handles rejections', async () => {
+      const router = AfRouter({ logger });
+      const error = new Error('test error');
+      router[method]('/test', () => Promise.reject(error));
+      const { promise, resolve } = Promise.withResolvers();
+      const next = vi.fn(resolve);
+      const req = { method, url: '/test', baseUrl: '' };
+      const res = {};
+      // @ts-expect-error handle is not typed for an unclear reason.
+      router.handle(req, res, next);
+      await promise;
+      // expect(await promise).toBe({ error: 'test error', status: "ERROR" });
+      expect(next).toHaveBeenCalledExactlyOnceWith(error);
+    });
+
+    it('forces errors with status code 400 if not 500', async () => {
+      const router = AfRouter({ logger });
+      const error = Object.assign(new Error('test error'), { statusCode: 418 });
+      router[method]('/test', () => Promise.reject(error));
+      const { promise, resolve } = Promise.withResolvers();
+      const status = vi.fn(() => ({ json: resolve }));
+      const req = { method, url: '/test', baseUrl: '' };
+      const res = { status };
+      // @ts-expect-error handle is not typed for an unclear reason.
+      router.handle(req, res, noop);
+      await promise;
+      expect(await promise).toEqual({ error: 'test error', status: 'ERROR' });
+      expect(status).toHaveBeenCalledExactlyOnceWith(400);
+    });
+
+    it('keeps original errors when status code is 500', async () => {
+      const router = AfRouter({ logger });
+      const error = Object.assign(new Error('test error'), { statusCode: 500 });
+      router[method]('/test', () => Promise.reject(error));
+      const { promise, resolve } = Promise.withResolvers();
+      const next = vi.fn(resolve);
+      const req = { method, url: '/test', baseUrl: '' };
+      const res = {};
+      // @ts-expect-error handle is not typed for an unclear reason.
+      router.handle(req, res, next);
+      await promise;
+      expect(next).toHaveBeenCalledExactlyOnceWith(error);
+    });
+
+    it('defaults to mergeParams true', async () => {
+      const router = AfRouter({ mergeParams: false, logger });
+      const childRouter = AfRouter({ logger });
+      router.use('/:parentParam', childRouter);
+      childRouter[method]<{ parentParam: string; param: string; }>('/:param', (req, res) => res.send({ param: req.params.param, parentParam: req.params.parentParam }));
+
+      const { promise, resolve } = Promise.withResolvers<string>();
+      const req = { method, url: '/foo/bar', baseUrl: '' };
+      const res = { send: (data: string) => resolve(data) };
+      // @ts-expect-error handle is not typed for an unclear reason.
+      router.handle(req, res, noop);
+      expect(await promise).toEqual({ parentParam: 'foo', param: 'bar' });
+      // @ts-expect-error mergeParams is a private field
+      expect(router.mergeParams).toBeFalsy();
+      // @ts-expect-error mergeParams is a private field
+      expect(childRouter.mergeParams).toBeTruthy();
+    });
+  });
+});

package/src/router/index.ts

@@ -0,0 +1,45 @@
+import {
+  Router, type Request, type Response, type NextFunction, type Handler, type RouterOptions, type IRouterMatcher,
+} from 'express';
+import Logger, { type LoggerInstanceManager } from '@autofleet/logger';
+
+export const METHODS = [
+  'all',
+  'get',
+  'post',
+  'put',
+  'delete',
+  'patch',
+  'options',
+  'head',
+] as const;
+
+const AfEntryPoint = (logger: LoggerInstanceManager, func: (req: Request, res: Response, nextFn: NextFunction) => void | PromiseLike<void>): Handler => async (req, res, next) => {
+  try {
+    await func(req, res, next);
+  } catch (err) {
+    const e = err as Error & { statusCode?: number };
+    logger.error(e.message);
+    if (e.statusCode && e.statusCode < 500) {
+      res.status(400).json({ error: e.message, status: 'ERROR' });
+      return;
+    }
+    next(e);
+  }
+};
+
+/** @returns a monkey-patched express router that will handle async routes (and force a 400 status for codes <500) */
+export const AfRouter = ({ logger = Logger(), ...options }: RouterOptions & { logger: LoggerInstanceManager }): Router => {
+  const myRouter = Router({ mergeParams: true, ...options });
+  METHODS.forEach((method) => {
+    const internalMethod = myRouter[method].bind(myRouter);
+    const newMethodHandler: IRouterMatcher<Router> = (...args: [...unknown[]]) => internalMethod(...args.map(argMapper) as [string]);
+    myRouter[method] = newMethodHandler;
+  });
+  return myRouter;
+
+  function argMapper(args: unknown): unknown {
+    if (Array.isArray(args)) return args.map(argMapper);
+    return typeof args === 'function' ? AfEntryPoint(logger, args as Handler) : args;
+  }
+};

package/tsconfig.json

@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "commonjs",
+    "declaration": true,
+    "outDir": "./dist",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "lib": [
+      "ESNext"
+    ]
+  },
+  "include": ["src", "tsup.config.ts", "vitest.config.ts"],
+}

package/tsup.config.ts

@@ -0,0 +1,13 @@
+import { defineConfig } from 'tsup';
+
+export default defineConfig((options) => ({
+  entry: ['src/index.ts'],
+  target: 'node18.0',
+  dts: true,
+  format: ['esm', 'cjs'],
+  clean: !options.watch,
+  minify: !options.watch,
+  removeNodeProtocol: false,
+  treeshake: true,
+  sourcemap: true,
+}));

package/vitest.config.ts

@@ -0,0 +1,14 @@
+// eslint-disable-next-line import/no-unresolved
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    coverage: {
+      provider: 'v8',
+      reporter: ['text'],
+      thresholds: {
+        lines: 80,
+      },
+    },
+  },
+});

package/.jest.config.js

@@ -1,8 +0,0 @@
-module.exports = {
-  testEnvironment: 'node',
-  coverageThreshold: {
-    global: {
-      lines: 80,
-    },
-  },
-};

package/delorean-client/index.js

@@ -1,52 +0,0 @@
-const tk = require('timekeeper');
-const WebSocket = require('ws');
-const Logger = require('../logger');
-
-const logger = Logger();
-
-const createWs = (host, resolve) => {
-  const ws = new WebSocket(`ws://${host}`);
-
-  ws.on('open', () => {
-    ws.send(JSON.stringify({ type: 'ping' }));
-    if (resolve) {
-      resolve(true);
-    }
-  });
-
-  ws.on('error', (error) => {
-    logger.error('ERROR', error);
-  });
-
-  ws.on('message', (data) => {
-    const jsonMsg = JSON.parse(data);
-
-    if (jsonMsg.type === 'freeze') {
-      logger.info('I know you just sent me back to the future, but I\'m back.I\'m back from the future.', { goingBackTo: jsonMsg.time });
-      tk.freeze(new Date(jsonMsg.time));
-    } else if (jsonMsg.type === 'travel') {
-      tk.travel(jsonMsg.time);
-    }
-  });
-
-  ws.on('close', () => {
-    setTimeout(() => {
-      if (process.env.TIME_TRAVEL_MS_SERVICE_HOST === host) {
-        createWs(host, null);
-      }
-    }, 500);
-  });
-};
-
-module.exports = () => new Promise((resolve) => {
-  const { TIME_TRAVEL_MS_SERVICE_HOST, SHOULD_TIME_TRAVEL } = process.env;
-  if (TIME_TRAVEL_MS_SERVICE_HOST && SHOULD_TIME_TRAVEL) {
-    logger.info('If my calculations are correct, when this baby hits 88 miles per hour... you\'re gonna see some serious shit.', {
-      TIME_TRAVEL_MS_SERVICE_HOST,
-    });
-
-    createWs(TIME_TRAVEL_MS_SERVICE_HOST, resolve);
-  } else {
-    resolve(false);
-  }
-});