@decocms/sandbox-controller 0.13.1 → 0.15.0

package/dist/index.d.ts

@@ -81,6 +81,8 @@ interface Workload {
     devPort?: number;
     /** Subdirectory inside the repo where the package manager manifest lives (e.g. `apps/web`). */
     packageManagerPath?: string;
+    /** Other monorepo apps to serve beside it, by path. Absent keeps what the sandbox has. */
+    apps?: string[];
 }
 /**
  * What a sandbox is for. AgentSandboxProvider may size, pool, and place the two
@@ -1054,6 +1056,11 @@ declare class AgentSandboxProvider {
      * mounts are additive, a relay failure must not fail provisioning/recovery.
      */
     private relayOrgFsConfig;
+    /**
+     * Bring a resumed/adopted sandbox's extra apps and their preview hosts in
+     * line with the caller's. Best-effort, like the credential refresh.
+     */
+    private syncExtraApps;
     /**
      * Forward a freshly-minted clone credential to a resumed/adopted sandbox's
      * daemon so authenticated git survives the ~1h expiry of the token baked in
@@ -3766,6 +3773,8 @@ declare class FreestyleSandboxProvider implements SandboxProvider {
     private sweeping;
     /** Org + repo → the newest repo snapshot known to exist, and the head it was built for. */
     private readonly repoSnapshots;
+    /** Handle → the app domains its VM was last given, so a resume skips the API. */
+    private readonly appIngress;
     /** Org + repo with a build running, so a push mid-build waits for it. */
     private readonly repoSnapshotBuilds;
     /** When a repo's last build failed; a build takes up to 30 min, so not on every ensure. */
