@nxtedition/lib 14.0.23 → 14.0.24

package/couch.js

@@ -246,33 +246,38 @@ module.exports = function (opts) {
         bodyTimeout: 2 * (params.heartbeat || 60e3),
       }
 
-      const res = await client.request(req)
-
-      retryCount = 0
+      try {
+        const res = await client.request(req)
 
-      let str = ''
-      for await (const chunk of res.body) {
-        const lines = (str + chunk).split('\n')
-        str = lines.pop() ?? ''
+        retryCount = 0
 
-        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
+        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 (results?.length) {
-          yield results
+          if (results?.length) {
+            yield results
+          }
         }
+      } catch (err) {
+        Object.assign(err, { data: req })
+        throw err
       }
     }
 
@@ -282,28 +287,29 @@ module.exports = function (opts) {
       let remaining = parseInt(options.limit) || Infinity
 
       const next = async () => {
+        const req = {
+          path:
+            dbPathname +
+            '/_changes' +
+            `?${new URLSearchParams({
+              ...params,
+              ...options.query,
+              limit: Math.min(remaining, batchSize),
+              feed: live ? 'longpoll' : 'normal',
+            })}`,
+          idempotent: true,
+          blocking: live,
+          method,
+          body: JSON.stringify(body),
+          signal: ac.signal,
+          headers: {
+            'user-agent': userAgent,
+            'request-id': genReqId(),
+            ...(body ? { 'content-type': 'application/json' } : {}),
+          },
+        }
+
         try {
-          const req = {
-            path:
-              dbPathname +
-              '/_changes' +
-              `?${new URLSearchParams({
-                ...params,
-                ...options.query,
-                limit: Math.min(remaining, batchSize),
-                feed: live ? 'longpoll' : 'normal',
-              })}`,
-            idempotent: true,
-            blocking: live,
-            method,
-            body: JSON.stringify(body),
-            signal: ac.signal,
-            headers: {
-              'user-agent': userAgent,
-              'request-id': genReqId(),
-              ...(body ? { 'content-type': 'application/json' } : {}),
-            },
-          }
           const res = await client.request(req)
 
           if (res.statusCode < 200 || res.statusCode >= 300) {
@@ -316,6 +322,7 @@ module.exports = function (opts) {
 
           return await res.body.json()
         } catch (err) {
+          Object.assign(err, { data: req })
           return { err }
         }
       }

package/errors.js

@@ -1,5 +1,6 @@
 const objectHash = require('object-hash')
 const fp = require('lodash/fp.js')
+const { toString } = Object.prototype
 
 module.exports.AbortError = class AbortError extends Error {
   constructor() {
@@ -37,6 +38,8 @@ module.exports.parseError = function parseError(error) {
   )
 }
 
+const kSeen = Symbol('kSeen')
+
 module.exports.serializeError = function serializeError(error) {
   if (!error) {
     return null
@@ -51,6 +54,24 @@ module.exports.serializeError = function serializeError(error) {
     return errors.length === 0 ? null : errors.length === 1 ? errors[0] : errors
   }
 
+  if (Object.prototype.hasOwnProperty.call(error, kSeen)) {
+    return null
+  }
+
+  error[kSeen] = undefined
+
+  const type =
+    toString.call(error.constructor) === '[object Function]' ? error.constructor.name : error.name
+
+  let data = error.data || error.body
+  if (typeof data === 'string') {
+    try {
+      data = JSON.parse(data)
+    } catch {
+      // Do nothing...
+    }
+  }
+
   let {
     msg,
     message = msg,
@@ -61,17 +82,19 @@ module.exports.serializeError = function serializeError(error) {
     statusCode,
     status = statusCode,
     headers,
-    data = body,
     ...properties
   } = error
 
   errors = Array.isArray(errors) ? errors.map(serializeError) : undefined
   cause = cause ? serializeError(cause) : undefined
 
+  delete error[kSeen]
+
   return JSON.parse(
     JSON.stringify({
       ...properties,
       message,
+      type,
       code,
       status,
       headers,

package/package.json

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