@nxtedition/lib 20.1.1 → 20.2.0

package/couch.js

@@ -132,7 +132,7 @@ export function makeCouch(opts) {
    * @param {string} [options.since=null] - The sequence number to start from.
    * @yields {Array<{ id: string, seq?: string, doc?: Object, deleted?: boolean, changes: Array<{ rev: string }> }>}
    */
-  async function* changes({ client = defaultClient, signal = null, ...options } = {}) {
+  async function* changes({ client = defaultClient, signal = null, logger, ...options } = {}) {
     const params = {}
 
     let body
@@ -221,7 +221,13 @@ export function makeCouch(opts) {
     }
 
     const live = options.live == null || !!options.live
-    const retry = options.retry
+    const retry =
+      options.retry ??
+      (async (err, retryCount, params, { signal }, next) => {
+        logger?.error({ err, retryCount, params }, 'changes error')
+        return next()
+      })
+
     const limit = options.limit
 
     try {
@@ -230,10 +236,11 @@ export function makeCouch(opts) {
       let remaining = Number(limit) || Infinity
       while (remaining > 0) {
         let count = 0
+        const limit = Math.min(remaining, socketCount)
         for await (const changes of _changes({
           live,
           retry,
-          limit: Math.min(remaining, socketCount),
+          limit,
           params,
           method,
           body,
@@ -263,7 +270,17 @@ export function makeCouch(opts) {
     }
   }
 
-  async function* _changes({ live, retry, limit, params, method, body, signal, client }) {
+  async function* _changes({
+    live,
+    retry,
+    limit,
+    params,
+    method,
+    body,
+    signal,
+    client,
+    blocking = live || !limit || limit > 256,
+  }) {
     let retryCount = 0
     let remaining = Number(limit) || Infinity
     while (true) {
@@ -280,7 +297,7 @@ export function makeCouch(opts) {
           origin: dbOrigin,
           query,
           idempotent: false,
-          blocking: true,
+          blocking,
           method,
           body: JSON.stringify(body),
           signal,

package/mutex.js

@@ -0,0 +1,50 @@
+import Queue from 'yocto-queue'
+
+export default class Mutex {
+  #queue = new Queue()
+  #isLocked = false
+
+  tryLock() {
+    if (!this.#isLocked) {
+      this.#isLocked = true
+      return true
+    }
+
+    return false
+  }
+
+  async lock() {
+    if (!this.#isLocked) {
+      this.#isLocked = true
+      return
+    }
+
+    return new Promise((resolve) => {
+      this.#queue.enqueue(resolve)
+    })
+  }
+
+  unlock() {
+    if (this.#queue.size > 0) {
+      const resolve = this.#queue.dequeue()
+      resolve()
+    } else {
+      this.#isLocked = false
+    }
+  }
+
+  async withLock(task) {
+    try {
+      if (!this.tryLock()) {
+        await this.lock()
+      }
+      return await task()
+    } finally {
+      this.unlock()
+    }
+  }
+
+  get isLocked() {
+    return this.#isLocked
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "20.1.1",
+  "version": "20.2.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -16,6 +16,7 @@
     "elasticsearch.js",
     "merge-ranges.js",
     "http.js",
+    "mutex.js",
     "s3.js",
     "time.js",
     "deepstream.js",
@@ -79,7 +80,8 @@
     "split-string": "^6.0.0",
     "undici": "^6.19.7",
     "url-join": "^5.0.0",
-    "xuid": "^4.1.3"
+    "xuid": "^4.1.3",
+    "yocto-queue": "^1.1.1"
   },
   "devDependencies": {
     "@nxtedition/deepstream.io-client-js": ">=25.6.3",

package/platform.js

@@ -1,6 +1,6 @@
 export const SIGNALS =
   typeof process === 'object'
-    ? {
+    ? ({
         linux: {
           129: 'SIGHUP', //  1
           130: 'SIGINT', //  2
@@ -34,5 +34,5 @@ export const SIGNALS =
           158: 'SIGPWR', // 30
           159: 'SIGSYS', // 31
         },
-      }[process.platform] ?? {}
+      }[process.platform] ?? {})
     : {}

package/s3.js

@@ -321,7 +321,7 @@ function getTransformedHeaders(headers) {
     const headerValues = headers[name]
     transformedHeaders[name] = Array.isArray(headerValues)
       ? headerValues.join(',')
-      : headerValues ?? ''
+      : (headerValues ?? '')
   }
 
   return transformedHeaders