@void/deploy-cloudflare 0.21.7 → 0.21.9

package/dist/index.d.mts

@@ -168,6 +168,8 @@ type CloudflareVersionMetadata = Readonly<{
   schema: 2;
   migrations: ReadonlyArray<string>;
   triggerConfig: CloudflareTriggerConfig;
+  /** Digest of the complete Worker upload input, when supplied by the caller. */
+  contentHash?: string;
 }>;
 type CloudflareTriggerConfig = Readonly<{
   /** This version retained the existing triggers instead of publishing a snapshot. */
@@ -218,7 +220,7 @@ type CloudflareVersionActivation = {
   triggerRepair?: "succeeded" | "failed" | "unavailable";
 };
 /** Encode migration state into Cloudflare's version annotation for safe rollback diagnostics. */
-export declare function encodeCloudflareVersionMessage(migrations: ReadonlyArray<string>, triggerConfig?: CloudflareTriggerConfig): string;
+export declare function encodeCloudflareVersionMessage(migrations: ReadonlyArray<string>, triggerConfig?: CloudflareTriggerConfig, contentHash?: string): string;
 /** Read migration state written by {@link encodeCloudflareVersionMessage}. */
 export declare function parseCloudflareVersionMessage(message: string | null | undefined): CloudflareVersionMetadata | null;
 /**

package/dist/index.mjs

@@ -750,6 +750,10 @@ function cloudflareCommandDiagnostic(result) {
 			break;
 		}
 	}
+	if (message === stderr && !/(?:^|\n)[ \t]*(?:[✘×X][ \t]+)?\[ERROR\]/i.test(stderr)) {
+		const box = /(?:^|\n)[ \t]*┌[ \t]*(?:APIError|Error)\b[^\n]*\n(?:[ \t]*│[^\n]*\n)*[ \t]*└[^\n]*/i.exec(stdout);
+		if (box) message = box[0].trim();
+	}
 	message = stripVTControlCharacters(message).split(/\n\s*(?:🪵|Logs (?:were )?written|If you think this is a bug)/)[0].trim();
 	if (!message) return;
 	message = message.replace(/\b(Bearer|Basic)\s+\S+/gi, "$1 [redacted]").replace(/([?&](?:X-Amz-[A-Za-z0-9-]+|signature|sig|token|access_token|key)=)[^&\s]+/gi, "$1[redacted]").replace(/\b([a-z][a-z0-9+.-]*:\/\/)[^\s/@]+:[^\s/@]*@/gi, "$1[redacted]@").replace(/(\b(?:CLOUDFLARE_API_TOKEN|CF_ACCESS_CLIENT_SECRET|access_token|refresh_token|api[_-]?(?:key|token)|password|secret)\b["']?\s*[:=]\s*)(?:"[^"]*"|'[^']*'|[^\s,;]+)/gi, "$1[redacted]");
@@ -764,15 +768,17 @@ const WORKERS_DEV_URL_RE = /(https:\/\/[a-z0-9.-]+\.workers\.dev(?:\/[^\s]*)?)/i
 const CLOUDFLARE_ERROR_CODE_RE = /\[code:\s*(\d+)\]/i;
 const DURABLE_MIGRATION_VERSION_ERROR = 10211;
 /** Encode migration state into Cloudflare's version annotation for safe rollback diagnostics. */
-function encodeCloudflareVersionMessage(migrations, triggerConfig) {
-	return `void:${JSON.stringify(triggerConfig ? {
+function encodeCloudflareVersionMessage(migrations, triggerConfig, contentHash) {
+	const metadata = triggerConfig ? {
 		schema: 2,
 		migrations,
-		triggerConfig
+		triggerConfig,
+		...contentHash ? { contentHash } : {}
 	} : {
 		schema: 1,
 		migrations
-	})}`;
+	};
+	return `void:${JSON.stringify(metadata)}`;
 }
 /** Read migration state written by {@link encodeCloudflareVersionMessage}. */
 function parseCloudflareVersionMessage(message) {
@@ -785,11 +791,13 @@ function parseCloudflareVersionMessage(message) {
 			migrations: value.migrations
 		};
 		const triggerConfig = parseTriggerConfig(value.triggerConfig);
-		return triggerConfig ? {
+		if (!triggerConfig) return null;
+		return {
 			schema: 2,
 			migrations: value.migrations,
-			triggerConfig
-		} : null;
+			triggerConfig,
+			...typeof value.contentHash === "string" && /^[a-f0-9]{64}$/.test(value.contentHash) ? { contentHash: value.contentHash } : {}
+		};
 	} catch {
 		return null;
 	}
@@ -1180,6 +1188,7 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 	const previousVersionId = previous.versionId;
 	let inheritanceBaseline;
 	let trustedCandidateChain = false;
+	let activeSecretsPinned = false;
 	if (options.expectedPreviousVersionId !== void 0 || options.verifyInheritedSecrets === true) {
 		const recent = await readRecentCloudflareVersionIds(options, commonArgs);
 		if (recent === null) return {
@@ -1213,6 +1222,7 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 					activeVersionId: latestVersionId,
 					rollback: "not-needed"
 				};
+				activeSecretsPinned = true;
 			}
 		}
 		inheritanceBaseline = recent;
@@ -1254,10 +1264,16 @@ 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);
+	if (options.atomic && previous.versionId !== null) {
+		if (!activeSecretsPinned && options.pinActiveSecrets) {
+			const activeSecrets = await readCloudflareVersionSecretBindings(options, commonArgs, previous.versionId);
+			if (activeSecrets?.length) await options.pinActiveSecrets(previous.versionId, activeSecrets);
+		}
+		return bootstrapFirstDeployment({
+			...options,
+			message
+		}, commonArgs, previous.versionId, true);
+	}
 	options.onProgress?.("Uploading the Worker and assets...");
 	const upload = await Promise.resolve(options.runWrangler([
 		"versions",

package/package.json

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