@nxtedition/lib 26.0.19 → 26.0.21

package/http.js

@@ -74,14 +74,7 @@ export class Context {
     if (this.#req.target) {
       return this.#req.target
     }
-
-    this.#target ??= Object.freeze(requestTarget(this.#req))
-
-    if (!this.#target) {
-      throw new createError.BadRequest('invalid url')
-    }
-
-    return this.#target
+    return (this.#target ??= Object.freeze(requestTarget(this.#req)))
   }
 
   get query() {
@@ -151,10 +144,11 @@ export async function upgradeMiddleware(ctx, next) {
     }
   })
 
+  const reqLogger = ctx.logger?.child({ req })
   try {
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
     if (!isHealthcheck) {
-      ctx.logger?.debug({ req }, 'request started')
+      reqLogger?.debug({ req }, 'request started')
     }
 
     const thenable = next()
@@ -172,15 +166,15 @@ export async function upgradeMiddleware(ctx, next) {
     if (isHealthcheck) {
       // Do nothing...
     } else if (socket.errored) {
-      ctx.logger?.error({ err: socket.errored, req, socket, elapsedTime }, 'stream error')
+      reqLogger?.error({ err: socket.errored, req, socket, elapsedTime }, 'stream error')
     } else if (!socket.writableEnded) {
-      ctx.logger?.debug({ socket, elapsedTime }, 'stream aborted')
+      reqLogger?.debug({ socket, elapsedTime }, 'stream aborted')
     } else if (socket.statusCode >= 500) {
-      ctx.logger?.error({ socket, elapsedTime }, 'stream error')
+      reqLogger?.error({ socket, elapsedTime }, 'stream error')
     } else if (socket.statusCode >= 400) {
-      ctx.logger?.warn({ socket, elapsedTime }, 'stream failed')
+      reqLogger?.warn({ socket, elapsedTime }, 'stream failed')
     } else {
-      ctx.logger?.debug({ socket, elapsedTime }, 'stream completed')
+      reqLogger?.debug({ socket, elapsedTime }, 'stream completed')
     }
   } catch (err) {
     ctx[kAbortController]?.abort(err)
@@ -189,29 +183,34 @@ export async function upgradeMiddleware(ctx, next) {
     const elapsedTime = performance.now() - startTime
 
     if (req.aborted || aborted || (!socket.errored && socket.closed) || err.name === 'AbortError') {
-      ctx.logger?.debug({ err, req, socket, elapsedTime }, 'stream aborted')
+      reqLogger?.debug({ err, req, socket, elapsedTime }, 'stream aborted')
     } else if (statusCode < 500) {
-      ctx.logger?.warn({ err, req, socket, elapsedTime }, 'stream failed')
+      reqLogger?.warn({ err, req, socket, elapsedTime }, 'stream failed')
     } else {
-      ctx.logger?.error({ err, req, socket, elapsedTime }, 'stream error')
+      reqLogger?.error({ err, req, socket, elapsedTime }, 'stream error')
     }
     socket.destroy(err)
   } finally {
     if (!socket.writableEnded && !socket.destroyed) {
       socket.destroy()
-      ctx.logger?.warn('socket destroyed')
+      reqLogger?.warn('socket destroyed')
     }
   }
 }
 
 export async function requestMiddleware(ctx, next) {
-  const { req, res } = ctx
+  const { req, res, target } = ctx
   const startTime = performance.now()
 
+  const reqLogger = ctx.logger?.child({ req })
   try {
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
     if (!isHealthcheck) {
-      ctx.logger?.debug({ req }, 'request started')
+      reqLogger?.debug({ req }, 'request started')
+    }
+
+    if (!target) {
+      throw new createError.BadRequest('invalid url')
     }
 
     if (ctx.id) {
@@ -257,15 +256,15 @@ export async function requestMiddleware(ctx, next) {
     if (isHealthcheck) {
       // Do nothing...
     } else if (res.errored) {
-      ctx.logger?.error({ err: res.errored, res, elapsedTime }, 'request error')
+      reqLogger?.error({ err: res.errored, res, elapsedTime }, 'request error')
     } else if (!res.writableEnded) {
-      ctx.logger?.debug({ res, elapsedTime }, 'request aborted')
+      reqLogger?.debug({ res, elapsedTime }, 'request aborted')
     } else if (res.statusCode >= 500) {
-      ctx.logger?.error({ res, elapsedTime }, 'request error')
+      reqLogger?.error({ res, elapsedTime }, 'request error')
     } else if (res.statusCode >= 400) {
-      ctx.logger?.warn({ res, elapsedTime }, 'request failed')
+      reqLogger?.warn({ res, elapsedTime }, 'request failed')
     } else {
-      ctx.logger?.debug({ res, elapsedTime }, 'request completed')
+      reqLogger?.debug({ res, elapsedTime }, 'request completed')
     }
   } catch (err) {
     ctx[kAbortController]?.abort(err)
@@ -305,7 +304,7 @@ export async function requestMiddleware(ctx, next) {
           }
         }
       } else if (err.headers != null) {
-        ctx.logger?.warn({ req, err }, 'invalid headers')
+        reqLogger?.warn({ req, err }, 'invalid headers')
       }
 
       if (fp.isPlainObject(err.body)) {
@@ -320,17 +319,17 @@ export async function requestMiddleware(ctx, next) {
       }
 
       if (statusCode < 500) {
-        ctx.logger?.warn({ req, res, err, elapsedTime }, 'request failed')
+        reqLogger?.warn({ req, res, err, elapsedTime }, 'request failed')
       } else {
-        ctx.logger?.error({ req, res, err, elapsedTime }, 'request error')
+        reqLogger?.error({ req, res, err, elapsedTime }, 'request error')
       }
     } else {
       if (req.aborted || (!res.errored && res.closed) || err.name === 'AbortError') {
-        ctx.logger?.debug({ req, res, err, elapsedTime }, 'request aborted')
+        reqLogger?.debug({ req, res, err, elapsedTime }, 'request aborted')
       } else if (statusCode < 500) {
-        ctx.logger?.warn({ req, res, err, elapsedTime }, 'request failed')
+        reqLogger?.warn({ req, res, err, elapsedTime }, 'request failed')
       } else {
-        ctx.logger?.error({ req, res, err, elapsedTime }, 'request error')
+        reqLogger?.error({ req, res, err, elapsedTime }, 'request error')
       }
       res.destroy(err)
     }
@@ -370,13 +369,7 @@ export class IncomingMessage extends http.IncomingMessage {
       this.#target = undefined
     }
 
-    this.#target ??= Object.freeze(requestTarget(this))
-
-    if (!this.#target) {
-      throw new createError.BadRequest('invalid url')
-    }
-
-    return this.#target
+    return (this.#target ??= Object.freeze(requestTarget(this)))
   }
 
   get query() {
@@ -618,7 +611,7 @@ export class Http2ServerRequest extends http2.Http2ServerRequest {
       this.#target = undefined
     }
 
-    return (this.#target ??= requestTarget(this))
+    return (this.#target ??= Object.freeze(requestTarget(this)))
   }
 
   get query() {

package/package.json

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

package/serializers.js

@@ -83,12 +83,17 @@ function getTarget(obj) {
   if (!obj) {
     return undefined
   }
-  if (obj.target) {
-    return obj.target
-  }
-  if (typeof obj.url === 'string') {
-    // TODO(fix): What if url is a full url?
-    return requestTarget({ url: obj.url, headers: obj.headers ?? {}, socket: obj.socket })
+
+  try {
+    if (obj.target) {
+      return obj.target
+    }
+    if (typeof obj.url === 'string') {
+      // TODO(fix): What if url is a full url?
+      return requestTarget({ url: obj.url, headers: obj.headers ?? {}, socket: obj.socket })
+    }
+  } catch {
+    return undefined
   }
 
   // TODO(fix): What if url is instanceof URL?