@nxtedition/lib 13.0.9 → 13.1.1

package/app.js

@@ -331,6 +331,74 @@ module.exports = function (appConfig, onTerminate) {
 
   const monitorProviders = {}
 
+  let stats$
+  if (appConfig.stats) {
+    const v8 = require('v8')
+    const rxjs = require('rxjs')
+    const rx = require('rxjs/operators')
+    const { eventLoopUtilization } = require('perf_hooks').performance
+
+    if (typeof appConfig.stats.subscribe === 'function') {
+      stats$ = appConfig.stats
+    } else if (typeof appConfig.stats === 'function') {
+      stats$ = rxjs.timer(0, 10e3).pipe(
+        rx.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))
+    } else {
+      stats$ = rxjs.timer(0, 10e3).pipe(rx.map(() => ({})))
+    }
+
+    stats$ = stats$.pipe(
+      rx.map((x) => ({
+        ...x,
+        timestamp: Date.now(),
+      })),
+      rx.auditTime(1e3),
+      rx.filter(Boolean),
+      rx.retryWhen((err$) =>
+        err$.pipe(
+          rx.tap((err) => logger.error({ err }, 'monitor.stats')),
+          rx.delay(10e3)
+        )
+      ),
+      rx.startWith({}),
+      rx.publishReplay(1),
+      rx.refCount()
+    )
+
+    monitorProviders.stats$ = stats$
+
+    let elu1 = eventLoopUtilization?.()
+    const subscription = stats$.pipe(rx.auditTime(10e3)).subscribe((stats) => {
+      if (process.env.NODE_ENV === 'production') {
+        const elu2 = eventLoopUtilization?.()
+        logger.debug(
+          {
+            ds: ds?.stats,
+            couch: couch?.stats,
+            lag: toobusy?.lag(),
+            memory: process.memoryUsage(),
+            utilization: eventLoopUtilization?.(elu2, elu1),
+            heap: v8.getHeapStatistics(),
+            ...stats,
+          },
+          'STATS'
+        )
+        elu1 = elu2
+      }
+    })
+
+    destroyers.push(() => {
+      subscription.unsubscribe()
+    })
+  }
+
+  let status$
   if (appConfig.status) {
     const rxjs = require('rxjs')
     const rx = require('rxjs/operators')
@@ -338,7 +406,6 @@ module.exports = function (appConfig, onTerminate) {
     const fp = require('lodash/fp')
     const hashString = require('./hash')
 
-    let status$
     if (appConfig.status.subscribe) {
       status$ = appConfig.status
     } else if (typeof appConfig.status === 'function') {
@@ -358,103 +425,157 @@ module.exports = function (appConfig, onTerminate) {
     }
 
     status$ = rxjs
-      .combineLatest([
-        status$.pipe(
-          rx.filter(Boolean),
-          rx.catchError((err) => {
-            logger.error({ err }, 'monitor.status')
-            return rxjs.of([
-              {
-                id: 'app:user_monitor_status',
-                level: 50,
-                code: err.code,
-                msg: err.message,
-              },
-            ])
-          }),
-          rx.startWith([]),
-          rx.distinctUntilChanged(fp.isEqual),
-          rx.repeatWhen((complete$) => complete$.pipe(rx.delay(10e3)))
-        ),
-        toobusy
-          ? rxjs.timer(0, 1e3).pipe(
-              rx.map(() =>
-                toobusy.lag() > 1e3
-                  ? [
+      .combineLatest(
+        [
+          status$.pipe(
+            rx.filter(Boolean),
+            rx.catchError((err) => {
+              logger.error({ err }, 'monitor.status')
+              return rxjs.of([
+                {
+                  id: 'app:user_monitor_status',
+                  level: 50,
+                  code: err.code,
+                  msg: err.message,
+                },
+              ])
+            }),
+            rx.startWith([]),
+            rx.distinctUntilChanged(fp.isEqual),
+            rx.repeatWhen((complete$) => complete$.pipe(rx.delay(10e3)))
+          ),
+          toobusy
+            ? rxjs.timer(0, 1e3).pipe(
+                rx.map(() =>
+                  toobusy.lag() > 1e3
+                    ? [
+                        {
+                          id: 'app:toobusy_lag',
+                          level: 40,
+                          code: 'NXT_LAG',
+                          msg: `lag: ${toobusy.lag()}`,
+                        },
+                      ]
+                    : []
+                ),
+                rx.startWith([]),
+                rx.distinctUntilChanged(fp.isEqual)
+              )
+            : rxjs.of({}),
+          couch
+            ? rxjs.timer(0, 10e3).pipe(
+                rx.exhaustMap(async () => {
+                  try {
+                    await couch.info()
+                  } catch (err) {
+                    return [
                       {
-                        id: 'app:toobusy_lag',
+                        id: 'app:couch',
                         level: 40,
-                        code: 'NXT_LAG',
-                        msg: `lag: ${toobusy.lag()}`,
+                        code: err.code,
+                        msg: 'couch: ' + err.message,
                       },
                     ]
-                  : []
-              ),
-              rx.startWith([]),
-              rx.distinctUntilChanged(fp.isEqual)
-            )
-          : rxjs.of({}),
-        couch
-          ? rxjs.timer(0, 10e3).pipe(
-              rx.exhaustMap(async () => {
-                try {
-                  await couch.info()
-                } catch (err) {
-                  return [
-                    {
-                      id: 'app:couch',
-                      level: 40,
-                      code: err.code,
-                      msg: 'couch: ' + err.message,
-                    },
-                  ]
-                }
-              }),
-              rx.startWith([]),
-              rx.distinctUntilChanged(fp.isEqual)
-            )
-          : rxjs.of({}),
-        ds
-          ? new rxjs.Observable((o) => {
-              const client = new undici.Client(`http://${new URL(ds._url || ds.url).host}`, {
-                keepAliveTimeout: 30e3,
-              })
-
-              const subscription = rxjs
-                .timer(0, 10e3)
-                .pipe(
-                  rx.exhaustMap(async () => {
-                    try {
-                      const { body } = await client.request({ method: 'GET', path: '/healthcheck' })
-                      await body.dump()
-                    } catch {
+                  }
+                }),
+                rx.startWith([]),
+                rx.distinctUntilChanged(fp.isEqual)
+              )
+            : rxjs.of({}),
+          ds
+            ? new rxjs.Observable((o) => {
+                const client = new undici.Client(`http://${new URL(ds._url || ds.url).host}`, {
+                  keepAliveTimeout: 30e3,
+                })
+
+                const subscription = rxjs
+                  .timer(0, 10e3)
+                  .pipe(
+                    rx.exhaustMap(async () => {
+                      const messages = []
+
+                      if (ds.stats.record.records > 100e3) {
+                        messages.push({
+                          id: 'app:ds_record_records',
+                          level: 40,
+                          code: 'NXT_DEEPSTREAM_RECORDS_RECORDS',
+                          msg: 'ds: ' + ds.stats.record.records + ' records',
+                        })
+                      }
+
+                      if (ds.stats.record.pruning > 100e3) {
+                        messages.push({
+                          id: 'app:ds_record_pruning',
+                          level: 40,
+                          code: 'NXT_DEEPSTREAM_RECORDS_PRUNING',
+                          msg: 'ds: ' + ds.stats.record.pruning + ' pruning',
+                        })
+                      }
+
+                      if (ds.stats.record.pending > 10e3) {
+                        messages.push({
+                          id: 'app:ds_record_pending',
+                          level: 40,
+                          code: 'NXT_DEEPSTREAM_RECORDS_PENDING',
+                          msg: 'ds: ' + ds.stats.record.pending + ' pending',
+                        })
+                      }
+
+                      if (ds.stats.record.updating > 10e3) {
+                        messages.push({
+                          id: 'app:ds_record_updating',
+                          level: 40,
+                          code: 'NXT_DEEPSTREAM_RECORDS_UPDATING',
+                          msg: 'ds: ' + ds.stats.record.updating + ' updating',
+                        })
+                      }
+
+                      if (ds.stats.record.patching > 10e3) {
+                        messages.push({
+                          id: 'app:ds_record_patching',
+                          level: 40,
+                          code: 'NXT_DEEPSTREAM_RECORDS_PATCHING',
+                          msg: 'ds: ' + ds.stats.record.patching + ' patching',
+                        })
+                      }
+
                       try {
                         const { body } = await client.request({
                           method: 'GET',
                           path: '/healthcheck',
                         })
                         await body.dump()
-                      } catch (err) {
-                        return {
-                          id: 'app:ds_http_connection',
-                          level: 40,
-                          code: err.code,
-                          msg: 'ds: ' + err.message,
+                      } catch {
+                        try {
+                          const { body } = await client.request({
+                            method: 'GET',
+                            path: '/healthcheck',
+                          })
+                          await body.dump()
+                        } catch (err) {
+                          messages.push({
+                            id: 'app:ds_http_connection',
+                            level: 40,
+                            code: err.code,
+                            msg: 'ds: ' + err.message,
+                          })
                         }
                       }
-                    }
-                  })
-                )
-                .subscribe(o)
-
-              return () => {
-                client.destroy()
-                subscription.unsubscribe()
-              }
-            }).pipe(rx.startWith([]), rx.distinctUntilChanged(fp.isEqual))
-          : rxjs.of({}),
-        rxjs.timer(0, 10e3),
-      ])
+
+                      return messages
+                    })
+                  )
+                  .subscribe(o)
+
+                return () => {
+                  client.destroy()
+                  subscription.unsubscribe()
+                }
+              }).pipe(rx.startWith([]), rx.distinctUntilChanged(fp.isEqual))
+            : rxjs.of({}),
+          rxjs.timer(0, 10e3),
+        ].filter(Boolean)
+      )
       .pipe(
         rx.auditTime(1e3),
         rx.map(([status, lag, couch, ds]) => {
@@ -527,73 +648,6 @@ module.exports = function (appConfig, onTerminate) {
     })
   }
 
-  if (appConfig.stats) {
-    const v8 = require('v8')
-    const rxjs = require('rxjs')
-    const rx = require('rxjs/operators')
-    const { eventLoopUtilization } = require('perf_hooks').performance
-
-    let stats$
-    if (typeof appConfig.stats.subscribe === 'function') {
-      stats$ = appConfig.stats
-    } else if (typeof appConfig.stats === 'function') {
-      stats$ = rxjs.timer(0, 10e3).pipe(
-        rx.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))
-    } else {
-      stats$ = rxjs.timer(0, 10e3).pipe(rx.map(() => ({})))
-    }
-
-    stats$ = stats$.pipe(
-      rx.map((x) => ({
-        ...x,
-        timestamp: Date.now(),
-      })),
-      rx.auditTime(1e3),
-      rx.filter(Boolean),
-      rx.retryWhen((err$) =>
-        err$.pipe(
-          rx.tap((err) => logger.error({ err }, 'monitor.stats')),
-          rx.delay(10e3)
-        )
-      ),
-      rx.startWith({}),
-      rx.publishReplay(1),
-      rx.refCount()
-    )
-
-    monitorProviders.stats$ = stats$
-
-    let elu1 = eventLoopUtilization?.()
-    const subscription = stats$.pipe(rx.auditTime(10e3)).subscribe((stats) => {
-      if (process.env.NODE_ENV === 'production') {
-        const elu2 = eventLoopUtilization?.()
-        logger.debug(
-          {
-            ds: ds?.stats,
-            couch: couch?.stats,
-            lag: toobusy?.lag(),
-            memory: process.memoryUsage(),
-            utilization: eventLoopUtilization?.(elu2, elu1),
-            heap: v8.getHeapStatistics(),
-            ...stats,
-          },
-          'STATS'
-        )
-        elu1 = elu2
-      }
-    })
-
-    destroyers.push(() => {
-      subscription.unsubscribe()
-    })
-  }
-
   if (ds && Object.keys(monitorProviders).length && appConfig.monitor !== false) {
     const { isMainThread } = require('node:worker_threads')
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "13.0.9",
+  "version": "13.1.1",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [