@nxtedition/lib 16.0.12 → 17.0.0

package/app.js

@@ -3,7 +3,6 @@ import net from 'node:net'
 import stream from 'node:stream'
 import { Buffer } from 'node:buffer'
 import { getDockerSecretsSync } from './docker-secrets.js'
-import { getGlobalDispatcher } from 'undici'
 import fp from 'lodash/fp.js'
 import { isMainThread, parentPort } from 'node:worker_threads'
 import toobusy from 'toobusy-js'
@@ -116,57 +115,63 @@ export function makeApp(appConfig, onTerminate) {
       } (module:${serviceModule}; instance:${serviceInstanceId}) Node/${process.version}`) ??
     null)
 
-  const terminate = async (finalLogger) => {
-    finalLogger ??= logger
+  {
+    const loggerConfig = { ...appConfig.logger, ...config.logger }
+
+    logger = createLogger({
+      ...loggerConfig,
+      name: serviceName,
+      module: serviceModule,
+      base: loggerConfig?.base ? { ...loggerConfig.base } : {},
+    })
+
+    destroyers.push(
+      () =>
+        new Promise((resolve, reject) =>
+          logger.flush((err) => (err ? reject(err) : resolve(null))),
+        ),
+    )
+  }
+
+  let terminated = false
+  const terminate = async () => {
+    if (terminated) {
+      return
+    }
+
+    terminated = true
 
     ac.abort()
 
-    try {
-      if (onTerminate) {
-        try {
-          await onTerminate(finalLogger)
-        } catch (err) {
-          finalLogger.error({ err }, 'terminate error')
-        }
+    if (onTerminate) {
+      try {
+        await onTerminate(logger)
+      } catch (err) {
+        logger.error({ err }, 'terminate error')
       }
+    }
 
-      const dispatcher = getGlobalDispatcher()
-      if (dispatcher?.close) {
-        destroyers.push(async () => {
-          const timeout = setTimeout(() => {
-            dispatcher.destroy()
-          }, 4e3)
-          await dispatcher.close()
-          clearTimeout(timeout)
-        })
+    for (const { reason } of await Promise.allSettled(
+      destroyers.filter(Boolean).map((fn) => fn(logger)),
+    )) {
+      if (reason) {
+        logger.error({ err: reason }, 'shutdown error')
       }
-
-      await Promise.all(destroyers.filter(Boolean).map((fn) => fn(finalLogger)))
-    } catch (err) {
-      finalLogger.error({ err }, 'shutdown error')
     }
-  }
 
-  {
-    const loggerConfig = { ...appConfig.logger, ...config.logger }
-
-    logger = createLogger(
-      {
-        ...loggerConfig,
-        name: serviceName,
-        module: serviceModule,
-        base: loggerConfig?.base ? { ...loggerConfig.base } : {},
-      },
-      terminate,
-    )
+    setTimeout(() => {
+      process.exit(0)
+    }, 10e3).unref()
   }
 
+  process.on('beforeExit', terminate).on('SIGINT', terminate).on('SIGTERM', terminate)
+
   logger.debug({ data: JSON.stringify(config, null, 2) }, 'config')
 
   if (!isMainThread && parentPort) {
     parentPort.on('message', ({ type }) => {
       if (type === 'nxt:worker:terminate') {
-        terminate(null)
+        terminate()
       }
     })
   }

package/logger.js

@@ -1,9 +1,7 @@
-import fs from 'node:fs'
-import util from 'node:util'
+import assert from 'node:assert'
 import { isMainThread } from 'node:worker_threads'
 import serializers from './serializers.js'
 import pino from 'pino'
-import xuid from 'xuid'
 
 const isProduction = process.env.NODE_ENV === 'production'
 
@@ -11,6 +9,8 @@ export function createLogger(
   { level = isProduction ? 'debug' : 'trace', flushInterval = 1e3, stream = null, ...options } = {},
   onTerminate,
 ) {
+  assert(!onTerminate)
+
   if (!stream) {
     if (
       process.stdout.write !== process.stdout.constructor.prototype.write ||
@@ -55,49 +55,5 @@ export function createLogger(
     stream,
   )
 
-  let called = false
-  const finalHandler = async (err, evt) => {
-    if (called) {
-      return
-    }
-    called = true
-
-    try {
-      fs.writeFileSync(`/tmp/${new Date()}-${xuid()}`, util.inspect(err), 'utf8')
-    } catch {
-      // Do nothing...
-    }
-
-    if (err) {
-      if (!(err instanceof Error)) {
-        err = new Error(err)
-      }
-      logger.fatal({ err }, evt || 'error caused exit')
-
-      logger.flush()
-    } else {
-      logger.info(`${evt} caught`)
-
-      let exitSignal
-      try {
-        exitSignal = onTerminate ? await onTerminate(logger) : null
-      } catch (err) {
-        exitSignal = err.exitSignal || 1
-        logger.warn({ err })
-      }
-
-      logger.info({ exitSignal }, 'exit')
-
-      logger.flush()
-    }
-  }
-
-  process.on('exit', () => finalHandler(null, 'exit'))
-  process.on('beforeExit', () => finalHandler(null, 'beforeExit'))
-  process.on('SIGINT', () => finalHandler(null, 'SIGINT'))
-  process.on('SIGQUIT', () => finalHandler(null, 'SIGQUIT'))
-  process.on('SIGTERM', () => finalHandler(null, 'SIGTERM'))
-  process.on('uncaughtException', (err, origin) => finalHandler(err, origin))
-
   return logger
 }

package/package.json

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