@nxtedition/lib 26.0.1 → 26.0.3

package/http.js

@@ -154,10 +154,12 @@ export async function upgradeMiddleware(ctx, next) {
     }
   })
 
+  let logger = ctx.logger
   try {
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
     if (!isHealthcheck) {
-      ctx.logger?.debug({ req }, 'stream started')
+      logger = logger?.child({ req })
+      logger?.debug('request started')
     }
 
     const thenable = next()
@@ -173,15 +175,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')
+      logger?.error({ err: socket.errored, req, socket, elapsedTime }, 'stream error')
     } else if (!socket.writableEnded) {
-      ctx.logger?.debug({ req, socket, elapsedTime }, 'stream aborted')
+      logger?.debug({ req, socket, elapsedTime }, 'stream aborted')
     } else if (socket.statusCode >= 500) {
-      ctx.logger?.error({ req, socket, elapsedTime }, 'stream error')
+      logger?.error({ req, socket, elapsedTime }, 'stream error')
     } else if (socket.statusCode >= 400) {
-      ctx.logger?.warn({ req, socket, elapsedTime }, 'stream failed')
+      logger?.warn({ req, socket, elapsedTime }, 'stream failed')
     } else {
-      ctx.logger?.debug({ req, socket, elapsedTime }, 'stream completed')
+      logger?.debug({ req, socket, elapsedTime }, 'stream completed')
     }
   } catch (err) {
     ctx[kAbortController]?.abort(err)
@@ -190,17 +192,17 @@ 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')
+      logger?.debug({ err, req, socket, elapsedTime }, 'stream aborted')
     } else if (statusCode < 500) {
-      ctx.logger?.warn({ err, req, socket, elapsedTime }, 'stream failed')
+      logger?.warn({ err, req, socket, elapsedTime }, 'stream failed')
     } else {
-      ctx.logger?.error({ err, req, socket, elapsedTime }, 'stream error')
+      logger?.error({ err, req, socket, elapsedTime }, 'stream error')
     }
     socket.destroy(err)
   } finally {
     if (!socket.writableEnded && !socket.destroyed) {
       socket.destroy()
-      ctx.logger?.warn('socket destroyed')
+      logger?.warn('socket destroyed')
     }
   }
 }
@@ -209,20 +211,41 @@ 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) {
-      ctx.logger?.debug({ req }, 'request started')
+      logger = logger?.child({ req })
+      logger?.debug('request started')
     }
 
     if (ctx.id) {
       res.setHeader('request-id', ctx.id)
     }
 
+    if (req.httpVersionMajor === 1 && (req.method === 'HEAD' || req.method === 'GET')) {
+      // Fast dump where request "has" already emitted all lifecycle events.
+      // This avoid a lot of unnecessary overhead otherwise introduced by
+      // stream.Readable life cycle rules. The downside is that this will
+      // break some servers that read GET bodies.
+
+      req._dumped = true
+      req._readableState.ended = true
+      req._readableState.endEmitted = true
+      req._readableState.destroyed = true
+      req._readableState.closed = true
+      req._readableState.closeEmitted = true
+
+      req._read()
+    }
+
     const thenable = next()
 
