@nxtedition/lib 20.3.5 → 20.3.7

package/couch.js

@@ -14,19 +14,6 @@ import {
   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).
-// With this upper bound, if you'll be generating 1k ids/sec, you're going to hit it in ~25 days.
-// This is very likely to happen in real-world applications, hence the limit is enforced.
-// Growing beyond this value will make the id generation slower and cause a deopt.
-// In the worst cases, it will become a float, losing accuracy.
-const maxInt = 2147483647
-let nextReqId = Math.floor(Math.random() * maxInt)
-function genReqId() {
-  nextReqId = (nextReqId + 1) & maxInt
-  return `req-${nextReqId.toString(36)}`
-}
-
 export function makeCouch(opts) {
   let config
   if (typeof opts === 'string') {
@@ -228,36 +215,16 @@ export function makeCouch(opts) {
         return next()
       })
 
-    const limit = options.limit
-
     try {
-      // Limit request duration to allow server to load balance.
-      const socketCount = 64 * 1024
-      let remaining = Number(limit) || Infinity
-      while (remaining > 0) {
-        let count = 0
-        const limit = Math.min(remaining, socketCount)
-        for await (const changes of _changes({
-          live,
-          retry,
-          limit,
-          params,
-          method,
-          body,
-          signal: ac.signal,
-          client,
-        })) {
-          yield changes
-          if (changes != null) {
-            count += changes.length
-            remaining -= changes.length
-          }
-        }
-        assert(remaining >= 0)
-        if (!live && count < socketCount) {
-          return
-        }
-      }
+      yield* _changes({
+        method,
+        live,
+        retry,
+        params,
+        body,
+        signal: ac.signal,
+        client,
+      })
     } finally {
       ac.abort()
       if (signal) {
@@ -273,39 +240,35 @@ export function makeCouch(opts) {
   async function* _changes({
     live,
     retry,
-    limit,
     params,
     method,
     body,
     signal,
     client,
-    blocking = live || !limit || limit > 256,
+    blocking = live || !params.limit || params.limit > 256,
   }) {
     let retryCount = 0
-    let remaining = Number(limit) || Infinity
     while (true) {
       let src
       try {
         const query = { ...params, feed: live ? 'continuous' : 'normal' }
 
-        if (Number.isFinite(remaining)) {
-          query.limit = remaining
-        }
-
         const ureq = {
           path: `${dbPathname}/_changes`,
           origin: dbOrigin,
           query,
-          idempotent: false,
+          headers: body
+            ? {
+                'content-type': 'application/json',
+              }
+            : null,
           blocking,
           method,
           body: JSON.stringify(body),
+          retry: false,
+          idempotent: false,
           signal,
-          headers: {
-            'user-agent': userAgent,
-            'request-id': genReqId(),
-            ...(body ? { 'content-type': 'application/json' } : {}),
-          },
+          headersTimeout: 2 * 60e3,
           bodyTimeout: 2 * (params.heartbeat || 60e3),
           highWaterMark: 256 * 1024,
           dispatcher: client,
@@ -404,9 +367,6 @@ export function makeCouch(opts) {
               }
             }
           } else if (changes.length) {
-            remaining -= changes.length
-            assert(remaining >= 0, 'invalid remaining: ' + remaining)
-
             const ret = changes.splice(0)
             ret.lastSeq = params.since
             yield ret

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "20.3.5",
+  "version": "20.3.7",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -54,10 +54,10 @@
     "singleQuote": true
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.627.0",
-    "@elastic/elasticsearch": "^8.14.0",
-    "@elastic/transport": "^8.7.0",
-    "@nxtedition/nxt-undici": "^4.2.5",
+    "@aws-sdk/client-s3": "^3.637.0",
+    "@elastic/elasticsearch": "^8.15.0",
+    "@elastic/transport": "^8.7.1",
+    "@nxtedition/nxt-undici": "^4.2.13",
     "content-type": "^1.0.5",
     "date-fns": "^3.6.0",
     "fast-querystring": "^1.1.1",
@@ -78,7 +78,7 @@
     "request-target": "^1.0.2",
     "smpte-timecode": "^1.3.6",
     "split-string": "^6.0.0",
-    "undici": "^6.19.7",
+    "undici": "^6.19.8",
     "url-join": "^5.0.0",
     "xuid": "^4.1.3",
     "yocto-queue": "^1.1.1"
@@ -86,22 +86,22 @@
   "devDependencies": {
     "@nxtedition/deepstream.io-client-js": ">=25.6.3",
     "@types/lodash": "^4.17.7",
-    "@types/node": "^22.2.0",
-    "eslint": "^9.9.0",
+    "@types/node": "^22.5.2",
+    "eslint": "^9.9.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^17.10.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^7.1.0",
-    "husky": "^9.1.4",
-    "lint-staged": "^15.2.8",
+    "husky": "^9.1.5",
+    "lint-staged": "^15.2.10",
     "pinst": "^3.0.0",
     "prettier": "^3.3.3",
     "rxjs": "^7.5.6",
     "send": "^0.18.0",
-    "tap": "^21.0.0",
-    "typescript-eslint": "^8.0.1"
+    "tap": "^21.0.1",
+    "typescript-eslint": "^8.3.0"
   },
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.6.0",