@nxtedition/lib 27.0.4 → 27.0.6

package/app.js

@@ -589,10 +589,7 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
             if (numa != null) {
               try {
                 const affinity = numa.setAffinity(numa)
-                logger.debug(
-                  { hostname: config.hostname, numa, affinity },
-                  'net numa succeeded',
-                )
+                logger.debug({ hostname: config.hostname, numa, affinity }, 'net numa succeeded')
               } catch (err) {
                 logger.error({ err, hostname: config.hostname, numa }, 'net numa failed')
               }

package/couch.js

@@ -1,14 +1,17 @@
 import assert from 'node:assert'
 import stream from 'node:stream'
 import querystring from 'node:querystring'
+import tp from 'node:timers/promises'
+
 import createError from 'http-errors'
-import { makeWeakCache } from '@nxtedition/weak-cache'
-import { defaultDelay as delay } from './http.js'
 import urljoin from 'url-join'
-import { AbortError } from './errors.js'
-import { dispatch, Agent, Pool, request as undiciRequest } from '@nxtedition/nxt-undici'
 import urlJoin from 'url-join'
 
+import { dispatch, Agent, Pool, request as undiciRequest } from '@nxtedition/nxt-undici'
+import { makeWeakCache } from '@nxtedition/weak-cache'
+
+import { AbortError } from './errors.js'
+
 export function makeCouch(opts) {
   let config
   if (typeof opts === 'string') {
@@ -249,6 +252,7 @@ export function makeCouch(opts) {
     blocking = live || !params.limit || params.limit > 256,
   }) {
     let retryCount = 0
+    let retryTime = 0
     while (true) {
       let src
       try {
@@ -279,6 +283,7 @@ export function makeCouch(opts) {
         const ures = await undiciRequest(ureq)
 
         retryCount = 0
+        retryTime = 0
 
         src = ures.body
 
@@ -288,6 +293,7 @@ export function makeCouch(opts) {
         let error = null
         let ended = false
         let state = 0
+        let since = params.since || '0'
 
         function maybeResume() {
           if (resume) {
@@ -328,8 +334,8 @@ export function makeCouch(opts) {
             for (const line of lines) {
               if (line === '') {
                 // hearbeat
-                const ret = []
-                ret.lastSeq = params.since
+                const ret = changes.splice(0)
+                ret.lastSeq = params.since = since
                 yield ret
               } else if (line === ',') {
                 // Do nothing. Couch sometimes insert new line between
@@ -337,9 +343,9 @@ export function makeCouch(opts) {
               } else if (live) {
                 const data = JSON.parse(line)
                 if (data.last_seq) {
-                  params.since = data.last_seq
+                  since = data.last_seq
                 } else {
-                  params.since = data.seq || params.since
+                  since = data.seq || since
                   changes.push(data)
                 }
               } else {
@@ -358,7 +364,7 @@ export function makeCouch(opts) {
                     try {
                       assert(idx >= 0, 'invalid row: ' + idx + ' ' + line)
                       const change = JSON.parse(line.slice(0, idx))
-                      params.since = change.seq || params.since
+                      since = change.seq || since
                       changes.push(change)
                     } catch (err) {
                       throw Object.assign(err, { data: line })
@@ -373,7 +379,7 @@ export function makeCouch(opts) {
             }
           } else if (changes.length) {
             const ret = changes.splice(0)
-            ret.lastSeq = params.since
+            ret.lastSeq = params.since = since
             yield ret
           } else if (error) {
             throw error
@@ -382,26 +388,66 @@ export function makeCouch(opts) {
               resume = resolve
             })
           } else {
-            const ret = []
-            ret.lastSeq = params.since
+            const ret = changes.splice(0)
+            ret.lastSeq = params.since = since
             yield ret
             return
           }
         }
       } catch (err) {
-        if (err.name === 'AbortError') {
+        if (err.name === 'AbortError' || !retry) {
           throw err
-        } else if (typeof retry === 'function') {
-          const retryState = { since: params.since }
-          Object.assign(
-            retryState,
-            await retry(err, retryCount++, retryState, { signal, logger }, () =>
-              delay(err, retryCount, { signal, logger }),
-            ),
-          )
-          params.since = retryState.since ?? 0
         } else {
-          await delay(err, retryCount, { signal, logger })
+          retryTime ||= Date.now()
+          const retryState = { since: params.since, time: retryTime, count: retryCount }
+          await retry(err, retryCount++, retryState, { signal, logger }, () => {
+            const { statusCode, code, message, headers } = err
+
+            if (retryTime && Date.now() - retryTime > 2 * 60e3) {
+              throw err
+            }
+
+            if (statusCode && [420, 429, 502, 503, 504].includes(statusCode)) {
+              const retryAfter = headers?.['retry-after']
+                ? Number(headers['retry-after']) * 1e3
+                : null
+              const delay =
+                retryAfter != null && Number.isFinite(retryAfter)
+                  ? retryAfter
+                  : Math.min(10e3, retryCount * 1e3)
+              return tp.setTimeout(delay, true, { signal: opts?.signal ?? undefined })
+            }
+
+            if (
+              [
+                'ECONNRESET',
+                'ECONNREFUSED',
+                'ENOTFOUND',
+                'ENETDOWN',
+                'ENETUNREACH',
+                'EHOSTDOWN',
+                'EHOSTUNREACH',
+                'EPIPE',
+                'EAI_AGAIN',
+                'ENODATA',
+                'UND_ERR_CONNECT_TIMEOUT',
+                'UND_ERR_SOCKET',
+              ].includes(code)
+            ) {
+              return tp.setTimeout(Math.min(10e3, retryCount * 1e3), true, {
+                signal: opts?.signal ?? undefined,
+              })
+            }
+
+            if (['other side closed'].includes(message)) {
+              return tp.setTimeout(Math.min(10e3, retryCount * 1e3), true, {
+                signal: opts?.signal ?? undefined,
+              })
+            }
+
+            throw err
+          })
+          params.since = retryState.since ?? 0
         }
       } finally {
         src?.on('error', () => {}).destroy()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "27.0.4",
+  "version": "27.0.6",
   "license": "UNLICENSED",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -44,19 +44,20 @@
     "under-pressure.js"
   ],
   "scripts": {
-    "test": "node --test-timeout 60000 --test",
-    "test:types": "tsd"
+    "test": "node --test-timeout 60000 --test"
   },
   "dependencies": {
     "@elastic/elasticsearch": "^8.17.1",
     "@elastic/transport": "^8.9.3",
-    "@nxtedition/nxt-undici": "^6.4.17",
+    "@nxtedition/nxt-undici": "^7.1.4",
     "@nxtedition/sched": "^1.0.2",
-    "@nxtedition/template": "^1.0.0",
-    "@nxtedition/weak-cache": "^1.0.0",
+    "@nxtedition/template": "^1.0.2",
+    "@nxtedition/weak-cache": "^1.0.1",
     "diff": "5.2.0",
+    "eslint": "^9.38.0",
     "fast-querystring": "^1.1.2",
     "http-errors": "^2.0.0",
+    "lerna": "^9.0.0",
     "lodash": "^4.17.21",
     "lru-cache": "^11.2.2",
     "mime": "^4.0.7",
@@ -66,18 +67,22 @@
     "pino": "^10.1.0",
     "qs": "^6.14.0",
     "request-target": "^1.0.2",
+    "typescript-eslint": "^8.46.2",
     "url-join": "^5.0.0",
     "xuid": "^4.1.5",
-    "yocto-queue": "^1.2.1"
+    "yocto-queue": "^1.2.2"
   },
   "devDependencies": {
-    "@nxtedition/deepstream.io-client-js": ">=31.2.1",
+    "@nxtedition/deepstream.io-client-js": ">=31.2.9",
     "@types/lodash": "^4.17.20",
-    "@types/node": "^24.9.1",
+    "@types/node": "^24.10.1",
     "canvas": "^3.1.0",
+    "eslint": "^9.39.1",
+    "lerna": "^9.0.1",
     "rxjs": "^7.8.2",
     "tsd": "^0.33.0",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.46.4"
   },
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.6.0",
@@ -87,5 +92,5 @@
     "pino": ">=7.0.0",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "be0475e7b0d724ba6f2f9fdbaa0c3f069e49e6a7"
+  "gitHead": "0a3d683b790eeeb5f198316a27e205f84bf93c9e"
 }