@nxtedition/lib 23.9.17 → 23.10.0

package/app.js

@@ -37,6 +37,7 @@ import { LRUCache } from 'lru-cache'
 import xuid from 'xuid'
 import { isTimeBetween } from './time.js'
 import makeUnderPressure from './under-pressure.js'
+import undici from '@nxtedition/undici'
 
 export function makeApp(appConfig, onTerminate) {
   let ds
@@ -346,13 +347,15 @@ export function makeApp(appConfig, onTerminate) {
   let underPressure
   if (appConfig.underPressure) {
     underPressure = makeUnderPressure(appConfig.underPressure)
-    underPressure.pressure$.subscribe((pressure) => {
-      if (pressure) {
-        logger?.warn({ pressure }, 'pressure triggered')
-      } else {
-        logger?.debug('pressure cleared')
-      }
-    })
+    if (underPressure) {
+      underPressure.pressure$.subscribe((pressure) => {
+        if (pressure) {
+          logger?.warn({ pressure }, 'pressure triggered')
+        } else {
+          logger?.debug('pressure cleared')
+        }
+      })
+    }
   }
 
   if (appConfig.couchdb || appConfig.couch) {
@@ -477,6 +480,65 @@ export function makeApp(appConfig, onTerminate) {
     compiler = makeTemplateCompiler({ ds, logger, ...appConfig.compiler })
   }
 
+  const undiciDefaults = {
+    connected: 0,
+    disconnected: 0,
+    connections: 0,
+  }
+
+  const undici$ = new rxjs.BehaviorSubject(undiciDefaults)
+  {
+    function onConnect(origin, targets) {
+      const stats = { ...undici$.value }
+      stats.connected++
+      stats.connections = stats.connected - stats.disconnected
+      undici$.next(stats)
+      logger.debug({ url: origin, count: stats.connected }, 'upstream connect')
+    }
+
+    function onDisconnect(origin, targets, err) {
+      const stats = { ...undici$.value }
+      stats.connected--
+      stats.connections = stats.connected - stats.disconnected
+      undici$.next(stats)
+      logger.debug({ url: origin, count: stats.connected }, 'upstream disconnect')
+    }
+
+    let currentDispatcher
+    function maybeRegisterUndiciStats() {
+      const nextDispatcher = undici.getGlobalDispatcher()
+
+      if (nextDispatcher === currentDispatcher) {
+        return
+      }
+
+      if (currentDispatcher) {
+        currentDispatcher.off('connect', onConnect).off('disconnect', onDisconnect)
+        currentDispatcher = null
+      }
+
+      undici$.next(undiciDefaults)
+
+      nextDispatcher.on('connect', onConnect).on('disconnect', onDisconnect)
+
+      currentDispatcher = nextDispatcher
+    }
+
+    let undiciInterval = setInterval(() => maybeRegisterUndiciStats(), 10e3).unref()
+
+    destroyers.push(() => {
+      if (undiciInterval) {
+        clearInterval(undiciInterval)
+        undiciInterval = null
+      }
+
+      if (currentDispatcher) {
+        currentDispatcher.off('connect', onConnect).off('disconnect', onDisconnect)
+        currentDispatcher = null
+      }
+    })
+  }
+
   const monitorProviders = {}
 
   let stats$
@@ -566,9 +628,11 @@ export function makeApp(appConfig, onTerminate) {
             }
           }),
         ),
+        undici$,
       ),
-      rx.map(([serviceStats, appStats]) => ({
+      rx.map(([serviceStats, appStats, undiciStats]) => ({
         ...appStats,
+        undici: undici$,
         [serviceName]: serviceStats,
       })),
       rx.retryWhen((err$) =>
@@ -634,6 +698,17 @@ export function makeApp(appConfig, onTerminate) {
             rx.distinctUntilChanged(fp.isEqual),
             rx.repeatWhen((complete$) => complete$.pipe(rx.delay(10e3))),
           ),
+          undici$.pipe(
+            rx.map((stats) => {
+              return [
+                {
+                  id: 'app:undici_upstream_connections',
+                  level: stats.connections > 8192 ? 50 : stats.connections > 4096 ? 40 : 30,
+                  msg: `Undici: ${stats.connections} upstream connected`,
+                },
+              ]
+            }),
+          ),
           toobusy?.appLag$.pipe(
             rx.map((lag) =>
               lag == null
@@ -648,7 +723,7 @@ export function makeApp(appConfig, onTerminate) {
                   ],
             ),
           ) ?? rxjs.of([]),
-          underPressure?.pressure$.pipe(
+          underPressure?.pressure$?.pipe(
             rx.map((pressure) =>
               pressure == null
                 ? []
@@ -1013,7 +1088,7 @@ export function makeApp(appConfig, onTerminate) {
     utilsBC.unref()
 
     function writeHeapSnapshot() {
-      const snapshotPath = `${os.tmpdir()}/heap-${Date.now()}-${serviceName}-${serviceModule}-${serviceInstanceId}-${serviceWorkerId}.heapsnapshot`
+      const snapshotPath = `${os.tmpdir()}/heap-${Date.now()}-${serviceName}-${serviceModule}-${serviceInstanceId}-${serviceWorkerId}-${threadId}.heapsnapshot`
       v8.writeHeapSnapshot(snapshotPath)
       logger.info({ snapshotPath }, 'heap snapshot')
     }

package/package.json

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