@norskvideo/ctl-test-harness 0.1.14 → 0.1.15

package/package.json

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

package/smoke.d.ts

@@ -87,7 +87,7 @@ export interface SmokeSpec {
         clearedMs?: number;
     };
     /** Override the banded ports (see smokePorts). */
-    ports?: Partial<BaseHarnessPorts>;
+    ports?: Partial<SmokePorts>;
 }
 /** What the observation kinds read. Injected so the phase rule is tested
  *  without Studio; defaults are studio-state's fetchers. */
@@ -133,7 +133,11 @@ export interface SmokeDeps {
 /** Per-slug port band, above the product integration harnesses' own bands:
  *  daemon, dev backend, published Studio port and an instance base, twenty
  *  apart per slug. */
-export declare function smokePorts(slug: string, overrides?: Partial<BaseHarnessPorts>): BaseHarnessPorts;
+export interface SmokePorts extends BaseHarnessPorts {
+    /** The daemon's oauth2 proxy; banded so co-located runs never meet on :9443. */
+    proxyPort: number;
+}
+export declare function smokePorts(slug: string, overrides?: Partial<SmokePorts>): SmokePorts;
 export declare const defaultSmokeDeps: SmokeDeps;
 /** Whether an observation depends on a source being pumped. Structural ones
  *  run the satisfied phase only. */

package/smoke.js

@@ -33,15 +33,13 @@ const SMOKE_BAND_WIDTH = 20;
 const SMOKE_BANDS = 50;
 const STUDIO_HOST_PORT_PARAM = "STUDIO_HOST_PORT";
 const NUKE_IMAGE = "alpine:3";
-/** Per-slug port band, above the product integration harnesses' own bands:
- *  daemon, dev backend, published Studio port and an instance base, twenty
- *  apart per slug. */
 export function smokePorts(slug, overrides = {}) {
     const daemonPort = SMOKE_PORT_BASE + hashSlot(`smoke:${slug}`, SMOKE_BANDS) * SMOKE_BAND_WIDTH;
     return {
         daemonPort,
         backendPort: daemonPort + 1,
         studioHostPort: daemonPort + 2,
+        proxyPort: daemonPort + 3,
         instancePortBase: daemonPort + 10,
         ...overrides,
     };
@@ -189,13 +187,18 @@ export async function runProductSmoke(slug, spec, deps = defaultSmokeDeps) {
     let launched = false;
     let handles = [];
     try {
-        // The same zero point as the guides: `init` on a virgin store, not a seeded config.yaml.
+        // The same zero point as the guides: `init` on a virgin store, not a seeded
+        // config.yaml. No http redirect (port 80 needs root) and a banded proxy port
+        // (the default :9443 would meet a co-located integration run).
         await cliOk([
             "init",
             "--network-mode",
             spec.networkMode ?? "docker",
             "--working-directory",
             join(storeDir, "norsk-runtime"),
+            "--proxy-port",
+            String(ports.proxyPort),
+            "--no-http-redirect",
             "--no-start-server",
         ]);
         const started = deps.startDaemon(storeDir, { port: ports.daemonPort, seedConfig: false });