@nxtedition/lib 26.0.2 → 26.0.4

package/http.js

@@ -157,7 +157,7 @@ export async function upgradeMiddleware(ctx, next) {
   try {
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
     if (!isHealthcheck) {
-      ctx.logger?.debug({ req }, 'stream started')
+      ctx.logger?.debug({ req }, 'request started')
     }
 
     const thenable = next()
@@ -219,10 +219,29 @@ export async function requestMiddleware(ctx, next) {
       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,7 +249,9 @@ 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
 
@@ -319,7 +340,7 @@ export async function requestMiddleware(ctx, next) {
       // Do nothing..
     } else {
       res.destroy()
-      ctx.logger?.warn({ req }, 'request destroyed')
+      ctx.logger?.warn('request destroyed')
     }
   }
 }
@@ -334,13 +355,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() {
@@ -581,13 +597,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.2",
+  "version": "26.0.4",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",