@@ -3824,6 +3833,13 @@ declare class FreestyleSandboxProvider implements SandboxProvider {
     private run;
     ensure(id: SandboxId, opts?: EnsureOptions): Promise<Sandbox>;
     private resume;
+    /** Public hosts of a sandbox's extra apps; the daemon routes them by Host. */
+    private appDomains;
+    /**
+     * Gives each extra app of a running VM its ingress, and takes it from apps
+     * no longer configured.
+     */
+    private syncAppIngress;
     /**
      * The bearer this VM was claimed with lives in daemon memory. A cold boot
      * (Freestyle restarts a guest it finds wedged) brings the daemon back on the

package/dist/index.js

@@ -3,6 +3,14 @@ import "./chunk-QGM4M3NI.js";
 // index.ts
 import { KubeConfig } from "@kubernetes/client-node";
 
+// ../shared/src/app-preview-host.ts
+function appSlug(path) {
+  return path.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+}
+function appHostLabel(handle, path) {
+  return `${handle}--${appSlug(path)}`;
+}
+
 // ../sandbox/server/provider/agent-sandbox/runner.ts
 import { createHash as createHash2, randomBytes, randomUUID } from "crypto";
 import * as net from "net";
@@ -957,7 +965,8 @@ function buildConfigPayload(args) {
   const application = packageManager ? {
     packageManager,
     runtime: args.runtime,
-    ...args.port !== void 0 ? { port: args.port } : {}
+    ...args.port !== void 0 ? { port: args.port } : {},
+    ...args.apps ? { apps: args.apps.map((path) => ({ path })) } : {}
   } : void 0;
   const orgId = tenant?.orgId;
   if (!git && !application && !operator && args.cloneOnly === void 0 && !orgId) {
@@ -979,6 +988,9 @@ function buildConfigPayload(args) {
     ...application ? { application } : {}
   };
 }
+function extraAppsPatch(apps) {
+  return { application: { apps: apps.map((path) => ({ path })) } };
+}
 function deriveRepoLabel(cloneUrl) {
   try {
     const u = new URL(cloneUrl);
@@ -2477,6 +2489,7 @@ var AgentSandboxProvider = class {
         const rec = await this.rehydrate(id2, handle, persisted);
         if (rec) {
           await this.refreshDaemonGitCredential(rec, opts);
+          await this.syncExtraApps(rec, opts);
           await this.relayOrgFsConfig(
             rec.daemonUrl,
             rec.token,
@@ -2553,6 +2566,7 @@ var AgentSandboxProvider = class {
         });
         if (adopted) {
           await this.refreshDaemonGitCredential(adopted, opts);
+          await this.syncExtraApps(adopted, opts);
           await this.relayOrgFsConfig(
             adopted.daemonUrl,
             adopted.token,
@@ -2794,7 +2808,8 @@ var AgentSandboxProvider = class {
       await this.ensureHttpRouteForHandle(
         handle,
         adoptedSandboxName,
-        opts.tenant ?? null
+        opts.tenant ?? null,
+        opts.workload?.apps
       );
     } catch (err) {
       await deleteSandboxClaim(this.kubeConfig, this.namespace, handle).catch(
@@ -2875,6 +2890,7 @@ var AgentSandboxProvider = class {
       repo: opts?.repo ?? null,
       extraRepos: opts?.extraRepos ?? [],
       port: opts?.workload?.devPort ?? DEFAULT_DEV_PORT,
+      apps: opts?.workload?.apps,
       tenant: opts?.tenant ?? void 0,
       // Sent on every ensure that carries opts, so a warm-pool pod inheriting a
       // previous claim's clone-only config gets it cleared on a normal one.
@@ -2896,6 +2912,27 @@ var AgentSandboxProvider = class {
       (err) => console.warn("[org-fs] sidecar config relay failed", err)
     );
   }
+  /**
+   * Bring a resumed/adopted sandbox's extra apps and their preview hosts in
+   * line with the caller's. Best-effort, like the credential refresh.
+   */
+  async syncExtraApps(rec, opts) {
+    const apps = opts.workload?.apps;
+    if (!apps) return;
+    try {
+      await this.ensureHttpRouteForHandle(
+        rec.handle,
+        rec.adoptedSandboxName,
+        rec.tenant,
+        apps
+      );
+      await postConfig(rec.daemonUrl, rec.token, extraAppsPatch(apps));
+    } catch (err) {
+      console.warn(
+        `[${LOG_LABEL}] extra apps sync failed for ${rec.handle}: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
   /**
    * Forward a freshly-minted clone credential to a resumed/adopted sandbox's
    * daemon so authenticated git survives the ~1h expiry of the token baked in
@@ -3353,14 +3390,18 @@ var AgentSandboxProvider = class {
    * `ensureServicePortForAdoptedSandbox` does — we want traffic to land on
    * the actually-bound pool pod, not the operator's cold-path orphan.
    */
-  async ensureHttpRouteForHandle(handle, adoptedSandboxName, tenant) {
+  async ensureHttpRouteForHandle(handle, adoptedSandboxName, tenant, apps = []) {
     if (!this.previewGateway || !this.previewUrlPattern) return;
-    const hostname = previewHostnameForHandle(this.previewUrlPattern, handle);
+    const pattern = this.previewUrlPattern;
+    const hostname = previewHostnameForHandle(pattern, handle);
     if (!hostname) {
       throw new SandboxError(
-        `Unable to derive preview hostname for ${handle} from pattern: ${this.previewUrlPattern}`
+        `Unable to derive preview hostname for ${handle} from pattern: ${pattern}`
       );
     }
+    const appHostnames = apps.flatMap(
+      (path) => previewHostnameForHandle(pattern, appHostLabel(handle, path)) ?? []
+    );
     const route = {
       apiVersion: `${HTTPROUTE_CONSTANTS.API_GROUP}/${HTTPROUTE_CONSTANTS.API_VERSION}`,
       kind: "HTTPRoute",
@@ -3384,7 +3425,7 @@ var AgentSandboxProvider = class {
             namespace: this.previewGateway.namespace
           }
         ],
-        hostnames: [hostname],
+        hostnames: [hostname, ...appHostnames],
         rules: [
           {
             backendRefs: [
@@ -6763,7 +6804,7 @@ var Freestyle = class {
 // ../sandbox/package.json
 var package_default = {
   name: "@decocms/sandbox",
-  version: "1.93.6",
+  version: "1.95.0",
   private: true,
   type: "module",
   description: "Sandbox runtime for isolated Studio tool execution",
@@ -6897,6 +6938,8 @@ var FreestyleSandboxProvider = class {
   sweeping = false;
   /** Org + repo → the newest repo snapshot known to exist, and the head it was built for. */
   repoSnapshots = /* @__PURE__ */ new Map();
+  /** Handle → the app domains its VM was last given, so a resume skips the API. */
+  appIngress = /* @__PURE__ */ new Map();
   /** Org + repo with a build running, so a push mid-build waits for it. */
   repoSnapshotBuilds = /* @__PURE__ */ new Set();
   /** When a repo's last build failed; a build takes up to 30 min, so not on every ensure. */
@@ -7241,7 +7284,7 @@ ${head}`).digest("hex").slice(0, 16)}`;
       const existing = await this.find(handle, { refresh: true });
       let warmPoolAdopted = false;
       if (existing) {
-        await this.resume(existing, opts);
+        await this.resume(handle, existing, opts);
       } else {
         warmPoolAdopted = await this.create(handle, opts);
       }
@@ -7254,7 +7297,7 @@ ${head}`).digest("hex").slice(0, 16)}`;
       };
     });
   }
-  async resume(found, opts) {
+  async resume(handle, found, opts) {
     const { state, sourceSnapshotSlugAtCreate, metadata } = await found.vm.data();
     if (state !== "running") await found.vm.start();
     await this.waitForDaemon(found.daemon.url);
@@ -7277,6 +7320,52 @@ ${head}`).digest("hex").slice(0, 16)}`;
         )
       );
     }
+    const apps = opts.workload?.apps;
+    if (apps) {
+      await this.syncAppIngress(handle, found.vm, apps).catch(
+        (err) => console.warn(`[${LOG_LABEL2}] app ingress sync failed: ${errMsg2(err)}`)
+      );
+      await postConfig(
+        found.daemon.url,
+        found.daemon.token,
+        extraAppsPatch(apps)
+      ).catch(
+        (err) => console.warn(`[${LOG_LABEL2}] apps update failed: ${errMsg2(err)}`)
+      );
+    }
+  }
+  /** Public hosts of a sandbox's extra apps; the daemon routes them by Host. */
+  appDomains(handle, apps) {
+    return apps.map(
+      (path) => `${appHostLabel(handle, path)}.${this.domainSuffix}`
+    );
+  }
+  /**
+   * Gives each extra app of a running VM its ingress, and takes it from apps
+   * no longer configured.
+   */
+  async syncAppIngress(handle, vm, apps) {
+    const wanted = new Set(this.appDomains(handle, apps));
+    const key = [...wanted].sort().join(",");
+    if (this.appIngress.get(handle) === key) return;
+    const appPrefix = `${handle}--`;
+    const { rules } = await this.freestyle.tls.rules.list({ vmId: vm.id });
+    const have = /* @__PURE__ */ new Set();
+    for (const rule of rules) {
+      if (!rule.domain.startsWith(appPrefix)) continue;
+      if (wanted.has(rule.domain)) have.add(rule.domain);
+      else await this.freestyle.tls.rules.delete(rule.id);
+    }
+    for (const domain of wanted) {
+      if (have.has(domain)) continue;
+      await this.freestyle.tls.rules.create({
+        action: "allow",
+        domain,
+        source: { public: true },
+        destination: { vmId: vm.id, port: DAEMON_PORT }
+      });
+    }
+    this.appIngress.set(handle, key);
   }
   /**
    * The bearer this VM was claimed with lives in daemon memory. A cold boot
@@ -7346,13 +7435,14 @@ ${head}`).digest("hex").slice(0, 16)}`;
       },
       tls: {
         rules: [
-          {
-            action: "allow",
-            domain: `${handle}.${this.domainSuffix}`,
-            source: { public: true },
-            destination: { port: DAEMON_PORT }
-          }
-        ]
+          `${handle}.${this.domainSuffix}`,
+          ...this.appDomains(handle, opts.workload?.apps ?? [])
+        ].map((domain) => ({
+          action: "allow",
+          domain,
+          source: { public: true },
+          destination: { port: DAEMON_PORT }
+        }))
       }
     });
     step("vm-fork");
@@ -7444,7 +7534,8 @@ ${head}`).digest("hex").slice(0, 16)}`;
       extraRepos: opts.extraRepos ?? [],
       port: opts.workload?.devPort ?? DEFAULT_DEV_PORT2,
       tenant: opts.tenant,
-      cloneOnly: opts.cloneOnly === true
+      cloneOnly: opts.cloneOnly === true,
+      apps: opts.workload?.apps
     });
   }
   async waitForDaemon(url) {
@@ -8005,7 +8096,8 @@ var ensureOptionsSchema = z4.object({
     runtime: z4.enum(["node", "bun", "deno"]),
     packageManager: z4.enum(["npm", "pnpm", "yarn", "bun", "deno"]),
     devPort: z4.number().int().optional(),
-    packageManagerPath: z4.string().optional()
+    packageManagerPath: z4.string().optional(),
+    apps: z4.array(z4.string().min(1).max(256)).max(8).optional()
   }).optional(),
   cloneOnly: z4.boolean().optional(),
   repoSnapshot: z4.boolean().optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/sandbox-controller",
-  "version": "0.13.1",
+  "version": "0.15.0",
   "description": "Runs Studio agent sandboxes on Kubernetes, and serves them to a remote Studio.",
   "repository": {
     "type": "git",