@nxtedition/lib 19.0.15 → 19.0.17

package/couch.js

@@ -72,10 +72,9 @@ export function makeCouch(opts) {
     keepAliveTimeout: 2 * 60e3,
     headersTimeout: 10 * 60e3,
     bodyTimeout: 2 * 60e3,
-    connections: 256,
   }
 
-  const userAgent = config.userAgent
+  const userAgent = config.userAgent || globalThis.userAgent
   const defaultClient = new undici.Pool(dbOrigin, defaultClientOpts)
 
   const getClient =
@@ -177,7 +176,7 @@ export function makeCouch(opts) {
     }
 
     if (options.heartbeat != null) {
-      params.heartbeat = options.heartbeat
+      params.heartbeat = Number(options.heartbeat)
     } else {
       params.heartbeat = 10e3
     }
@@ -228,55 +227,50 @@ export function makeCouch(opts) {
       }
     }
 
-    async function parse(live, params) {
-      const req = {
-        path: `${dbPathname}/_changes?${new URLSearchParams(params)}`,
-        idempotent: false,
-        blocking: true,
-        method,
-        body: JSON.stringify(body),
-        signal: ac.signal,
-        headers: {
-          'user-agent': userAgent,
-          'request-id': genReqId(),
-          ...(body ? { 'content-type': 'application/json' } : {}),
-        },
-        highWaterMark: 256 * 1024, // TODO (fix): Needs support in undici...
-        bodyTimeout: 2 * (params.heartbeat || 60e3),
-      }
-
-      const res = await client.request(req)
-
-      if (res.statusCode < 200 || res.statusCode >= 300) {
-        throw makeError(req, {
-          status: res.statusCode,
-          headers: res.headers,
-          data: await res.body.text(),
-        })
-      }
-
-      return stream.pipeline(
-        res.body,
-        split2('\n', { writableHighWaterMark: highWaterMark ?? 128 * 1024 }),
-        () => {},
-      )
-    }
-
     let remaining = Number(options.limit) || Infinity
     try {
       while (true) {
+        let src
         try {
-          const params2 = {
-            ...params,
-            ...options.query,
-            feed: live ? 'continuous' : 'normal',
-          }
+          const query = { ...params, feed: live ? 'continuous' : 'normal' }
 
           if (Number.isFinite(remaining)) {
-            params.limit = remaining
+            query.limit = remaining
+          }
+
+          const ureq = {
+            path: `${dbPathname}/_changes`,
+            query,
+            idempotent: false,
+            blocking: true,
+            method,
+            body: JSON.stringify(body),
+            signal: ac.signal,
+            headers: {
+              'user-agent': userAgent,
+              'request-id': genReqId(),
+              ...(body ? { 'content-type': 'application/json' } : {}),
+            },
+            highWaterMark: 256 * 1024, // TODO (fix): Needs support in undici...
+            bodyTimeout: 2 * (params.heartbeat || 60e3),
           }
 
-          const src = await parse(live, params2)
+          const ures = await client.request(ureq)
+
+          if (ures.statusCode < 200 || ures.statusCode >= 300) {
+            throw makeError(ureq, {
+              status: ures.statusCode,
+              headers: ures.headers,
+              data: await ures.body.text(),
+            })
+          }
+
+          src = stream.pipeline(
+            ures.body,
+            split2('\n', { writableHighWaterMark: highWaterMark ?? 256 * 1024 }),
+            () => {},
+          )
+
           const changes = []
 
           let resume = null
@@ -284,24 +278,24 @@ export function makeCouch(opts) {
           let ended = false
           let state = 0
 
+          function maybeResume() {
+            if (resume) {
+              resume()
+              resume = null
+            }
+          }
+
           src
-            .on('readable', () => {
-              if (resume) {
-                resume()
-                resume = null
-              }
-            })
+            .on('readable', maybeResume)
             .on('error', (err) => {
               error = err
-
-              if (resume) {
-                resume()
-                resume = null
-              }
+              maybeResume()
             })
             .on('end', () => {
               ended = true
+              maybeResume()
             })
+            .on('close', maybeResume)
 
           while (true) {
             const line = src.read()
@@ -372,6 +366,8 @@ export function makeCouch(opts) {
           } else {
             await delay(err, retryCount, { signal })
           }
+        } finally {
+          src.destroy()
         }
       }
     } finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.0.15",
+  "version": "19.0.17",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",