@nxtedition/lib 26.3.2 → 26.3.4

package/http.js

@@ -13,8 +13,6 @@ export const kAbortController = Symbol('abortController')
 const ERR_HEADER_EXPR =
   /^(content-length|content-type|te|host|upgrade|trailers|connection|keep-alive|http2-settings|transfer-encoding|proxy-connection|proxy-authenticate|proxy-authorization)$/i
 
-const pending = (globalThis._nxt_lib_http_pending = new Set())
-
 // https://github.com/fastify/fastify/blob/main/lib/reqIdGenFactory.js
 // 2,147,483,647 (2^31 − 1) stands for max SMI value (an internal optimization of V8).
 // With this upper bound, if you'll be generating 1k ids/sec, you're going to hit it in ~25 days.
@@ -147,7 +145,6 @@ export async function upgradeMiddleware(ctx, next) {
   })
 
   const reqLogger = ctx.logger?.child({ req })
-  pending.add(ctx)
   try {
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
     if (!isHealthcheck) {
@@ -194,7 +191,6 @@ export async function upgradeMiddleware(ctx, next) {
     }
     socket.destroy(err)
   } finally {
-    pending.delete(ctx)
     if (!socket.writableEnded && !socket.destroyed) {
       socket.destroy()
       reqLogger?.warn('socket destroyed')
@@ -207,7 +203,6 @@ export async function requestMiddleware(ctx, next) {
   const startTime = performance.now()
 
   const reqLogger = ctx.logger?.child({ req })
-  pending.add(ctx)
   try {
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
     if (!isHealthcheck) {
@@ -240,14 +235,6 @@ export async function requestMiddleware(ctx, next) {
 
     const thenable = next()
 
-    if (!req.destroyed || req.errored) {
-      req.on('error', noop)
-    }
-
-    if (!res.destroyed || res.errored) {
-      res.on('error', noop)
-    }
-
     if (thenable?.then) {
       await thenable
     }
@@ -274,6 +261,18 @@ export async function requestMiddleware(ctx, next) {
   } catch (err) {
     ctx[kAbortController]?.abort(err)
 
+    if (!req.closed) {
+      req.on('error', (err) => {
+        reqLogger?.warn({ err }, 'request error')
+      })
+    }
+
+    if (!res.closed) {
+      res.on('error', (err) => {
+        reqLogger?.warn({ err }, 'response error')
+      })
+    }
+
     const statusCode = err.statusCode || err.$metadata?.httpStatusCode || 500
     const elapsedTime = performance.now() - startTime
 
@@ -339,7 +338,6 @@ export async function requestMiddleware(ctx, next) {
       res.destroy(err)
     }
   } finally {
-    pending.delete(ctx)
     if (res.writableEnded || res.destroyed || res.stream?.destroyed) {
       // Do nothing..
     } else {
@@ -394,7 +392,7 @@ export class IncomingMessage extends http.IncomingMessage {
 export class ServerResponse extends http.ServerResponse {
   #bytesWritten = 0
 
-  #created = -1
+  #created = performance.now()
   #connect = -1
   #headers = -1
   #data = -1
@@ -426,15 +424,6 @@ export class ServerResponse extends http.ServerResponse {
     return this.#bytesWritten
   }
 
-  /**
-   * @param {http.IncomingMessage} req
-   */
-  constructor(req) {
-    super(req)
-
-    this.#created = performance.now()
-  }
-
   setHeaders() {
     throw new Error('not supported')
   }
@@ -634,7 +623,7 @@ export class Http2ServerRequest extends http2.Http2ServerRequest {
 }
 
 export class Http2ServerResponse extends http2.Http2ServerResponse {
-  #created = 0
+  #created = performance.now()
   #bytesWritten = 0
   #connect = -1
   #headers = -1
@@ -654,13 +643,6 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
     return this.#bytesWritten
   }
 
-  constructor(req) {
-    super(req)
-
-    this.#created = performance.now()
-    this.#connect = 0
-  }
-
   flushHeaders() {
     if (!this.destroyed) {
       if (this.#headers === -1) {
@@ -734,7 +716,6 @@ export async function request(ctx, next) {
 
   let reqLogger = logger
 
-  pending.add(ctx)
   try {
     ctx.url = requestTarget(req)
     if (!ctx.url) {
@@ -844,7 +825,6 @@ export async function request(ctx, next) {
       }
     }
   } finally {
-    pending.delete(ctx)
     if (!res.writableEnded) {
       res.destroy()
       logger.debug('request destroyed')
@@ -922,7 +902,6 @@ export async function upgrade(ctx, next) {
 
   let aborted = false
   let reqLogger = logger
-  pending.add(ctx)
   try {
     ctx.url = requestTarget(req)
     if (!ctx.url) {
@@ -987,7 +966,6 @@ export async function upgrade(ctx, next) {
 
     socket.destroy(err)
   } finally {
-    pending.delete(ctx)
     queueMicrotask(() => ac.abort())
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "26.3.2",
+  "version": "26.3.4",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -79,7 +79,7 @@
     "http-errors": "^2.0.0",
     "json5": "^2.2.3",
     "lodash": "^4.17.21",
-    "lru-cache": "^11.2.1",
+    "lru-cache": "^11.2.2",
     "mime": "^4.0.7",
     "mitata": "^1.0.34",
     "moment-timezone": "^0.5.48",
@@ -108,7 +108,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^7.2.1",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.0",
+    "lint-staged": "^16.2.1",
     "prettier": "^3.6.2",
     "rxjs": "^7.8.2",
     "typescript": "^5.9.2",