@nxtedition/lib 26.0.29 → 26.0.31

package/app.js

@@ -317,7 +317,11 @@ export function makeApp(appConfig, onTerminate) {
   }
 
   let affinity = null
-  if (isMainThread && appConfig.affinity !== false && process.platform === 'linux') {
+  if (
+    process.platform === 'linux' &&
+    (isMainThread || appConfig.affinity != null) &&
+    appConfig.affinity !== false
+  ) {
     const allNodes = []
     for (const entry of fs.readdirSync('/sys/devices/system/node')) {
       if (!entry.startsWith('node')) {
@@ -341,28 +345,33 @@ export function makeApp(appConfig, onTerminate) {
       allNodes.push(cpus)
     }
 
-    if (Number.isInteger(appConfig.affinity) && appConfig.affinity >= 0) {
-      affinity = allNodes[appConfig.affinity % allNodes.length]
+    let indices = []
+    if (Number.isInteger(appConfig.affinity)) {
+      indices = [appConfig.affinity % allNodes.length]
     } else if (appConfig.affinity == null) {
-      affinity = allNodes[hashString(serviceName) % allNodes.length]
+      indices = [hashString(serviceName) % allNodes.length]
     } else {
       throw new Error('invalid affinity configuration: ' + appConfig.affinity)
     }
 
+    affinity = indices.flatMap((i) => allNodes[i] ?? [])
     affinity = fp.uniq(affinity)
     affinity = fp.intersection(affinity, sched_getaffinity(0))
 
     if (
       !Array.isArray(affinity) ||
       affinity.length === 0 ||
-      affinity.some((x) => typeof x !== 'number' || x < 0)
+      affinity.some((x) => !Number.isInteger(x) || x < 0)
     ) {
       throw new Error('invalid affinity configuration: ' + appConfig.affinity)
     }
 
     try {
       sched_setaffinity(0, affinity)
-      logger.debug({ data: { value: appConfig.affinity, affinity } }, 'sched_setaffinity succeeded')
+      logger.debug(
+        { data: { value: appConfig.affinity, affinity, indices } },
+        'sched_setaffinity succeeded',
+      )
     } catch (err) {
       logger.error({ err }, 'sched_setaffinity failed')
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "26.0.29",
+  "version": "26.0.31",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",