@norskvideo/ctl-test-harness 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norskvideo/ctl-test-harness",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "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;