@decocms/sandbox-controller 0.12.4 → 0.13.0

package/dist/index.d.ts

@@ -3889,6 +3889,7 @@ declare class FreestyleSandboxProvider implements SandboxProvider {
      * server's own traffic. Returns the handles paused; never throws.
      */
     pauseIdle(): Promise<string[]>;
+    private pauseIfOverIdle;
     private cancelRelease;
     close(): void;
 }

package/dist/index.js

@@ -1469,6 +1469,7 @@ var RepositorySchema = z.object({
   sandboxImage: SandboxImageSchema.describe(
     "Sandbox image this repository's sandboxes boot from."
   ),
+  monitorDeploys: z.boolean().describe("Its default-branch pushes show on the Monitor's Deploys tab."),
   createdAt: z.string(),
   updatedAt: z.string()
 });
@@ -6762,7 +6763,7 @@ var Freestyle = class {
 // ../sandbox/package.json
 var package_default = {
   name: "@decocms/sandbox",
-  version: "1.93.4",
+  version: "1.93.5",
   private: true,
   type: "module",
   description: "Sandbox runtime for isolated Studio tool execution",
@@ -7290,7 +7291,15 @@ ${head}`).digest("hex").slice(0, 16)}`;
     const sentinel = this.sentinelToken(snapshotSlug);
     const payload = this.configPayload(opts) ?? {};
     try {
-      await postConfig(url, sentinel, payload, { rotateToken: token });
+      await retry(
+        () => postConfig(url, sentinel, payload, { rotateToken: token }),
+        {
+          maxAttempts: 8,
+          minTimeout: 250,
+          maxTimeout: 4e3,
+          isRetriable: (err) => err instanceof ConfigRequestError && err.status === 502
+        }
+      );
       console.log(`[${LOG_LABEL2}] reclaimed ${url} after a reboot`);
       return;
     } catch (err) {
@@ -7588,40 +7597,20 @@ ${head}`).digest("hex").slice(0, 16)}`;
     if (this.sweeping) return [];
     this.sweeping = true;
     try {
-      const running = [];
-      for (let offset = 0; ; offset += IDLE_SWEEP_PAGE) {
+      const paused = [];
+      for (let offset = 0; ; ) {
         const { vms } = await this.freestyle.vms.list({
           state: "running",
           limit: IDLE_SWEEP_PAGE,
           offset
         });
-        running.push(...vms);
+        const results = await Promise.all(
+          vms.map((data) => this.pauseIfOverIdle(data))
+        );
+        paused.push(...results);
         if (vms.length < IDLE_SWEEP_PAGE) break;
+        offset += vms.length - results.filter((h) => h !== null).length;
       }
-      const paused = await Promise.all(
-        running.map(async (data) => {
-          const handle = data.slug;
-          if (!handle || !data.metadata[TOKEN_KEY]) return null;
-          if (Date.now() - Date.parse(data.createdAt) < this.idlePauseMs) {
-            return null;
-          }
-          const idleMs = await daemonIdleMs(this.daemonUrl(handle));
-          if (idleMs === null || idleMs < this.idlePauseMs) return null;
-          try {
-            await this.freestyle.vms.ref(data.id).pause();
-          } catch (err) {
-            console.warn(
-              `[${LOG_LABEL2}] pause ${handle} failed: ${errMsg2(err)}`
-            );
-            return null;
-          }
-          this.cancelRelease(handle);
-          console.log(
-            `[${LOG_LABEL2}] paused ${handle}, daemon idle ${Math.round(idleMs / 6e4)}m`
-          );
-          return handle;
-        })
-      );
       return paused.filter((h) => h !== null);
     } catch (err) {
       console.warn(`[${LOG_LABEL2}] idle sweep failed: ${errMsg2(err)}`);
@@ -7630,6 +7619,26 @@ ${head}`).digest("hex").slice(0, 16)}`;
       this.sweeping = false;
     }
   }
+  async pauseIfOverIdle(data) {
+    const handle = data.slug;
+    if (!handle || !data.metadata[TOKEN_KEY]) return null;
+    if (Date.now() - Date.parse(data.createdAt) < this.idlePauseMs) {
+      return null;
+    }
+    const idleMs = await daemonIdleMs(this.daemonUrl(handle));
+    if (idleMs === null || idleMs < this.idlePauseMs) return null;
+    try {
+      await this.freestyle.vms.ref(data.id).pause();
+    } catch (err) {
+      console.warn(`[${LOG_LABEL2}] pause ${handle} failed: ${errMsg2(err)}`);
+      return null;
+    }
+    this.cancelRelease(handle);
+    console.log(
+      `[${LOG_LABEL2}] paused ${handle}, daemon idle ${Math.round(idleMs / 6e4)}m`
+    );
+    return handle;
+  }
   cancelRelease(handle) {
     const timer = this.releaseTimers.get(handle);
     if (timer) clearTimeout(timer);

package/package.json

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