@nxtedition/lib 26.0.27 → 26.0.29

package/app.js

@@ -39,8 +39,7 @@ import undici from '@nxtedition/undici'
 import { isPrimary } from 'node:cluster'
 import { nice } from '@napi-rs/nice'
 import path from 'node:path'
-
-import { sched_setaffinity, sched_getaffinity } from '@nxtedition/sched'
+import { sched_getaffinity, sched_setaffinity } from '@nxtedition/sched'
 
 export function makeApp(appConfig, onTerminate) {
   let ds
@@ -127,13 +126,17 @@ export function makeApp(appConfig, onTerminate) {
   const appDestroyers = []
 
   const serviceName = appConfig.name
-  const serviceModule = appConfig.module ?? 'main'
   const serviceVersion = appConfig.version
+  const serviceModule = appConfig.module ?? 'main'
   const serviceWorkerId = appConfig.workerId ?? threadId
   const serviceInstanceId =
     // process.env.name is the pm2 name of the process
     appConfig.instanceId ?? appConfig.containerId ?? process.env.name ?? os.hostname()
 
+  if (!serviceName) {
+    throw new Error('Service name is required')
+  }
+
   const userAgent = (globalThis.userAgent =
     appConfig.userAgent ??
     (serviceName &&
@@ -313,50 +316,53 @@ export function makeApp(appConfig, onTerminate) {
     }
   }
 
-  if (appConfig.affinity != null && process.platform === 'linux') {
-    try {
-      const nodes = []
-      for (const entry of fs.readdirSync('/sys/devices/system/node')) {
-        if (!entry.startsWith('node')) {
-          continue
-        }
+  let affinity = null
+  if (isMainThread && appConfig.affinity !== false && process.platform === 'linux') {
+    const allNodes = []
+    for (const entry of fs.readdirSync('/sys/devices/system/node')) {
+      if (!entry.startsWith('node')) {
+        continue
+      }
 
-        const cpulist = fs
-          .readFileSync(path.join('/sys/devices/system/node', entry, 'cpulist'), 'utf8')
-          .trim()
-        const cpus = []
-        for (const part of cpulist.split(',')) {
-          if (part.includes('-')) {
-            const [start, end] = part.split('-').map(Number)
-            for (let i = start; i <= end; i++) cpus.push(i)
-          } else {
-            cpus.push(Number(part))
+      const cpulist = fs
+        .readFileSync(path.join('/sys/devices/system/node', entry, 'cpulist'), 'utf8')
+        .trim()
+      const cpus = []
+      for (const part of cpulist.split(',')) {
+        if (part.includes('-')) {
+          const [start, end] = part.split('-').map(Number)
+          for (let i = start; i <= end; i++) {
+            cpus.push(i)
           }
+        } else {
+          cpus.push(Number(part))
         }
-        nodes.push(cpus)
       }
+      allNodes.push(cpus)
+    }
 
-      let indices
-      if (typeof appConfig.affinity === 'number') {
-        indices = [appConfig.affinity]
-      } else if (Array.isArray(appConfig.affinity)) {
-        indices = appConfig.affinity
-      } else {
-        indices = [Math.floor(Math.random() * nodes.length)]
-      }
+    if (Number.isInteger(appConfig.affinity) && appConfig.affinity >= 0) {
+      affinity = allNodes[appConfig.affinity % allNodes.length]
+    } else if (appConfig.affinity == null) {
+      affinity = allNodes[hashString(serviceName) % allNodes.length]
+    } else {
+      throw new Error('invalid affinity configuration: ' + appConfig.affinity)
+    }
 
-      if (indices?.length > 0) {
-        let affinity = []
-        for (const index of indices) {
-          affinity = fp.union(affinity, nodes[index % nodes.length])
-        }
+    affinity = fp.uniq(affinity)
+    affinity = fp.intersection(affinity, sched_getaffinity(0))
 
-        const next = affinity
-        const prev = sched_getaffinity(0)
+    if (
+      !Array.isArray(affinity) ||
+      affinity.length === 0 ||
+      affinity.some((x) => typeof x !== 'number' || x < 0)
+    ) {
+      throw new Error('invalid affinity configuration: ' + appConfig.affinity)
+    }
 
-        sched_setaffinity(0, fp.intersection(prev, next))
-        logger.debug({ data: { prev, next, nodes, affinity } }, 'sched_setaffinity succeeded')
-      }
+    try {
+      sched_setaffinity(0, affinity)
+      logger.debug({ data: { value: appConfig.affinity, affinity } }, 'sched_setaffinity succeeded')
     } catch (err) {
       logger.error({ err }, 'sched_setaffinity failed')
     }
@@ -1327,5 +1333,6 @@ export function makeApp(appConfig, onTerminate) {
     serviceInstanceId,
     serviceWorkerId,
     signal: ac.signal,
+    affinity,
   })
 }

package/package.json

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