@nxtedition/lib 28.0.24 → 28.0.26

package/app.js

@@ -1,6 +1,7 @@
 import { readFileSync } from 'node:fs'
 import * as inspector from 'node:inspector'
 import fs from 'node:fs'
+import util from 'node:util'
 import os from 'node:os'
 import http from 'node:http'
 import net from 'node:net'
@@ -40,6 +41,7 @@ import makeUnderPressure from './under-pressure.js'
 import { nice } from '@nxtedition/sched'
 import { setAffinity } from './numa.js'
 import { getContainerMemoryLimit, getContainerMemoryUsage } from './memory.js'
+import { serializeError } from './errors.js'
 
 /**
  * @param {object} appConfig
@@ -688,6 +690,8 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
               sockets: globalThis.__undici_sockets?.size ?? 0,
             }
 
+            const errors = []
+
             if (statsMap) {
               memory.totalHeapTotal = 0
               memory.totalHeapUsed = 0
@@ -707,6 +711,10 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
                 http.totalPending += stats.http?.pending ?? 0
 
                 undici.totalSockets += stats.undici?.sockets ?? 0
+
+                if (stats.error) {
+                  errors.push(stats.error)
+                }
               }
             }
 
@@ -718,6 +726,9 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
               couch: couch?.stats,
               lag: toobusy?.lag(),
               version: process.version,
+              error: errors.length
+                ? serializeError(errors.length > 1 ? new AggregateError(errors) : errors[0])
+                : null,
               underPressure: underPressure?.isUnderPressure() ? underPressure.getPressure() : null,
               cpu,
               memory,
@@ -757,7 +768,15 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
     appDestroyers.unshift(
       monitorProviders.stats$
         .subscribe((stats) => {
-          statsBC.postMessage({ id: threadId, data: stats })
+          try {
+            statsBC.postMessage({ id: threadId, data: stats })
+          } catch (err) {
+            statsBC.postMessage({ id: threadId, data: { error: serializeError(err) } })
+            logger.error(
+              { err, data: util.inspect(stats, { depth: 16 }) },
+              'stats broadcast failed',
+            )
+          }
         })
         .add(() => {
           statsBC.postMessage({ id: threadId, data: undefined })
@@ -823,18 +842,25 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
                   }
                 }
               }
-              return { messages }
+              return messages
             }),
           ),
           status$.pipe(
-            rxjs.filter(Boolean),
-            rxjs.map((xs) => (Array.isArray(xs) ? { messages: xs } : xs)),
-            makeStatusPipe('stats'),
+            rxjs.map((xs) => [xs, xs?.messages].find(Array.isArray) ?? []),
+            makeStatusPipe('status'),
           ),
           monitorProviders.stats$?.pipe(
-            rxjs.map(({ memory, heap, utilization, undici, http }) => {
+            rxjs.map(({ memory, heap, utilization, undici, http, error }) => {
               const messages = []
 
+              if (error) {
+                messages.push({
+                  id: 'app:monitor_stats_error',
+                  level: 50,
+                  msg: `Monitor Stats Error: ${error.message}`,
+                })
+              }
+
               if (memory?.containerLimit) {
                 const usagePercent = (memory.containerUsage / memory.containerLimit) * 100
                 messages.push({
@@ -1021,17 +1047,8 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
         ])
         .pipe(
           rxjs.auditTime(1e3),
-          rxjs.map(([status, lag, couch, ds]) => {
-            const messages = [
-              lag,
-              couch,
-              ds,
-              [
-                status?.messages,
-                fp.map((x) => (fp.isString(x) ? { msg: x, level: 40 } : x), status?.warnings),
-                status,
-              ].find((x) => fp.isArray(x) && !fp.isEmpty(x)) ?? [],
-            ]
+          rxjs.map((xs) => {
+            const messages = xs
               .flat()
               .filter((x) => fp.isPlainObject(x) && !fp.isEmpty(x))
               .map((message) =>
@@ -1054,18 +1071,18 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
                     },
               )
 
-            return { ...status, messages, timestamp: Date.now() }
+            return { messages, timestamp: Date.now() }
           }),
           makeStatusPipe('status'),
         )
         .subscribe(monitorProviders.status$),
     )
 
-    const statussBC = new BroadcastChannel('nxt:app:stats').unref()
+    const statusBC = new BroadcastChannel('nxt:app:stats').unref()
 
     if (isMainThread) {
       statusMap = new Map()
-      statussBC.onmessage = ({ data: { data, id } }) => {
+      statusBC.onmessage = ({ data: { data, id } }) => {
         if (data != null) {
           statusMap.set(id, data)
         } else {
@@ -1077,10 +1094,29 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
     appDestroyers.unshift(
       monitorProviders.status$
         .subscribe((stats) => {
-          statussBC.postMessage({ id: threadId, data: stats })
+          try {
+            statusBC.postMessage({ id: threadId, data: stats })
+          } catch (err) {
+            statusBC.postMessage({
+              id: threadId,
+              data: {
+                messages: [
+                  {
+                    id: 'app:monitor_status_broadcast_error_' + threadId,
+                    level: 50,
+                    msg: `Monitor Status Error: ${err.message}`,
+                  },
+                ],
+              },
+            })
+            logger.error(
+              { err, data: util.inspect(stats, { depth: 16 }) },
+              'status broadcast failed',
+            )
+          }
         })
         .add(() => {
-          statussBC.postMessage({ id: threadId, data: undefined })
+          statusBC.postMessage({ id: threadId, data: undefined })
         }),
     )
 

package/http.js

@@ -572,7 +572,7 @@ export class ServerResponse extends http.ServerResponse {
 
   /**
    * @param {Buffer|string} chunk
-   * @param {string} [encoding]
+   * @param {NodeJS.BufferEncoding} [encoding]
    * @param {(err: Error) => void} [callback]
    */
   write(chunk, encoding, callback) {
@@ -599,7 +599,7 @@ export class ServerResponse extends http.ServerResponse {
 
   /**
    * @param {Buffer|string} chunk
-   * @param {string} [encoding]
+   * @param {NodeJS.BufferEncoding} [encoding]
    * @param {(err: Error) => void} [callback]
    */
   end(chunk, encoding, callback) {
@@ -811,7 +811,7 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
 
   /**
    * @param {Buffer|string} chunk
-   * @param {string} [encoding]
+   * @param {NodeJS.BufferEncoding} [encoding]
    * @param {(err: Error) => void} [callback]
    */
   write(chunk, encoding, callback) {
@@ -838,7 +838,7 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
 
   /**
    * @param {Buffer|string} chunk
-   * @param {string} [encoding]
+   * @param {NodeJS.BufferEncoding} [encoding]
    * @param {(err: Error) => void} [callback]
    */
   end(chunk, encoding, callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "28.0.24",
+  "version": "28.0.26",
   "license": "UNLICENSED",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -52,7 +52,7 @@
     "@elastic/transport": "^8.9.3",
     "@nxtedition/nxt-undici": "^7.1.9",
     "@nxtedition/sched": "^1.0.2",
-    "@nxtedition/template": "^1.0.10",
+    "@nxtedition/template": "^1.0.11",
     "@nxtedition/weak-cache": "^1.0.2",
     "@nxtedition/yield": "^1.0.2",
     "diff": "5.2.0",
@@ -92,5 +92,5 @@
     "canvas": "^3.1.0",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "73f8163622322cb2cd3d0a1f6e9473c6d3b4693b"
+  "gitHead": "007b8e2002dfc572af40f794575ded6ad79620e7"
 }