@nxtedition/lib 23.7.6 → 23.8.1

package/http.js

@@ -8,7 +8,6 @@ import compose from 'koa-compose'
 import http from 'http'
 import fp from 'lodash/fp.js'
 import tp from 'timers/promises'
-import querystring from 'fast-querystring'
 
 export const kAbortController = Symbol('abortController')
 
@@ -39,11 +38,13 @@ function onTimeout() {
 
 export class Context {
   #id
-  #userAgent
   #req
   #res
   #ac
   #logger
+
+  // deprecated fields
+  #userAgent
   #query
   #target
 
@@ -55,16 +56,11 @@ export class Context {
     this.#userAgent = req.headers['user-agent'] || req.headers['User-Agent'] || ''
     this.#req = req
     this.#res = res
-    this.#logger = logger.child({ rid: this.#id })
-    this.#query = undefined
+    this.#logger = logger.child({ rid: this.#id, userAgent: this.#userAgent })
   }
 
   get id() {
-    if (this.#req.id) {
-      return this.#req.id
-    }
-
-    return this.#id
+    return this.#req.id ?? this.#id
   }
 
   get logger() {
@@ -90,11 +86,7 @@ export class Context {
 
   /** @deprecated */
   get userAgent() {
-    if (this.#req.userAgent) {
-      return this.#req.userAgent
-    }
-
-    return this.#userAgent
+    return this.#req.userAgent ?? this.#userAgent
   }
 
   /** @deprecated */
@@ -143,13 +135,9 @@ export class Context {
     return this.#query
   }
 
-  /** @deprecated */
-  set query(value) {}
-
   /** @deprecated */
   set logger(logger) {
-    this.#logger = logger.child({ req: { id: this.#req.id } })
-    this.#req.logger = this.#logger
+    this.#logger = logger.child({ rid: this.#id })
   }
 }
 
@@ -757,12 +745,33 @@ export async function request(ctx, next) {
   }
 }
 
-/** @deprecated */
 export function createServer(options, ctx, middleware) {
-  middleware = Array.isArray(middleware) ? middleware : [middleware]
-  middleware = fp.values(middleware)
-  middleware = middleware.flat().filter(Boolean)
-  middleware = compose([requestMiddleware, ...middleware])
+  if (middleware) {
+    middleware = [middleware].flat(16).filter(Boolean)
+    middleware = middleware.includes(requestMiddleware)
+      ? middleware
+      : [requestMiddleware, ...middleware]
+    middleware = compose(middleware)
+    middleware = middleware.length === 0 ? null : middleware
+  }
+
+  let factory
+  if (typeof ctx === 'function') {
+    factory = ctx
+  } else {
+    let { logger, ...opaque } = ctx ?? {}
+    if (Object.keys(opaque).length === 0) {
+      opaque = null
+    }
+
+    factory = (req, res) => {
+      const context = new Context(req, res, ctx.logger ?? options?.logger)
+      if (opaque) {
+        Object.assign(context, opaque)
+      }
+      return context
+    }
+  }
 
   const server = http.createServer(
     {
@@ -773,7 +782,7 @@ export function createServer(options, ctx, middleware) {
       requestTimeout: 0,
       ...options,
     },
-    (req, res) => middleware(ctx ? { req, res, ...ctx } : { req, res }),
+    (req, res) => (middleware ? middleware(factory(req, res)) : factory(req, res)),
   )
 
   server.setTimeout(options.socketTimeout ?? options.timeout ?? 2 * 60e3)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "23.7.6",
+  "version": "23.8.1",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",