@nxtedition/lib 23.9.16 → 23.9.18

package/app.js

@@ -346,13 +346,15 @@ export function makeApp(appConfig, onTerminate) {
   let underPressure
   if (appConfig.underPressure) {
     underPressure = makeUnderPressure(appConfig.underPressure)
-    underPressure.pressure$.subscribe((pressure) => {
-      if (pressure) {
-        logger?.warn({ pressure }, 'pressure triggered')
-      } else {
-        logger?.debug('pressure cleared')
-      }
-    })
+    if (underPressure) {
+      underPressure.pressure$.subscribe((pressure) => {
+        if (pressure) {
+          logger?.warn({ pressure }, 'pressure triggered')
+        } else {
+          logger?.debug('pressure cleared')
+        }
+      })
+    }
   }
 
   if (appConfig.couchdb || appConfig.couch) {
@@ -524,23 +526,27 @@ export function makeApp(appConfig, onTerminate) {
           rx.map(() => performance.eventLoopUtilization?.()),
           rx.pairwise(),
           rx.map(([elu1, elu2]) => {
-            const memory = process.memoryUsage()
+            const mem = process.memoryUsage()
             const cpu = process.cpuUsage()
 
-            let totalMemory
+            const memory = {
+              rss: mem.rss,
+              heapTotal: mem.heapTotal,
+              heapUsed: mem.heapUsed,
+              external: mem.external,
+              arrayBuffers: mem.arrayBuffers,
+              totalHeapTotal: 0,
+              totalHeapUsed: 0,
+              totalExternal: 0,
+              totalArrayBuffers: 0,
+            }
+
             if (memoryUsageMap) {
-              totalMemory = {
-                rss: memory.rss,
-                heapTotal: 0,
-                heapUsed: 0,
-                external: 0,
-                arrayBuffers: 0,
-              }
               for (const memoryUsage of memoryUsageMap.values()) {
-                totalMemory.heapTotal += memoryUsage.heapTotal
-                totalMemory.heapUsed += memoryUsage.heapUsed
-                totalMemory.external += memoryUsage.external
-                totalMemory.arrayBuffers += memoryUsage.arrayBuffers
+                memory.totalHeapTotal += memoryUsage.heapTotal
+                memory.totalHeapUsed += memoryUsage.heapUsed
+                memory.totalExternal += memoryUsage.external
+                memory.totalArrayBuffers += memoryUsage.arrayBuffers
               }
             }
 
@@ -552,7 +558,6 @@ export function makeApp(appConfig, onTerminate) {
               underPressure: underPressure?.isUnderPressure() ? underPressure.getPressure() : null,
               cpu,
               memory,
-              totalMemory,
               resourceLimits,
               utilization: performance.eventLoopUtilization?.(elu2, elu1),
               heap: v8.getHeapStatistics(),
@@ -645,7 +650,7 @@ export function makeApp(appConfig, onTerminate) {
                   ],
             ),
           ) ?? rxjs.of([]),
-          underPressure?.pressure$.pipe(
+          underPressure?.pressure$?.pipe(
             rx.map((pressure) =>
               pressure == null
                 ? []

package/package.json

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