@nxtedition/lib 23.6.0 → 23.6.2

package/http.js

@@ -33,101 +33,128 @@ function onTimeout() {
   this.destroy((timeoutError ??= new createError.RequestTimeout()))
 }
 
+// TODO (fix): Make custom ServerRequest class with the properties
+// that is currently deprecated by Context.
+
 export class Context {
   #id
   #userAgent
   #req
   #res
   #ac
-  #url
+  #target
   #logger
   #query
 
   constructor(req, res, logger) {
     assert(req)
     assert(res)
-    assert(logger)
-
-    const id = req.headers['request-id'] || req.headers['Request-Id']
 
-    this.#id = (id ? `${id},` : '') + genReqId()
+    this.#id = req.id || req.headers['request-id'] || req.headers['Request-Id'] || genReqId()
     this.#userAgent = req.headers['user-agent'] || req.headers['User-Agent'] || ''
     this.#req = req
     this.#res = res
-    this.#logger = logger.child({ reqId: this.#id, url: req.url, userAgent: this.#userAgent })
+    this.#logger = logger.child({ id: this.#req.id })
+    this.#target = requestTarget(this.#req)
+    this.#query = undefined
+
+    // TODO (fix): This should not be necessary...
+    req.target ??= this.#target
+    req.userAgent ??= this.#userAgent
+    req.id ??= this.#id
+    req.logger ??= this.#logger
   }
 
   get id() {
+    if (this.#req.id) {
+      return this.#req.id
+    }
+
     return this.#id
   }
 
+  get logger() {
+    return this.#logger
+  }
+
+  get req() {
+    return this.#req
+  }
+
+  get res() {
+    return this.#res
+  }
+
+  get [kAbortController]() {
+    return this.#ac
+  }
+
+  get signal() {
+    this.#ac ??= new AbortController()
+    return this.#ac.signal
+  }
+
+  /** @deprecated */
   get userAgent() {
+    if (this.#req.userAgent) {
+      return this.#req.userAgent
+    }
+
     return this.#userAgent
   }
 
+  /** @deprecated */
   get method() {
     return this.#req.method
   }
 
+  /** @deprecated */
   get url() {
-    if (this.#url === undefined) {
-      this.#url = requestTarget(this.#req)
+    if (this.#req.target) {
+      return this.#req.target
     }
 
-    if (!this.#url) {
+    this.#target ??= requestTarget(this.#req)
+
+    if (!this.#target) {
       throw new createError.BadRequest('invalid url')
     }
 
-    return this.#url
+    return this.#target
   }
 
+  /** @deprecated */
   set url(value) {
-    if (value instanceof URL) {
-      value = value.toString()
-    }
-
     if (typeof value !== 'string') {
       throw new Error('url must be a string')
     }
 
     this.#req.url = value
-    this.#url = undefined
+    this.#target = undefined
     this.#query = undefined
   }
 
+  /** @deprecated */
   get query() {
-    if (this.#query === undefined) {
-      this.#query =
-        this.url.search.length > 1 ? Object.freeze(querystring.parse(this.url.search.slice(1))) : {}
+    if (this.#req.query) {
+      return this.#req.query
     }
-    return this.#query
-  }
-
-  set query(value) {}
 
-  get logger() {
-    return this.#logger
-  }
+    this.#query ??=
+      this.#target.search.length > 1
+        ? Object.freeze(querystring.parse(this.#target.search.slice(1)))
+        : {}
 
-  set logger(val) {
-    this.#logger = val
-  }
-
-  get req() {
-    return this.#req
-  }
-
-  get res() {
-    return this.#res
+    return this.#query
   }
 
-  get [kAbortController]() {
-    return this.#ac
-  }
+  /** @deprecated */
+  set query(value) {}
 
-  get signal() {
-    this.#ac ??= new AbortController()
-    return this.#ac.signal
+  /** @deprecated */
+  set logger(logger) {
+    this.#logger = logger.child({ req: { id: this.#req.id } })
+    this.#req.logger = this.#logger
   }
 }
 

package/package.json

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

package/serializers.js

@@ -2,7 +2,9 @@ import { SIGNALS } from './platform.js'
 import { parseHeaders } from '@nxtedition/nxt-undici'
 
 function getHeader(obj, key) {
-  return obj?.headers?.get?.(key) || obj?.getHeader?.(key) || obj?.headers?.[key]
+  return !obj || !key
+    ? undefined
+    : obj?.headers?.get?.(key) || obj?.getHeader?.(key) || obj?.headers?.[key]
 }
 
 function getHeaders(obj) {
@@ -91,8 +93,8 @@ export default {
     },
   res: (res) =>
     res && {
-      id: res.id || res.req?.id || getHeader(res, 'request-id') || getHeader(res.req, 'request-id'),
-      userAgent: res.userAgent ?? getHeader(res, 'user-agent'),
+      id: res.id ?? res.req?.id ?? getHeader(res, 'request-id') ?? getHeader(res.req, 'request-id'),
+      userAgent: res.userAgent ?? res.req?.userAgent ?? getHeader(res.req, 'user-agent'),
       timing: getTiming(res),
       statusCode: res.statusCode || res.status,
       bytesWritten: res.bytesWritten,
@@ -109,17 +111,14 @@ export default {
     },
   req: (req) =>
     req && {
+      url: req.url,
       id: req.id || getHeader(req, 'request-id'),
       userAgent: req.userAgent ?? getHeader(req, 'user-agent'),
       timing: getTiming(req),
+      target: req.target,
       method: req.method,
-      url: req.url,
-      scheme: req.scheme,
-      host: req.host,
-      port: req.port,
-      path: req.path,
-      query: req.query,
       headers: getHeaders(req),
+      query: req.query,
       bytesRead: req.bytesRead,
       bytesReadPerSecond:
         req.bytesReadPerSecond ??
@@ -149,11 +148,11 @@ export default {
     },
   ureq: (ureq) =>
     ureq && {
+      url: getUrl(ureq),
       id: ureq.id || getHeader(ureq, 'request-id'),
       userAgent: ureq.userAgent ?? getHeader(ureq, 'user-agent'),
       timing: getTiming(ureq),
       method: ureq.method,
-      url: getUrl(ureq),
       body: typeof ureq.body === 'string' ? ureq.body : undefined,
       bytesWritten: ureq.bytesWritten,
       bytesReadPerSecond: