@nxtedition/lib 15.0.49 → 15.0.51

package/couch.js

@@ -1,9 +1,7 @@
-const stream = require('node:stream')
-const tp = require('node:timers/promises')
 const createError = require('http-errors')
 const makeWeak = require('./weakCache')
+const tp = require('timers/promises')
 const { delay } = require('./http')
-const split2 = require('split2')
 
 // 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).
@@ -133,7 +131,7 @@ module.exports = function (opts) {
     })
   }
 
-  async function* changes({ client = defaultClient, signal, highWaterMark, ...options } = {}) {
+  async function* changes({ client = defaultClient, signal, ...options } = {}) {
     const params = {}
 
     let body
@@ -244,59 +242,42 @@ module.exports = function (opts) {
           ...(body ? { 'content-type': 'application/json' } : {}),
         },
         throwOnError: true,
-        highWaterMark: highWaterMark ?? 256 * 1024,
+        highWaterMark: 256 * 1024, // TODO (fix): Needs support in undici...
         bodyTimeout: 2 * (params.heartbeat || 60e3),
       }
 
-      const res = await client.request(req)
-
-      retryCount = 0
-
-      const src = stream.pipeline(res.body, split2(), () => {})
-
-      let error
-      let ended = false
-      let resume = () => {}
+      try {
+        const res = await client.request(req)
 
-      src
-        .on('error', (err) => {
-          error = err
-        })
-        .on('readable', () => {
-          resume()
-        })
-        .on('end', () => {
-          ended = true
-          resume()
-        })
+        retryCount = 0
 
-      const batch = batched ? [] : null
-      while (true) {
-        const line = src.read()
-
-        if (line === '') {
-          continue
-        } else if (line !== null) {
-          const change = JSON.parse(line)
-          if (change.seq) {
-            params.since = change.seq
+        let str = ''
+        for await (const chunk of res.body) {
+          const lines = (str + chunk).split('\n')
+          str = lines.pop() ?? ''
+
+          const results = batched ? [] : null
+          for (const line of lines) {
+            if (line) {
+              const change = JSON.parse(line)
+              if (change.seq) {
+                params.since = change.seq
+              }
+              if (results) {
+                results.push(change)
+              } else {
+                yield change
+              }
+            }
           }
-          if (batch) {
-            batch.push(change)
-          } else {
-            yield change
+
+          if (results?.length) {
+            yield results
           }
-        } else if (batch?.length) {
-          yield batch.splice(0)
-        } else if (error) {
-          throw Object.assign(error, { data: req })
-        } else if (ended) {
-          return
-        } else {
-          await new Promise((resolve) => {
-            resume = resolve
-          })
         }
+      } catch (err) {
+        Object.assign(err, { data: req })
+        throw err
       }
     }
 

package/deepstream.js

@@ -141,6 +141,7 @@ function init(ds) {
 async function* changes(
   ds,
   {
+    origin,
     since = 'now',
     live = true,
     batched = false,
@@ -151,10 +152,8 @@ async function* changes(
     retry,
   },
 ) {
-  const url = new URL('/_record/changes', ds._url)
+  const url = new URL('/_record/changes', origin)
 
-  url.protocol = url.protocol === 'ws:' ? 'http:' : 'https:'
-  url.port = '6100'
   url.searchParams.set('since', since || '0')
   url.searchParams.set('live', String(live))
   url.searchParams.set('include_docs', String(includeDocs))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "15.0.49",
+  "version": "15.0.51",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [
@@ -89,7 +89,6 @@
     "request-target": "^1.0.2",
     "smpte-timecode": "^1.3.3",
     "split-string": "^6.0.0",
-    "split2": "^4.2.0",
     "toobusy-js": "^0.5.1",
     "undici": "^5.25.4",
     "url-join": "^4.0.0"