@nxtedition/lib 26.0.20 → 26.0.22

package/http.js

@@ -13,6 +13,8 @@ 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.
@@ -144,10 +146,12 @@ 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) {
-      ctx.logger?.debug({ req }, 'request started')
+      reqLogger?.debug({ req }, 'request started')
     }
 
     const thenable = next()
@@ -165,15 +169,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')
+      reqLogger?.error({ err: socket.errored, req, socket, elapsedTime }, 'stream error')
     } else if (!socket.writableEnded) {
-      ctx.logger?.debug({ socket, elapsedTime }, 'stream aborted')
+      reqLogger?.debug({ socket, elapsedTime }, 'stream aborted')
     } else if (socket.statusCode >= 500) {
-      ctx.logger?.error({ socket, elapsedTime }, 'stream error')
+      reqLogger?.error({ socket, elapsedTime }, 'stream error')
     } else if (socket.statusCode >= 400) {
-      ctx.logger?.warn({ socket, elapsedTime }, 'stream failed')
+      reqLogger?.warn({ socket, elapsedTime }, 'stream failed')
     } else {
-      ctx.logger?.debug({ socket, elapsedTime }, 'stream completed')
+      reqLogger?.debug({ socket, elapsedTime }, 'stream completed')
     }
   } catch (err) {
     ctx[kAbortController]?.abort(err)
@@ -182,17 +186,18 @@ 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')
+      reqLogger?.debug({ err, req, socket, elapsedTime }, 'stream aborted')
     } else if (statusCode < 500) {
-      ctx.logger?.warn({ err, req, socket, elapsedTime }, 'stream failed')
+      reqLogger?.warn({ err, req, socket, elapsedTime }, 'stream failed')
     } else {
-      ctx.logger?.error({ err, req, socket, elapsedTime }, 'stream error')
+      reqLogger?.error({ err, req, socket, elapsedTime }, 'stream error')
     }
     socket.destroy(err)
   } finally {
+    pending.delete(ctx)
     if (!socket.writableEnded && !socket.destroyed) {
       socket.destroy()
-      ctx.logger?.warn('socket destroyed')
+      reqLogger?.warn('socket destroyed')
     }
   }
 }
@@ -201,10 +206,12 @@ export async function requestMiddleware(ctx, next) {
   const { req, res, target } = ctx
   const startTime = performance.now()
 
+  const reqLogger = ctx.logger?.child({ req })
+  pending.add(ctx)
   try {
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
     if (!isHealthcheck) {
-      ctx.logger?.debug({ req }, 'request started')
+      reqLogger?.debug({ req }, 'request started')
     }
 
     if (!target) {
@@ -254,15 +261,15 @@ export async function requestMiddleware(ctx, next) {
     if (isHealthcheck) {
       // Do nothing...
     } else if (res.errored) {
-      ctx.logger?.error({ err: res.errored, res, elapsedTime }, 'request error')
+      reqLogger?.error({ err: res.errored, res, elapsedTime }, 'request error')
     } else if (!res.writableEnded) {
-      ctx.logger?.debug({ res, elapsedTime }, 'request aborted')
+      reqLogger?.debug({ res, elapsedTime }, 'request aborted')
     } else if (res.statusCode >= 500) {
-      ctx.logger?.error({ res, elapsedTime }, 'request error')
+      reqLogger?.error({ res, elapsedTime }, 'request error')
     } else if (res.statusCode >= 400) {
-      ctx.logger?.warn({ res, elapsedTime }, 'request failed')
+      reqLogger?.warn({ res, elapsedTime }, 'request failed')
     } else {
-      ctx.logger?.debug({ res, elapsedTime }, 'request completed')
+      reqLogger?.debug({ res, elapsedTime }, 'request completed')
     }
   } catch (err) {
     ctx[kAbortController]?.abort(err)
@@ -302,7 +309,7 @@ export async function requestMiddleware(ctx, next) {
           }
         }
       } else if (err.headers != null) {
-        ctx.logger?.warn({ req, err }, 'invalid headers')
+        reqLogger?.warn({ req, err }, 'invalid headers')
       }
 
       if (fp.isPlainObject(err.body)) {
@@ -317,21 +324,22 @@ export async function requestMiddleware(ctx, next) {
       }
 
       if (statusCode < 500) {
-        ctx.logger?.warn({ req, res, err, elapsedTime }, 'request failed')
+        reqLogger?.warn({ req, res, err, elapsedTime }, 'request failed')
       } else {
-        ctx.logger?.error({ req, res, err, elapsedTime }, 'request error')
+        reqLogger?.error({ req, 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')
+        reqLogger?.debug({ req, res, err, elapsedTime }, 'request aborted')
       } else if (statusCode < 500) {
-        ctx.logger?.warn({ req, res, err, elapsedTime }, 'request failed')
+        reqLogger?.warn({ req, res, err, elapsedTime }, 'request failed')
       } else {
-        ctx.logger?.error({ req, res, err, elapsedTime }, 'request error')
+        reqLogger?.error({ req, res, err, elapsedTime }, 'request error')
       }
       res.destroy(err)
     }
   } finally {
+    pending.delete(ctx)
     if (res.writableEnded || res.destroyed || res.stream?.destroyed) {
       // Do nothing..
     } else {
@@ -726,6 +734,7 @@ export async function request(ctx, next) {
 
   let reqLogger = logger
 
+  pending.add(ctx)
   try {
     ctx.url = requestTarget(req)
     if (!ctx.url) {
@@ -835,6 +844,7 @@ export async function request(ctx, next) {
       }
     }
   } finally {
+    pending.delete(ctx)
     if (!res.writableEnded) {
       res.destroy()
       logger.debug('request destroyed')
@@ -912,6 +922,7 @@ export async function upgrade(ctx, next) {
 
   let aborted = false
   let reqLogger = logger
+  pending.add(ctx)
   try {
     ctx.url = requestTarget(req)
     if (!ctx.url) {
@@ -976,6 +987,7 @@ 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.0.20",
+  "version": "26.0.22",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/util/template/index-common.js

@@ -209,7 +209,7 @@ export function makeTemplateCompiler({ ds, proxify, logger, platform }) {
     return resolver ? (args$) => resolver(template, args$) : null
   }
 
-  function resolveTemplate(template, args$, options) {
+  async function resolveTemplate(template, args$, options) {
     const expr = _compileTemplate(template)
     return expr ? firstValueFrom(expr(template, args$), options) : template
   }