@nxtedition/lib 27.0.0-alpha.0 → 27.0.0

package/app.js

@@ -1,3 +1,4 @@
+import { readFileSync } from 'node:fs'
 import * as inspector from 'node:inspector'
 import fs from 'node:fs'
 import os from 'node:os'
@@ -7,9 +8,9 @@ import assert from 'node:assert'
 import cluster from 'node:cluster'
 import stream from 'node:stream'
 import { Buffer } from 'node:buffer'
-import { getDockerSecretsSync } from './docker-secrets.js'
-import { getUTCRangeForLocalTime } from './time.js'
-import fp from 'lodash/fp.js'
+import v8 from 'node:v8'
+import { isPrimary } from 'node:cluster'
+import { monitorEventLoopDelay } from 'node:perf_hooks'
 import {
   isMainThread,
   parentPort,
@@ -17,13 +18,16 @@ import {
   BroadcastChannel,
   resourceLimits,
 } from 'node:worker_threads'
+
+import { getDockerSecretsSync } from './docker-secrets.js'
+import { getUTCRangeForLocalTime } from './time.js'
+import fp from 'lodash/fp.js'
 import deepstream from '@nxtedition/deepstream.io-client-js'
 import { createLogger } from './logger.js'
 import nconf from 'nconf'
 import { makeCouch } from './couch.js'
 import { makeTemplateCompiler } from '@nxtedition/template'
 import { makeDeepstream } from './deepstream.js'
-import v8 from 'v8'
 import * as rxjs from 'rxjs'
 import rx from 'rxjs/operators'
 import { performance } from 'perf_hooks'
@@ -31,15 +35,18 @@ import hashString from './hash.js'
 import { makeTrace } from './trace.js'
 import { compose, createServer } from './http.js'
 import { json } from 'node:stream/consumers'
-import { monitorEventLoopDelay } from 'node:perf_hooks'
 import xuid from 'xuid'
 import { isTimeBetween } from './time.js'
 import makeUnderPressure from './under-pressure.js'
-import { isPrimary } from 'node:cluster'
 import { nice } from '@nxtedition/sched'
 import { setAffinity } from './numa.js'
 
-export function makeApp(appConfig, onTerminate) {
+/**
+ * @param {object} appConfig
+ * @param {object} [meta]
+ * @returns {object}
+ */
+export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
   let ds
   let nxt
   let couch
@@ -49,6 +56,27 @@ export function makeApp(appConfig, onTerminate) {
   let logger
   let trace
 
+  let onTerminate
+  let meta
+
+  if (typeof onTerminateOrMeta === 'function') {
+    meta = metaOrNull
+  } else {
+    meta = onTerminateOrMeta ?? metaOrNull
+  }
+
+  if (onTerminate != null && typeof onTerminateOrMeta !== 'function') {
+    throw new Error('onTerminate must be a function or null')
+  }
+
+  if (meta != null && typeof meta !== 'object') {
+    throw new Error('meta must be an object or null')
+  }
+
+  const pkg = meta?.url
+    ? JSON.parse(readFileSync(new URL('../package.json', meta.url).pathname).toString())
+    : null
+
   /** @type {Array<rxjs.Subscription|Function|AsyncFunction|Disposable|AsyncDisposable>} */
   const destroyers = []
 
@@ -119,6 +147,9 @@ export function makeApp(appConfig, onTerminate) {
     }
   }
 
+  appConfig.name ||= pkg?.name ?? null
+  appConfig.version ||= pkg?.version ?? null
+
   assert(appConfig.name, 'name is required')
 
   const appDestroyers = []

package/couch.d.ts

@@ -21,6 +21,7 @@ export interface CouchRequestOptions<Stream extends boolean = false> {
   bodyTimeout?: number
   dispatcher?: Dispatcher
   query?: {
+    key?: string
     startkey?: string
     endkey?: string
     update?: boolean

package/numa.js

@@ -3,6 +3,21 @@ import path from 'node:path'
 
 import { sched_setaffinity } from '@nxtedition/sched'
 
+function parseRange(value) {
+  const range = []
+  for (const part of value.split(',')) {
+    if (part.includes('-')) {
+      const [start, end] = part.split('-').map(Number)
+      for (let i = start; i <= end; i++) {
+        range.push(i)
+      }
+    } else {
+      range.push(Number(part))
+    }
+  }
+  return range
+}
+
 /**
  *
  * @param {number|number[]} numa
@@ -14,6 +29,8 @@ export function setAffinity(numa) {
     throw new Error('NUMA node must be a non-negative integer')
   }
 
+  const isolated = parseRange(fs.readFileSync('/sys/devices/system/cpu/isolated', 'utf8').trim())
+
   const allNodes = []
   for (const entry of fs.readdirSync('/sys/devices/system/node')) {
     if (!entry.startsWith('node')) {
@@ -23,25 +40,17 @@ export function setAffinity(numa) {
     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))
-      }
-    }
-    allNodes.push(cpus)
+
+    allNodes.push(parseRange(cpulist))
   }
 
   if (allNodes.length === 0) {
     throw new Error('No NUMA nodes found')
   }
 
-  const affinity = indices.flatMap((i) => allNodes[i % allNodes.length] ?? [])
+  const affinity = indices
+    .flatMap((i) => allNodes[i % allNodes.length] ?? [])
+    .filter((cpu) => !isolated.includes(cpu))
   sched_setaffinity(0, affinity)
   globalThis.__nxt_sched_affinity = {
     cpulist: affinity,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "27.0.0-alpha.0",
+  "version": "27.0.0",
   "license": "UNLICENSED",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -87,5 +87,5 @@
     "pino": ">=7.0.0",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "7e4d71a9276d64d7cb8c39eaed681121903e16a4"
+  "gitHead": "8c7a9f6b7dbf185d39f5927c779265415fb29bfb"
 }