@nxtedition/lib 23.9.15 → 23.9.17

package/app.js

@@ -524,23 +524,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 +556,6 @@ export function makeApp(appConfig, onTerminate) {
               underPressure: underPressure?.isUnderPressure() ? underPressure.getPressure() : null,
               cpu,
               memory,
-              totalMemory,
               resourceLimits,
               utilization: performance.eventLoopUtilization?.(elu2, elu1),
               heap: v8.getHeapStatistics(),
@@ -1009,20 +1012,28 @@ export function makeApp(appConfig, onTerminate) {
     const utilsBC = new BroadcastChannel('nxt:utils')
     utilsBC.unref()
 
+    function writeHeapSnapshot() {
+      const snapshotPath = `${os.tmpdir()}/heap-${Date.now()}-${serviceName}-${serviceModule}-${serviceInstanceId}-${serviceWorkerId}.heapsnapshot`
+      v8.writeHeapSnapshot(snapshotPath)
+      logger.info({ snapshotPath }, 'heap snapshot')
+    }
+
+    function gc() {
+      if (global.gc) {
+        global.gc()
+        logger.debug('gc')
+      } else {
+        logger.warn('gc not available')
+      }
+    }
+
     utilsBC.onmessage = ({ data }) => {
       const { type } = data
       try {
         if (type === 'utils:gc') {
-          if (global.gc) {
-            global.gc()
-            logger.debug('gc')
-          } else {
-            logger.warn('gc not available')
-          }
+          gc()
         } else if (type === 'utils:writeHeapSnapshot') {
-          const snapshotPath = `${os.tmpdir()}/heap-${Date.now()}-${serviceName}-${serviceModule}-${serviceInstanceId}-${serviceWorkerId}.heapsnapshot`
-          v8.writeHeapSnapshot(snapshotPath)
-          logger.info({ snapshotPath }, 'heap snapshot')
+          writeHeapSnapshot()
         }
       } catch (err) {
         logger.error({ err, type })
@@ -1049,12 +1060,14 @@ export function makeApp(appConfig, onTerminate) {
             }
 
             if (req.method === 'POST' && req.url === '/gc') {
+              gc()
               utilsBC.postMessage({ type: 'utils:gc' })
               res.end()
               return
             }
 
             if (req.method === 'POST' && req.url === '/writeHeapSnapshot') {
+              writeHeapSnapshot()
               utilsBC.postMessage({ type: 'utils:writeHeapSnapshot' })
               res.end()
               return

package/package.json

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