@decocms/sandbox-controller 0.7.1 → 0.8.0

package/dist/index.d.ts

@@ -3715,10 +3715,10 @@ interface FreestyleSandboxProviderOptions {
     image?: string;
     /** The org-fs sidecar image. Default: the chart's `orgFs.image`. */
     orgFsSidecarImage?: string;
-    /** Pause a VM after this long without network activity. Default 15 min. */
+    /** Pause a VM after this long without network activity. Default 5 min. */
     idleTimeoutSeconds?: number;
     /**
-     * Delete a VM after this long without running. Default 3 days. A plan
+     * Delete a VM after this long without running. Default 1 day. A plan
      * that caps it lower gets its cap.
      */
     autoDeleteSeconds?: number;
@@ -3752,6 +3752,11 @@ declare class FreestyleSandboxProvider implements SandboxProvider {
      * A snapshot of a VM with both images already pulled, so a sandbox boots in
      * seconds instead of pulling ~2GB. One per image pair; built on first use.
      */
+    /**
+     * Build this image's base snapshot now, so the first sandbox after an image
+     * bump boots from it instead of waiting on the pull. Never throws.
+     */
+    warm(): Promise<void>;
     private baseSnapshot;
     private snapshotExists;
     private run;

package/dist/index.js

@@ -6759,7 +6759,7 @@ var Freestyle = class {
 // ../sandbox/package.json
 var package_default = {
   name: "@decocms/sandbox",
-  version: "1.80.3",
+  version: "1.83.0",
   private: true,
   type: "module",
   description: "Sandbox runtime for isolated Studio tool execution",
@@ -6838,7 +6838,7 @@ var WORKDIR = "/app";
 var DEFAULT_DEV_PORT2 = 3e3;
 var CONTAINER = "sandbox";
 var SIDECAR = "orgfs";
-var DEFAULT_SIDECAR_IMAGE = "ghcr.io/decocms/studio/orgfs-sidecar:0.1.0";
+var DEFAULT_SIDECAR_IMAGE = "ghcr.io/decocms/studio/orgfs-sidecar:0.2.0";
 var HOST_ORG_DIR = "/srv/sandbox/org";
 var HOST_CTL_DIR = "/srv/sandbox/orgfs-ctl";
 var CTL_DIR = "/run/orgfs";
@@ -6890,8 +6890,8 @@ var FreestyleSandboxProvider = class {
     });
     this.image = opts.image ?? `ghcr.io/decocms/studio/studio-sandbox-go:${package_default.version}`;
     this.sidecarImage = opts.orgFsSidecarImage ?? DEFAULT_SIDECAR_IMAGE;
-    this.idleTimeoutSeconds = opts.idleTimeoutSeconds ?? 15 * 60;
-    this.autoDeleteSeconds = opts.autoDeleteSeconds ?? 3 * 24 * 60 * 60;
+    this.idleTimeoutSeconds = opts.idleTimeoutSeconds ?? 5 * 60;
+    this.autoDeleteSeconds = opts.autoDeleteSeconds ?? 24 * 60 * 60;
     this.domainSuffix = opts.domainSuffix ?? "style.dev";
     this.timeDaemonRequest = daemonProxyTimer(opts.meter);
   }
@@ -6937,6 +6937,15 @@ var FreestyleSandboxProvider = class {
    * A snapshot of a VM with both images already pulled, so a sandbox boots in
    * seconds instead of pulling ~2GB. One per image pair; built on first use.
    */
+  /**
+   * Build this image's base snapshot now, so the first sandbox after an image
+   * bump boots from it instead of waiting on the pull. Never throws.
+   */
+  async warm() {
+    await this.baseSnapshot().catch(
+      (err) => console.warn(`[${LOG_LABEL2}] base snapshot warm failed: ${errMsg2(err)}`)
+    );
+  }
   baseSnapshot() {
     const { image, sidecarImage } = this;
     const slug = `studio-sandbox-${createHash3("sha256").update(`${image}
@@ -7070,7 +7079,7 @@ ${sidecarImage}`).digest("hex").slice(0, 16)}`;
       const envFlags = Object.keys(env).map((k) => `-e ${shellQuote(k)}`).join(" ");
       await this.run(
         vm,
-        `sudo sh -c ${shellQuote(HOST_SETUP)} && docker run -d --name ${SIDECAR} --restart=always --privileged --device /dev/fuse -e APP_ROOT=${WORKDIR} -v ${HOST_ORG_DIR}:${WORKDIR}/org:rshared -v ${HOST_CTL_DIR}:${CTL_DIR} ${shellQuote(this.sidecarImage)}`,
+        `sudo sh -c ${shellQuote(HOST_SETUP)} && docker run -d --name ${SIDECAR} --restart=always --privileged --device /dev/fuse -e APP_ROOT=${WORKDIR} -e ORGFS_FEED_IDLE_MS=60000 -v ${HOST_ORG_DIR}:${WORKDIR}/org:rshared -v ${HOST_CTL_DIR}:${CTL_DIR} ${shellQuote(this.sidecarImage)}`,
         { timeoutMs: IMAGE_PULL_TIMEOUT_MS }
       );
       await this.run(

package/package.json

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