@nxtedition/lib 26.0.3 → 26.0.5

package/http.js

@@ -154,12 +154,10 @@ export async function upgradeMiddleware(ctx, next) {
     }
   })
 
-  let logger = ctx.logger
   try {
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
     if (!isHealthcheck) {
-      logger = logger?.child({ req })
-      logger?.debug('request started')
+      ctx.logger?.debug({ req }, 'request started')
     }
 
     const thenable = next()
@@ -175,15 +173,15 @@ export async function upgradeMiddleware(ctx, next) {
     if (isHealthcheck) {
       // Do nothing...
     } else if (socket.errored) {
-      logger?.error({ err: socket.errored, req, socket, elapsedTime }, 'stream error')
+      ctx.logger?.error({ err: socket.errored, req, socket, elapsedTime }, 'stream error')
     } else if (!socket.writableEnded) {
-      logger?.debug({ req, socket, elapsedTime }, 'stream aborted')
+      ctx.logger?.debug({ socket, elapsedTime }, 'stream aborted')
     } else if (socket.statusCode >= 500) {
-      logger?.error({ req, socket, elapsedTime }, 'stream error')
+      ctx.logger?.error({ socket, elapsedTime }, 'stream error')
     } else if (socket.statusCode >= 400) {
-      logger?.warn({ req, socket, elapsedTime }, 'stream failed')
+      ctx.logger?.warn({ socket, elapsedTime }, 'stream failed')
     } else {
-      logger?.debug({ req, socket, elapsedTime }, 'stream completed')
+      ctx.logger?.debug({ socket, elapsedTime }, 'stream completed')
     }
   } catch (err) {
     ctx[kAbortController]?.abort(err)
@@ -192,17 +190,17 @@ export async function upgradeMiddleware(ctx, next) {
     const elapsedTime = performance.now() - startTime
 
     if (req.aborted || aborted || (!socket.errored && socket.closed) || err.name === 'AbortError') {
-      logger?.debug({ err, req, socket, elapsedTime }, 'stream aborted')
+      ctx.logger?.debug({ err, req, socket, elapsedTime }, 'stream aborted')
     } else if (statusCode < 500) {
-      logger?.warn({ err, req, socket, elapsedTime }, 'stream failed')
+      ctx.logger?.warn({ err, req, socket, elapsedTime }, 'stream failed')
     } else {
-      logger?.error({ err, req, socket, elapsedTime }, 'stream error')
+      ctx.logger?.error({ err, req, socket, elapsedTime }, 'stream error')
     }
     socket.destroy(err)
   } finally {
     if (!socket.writableEnded && !socket.destroyed) {
       socket.destroy()
-      logger?.warn('socket destroyed')
+      ctx.logger?.warn('socket destroyed')
     }
   }
 }
@@ -211,12 +209,10 @@ export async function requestMiddleware(ctx, next) {
   const { req, res } = ctx
   const startTime = performance.now()
 
-  let logger = ctx.logger
   try {
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
     if (!isHealthcheck) {
-      logger = logger?.child({ req })
-      logger?.debug('request started')
+      ctx.logger?.debug({ req }, 'request started')
     }
 
     if (ctx.id) {
@@ -262,15 +258,15 @@ export async function requestMiddleware(ctx, next) {
     if (isHealthcheck) {
       // Do nothing...
     } else if (res.errored) {
-      logger?.error({ err: res.errored, req, res, elapsedTime }, 'request error')
+      ctx.logger?.error({ err: res.errored, res, elapsedTime }, 'request error')
     } else if (!res.writableEnded) {
-      logger?.debug({ req, res, elapsedTime }, 'request aborted')
+      ctx.logger?.debug({ res, elapsedTime }, 'request aborted')
     } else if (res.statusCode >= 500) {
-      logger?.error({ req, res, elapsedTime }, 'request error')
+      ctx.logger?.error({ res, elapsedTime }, 'request error')
     } else if (res.statusCode >= 400) {
-      logger?.warn({ req, res, elapsedTime }, 'request failed')
+      ctx.logger?.warn({ res, elapsedTime }, 'request failed')
     } else {
-      logger?.debug({ req, res, elapsedTime }, 'request completed')
+      ctx.logger?.debug({ res, elapsedTime }, 'request completed')
     }
   } catch (err) {
     ctx[kAbortController]?.abort(err)
@@ -310,7 +306,7 @@ export async function requestMiddleware(ctx, next) {
           }
         }
       } else if (err.headers != null) {
-        logger?.warn({ req, err }, 'invalid headers')
+        ctx.logger?.warn({ req, err }, 'invalid headers')
       }
 
       if (fp.isPlainObject(err.body)) {
@@ -325,17 +321,17 @@ export async function requestMiddleware(ctx, next) {
       }
 
       if (statusCode < 500) {
-        logger?.warn({ res, err, elapsedTime }, 'request failed')
+        ctx.logger?.warn({ req, res, err, elapsedTime }, 'request failed')
       } else {
-        logger?.error({ res, err, elapsedTime }, 'request error')
+        ctx.logger?.error({ req, res, err, elapsedTime }, 'request error')
       }
     } else {
       if (req.aborted || (!res.errored && res.closed) || err.name === 'AbortError') {
-        logger?.debug({ res, err, elapsedTime }, 'request aborted')
+        ctx.logger?.debug({ req, res, err, elapsedTime }, 'request aborted')
       } else if (statusCode < 500) {
-        logger?.warn({ res, err, elapsedTime }, 'request failed')
+        ctx.logger?.warn({ req, res, err, elapsedTime }, 'request failed')
       } else {
-        logger?.error({ res, err, elapsedTime }, 'request error')
+        ctx.logger?.error({ req, res, err, elapsedTime }, 'request error')
       }
       res.destroy(err)
     }
@@ -344,7 +340,7 @@ export async function requestMiddleware(ctx, next) {
       // Do nothing..
     } else {
       res.destroy()
-      logger?.warn('request destroyed')
+      ctx.logger?.warn('request destroyed')
     }
   }
 }

package/package.json

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