@nxtedition/lib 27.0.1 → 27.0.3

package/app.js

@@ -363,22 +363,6 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
     }
   }
 
-  let affinity = null
-
-  if (process.platform === 'linux' && appConfig.numa != null && appConfig.numa !== '') {
-    let numa = appConfig.numa
-    if (numa == 'auto' || numa === true) {
-      numa = hashString(JSON.stringify({ serviceName, serviceModule }))
-    }
-
-    try {
-      affinity = setAffinity(numa)
-      logger.debug({ data: { numa: appConfig.numa, affinity } }, 'set numa affinity succeeded')
-    } catch (err) {
-      logger.error({ err, data: { numa: appConfig.numa } }, 'set numa affinity failed')
-    }
-  }
-
   if (appConfig.toobusy) {
     const resolution = appConfig.toobusy.resolution ?? 10
     const interval = appConfig.toobusy.interval ?? 500
@@ -576,6 +560,63 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
     appDestroyers.unshift(() => ds.close())
   }
 
+  if (process.platform === 'linux' && appConfig.numa != null && appConfig.numa !== '') {
+    let numa = appConfig.numa
+    if (numa == 'auto' || numa === true) {
+      numa = hashString(
+        JSON.stringify({ serviceName, serviceModule, serviceInstanceId, serviceWorkerId }),
+      )
+    }
+
+    if (numa === 'net') {
+      if (config.hostname) {
+        if (!ds) {
+          throw new Error('deepstream is required for net numa')
+        }
+        ds.record
+          .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) {
+              try {
+                const affinity = numa.setAffinity(numaNode)
+                logger.debug(
+                  { hostname: config.hostname, numaNode, affinity },
+                  'net numa succeeded',
+                )
+              } catch (err) {
+                logger.error({ err, hostname: config.hostname, numaNode }, 'net numa failed')
+              }
+            } else {
+              logger.warn({ hostname: config.hostname, numaNode }, 'net numa missing')
+            }
+          })
+      }
+    } else {
+      try {
+        const affinity = setAffinity(numa)
+        logger.debug({ data: { numa: appConfig.numa, affinity } }, 'set numa affinity succeeded')
+      } catch (err) {
+        logger.error({ err, data: { numa: appConfig.numa } }, 'set numa affinity failed')
+      }
+    }
+  }
+
   if (appConfig.compiler) {
     compiler = makeTemplateCompiler({ ds, logger, ...appConfig.compiler })
   }
@@ -1289,6 +1330,5 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
     serviceInstanceId,
     serviceWorkerId,
     signal: ac.signal,
-    affinity,
   })
 }

package/numa.js

@@ -4,10 +4,17 @@ import path from 'node:path'
 import { sched_setaffinity } from '@nxtedition/sched'
 
 function parseRange(value) {
+  if (typeof value !== 'string') {
+    throw new Error('CPU range must be a string')
+  }
+
   const range = []
   for (const part of value.split(',')) {
     if (part.includes('-')) {
-      const [start, end] = part.split('-').map(Number)
+      const [start, end, ...rest] = part.split('-').map(Number)
+      if (rest.length > 0) {
+        throw new Error('Invalid CPU range')
+      }
       for (let i = start; i <= end; i++) {
         range.push(i)
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "27.0.1",
+  "version": "27.0.3",
   "license": "UNLICENSED",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -87,5 +87,5 @@
     "pino": ">=7.0.0",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "18e2d636f4420547cee8ac6ea96e32554d75a1eb"
+  "gitHead": "383b7fe1d10a8b7d80aa80ea81e7828f415d248d"
 }