@nxtedition/lib 23.17.7 → 23.17.8

package/http.js

@@ -42,9 +42,6 @@ export class Context {
   #res
   #ac
   #logger
-
-  // deprecated fields
-  #userAgent
   #query
   #target
 
@@ -52,15 +49,14 @@ export class Context {
     assert(req)
     assert(res)
 
-    this.#id = req.headers['request-id'] || req.headers['Request-Id'] || genReqId()
-    this.#userAgent = req.headers['user-agent'] || req.headers['User-Agent'] || ''
+    this.#id = req.id || req.headers['request-id'] || req.headers['Request-Id'] || genReqId()
     this.#req = req
     this.#res = res
-    this.#logger = logger.child({ rid: this.#id, userAgent: this.#userAgent })
+    this.#logger = logger.child({ rid: this.#id })
   }
 
   get id() {
-    return this.#req.id ?? this.#id
+    return this.#id
   }
 
   get logger() {
@@ -75,6 +71,38 @@ export class Context {
     return this.#res
   }
 
+  get target() {
+    if (this.#req.target) {
+      return this.#req.target
+    }
+
+    this.#target ??= requestTarget(this.#req)
+
+    if (!this.#target) {
+      throw new createError.BadRequest('invalid url')
+    }
+
+    return this.#target
+  }
+
+  get query() {
+    if (this.#req.query) {
+      return this.#req.query
+    }
+
+    this.#target ??= requestTarget(this.#req)
+    this.#query ??=
+      this.#target.search.length > 1
+        ? Object.freeze(querystring.parse(this.#target.search.slice(1)))
+        : {}
+
+    return this.#query
+  }
+
+  get userAgent() {
+    return this.#req.headers['user-agent'] || this.#req.headers['User-Agent'] || ''
+  }
+
   get [kAbortController]() {
     return this.#ac
   }
@@ -84,11 +112,6 @@ export class Context {
     return this.#ac.signal
   }
 
-  /** @deprecated */
-  get userAgent() {
-    return this.#req.userAgent ?? this.#userAgent
-  }
-
   /** @deprecated */
   get method() {
     return this.#req.method
@@ -96,17 +119,7 @@ export class Context {
 
   /** @deprecated */
   get url() {
-    if (this.#req.target) {
-      return this.#req.target
-    }
-
-    this.#target ??= requestTarget(this.#req)
-
-    if (!this.#target) {
-      throw new createError.BadRequest('invalid url')
-    }
-
-    return this.#target
+    return this.target
   }
 
   /** @deprecated */
@@ -120,21 +133,6 @@ export class Context {
     this.#query = undefined
   }
 
-  /** @deprecated */
-  get query() {
-    if (this.#req.query) {
-      return this.#req.query
-    }
-
-    this.#target ??= requestTarget(this.#req)
-    this.#query ??=
-      this.#target.search.length > 1
-        ? Object.freeze(querystring.parse(this.#target.search.slice(1)))
-        : {}
-
-    return this.#query
-  }
-
   /** @deprecated */
   set logger(logger) {
     this.#logger = logger.child({ rid: this.#id })
@@ -349,15 +347,17 @@ export class IncomingMessage extends http.IncomingMessage {
   #socket
   #target
 
+  #id
   #search
   #query
 
   constructor(...args) {
     super(...args)
+    this.#id = this.headers['request-id'] || this.headers['Request-Id'] || genReqId()
   }
 
   get id() {
-    return this.headers['request-id'] || this.headers['Request-Id']
+    return this.#id
   }
 
   get target() {
@@ -493,15 +493,17 @@ export class Http2ServerRequest extends http2.Http2ServerRequest {
   #socket
   #target
 
+  #id
   #search
   #query
 
   constructor(...args) {
     super(...args)
+    this.#id = this.headers['request-id'] || this.headers['Request-Id'] || genReqId()
   }
 
   get id() {
-    return this.headers['request-id'] || this.headers['Request-Id']
+    return this.#id
   }
 
   get target() {

package/package.json

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