@nxtedition/lib 17.2.7 → 17.2.9

package/app.js

@@ -129,23 +129,24 @@ export function makeApp(appConfig, onTerminate) {
       base: loggerConfig?.base ? { ...loggerConfig.base } : {},
     })
 
-    destroyers.push(
-      () =>
-        new Promise((resolve, reject) =>
-          logger.flush((err) => (err ? reject(err) : resolve(null))),
-        ),
-    )
+    destroyers.push(() => {
+      try {
+        logger.flushSync()
+      } catch (err) {
+        console.error(err)
+      }
+    })
   }
 
   let terminated = false
-  const terminate = async () => {
+  const terminate = async (reason) => {
     if (terminated) {
       return
     }
 
     terminated = true
 
-    logger.info('terminate')
+    logger.info({ reason }, 'terminate')
 
     ac.abort()
 
@@ -157,11 +158,11 @@ export function makeApp(appConfig, onTerminate) {
       }
     }
 
-    for (const { reason } of await Promise.allSettled(
+    for (const { reason: err } of await Promise.allSettled(
       destroyers.filter(Boolean).map((fn) => fn(logger)),
     )) {
-      if (reason) {
-        logger.error({ err: reason }, 'shutdown error')
+      if (err) {
+        logger.error({ err }, 'shutdown error')
       }
     }
 
@@ -176,17 +177,17 @@ export function makeApp(appConfig, onTerminate) {
   }
 
   process
-    .on('beforeExit', terminate)
-    .on('SIGINT', terminate)
-    .on('SIGTERM', terminate)
-    .on('uncaughtExceptionMonitor', terminate)
+    .on('beforeExit', () => terminate('beforeExit'))
+    .on('SIGINT', () => terminate('SIGINT'))
+    .on('SIGTERM', () => terminate('SIGTERM'))
+    .on('uncaughtExceptionMonitor', () => terminate('uncaughtExceptionMonitor'))
 
   logger.debug({ data: JSON.stringify(config, null, 2) }, 'config')
 
   if (!isMainThread && parentPort) {
     parentPort.on('message', ({ type }) => {
       if (type === 'nxt:worker:terminate') {
-        terminate()
+        terminate('nxt:worker:terminate')
       }
     })
   }

package/logger.js

@@ -32,8 +32,12 @@ export function createLogger(
     let flushing = 0
     setInterval(() => {
       if (flushing > 60) {
-        logger.warn('logger is flushing too slow')
-        stream.flushSync()
+        try {
+          logger.warn('logger is flushing too slow')
+          stream.flushSync()
+        } catch (err) {
+          console.error(err)
+        }
       } else {
         flushing++
         stream.flush(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "17.2.7",
+  "version": "17.2.9",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -89,6 +89,7 @@
     "nconf": "^0.12.1",
     "nested-error-stacks": "^2.1.1",
     "object-hash": "^3.0.0",
+    "pino": "^8.17.2",
     "pino-std-serializers": "^6.2.2",
     "qs": "^6.11.1",
     "request-target": "^1.0.2",

package/util/template/javascript.js

@@ -564,16 +564,23 @@ export default function ({ 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)
         }
       })
   })