sproutboat 0.4.8 → 0.4.10

package/SURFACE.md

@@ -3,7 +3,7 @@
 > Generated by `src/surface.test.ts` from `src/surface.ts` + the pinned
 > toolchain constants. Do not edit by hand — run `UPDATE_SURFACE=1 bun test`.
 
-**Package:** `sproutboat` 0.4.8 · runs on Bun (use `bunx`, not `npx`)
+**Package:** `sproutboat` 0.4.10 · runs on Bun (use `bunx`, not `npx`)
 
 ## Commands
 
@@ -12,7 +12,7 @@
 | `init` | `[name]` | Scaffold sproutboat.jsonc + src/index.js in ./<name>. |
 | `check` | `[project-dir]` | Validate the config and entry point without building. |
 | `build` | `[project-dir]` | Cross-compile the native-fetch sprout (Porffor + Zig). |
-| `deploy` | `[project-dir] [--dry-run] [--artifact <dir>] [--no-wait] [--no-provision] [--force]` | Build (unless --artifact), auto-provision id-less storage bindings and pin their ids into sproutboat.jsonc, print the report, upload, wait until the URL serves. --dry-run stops before upload; --no-wait skips the health check; --no-provision leaves id-less bindings as ephemeral deploy-scoped stores; --force uploads even if the sprout binary is unchanged. |
+| `deploy` | `[project-dir] [--dry-run] [--artifact <dir>] [--no-wait] [--no-provision]` | Build (unless --artifact), auto-provision id-less storage bindings and pin their ids into sproutboat.jsonc, print the report, upload, wait until the URL serves. The control plane skips an upload that matches the live artifact byte-for-byte. --dry-run stops before upload; --no-wait skips the health check; --no-provision leaves id-less bindings as ephemeral deploy-scoped stores. |
 | `versions` | `list [project-dir]` | List the project's deployed versions. |
 | `rollback` | `<version-id> [project-dir]` | Re-activate a previous version. |
 | `tail` | `[project-dir] [--sprout]` | Print recent request logs; --sprout prints the running sprout + broker stdout/stderr instead. |
@@ -23,7 +23,7 @@
 | `login` | `[--api-url <url>] [--token <token>]` | Device-code browser flow, or store <token> for <url> directly. |
 
 ```
-usage: sproutboat <init [name] | check [project-dir] | build [project-dir] | deploy [project-dir] [--dry-run] [--artifact <dir>] [--no-wait] [--no-provision] [--force] | versions list [project-dir] | rollback <version-id> [project-dir] | tail [project-dir] [--sprout] | domains [list | add <host> | verify <host> | rm <host>] [project-dir] | secrets [list | set <NAME> [value] | rm <NAME>] [project-dir] | resource [list [kind] | create <kind> <name> | rename <id> <name> | delete <id>] | delete [project-dir] [--name <project>] --yes | login [--api-url <url>] [--token <token>]>
+usage: sproutboat <init [name] | check [project-dir] | build [project-dir] | deploy [project-dir] [--dry-run] [--artifact <dir>] [--no-wait] [--no-provision] | versions list [project-dir] | rollback <version-id> [project-dir] | tail [project-dir] [--sprout] | domains [list | add <host> | verify <host> | rm <host>] [project-dir] | secrets [list | set <NAME> [value] | rm <NAME>] [project-dir] | resource [list [kind] | create <kind> <name> | rename <id> <name> | delete <id>] | delete [project-dir] [--name <project>] --yes | login [--api-url <url>] [--token <token>]>
 ```
 
 ## Environment variables

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sproutboat",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "description": "Wrangler-shaped CLI for Sproutboat. Deploys workers to any control plane via --api-url / SPROUTBOAT_API_URL.",
   "license": "MIT",
   "type": "module",

package/src/main.ts

@@ -39,22 +39,9 @@ function jsonObject(value: JsonValue): JsonObject | undefined {
   return value instanceof Object && !Array.isArray(value) ? value : undefined;
 }
 
-type DeploymentSummary = { artifact: string; hostname: string; active: boolean };
 type VersionSummary = { id: string; artifact: string; deployedAt: string; active: boolean };
 type CliAuthorization = { deviceCode: string; userCode: string; verificationUri: string; interval: number; expiresAt: string };
 
