@nxtedition/lib 19.0.0 → 19.0.2

package/couch.js

@@ -6,6 +6,7 @@ import { defaultDelay as delay } from './http.js'
 import querystring from 'querystring'
 import urljoin from 'url-join'
 import undici from 'undici'
+import { AbortError } from './errors.js'
 
 // 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).
@@ -114,7 +115,6 @@ export function makeCouch(opts) {
     return createError(res.status, {
       reason,
       error,
-      body: req.body ? JSON.stringify(req.body).slice(0, 4096) : null,
       data: {
         req: {
           origin: dbOrigin,
@@ -216,13 +216,13 @@ export function makeCouch(opts) {
 
     if (signal) {
       if (signal.aborted) {
-        ac.abort()
-      } else {
-        if (signal.on) {
-          signal.on('abort', onAbort)
-        } else if (signal.addEventListener) {
-          signal.addEventListener('abort', onAbort)
-        }
+        throw signal.reason ?? new AbortError()
+      }
+
+      if (signal.on) {
+        signal.on('abort', onAbort)
+      } else if (signal.addEventListener) {
+        signal.addEventListener('abort', onAbort)
       }
     }
 
@@ -251,7 +251,6 @@ export function makeCouch(opts) {
           'request-id': genReqId(),
           ...(body ? { 'content-type': 'application/json' } : {}),
         },
-        throwOnError: true,
         highWaterMark: 256 * 1024, // TODO (fix): Needs support in undici...
         bodyTimeout: 2 * (params.heartbeat || 60e3),
       }
@@ -290,8 +289,8 @@ export function makeCouch(opts) {
             if (live) {
               const data = JSON.parse(line)
               if (data.last_seq) {
+                assert(data.last_seq, 'invalid last_seq: ' + data.last_seq)
                 params.since = data.last_seq
-                assert(params.since, 'invalid last_seq: ' + params.since)
               } else {
                 params.since = data.seq || params.since
                 changes.push(data)
@@ -351,7 +350,12 @@ export function makeCouch(opts) {
             throw err
           } else if (typeof retry === 'function') {
             const retryState = { since: params.since }
-            Object.assign(retryState, await retry(err, retryCount++, retryState, { signal }))
+            Object.assign(
+              retryState,
+              await retry(err, retryCount++, retryState, { signal }, () =>
+                delay(err, retryCount, { signal }),
+              ),
+            )
             params.since = retryState.since ?? 0
           } else {
             await delay(err, retryCount, { signal })

package/package.json

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