@nxtedition/lib 19.8.20 → 19.9.0

package/app.js

@@ -223,13 +223,13 @@ export function makeApp(appConfig, onTerminate) {
     const interval = 500
     const maxLag = 70
 
-    let currentLag = 0
+    const currentLag$ = new rxjs.BehaviorSubject(0)
 
     const histogram = monitorEventLoopDelay({ resolution })
     histogram.enable()
 
     setInterval(() => {
-      currentLag = Math.max(0, histogram.mean / 1e6 - resolution)
+      let currentLag = Math.max(0, histogram.mean / 1e6 - resolution)
       if (Number.isNaN(currentLag)) {
         currentLag = null
       }
@@ -240,10 +240,14 @@ export function makeApp(appConfig, onTerminate) {
       } else if (currentLag > maxLag) {
         logger?.warn({ currentLag }, 'lag')
       }
+
+      currentLag$.next(currentLag)
     }, interval).unref()
 
-    toobusy = () => currentLag > maxLag
-    toobusy.lag = () => currentLag
+    toobusy = () => currentLag$.value > maxLag
+    toobusy.lag = () => currentLag$.value
+    toobusy.lag$ = currentLag$
+    toobusy.maxLag = maxLag
   }
 
   if (appConfig.couchdb || appConfig.couch) {
@@ -469,24 +473,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?.lag$.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/couch.js

@@ -488,11 +488,10 @@ export function makeCouch(opts) {
       method,
       body: typeof body === 'object' && body ? JSON.stringify(body) : body,
       headers,
-      dispatcher: client,
     }
 
     return new Promise((resolve, reject) =>
-      dispatch(req, {
+      dispatch(client, req, {
         resolve,
         reject,
         signal,

package/package.json

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