@norskvideo/ctl-sdk 0.1.22 → 0.1.24

package/docker-runner.d.ts

@@ -4,10 +4,17 @@ export declare const CONTAINER_INTERNAL_PORT = 4321;
  *  `norsk-ctl.role` label (proxy, proxy-oauth2, cpu-monitor, product); the
  *  value doubles as the card's component name. */
 export declare const PRODUCT_ROLE_LABEL = "norsk-ctl.role=product";
+/** How to place a product container. The network is the host's call: ctl puts
+ *  the control plane on the same bridge as nginx and every launched instance,
+ *  which is what makes it reachable from a daemon that is itself a container
+ *  (see product-reach.ts). Omitted leaves it on docker's default bridge. */
+export interface ProductRunOpts {
+    network?: string;
+}
 /** argv (sans leading "docker") that launches a product container: detached,
  *  auto-removed, loopback-published to its internal 4321, and role-labelled so
  *  it shows up in the Infrastructure tab. */
-export declare function productRunArgs(image: string, hostPort: number): string[];
+export declare function productRunArgs(image: string, hostPort: number, opts?: ProductRunOpts): string[];
 /** Stable container name for a product, derived from its manifest name, so
  *  `docker ps` shows `norsk-product-studio` instead of a random docker alias.
  *  Mirrors the singleton naming of norsk-proxy / norsk-ctl-cpu-monitor. */
@@ -16,7 +23,7 @@ export declare function productContainerName(productName: string): string;
  *  so there is nothing to refresh; a tag can move under a registration. */
 export declare function isDigestRef(image: string): boolean;
 export declare function dockerPull(image: string): Promise<void>;
-export declare function dockerRun(image: string, hostPort: number): Promise<string>;
+export declare function dockerRun(image: string, hostPort: number, opts?: ProductRunOpts): Promise<string>;
 /** The container's address on its first network (the default bridge for a
  *  product container), or undefined when docker cannot say. */
 export declare function dockerAddress(containerId: string): Promise<string | undefined>;

package/docker-runner.js

@@ -8,13 +8,14 @@ export const PRODUCT_ROLE_LABEL = "norsk-ctl.role=product";
 /** argv (sans leading "docker") that launches a product container: detached,
  *  auto-removed, loopback-published to its internal 4321, and role-labelled so
  *  it shows up in the Infrastructure tab. */
-export function productRunArgs(image, hostPort) {
+export function productRunArgs(image, hostPort, opts = {}) {
     return [
         "run",
         "-d",
         "--rm",
         "--label",
         PRODUCT_ROLE_LABEL,
+        ...(opts.network ? ["--network", opts.network] : []),
         "-p",
         `127.0.0.1:${hostPort}:${CONTAINER_INTERNAL_PORT}`,
         image,
@@ -43,8 +44,8 @@ export async function dockerPull(image) {
         throw new ProductError("DOCKER_PULL_FAILED", `docker pull failed (exit ${exitCode}): ${stderr || "no stderr"}`);
     }
 }
-export async function dockerRun(image, hostPort) {
-    const proc = Bun.spawn(["docker", ...productRunArgs(image, hostPort)], { stdout: "pipe", stderr: "pipe" });
+export async function dockerRun(image, hostPort, opts = {}) {
+    const proc = Bun.spawn(["docker", ...productRunArgs(image, hostPort, opts)], { stdout: "pipe", stderr: "pipe" });
     const exitCode = await proc.exited;
     const stdout = (await new Response(proc.stdout).text()).trim();
     const stderr = (await new Response(proc.stderr).text()).trim();

package/manifest-fetch.d.ts

@@ -17,7 +17,18 @@ export declare function specBaseUrl(spec: ProductSpec, port?: number, reachHost?
  *  so a recorded reachHost is never forgotten. */
 export declare function productBaseUrl(reg: Pick<ProductRegistration, "spec" | "port" | "reachHost">): string;
 export declare function fetchManifest(baseUrl: string): Promise<Manifest>;
-export declare function waitForReady(baseUrl: string): Promise<void>;
+/** Poll a product's manifest until it answers.
+ *
+ *  The timeout names `baseUrl`. That is the whole point of the message: the
+ *  daemon dials a container product on loopback, and where that loopback is not
+ *  the daemon's own (a docker-outside-of-docker runner, where it belongs to the
+ *  docker host — see product-reach.ts) the product is perfectly healthy and
+ *  simply unreachable. Without the address, that reads identically to a product
+ *  that genuinely failed to start. */
+export declare function waitForReady(baseUrl: string, opts?: {
+    timeoutMs?: number;
+    intervalMs?: number;
+}): Promise<void>;
 /**
  * Probe the product's configScreenUrl after registration. Two hard
  * rejections:

package/manifest-fetch.js

@@ -56,8 +56,18 @@ export async function fetchManifest(baseUrl) {
     }
     return parsed.data;
 }
-export async function waitForReady(baseUrl) {
-    const deadline = Date.now() + READINESS_TIMEOUT_MS;
+/** Poll a product's manifest until it answers.
+ *
+ *  The timeout names `baseUrl`. That is the whole point of the message: the
+ *  daemon dials a container product on loopback, and where that loopback is not
+ *  the daemon's own (a docker-outside-of-docker runner, where it belongs to the
+ *  docker host — see product-reach.ts) the product is perfectly healthy and
+ *  simply unreachable. Without the address, that reads identically to a product
+ *  that genuinely failed to start. */
+export async function waitForReady(baseUrl, opts = {}) {
+    const timeoutMs = opts.timeoutMs ?? READINESS_TIMEOUT_MS;
+    const intervalMs = opts.intervalMs ?? READINESS_INTERVAL_MS;
+    const deadline = Date.now() + timeoutMs;
     while (Date.now() < deadline) {
         try {
             const r = await fetch(`${baseUrl}/manifest.json`);
@@ -67,9 +77,9 @@ export async function waitForReady(baseUrl) {
         catch {
             // not ready yet
         }
-        await new Promise((resolve) => setTimeout(resolve, READINESS_INTERVAL_MS));
+        await new Promise((resolve) => setTimeout(resolve, intervalMs));
     }
-    throw new ProductError("READINESS_TIMEOUT", `product did not become ready within ${READINESS_TIMEOUT_MS}ms`);
+    throw new ProductError("READINESS_TIMEOUT", `product did not become ready within ${timeoutMs}ms — nothing answered ${baseUrl}/manifest.json`);
 }
 /**
  * Probe the product's configScreenUrl after registration. Two hard

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norskvideo/ctl-sdk",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "type": "module",
   "exports": {
     ".": {
@@ -37,7 +37,7 @@
   "types": "./index.d.ts",
   "dependencies": {
     "@norskvideo/ctl-foundation": "^0.1.0",
-    "@norskvideo/ctl-product-template-schema": "^0.1.5",
+    "@norskvideo/ctl-product-template-schema": "^0.1.12",
     "express": "5",
     "lucide-react": "^0.483.0",
     "react": "^19.0.0",

package/product-service.js

@@ -127,7 +127,7 @@ export class ProductService {
             }
             port = allocated;
             await this.refreshImage(spec.image);
-            logger.info(`Starting product container: ${spec.image} on host port ${port}`);
+            logger.info(`Starting product container: ${spec.image} on host port ${port} (reach: ${this.reach})`);
             containerId = await this.containerOps.run(spec.image, port);
             reachHost = await this.reachHostFor(containerId);
             baseUrl = specBaseUrl(spec, port, reachHost);