@cloudhal/cli 0.3.9 → 0.3.10

package/dist/assets/starters/blog/package.json

@@ -14,18 +14,18 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@cloudhal/astro-renderer": "0.3.9",
-    "@cloudhal/core-ts": "0.3.9",
+    "@cloudhal/astro-renderer": "0.3.10",
+    "@cloudhal/core-ts": "0.3.10",
     "@tailwindcss/vite": "^4.3.3",
     "astro": "7.3.6",
     "better-sqlite3": "13.0.3",
     "tailwindcss": "^4.3.3",
     "@astrojs/cloudflare": "14.3.4",
-    "@cloudhal/cli": "0.3.9"
+    "@cloudhal/cli": "0.3.10"
   },
   "devDependencies": {
     "wrangler": "^4.148.0",
-    "@cloudhal/cloudflare": "0.3.9"
+    "@cloudhal/cloudflare": "0.3.10"
   },
   "trustedDependencies": [
     "better-sqlite3",

package/dist/src/commands/deploy/resources.d.ts

@@ -24,5 +24,15 @@ export declare const BUNDLE_LIFECYCLE_DAYS = 30;
  */
 export declare function ensureBundleLifecycle(run: WranglerRunner, cwd: string, bucket: string, log: (l: string) => void): Promise<void>;
 export declare function waitForHealth(adminUrl: string, f: typeof fetch, log: (line: string) => void, timeoutMs: number): Promise<void>;
+/**
+ * Runs `step` again while it fails with 401. Right after a deploy the edge can still answer from
+ * the previous admin Worker version, which holds the previous deployment token (Workers Builds
+ * makes a new one on every build), for a few seconds. Gives up after `timeoutMs`.
+ */
+export declare function whileTokenPropagates<T>(step: () => Promise<T>, options: {
+    log: (line: string) => void;
+    timeoutMs?: number;
+    waitMs?: number;
+}): Promise<T>;
 /** Purges the site Worker's whole cache once (the script tag lives in cached HTML). */
 export declare function purgeSite(siteUrl: string, token: string, f: typeof fetch, log: (line: string) => void): Promise<boolean>;

package/dist/src/commands/deploy/resources.js

@@ -139,6 +139,31 @@ export async function waitForHealth(
   }
 }
 
+/**
+ * Runs `step` again while it fails with 401. Right after a deploy the edge can still answer from
+ * the previous admin Worker version, which holds the previous deployment token (Workers Builds
+ * makes a new one on every build), for a few seconds. Gives up after `timeoutMs`.
+ */
+export async function whileTokenPropagates   (
+  step                  ,
+  options                                                                      ,
+)             {
+  const deadline = Date.now() + (options.timeoutMs ?? 90_000);
+  let announced = false;
+  for (;;) {
+    try {
+      return await step();
+    } catch (e) {
+      if (!/\(401\)/.test(e instanceof Error ? e.message : "") || Date.now() > deadline) throw e;
+      if (!announced) {
+        options.log("the deployment does not accept the new token yet; retrying while it spreads…");
+        announced = true;
+      }
+      await new Promise((r) => setTimeout(r, options.waitMs ?? 5000));
+    }
+  }
+}
+
 /** Purges the site Worker's whole cache once (the script tag lives in cached HTML). */
 export async function purgeSite(
   siteUrl        ,

package/dist/src/commands/deploy/ship.js

@@ -14,7 +14,7 @@ import { openLocalStore } from "@cloudhal/core-ts/local";
 import { deployedUrls, isCronLimitError, must, WranglerError } from "../../cloudflare/wrangler.js";
 import { pushSite, setPrimaryDomain } from "../sync.js";
                                                   
-import { purgeSite, waitForHealth } from "./resources.js";
+import { purgeSite, waitForHealth, whileTokenPropagates } from "./resources.js";
 import { CRON_REFUSED_MESSAGE } from "./schedules-guard.js";
                                                 
 
@@ -111,29 +111,35 @@ export async function afterDeploy(
       });
     await l.close();
   }
-  const result = await pushSite({
-    projectDir: options.projectDir,
-    ifAbsent: true,
-    log,
-    ...(options.fetch ? { fetch: options.fetch } : {}),
-  });
-  // A custom domain becomes the site's primary hostname (the workers.dev one stays secondary).
-  if (cfg.domains?.site) {
-    await setPrimaryDomain({
+  const retry =    (step                  ) => whileTokenPropagates(step, { log });
+  const result = await retry(() =>
+    pushSite({
       projectDir: options.projectDir,
-      hostname: cfg.domains.site,
+      ifAbsent: true,
+      log,
       ...(options.fetch ? { fetch: options.fetch } : {}),
-    });
-    log(
-      `site domain: https://${cfg.domains.site} (Cloudflare issues the certificate on first use)`,
+    }),
+  );
+  // A custom domain becomes the site's primary hostname (the workers.dev one stays secondary).
+  const domain = cfg.domains?.site;
+  if (domain) {
+    await retry(() =>
+      setPrimaryDomain({
+        projectDir: options.projectDir,
+        hostname: domain,
+        ...(options.fetch ? { fetch: options.fetch } : {}),
+      }),
     );
+    log(`site domain: https://${domain} (Cloudflare issues the certificate on first use)`);
   } else if (previous?.siteDomain && siteUrl) {
     // The custom domain was removed from cloudhal.json: workers.dev is primary again.
-    await setPrimaryDomain({
-      projectDir: options.projectDir,
-      hostname: new URL(siteUrl).hostname,
-      ...(options.fetch ? { fetch: options.fetch } : {}),
-    });
+    await retry(() =>
+      setPrimaryDomain({
+        projectDir: options.projectDir,
+        hostname: new URL(siteUrl).hostname,
+        ...(options.fetch ? { fetch: options.fetch } : {}),
+      }),
+    );
     log(
       `site domain ${previous.siteDomain} removed from cloudhal.json; if Cloudflare still lists it under the Worker's Domains & Routes, remove it there`,
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudhal/cli",
-  "version": "0.3.9",
+  "version": "0.3.10",
   "description": "cloudhal — create, run and build Cloudhal sites locally",
   "license": "Apache-2.0",
   "homepage": "https://cloudhal.dev",
@@ -27,16 +27,16 @@
     "README.md"
   ],
   "dependencies": {
-    "@cloudhal/agent-runtime": "0.3.9",
-    "@cloudhal/analytics": "0.3.9",
-    "@cloudhal/api": "0.3.9",
-    "@cloudhal/cloudflare": "0.3.9",
-    "@cloudhal/comments": "0.3.9",
-    "@cloudhal/core-contracts": "0.3.9",
-    "@cloudhal/core-ts": "0.3.9",
-    "@cloudhal/mcp-server": "0.3.9",
-    "@cloudhal/schedules": "0.3.9",
-    "@cloudhal/storage": "0.3.9",
+    "@cloudhal/agent-runtime": "0.3.10",
+    "@cloudhal/analytics": "0.3.10",
+    "@cloudhal/api": "0.3.10",
+    "@cloudhal/cloudflare": "0.3.10",
+    "@cloudhal/comments": "0.3.10",
+    "@cloudhal/core-contracts": "0.3.10",
+    "@cloudhal/core-ts": "0.3.10",
+    "@cloudhal/mcp-server": "0.3.10",
+    "@cloudhal/schedules": "0.3.10",
+    "@cloudhal/storage": "0.3.10",
     "@hono/node-server": "^2.1.4",
     "better-sqlite3": "13.0.3"
   },