@nxtedition/lib 21.0.2 → 21.0.4

package/app.js

@@ -441,6 +441,16 @@ export function makeApp(appConfig, onTerminate) {
       stats$ = rxjs.timer(0, 10e3).pipe(rx.map(() => ({})))
     }
 
+    const memoryUsageBC = new BroadcastChannel('nxt:memoryUsage')
+
+    let memoryUsageMap
+    if (isMainThread) {
+      memoryUsageMap = new Map()
+      memoryUsageBC.onmessage = ({ data, id }) => {
+        memoryUsageMap.set(id, data)
+      }
+    }
+
     const startTime = Date.now()
     stats$ = stats$.pipe(
       rx.map((x) => ({
@@ -453,15 +463,40 @@ export function makeApp(appConfig, onTerminate) {
         rxjs.timer(0, 1e3).pipe(
           rx.map(() => performance.eventLoopUtilization?.()),
           rx.pairwise(),
-          rx.map(([elu1, elu2]) => ({
-            ds: ds?.stats,
-            couch: couch?.stats,
-            lag: toobusy?.lag(),
-            version: process.version,
-            memory: process.memoryUsage(),
-            utilization: performance.eventLoopUtilization?.(elu2, elu1),
-            heap: v8.getHeapStatistics(),
-          })),
+          rx.map(([elu1, elu2]) => {
+            const memory = process.memoryUsage()
+
+            memoryUsageBC.postMessage({ data: memory, id: threadId })
+
+            let totalMemory
+            if (memoryUsageMap) {
+              totalMemory = {
+                rss: 0,
+                heapTotal: 0,
+                heapUsed: 0,
+                external: 0,
+                arrayBuffers: 0,
+              }
+              for (const memoryUsage of memoryUsageMap.values()) {
+                totalMemory.rss += memoryUsage.rss
+                totalMemory.heapTotal += memoryUsage.heapTotal
+                totalMemory.heapUsed += memoryUsage.heapUsed
+                totalMemory.external += memoryUsage.external
+                totalMemory.arrayBuffers += memoryUsage.arrayBuffers
+              }
+            }
+
+            return {
+              ds: ds?.stats,
+              couch: couch?.stats,
+              lag: toobusy?.lag(),
+              version: process.version,
+              memory,
+              totalMemory,
+              utilization: performance.eventLoopUtilization?.(elu2, elu1),
+              heap: v8.getHeapStatistics(),
+            }
+          }),
         ),
       ),
       rx.map(([serviceStats, appStats]) => ({

package/couch.js

@@ -988,7 +988,6 @@ class PromiseOutput {
   #reject
   #str
   #decoder
-  #headers
   #signal
   #abort
 
@@ -1010,12 +1009,10 @@ class PromiseOutput {
     }
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusText, headers = parseHeaders(rawHeaders)) {
+  onHeaders(statusCode, rawHeaders, resume, statusText) {
     if (statusCode >= 300 || statusCode < 200) {
       throw new Error('invalid status code: ' + statusCode)
     }
-
-    this.#headers = headers
   }
 
   onData(data) {
@@ -1024,9 +1021,11 @@ class PromiseOutput {
 
   onComplete() {
     this.#str += this.#decoder.decode(undefined, { stream: false })
-
-    const val = Object.assign(JSON.parse(this.#str), { headers: this.#headers })
-    this.#onDone(null, val)
+    try {
+      this.#onDone(null, JSON.parse(this.#str))
+    } catch (err) {
+      this.#onDone(Object.assign(new Error('invalid json'), { data: this.#str, cause: err }))
+    }
   }
 
   onError(err) {

package/deepstream.js

@@ -49,6 +49,7 @@ function provide(ds, domain, callback, options) {
   return ds.record.provide(
     `${idExpr}(?:${domain})(?:[?].*)${options.strict ? '' : '?'}$`,
     (key) => {
+      // TODO (fix): More strict pattern matching...
       const [id, options] = parseKey(key)
       return callback(id, options, key)
     },

package/package.json

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