@void/deploy-cloudflare 0.21.2 → 0.21.4

package/dist/index.d.mts

@@ -69,6 +69,7 @@ export declare function assertCloudflareDurableObjectLifecycleSupported(options:
   accountId: string;
   apiBaseUrl: string;
   readMigrationTag?: (options: CloudflareWorkerMigrationTagOptions) => Promise<string | null>;
+  allowPendingAtomicMigration?: boolean;
 }): Promise<void>;
 export declare function assertCloudflareBindingsPreserved(before: ExistingCloudflareWorker, after: ExistingCloudflareWorker, approvedKv?: ReadonlyArray<ApprovedCloudflareKvBinding>, options?: {
   staticAssetsBinding?: string;
@@ -197,7 +198,7 @@ type CloudflareVersionActivation = {
   trafficConfig?: CloudflareTrafficConfig;
 } | {
   ok: false;
-  reason: "uploader-changed" | "status-failed" | "deployment-changed" | "inheritance-source-unavailable" | "inheritance-source-changed" | "traffic-preservation-unavailable" | "traffic-split-unsupported" | "upload-failed" | "upload-output-invalid" | "preview-unavailable" | "readiness-staging-failed" | "readiness-failed" | "readiness-access-denied" | "bootstrap-failed" | "bootstrap-output-invalid" | "bootstrap-readiness-failed" | "bootstrap-readiness-access-denied" | "activation-failed" | "triggers-failed";
+  reason: "uploader-changed" | "status-failed" | "deployment-changed" | "inheritance-source-unavailable" | "inheritance-source-changed" | "traffic-preservation-unavailable" | "traffic-split-unsupported" | "upload-failed" | "upload-output-invalid" | "preview-unavailable" | "readiness-staging-failed" | "readiness-failed" | "readiness-access-denied" | "bootstrap-failed" | "bootstrap-output-invalid" | "bootstrap-readiness-failed" | "bootstrap-readiness-access-denied" | "atomic-failed" | "atomic-output-invalid" | "atomic-readiness-failed" | "atomic-readiness-access-denied" | "activation-failed" | "triggers-failed";
   status?: number;
   cloudflareErrorCode?: number;
   /** Bounded uploader error text with terminal escapes removed and common credential formats redacted. */
@@ -273,7 +274,7 @@ type CloudflareVersionActivationOptions = {
   preserveTriggers?: boolean;
   expectedPreviousVersionId?: string;
   trustedInheritanceVersionIds?: ReadonlyArray<string>;
-  recordVerifiedCandidate?: (versionId: string) => void | Promise<void>;
+  recordVerifiedCandidate?: (versionId: string, parentVersionId: string | null) => void | Promise<void>;
   validateUploadedVersion?: (versionId: string) => Promise<void>;
   runWrangler: CloudflareCommandRunner;
   verifyUploader: () => boolean;
@@ -309,6 +310,13 @@ type CloudflareVersionActivationOptions = {
   readinessAttempts?: number;
   /** Verify that omitted remote secrets come from the active Worker Version before uploading. */
   verifyInheritedSecrets?: boolean;
+  /** Pin opaque secret bindings to the live version when an unpublished upload is newer. */
+  pinActiveSecrets?: (activeVersionId: string, bindings: ReadonlyArray<{
+    name: string;
+    type: "secret_text" | "secret_key";
+  }>) => Promise<boolean> | boolean;
+  /** Explicitly publish an existing Durable Object Worker in one atomic operation. */
+  atomic?: boolean;
   /**
    * Plaintext secrets to attach only to the uploaded candidate version. Supplying every remote
    * `secret_text` binding lets a deployment recover safely when an inactive upload is newer than

package/dist/index.mjs

@@ -246,13 +246,15 @@ async function assertCloudflareDurableObjectLifecycleSupported(options) {
 	const afterTag = await readMigrationTag(migrationOptions);
 	if (!after || after.snapshot.versionId !== existing.snapshot.versionId || afterTag !== activeTag) throw new Error("Cloudflare production or Durable Object migration state changed during verification. Retry from the current deployment.");
 	if (activeTag === null && existing.isSecretOnlyDraft && after.isSecretOnlyDraft) return;
+	if (activeTag === null && declarativeClassesMatch(migrations, existing.snapshot.runtime.exports)) return;
 	const activeIndex = activeTag === null ? -1 : migrations.findIndex((migration) => migration.tag === activeTag);
 	const pending = migrations.slice(activeIndex + 1).filter((migration) => migration.changesClasses);
 	if (pending.length === 0) return;
+	if (options.allowPendingAtomicMigration === true) return;
 	throw new Error([
-		"deploy: native Cloudflare beta cannot apply a Durable Object class migration to an existing Worker.",
+		"deploy: this Durable Object class migration needs an atomic Cloudflare deployment.",
 		`Pending migration tag${pending.length === 1 ? "" : "s"}: ${pending.map((migration) => migration.tag).join(", ")}.`,
-		"Apply the class migration through a supported Cloudflare deployment workflow, then retry after that migration tag is active.",
+		"Review the migration, then run `void deploy --platform cloudflare --atomic`. The Worker will receive traffic before readiness is checked.",
 		"No database migration or Worker secret was changed."
 	].join("\n"));
 }
@@ -270,10 +272,39 @@ function parseDurableObjectMigrations(value) {
 		for (const field of fields) if (field !== void 0 && !Array.isArray(field)) throw new Error("deploy: generated Cloudflare config has a malformed class migration.");
 		return {
 			tag: migration.tag,
-			changesClasses: fields.some((field) => Array.isArray(field) && field.length > 0)
+			changesClasses: fields.some((field) => Array.isArray(field) && field.length > 0),
+			step: migration
 		};
 	});
 }
+/** Cloudflare's declarative exports replace the legacy migration tag after an atomic publish. */
+function declarativeClassesMatch(migrations, actualValue) {
+	if (!record$1(actualValue)) return false;
+	const desired = /* @__PURE__ */ new Map();
+	for (const { step } of migrations) {
+		for (const [field, storage] of [["new_classes", "legacy-kv"], ["new_sqlite_classes", "sqlite"]]) for (const name of step[field] ?? []) {
+			if (typeof name !== "string") return false;
+			desired.set(name, storage);
+		}
+		for (const item of step.renamed_classes ?? []) {
+			if (!record$1(item) || typeof item.from !== "string" || typeof item.to !== "string") return false;
+			const storage = desired.get(item.from);
+			if (storage !== "sqlite" && storage !== "legacy-kv") return false;
+			desired.set(item.from, "deleted");
+			desired.set(item.to, storage);
+		}
+		for (const name of step.deleted_classes ?? []) {
+			if (typeof name !== "string") return false;
+			desired.set(name, "deleted");
+		}
+	}
+	if (desired.size === 0) return false;
+	return [...desired].every(([name, storage]) => {
+		const current = actualValue[name];
+		if (storage === "deleted") return current === void 0 || record$1(current) && current.state === "deleted";
+		return record$1(current) && current.type === "durable-object" && current.storage === storage;
+	});
+}
 function isMissingWorkerOutput$1(output) {
 	return /\[code:\s*10007\]/i.test(output) || /no deployments|\bworker\b.*\b(?:does not exist|not found)\b/i.test(output);
 }
@@ -1144,6 +1175,7 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 	};
 	const previousVersionId = previous.versionId;
 	let inheritanceBaseline;
+	let trustedCandidateChain = false;
 	if (options.expectedPreviousVersionId !== void 0 || options.verifyInheritedSecrets === true) {
 		const recent = await readRecentCloudflareVersionIds(options, commonArgs);
 		if (recent === null) return {
@@ -1151,29 +1183,33 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 			reason: "inheritance-source-unavailable"
 		};
 		const latestVersionId = recent.at(-1)?.id ?? null;
-		if (options.expectedPreviousVersionId !== void 0) {
+		if (options.expectedPreviousVersionId !== void 0 || options.trustedInheritanceVersionIds !== void 0) {
 			const activeIndex = recent.findIndex((version) => version.id === previous.versionId);
 			const inheritedChain = activeIndex < 0 ? [] : recent.slice(activeIndex);
 			const inheritedCandidates = inheritedChain.slice(1).map((version) => version.id);
-			if (!(inheritedChain.length > 0 && inheritedChain.every((version, index) => index === 0 || version.number === inheritedChain[index - 1].number + 1) && arraysEqual(inheritedCandidates, options.trustedInheritanceVersionIds ?? []))) return {
+			trustedCandidateChain = options.trustedInheritanceVersionIds !== void 0 && options.trustedInheritanceVersionIds.length > 0 && arraysEqual(inheritedCandidates, options.trustedInheritanceVersionIds);
+			if (!(inheritedChain.length > 0 && inheritedChain.every((version, index) => index === 0 || version.number === inheritedChain[index - 1].number + 1) && (arraysEqual(inheritedCandidates, options.trustedInheritanceVersionIds ?? []) || options.pinActiveSecrets !== void 0))) return {
 				ok: false,
 				reason: "inheritance-source-changed",
 				activeVersionId: recent.at(-1)?.id ?? null,
 				rollback: "not-needed"
 			};
 		}
-		if (options.verifyInheritedSecrets === true && previous.versionId !== latestVersionId) {
+		if (options.verifyInheritedSecrets === true && previous.versionId !== latestVersionId && !trustedCandidateChain) {
 			const replacesAllRemoteSecrets = await candidateReplacesAllRemoteSecrets(options, commonArgs, previous.versionId, latestVersionId);
 			if (replacesAllRemoteSecrets === null) return {
 				ok: false,
 				reason: "inheritance-source-unavailable"
 			};
-			if (!replacesAllRemoteSecrets) return {
-				ok: false,
-				reason: "inheritance-source-changed",
-				activeVersionId: latestVersionId,
-				rollback: "not-needed"
-			};
+			if (!replacesAllRemoteSecrets) {
+				const activeSecrets = previous.versionId ? await readCloudflareVersionSecretBindings(options, commonArgs, previous.versionId) : null;
+				if (!activeSecrets || !options.pinActiveSecrets || !await options.pinActiveSecrets(previous.versionId, activeSecrets)) return {
+					ok: false,
+					reason: "inheritance-source-changed",
+					activeVersionId: latestVersionId,
+					rollback: "not-needed"
+				};
+			}
 		}
 		inheritanceBaseline = recent;
 	}
@@ -1214,6 +1250,10 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 	} : versionedPreviousTriggerConfig;
 	const previousTriggerConfig = triggerConfigWithQueueConsumerCleanup(versionedPreviousTriggerConfigWithTraffic, options.queueConsumerCleanup);
 	const alias = `void-ready-${Date.now().toString(36)}`;
+	if (options.atomic && previous.versionId !== null) return bootstrapFirstDeployment({
+		...options,
+		message
+	}, commonArgs, previous.versionId, true);
 	options.onProgress?.("Uploading the Worker and assets...");
 	const upload = await Promise.resolve(options.runWrangler([
 		"versions",
@@ -1278,8 +1318,8 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 	}
 	await options.validateUploadedVersion?.(versionId);
 	if (options.recordVerifiedCandidate) {
-		if (!options.validateUploadedVersion) throw new Error("A Worker candidate cannot be recorded without validating its upload.");
-		await options.recordVerifiedCandidate(versionId);
+		if (!options.validateUploadedVersion && !inheritanceBaseline) throw new Error("A Worker candidate cannot be recorded without validating its upload and version sequence.");
+		await options.recordVerifiedCandidate(versionId, previous.versionId);
 	}
 	const reportedPreviewUrl = output.match(PREVIEW_URL_RE)?.[1];
 	let authenticatedWorkersDevSubdomain = reportedPreviewUrl ? extractWorkersDevSubdomain(reportedPreviewUrl) : void 0;
@@ -1311,14 +1351,19 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 		const stagingOwnerFailure = await verifyReadinessStagingOwner(options, commonArgs, previous.versionId, versionId);
 		if (stagingOwnerFailure) return stagingOwnerFailure;
 		const staged = await deployVersionPercentages(options, commonArgs, [`${previous.versionId}@100`, `${versionId}@0`], message);
-		if (!isCleanCommandExit(staged)) return {
-			ok: false,
-			reason: "readiness-staging-failed",
-			status: staged.status,
-			versionId,
-			previousVersionId: previous.versionId,
-			rollback: "not-needed"
-		};
+		if (!isCleanCommandExit(staged)) {
+			const cloudflareErrorCode = parseCloudflareErrorCode(`${staged.stdout}\n${staged.stderr}`);
+			return {
+				ok: false,
+				reason: "readiness-staging-failed",
+				status: staged.status,
+				...commandDiagnosticFields(staged),
+				...cloudflareErrorCode === void 0 ? {} : { cloudflareErrorCode },
+				versionId,
+				previousVersionId: previous.versionId,
+				rollback: "not-needed"
+			};
+		}
 		stagedVersionOverride = true;
 	}
 	options.onProgress?.("Waiting for the Worker to become ready...");
@@ -1336,14 +1381,19 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 			const stagingOwnerFailure = await verifyReadinessStagingOwner(options, commonArgs, previous.versionId, versionId);
 			if (stagingOwnerFailure) return stagingOwnerFailure;
 			const staged = await deployVersionPercentages(options, commonArgs, [`${previous.versionId}@100`, `${versionId}@0`], message);
-			if (!isCleanCommandExit(staged)) return {
-				ok: false,
-				reason: "readiness-staging-failed",
-				status: staged.status,
-				versionId,
-				previousVersionId: previous.versionId,
-				rollback: "not-needed"
-			};
+			if (!isCleanCommandExit(staged)) {
+				const cloudflareErrorCode = parseCloudflareErrorCode(`${staged.stdout}\n${staged.stderr}`);
+				return {
+					ok: false,
+					reason: "readiness-staging-failed",
+					status: staged.status,
+					...commandDiagnosticFields(staged),
+					...cloudflareErrorCode === void 0 ? {} : { cloudflareErrorCode },
+					versionId,
+					previousVersionId: previous.versionId,
+					rollback: "not-needed"
+				};
+			}
 			readinessUrl = stableReadinessUrl;
 			authenticatedWorkersDevSubdomain = extractWorkersDevSubdomain(stableReadinessUrl);
 			readinessUsesCustomRoute = !desiredTriggerConfig.workers_dev;
@@ -1680,12 +1730,26 @@ async function readCloudflareVersionSecretBindings(options, commonArgs, versionI
 * brand-new Worker can therefore need one ordinary deploy before later releases use preview-first
 * version activation. This fallback requires prior proof that no application had been deployed.
 */
-async function bootstrapFirstDeployment(options, commonArgs, previousVersionId) {
+async function bootstrapFirstDeployment(options, commonArgs, previousVersionId, atomic = false) {
 	if (!options.verifyUploader()) return {
 		ok: false,
 		reason: "uploader-changed"
 	};
-	options.onProgress?.("Publishing the first Worker deployment...");
+	if (atomic) {
+		const current = await readCurrentProductionVersion(options, commonArgs);
+		if (current.kind === "failed") return {
+			ok: false,
+			reason: "status-failed",
+			status: current.status
+		};
+		if (current.kind !== "ok" || current.versionId !== previousVersionId) return {
+			ok: false,
+			reason: "deployment-changed",
+			activeVersionId: current.kind === "ok" ? current.versionId : null,
+			rollback: "not-needed"
+		};
+	}
+	options.onProgress?.(atomic ? "Publishing the Worker atomically..." : "Publishing the first Worker deployment...");
 	const bootstrap = await Promise.resolve(options.runWrangler([
 		"deploy",
 		...commonArgs,
@@ -1705,7 +1769,7 @@ async function bootstrapFirstDeployment(options, commonArgs, previousVersionId)
 		const cloudflareErrorCode = parseCloudflareErrorCode(output);
 		return {
 			ok: false,
-			reason: "bootstrap-failed",
+			reason: atomic ? "atomic-failed" : "bootstrap-failed",
 			status: bootstrap.status,
 			...commandDiagnosticFields(bootstrap),
 			...cloudflareErrorCode === void 0 ? {} : { cloudflareErrorCode },
@@ -1719,7 +1783,7 @@ async function bootstrapFirstDeployment(options, commonArgs, previousVersionId)
 	const reportedOrConfiguredUrl = reportedUrl ?? (desiredTriggerConfig.workers_dev ? workersDevReadinessUrl(options.workerName, options.workersDevSubdomain) : customRouteReadinessUrl(desiredTriggerConfig.routes));
 	if (!versionId || !reportedOrConfiguredUrl) return {
 		ok: false,
-		reason: "bootstrap-output-invalid",
+		reason: atomic ? "atomic-output-invalid" : "bootstrap-output-invalid",
 		previousVersionId,
 		...versionId ? { versionId } : {}
 	};
@@ -1728,7 +1792,7 @@ async function bootstrapFirstDeployment(options, commonArgs, previousVersionId)
 	const ready = await probeReadiness(`${previewUrl.replace(/\/$/, "")}/__void/ready`, options.workerName, reportedUrl || desiredTriggerConfig.workers_dev ? options.readinessHeaders : void 0, extractWorkersDevSubdomain(previewUrl), void 0, options.fetch ?? globalThis.fetch, options.sleep ?? defaultSleep, options.readinessAttempts ?? 30, 6e4);
 	if (ready !== "ready") return {
 		ok: false,
-		reason: ready === "access-denied" ? "bootstrap-readiness-access-denied" : "bootstrap-readiness-failed",
+		reason: ready === "access-denied" ? atomic ? "atomic-readiness-access-denied" : "bootstrap-readiness-access-denied" : atomic ? "atomic-readiness-failed" : "bootstrap-readiness-failed",
 		versionId,
 		previousVersionId,
 		rollback: "unavailable"
@@ -1738,6 +1802,11 @@ async function bootstrapFirstDeployment(options, commonArgs, previousVersionId)
 		versionId,
 		previewUrl,
 		previousVersionId,
+		...atomic ? { trafficConfig: {
+			workers_dev: desiredTriggerConfig.workers_dev,
+			preview_urls: desiredTriggerConfig.preview_urls,
+			routes: desiredTriggerConfig.routes
+		} } : {},
 		...workersDevSubdomainResult(previewUrl)
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/deploy-cloudflare",
-  "version": "0.21.2",
+  "version": "0.21.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voidzero-dev/void.git",
@@ -20,7 +20,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@void/deploy-core": "0.21.2",
+    "@void/deploy-core": "0.21.4",
     "jsonc-parser": "3.3.1"
   },
   "devDependencies": {