@nxtedition/lib 19.8.13 → 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).
@@ -191,12 +197,6 @@ export function makeCouch(opts) {
       throw new Error('invalid pathname')
     }
 
-    const batched = options.batched || false
-    const live = options.live == null || !!options.live
-    const retry = options.retry
-
-    let retryCount = 0
-
     const ac = new AbortController()
     const onAbort = () => {
       ac.abort()
@@ -214,169 +214,192 @@ export function makeCouch(opts) {
       }
     }
 
-    let remaining = Number(options.limit) || Infinity
+    const batched = options.batched || false
+    const live = options.live == null || !!options.live
+    const retry = options.retry
+    const limit = options.limit
+
     try {
-      while (true) {
-        let src
-        try {
-          const query = { ...params, feed: live ? 'continuous' : 'normal' }
+      yield* _changes({
+        batched,
+        live,
+        retry,
+        limit,
+        params,
+        method,
+        body,
+        signal: ac.signal,
+        client,
+      })
+    } finally {
+      ac.abort()
+      if (signal) {
+        if (signal.off) {
+          signal.off('abort', onAbort)
+        } else if (signal.removeEventListener) {
+          signal.removeEventListener('abort', onAbort)
+        }
+      }
+    }
+  }
 
-          if (Number.isFinite(remaining)) {
-            query.limit = remaining
-          }
+  async function* _changes({ batched, live, retry, limit, params, method, body, signal, client }) {
+    let retryCount = 0
+    let remaining = Number(limit) || Infinity
+    while (true) {
+      let src
+      try {
+        const query = { ...params, feed: live ? 'continuous' : 'normal' }
 
-          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' } : {}),
-            },
-            bodyTimeout: 2 * (params.heartbeat || 60e3),
-          }
+        if (Number.isFinite(remaining)) {
+          query.limit = remaining
+        }
 
-          const ures = await client.request(ureq)
+        const ureq = {
+          path: `${dbPathname}/_changes`,
+          origin: dbOrigin,
+          query,
+          idempotent: false,
+          blocking: true,
+          method,
+          body: JSON.stringify(body),
+          signal,
+          headers: {
+            'user-agent': userAgent,
+            'request-id': genReqId(),
+            ...(body ? { 'content-type': 'application/json' } : {}),
+          },
+          bodyTimeout: 2 * (params.heartbeat || 60e3),
+          highWaterMark: 256 * 1024,
+          dispatcher: client,
+        }
 
-          if (ures.statusCode < 200 || ures.statusCode >= 300) {
-            throw makeError(ureq, {
-              status: ures.statusCode,
-              headers: ures.headers,
-              data: await ures.body.text(),
-            })
-          }
+        const ures = await undiciRequest(ureq)
 
-          src = ures.body
+        if (ures.statusCode < 200 || ures.statusCode >= 300) {
+          throw makeError(ureq, {
+            status: ures.statusCode,
+            headers: ures.headers,
+            data: await ures.body.text(),
+          })
+        }
 
-          const changes = []
+        src = ures.body
 
-          let resume = null
-          let error = null
-          let ended = false
-          let state = 0
+        const changes = []
 
-          function maybeResume() {
-            if (resume) {
-              resume()
-              resume = null
-            }
+        let resume = null
+        let error = null
+        let ended = false
+        let state = 0
+
+        function maybeResume() {
+          if (resume) {
+            resume()
+            resume = null
           }
+        }
 
-          src
-            .on('readable', maybeResume)
-            .on('error', (err) => {
-              error = err
-              maybeResume()
-            })
-            .on('end', () => {
-              ended = true
-              maybeResume()
-            })
-            .on('close', maybeResume)
-
-          let str = ''
-          while (true) {
-            const chunk = src.read()
-
-            if (chunk !== null) {
-              const lines = (str + chunk).split(/\r?\n/)
-              str = lines.pop() ?? ''
-
-              for (const line of lines) {
-                if (line === '') {
-                  // hearbeat
-                  yield batched ? [] : null
-                } else if (line === ',') {
-                  // Do nothing. Couch sometimes insert new line between
-                  // json body and comma.
-                } else if (live) {
-                  const data = JSON.parse(line)
-                  if (data.last_seq) {
-                    params.since = data.last_seq
+        src
+          .on('readable', maybeResume)
+          .on('error', (err) => {
+            error = err
+            maybeResume()
+          })
+          .on('end', () => {
+            ended = true
+            maybeResume()
+          })
+          .on('close', maybeResume)
+
+        let str = ''
+        while (true) {
+          const chunk = src.read()
+
+          if (chunk !== null) {
+            const lines = (str + chunk).split(/\r?\n/)
+            str = lines.pop() ?? ''
+
+            for (const line of lines) {
+              if (line === '') {
+                // hearbeat
+                yield batched ? [] : null
+              } else if (line === ',') {
+                // Do nothing. Couch sometimes insert new line between
+                // json body and comma.
+              } else if (live) {
+                const data = JSON.parse(line)
+                if (data.last_seq) {
+                  params.since = data.last_seq
+                } else {
+                  params.since = data.seq || params.since
+                  changes.push(data)
+                }
+              } else {
+                // NOTE: This makes some assumptions about the format of the JSON.
+                if (state === 0) {
+                  if (line.endsWith('[')) {
+                    state = 1
                   } else {
-                    params.since = data.seq || params.since
-                    changes.push(data)
+                    assert(false, 'invalid head: ' + line)
                   }
-                } else {
-                  // NOTE: This makes some assumptions about the format of the JSON.
-                  if (state === 0) {
-                    if (line.endsWith('[')) {
-                      state = 1
-                    } else {
-                      assert(false, 'invalid head: ' + line)
-                    }
-                  } else if (state === 1) {
-                    if (line.startsWith(']')) {
-                      state = 2
-                    } else {
-                      const idx = line.lastIndexOf('}') + 1
-                      try {
-                        assert(idx >= 0, 'invalid row: ' + idx + ' ' + line)
-                        const change = JSON.parse(line.slice(0, idx))
-                        params.since = change.seq || params.since
-                        changes.push(change)
-                      } catch (err) {
-                        throw Object.assign(err, { data: line })
-                      }
+                } else if (state === 1) {
+                  if (line.startsWith(']')) {
+                    state = 2
+                  } else {
+                    const idx = line.lastIndexOf('}') + 1
+                    try {
+                      assert(idx >= 0, 'invalid row: ' + idx + ' ' + line)
+                      const change = JSON.parse(line.slice(0, idx))
+                      params.since = change.seq || params.since
+                      changes.push(change)
+                    } catch (err) {
+                      throw Object.assign(err, { data: line })
                     }
-                  } else if (state === 2) {
-                    state = 3
-                    params.since = JSON.parse('{' + line).last_seq
-                    assert(params.since, 'invalid trailer: ' + line)
                   }
+                } else if (state === 2) {
+                  state = 3
+                  params.since = JSON.parse('{' + line).last_seq
+                  assert(params.since, 'invalid trailer: ' + line)
                 }
               }
-            } else if (changes.length) {
-              remaining -= changes.length
-              assert(remaining >= 0, 'invalid remaining: ' + remaining)
+            }
+          } else if (changes.length) {
+            remaining -= changes.length
+            assert(remaining >= 0, 'invalid remaining: ' + remaining)
 
-              if (batched) {
-                yield changes.splice(0)
-              } else {
-                yield* changes.splice(0)
-              }
-            } else if (error) {
-              throw error
-            } else if (!ended) {
-              await new Promise((resolve) => {
-                resume = resolve
-              })
+            if (batched) {
+              yield changes.splice(0)
             } else {
-              return
+              yield* changes.splice(0)
             }
-          }
-        } catch (err) {
-          if (err.name === 'AbortError') {
-            throw err
-          } else if (typeof retry === 'function') {
-            const retryState = { since: params.since }
-            Object.assign(
-              retryState,
-              await retry(err, retryCount++, retryState, { signal }, () =>
-                delay(err, retryCount, { signal }),
-              ),
-            )
-            params.since = retryState.since ?? 0
+          } else if (error) {
+            throw error
+          } else if (!ended) {
+            await new Promise((resolve) => {
+              resume = resolve
+            })
           } else {
-            await delay(err, retryCount, { signal })
+            return
           }
-        } finally {
-          src?.on('error', () => {}).destroy()
         }
-      }
-    } finally {
-      ac.abort()
-      if (signal) {
-        if (signal.off) {
-          signal.off('abort', onAbort)
-        } else if (signal.removeEventListener) {
-          signal.removeEventListener('abort', onAbort)
+      } catch (err) {
+        if (err.name === 'AbortError') {
+          throw err
+        } else if (typeof retry === 'function') {
+          const retryState = { since: params.since }
+          Object.assign(
+            retryState,
+            await retry(err, retryCount++, retryState, { signal }, () =>
+              delay(err, retryCount, { signal }),
+            ),
+          )
+          params.since = retryState.since ?? 0
+        } else {
+          await delay(err, retryCount, { signal })
         }
+      } finally {
+        src?.on('error', () => {}).destroy()
       }
     }
   }
@@ -451,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,
@@ -702,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.13",
+  "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",