@nxtedition/lib 25.1.1 → 25.1.3

package/http.js

@@ -4,7 +4,6 @@ import createError from 'http-errors'
 import { performance } from 'perf_hooks'
 import requestTarget from 'request-target'
 import querystring from 'fast-querystring'
-import compose from 'koa-compose'
 import http from 'http'
 import fp from 'lodash/fp.js'
 import tp from 'timers/promises'
@@ -220,17 +219,14 @@ export async function requestMiddleware(ctx, next) {
   const { req, res } = ctx
   const startTime = performance.now()
 
-  req.on('error', noop)
-  res.on('error', noop)
-
-  const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
-
   pendingSet.add(ctx)
   try {
     if (req.method === 'GET' || req.method === 'HEAD' || req.method === 'OPTIONS') {
       req.resume() // Dump the body if there is one.
     }
 
+    const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
+
     if (!isHealthcheck) {
       ctx.logger?.debug({ req }, 'request started')
     }
@@ -242,6 +238,8 @@ export async function requestMiddleware(ctx, next) {
     const thenable = next()
 
     if (thenable?.then) {
+      req.on('error', noop)
+      res.on('error', noop)
       await thenable
     }
 
@@ -951,3 +949,66 @@ export async function retry(fn, options) {
     }
   }
 }
+
+/**
+ * @param {Array} middleware
+ * @return {Function}
+ */
+const composeSlim = (middleware) => (ctx, next) => {
+  const dispatch = (i) => () => {
+    const fn = i === middleware.length ? next : middleware[i]
+    return fn ? fn(ctx, dispatch(i + 1)) : undefined
+  }
+  return dispatch(0)()
+}
+
+/** @typedef {import("koa").Middleware} Middleware */
+
+/**
+ * Compose `middleware` returning
+ * a fully valid middleware comprised
+ * of all those which are passed.
+ *
+ * @param {...(Middleware | Middleware[])} middleware
+ * @return {Middleware}
+ * @api public
+ */
+
+export const compose = (...middleware) => {
+  const funcs = middleware.flat()
+
+  for (const fn of funcs) {
+    if (typeof fn !== 'function') throw new TypeError('Middleware must be composed of functions!')
+  }
+
+  if (process.env.NODE_ENV === 'production') {
+    return composeSlim(funcs)
+  }
+
+  return async (ctx, next) => {
+    const dispatch = async (i) => {
+      const fn = i === funcs.length ? next : funcs[i]
+      if (!fn) return
+
+      let nextCalled = false
+      let nextResolved = false
+      const nextProxy = async () => {
+        if (nextCalled) throw Error('next() called multiple times')
+        nextCalled = true
+        try {
+          return await dispatch(i + 1)
+        } finally {
+          nextResolved = true
+        }
+      }
+      const result = await fn(ctx, nextProxy)
+      if (nextCalled && !nextResolved) {
+        throw Error(
+          'Middleware resolved before downstream.\n\tYou are probably missing an await or return',
+        )
+      }
+      return result
+    }
+    return dispatch(0)
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "25.1.1",
+  "version": "25.1.3",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -78,7 +78,6 @@
     "hasha": "^6.0.0",
     "http-errors": "^2.0.0",
     "json5": "^2.2.3",
-    "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",
     "lru-cache": "^11.1.0",
     "mime": "^4.0.7",