@nxtedition/lib 19.8.2 → 19.8.4

package/couch.js

@@ -8,7 +8,6 @@ import { defaultDelay as delay } from './http.js'
 import urljoin from 'url-join'
 import undici, { util as undiciUtil } from 'undici'
 import { AbortError } from './errors.js'
-import split2 from 'split2'
 import { interceptors } from '@nxtedition/nxt-undici'
 
 // https://github.com/fastify/fastify/blob/main/lib/reqIdGenFactory.js
@@ -265,11 +264,7 @@ export function makeCouch(opts) {
             })
           }
 
-          src = stream.pipeline(
-            ures.body,
-            split2('\n', { writableHighWaterMark: highWaterMark ?? 256 * 1024 }),
-            () => {},
-          )
+          src = ures.body
 
           const changes = []
 
@@ -297,42 +292,59 @@ export function makeCouch(opts) {
             })
             .on('close', maybeResume)
 
+          let str = ''
           while (true) {
-            const line = src.read()
-            if (line) {
-              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
+            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 {
-                    assert(false, 'invalid head: ' + line)
+                    params.since = data.seq || params.since
+                    changes.push(data)
                   }
-                } else if (state === 1) {
-                  if (line.startsWith(']')) {
-                    state = 2
-                  } else {
-                    const idx = line.lastIndexOf('}') + 1
-                    assert(idx > 0, 'invalid row: ' + line)
-                    const change = JSON.parse(line.slice(0, idx))
-                    params.since = change.seq || params.since
-                    changes.push(change)
+                } 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 === 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 || line === '') {
+            } else if (changes.length) {
               remaining -= changes.length
               assert(remaining >= 0, 'invalid remaining: ' + remaining)
 
@@ -1124,9 +1136,6 @@ export function request(
       interceptors.requestId,
       interceptors.responseRetry,
       interceptors.responseVerify,
-      interceptors.redirect,
-      interceptors.cache,
-      interceptors.proxy,
     )
     dispatcherCache.set(dispatcher, wrappedDispatcher)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.8.2",
+  "version": "19.8.4",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -79,10 +79,10 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.596.0",
-    "@elastic/elasticsearch": "^8.13.1",
-    "@elastic/transport": "^8.6.0",
-    "@nxtedition/nxt-undici": "^2.2.5",
+    "@aws-sdk/client-s3": "^3.600.0",
+    "@elastic/elasticsearch": "^8.14.0",
+    "@elastic/transport": "^8.6.1",
+    "@nxtedition/nxt-undici": "^3.0.3",
     "content-type": "^1.0.5",
     "date-fns": "^3.6.0",
     "fast-querystring": "^1.1.1",
@@ -100,17 +100,16 @@
     "pino": "^9.2.0",
     "qs": "^6.12.1",
     "request-target": "^1.0.2",
-    "smpte-timecode": "^1.3.5",
+    "smpte-timecode": "^1.3.6",
     "split-string": "^6.0.0",
-    "split2": "^4.2.0",
     "toobusy-js": "^0.5.1",
-    "undici": "^6.18.2",
+    "undici": "^6.19.2",
     "url-join": "^5.0.0"
   },
   "devDependencies": {
     "@nxtedition/deepstream.io-client-js": ">=24.2.4",
     "@types/lodash": "^4.17.5",
-    "@types/node": "^20.14.2",
+    "@types/node": "^20.14.8",
     "eslint": "^8.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.0.0",