-    if (thenable?.then || res.errored || req.errored) {
+    if (!req.destroyed || req.errored) {
       req.on('error', noop)
+    }
+
+    if (!res.destroyed || res.errored) {
       res.on('error', noop)
     }
 
@@ -230,22 +253,24 @@ export async function requestMiddleware(ctx, next) {
       await thenable
     }
 
-    assert(res.destroyed || res.writableEnded, 'response not completed')
+    if (!res.destroyed || !res.writableEnded) {
+      throw new Error('Response not completed')
+    }
 
     const elapsedTime = performance.now() - startTime
 
     if (isHealthcheck) {
       // Do nothing...
     } else if (res.errored) {
-      ctx.logger?.error({ err: res.errored, req, res, elapsedTime }, 'request error')
+      logger?.error({ err: res.errored, req, res, elapsedTime }, 'request error')
     } else if (!res.writableEnded) {
-      ctx.logger?.debug({ req, res, elapsedTime }, 'request aborted')
+      logger?.debug({ req, res, elapsedTime }, 'request aborted')
     } else if (res.statusCode >= 500) {
-      ctx.logger?.error({ req, res, elapsedTime }, 'request error')
+      logger?.error({ req, res, elapsedTime }, 'request error')
     } else if (res.statusCode >= 400) {
-      ctx.logger?.warn({ req, res, elapsedTime }, 'request failed')
+      logger?.warn({ req, res, elapsedTime }, 'request failed')
     } else {
-      ctx.logger?.debug({ req, res, elapsedTime }, 'request completed')
+      logger?.debug({ req, res, elapsedTime }, 'request completed')
     }
   } catch (err) {
     ctx[kAbortController]?.abort(err)
@@ -285,7 +310,7 @@ export async function requestMiddleware(ctx, next) {
           }
         }
       } else if (err.headers != null) {
-        ctx.logger?.warn({ req, err }, 'invalid headers')
+        logger?.warn({ req, err }, 'invalid headers')
       }
 
       if (fp.isPlainObject(err.body)) {
@@ -300,17 +325,17 @@ export async function requestMiddleware(ctx, next) {
       }
 
       if (statusCode < 500) {
-        ctx.logger?.warn({ req, res, err, elapsedTime }, 'request failed')
+        logger?.warn({ res, err, elapsedTime }, 'request failed')
       } else {
-        ctx.logger?.error({ req, res, err, elapsedTime }, 'request error')
+        logger?.error({ 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')
+        logger?.debug({ res, err, elapsedTime }, 'request aborted')
       } else if (statusCode < 500) {
-        ctx.logger?.warn({ req, res, err, elapsedTime }, 'request failed')
+        logger?.warn({ res, err, elapsedTime }, 'request failed')
       } else {
-        ctx.logger?.error({ req, res, err, elapsedTime }, 'request error')
+        logger?.error({ res, err, elapsedTime }, 'request error')
       }
       res.destroy(err)
     }
@@ -319,7 +344,7 @@ export async function requestMiddleware(ctx, next) {
       // Do nothing..
     } else {
       res.destroy()
-      ctx.logger?.warn({ req }, 'request destroyed')
+      logger?.warn('request destroyed')
     }
   }
 }
@@ -334,13 +359,8 @@ export class IncomingMessage extends http.IncomingMessage {
   #search
   #query
 
-  constructor(...args) {
-    super(...args)
-    this.#id = this.headers['request-id'] || this.headers['Request-Id'] || genReqId()
-  }
-
   get id() {
-    return this.#id
+    return (this.#id ??= this.headers['request-id'] || this.headers['Request-Id'] || genReqId())
   }
 
   get target() {
@@ -485,6 +505,12 @@ export class ServerResponse extends http.ServerResponse {
       headers = headers ? Object.assign(this.#headersObj, headers) : this.#headersObj
     }
 
+    if (!this.destroyed) {
+      if (this.#headers === -1) {
+        this.#headers = performance.now() - this.#created
+      }
+    }
+
     this.#headersObj = null
 
     return super.writeHead(statusCode, headers)
@@ -503,15 +529,6 @@ export class ServerResponse extends http.ServerResponse {
     return super.assignSocket(socket)
   }
 
-  flushHeaders() {
-    if (!this.destroyed) {
-      if (this.#headers === -1) {
-        this.#headers = performance.now() - this.#created
-      }
-    }
-    return super.flushHeaders()
-  }
-
   write(chunk, encoding, callback) {
     if (!this.destroyed) {
       if (this.#data === -1) {
@@ -584,13 +601,8 @@ export class Http2ServerRequest extends http2.Http2ServerRequest {
   #search
   #query
 
-  constructor(...args) {
-    super(...args)
-    this.#id = this.headers['request-id'] || this.headers['Request-Id'] || genReqId()
-  }
-
   get id() {
-    return this.#id
+    return (this.#id ??= this.headers['request-id'] || this.headers['Request-Id'] || genReqId())
   }
 
   get target() {

package/package.json

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