@nxtedition/lib 28.0.10 → 28.0.12

package/app.js

@@ -30,8 +30,6 @@ import { makeCouch } from './couch.js'
 import { makeTemplateCompiler } from '@nxtedition/template'
 import { makeDeepstream } from './deepstream.js'
 import * as rxjs from 'rxjs'
-import rx from 'rxjs/operators'
-import { performance } from 'perf_hooks'
 import hashString from './hash.js'
 import { makeTrace } from './trace.js'
 import { compose, createServer } from './http.js'
@@ -624,32 +622,30 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
       stats$ = appConfig.stats
     } else if (typeof appConfig.stats === 'function') {
       stats$ = rxjs.timer(0, 10e3).pipe(
-        rx.exhaustMap(() => {
+        rxjs.exhaustMap(() => {
           const ret = appConfig.stats({ ds, couch, logger })
           return ret?.then || ret?.subscribe ? ret : rxjs.of(ret)
         }),
       )
     } else if (typeof appConfig.stats === 'object') {
-      stats$ = rxjs.timer(0, 10e3).pipe(rx.map(() => appConfig.stats))
+      stats$ = rxjs.timer(0, 10e3).pipe(rxjs.map(() => appConfig.stats))
     } else {
-      stats$ = rxjs.timer(0, 10e3).pipe(rx.map(() => ({})))
+      stats$ = rxjs.timer(0, 10e3).pipe(rxjs.map(() => ({})))
     }
 
     let statsMap
 
+    monitorProviders.stats$ = new rxjs.BehaviorSubject({})
+
     const startTime = Date.now()
-    stats$ = stats$.pipe(
-      rx.map((x) => ({
-        ...x,
-        uptime: Date.now() - startTime,
-        timestamp: Date.now(),
-      })),
-      rx.auditTime(1e3),
-      rx.withLatestFrom(
-        rxjs.timer(0, 1e3).pipe(
-          rx.map(() => performance.eventLoopUtilization?.()),
-          rx.pairwise(),
-          rx.map(([elu1, elu2]) => {
+
+    appDestroyers.unshift(
+      rxjs
+        .timer(0, 1e3)
+        .pipe(
+          rxjs.map(() => performance.eventLoopUtilization?.()),
+          rxjs.pairwise(),
+          rxjs.map(([elu1, elu2]) => {
             const mem = process.memoryUsage()
             const cpu = process.cpuUsage()
 
@@ -691,7 +687,10 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
               }
             }
 
+            const now = Date.now()
             return {
+              uptime: now - startTime,
+              timestamp: now,
               ds: ds?.stats,
               couch: couch?.stats,
               lag: toobusy?.lag(),
@@ -707,39 +706,52 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
               undici,
             }
           }),
-        ),
-      ),
-      rx.map(([serviceStats, appStats]) => ({
-        ...appStats,
-        [serviceName]: serviceStats,
-      })),
-      rx.retryWhen((err$) =>
-        err$.pipe(
-          rx.tap((err) => logger.error({ err }, 'monitor.stats')),
-          rx.delay(10e3),
-        ),
-      ),
-      rx.startWith({}),
-      rx.publishReplay(1),
-      rx.refCount(),
+          rxjs.withLatestFrom(stats$.pipe(rxjs.startWith({}))),
+          rxjs.map(([appStats, serviceStats]) => ({
+            ...appStats,
+            // TODO (fix): [serviceName] is not great and can collide.
+            [serviceName]: serviceStats,
+          })),
+          rxjs.retry({
+            delay(err, retryCount) {
+              logger.error({ err, retryCount }, 'monitor.stats$ failed')
+              return rxjs.timer(10e3)
+            },
+          }),
+        )
+        .subscribe(monitorProviders.stats$),
     )
 
     const statsBC = new BroadcastChannel('nxt:app:stats').unref()
+
     if (isMainThread) {
       statsMap = new Map()
       statsBC.onmessage = ({ data: { data, id } }) => {
-        statsMap.set(id, data)
+        if (data != null) {
+          statsMap.set(id, data)
+        } else {
+          statsMap.delete(id)
+        }
       }
     }
 
-    monitorProviders.stats$ = stats$
+    appDestroyers.unshift(
+      monitorProviders.stats$
+        .subscribe((stats) => {
+          statsBC.postMessage({ id: threadId, data: stats })
+        })
+        .add(() => {
+          statsBC.postMessage({ id: threadId, data: undefined })
+        }),
+    )
 
     if (process.env.NODE_ENV === 'production') {
       appDestroyers.unshift(
-        stats$.pipe(rx.auditTime(10e3)).subscribe((stats) => {
-          statsBC.postMessage({ id: threadId, data: stats })
-          logger.debug(stats, 'STATS')
-        }),
+        monitorProviders.stats$
+          .pipe(rxjs.auditTime(10e3))
+          .subscribe((stats) => {
+            logger.debug(stats, 'STATS')
+          })
       )
     }
   }
@@ -755,11 +767,11 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
           return ret?.then || ret?.subscribe ? ret : rxjs.of(ret)
         })
         .pipe(
-          rx.catchError((err) => rxjs.of({ warnings: [err.message] })),
-          rx.repeatWhen(() => rxjs.timer(10e3)),
+          rxjs.catchError((err) => rxjs.of({ warnings: [err.message] })),
+          rxjs.repeatWhen(() => rxjs.timer(10e3)),
         )
     } else if (appConfig.status && typeof appConfig.status === 'object') {
-      status$ = rxjs.timer(0, 10e3).pipe(rx.exhaustMap(() => appConfig.status))
+      status$ = rxjs.timer(0, 10e3).pipe(rxjs.exhaustMap(() => appConfig.status))
     } else {
       status$ = rxjs.of({})
     }
