numux 1.17.0 → 1.18.0

package/README.md

@@ -311,7 +311,7 @@ Persistent processes that crash are auto-restarted with exponential backoff (1s
 
 ### Dependency output capture
 
-When `readyPattern` is a `RegExp` (not a string), capture groups are extracted on match and expanded into dependent process commands using `$process.group` syntax:
+When `readyPattern` is a `RegExp` (not a string), capture groups are extracted on match and expanded into dependent process `command` and `env` values using `$process.group` syntax:
 
 ```ts
 export default defineConfig({
@@ -323,6 +323,7 @@ export default defineConfig({
     api: {
       command: 'node server.js --db-port $db.port',
       dependsOn: ['db'],
+      env: { DB_PORT: '$db.port' },
     },
   },
 })

package/dist/numux.js

@@ -36,7 +36,7 @@ var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports,
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "numux",
-    version: "1.17.0",
+    version: "1.18.0",
     description: "Terminal multiplexer with dependency orchestration",
     type: "module",
     license: "MIT",
@@ -1419,6 +1419,7 @@ class ProcessRunner {
   restarting = false;
   readyTimedOut = false;
   commandOverride;
+  envOverride;
   constructor(name, config, handler) {
     this.name = name;
     this.config = config;
@@ -1432,9 +1433,11 @@ class ProcessRunner {
   get signal() {
     return this.config.stopSignal ?? "SIGTERM";
   }
-  start(cols, rows, commandOverride) {
+  start(cols, rows, commandOverride, envOverride) {
     if (commandOverride !== undefined)
       this.commandOverride = commandOverride;
+    if (envOverride !== undefined)
+      this.envOverride = envOverride;
     const command = this.commandOverride ?? this.config.command;
     const gen = ++this.generation;
     this.stopping = false;
@@ -1449,7 +1452,7 @@ class ProcessRunner {
         ...noColor ? {} : { FORCE_COLOR: "1" },
         TERM: "xterm-256color",
         ...envFromFile,
-        ...this.config.env
+        ...this.envOverride ?? this.config.env
       };
       this.proc = Bun.spawn(["sh", "-c", command], {
         cwd,
@@ -1567,7 +1570,7 @@ class ProcessRunner {
     this.handler.onStatus("ready");
     this.handler.onReady(this.readiness.captures);
   }
-  async restart(cols, rows, commandOverride) {
+  async restart(cols, rows, commandOverride, envOverride) {
     if (this.restarting)
       return;
     this.restarting = true;
@@ -1592,7 +1595,7 @@ class ProcessRunner {
     this.readyTimedOut = false;
     this.readiness = createReadinessChecker(this.config);
     this.errorChecker = createErrorChecker(this.config);
-    this.start(cols, rows, commandOverride);
+    this.start(cols, rows, commandOverride, envOverride);
   }
   async stop(timeoutMs = 5000) {
     if (!this.proc)
@@ -1737,7 +1740,7 @@ class ProcessManager {
     this.setupWatchers();
   }
   startProcess(name, cols, rows) {
-    const commandOverride = this.expandDependencyCaptures(name);
+    const { command, env } = this.expandDependencyCaptures(name);
     const delay = this.config.processes[name].delay;
     if (delay) {
       log(`[${name}] Delaying start by ${delay}ms`);
@@ -1746,12 +1749,12 @@ class ProcessManager {
         if (this.stopping)
           return;
         this.startTimes.set(name, Date.now());
-        this.runners.get(name).start(cols, rows, commandOverride);
+        this.runners.get(name).start(cols, rows, command, env);
       }, delay);
       this.restartTimers.set(name, timer);
     } else {
       this.startTimes.set(name, Date.now());
-      this.runners.get(name).start(cols, rows, commandOverride);
+      this.runners.get(name).start(cols, rows, command, env);
     }
   }
   createRunner(name, onInitialReady) {
@@ -1860,7 +1863,7 @@ class ProcessManager {
     const proc = this.config.processes[name];
     const deps = proc.dependsOn;
     if (!deps?.length)
-      return;
+      return {};
     const allCaptures = new Map;
     for (const dep of deps) {
       const captures = this.readyCaptures.get(dep);
@@ -1868,19 +1871,33 @@ class ProcessManager {
         allCaptures.set(dep, captures);
     }
     if (allCaptures.size === 0)
-      return;
+      return {};
     const depNames = [...allCaptures.keys()].map((n) => escapeRegExp(n)).join("|");
     const refPattern = new RegExp(`\\$(${depNames})\\.(\\w+)`, "g");
-    let hadReplacement = false;
-    const expanded = proc.command.replace(refPattern, (match, dep, key) => {
+    const replacer = (match, dep, key) => {
       const captures = allCaptures.get(dep);
-      if (captures && key in captures) {
-        hadReplacement = true;
+      if (captures && key in captures)
         return captures[key];
-      }
       return match;
-    });
-    return hadReplacement ? expanded : undefined;
+    };
+    let command;
+    const expandedCmd = proc.command.replace(refPattern, replacer);
+    if (expandedCmd !== proc.command)
+      command = expandedCmd;
+    let env;
+    if (proc.env) {
+      const expandedEnv = {};
+      let hadReplacement = false;
+      for (const [k, v] of Object.entries(proc.env)) {
+        const expanded = v.replace(refPattern, replacer);
+        expandedEnv[k] = expanded;
+        if (expanded !== v)
+          hadReplacement = true;
+      }
+      if (hadReplacement)
+        env = expandedEnv;
+    }
+    return { command, env };
   }
   updateStatus(name, status) {
     const state = this.states.get(name);
@@ -1908,7 +1925,8 @@ class ProcessManager {
     state.exitCode = null;
     state.restartCount++;
     this.startTimes.set(name, Date.now());
-    runner.restart(cols, rows, this.expandDependencyCaptures(name));
+    const { command, env } = this.expandDependencyCaptures(name);
+    runner.restart(cols, rows, command, env);
   }
   async stop(name) {
     const state = this.states.get(name);
@@ -1946,7 +1964,8 @@ class ProcessManager {
     state.exitCode = null;
     state.restartCount++;
     this.startTimes.set(name, Date.now());
-    this.runners.get(name)?.restart(cols, rows, this.expandDependencyCaptures(name));
+    const { command, env } = this.expandDependencyCaptures(name);
+    this.runners.get(name)?.restart(cols, rows, command, env);
   }
   restartAll(cols, rows) {
     log("Restarting all processes");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "numux",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "Terminal multiplexer with dependency orchestration",
   "type": "module",
   "license": "MIT",