@nxtedition/lib 19.8.14 → 19.8.15

package/couch.js

@@ -7,7 +7,13 @@ import tp from 'timers/promises'
 import { defaultDelay as delay } from './http.js'
 import urljoin from 'url-join'
 import { AbortError } from './errors.js'
-import { dispatch, Agent, Pool, parseHeaders } from '@nxtedition/nxt-undici'
+import {
+  dispatch,
+  Agent,
+  Pool,
+  parseHeaders,
+  request as undiciRequest,
+} from '@nxtedition/nxt-undici'
 
 // https://github.com/fastify/fastify/blob/main/lib/reqIdGenFactory.js
 // 2,147,483,647 (2^31 − 1) stands for max SMI value (an internal optimization of V8).
@@ -214,31 +220,17 @@ export function makeCouch(opts) {
     const limit = options.limit
 
     try {
-      // Don't stay connected to the same socket to allow server to load balance.
-      const socketCount = 128 * 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
-        }
-      }
+      yield* _changes({
+        batched,
+        live,
+        retry,
+        limit,
+        params,
+        method,
+        body,
+        signal: ac.signal,
+        client,
+      })
     } finally {
       ac.abort()
       if (signal) {
@@ -265,6 +257,7 @@ export function makeCouch(opts) {
 
         const ureq = {
           path: `${dbPathname}/_changes`,
+          origin: dbOrigin,
           query,
           idempotent: false,
           blocking: true,
@@ -278,9 +271,10 @@ export function makeCouch(opts) {
           },
           bodyTimeout: 2 * (params.heartbeat || 60e3),
           highWaterMark: 256 * 1024,
+          dispatcher: client,
         }
 
-        const ures = await client.request(ureq)
+        const ures = await undiciRequest(ureq)
 
         if (ures.statusCode < 200 || ures.statusCode >= 300) {
           throw makeError(ureq, {
@@ -480,10 +474,11 @@ export function makeCouch(opts) {
       method,
       body: typeof body === 'object' && body ? JSON.stringify(body) : body,
       headers,
+      dispatcher: client,
     }
 
     return new Promise((resolve, reject) =>
-      client.dispatch(req, {
+      dispatch(req, {
         resolve,
         reject,
         signal,
@@ -731,11 +726,12 @@ export function makeCouch(opts) {
   }
 
   async function up(params, body, { client = defaultClient, signal = null } = {}) {
-    const res = await client.request({
+    const res = await request({
       path: '/_up',
       method: 'GET',
       signal,
       throwOnError: true,
+      dispatcher: client,
     })
     return await res.body.json()
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.8.14",
+  "version": "19.8.15",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -79,10 +79,10 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.606.0",
+    "@aws-sdk/client-s3": "^3.614.0",
     "@elastic/elasticsearch": "^8.14.0",
-    "@elastic/transport": "^8.6.1",
-    "@nxtedition/nxt-undici": "^4.0.1",
+    "@elastic/transport": "^8.7.0",
+    "@nxtedition/nxt-undici": "^4.1.3",
     "content-type": "^1.0.5",
     "date-fns": "^3.6.0",
     "fast-querystring": "^1.1.1",
@@ -91,14 +91,14 @@
     "json5": "^2.2.3",
     "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",
-    "mime": "^4.0.1",
+    "mime": "^4.0.4",
     "moment-timezone": "^0.5.45",
     "nconf": "^0.12.1",
     "nested-error-stacks": "^2.1.1",
     "object-hash": "^3.0.0",
     "p-queue": "^8.0.1",
     "pino": "^9.2.0",
-    "qs": "^6.12.1",
+    "qs": "^6.12.3",
     "request-target": "^1.0.2",
     "smpte-timecode": "^1.3.6",
     "split-string": "^6.0.0",
@@ -109,7 +109,7 @@
   "devDependencies": {
     "@nxtedition/deepstream.io-client-js": ">=24.2.4",
     "@types/lodash": "^4.17.6",
-    "@types/node": "^20.14.9",
+    "@types/node": "^20.14.10",
     "eslint": "^8.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.0.0",