@nxtedition/lib 23.6.17 → 23.6.18

package/http.js

@@ -42,7 +42,6 @@ export class Context {
   #req
   #res
   #ac
-  #target
   #logger
   #query
 
@@ -50,19 +49,12 @@ export class Context {
     assert(req)
     assert(res)
 
-    this.#id = req.id || req.headers['request-id'] || req.headers['Request-Id'] || genReqId()
+    this.#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({ rid: this.#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() {
@@ -284,6 +276,35 @@ export async function requestMiddleware(ctx, next) {
   }
 }
 
+export class IncomingMessage extends http.IncomingMessage {
+  #target
+  #host
+  #url
+  #socket
+
+  constructor(...args) {
+    super(...args)
+  }
+
+  get id() {
+    return this.headers['request-id'] || this.headers['Request-Id']
+  }
+
+  get target() {
+    if (
+      this.#host !== this.headers.host ||
+      this.#url !== this.url ||
+      this.#socket !== this.socket
+    ) {
+      this.#target = undefined
+      this.#host = this.headers.host
+      this.#url = this.url
+      this.#socket = this.socket
+    }
+    return (this.#target ??= requestTarget(this))
+  }
+}
+
 export class ServerResponse extends http.ServerResponse {
   #created = 0
   #bytesWritten = 0
@@ -383,6 +404,35 @@ export class ServerResponse extends http.ServerResponse {
   }
 }
 
+export class Http2IncomingMessage extends http2.IncomingMessage {
+  #target
+  #host
+  #url
+  #socket
+
+  constructor(...args) {
+    super(...args)
+  }
+
+  get id() {
+    return this.headers['request-id'] || this.headers['Request-Id']
+  }
+
+  get target() {
+    if (
+      this.#host !== this.headers.host ||
+      this.#url !== this.url ||
+      this.#socket !== this.socket
+    ) {
+      this.#target = undefined
+      this.#host = this.headers.host
+      this.#url = this.url
+      this.#socket = this.socket
+    }
+    return (this.#target ??= requestTarget(this))
+  }
+}
+
 export class Http2ServerResponse extends http2.Http2ServerResponse {
   #created = 0
   #bytesWritten = 0
@@ -479,8 +529,6 @@ export async function request(ctx, next) {
   const { req, res, logger } = ctx
   const startTime = performance.now()
 
-  const ac = ctx.signal !== undefined ? null : new AbortController()
-
   let reqLogger = logger
 
   pendingSet.add(ctx)
@@ -499,10 +547,6 @@ export async function request(ctx, next) {
       res.log =
         logger.child({ req: { id: req.id, url: req.url, userAgent: ctx.userAgent } })
 
-    if (ac) {
-      ctx.signal = ac.signal
-    }
-
     if (req.method === 'GET' || req.method === 'HEAD') {
       req.resume() // Dump the body if there is one.
     }
@@ -541,7 +585,7 @@ export async function request(ctx, next) {
       reqLogger.debug({ res, elapsedTime }, 'request completed')
     }
   } catch (err) {
-    ac?.abort(err)
+    ctx[kAbortController]?.abort(err)
 
     const statusCode = err.statusCode || err.$metadata?.httpStatusCode || 500
     const elapsedTime = performance.now() - startTime

package/package.json

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