@norskvideo/ctl-test-harness 0.1.2 → 0.1.4

package/daemon.d.ts

@@ -1,6 +1,7 @@
 import { pollUntil } from "./poll.js";
 import { makeStoreDir, makeTempDir, TEST_TMP_BASE } from "./temp-dir.js";
 export declare const HEALTH_TIMEOUT_MS = 120000;
+export declare const DAEMON_READY_TIMEOUT_MS = 60000;
 export { makeStoreDir, makeTempDir, pollUntil, TEST_TMP_BASE };
 export declare function requireLicenseFile(): string;
 export declare function runCli(storeDir: string, ...args: string[]): Promise<{

package/daemon.js

@@ -11,6 +11,15 @@ import { pollUntil } from "./poll.js";
 import { makeStoreDir, makeTempDir, TEST_TMP_BASE } from "./temp-dir.js";
 process.env.NORSK_CTL_NO_MEDIA_DOWNLOAD = "1";
 export const HEALTH_TIMEOUT_MS = 120_000;
+// The daemon's readiness probe (/api/ready) cannot answer until `serve` has
+// brought up its oauth2-proxy + nginx sidecar CONTAINERS — /api/* redirects
+// through the proxy. On a cold or contended CI runner that bring-up finishes
+// just past 10s (observed ~10.5s on the GPU box under nightly load), so a 10s
+// window lost the photo-finish and failed every test at setup with "Daemon did
+// not become ready ... Unable to connect". A healthy daemon still answers in
+// under a second, so the wider window only costs wall-clock when startup is
+// genuinely slow.
+export const DAEMON_READY_TIMEOUT_MS = 60_000;
 export { makeStoreDir, makeTempDir, pollUntil, TEST_TMP_BASE };
 function splitLines(text) {
     return text
@@ -89,7 +98,7 @@ export function startDaemon(storeDir, options) {
     const ready = pollUntil(async () => {
         const res = await fetch(`http://localhost:${port}/api/ready`, { signal: AbortSignal.timeout(1000) });
         return res.ok;
-    }, { timeoutMs: 10_000, intervalMs: 500, label: "Daemon did not become ready" });
+    }, { timeoutMs: DAEMON_READY_TIMEOUT_MS, intervalMs: 500, label: "Daemon did not become ready" });
     return { daemon, ready };
 }
 function runningContainers(names) {

package/package.json

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

package/studio-state.d.ts

@@ -8,6 +8,7 @@ export interface ComponentsResponse {
     totalComponents: number;
 }
 export declare function applyTestHost(rawUrl: string): string;
+export declare function mediaDirectUrl(rawUrl: string): string;
 export declare function fetchComponents(studioHostPort: number): Promise<ComponentsResponse | null>;
 export declare function fetchComponentState(studioHostPort: number, componentId: string): Promise<unknown | null>;
 /** SRT-listener state shape — see
@@ -93,6 +94,7 @@ export declare function assertMultivariantHasRenditions(opts: {
     expectedRenditionLabels: readonly string[];
     timeoutMs?: number;
     intervalMs?: number;
+    resolveFetchUrl?: (url: string) => string;
 }): Promise<void>;
 export declare function assertNoUnmapped(opts: {
     studioHostPort: number;

package/studio-state.js

@@ -47,6 +47,33 @@ export function applyTestHost(rawUrl) {
     }
     return rawUrl;
 }
+// The default norsk media HTTP port inside the container. The daemon's nginx
+// proxies `/instance/<id>/media/*` here; whip-driver hits the same port direct.
+const MEDIA_HTTP_PORT = 8080;
+// Rewrite a daemon-proxy-routed media URL to a direct hit on the Norsk media
+// container over the daemon's `norsk-net` bridge. Studio advertises playback
+// URLs as `http://<publicHost>/instance/<id>/media/<native>` — that route is
+// served ONLY by the daemon's nginx proxy. A harness that runs proxy-less (and
+// whose runner has joined norsk-net) can instead reach the media container
+// directly by its compose service name: `http://<id>-media-1:8080/<native>`.
+// The `/instance/<id>/media` prefix is the proxy's routing concern; Norsk's
+// native path is what follows it. Falls back to applyTestHost for URLs that
+// don't carry the proxy prefix. Mirrors whip-driver's dockerNetUrl.
+export function mediaDirectUrl(rawUrl) {
+    try {
+        const u = new URL(rawUrl);
+        const m = u.pathname.match(/^\/instance\/([^/]+)\/media(\/.*)?$/);
+        if (m) {
+            const id = m[1];
+            const rest = m[2] ?? "/";
+            return `http://${id}-media-1:${MEDIA_HTTP_PORT}${rest}${u.search}`;
+        }
+    }
+    catch {
+        // not a parseable URL — fall through
+    }
+    return applyTestHost(rawUrl);
+}
 export async function fetchComponents(studioHostPort) {
     const r = await fetch(`http://${STUDIO_HOST}:${studioHostPort}/live/api/components`, {
         signal: AbortSignal.timeout(5000),
@@ -182,6 +209,7 @@ export async function assertSrtConnected(opts) {
  *  `#EXT-X-MEDIA:TYPE=AUDIO ... URI="<rendition>/norsk.m3u8"` line. The caller
  *  passes the set of expected labels; the body must reference every one. */
 export async function assertMultivariantHasRenditions(opts) {
+    const resolveFetchUrl = opts.resolveFetchUrl ?? applyTestHost;
     let lastState = null;
     let lastBody = null;
     let lastFetchStatus = null;
@@ -193,7 +221,7 @@ export async function assertMultivariantHasRenditions(opts) {
             if (!state?.url)
                 return false;
             try {
-                const r = await fetch(applyTestHost(state.url), { signal: AbortSignal.timeout(5000) });
+                const r = await fetch(resolveFetchUrl(state.url), { signal: AbortSignal.timeout(5000) });
                 lastFetchStatus = r.status;
                 if (!r.ok)
                     return false;