@norskvideo/ctl-test-harness 0.1.61 → 0.1.63

package/demo/harness.d.ts

@@ -43,6 +43,8 @@ export interface LaunchOverrides {
     /** Merged over the spec's `launch.params`. */
     params?: Record<string, string | number>;
     hardware?: "nvidia" | "none";
+    /** Replaces the spec's `launch.st2110Nics`. */
+    st2110Nics?: string[];
     workingDirectory?: string;
 }
 /** An instance `launch()` brought to running: its resolved ports and URLs,

package/demo/harness.js

@@ -139,6 +139,8 @@ export class ProductHarness {
         const hardware = overrides.hardware ?? spec.launch?.hardware;
         if (hardware)
             launchArgv.push("--hardware", hardware);
+        for (const nic of overrides.st2110Nics ?? spec.launch?.st2110Nics ?? [])
+            launchArgv.push("--st2110-nics", nic);
         const workingDirectory = overrides.workingDirectory ?? spec.launch?.workingDirectory;
         if (this.action === "up" && workingDirectory) {
             launchArgv.push("--working-directory", expandHome(workingDirectory));

package/demo/run.d.ts

@@ -242,6 +242,38 @@ export declare function demoUrlHost(opts: {
     daemon: DemoDaemonPolicy;
     env?: NodeJS.ProcessEnv;
 }): string;
+/** Where the daemon's nginx PROXY answers, which is not where the daemon does.
+ *
+ *  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
+ *  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.
+ *
+ *  That is playout's `visualiser unreachable … (180s)`: composeAdvancingGate
+ *  reads through `{ proxy: "/instance/{id}/visualiser" }`, got the daemon's
+ *  host, and every poll failed to connect while the compositor was advancing.
+ *  It is not the 2026-09-03 bug of the same shape — that one was the proxy
+ *  being pointed AWAY from localhost; this is it being pinned TO localhost
+ *  after the proxy became a container.
+ *
+ *  `NORSK_TEST_HOST` is the explicit answer when a runner has one. Otherwise a
+ *  containerised run takes the host-gateway alias, which these runners do
+ *  resolve (`host.docker.internal -> 172.18.0.1` from test2-runner-one-1).
+ *  Off a runner the test process is not in a container and the published port
+ *  really is on localhost, so nothing changes for a dev box. */
+export declare const HOST_GATEWAY_ALIAS = "host.docker.internal";
+export declare function proxyUrlHost(opts: {
+    publicHost: string | undefined;
+    inContainer: boolean;
+    env?: NodeJS.ProcessEnv;
+}): string;
+/** Whether this process is itself in a container — the DooD case, where a
+ *  sibling container's published port is on the host and not on our localhost.
+ *  `/.dockerenv` is written by the daemon into every container it creates. */
+export declare function runningInContainer(exists?: (p: string) => boolean): boolean;
 /** The pieces of a run that `runDemo`, `runExportCheck` and the dev-loop
  *  share: the daemon (private on its band, or the developer's), the dev
  *  backend on the driver's port, the registration, and the template (built

package/demo/run.js

@@ -344,6 +344,43 @@ export function demoUrlHost(opts) {
         return envHost;
     return "localhost";
 }
+/** Where the daemon's nginx PROXY answers, which is not where the daemon does.
+ *
+ *  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
+ *  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.
+ *
+ *  That is playout's `visualiser unreachable … (180s)`: composeAdvancingGate
+ *  reads through `{ proxy: "/instance/{id}/visualiser" }`, got the daemon's
+ *  host, and every poll failed to connect while the compositor was advancing.
+ *  It is not the 2026-09-03 bug of the same shape — that one was the proxy
+ *  being pointed AWAY from localhost; this is it being pinned TO localhost
+ *  after the proxy became a container.
+ *
+ *  `NORSK_TEST_HOST` is the explicit answer when a runner has one. Otherwise a
+ *  containerised run takes the host-gateway alias, which these runners do
+ *  resolve (`host.docker.internal -> 172.18.0.1` from test2-runner-one-1).
+ *  Off a runner the test process is not in a container and the published port
+ *  really is on localhost, so nothing changes for a dev box. */
+export const HOST_GATEWAY_ALIAS = "host.docker.internal";
+export function proxyUrlHost(opts) {
+    if (opts.publicHost !== undefined)
+        return opts.publicHost;
+    const envHost = (opts.env ?? process.env).NORSK_TEST_HOST;
+    if (envHost)
+        return envHost;
+    return opts.inContainer ? HOST_GATEWAY_ALIAS : "localhost";
+}
+/** Whether this process is itself in a container — the DooD case, where a
+ *  sibling container's published port is on the host and not on our localhost.
+ *  `/.dockerenv` is written by the daemon into every container it creates. */
+export function runningInContainer(exists = existsSync) {
+    return exists("/.dockerenv");
+}
 /** The pieces of a run that `runDemo`, `runExportCheck` and the dev-loop
  *  share: the daemon (private on its band, or the developer's), the dev
  *  backend on the driver's port, the registration, and the template (built
@@ -381,19 +418,21 @@ export class DemoSession {
         this.publicHost = opts.publicHost;
         const host = demoUrlHost({ publicHost: opts.publicHost, daemon: opts.daemon });
         this.host = host;
+        // The proxy is a container even when the daemon is ours; see proxyUrlHost.
+        const proxyHost = proxyUrlHost({ publicHost: opts.publicHost, inContainer: runningInContainer() });
         if (opts.daemon === "reuse") {
             const daemonPort = opts.daemonPort ?? (Number(process.env.NORSK_CTL_PORT) || DEFAULT_DAEMON_PORT);
             this.storeDir = deps.realStoreDir();
             const proxy = parseProxyConfig(deps.readFile(join(this.storeDir, "config.yaml")));
             this.ports = demoPorts(slug, { daemonPort, proxyPort: proxy.port });
-            this.proxyBase = `${proxy.scheme}://${host}:${proxy.port}`;
+            this.proxyBase = `${proxy.scheme}://${proxyHost}:${proxy.port}`;
         }
         else {
             this.ports = demoPorts(slug);
             this.storeDir = opts.storeDir ?? deps.storeDir(slug);
             // The private daemon is initialised without a cert source, so its proxy
             // speaks plain http (seen live: https:// gave 000, http:// served the page).
-            this.proxyBase = `http://${host}:${this.ports.proxyPort}`;
+            this.proxyBase = `http://${proxyHost}:${this.ports.proxyPort}`;
         }
         this.proxyAuth = opts.proxy;
         this.daemonEnv = opts.daemonEnv ?? {};

package/demo/spec.d.ts

@@ -119,6 +119,8 @@ export interface DemoSpec {
     launch?: {
         hardware?: "nvidia" | "none";
         params?: Record<string, string | number>;
+        /** Host NICs to claim for an ST 2110 template; one `--st2110-nics` each. */
+        st2110Nics?: string[];
         /** `up` only; `check` launches without it (05-demo s5 playout). */
         workingDirectory?: string;
     };

package/demo/spec.js

@@ -67,6 +67,7 @@ export const DemoSpecSchema = z
         .strictObject({
         hardware: z.enum(["nvidia", "none"]).optional(),
         params: Params.optional(),
+        st2110Nics: z.array(z.string().min(1)).min(1).optional(),
         workingDirectory: z.string().min(1).optional(),
     })
         .optional(),

package/package.json

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