@nxtedition/lib 23.6.6 → 23.6.8

package/app.js

@@ -36,6 +36,7 @@ import { monitorEventLoopDelay } from 'node:perf_hooks'
 import { LRUCache } from 'lru-cache'
 import xuid from 'xuid'
 import { isTimeBetween } from './time.js'
+import makeUnderPressure from './under-pressure.js'
 
 export function makeApp(appConfig, onTerminate) {
   let ds
@@ -342,6 +343,11 @@ export function makeApp(appConfig, onTerminate) {
     toobusy.maxLag = maxLag
   }
 
+  let underPressure
+  if (appConfig.underPressure) {
+    underPressure = makeUnderPressure(appConfig.underPressure)
+  }
+
   if (appConfig.couchdb || appConfig.couch) {
     const couchConfig = fp.mergeAll(
       [
@@ -536,6 +542,7 @@ export function makeApp(appConfig, onTerminate) {
               couch: couch?.stats,
               lag: toobusy?.lag(),
               version: process.version,
+              underPressure: underPressure?.isUnderPressure() ? underPressure.getPressure() : null,
               cpu,
               memory,
               totalMemory,
@@ -627,6 +634,20 @@ export function makeApp(appConfig, onTerminate) {
                   ],
             ),
           ) ?? rxjs.of([]),
+          underPressure.pressure$.pipe(
+            rx.map((pressure) =>
+              pressure == null
+                ? []
+                : [
+                    {
+                      id: 'app:under_pressure',
+                      level: 40,
+                      code: 'NXT_PRESSURE',
+                      msg: `Under Pressure`,
+                    },
+                  ],
+            ),
+          ) ?? rxjs.of([]),
           couch
             ? rxjs.timer(0, 10e3).pipe(
                 rx.exhaustMap(async () => {
@@ -1105,6 +1126,7 @@ export function makeApp(appConfig, onTerminate) {
     nxt,
     logger,
     toobusy,
+    underPressure,
     destroyers,
     couch,
     server,

package/package.json

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

package/under-pressure.js

@@ -1,5 +1,6 @@
 // Based on: https://github.com/fastify/under-pressure/blob/main/index.js
 import { monitorEventLoopDelay } from 'node:perf_hooks'
+import * as rxjs from 'rxjs'
 
 function getSampleInterval(value, eventLoopResolution) {
   const sampleInterval = value || 1000
@@ -21,12 +22,14 @@ export default function (opts = {}) {
   const checkMaxHeapUsedBytes = maxHeapUsedBytes > 0
   const checkMaxRssBytes = maxRssBytes > 0
   const checkMaxEventLoopUtilization = maxEventLoopUtilization > 0
+  const pressure$ = new rxjs.BehaviorSubject(null)
 
   let heapUsedBytes = 0
   let rssBytes = 0
   let eventLoopDelay = 0
   let elu
   let eventLoopUtilized = 0
+  let wasUnderPressure = false
 
   const histogram = monitorEventLoopDelay({ resolution })
   histogram.enable()
@@ -69,12 +72,14 @@ export default function (opts = {}) {
     updateEventLoopUtilization()
 
     if (isUnderPressure()) {
-      onPressure({
-        eventLoopDelay,
-        heapUsedBytes,
-        rssBytes,
-        eventLoopUtilized,
-      })
+      if (!wasUnderPressure) {
+        wasUnderPressure = true
+        onPressure(getPressure())
+        pressure$.next(getPressure())
+      }
+    } else if (wasUnderPressure) {
+      wasUnderPressure = false
+      pressure$.next(null)
     }
 
     timer.refresh()
@@ -96,21 +101,24 @@ export default function (opts = {}) {
     return checkMaxEventLoopUtilization && eventLoopUtilized > maxEventLoopUtilization
   }
 
+  function getPressure() {
+    return {
+      eventLoopDelay,
+      maxEventLoopDelay,
+      rssBytes,
+      maxRssBytes,
+      heapUsedBytes,
+      maxHeapUsedBytes,
+      eventLoopUtilized,
+      maxEventLoopUtilization,
+    }
+  }
+
   return {
-    get isUnderPressure() {
-      return isUnderPressure()
-    },
-    get stats() {
-      return {
-        eventLoopDelay,
-        maxEventLoopDelay,
-        rssBytes,
-        maxRssBytes,
-        heapUsedBytes,
-        maxHeapUsedBytes,
-        eventLoopUtilized,
-        maxEventLoopUtilization,
-      }
+    isUnderPressure,
+    getPressure,
+    get pressure$() {
+      return pressure$.asObservable()
     },
     [Symbol.dispose]() {
       clearTimeout(timer)