@nxtedition/lib 27.0.3 → 27.0.6

package/app.js

@@ -562,7 +562,7 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
 
   if (process.platform === 'linux' && appConfig.numa != null && appConfig.numa !== '') {
     let numa = appConfig.numa
-    if (numa == 'auto' || numa === true) {
+    if (numa == 'auto' || numa === true || numa === 'hash') {
       numa = hashString(
         JSON.stringify({ serviceName, serviceModule, serviceInstanceId, serviceWorkerId }),
       )
@@ -577,33 +577,24 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
           .observe(`${config.hostname}:monitor.stats?`, ds.record.PROVIDER)
           .pipe(
             rxjs.map((stats) => stats?.net?.bonding?.[0]?.numaNode ?? null),
-            rxjs.filter((n) => Number.isInteger(n) && n >= 0),
-            rxjs.timeout({
-              first: 10e3,
-              with: () => rxjs.of(null),
-            }),
             rxjs.distinctUntilChanged(),
             rxjs.retry({
-              resetOnSuccess: true,
               delay(err, retryCount) {
                 logger.error({ err, retryCount }, 'net numa failed')
                 return rxjs.timer(10e3)
               },
             }),
           )
-          .subscribe((numaNode) => {
-            if (numaNode != null) {
+          .subscribe((numa) => {
+            if (numa != null) {
               try {
-                const affinity = numa.setAffinity(numaNode)
-                logger.debug(
-                  { hostname: config.hostname, numaNode, affinity },
-                  'net numa succeeded',
-                )
+                const affinity = numa.setAffinity(numa)
+                logger.debug({ hostname: config.hostname, numa, affinity }, 'net numa succeeded')
               } catch (err) {
-                logger.error({ err, hostname: config.hostname, numaNode }, 'net numa failed')
+                logger.error({ err, hostname: config.hostname, numa }, 'net numa failed')
               }
             } else {
-              logger.warn({ hostname: config.hostname, numaNode }, 'net numa missing')
+              logger.warn({ hostname: config.hostname, numa }, 'net numa missing')
             }
           })
       }

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/numa.js

@@ -5,66 +5,100 @@ import { sched_setaffinity } from '@nxtedition/sched'
 
 function parseRange(value) {
   if (typeof value !== 'string') {
-    throw new Error('CPU range must be a string')
+    throw new Error('range must be a string')
   }
 
   const range = []
   for (const part of value.split(',')) {
-    if (part.includes('-')) {
-      const [start, end, ...rest] = part.split('-').map(Number)
+    const trimmed = part.trim()
+    if (!trimmed) {
+      continue
+    }
+
+    if (trimmed.includes('-')) {
+      const [startStr, endStr, ...rest] = trimmed.split('-')
+
       if (rest.length > 0) {
-        throw new Error('Invalid CPU range')
+        throw new Error(`Invalid range: "${trimmed}"`)
+      }
+
+      const start = Number(startStr)
+      const end = Number(endStr)
+
+      if (!Number.isInteger(start) || !Number.isInteger(end) || start < 0 || end < 0) {
+        throw new Error(`Invalid number in range: "${trimmed}"`)
       }
+
+      if (end < start) {
+        throw new Error(`Invalid range order: "${trimmed}" (end < start)`)
+      }
+
       for (let i = start; i <= end; i++) {
         range.push(i)
       }
-    } else if (part) {
-      range.push(Number(part))
+    } else {
+      const num = Number(trimmed)
+      if (!Number.isInteger(num) || num < 0) {
+        throw new Error(`Invalid number: "${trimmed}"`)
+      }
+      range.push(num)
     }
   }
-  if (range.some((x) => !Number.isInteger(x) || x < 0)) {
-    throw new Error('Invalid CPU range')
-  }
-  return range
+
+  return [...new Set(range)].sort((a, b) => a - b)
 }
 
 /**
  *
- * @param {number|number[]} numa
+ * @param {null|number|number[]} numa
  * @returns {number[]}
  */
 export function setAffinity(numa) {
-  const indices = Array.from(new Set([numa].flat()))
-  if (indices.some((x) => !Number.isInteger(x) || x < 0)) {
-    throw new Error('NUMA node must be a non-negative integer')
-  }
+  let affinity
 
-  const isolated = parseRange(fs.readFileSync('/sys/devices/system/cpu/isolated', 'utf8').trim())
+  if (numa === null) {
+    affinity = parseRange(fs.readFileSync('/sys/devices/system/cpu/present', 'utf8').trim())
+  } else {
+    if (numa.some((x) => !Number.isInteger(x) || x < 0)) {
+      throw new Error(
+        'NUMA node must be null, a non-negative integer or array of non-negative integers',
+      )
+    }
 
-  const allNodes = []
-  for (const entry of fs.readdirSync('/sys/devices/system/node')) {
-    if (!entry.startsWith('node')) {
-      continue
+    const allNodes = []
+    for (const entry of fs.readdirSync('/sys/devices/system/node')) {
+      if (!/^node\d+$/.test(entry)) {
+        continue
+      }
+
+      const cpulist = fs
+        .readFileSync(path.join('/sys/devices/system/node', entry, 'cpulist'), 'utf8')
+        .trim()
+
+      allNodes.push(parseRange(cpulist))
     }
 
-    const cpulist = fs
-      .readFileSync(path.join('/sys/devices/system/node', entry, 'cpulist'), 'utf8')
-      .trim()
+    if (allNodes.length === 0) {
+      throw new Error('No NUMA nodes found')
+    }
 
-    allNodes.push(parseRange(cpulist))
+    affinity = numa.flatMap((i) => allNodes[i % allNodes.length] ?? [])
   }
 
-  if (allNodes.length === 0) {
-    throw new Error('No NUMA nodes found')
+  const isolated = parseRange(fs.readFileSync('/sys/devices/system/cpu/isolated', 'utf8').trim())
+
+  affinity = affinity.filter((cpu) => !isolated.includes(cpu))
+  affinity = [...new Set(affinity)].sort((a, b) => a - b)
+
+  if (affinity.length === 0) {
+    throw new Error('Resulting CPU affinity is empty')
   }
 
-  const affinity = indices
-    .flatMap((i) => allNodes[i % allNodes.length] ?? [])
-    .filter((cpu) => !isolated.includes(cpu))
   sched_setaffinity(0, affinity)
+
   globalThis.__nxt_sched_affinity = {
     cpulist: affinity,
-    nodelist: indices,
   }
+
   return affinity
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "27.0.3",
+  "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-alpha.0",
-    "@nxtedition/weak-cache": "^1.0.0-alpha.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": "383b7fe1d10a8b7d80aa80ea81e7828f415d248d"
+  "gitHead": "0a3d683b790eeeb5f198316a27e205f84bf93c9e"
 }

package/time.js

@@ -10,19 +10,9 @@ export function fastNow() {
   return fastNowTime
 }
 
-export function isTimeBetween(date, startTime, endTime, isUTC) {
-  let currentHours = date.getHours()
-  let currentMinutes = date.getMinutes()
-
-  if (isUTC) {
-    currentHours = date.getUTCHours()
-    currentMinutes = date.getUTCMinutes()
-  } else {
-    // Convert local time to UTC equivalent
-    const utcDate = new Date(date.getTime() + date.getTimezoneOffset() * 60000)
-    currentHours = utcDate.getUTCHours()
-    currentMinutes = utcDate.getUTCMinutes()
-  }
+export function isTimeBetween(date, startTime, endTime) {
+  const currentHours = date.getHours()
+  const currentMinutes = date.getMinutes()
 
   // Validate and parse start and end times
   if (!startTime) startTime = '00:00' // Default start at midnight