@nxtedition/lib 28.0.7 → 28.0.9

package/app.js

@@ -635,19 +635,7 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
       stats$ = rxjs.timer(0, 10e3).pipe(rx.map(() => ({})))
     }
 
-    const memoryUsageBC = new BroadcastChannel('nxt:memoryUsage').unref()
-
-    let memoryUsageMap
-    if (isMainThread) {
-      memoryUsageMap = new Map()
-      memoryUsageBC.onmessage = ({ data: { data, id } }) => {
-        memoryUsageMap.set(id, data)
-      }
-    }
-
-    setInterval(() => {
-      memoryUsageBC.postMessage({ data: process.memoryUsage(), id: serviceWorkerId })
-    }, 1e3).unref()
+    let statsMap
 
     const startTime = Date.now()
     stats$ = stats$.pipe(
@@ -679,12 +667,27 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
               totalArrayBuffers: 0,
             }
 
-            if (memoryUsageMap) {
-              for (const memoryUsage of memoryUsageMap.values()) {
-                memory.totalHeapTotal += memoryUsage.heapTotal
-                memory.totalHeapUsed += memoryUsage.heapUsed
-                memory.totalExternal += memoryUsage.external
-                memory.totalArrayBuffers += memoryUsage.arrayBuffers
+            const http = {
+              userAgent,
+              pending: globalThis._nxt_lib_http_pending?.size,
+              totalPending: 0,
+            }
+
+            const undici = {
+              sockets: globalThis.__undici_sockets?.size ?? 0,
+              totalSockets: 0,
+            }
+
+            if (statsMap) {
+              for (const stats of statsMap.values()) {
+                memory.totalHeapTotal += stats.memory?.heapTotal ?? 0
+                memory.totalHeapUsed += stats.memory?.heapUsed ?? 0
+                memory.totalExternal += stats.memory?.external ?? 0
+                memory.totalArrayBuffers += stats.memory?.arrayBuffers ?? 0
+
+                http.totalPending += stats.http?.pending ?? 0
+
+                undici.totalSockets += stats.undici?.sockets ?? 0
               }
             }
 
@@ -700,13 +703,8 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
               resourceLimits,
               utilization: performance.eventLoopUtilization?.(elu2, elu1),
               heap: v8.getHeapStatistics(),
-              http: {
-                userAgent,
-                pending: globalThis._nxt_lib_http_pending?.size,
-              },
-              undici: {
-                sockets: globalThis.__undici_sockets?.size ?? 0,
-              },
+              http,
+              undici,
             }
           }),
         ),
@@ -726,11 +724,20 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
       rx.refCount(),
     )
 
+    const statsBC = new BroadcastChannel('nxt:app:stats').unref()
+    if (isMainThread) {
+      statsMap = new Map()
+      statsBC.onmessage = ({ data: { data, id } }) => {
+        statsMap.set(id, data)
+      }
+    }
+
     monitorProviders.stats$ = stats$
 
     if (process.env.NODE_ENV === 'production') {
       appDestroyers.unshift(
         stats$.pipe(rx.auditTime(10e3)).subscribe((stats) => {
+          statsBC.postMessage({ id: threadId, data: stats })
           logger.debug(stats, 'STATS')
         }),
       )
@@ -779,7 +786,7 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
             rx.repeatWhen((complete$) => complete$.pipe(rx.delay(10e3))),
           ),
           stats$.pipe(
-            rx.map(({ memory, heap, utilization, undici }) => {
+            rx.map(({ memory, heap, utilization, undici, http }) => {
               const messages = []
 
               if (memory?.containerLimit) {
@@ -812,8 +819,16 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
               if (undici) {
                 messages.push({
                   id: 'app:undici_upstream_sockets',
-                  level: undici.sockets > 8192 ? 50 : undici.sockets > 4096 ? 40 : 30,
-                  msg: `Undici: ${undici.sockets} upstream connected`,
+                  level: undici.totalSockets > 8192 ? 50 : undici.totalSockets > 4096 ? 40 : 30,
+                  msg: `Undici: ${undici.totalSockets} upstream connected`,
+                })
+              }
+
+              if (http) {
+                messages.push({
+                  id: 'app:http_pending_requests',
+                  level: http.totalPending > 8192 ? 50 : http.totalPending > 4096 ? 40 : 30,
+                  msg: `HTTP: ${http.totalPending} pending requests`,
                 })
               }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "28.0.7",
+  "version": "28.0.9",
   "license": "UNLICENSED",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -92,5 +92,5 @@
     "pino": ">=7.0.0",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "545d4052432b61ff13ba81fa5a69644cf4901103"
+  "gitHead": "c387129cb7a362f64690cfef28d51ee98f0ab87c"
 }

package/sequence.js

@@ -98,8 +98,8 @@ export class Sequence {
         this.#identity = identity
         for (const part of value) {
           if (typeof part === 'string') {
-            const [sequenceStr, id] = part.split(ID_SEP)
-            const sequence = parseInt(sequenceStr)
+            const [sequenceStr, id] = part.split(ID_SEP, 2)
+            const sequence = Number(sequenceStr)
             this.#parts.push(id, sequence)
             this.#identity = null
             this.#count += part
@@ -116,15 +116,15 @@ export class Sequence {
         }
         assert(this.#identity === 0 || this.#parts.length > 0)
       } else if (typeof value === 'string') {
-        const [countStr, token] = value.split('-')
+        const [countStr, token] = value.split('-', 2)
         if (token) {
           for (const str of token.split('_')) {
             const [sequenceStr, id] = str.split(ID_SEP)
-            const sequence = parseInt(sequenceStr)
+            const sequence = Number(sequenceStr)
             this.#parts.push(id, sequence)
           }
         }
-        this.#count = parseInt(countStr)
+        this.#count = Number(countStr)
         this.#value = value
       } else if (value instanceof Sequence) {
         this.#count = value.#count
@@ -139,10 +139,6 @@ export class Sequence {
         throw new Error('invalid sequence count')
       }
 
-      if (!Array.isArray(this.#parts)) {
-        throw new Error('invalid sequence parts')
-      }
-
       {
         let count = 0
         for (let n = 0; n < this.#parts.length; n += 2) {

package/shared.js

@@ -18,11 +18,22 @@ const HWM_COUNT = 1024 // 1024 items
  * @returns {{sharedState: SharedArrayBuffer, sharedBuffer: SharedArrayBuffer}}
  */
 export function alloc(size) {
+  if (!Number.isInteger(size)) {
+    throw new TypeError('size must be a positive integer')
+  }
+  if (size <= 0) {
+    throw new RangeError('size must be a positive integer')
+  }
+  if (size >= 2 ** 31 - 8) {
+    throw new RangeError('size exceeds maximum of 2GB minus header size')
+  }
+
   return {
     // A small buffer for sharing state (read/write pointers).
     sharedState: new SharedArrayBuffer(128),
     // The main buffer for transferring data.
-    sharedBuffer: new SharedArrayBuffer(size),
+    // We need another 8 bytes for entry headers.
+    sharedBuffer: new SharedArrayBuffer(size + 8),
   }
 }