-function parseDeploymentList(source: string): DeploymentSummary[] | undefined {
-  const value = parseJsonValue(source);
-  if (!Array.isArray(value)) return undefined;
-  const deployments: DeploymentSummary[] = [];
-  for (const item of value) {
-    const record = jsonObject(item);
-    if (!record || !isString(record.artifact) || !isString(record.hostname) || (record.active !== true && record.active !== false)) return undefined;
-    deployments.push({ artifact: record.artifact, hostname: record.hostname, active: record.active });
-  }
-  return deployments;
-}
-
 function parseVersionList(source: string): VersionSummary[] | undefined {
   const value = parseJsonValue(source);
   if (!Array.isArray(value)) return undefined;
@@ -67,13 +54,14 @@ function parseVersionList(source: string): VersionSummary[] | undefined {
   return deployments;
 }
 
-function parseUrlResponse(source: string): { url: string; id?: string; artifact?: string } | undefined {
+function parseUrlResponse(source: string): { url: string; id?: string; artifact?: string; unchanged: boolean } | undefined {
   const record = jsonObject(parseJsonValue(source));
   if (!record || !isString(record.url)) return undefined;
   return {
     url: record.url,
     id: isString(record.id) ? record.id : undefined,
     artifact: isString(record.artifact) ? record.artifact : undefined,
+    unchanged: record.unchanged === true,
   };
 }
 
@@ -263,23 +251,6 @@ async function deploy(args: string[]) {
     return;
   }
   const { apiUrl, token } = await apiCredentials();
-  const digest = artifactManifest.binaryHash.replace(/^sha256:/, "");
-  // The "already active" shortcut keys on the sprout binary hash alone. Assets
-  // and bindings.json can change while the handler stays byte-identical, so skip
-  // it whenever the artifact ships either sidecar (or the caller passed --force).
-  const hasSidecars = (await Bun.file(resolve(artifactDir, "assets.json")).exists())
-    || (await Bun.file(resolve(artifactDir, "bindings.json")).exists());
-  if (digest && !hasSidecars && !args.includes("--force")) {
-    const response = await fetch(`${apiUrl.replace(/\/$/, "")}/api/projects/${projectName}/deployments`, { headers: { "x-api-key": token } });
-    const deployments = parseDeploymentList(await responseText(response, "could not check existing deployments"));
-    if (!deployments) fail("could not parse deployment list response");
-    const active = deployments.find((deployment) => deployment.active && deployment.artifact === digest);
-    if (active) {
-      console.log(ok(`nothing to deploy — artifact ${digest.slice(0, 12)} is already active`));
-      console.log(`https://${active.hostname}`);
-      return;
-    }
-  }
   const form = new FormData();
   form.set("manifest", new File([await manifest.arrayBuffer()], "manifest.json", { type: "application/json" }));
   form.set("sprout", new File([await sprout.arrayBuffer()], "sprout", { type: "application/octet-stream" }));
@@ -310,6 +281,11 @@ async function deploy(args: string[]) {
   const body = await responseText(response, "deployment rejected");
   const deployed = parseUrlResponse(body);
   if (!deployed) fail("deployment response did not include a URL");
+  if (deployed.unchanged) {
+    console.log(ok(`nothing to deploy — ${projectName} is already serving this exact artifact`));
+    console.log(`  ${deployed.url}`);
+    return;
+  }
   console.log(`\n${leaf("🌱")} ${bold(leaf(`Deployed ${projectName}`))}`);
   console.log(`  ${bold(deployed.url)}`);
   if (deployed.id) console.log(dim(`  version ${deployed.id}${deployed.artifact ? `  ·  artifact ${deployed.artifact.slice(0, 12)}` : ""}`));
@@ -433,21 +409,32 @@ async function tail(args: string[]) {
   process.stdout.write(await responseText(response, "could not read logs"));
 }
 
-type DomainView = { hostname: string; verified: boolean; verification: { type: string; name: string; value: string } | null };
+type DomainView = {
+  hostname: string;
+  verified: boolean;
+  verification: { type: string; name: string; value: string } | null;
+  serverAddresses: string[];
+  warning?: string;
+};
 function parseDomain(source: string): DomainView | undefined {
   const record = jsonObject(parseJsonValue(source));
   if (!record || !isString(record.hostname) || typeof record.verified !== "boolean") return undefined;
   const v = jsonObject(record.verification ?? null);
   const verification = v && isString(v.type) && isString(v.name) && isString(v.value) ? { type: v.type, name: v.name, value: v.value } : null;
-  return { hostname: record.hostname, verified: record.verified, verification };
+  const serverAddresses = Array.isArray(record.serverAddresses) ? record.serverAddresses.filter(isString) : [];
+  return { hostname: record.hostname, verified: record.verified, verification, serverAddresses, warning: isString(record.warning) ? record.warning : undefined };
 }
 function printDomain(domain: DomainView) {
   const status = domain.verified ? "verified" : "unverified";
   console.log(`${status.padEnd(10)} ${domain.hostname}`);
   if (domain.verification) {
-    console.log(`  add this DNS record, then run: sproutboat domains verify ${domain.hostname}`);
+    console.log("  add these DNS records, then run: sproutboat domains verify " + domain.hostname);
     console.log(`  ${domain.verification.type}  ${domain.verification.name}  "${domain.verification.value}"`);
+    if (domain.serverAddresses[0]) {
+      console.log(`  A    ${domain.hostname}  ${domain.serverAddresses[0]}   (point the hostname here, DNS-only / not proxied)`);
+    }
   }
+  if (domain.warning) console.log(amber(`  ! ${domain.warning}`));
 }
 
 async function domains(args: string[]) {

package/src/surface.ts

@@ -31,8 +31,8 @@ export const COMMANDS: readonly Command[] = [
     summary: "Cross-compile the native-fetch sprout (Porffor + Zig)." },
 
   { name: "deploy", group: "Ship", emoji: "🚀",
-    args: "[project-dir] [--dry-run] [--artifact <dir>] [--no-wait] [--no-provision] [--force]", brief: "[project-dir] [--dry-run]",
-    summary: "Build (unless --artifact), auto-provision id-less storage bindings and pin their ids into sproutboat.jsonc, print the report, upload, wait until the URL serves. --dry-run stops before upload; --no-wait skips the health check; --no-provision leaves id-less bindings as ephemeral deploy-scoped stores; --force uploads even if the sprout binary is unchanged." },
+    args: "[project-dir] [--dry-run] [--artifact <dir>] [--no-wait] [--no-provision]", brief: "[project-dir] [--dry-run]",
+    summary: "Build (unless --artifact), auto-provision id-less storage bindings and pin their ids into sproutboat.jsonc, print the report, upload, wait until the URL serves. The control plane skips an upload that matches the live artifact byte-for-byte. --dry-run stops before upload; --no-wait skips the health check; --no-provision leaves id-less bindings as ephemeral deploy-scoped stores." },
   { name: "versions", group: "Ship", emoji: "📜", args: "list [project-dir]",
     summary: "List the project's deployed versions." },
   { name: "rollback", group: "Ship", emoji: "⏮", args: "<version-id> [project-dir]", brief: "<version-id>",