@nxtedition/lib 22.0.0 → 22.0.2

package/http.js

@@ -53,8 +53,6 @@ export class Context {
     this.#req = req
     this.#res = res
     this.#logger = logger.child({ reqId: this.#id, url: req.url, userAgent: this.#userAgent })
-
-    res.setHeader('request-id', this.id)
   }
 
   get id() {
@@ -144,20 +142,28 @@ export async function requestMiddleware(ctx, next) {
       logger.debug({ req }, 'request started')
     }
 
+    if (ctx.id) {
+      res.setHeader('request-id', ctx.id)
+    }
+
     const thenable = next()
 
     if (thenable?.then) {
       await thenable
     }
 
-    const elapsedTime = Math.ceil(performance.now() - startTime)
+    assert(res.destroyed, 'response not completed')
+
+    const elapsedTime = performance.now() - startTime
 
     if (isHealthcheck) {
       // Do nothing...
+    } else if (res.errored) {
+      logger.error({ err: res.errored, res, elapsedTime }, 'request error')
     } else if (!res.writableEnded) {
       logger.debug({ res, elapsedTime }, 'request aborted')
-    } else if (res.statusCode >= 500 || res.errored) {
-      logger.error({ err: res.errored, res, elapsedTime }, 'request error')
+    } else if (res.statusCode >= 500) {
+      logger.error({ res, elapsedTime }, 'request error')
     } else if (res.statusCode >= 400) {
       logger.warn({ res, elapsedTime }, 'request failed')
     } else {
@@ -167,21 +173,19 @@ export async function requestMiddleware(ctx, next) {
     ctx[kAbortController]?.abort(err)
 
     const statusCode = err.statusCode || err.$metadata?.httpStatusCode || 500
-    const elapsedTime = Math.ceil(performance.now() - startTime)
+    const elapsedTime = performance.now() - startTime
 
-    if (!res.headersSent && !res.destroyed) {
+    // res.destroyed is not properly set by http2 compat so we need to
+    // also check res.closed.
+    if (!res.headersSent && !res.destroyed && !res.closed) {
       res.statusCode = statusCode
 
-      let reqId = ctx.id || req?.id || err.id
       for (const name of res.getHeaderNames()) {
-        if (!reqId && name === 'request-id') {
-          reqId = res.getHeader(name)
-        }
         res.removeHeader(name)
       }
 
-      if (reqId) {
-        res.setHeader('request-id', reqId)
+      if (ctx.id) {
+        res.setHeader('request-id', ctx.id)
       }
 
       const { headers } = err
@@ -202,6 +206,8 @@ export async function requestMiddleware(ctx, next) {
             res.setHeader(key, val)
           }
         }
+      } else if (err.headers != null) {
+        logger.warn({ err }, 'invalid headers')
       }
 
       if (fp.isPlainObject(err.body)) {
@@ -291,7 +297,7 @@ export async function request(ctx, next) {
       await responsePromise
     }
 
-    const elapsedTime = Math.ceil(performance.now() - startTime)
+    const elapsedTime = performance.now() - startTime
 
     if (isHealthcheck) {
       // Do nothing...
@@ -308,7 +314,7 @@ export async function request(ctx, next) {
     ac?.abort(err)
 
     const statusCode = err.statusCode || err.$metadata?.httpStatusCode || 500
-    const elapsedTime = Math.ceil(performance.now() - startTime)
+    const elapsedTime = performance.now() - startTime
 
     if (!res.headersSent && !res.destroyed) {
       res.statusCode = statusCode

package/package.json

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

package/serializers.js

@@ -17,7 +17,8 @@ function getHeaders(obj) {
   return (
     (obj.headers?.entries && Object.fromEntries(obj.headers.entries())) ||
     obj.headers ||
-    obj.getHeaders?.()
+    obj.getHeaders?.() ||
+    undefined
   )
 }
 
@@ -59,6 +60,9 @@ export default {
           : undefined),
       headers: getHeaders(res),
       headersSent: res.headersSent,
+      aborted: res.aborted,
+      closed: res.closed,
+      destroyed: res.destroyed,
     },
   req: (req) =>
     req && {
@@ -81,6 +85,9 @@ export default {
           : undefined),
       remoteAddress: req.socket?.remoteAddress,
       remotePort: req.socket?.remotePort,
+      aborted: req.aborted,
+      closed: req.closed,
+      destroyed: req.destroyed,
     },
   ures: (ures) =>
     ures && {