@nxtedition/lib 23.6.9 → 23.6.11

package/app.d.ts

@@ -16,6 +16,13 @@ export interface AppConfig<Config = Record<string, unknown>> {
   module?: string
   version?: string
   config: Config
+  underPressure?: {
+    sampleInterval?: number
+    maxEventLoopDelay?: number
+    maxHeapUsedBytes?: number
+    maxRssBytes?: number
+    maxEventLoopUtilization?: number
+  }
   [key: string]: unknown
 }
 
@@ -29,6 +36,7 @@ export interface App<Records, RpcMethods, Config = Record<string, unknown>> {
   logger: Logger
   trace: unknown // TODO: type
   toobusy: TooBusy
+  underPressure: UnderPressure
   destroyers: Array<
     | Subscription
     | ((logger: Logger) => void)
@@ -58,3 +66,21 @@ export interface TooBusy {
   appLag$: BehaviorSubject<number>
   maxLag: number
 }
+
+export interface UnderPressure {
+  isUnderPressure: () => boolean
+  getPressure: () => Pressure
+  pressure$: BehaviorSubject<Pressure>
+  [Symbol.dispose]: () => void
+}
+
+export interface Pressure {
+  eventLoopDelay: number
+  maxEventLoopDelay: number
+  rssBytes: number
+  maxRssBytes: number
+  heapUsedBytes: number
+  maxHeapUsedBytes: number
+  eventLoopUtilized: number
+  maxEventLoopUtilization: number
+}

package/app.js

@@ -641,7 +641,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.6.9",
+  "version": "23.6.11",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/under-pressure.js

@@ -14,9 +14,7 @@ export default function (opts = {}) {
   const maxEventLoopDelay = opts.maxEventLoopDelay || 0
   const maxHeapUsedBytes = opts.maxHeapUsedBytes || 0
   const maxRssBytes = opts.maxRssBytes || 0
-  const healthCheck = opts.healthCheck || false
   const maxEventLoopUtilization = opts.maxEventLoopUtilization || 0
-  const onPressure = opts.onPressure || (() => {})
 
   const checkMaxEventLoopDelay = maxEventLoopDelay > 0
   const checkMaxHeapUsedBytes = maxHeapUsedBytes > 0
@@ -29,7 +27,6 @@ export default function (opts = {}) {
   let eventLoopDelay = 0
   let elu
   let eventLoopUtilized = 0
-  let wasUnderPressure = false
 
   const histogram = monitorEventLoopDelay({ resolution })
   histogram.enable()
@@ -42,8 +39,7 @@ export default function (opts = {}) {
     checkMaxEventLoopUtilization === false &&
     checkMaxEventLoopDelay === false &&
     checkMaxHeapUsedBytes === false &&
-    checkMaxRssBytes === false &&
-    healthCheck === false
+    checkMaxRssBytes === false
   ) {
     return
   }
@@ -70,18 +66,7 @@ export default function (opts = {}) {
     rssBytes = mem.rss
     updateEventLoopDelay()
     updateEventLoopUtilization()
-
-    if (isUnderPressure()) {
-      if (!wasUnderPressure) {
-        wasUnderPressure = true
-        onPressure(getPressure())
-        pressure$.next(getPressure())
-      }
-    } else if (wasUnderPressure) {
-      wasUnderPressure = false
-      pressure$.next(null)
-    }
-
+    pressure$.next(isUnderPressure() ? getPressure() : null)
     timer.refresh()
   }
 
@@ -118,7 +103,7 @@ export default function (opts = {}) {
     isUnderPressure,
     getPressure,
     get pressure$() {
-      return pressure$.asObservable()
+      return pressure$.asObservable().pipe(rxjs.distinctUntilChanged())
     },
     [Symbol.dispose]() {
       clearTimeout(timer)