@nxtedition/lib 19.8.15 → 19.8.17

package/app.js

@@ -7,7 +7,6 @@ import { Buffer } from 'node:buffer'
 import { getDockerSecretsSync } from './docker-secrets.js'
 import fp from 'lodash/fp.js'
 import { isMainThread, parentPort, threadId } from 'node:worker_threads'
-import toobusy from 'toobusy-js'
 import deepstream from '@nxtedition/deepstream.io-client-js'
 import { createLogger } from './logger.js'
 import nconf from 'nconf'
@@ -216,7 +215,37 @@ export function makeApp(appConfig, onTerminate) {
     })
   }
 
+  let toobusy
+
   if (appConfig.toobusy) {
+    const { monitorEventLoopDelay } = require('node:perf_hooks')
+
+    const resolution = 10
+    const interval = 500
+    const maxLag = 70
+
+    let currentLag = 0
+
+    const histogram = monitorEventLoopDelay({ resolution })
+    histogram.enable()
+
+    setInterval(() => {
+      currentLag = Math.max(0, histogram.mean / 1e6 - resolution)
+      if (Number.isNaN(currentLag)) {
+        currentLag = Infinity
+      }
+      histogram.reset()
+
+      if (currentLag > 1e3) {
+        logger?.error({ currentLag }, 'lag')
+      } else {
+        logger?.warn({ currentLag }, 'lag')
+      }
+    }, interval).unref()
+
+    toobusy = () => currentLag > maxLag
+    toobusy.lag = () => currentLag
+
     toobusy.onLag((currentLag) => {
       if (currentLag > 1e3) {
         logger.error({ currentLag }, 'lag')

package/couch.js

@@ -220,17 +220,31 @@ export function makeCouch(opts) {
     const limit = options.limit
 
     try {
-      yield* _changes({
-        batched,
-        live,
-        retry,
-        limit,
-        params,
-        method,
-        body,
-        signal: ac.signal,
-        client,
-      })
+      // Limit request duration to allow server to load balance.
+      const socketCount = 64 * 1024
+      let remaining = Number(limit) || Infinity
+      while (remaining > 0) {
+        let count = 0
+        for await (const changes of _changes({
+          batched,
+          live,
+          retry,
+          limit: Math.min(remaining, socketCount),
+          params,
+          method,
+          body,
+          signal: ac.signal,
+          client,
+        })) {
+          yield changes
+          count += changes.length
+          remaining -= changes.length
+        }
+        assert(remaining >= 0)
+        if (!live && count < socketCount) {
+          return
+        }
+      }
     } finally {
       ac.abort()
       if (signal) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.8.15",
+  "version": "19.8.17",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -102,7 +102,6 @@
     "request-target": "^1.0.2",
     "smpte-timecode": "^1.3.6",
     "split-string": "^6.0.0",
-    "toobusy-js": "^0.5.1",
     "undici": "^6.19.2",
     "url-join": "^5.0.0"
   },