@@ -768,9 +780,9 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
       .combineLatest(
         [
           status$.pipe(
-            rx.filter(Boolean),
-            rx.map((xs) => (Array.isArray(xs) ? { messages: xs } : xs)),
-            rx.catchError((err) => {
+            rxjs.filter(Boolean),
+            rxjs.map((xs) => (Array.isArray(xs) ? { messages: xs } : xs)),
+            rxjs.catchError((err) => {
               logger.error({ err }, 'monitor.status')
               return rxjs.of([
                 {
@@ -781,12 +793,12 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
                 },
               ])
             }),
-            rx.startWith([]),
-            rx.distinctUntilChanged(fp.isEqual),
-            rx.repeatWhen((complete$) => complete$.pipe(rx.delay(10e3))),
+            rxjs.startWith([]),
+            rxjs.distinctUntilChanged(fp.isEqual),
+            rxjs.repeatWhen((complete$) => complete$.pipe(rxjs.delay(10e3))),
           ),
           stats$.pipe(
-            rx.map(({ memory, heap, utilization, undici, http }) => {
+            rxjs.map(({ memory, heap, utilization, undici, http }) => {
               const messages = []
 
               if (memory?.containerLimit) {
@@ -836,7 +848,7 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
             }),
           ),
           toobusy?.appLag$.pipe(
-            rx.map((lag) =>
+            rxjs.map((lag) =>
               lag == null
                 ? []
                 : [
@@ -850,7 +862,7 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
             ),
           ) ?? rxjs.of([]),
           underPressure?.pressure$?.pipe(
-            rx.map((pressure) =>
+            rxjs.map((pressure) =>
               pressure == null
                 ? []
                 : [
@@ -865,7 +877,7 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
           ) ?? rxjs.of([]),
           couch
             ? rxjs.timer(0, 10e3).pipe(
-                rx.exhaustMap(async () => {
+                rxjs.exhaustMap(async () => {
                   try {
                     await couch.up()
                     return [
@@ -886,8 +898,8 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
                     ]
                   }
                 }),
-                rx.startWith([]),
-                rx.distinctUntilChanged(fp.isEqual),
+                rxjs.startWith([]),
+                rxjs.distinctUntilChanged(fp.isEqual),
               )
             : rxjs.of({}),
           ds
@@ -915,7 +927,7 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
             : rxjs.of([]),
           ds
             ? rxjs.timer(0, 10e3).pipe(
-                rx.exhaustMap(async () => {
+                rxjs.exhaustMap(async () => {
                   const messages = []
 
                   if (ds.stats.record.records > 100e3) {
@@ -971,8 +983,8 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
         ].filter(Boolean),
       )
       .pipe(
-        rx.auditTime(1e3),
-        rx.map(([status, lag, couch, ds]) => {
+        rxjs.auditTime(1e3),
+        rxjs.map(([status, lag, couch, ds]) => {
           const messages = [
             lag,
             couch,
@@ -1007,21 +1019,21 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
 
           return { ...status, messages, timestamp: Date.now() }
         }),
-        rx.catchError((err) => {
+        rxjs.catchError((err) => {
           logger.error({ err }, 'monitor.status')
           return rxjs.of({
             messages: [{ id: 'app:monitor_status', level: 50, code: err.code, msg: err.message }],
           })
         }),
-        rx.repeatWhen((complete$) => complete$.pipe(rx.delay(10e3))),
-        rx.startWith({}),
-        rx.distinctUntilChanged(fp.isEqual),
-        rx.publishReplay(1),
-        rx.refCount(),
+        rxjs.repeatWhen((complete$) => complete$.pipe(rxjs.delay(10e3))),
+        rxjs.startWith({}),
+        rxjs.distinctUntilChanged(fp.isEqual),
+        rxjs.publishReplay(1),
+        rxjs.refCount(),
       )
 
     const loggerSubscription = status$
-      .pipe(rx.auditTime(1e3), rx.pluck('messages'), rx.startWith([]), rx.pairwise())
+      .pipe(rxjs.auditTime(1e3), rxjs.pluck('messages'), rxjs.startWith([]), rxjs.pairwise())
       .subscribe(([prev, next]) => {
         for (const { level, msg: status, ...message } of fp.differenceBy('id', next, prev)) {
           if (level >= 50) {

package/cache.js

@@ -291,7 +291,7 @@ export class AsyncCache {
       throw new TypeError('ttl must be a finite number')
     }
 
-    const stale = now + Math.max(ttl, this.#stale(value, key) ?? 0)
+    const stale = ttl + (this.#stale(value, key) ?? 0)
     if (!Number.isFinite(stale)) {
       throw new TypeError('stale must be a finite number')
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "28.0.10",
+  "version": "28.0.12",
   "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.9",
+    "@nxtedition/template": "^1.0.10",
     "@nxtedition/weak-cache": "^1.0.2",
     "diff": "5.2.0",
     "fast-querystring": "^1.1.2",
@@ -92,5 +92,5 @@
     "pino": ">=7.0.0",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "e9be8f39c7bbf874619d29249809959ca6f7950b"
+  "gitHead": "e0d096f01e85551f3caac31e96f8d144f4c17f5a"
 }