deepspace 0.4.1 → 0.4.2

package/dist/cli.js

@@ -187,10 +187,12 @@ var DEV_VARS_DIVIDER = "# --- not managed by the SDK; preserved across dev/test
 function extractCustomDevVars(content) {
   const lines = content.split("\n");
   const out = [];
+  let belowDivider = false;
   let i = 0;
   while (i < lines.length) {
     const line = lines[i];
     if (line.trim() === DEV_VARS_DIVIDER.trim()) {
+      belowDivider = true;
       i++;
       continue;
     }
@@ -215,7 +217,7 @@ function extractCustomDevVars(content) {
     } else {
       i++;
     }
-    if (!SDK_MANAGED_KEYS.has(key)) {
+    if (belowDivider || !SDK_MANAGED_KEYS.has(key)) {
       out.push(...block);
     }
   }
@@ -1346,6 +1348,7 @@ var test_accounts_default = defineCommand7({
 // src/cli/commands/deploy.ts
 import { defineCommand as defineCommand8 } from "citty";
 import { execSync as execSync2 } from "child_process";
+import { randomUUID } from "crypto";
 import { readFileSync as readFileSync6, readdirSync, existsSync as existsSync9 } from "fs";
 import { parse as parseToml2 } from "smol-toml";
 import { join as join9, resolve as resolve5, dirname } from "path";
@@ -1599,6 +1602,59 @@ function formatDeployWorkerError(status2, error) {
 
 Underlying error: ${detail}`;
 }
+var MAX_GROUP_BYTES = 40 * 1024 * 1024;
+var GROUP_BYTES = (() => {
+  const raw = Number(process.env.DEEPSPACE_DEPLOY_GROUP_BYTES);
+  const v = Number.isInteger(raw) && raw > 0 ? raw : 3 * 1024 * 1024;
+  return Math.min(v, MAX_GROUP_BYTES);
+})();
+function packAssetGroups(assets, maxBytes) {
+  const groups = [];
+  let current = [];
+  let currentBytes = 2;
+  for (const a of assets) {
+    const entryBytes = Buffer.byteLength(JSON.stringify(a), "utf-8") + 1;
+    if (current.length > 0 && currentBytes + entryBytes > maxBytes) {
+      groups.push(current);
+      current = [];
+      currentBytes = 2;
+    }
+    current.push(a);
+    currentBytes += entryBytes;
+  }
+  if (current.length > 0) groups.push(current);
+  return groups;
+}
+async function postWithRetry(url, makeInit, { attempts = 4, retryServerErrors = true } = {}) {
+  let lastRes;
+  let lastErr;
+  for (let attempt = 1; attempt <= attempts; attempt++) {
+    try {
+      const res = await fetch(url, makeInit());
+      const isTransient = retryServerErrors && (res.status >= 500 || res.status === 408 || res.status === 429);
+      if (!isTransient) {
+        return res;
+      }
+      lastRes = res;
+    } catch (err) {
+      lastErr = err;
+    }
+    if (attempt < attempts) {
+      await new Promise((r) => setTimeout(r, Math.min(8e3, 500 * 2 ** (attempt - 1))));
+    }
+  }
+  if (lastRes) return lastRes;
+  throw lastErr instanceof Error ? lastErr : new Error(String(lastErr));
+}
+async function abortStagedUpload(appName, uploadId, totalGroups, token2) {
+  try {
+    await fetch(
+      `${DEPLOY_URL}/api/deploy/${appName}/assets?uploadId=${uploadId}&totalGroups=${totalGroups}`,
+      { method: "DELETE", headers: { Authorization: `Bearer ${token2}` } }
+    );
+  } catch {
+  }
+}
 var deploy_default = defineCommand8({
   meta: {
     name: "deploy",
@@ -1647,7 +1703,8 @@ var deploy_default = defineCommand8({
       execSync2("npx vite build", { cwd: appDir, stdio: "pipe" });
     } catch (err) {
       s.stop("Build failed");
-      console.error(err.stderr?.toString() ?? err.message);
+      const detail = [err.stdout?.toString(), err.stderr?.toString()].filter(Boolean).join("\n").trim();
+      console.error(detail || err.message);
       process.exit(1);
     }
     s.stop("Built");
@@ -1740,30 +1797,98 @@ var deploy_default = defineCommand8({
       p4.log.info(`App secrets (from .dev.vars): ${userSecretNames.join(", ")}`);
     }
     s.start(`Deploying to ${appName}.app.space...`);
-    const form = new FormData();
-    form.append("worker", new Blob([workerJs], { type: "application/javascript" }), "worker.js");
-    form.append("assets", JSON.stringify(assets));
-    if (doManifest) {
-      form.append("doManifest", JSON.stringify(doManifest));
-    }
-    if (customBindings.length) {
-      form.append("bindingManifest", JSON.stringify(customBindings));
-    }
-    if (userSecretNames.length) {
-      form.append("userSecrets", JSON.stringify(userSecrets));
-    }
     const extraRoutes = extractRunWorkerFirst(wranglerConfig);
     if (extraRoutes.length) {
-      form.append("extraRunWorkerFirst", JSON.stringify(extraRoutes));
       p4.log.info(`Custom worker-first routes: ${extraRoutes.join(", ")}`);
     }
-    const res = await fetch(`${DEPLOY_URL}/api/deploy/${appName}`, {
-      method: "POST",
-      headers: { Authorization: `Bearer ${token2}` },
-      body: form
-    });
+    const assetGroups = packAssetGroups(assets, GROUP_BYTES);
+    let inlineAssets = null;
+    let uploadId = null;
+    let totalGroups = 0;
+    if (assetGroups.length <= 1) {
+      inlineAssets = JSON.stringify(assets);
+    } else {
+      uploadId = randomUUID();
+      totalGroups = assetGroups.length;
+      try {
+        for (let i = 0; i < totalGroups; i++) {
+          const groupJson = JSON.stringify(assetGroups[i]);
+          s.message(`Uploading assets \u2014 group ${i + 1}/${totalGroups}...`);
+          const groupRes = await postWithRetry(
+            `${DEPLOY_URL}/api/deploy/${appName}/assets?uploadId=${uploadId}&groupIndex=${i}&totalGroups=${totalGroups}`,
+            () => ({
+              method: "POST",
+              headers: {
+                Authorization: `Bearer ${token2}`,
+                "Content-Type": "application/json"
+              },
+              body: groupJson
+            })
+          );
+          if (!groupRes.ok) {
+            const errBody = await groupRes.json().catch(() => ({}));
+            await abortStagedUpload(appName, uploadId, totalGroups, token2);
+            s.stop("Deploy failed");
+            p4.cancel(
+              `Asset upload failed on group ${i + 1}/${totalGroups}: ${errBody.error ?? `HTTP ${groupRes.status}`}`
+            );
+            process.exit(1);
+          }
+        }
+      } catch (err) {
+        await abortStagedUpload(appName, uploadId, totalGroups, token2);
+        s.stop("Deploy failed");
+        p4.cancel(`Asset upload failed (network): ${err?.message ?? err}`);
+        process.exit(1);
+      }
+      s.message(`Deploying to ${appName}.app.space...`);
+    }
+    const makeForm = () => {
+      const form = new FormData();
+      form.append("worker", new Blob([workerJs], { type: "application/javascript" }), "worker.js");
+      if (inlineAssets !== null) {
+        form.append("assets", inlineAssets);
+      } else {
+        form.append("uploadId", uploadId);
+        form.append("totalGroups", String(totalGroups));
+      }
+      if (doManifest) {
+        form.append("doManifest", JSON.stringify(doManifest));
+      }
+      if (customBindings.length) {
+        form.append("bindingManifest", JSON.stringify(customBindings));
+      }
+      if (userSecretNames.length) {
+        form.append("userSecrets", JSON.stringify(userSecrets));
+      }
+      if (extraRoutes.length) {
+        form.append("extraRunWorkerFirst", JSON.stringify(extraRoutes));
+      }
+      return form;
+    };
+    let res;
+    try {
+      res = await postWithRetry(
+        `${DEPLOY_URL}/api/deploy/${appName}`,
+        () => ({
+          method: "POST",
+          headers: { Authorization: `Bearer ${token2}` },
+          body: makeForm()
+        }),
+        // Commit runs a real deploy — don't retry its 5xx (could double-deploy);
+        // only a thrown fetch (dropped connection) is retried, and the staged
+        // groups survive on the worker until this request succeeds.
+        { retryServerErrors: false }
+      );
+    } catch (err) {
+      if (uploadId) await abortStagedUpload(appName, uploadId, totalGroups, token2);
+      s.stop("Deploy failed");
+      p4.cancel(`Deploy request failed: ${err?.message ?? err}`);
+      process.exit(1);
+    }
     const body = await res.json().catch(() => ({}));
     if (!res.ok || !body.success) {
+      if (uploadId) await abortStagedUpload(appName, uploadId, totalGroups, token2);
       s.stop("Deploy failed");
       p4.cancel(formatDeployWorkerError(res.status, body.error));
       process.exit(1);