@nxtedition/lib 15.0.46 → 15.0.47

package/deepstream.js

@@ -147,6 +147,7 @@ async function* changes(
     includeDocs = false,
     highWaterMark = 256 * 1024,
     heartbeat = 60e3,
+    signal,
     retry,
   },
 ) {
@@ -158,81 +159,93 @@ async function* changes(
   url.searchParams.set('live', String(live))
   url.searchParams.set('include_docs', String(includeDocs))
 
-  for (let retryCount = 0; retryCount < retry; retryCount++) {
-    const ac = new AbortController()
-    const signal = ac.signal
-    try {
-      // TODO (fix): Use nxt-undici
-      const res = await undici.request(url, {
-        idempotent: false,
-        blocking: true,
-        method: 'GET',
-        signal,
-        throwOnError: true,
-        highWaterMark,
-        bodyTimeout: 2 * heartbeat,
-      })
-
-      const src = stream.pipeline(res.body, split2(), () => {})
-
-      let error
-      let ended = false
-      let resume = () => {}
-
-      src
-        .on('error', (err) => {
-          error = err
-        })
-        .on('readable', () => {
-          resume()
-        })
-        .on('end', () => {
-          ended = true
-          resume()
+  let ac
+
+  const abort = () => {
+    ac?.abort(signal.reason)
+  }
+
+  signal?.addEventListener('abort', abort)
+
+  try {
+    for (let retryCount = 0; retryCount < retry; retryCount++) {
+      ac = new AbortController()
+      try {
+        // TODO (fix): Use nxt-undici
+        const res = await undici.request(url, {
+          idempotent: false,
+          blocking: true,
+          method: 'GET',
+          signal: ac.signal,
+          throwOnError: true,
+          highWaterMark,
+          bodyTimeout: 2 * heartbeat,
         })
 
-      const batch = batched ? [] : null
-      while (true) {
-        const line = src.read()
+        const src = stream.pipeline(res.body, split2(), () => {})
+
+        let error
+        let ended = false
+        let resume = () => {}
+
+        src
+          .on('error', (err) => {
+            error = err
+          })
+          .on('readable', () => {
+            resume()
+          })
+          .on('end', () => {
+            ended = true
+            resume()
+          })
 
-        if (line === '') {
-          continue
-        } else if (line !== null) {
-          const change = JSON.parse(line)
+        const batch = batched ? [] : null
+        while (true) {
+          const line = src.read()
 
-          retryCount = 0
+          if (line === '') {
+            continue
+          } else if (line !== null) {
+            const change = JSON.parse(line)
 
-          if (change.seq) {
-            since = change.seq
-          }
-          if (batch) {
-            batch.push(change)
+            retryCount = 0
+
+            if (change.seq) {
+              since = change.seq
+            }
+            if (batch) {
+              batch.push(change)
+            } else {
+              yield change
+            }
+          } else if (batch?.length) {
+            yield batch.splice(0)
+          } else if (error) {
+            throw error
+          } else if (ended) {
+            return
           } else {
-            yield change
+            await new Promise((resolve) => {
+              resume = resolve
+            })
           }
-        } else if (batch?.length) {
-          yield batch.splice(0)
-        } else if (error) {
-          throw error
-        } else if (ended) {
-          return
+        }
+      } catch (err) {
+        if (typeof retry === 'function') {
+          const retryState = { since }
+          await retry(err, retryCount, retryState, { signal: ac.signal })
+          url.searchParams.set('since', since || '0')
         } else {
-          await new Promise((resolve) => {
-            resume = resolve
-          })
+          await delay(err, retryCount, { signal: ac.signal })
         }
+      } finally {
+        ac.abort()
+        ac = null
       }
-    } catch (err) {
-      if (typeof retry === 'function') {
-        const retryState = { since }
-        await retry(err, retryCount, retryState, { signal })
-        url.searchParams.set('since', since || '0')
-      } else {
-        await delay(err, retryCount, { signal })
-      }
-    } finally {
-      ac.abort()
     }
+  } finally {
+    signal?.removeEventListener('abort', abort)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "15.0.46",
+  "version": "15.0.47",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [