fix: bump deps, fixed middleware order

Author: niftylettuce

index.js

@@ -38,18 +38,8 @@ class API {
       ...config
     };
 
-    const { logger } = this.config;
-
-    let storeIPAddress = false;
-
-    if (this.config.storeIPAddress)
-      storeIPAddress = new StoreIPAddress({
-        logger,
-        ...this.config.storeIPAddress
-      });
-
     const cabin = new Cabin({
-      logger,
+      logger: this.config.logger,
       ...this.config.cabin
     });
 
@@ -58,14 +48,16 @@ class API {
 
     // listen for error and log events emitted by app
     app.on('error', (err, ctx) => {
-      ctx.logger[err.status && err.status < 500 ? 'warn' : 'error'](err);
+      const level = err.status && err.status < 500 ? 'warn' : 'error';
+      if (ctx.logger) ctx.logger[level](err);
+      else cabin[level](err);
     });
-    app.on('log', logger.log);
+    app.on('log', cabin.log);
 
     // initialize redis
     const client = new Redis(
       this.config.redis,
-      logger,
+      cabin,
       this.config.redisMonitor
     );
 
@@ -74,19 +66,40 @@ class API {
     // later on with `server.close()`
     let server;
 
-    // override koa's undocumented error handler
-    // <https://github.com/sindresorhus/eslint-plugin-unicorn/issues/174>
-    app.context.onerror = errorHandler;
-
     // allow middleware to access redis client
     app.context.client = client;
 
+    // override koa's undocumented error handler
+    app.context.onerror = errorHandler(false, cabin);
+
     // only trust proxy if enabled
     app.proxy = boolean(process.env.TRUST_PROXY);
 
     // specify that this is our api (used by error handler)
     app.context.api = true;
 
+    // allow before hooks to get setup
+    if (_.isFunction(this.config.hookBeforeSetup))
+      this.config.hookBeforeSetup(app);
+
+    // rate limiting
+    if (this.config.rateLimit)
+      app.use(
+        ratelimit({
+          ...this.config.rateLimit,
+          db: client
+        })
+      );
+
+    // basic auth
+    if (this.config.auth) app.use(auth(this.config.auth));
+
+    // configure timeout
+    if (this.config.timeout) {
+      const timeout = new Timeout(this.config.timeout);
+      app.use(timeout.middleware);
+    }
+
     // adds request received hrtime and date symbols to request object
     // (which is used by Cabin internally to add `request.timestamp` to logs
     app.use(requestReceived);
@@ -104,21 +117,10 @@ class API {
     if (this.config.i18n) {
       const i18n = this.config.i18n.config
         ? this.config.i18n
-        : new I18N({ ...this.config.i18n, logger });
+        : new I18N({ ...this.config.i18n, logger: cabin });
       app.use(i18n.middleware);
     }
 
-    if (this.config.auth) app.use(auth(this.config.auth));
-
-    // rate limiting
-    if (this.config.rateLimit)
-      app.use(
-        ratelimit({
-          ...this.config.rateLimit,
-          db: client
-        })
-      );
-
     // conditional-get
     app.use(conditional());
 
@@ -137,20 +139,20 @@ class API {
     // pretty-printed json responses
     app.use(json());
 
-    // 404 handler
-    app.use(koa404Handler);
-
     // passport
     if (this.config.passport) app.use(this.config.passport.initialize());
 
-    // configure timeout
-    if (this.config.timeout) {
-      const timeout = new Timeout(this.config.timeout);
-      app.use(timeout.middleware);
+    // store the user's last ip address in the background
+    if (this.config.storeIPAddress) {
+      const storeIPAddress = new StoreIPAddress({
+        logger: cabin,
+        ...this.config.storeIPAddress
+      });
+      app.use(storeIPAddress.middleware);
     }
 
-    // store the user's last ip address in the background
-    if (storeIPAddress) app.use(storeIPAddress.middleware);
+    // 404 handler
+    app.use(koa404Handler);
 
     // allow before hooks to get setup
     if (_.isFunction(this.config.hookBeforeRoutes))

package.json

@@ -20,20 +20,20 @@
     "Nick Baugh <[email protected]> (http://niftylettuce.com/)"
   ],
   "dependencies": {
-    "@koa/router": "^9.3.1",
-    "@ladjs/i18n": "^4.0.0",
+    "@koa/router": "^9.4.0",
+    "@ladjs/i18n": "^5.0.0",
     "@ladjs/redis": "^1.0.7",
     "@ladjs/shared-config": "^3.0.9",
     "@ladjs/store-ip-address": "^0.0.7",
     "boolean": "3.0.1",
-    "cabin": "^8.0.4",
+    "cabin": "^8.0.7",
     "express-request-id": "^1.4.1",
     "findhit-proxywrap": "^0.3.12",
     "kcors": "^2.2.2",
     "koa": "^2.13.0",
     "koa-404-handler": "^0.0.2",
     "koa-basic-auth": "^4.0.0",
-    "koa-better-error-handler": "^5.0.0",
+    "koa-better-error-handler": "^6.0.1",
     "koa-better-timeout": "^0.0.6",
     "koa-bodyparser": "^4.3.0",
     "koa-compress": "^5.0.1",
@@ -43,27 +43,27 @@
     "koa-json": "^2.0.2",
     "koa-no-trailing-slash": "^2.1.0",
     "koa-simple-ratelimit": "^5.0.0",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.20",
     "request-received": "^0.0.3",
     "response-time": "^2.3.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "^9.1.1",
-    "@commitlint/config-conventional": "^9.1.1",
-    "ava": "^3.10.1",
+    "@commitlint/cli": "^9.1.2",
+    "@commitlint/config-conventional": "^9.1.2",
+    "ava": "^3.12.1",
     "codecov": "^3.7.2",
     "cross-env": "^7.0.2",
-    "eslint": "^7.5.0",
+    "eslint": "^7.7.0",
     "eslint-config-xo-lass": "^1.0.3",
     "fixpack": "^3.0.6",
     "husky": "^4.2.5",
-    "lint-staged": "10.2.11",
-    "mongoose": "^5.9.25",
+    "lint-staged": "10.2.13",
+    "mongoose": "^5.10.2",
     "nyc": "^15.1.0",
     "remark-cli": "^8.0.1",
-    "remark-preset-github": "^2.0.2",
+    "remark-preset-github": "^3.0.0",
     "supertest": "^4.0.2",
-    "xo": "^0.32.1"
+    "xo": "^0.33.0"
   },
   "engines": {
     "node": ">=8.3"