@norskvideo/ctl-sdk 0.1.31 → 0.1.32

package/docker-runner.d.ts

@@ -10,6 +10,10 @@ export declare const PRODUCT_ROLE_LABEL = "norsk-ctl.role=product";
  *  (see product-reach.ts). Omitted leaves it on docker's default bridge. */
 export interface ProductRunOpts {
     network?: string;
+    /** Deploy-time environment for the control-plane container, passed as
+     *  `-e KEY=VALUE` (e.g. `FUNKE_HARDWARE=software`). The map is the caller's;
+     *  what a product reads from it is the product's own contract. */
+    env?: Record<string, string>;
 }
 /** argv (sans leading "docker") that launches a product container: detached,
  *  auto-removed, loopback-published to its internal 4321, and role-labelled so

package/docker-runner.js

@@ -27,6 +27,7 @@ export function productRunArgs(image, opts = {}) {
         "--label",
         PRODUCT_ROLE_LABEL,
         ...(opts.network ? ["--network", opts.network] : []),
+        ...Object.entries(opts.env ?? {}).flatMap(([k, v]) => ["-e", `${k}=${v}`]),
         "-p",
         `127.0.0.1::${CONTAINER_INTERNAL_PORT}`,
         image,

package/manifest-schema.d.ts

@@ -130,6 +130,23 @@ export declare const ManifestSchema: z.ZodObject<{
                 model: z.ZodOptional<z.ZodString>;
             }, z.core.$strip>>;
         }, z.core.$strip>>;
+        accelerator: z.ZodOptional<z.ZodDiscriminatedUnion<[z.ZodObject<{
+            mode: z.ZodLiteral<"fixed">;
+            value: z.ZodEnum<{
+                none: "none";
+                nvidia: "nvidia";
+                quadra: "quadra";
+            }>;
+        }, z.core.$strip>, z.ZodObject<{
+            mode: z.ZodLiteral<"default">;
+            value: z.ZodEnum<{
+                none: "none";
+                nvidia: "nvidia";
+                quadra: "quadra";
+            }>;
+        }, z.core.$strip>, z.ZodObject<{
+            mode: z.ZodLiteral<"required">;
+        }, z.core.$strip>], "mode">>;
         capabilities: z.ZodOptional<z.ZodObject<{
             mode: z.ZodEnum<{
                 default: "default";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norskvideo/ctl-sdk",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "type": "module",
   "exports": {
     ".": {

package/parsing.js

@@ -15,7 +15,8 @@ export function parseSpec(raw, where, path) {
         if (typeof raw.image !== "string") {
             throw new ProductsParseError(path, `${where}.spec.image must be a string`);
         }
-        return { kind: "container", image: raw.image };
+        const env = parseEnv(raw.env, where, path);
+        return { kind: "container", image: raw.image, ...(env !== undefined ? { env } : {}) };
     }
     if (raw.kind === "dev") {
         if (typeof raw.url !== "string") {
@@ -25,6 +26,22 @@ export function parseSpec(raw, where, path) {
     }
     throw new ProductsParseError(path, `${where}.spec.kind must be 'container' or 'dev'`);
 }
+/** The container spec's deploy-time env, round-tripped from the store as a
+ *  `{ KEY: VALUE }` map of strings. Absent stays absent; a present value must
+ *  be an object of string→string. */
+function parseEnv(raw, where, path) {
+    if (raw === undefined)
+        return undefined;
+    if (!isRecord(raw))
+        throw new ProductsParseError(path, `${where}.spec.env must be an object`);
+    const env = {};
+    for (const [k, v] of Object.entries(raw)) {
+        if (typeof v !== "string")
+            throw new ProductsParseError(path, `${where}.spec.env.${k} must be a string`);
+        env[k] = v;
+    }
+    return env;
+}
 function parseLicense(raw, where, path) {
     if (!isRecord(raw))
         throw new ProductsParseError(path, `${where}.license must be an object`);

package/product-service.d.ts

@@ -82,8 +82,10 @@ export type RefreshProductTemplateBytesFn = ImportProductTemplateBytesFn;
 export interface ProductContainerOps {
     pull(image: string): Promise<void>;
     /** Start the container. The host port comes back from docker rather than
-     *  going in: docker owns the host port space (see docker-runner.ts). */
-    run(image: string): Promise<ProductPlacement>;
+     *  going in: docker owns the host port space (see docker-runner.ts). `env`
+     *  is the spec's deploy-time environment, passed straight through as
+     *  `-e KEY=VALUE`. */
+    run(image: string, env?: Record<string, string>): Promise<ProductPlacement>;
     remove(containerId: string): Promise<void>;
     rename(containerId: string, name: string): Promise<void>;
     waitForReady(baseUrl: string): Promise<void>;

package/product-service.js

@@ -29,7 +29,7 @@ async function fetchProductTemplateBytes(baseUrl, url) {
  *  (typically `pull`, onto its own docker adapter) and keep the rest. */
 export const defaultProductContainerOps = {
     pull: dockerPull,
-    run: dockerRun,
+    run: (image, env) => dockerRun(image, env ? { env } : {}),
     remove: dockerRm,
     rename: dockerRename,
     waitForReady,
@@ -117,7 +117,7 @@ export class ProductService {
         else {
             await this.refreshImage(spec.image);
             logger.info(`Starting product container: ${spec.image} (reach: ${this.reach})`);
-            const placement = await this.containerOps.run(spec.image);
+            const placement = await this.containerOps.run(spec.image, spec.env);
             containerId = placement.containerId;
             port = placement.hostPort;
             logger.info(`Product container ${containerId.slice(0, 12)} published on host port ${port}`);
@@ -309,7 +309,7 @@ export class ProductService {
                     // Already gone (crashed / --rm reaped) — nothing to stop.
                 }
             }
-            const { containerId, hostPort } = await this.containerOps.run(target.spec.image);
+            const { containerId, hostPort } = await this.containerOps.run(target.spec.image, target.spec.env);
             const reachHost = await this.reachHostFor(containerId);
             await this.store.update((products) => products.map((p) => (p.name === name ? withPlacement(p, containerId, hostPort, reachHost) : p)));
             await this.containerOps.waitForReady(specBaseUrl(target.spec, hostPort, reachHost));
@@ -400,7 +400,7 @@ export class ProductService {
                 return;
             }
             try {
-                const { containerId, hostPort } = await this.containerOps.run(reg.spec.image);
+                const { containerId, hostPort } = await this.containerOps.run(reg.spec.image, reg.spec.env);
                 const reachHost = await this.reachHostFor(containerId);
                 await this.containerOps.waitForReady(specBaseUrl(reg.spec, hostPort, reachHost));
                 await this.containerOps.rename(containerId, productContainerName(reg.name));
@@ -449,7 +449,7 @@ export class ProductService {
                 // Already gone (crashed / --rm reaped) — nothing to stop.
             }
         }
-        const { containerId, hostPort } = await this.containerOps.run(target.spec.image);
+        const { containerId, hostPort } = await this.containerOps.run(target.spec.image, target.spec.env);
         const reachHost = await this.reachHostFor(containerId);
         await this.store.update((products) => products.map((p) => (p.name === name ? withPlacement(p, containerId, hostPort, reachHost) : p)));
         await this.containerOps.waitForReady(specBaseUrl(target.spec, hostPort, reachHost));

package/product-types.d.ts

@@ -1,7 +1,13 @@
 import type { Manifest } from "./manifest-schema.js";
-export type ProductSpec = {
+export type ProductSpec = 
+/** `env` is the deploy-time environment for the control-plane container,
+ *  supplied at `product add --env KEY=VALUE`. It lives on the spec (not just
+ *  the add call) so it persists with the registration and every later
+ *  restart/reload/restore re-runs the container with the same environment. */
+{
     kind: "container";
     image: string;
+    env?: Record<string, string>;
 } | {
     kind: "dev";
     url: string;