@nxtedition/lib 21.0.16 → 21.0.18

package/http.js

@@ -67,24 +67,19 @@ export async function request(ctx, next) {
       reqLogger.debug('request started')
     }
 
-    await Promise.all([
-      next(),
-      new Promise((resolve, reject) => {
-        req.on('timeout', onRequestTimeout).on('error', reject)
-        res
-          .on('timeout', onResponseTimeout)
-          .on('error', reject)
-          // TODO (fix): Use 'end' once we can trust that
-          // 'end' or 'error' will always be emitted.
-          .on('close', function () {
-            this.log.debug('request closed')
-            resolve(null)
-            ac.abort()
-          })
-      }),
-    ])
+    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()
+    }
 
-    const elapsedTime = Math.round(performance.now() - startTime)
+    const elapsedTime = Math.ceil(performance.now() - startTime)
 
     if (isHealthcheck) {
       // Do nothing...
@@ -99,7 +94,7 @@ export async function request(ctx, next) {
     }
   } catch (err) {
     const statusCode = err.statusCode || err.$metadata?.httpStatusCode || 500
-    const responseTime = Math.round(performance.now() - startTime)
+    const responseTime = Math.ceil(performance.now() - startTime)
 
     if (!res.headersSent && !res.destroyed) {
       res.statusCode = statusCode
@@ -129,24 +124,20 @@ export async function request(ctx, next) {
         res.write(JSON.stringify(err.body))
       }
 
-      reqLogger = reqLogger.child({ res, err, responseTime })
-
       if (statusCode < 500) {
-        reqLogger.warn('request failed')
+        reqLogger.warn({ res, err, responseTime }, 'request failed')
       } else {
-        reqLogger.error('request error')
+        reqLogger.error({ res, err, responseTime }, 'request error')
       }
 
       res.end()
     } else {
-      reqLogger = reqLogger.child({ res, err, responseTime })
-
       if (req.aborted || !res.writableEnded || err.name === 'AbortError') {
-        reqLogger.debug('request aborted')
+        reqLogger.debug({ res, err, responseTime }, 'request aborted')
       } else if (statusCode < 500) {
-        reqLogger.warn('request failed')
+        reqLogger.warn({ res, err, responseTime }, 'request failed')
       } else {
-        reqLogger.error('request error')
+        reqLogger.error({ res, err, responseTime }, 'request error')
       }
 
       if (!res.writableEnded) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "21.0.16",
+  "version": "21.0.18",
   "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$) {