@nxtedition/lib 21.0.9 → 21.0.10

package/app.js

@@ -255,9 +255,9 @@ export function makeApp(appConfig, onTerminate) {
 
     const lagMap = new LRUCache({ ttl: 10e3, max: 1024 })
 
-    const bc = new BroadcastChannel('nxt:lag')
+    const lagBC = new BroadcastChannel('nxt:lag')
 
-    bc.onmessage = ({ data }) => {
+    lagBC.onmessage = ({ data }) => {
       lagMap.set(data.id, data.currentLag)
     }
 
@@ -267,7 +267,7 @@ export function makeApp(appConfig, onTerminate) {
       }
     })
 
-    const intervalHandle = setInterval(() => {
+    setInterval(() => {
       let currentLag = Math.max(0, histogram.mean / 1e6 - resolution)
       if (Number.isNaN(currentLag)) {
         currentLag = 0
@@ -281,8 +281,7 @@ export function makeApp(appConfig, onTerminate) {
       }
 
       currentLag$.next(currentLag)
-      bc.postMessage({ id, currentLag })
-
+      lagBC.postMessage({ id, currentLag })
       process.send?.({ type: 'nxt:lag', id, currentLag })
 
       let appLag = currentLag$.value ?? 0
@@ -292,11 +291,6 @@ export function makeApp(appConfig, onTerminate) {
       appLag$.next(appLag)
     }, interval).unref()
 
-    destroyers.unshift(() => {
-      clearInterval(intervalHandle)
-      bc.postMessage({ id, currentLag: null })
-    })
-
     toobusy = () => currentLag$.value > maxLag
     toobusy.lag = () => currentLag$.value
     toobusy.lag$ = currentLag$
@@ -471,6 +465,7 @@ export function makeApp(appConfig, onTerminate) {
           rx.pairwise(),
           rx.map(([elu1, elu2]) => {
             const memory = process.memoryUsage()
+            const cpu = process.cpuUsage()
 
             let totalMemory
             if (memoryUsageMap) {
@@ -494,6 +489,7 @@ export function makeApp(appConfig, onTerminate) {
               couch: couch?.stats,
               lag: toobusy?.lag(),
               version: process.version,
+              cpu,
               memory,
               totalMemory,
               utilization: performance.eventLoopUtilization?.(elu2, elu1),
@@ -569,14 +565,18 @@ export function makeApp(appConfig, onTerminate) {
             rx.repeatWhen((complete$) => complete$.pipe(rx.delay(10e3))),
           ),
           toobusy?.appLag$.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`,
-              },
-            ]),
+            rx.map((lag) =>
+              lag == null
+                ? []
+                : [
+                    {
+                      id: 'app:toobusy_lag',
+                      level: lag > 1e3 ? 50 : lag > toobusy.maxLag ? 40 : 30,
+                      code: 'NXT_LAG',
+                      msg: `Lag: ${lag.toFixed(2)} ms`,
+                    },
+                  ],
+            ),
           ) ?? rxjs.of([]),
           couch
             ? rxjs.timer(0, 10e3).pipe(

package/couch.js

@@ -948,29 +948,36 @@ class StreamOutput extends stream.Readable {
     lines[0] = this.#str + lines[0]
     this.#str = lines.pop() ?? ''
 
-    let ret = true
-    for (const line of lines) {
-      if (!line) {
-        continue
-      }
-      if (this.#state === 0) {
-        if (line.endsWith('[')) {
-          this.#state = 1
-        } else {
-          throw new Error('unexpected data')
+    try {
+      let ret = true
+      for (const line of lines) {
+        if (!line) {
+          continue
         }
-      } else if (this.#state === 1) {
-        if (line.startsWith(']')) {
-          this.#state = 2
-        } else {
-          const row = JSON.parse(line.slice(0, line.lastIndexOf('}') + 1))
-          if (!this.push(row)) {
-            ret = false
+        if (this.#state === 0) {
+          if (/\[\s*$/.test(line)) {
+            this.#state = 1
+          } else {
+            throw Object.assign('expected [ at end of line')
+          }
+        } else if (this.#state === 1) {
+          if (/^\s*\]/.test(line)) {
+            this.#state = 2
+          } else {
+            const row = JSON.parse(line.slice(0, line.lastIndexOf('}') + 1))
+            if (!this.push(row)) {
+              ret = false
+            }
           }
         }
       }
+      return ret
+    } catch (err) {
+      throw Object.assign(new Error('invalid data'), {
+        data: lines.join('\n') + this.#str,
+        cause: err,
+      })
     }
-    return ret
   }
 
   onComplete() {

package/package.json

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