@nxtedition/lib 23.7.5 → 23.8.0

package/http.js

@@ -38,11 +38,13 @@ function onTimeout() {
 
 export class Context {
   #id
-  #userAgent
   #req
   #res
   #ac
   #logger
+
+  // deprecated fields
+  #userAgent
   #query
   #target
 
@@ -54,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() {
@@ -89,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 */
@@ -142,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 })
   }
 }
 
@@ -351,10 +340,13 @@ export async function requestMiddleware(ctx, next) {
 }
 
 export class IncomingMessage extends http.IncomingMessage {
-  #target
   #host
   #url
   #socket
+  #target
+
+  #search
+  #query
 
   constructor(...args) {
     super(...args)
@@ -370,13 +362,26 @@ export class IncomingMessage extends http.IncomingMessage {
       this.#url !== this.url ||
       this.#socket !== this.socket
     ) {
-      this.#target = undefined
+      this.#socket = this.socket
       this.#host = this.headers.host
       this.#url = this.url
-      this.#socket = this.socket
+      this.#target = undefined
     }
+
     return (this.#target ??= requestTarget(this))
   }
+
+  get query() {
+    const search = this.target.search
+
+    if (this.#search !== search) {
+      this.#search = search
+      this.#query = undefined
+    }
+
+    return (this.#query ??=
+      search.length > 1 ? Object.freeze(querystring.parse(search.slice(1))) : {})
+  }
 }
 
 export class ServerResponse extends http.ServerResponse {
@@ -479,10 +484,13 @@ export class ServerResponse extends http.ServerResponse {
 }
 
 export class Http2ServerRequest extends http2.Http2ServerRequest {
-  #target
   #host
   #url
   #socket
+  #target
+
+  #search
+  #query
 
   constructor(...args) {
     super(...args)
@@ -498,13 +506,26 @@ export class Http2ServerRequest extends http2.Http2ServerRequest {
       this.#url !== this.url ||
       this.#socket !== this.socket
     ) {
-      this.#target = undefined
+      this.#socket = this.socket
       this.#host = this.headers.host
       this.#url = this.url
-      this.#socket = this.socket
+      this.#target = undefined
     }
+
     return (this.#target ??= requestTarget(this))
   }
+
+  get query() {
+    const search = this.target.search
+
+    if (this.#search !== search) {
+      this.#search = search
+      this.#query = undefined
+    }
+
+    return (this.#query ??=
+      search.length > 1 ? Object.freeze(querystring.parse(search.slice(1))) : {})
+  }
 }
 
 export class Http2ServerResponse extends http2.Http2ServerResponse {
@@ -724,12 +745,30 @@ 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])
+  middleware = [middleware].flat(16).filter(Boolean)
+  middleware = middleware.includes(requestMiddleware)
+    ? middleware
+    : [requestMiddleware, ...middleware]
+  middleware = compose(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 middleware(context)
+    }
+  }
 
   const server = http.createServer(
     {
@@ -740,7 +779,7 @@ export function createServer(options, ctx, middleware) {
       requestTimeout: 0,
       ...options,
     },
-    (req, res) => middleware(ctx ? { req, res, ...ctx } : { req, res }),
+    (req, res) => middleware(factory(req, res)),
   )
 
   server.setTimeout(options.socketTimeout ?? options.timeout ?? 2 * 60e3)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "23.7.5",
+  "version": "23.8.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -72,7 +72,7 @@
     "@swc/wasm-web": "^1.11.22",
     "date-fns": "^4.1.0",
     "diff": "5.2.0",
-    "fast-querystring": "^1.1.1",
+    "fast-querystring": "^1.1.2",
     "hasha": "^6.0.0",
     "http-errors": "^2.0.0",
     "json5": "^2.2.3",