@nxtedition/lib 19.8.21 → 19.9.1

package/app.js

@@ -6,7 +6,7 @@ import stream from 'node:stream'
 import { Buffer } from 'node:buffer'
 import { getDockerSecretsSync } from './docker-secrets.js'
 import fp from 'lodash/fp.js'
-import { isMainThread, parentPort, threadId } from 'node:worker_threads'
+import { isMainThread, parentPort, threadId, BroadcastChannel } from 'node:worker_threads'
 import deepstream from '@nxtedition/deepstream.io-client-js'
 import { createLogger } from './logger.js'
 import nconf from 'nconf'
@@ -223,13 +223,25 @@ export function makeApp(appConfig, onTerminate) {
     const interval = 500
     const maxLag = 70
 
-    let currentLag = 0
+    const currentLag$ = new rxjs.BehaviorSubject(0)
+    const appLag$ = new rxjs.BehaviorSubject(0)
 
     const histogram = monitorEventLoopDelay({ resolution })
     histogram.enable()
 
-    setInterval(() => {
-      currentLag = Math.max(0, histogram.mean / 1e6 - resolution)
+    const bc = new BroadcastChannel('nxt:lag')
+
+    const lagMap = new Map()
+    bc.onmessage = ({ data }) => {
+      if (data.currentLag) {
+        lagMap.set(data.threadId, data.currentLag)
+      } else {
+        lagMap.delete(data.threadId)
+      }
+    }
+
+    const intervalHandle = setInterval(() => {
+      let currentLag = Math.max(0, histogram.mean / 1e6 - resolution)
       if (Number.isNaN(currentLag)) {
         currentLag = null
       }
@@ -240,10 +252,26 @@ export function makeApp(appConfig, onTerminate) {
       } else if (currentLag > maxLag) {
         logger?.warn({ currentLag }, 'lag')
       }
+
+      currentLag$.next(currentLag)
+      bc.postMessage({ threadId, currentLag })
+
+      let appLag = currentLag$.value
+      for (const lag of lagMap.values()) {
+        appLag = Math.max(appLag, lag)
+      }
     }, interval).unref()
 
-    toobusy = () => currentLag > maxLag
-    toobusy.lag = () => currentLag
+    destroyers.unshift(() => {
+      clearInterval(intervalHandle)
+      bc.postMessage({ threadId, currentLag: null })
+    })
+
+    toobusy = () => currentLag$.value > maxLag
+    toobusy.lag = () => currentLag$.value
+    toobusy.lag$ = currentLag$
+    toobusy.appLag$ = appLag$
+    toobusy.maxLag = maxLag
   }
 
   if (appConfig.couchdb || appConfig.couch) {
@@ -469,24 +497,16 @@ export function makeApp(appConfig, onTerminate) {
             rx.distinctUntilChanged(fp.isEqual),
             rx.repeatWhen((complete$) => complete$.pipe(rx.delay(10e3))),
           ),
-          toobusy
-            ? rxjs.timer(0, 1e3).pipe(
-                rx.map(() =>
-                  toobusy.lag() > 1e3
-                    ? [
-                        {
-                          id: 'app:toobusy_lag',
-                          level: 40,
-                          code: 'NXT_LAG',
-                          msg: `lag: ${toobusy.lag()}`,
-                        },
-                      ]
-                    : [],
-                ),
-                rx.startWith([]),
-                rx.distinctUntilChanged(fp.isEqual),
-              )
-            : rxjs.of({}),
+          toobusy?.allLag$.pipe(
+            rx.map((lag) => [
+              {
+                id: 'app:toobusy_lag',
+                level: lag > 1e3 ? 50 : lag > toobusy.maxLAge ? 40 : 30,
+                code: 'NXT_LAG',
+                msg: `Lag: ${lag.toFixed(2)} ms`,
+              },
+            ]),
+          ) ?? rxjs.of([]),
           couch
             ? rxjs.timer(0, 10e3).pipe(
                 rx.exhaustMap(async () => {

package/package.json

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