@nxtedition/lib 26.8.1 → 26.8.3

package/app.js

@@ -35,7 +35,6 @@ import { monitorEventLoopDelay } from 'node:perf_hooks'
 import xuid from 'xuid'
 import { isTimeBetween } from './time.js'
 import makeUnderPressure from './under-pressure.js'
-import undici from '@nxtedition/undici'
 import { isPrimary } from 'node:cluster'
 import { nice } from '@nxtedition/sched'
 import { setAffinity } from './numa.js'
@@ -550,65 +549,6 @@ export function makeApp(appConfig, onTerminate) {
     compiler = makeTemplateCompiler({ ds, logger, ...appConfig.compiler })
   }
 
-  const undiciDefaults = Object.freeze({
-    connected: 0,
-    disconnected: 0,
-    connections: 0,
-  })
-
-  const undici$ = new rxjs.BehaviorSubject({ ...undiciDefaults })
-  {
-    function onConnect(origin, targets) {
-      const stats = { ...undici$.value }
-      stats.connected++
-      stats.connections = stats.connected - stats.disconnected
-      undici$.next(stats)
-      logger.debug({ url: origin, count: stats.connected }, 'upstream connect')
-    }
-
-    function onDisconnect(origin, targets, err) {
-      const stats = { ...undici$.value }
-      stats.connected--
-      stats.connections = stats.connected - stats.disconnected
-      undici$.next(stats)
-      logger.debug({ url: origin, count: stats.connected }, 'upstream disconnect')
-    }
-
-    let currentDispatcher
-    function maybeRegisterUndiciStats() {
-      const nextDispatcher = undici.getGlobalDispatcher()
-
-      if (nextDispatcher === currentDispatcher) {
-        return
-      }
-
-      if (currentDispatcher) {
-        currentDispatcher.off('connect', onConnect).off('disconnect', onDisconnect)
-        currentDispatcher = null
-      }
-
-      undici$.next({ ...undiciDefaults })
-
-      nextDispatcher.on('connect', onConnect).on('disconnect', onDisconnect)
-
-      currentDispatcher = nextDispatcher
-    }
-
-    let undiciInterval = setInterval(() => maybeRegisterUndiciStats(), 10e3).unref()
-
-    destroyers.push(() => {
-      if (undiciInterval) {
-        clearInterval(undiciInterval)
-        undiciInterval = null
-      }
-
-      if (currentDispatcher) {
-        currentDispatcher.off('connect', onConnect).off('disconnect', onDisconnect)
-        currentDispatcher = null
-      }
-    })
-  }
-
   const monitorProviders = {}
 
   let stats$
@@ -695,17 +635,15 @@ export function makeApp(appConfig, onTerminate) {
                 userAgent,
                 pending: globalThis._nxt_lib_http_pending?.size,
               },
+              undici: {
+                sockets: globalThis.__undici_sockets?.size ?? 0,
+              },
             }
           }),
         ),
-        undici$,
       ),
-      rx.map(([serviceStats, appStats, undiciStats]) => ({
+      rx.map(([serviceStats, appStats]) => ({
         ...appStats,
-        undici: {
-          sockets: globalThis.__undici_sockets?.size,
-          ...undiciStats,
-        },
         [serviceName]: serviceStats,
       })),
       rx.retryWhen((err$) =>
@@ -771,20 +709,17 @@ export function makeApp(appConfig, onTerminate) {
             rx.distinctUntilChanged(fp.isEqual),
             rx.repeatWhen((complete$) => complete$.pipe(rx.delay(10e3))),
           ),
-          undici$.pipe(
-            rx.map((stats) => {
-              return [
-                {
-                  id: 'app:undici_upstream_sockets',
-                  level: stats.sockets > 8192 ? 50 : stats.sockets > 4096 ? 40 : 30,
-                  msg: `Undici: ${stats.sockets} upstream connected`,
-                },
-                {
-                  id: 'app:undici_upstream_connections',
-                  level: stats.connections > 8192 ? 50 : stats.connections > 4096 ? 40 : 30,
-                  msg: `Undici: ${stats.connections} upstream connected`,
-                },
-              ]
+          stats$.pipe(
+            rx.map(({ undici: stats }) => {
+              return stats
+                ? [
+                    {
+                      id: 'app:undici_upstream_sockets',
+                      level: stats.sockets > 8192 ? 50 : stats.sockets > 4096 ? 40 : 30,
+                      msg: `Undici: ${stats.sockets} upstream connected`,
+                    },
+                  ]
+                : []
             }),
           ),
           toobusy?.appLag$.pipe(

package/couch.d.ts

@@ -1,5 +1,6 @@
 import type { Logger } from './logger.js'
 import { HttpError } from 'http-errors'
+import type { Readable } from 'node:stream'
 
 export interface CouchOptions {
   url?: string
@@ -38,8 +39,8 @@ export interface CouchResponse<T> {
 
 export function request<T, Stream extends boolean = false>(
   url: string | URL | { origin: string; path?: string; pathname?: string },
-  opts?: CouchRequestOptions<Stream> | null,
-): Stream extends true ? AsyncGenerator<T> & { length: number } : Promise<CouchResponse<T>>
+  opts?: CouchRequestOptione<Stream> | null,
+): Stream extends true ? Readable : Promise<CouchResponse<T>>
 
 interface ChangesOptions {
   signal?: AbortSignal | null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "26.8.1",
+  "version": "26.8.3",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -65,12 +65,12 @@
     "singleQuote": true
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.901.0",
+    "@aws-sdk/client-s3": "3.918.0",
     "@elastic/elasticsearch": "^8.17.1",
     "@elastic/transport": "^8.9.3",
-    "@nxtedition/nxt-undici": "^6.4.0",
+    "@nxtedition/nxt-undici": "^6.4.17",
     "@nxtedition/sched": "^1.0.2",
-    "@smithy/node-http-handler": "^4.3.0",
+    "@smithy/node-http-handler": "^4.4.3",
     "acorn": "^8.15.0",
     "astring": "^1.9.0",
     "date-fns": "^4.1.0",
@@ -87,7 +87,7 @@
     "nconf": "^0.13.0",
     "object-hash": "^3.0.0",
     "p-queue": "^9.0.0",
-    "pino": "^10.0.0",
+    "pino": "^10.1.0",
     "qs": "^6.14.0",
     "request-target": "^1.0.2",
     "smpte-timecode": "^1.3.6",
@@ -97,11 +97,11 @@
     "yocto-queue": "^1.2.1"
   },
   "devDependencies": {
-    "@nxtedition/deepstream.io-client-js": ">=31.0.18",
+    "@nxtedition/deepstream.io-client-js": ">=31.2.1",
     "@types/lodash": "^4.17.20",
-    "@types/node": "^24.7.0",
+    "@types/node": "^24.9.1",
     "canvas": "^3.1.0",
-    "eslint": "^9.37.0",
+    "eslint": "^9.38.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.32.0",
@@ -109,11 +109,11 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^7.2.1",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.3",
+    "lint-staged": "^16.2.6",
     "prettier": "^3.6.2",
     "rxjs": "^7.8.2",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.46.0"
+    "typescript-eslint": "^8.46.2"
   },
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.6.0",