@nxtedition/lib 26.3.3 → 26.3.5

package/http.js

@@ -199,10 +199,14 @@ export async function upgradeMiddleware(ctx, next) {
 }
 
 export async function requestMiddleware(ctx, next) {
-  const { req, res, target } = ctx
+  const { req, res, target, stats } = ctx
   const startTime = performance.now()
 
   const reqLogger = ctx.logger?.child({ req })
+
+  if (stats?.pending != null) {
+    stats.pending++
+  }
   try {
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
     if (!isHealthcheck) {
@@ -235,14 +239,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
     }
@@ -269,6 +265,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
 
@@ -334,6 +342,10 @@ export async function requestMiddleware(ctx, next) {
       res.destroy(err)
     }
   } finally {
+    if (stats?.pending != null) {
+      stats.pending--
+    }
+
     if (res.writableEnded || res.destroyed || res.stream?.destroyed) {
       // Do nothing..
     } else {

package/package.json

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