@nxtedition/lib 14.3.2 → 14.3.4

package/http.js

@@ -135,6 +135,8 @@ module.exports.request = async function request(ctx, next) {
         reqLogger.warn('request failed')
       }
 
+      reqLogger.debug('request ended')
+
       res.end()
     } else {
       if (req.aborted || err.name === 'AbortError') {
@@ -145,6 +147,8 @@ module.exports.request = async function request(ctx, next) {
         reqLogger.error('request error')
       }
 
+      reqLogger.debug('request destroyed')
+
       res.destroy()
     }
   }
@@ -206,7 +210,7 @@ module.exports.createServer = function (options, ctx, middleware) {
       requestTimeout: 0,
       ...options,
     },
-    (req, res) => middleware({ req, res, ...factory() })
+    (req, res) => middleware({ req, res, ...factory() }),
   )
 
   server.setTimeout(2 * 60e3)
@@ -256,7 +260,7 @@ module.exports.upgrade = async function upgrade(ctx, next) {
           .on('error', reject)
           .on('timeout', () => {
             reject(new createError.RequestTimeout())
-          })
+          }),
       ),
       new Promise((resolve, reject) =>
         socket
@@ -264,7 +268,7 @@ module.exports.upgrade = async function upgrade(ctx, next) {
           .on('error', reject)
           .on('timeout', () => {
             reject(new createError.RequestTimeout())
-          })
+          }),
       ),
       next(),
     ])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "14.3.2",
+  "version": "14.3.4",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [

package/util/template/index.js

@@ -84,7 +84,7 @@ module.exports = ({ ds, proxify }) => {
     let indices
 
     for (let i = 0; i < template.length; i++) {
-      const resolver = compileTemplate(template[i])
+      const resolver = _compileTemplate(template[i])
       if (resolver) {
         resolvers ??= []
         resolvers.push(resolver)
@@ -121,7 +121,7 @@ module.exports = ({ ds, proxify }) => {
     const keys = Object.keys(template)
 
     for (let i = 0; i < keys.length; i++) {
-      const resolver = compileTemplate(template[keys[i]])
+      const resolver = _compileTemplate(template[keys[i]])
       if (resolver) {
         resolvers ??= []
         resolvers.push(resolver)
@@ -207,7 +207,7 @@ module.exports = ({ ds, proxify }) => {
     return typeof val === 'string' && val.indexOf('{{') !== -1
   }
 
-  const compileTemplateCache = weakCache(
+  const _compileTemplateCache = weakCache(
     (template) => {
       if (fp.isPlainObject(template)) {
         return compileObjectTemplate(template)
@@ -222,9 +222,14 @@ module.exports = ({ ds, proxify }) => {
     (template, hash) => hash,
   )
 
-  function compileTemplate(template) {
+  function _compileTemplate(template) {
     const hash = hashTemplate(template)
-    const resolver = hash ? compileTemplateCache(template, hash) : null
+    const resolver = hash ? _compileTemplateCache(template, hash) : null
+    return resolver // ? (args$) => resolver(template, args$) : null
+  }
+
+  function compileTemplate(template) {
+    const resolver = _compileTemplate(template)
     return resolver ? (args$) => resolver(template, args$) : null
   }
 
@@ -234,7 +239,7 @@ module.exports = ({ ds, proxify }) => {
 
   function onResolveTemplate(template, args$) {
     try {
-      return compileTemplate(template)?.(args$) ?? rxjs.of(template)
+      return _compileTemplate(template)?.(template, args$) ?? rxjs.of(template)
     } catch (err) {
       return rxjs.throwError(() => err)
     }

package/util/template/javascript.js

@@ -539,16 +539,23 @@ module.exports = ({ ds, proxify, compiler }) => {
       }
     `)
     } catch (err) {
-      throw Object.assign(new Error(`failed to parse expression ${expression}`), { cause: err })
+      return () =>
+        rxjs.throwError(
+          Object.assign(new Error(`failed to parse expression ${expression}`), { cause: err }),
+        )
     }
 
     const context = vm.createContext({ ...globals })
 
     return (args) =>
       new rxjs.Observable((o) => {
-        const exp = new Expression(context, script, expression, args, o)
-        return () => {
-          exp._destroy()
+        try {
+          const exp = new Expression(context, script, expression, args, o)
+          return () => {
+            exp._destroy()
+          }
+        } catch (err) {
+          o.error(err)
         }
       })
   })