@norskvideo/ctl-test-harness 0.1.66 → 0.1.67

package/daemon.d.ts

@@ -56,6 +56,20 @@ export interface StartDaemonOptions {
  *  A suite that writes its own config.yaml (to pick a networkMode, a proxy
  *  port) still gets the working directory added, unless it states one. */
 export declare function seedDaemonConfig(storeDir: string): void;
+/** The environment a test daemon is spawned with.
+ *
+ *  The daemon's singleton containers default to box-global names, and on a
+ *  docker-outside-of-docker runner the "box" is a host daemon shared by every
+ *  runner on it: concurrent jobs replaced and removed each other's `norsk-proxy`
+ *  (and each daemon start `rm -f`s the cpu-monitor sidecar by name). Naming them
+ *  after the daemon's port, which is already unique per live daemon on a box,
+ *  keeps each job to its own. A ctl that predates an override ignores it. */
+export declare function daemonSpawnEnv(o: {
+    storeDir: string;
+    port: number;
+    inherited: Record<string, string | undefined>;
+    overrides?: Record<string, string>;
+}): Record<string, string | undefined>;
 export declare function startDaemon(storeDir: string, options?: StartDaemonOptions): {
     daemon: DaemonProcess;
     ready: Promise<void>;

package/daemon.js

@@ -145,6 +145,29 @@ export function seedDaemonConfig(storeDir) {
     const separator = existing === "" || existing.endsWith("\n") ? "" : "\n";
     writeFileSync(configPath, `${existing}${separator}${workdirLine}`);
 }
+/** The environment a test daemon is spawned with.
+ *
+ *  The daemon's singleton containers default to box-global names, and on a
+ *  docker-outside-of-docker runner the "box" is a host daemon shared by every
+ *  runner on it: concurrent jobs replaced and removed each other's `norsk-proxy`
+ *  (and each daemon start `rm -f`s the cpu-monitor sidecar by name). Naming them
+ *  after the daemon's port, which is already unique per live daemon on a box,
+ *  keeps each job to its own. A ctl that predates an override ignores it. */
+export function daemonSpawnEnv(o) {
+    // A spawned daemon must boot GUARDED: exercising the real ingress secret is
+    // the point of the tiers that spawn one. The unit tier's marker would
+    // otherwise be inherited straight through this env spread and quietly open
+    // it (RFC 0003 D10b).
+    const { NORSK_CTL_UNGUARDED_TEST_DAEMON: _unguarded, ...inherited } = o.inherited;
+    return {
+        NORSK_CTL_PROXY_CONTAINER: `norsk-proxy-${o.port}`,
+        NORSK_CTL_CPU_MONITOR_CONTAINER: `norsk-ctl-cpu-monitor-${o.port}`,
+        ...inherited,
+        NORSK_CTL_STORE_DIR: o.storeDir,
+        NORSK_CTL_PORT: String(o.port),
+        ...o.overrides,
+    };
+}
 export function startDaemon(storeDir, options) {
     const port = options?.port ?? 8333;
     // Before the spawn, so anything reaching for this daemon's ingress secret can
@@ -154,15 +177,15 @@ export function startDaemon(storeDir, options) {
     if (options?.seedConfig !== false)
         seedDaemonConfig(storeDir);
     const [cmd, ...cmdArgs] = cliCommand;
-    // A spawned daemon must boot GUARDED: exercising the real ingress secret is
-    // the point of the tiers that spawn one. The unit tier's marker would
-    // otherwise be inherited straight through this env spread and quietly open
-    // it (RFC 0003 D10b).
-    const { NORSK_CTL_UNGUARDED_TEST_DAEMON: _unguarded, ...inheritedEnv } = process.env;
     const proc = spawn(cmd, [...cmdArgs, "serve"], {
         stdio: "inherit",
         detached: options?.detached === true,
-        env: { ...inheritedEnv, NORSK_CTL_STORE_DIR: storeDir, NORSK_CTL_PORT: String(port), ...options?.env },
+        env: daemonSpawnEnv({
+            storeDir,
+            port,
+            inherited: process.env,
+            ...(options?.env ? { overrides: options.env } : {}),
+        }),
     });
     const spawnFailed = new Promise((_, reject) => {
         proc.once("error", (e) => reject(new Error(cliUnavailableMessage(cliCommand, e.message))));

package/demo/run.d.ts

@@ -246,8 +246,8 @@ export declare function demoUrlHost(opts: {
  *
  *  The daemon is a process in this very process' container, so `localhost`
  *  reaches it. Its proxy is NOT: every `nginx proxy starting on port N` is
- *  followed by `docker: Container norsk-proxy Created/Started`, for a private
- *  daemon exactly as for a reused one. On a docker-outside-of-docker runner
+ *  followed by `docker: Container norsk-proxy[-<port>] Created/Started`, for a
+ *  private daemon exactly as for a reused one. On a docker-outside-of-docker runner
  *  that container is created by the HOST's daemon and publishes there
  *  (`0.0.0.0:22263->22263/tcp`, HostIp "" — measured on test2, 2026-10-01), so
  *  from inside this container `localhost:<proxyPort>` reaches nothing at all.

package/demo/run.js

@@ -348,8 +348,8 @@ export function demoUrlHost(opts) {
  *
  *  The daemon is a process in this very process' container, so `localhost`
  *  reaches it. Its proxy is NOT: every `nginx proxy starting on port N` is
- *  followed by `docker: Container norsk-proxy Created/Started`, for a private
- *  daemon exactly as for a reused one. On a docker-outside-of-docker runner
+ *  followed by `docker: Container norsk-proxy[-<port>] Created/Started`, for a
+ *  private daemon exactly as for a reused one. On a docker-outside-of-docker runner
  *  that container is created by the HOST's daemon and publishes there
  *  (`0.0.0.0:22263->22263/tcp`, HostIp "" — measured on test2, 2026-10-01), so
  *  from inside this container `localhost:<proxyPort>` reaches nothing at all.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norskvideo/ctl-test-harness",
-  "version": "0.1.66",
+  "version": "0.1.67",
   "type": "module",
   "exports": {
     ".": {