@nxtedition/lib 23.6.12 → 23.6.14

package/http.js

@@ -169,19 +169,16 @@ export async function requestMiddleware(ctx, next) {
   req.on('error', noop)
   res.on('error', noop)
 
+  const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
+  const reqLogger = isHealthcheck ? null : logger.child({ req })
+
   pendingSet.add(ctx)
   try {
     if (req.method === 'GET' || req.method === 'HEAD' || req.method === 'OPTIONS') {
       req.resume() // Dump the body if there is one.
     }
 
-    const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
-
-    if (isHealthcheck) {
-      // Do nothing...
-    } else {
-      logger.debug({ req }, 'request started')
-    }
+    reqLogger?.debug('request started')
 
     if (ctx.id) {
       res.setHeader('request-id', ctx.id)
@@ -200,15 +197,15 @@ export async function requestMiddleware(ctx, next) {
     if (isHealthcheck) {
       // Do nothing...
     } else if (res.errored) {
-      logger.error({ err: res.errored, res, elapsedTime }, 'request error')
+      reqLogger?.error({ err: res.errored, req, res, elapsedTime }, 'request error')
     } else if (!res.writableEnded) {
-      logger.debug({ res, elapsedTime }, 'request aborted')
+      reqLogger?.debug({ req, res, elapsedTime }, 'request aborted')
     } else if (res.statusCode >= 500) {
-      logger.error({ res, elapsedTime }, 'request error')
+      reqLogger?.error({ req, res, elapsedTime }, 'request error')
     } else if (res.statusCode >= 400) {
-      logger.warn({ res, elapsedTime }, 'request failed')
+      reqLogger?.warn({ req, res, elapsedTime }, 'request failed')
     } else {
-      logger.debug({ res, elapsedTime }, 'request completed')
+      reqLogger?.debug({ req, res, elapsedTime }, 'request completed')
     }
   } catch (err) {
     ctx[kAbortController]?.abort(err)
@@ -248,7 +245,7 @@ export async function requestMiddleware(ctx, next) {
           }
         }
       } else if (err.headers != null) {
-        logger.warn({ err }, 'invalid headers')
+        reqLogger?.warn({ err }, 'invalid headers')
       }
 
       if (fp.isPlainObject(err.body)) {
@@ -263,17 +260,17 @@ export async function requestMiddleware(ctx, next) {
       }
 
       if (statusCode < 500) {
-        logger.warn({ res, err, elapsedTime }, 'request failed')
+        reqLogger?.warn({ res, err, elapsedTime }, 'request failed')
       } else {
-        logger.error({ res, err, elapsedTime }, 'request error')
+        reqLogger?.error({ res, err, elapsedTime }, 'request error')
       }
     } else {
       if (req.aborted || (!res.errored && res.closed) || err.name === 'AbortError') {
-        logger.debug({ res, err, elapsedTime }, 'request aborted')
+        reqLogger?.debug({ res, err, elapsedTime }, 'request aborted')
       } else if (statusCode < 500) {
-        logger.warn({ res, err, elapsedTime }, 'request failed')
+        reqLogger?.warn({ res, err, elapsedTime }, 'request failed')
       } else {
-        logger.error({ res, err, elapsedTime }, 'request error')
+        reqLogger?.error({ res, err, elapsedTime }, 'request error')
       }
       res.destroy(err)
     }
@@ -282,7 +279,7 @@ export async function requestMiddleware(ctx, next) {
 
     if (!res.writableEnded && !res.destroyed) {
       res.destroy()
-      logger.debug('request destroyed')
+      reqLogger?.warn('request destroyed')
     }
   }
 }

package/package.json

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

package/serializers.js

@@ -1,5 +1,6 @@
 import { SIGNALS } from './platform.js'
 import { parseHeaders } from '@nxtedition/nxt-undici'
+import requestTarget from 'request-target'
 
 function getHeader(obj, key) {
   return !obj || !key
@@ -96,6 +97,7 @@ export default {
       id: res.id ?? res.req?.id ?? getHeader(res, 'request-id') ?? getHeader(res.req, 'request-id'),
       url: res.req?.url,
       method: res.req?.method,
+      headers: getHeaders(res),
       statusCode: res.statusCode || res.status,
       userAgent: res.userAgent ?? res.req?.userAgent ?? getHeader(res.req, 'user-agent'),
       timing: getTiming(res),
@@ -105,7 +107,6 @@ export default {
         (res.timing?.complete > 0 && res.bytesWritten
           ? (res.bytesWritten * 1e3) / res.timing.complete
           : undefined),
-      headers: getHeaders(res),
       headersSent: res.headersSent,
       aborted: res.aborted,
       closed: res.closed,
@@ -116,11 +117,10 @@ export default {
       id: req.id || getHeader(req, 'request-id'),
       url: req.url,
       method: req.method,
-      target: req.target,
+      headers: getHeaders(req),
+      target: req.target ?? requestTarget(req),
       userAgent: req.userAgent ?? getHeader(req, 'user-agent'),
       timing: getTiming(req),
-      headers: getHeaders(req),
-      query: req.query,
       bytesRead: req.bytesRead,
       bytesReadPerSecond:
         req.bytesReadPerSecond ??