@nxtedition/lib 21.0.17 → 21.0.19

package/http.js

@@ -24,22 +24,17 @@ export function genReqId() {
   return `req-${nextReqId.toString(36)}`
 }
 
-let reqTimeoutError
-let resTimeoutError
+let timeoutError
 
-function onRequestTimeout() {
-  this.destroy((reqTimeoutError ??= new createError.RequestTimeout()))
-}
-
-function onResponseTimeout() {
-  this.destroy((resTimeoutError ??= new createError.RequestTimeout()))
+function onTimeout() {
+  this.destroy((timeoutError ??= new createError.RequestTimeout()))
 }
 
 export async function request(ctx, next) {
   const { req, res, logger } = ctx
   const startTime = performance.now()
 
-  const ac = new AbortController()
+  const ac = ctx.signal !== undefined ? null : new AbortController()
 
   let reqLogger = logger
   try {
@@ -49,11 +44,14 @@ export async function request(ctx, next) {
     }
 
     ctx.id = req.id = res.id = req.headers['request-id'] || genReqId()
-    ctx.signal = ac.signal
     ctx.method = req.method
     ctx.query = ctx.url.search.length > 1 ? querystring.parse(ctx.url.search.slice(1)) : {}
     ctx.logger = req.log = res.log = logger.child({ req: { id: req.id, url: req.url } })
 
+    if (ac) {
+      ctx.signal = ac.signal
+    }
+
     if (req.method === 'GET' || req.method === 'HEAD') {
       req.resume() // Dump the body if there is one.
     }
@@ -67,17 +65,12 @@ export async function request(ctx, next) {
       reqLogger.debug('request started')
     }
 
-    try {
-      await Promise.all([
-        next(),
-        new Promise((resolve, reject) => {
-          req.on('timeout', onRequestTimeout).on('error', reject)
-          res.on('timeout', onResponseTimeout).on('error', reject).on('close', resolve)
-        }),
-      ])
-    } finally {
-      ac.abort()
-    }
+    await Promise.all([
+      next(),
+      new Promise((resolve, reject) => {
+        res.on('timeout', onTimeout).on('error', reject).on('close', resolve)
+      }),
+    ])
 
     const elapsedTime = Math.ceil(performance.now() - startTime)
 
@@ -93,6 +86,8 @@ export async function request(ctx, next) {
       reqLogger.debug({ res, elapsedTime }, 'request completed')
     }
   } catch (err) {
+    ac?.abort(err)
+
     const statusCode = err.statusCode || err.$metadata?.httpStatusCode || 500
     const responseTime = Math.ceil(performance.now() - startTime)
 
@@ -380,6 +375,8 @@ export async function upgrade(ctx, next) {
 
     reqLogger.debug('stream completed')
   } catch (err) {
+    ac?.abort(err)
+
     const statusCode = err.statusCode || 500
 
     if (aborted || err.name === 'AbortError' || err.code === 'ERR_STREAM_PREMATURE_CLOSE') {

package/package.json

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

package/util/template/index.js

@@ -51,7 +51,9 @@ export function makeTemplateCompiler({ ds, proxify }) {
   }
 
   const hashTemplate = (template, prefix) => {
-    if (fp.isPlainObject(template)) {
+    if (typeof template === 'string') {
+      return isTemplate(template) ? objectHash([prefix, template]) : ''
+    } else if (fp.isPlainObject(template)) {
       let hashes
       for (const key of Object.keys(template)) {
         const hash = hashTemplate(template[key], key)
@@ -71,8 +73,6 @@ export function makeTemplateCompiler({ ds, proxify }) {
         }
       }
       return hashes ? objectHash([prefix, hashes]) : ''
-    } else if (isTemplate(template)) {
-      return objectHash([prefix, template])
     } else {
       return ''
     }
@@ -236,8 +236,9 @@ export function makeTemplateCompiler({ ds, proxify }) {
     return resolver ? (args$) => resolver(template, args$) : null
   }
 
-  async function resolveTemplate(template, args$, options) {
-    return firstValueFrom(onResolveTemplate(template, args$), options)
+  function resolveTemplate(template, args$, options) {
+    const expr = _compileTemplate(template)
+    return expr ? firstValueFrom(expr(template, args$), options) : template
   }
 
   function onResolveTemplate(template, args$) {