@void/deploy-cloudflare 1.4.0 → 1.6.0

package/dist/index.d.mts

@@ -1,5 +1,4 @@
 import { AssetConfig, HeaderRule, RedirectRule } from "@void/deploy-core";
-//#region src/operations.d.ts
 /** Typed provider operations shared by app deployment and platform installation. */
 type ConfigTarget = {
   configPath?: string;
@@ -120,8 +119,6 @@ type CloudflareProviderError = {
   code?: number;
   message: string;
 };
-//#endregion
-//#region src/execute.d.ts
 type CloudflareCommandResult = {
   /** Structured provider response. stdout is diagnostics only. */
   data?: unknown;
@@ -153,8 +150,6 @@ export declare function executeCloudflareDeploy(options: {
   verifyUploader: () => boolean;
   configPath?: string;
 }): Promise<CloudflareDeployExecution>;
-//#endregion
-//#region src/existing.d.ts
 type ExistingCloudflareWorker = {
   versionId: string;
   bindings: Array<Record<string, unknown>>;
@@ -208,8 +203,6 @@ export declare function assertCloudflareBindingsPreserved(before: ExistingCloudf
 }): void;
 /** Preserve the existing Worker, allowing only explicitly approved KV additions. */
 export declare function assertExistingCloudflareConfig(existing: ExistingCloudflareWorker, config: Record<string, unknown>, built?: boolean, approvedKv?: ReadonlyArray<ApprovedCloudflareKvBinding>): void;
-//#endregion
-//#region src/config.d.ts
 /** Parse a root Wrangler JSON/JSONC config without accepting a partial parse. */
 export declare function parseRootWranglerConfig(configPath: string): Record<string, unknown>;
 export declare function readWranglerTopLevelString(config: Record<string, unknown>, field: string): string | undefined;
@@ -226,8 +219,6 @@ export declare function resolveD1MigrateTarget(config: Record<string, unknown>,
   ok: false;
   reason: string;
 };
-//#endregion
-//#region src/framework.d.ts
 type CloudflareFrameworkDeployConfig = Readonly<{
   configPath: string;
   deployPointerPath: string;
@@ -254,8 +245,6 @@ type CloudflareFrameworkDeployConfig = Readonly<{
  * that file, so Wrangler uploads the exact config Void verifies.
  */
 export declare function writeCloudflareFrameworkDeployConfig(options: CloudflareFrameworkDeployConfig): boolean;
-//#endregion
-//#region src/static.d.ts
 type CloudflareStaticDeployConfig = Readonly<{
   configPath: string;
   name: string;
@@ -280,18 +269,18 @@ export declare function renderCloudflareStaticEntry(options: {
  * Void has already compiled the root `_headers` and `_redirects` files into the thin edge
  * Worker. Wrangler parses those files independently of `.assetsignore`, so uploading the source
  * directory would apply every rule twice and can reject valid Void fallbacks as redirect loops.
+ * `headers` becomes the staged `_headers` for rules Cloudflare applies to asset responses itself.
  */
 export declare function stageCloudflareStaticAssets(options: {
   sourceDirectory: string;
   destinationDirectory: string;
+  headers?: string;
 }): void;
 /**
  * Persist the mutable Cloudflare target state without replacing comments,
  * Durable Object migrations, resource ids, or unrelated user configuration.
  */
 export declare function writeCloudflareStaticDeployConfig(options: CloudflareStaticDeployConfig): boolean;
-//#endregion
-//#region src/version.d.ts
 type CloudflareVersionMetadata = Readonly<{
   schema: 1;
   migrations: ReadonlyArray<string>;
@@ -524,8 +513,6 @@ export declare function deployCloudflareVersionTraffic(options: {
 export declare function normalizeWorkersDevSubdomain(value: string | undefined): string | undefined;
 /** Extract the account subdomain from a Wrangler-reported workers.dev URL. */
 export declare function extractWorkersDevSubdomain(url: string): string | undefined;
-//#endregion
-//#region src/metadata.d.ts
 /**
  * Share one authenticated transport for the activator's read-only metadata calls.
  * Writes and unsupported commands use the pinned cf command adapter. Responses
@@ -543,12 +530,7 @@ export declare function createCloudflareMetadataRunner(options: {
   /** Environment used to decide whether the CLI's proxy-aware transport is required. */
   env?: Readonly<Record<string, string | undefined>>;
 }): CloudflareCommandRunner;
-//#endregion
-//#region src/diagnostics.d.ts
-/** Keep the uploader's error, excluding stdout binding tables and redacting common credential formats. */
+/** Keep the uploader's error, excluding cf's log lines and redacting common credential formats. */
 export declare function cloudflareCommandDiagnostic(result: CloudflareCommandResult): string | undefined;
-//#endregion
-//#region src/secret-draft.d.ts
 export declare const VOID_SECRET_DRAFT_SOURCE = "export default { fetch() { return new Response(\"\"); } };\n";
-//#endregion
 export type { ApprovedCloudflareKvBinding, CloudflareCommandResult, CloudflareCommandRunner, CloudflareDeployExecution, CloudflareFrameworkDeployConfig, CloudflareOperation, CloudflareProviderError, CloudflareStaticDeployConfig, CloudflareTrafficConfig, CloudflareTriggerConfig, CloudflareTriggerStabilization, CloudflareUploadResult, CloudflareVersionActivation, CloudflareVersionActivationOptions, CloudflareVersionMetadata, CloudflareWorkerMigrationTagOptions, CloudflareWorkersDevSubdomainLookup, ExistingCloudflareWorker };

package/dist/index.mjs

@@ -6,7 +6,7 @@ import nodePath from "node:path";
 import { createHash } from "node:crypto";
 import { tmpdir } from "node:os";
 import { setTimeout } from "node:timers/promises";
-//#region src/config.ts
+// src/config.ts
 /** Parse a root Wrangler JSON/JSONC config without accepting a partial parse. */
 function parseRootWranglerConfig(configPath) {
 	if (!existsSync(configPath)) return {};
@@ -82,8 +82,7 @@ function resolveD1MigrateTarget(config, binding) {
 		token
 	};
 }
-//#endregion
-//#region src/execute.ts
+// src/execute.ts
 /** Upload the already-verified Worker artifact without Wrangler autoconfiguration. */
 async function executeCloudflareDeploy(options) {
 	if (!options.verifyUploader()) return {
@@ -112,8 +111,7 @@ function isCleanCommandExit(result) {
 function isWorkerNotFound(result) {
 	return isCompletedCommand(result) && (result.failure === "not-found" || result.errorCode === 10007);
 }
-//#endregion
-//#region src/secret-draft.ts
+// src/secret-draft.ts
 /**
 * `wrangler secret put` creates a fetch-only draft before attaching a first secret to a Worker.
 * Accept that draft as first-deployment proof only when its complete deployable shape contains no
@@ -168,8 +166,7 @@ function isVoidSecretOnlyDraft(entry) {
 	}
 	return true;
 }
-//#endregion
-//#region src/existing.ts
+// src/existing.ts
 /** A failed remote read, distinct from an invalid or changing Worker configuration. */
 var CloudflareWorkerInspectionError = class extends Error {
 	name = "CloudflareWorkerInspectionError";
@@ -531,8 +528,7 @@ function hasContent(value) {
 	if (isRecord(value)) return Object.values(value).some(hasContent);
 	return true;
 }
-//#endregion
-//#region ../../node_modules/.pnpm/pathslash@0.1.0/node_modules/pathslash/dist/index.mjs
+// ../../node_modules/.pnpm/pathslash@0.1.0/node_modules/pathslash/dist/index.mjs
 const BACKSLASH_RE = /\\/g;
 const isWindows = process.platform === "win32";
 /**
@@ -570,8 +566,7 @@ const posix = { ...nodePath.posix };
 posix.posix = win32.posix = posix;
 posix.win32 = win32.win32 = win32;
 const { basename, delimiter, dirname, extname, format, isAbsolute, join, matchesGlob, normalize, parse: parse$1, relative, resolve, sep, toNamespacedPath } = isWindows ? win32 : posix;
-//#endregion
-//#region src/framework.ts
+// src/framework.ts
 /**
 * Point a standalone framework Worker at the canonical root Cloudflare state.
 *
@@ -640,8 +635,7 @@ function writeCloudflareFrameworkDeployConfig(options) {
 	}
 	return changed;
 }
-//#endregion
-//#region src/static.ts
+// src/static.ts
 /** Generate the deterministic thin Worker entry bundled by Wrangler. */
 function renderCloudflareStaticEntry(options) {
 	const config = JSON.stringify({
@@ -663,6 +657,7 @@ function renderCloudflareStaticEntry(options) {
 * Void has already compiled the root `_headers` and `_redirects` files into the thin edge
 * Worker. Wrangler parses those files independently of `.assetsignore`, so uploading the source
 * directory would apply every rule twice and can reject valid Void fallbacks as redirect loops.
+* `headers` becomes the staged `_headers` for rules Cloudflare applies to asset responses itself.
 */
 function stageCloudflareStaticAssets(options) {
 	const sourceDirectory = resolve(options.sourceDirectory);
@@ -685,6 +680,7 @@ function stageCloudflareStaticAssets(options) {
 			return !reserved.has(absolute) && !isInsideDestination(absolute);
 		}
 	});
+	if (options.headers !== void 0) writeFileSync(join(destinationDirectory, "_headers"), options.headers);
 }
 /**
 * Persist the mutable Cloudflare target state without replacing comments,
@@ -707,7 +703,7 @@ function writeCloudflareStaticDeployConfig(options) {
 	upsert(["no_bundle"], false);
 	upsert(["assets", "directory"], options.assetsDirectory);
 	upsert(["assets", "binding"], "ASSETS");
-	upsert(["assets", "run_worker_first"], true);
+	upsert(["assets", "run_worker_first"], options.assetConfig.run_worker_first ?? true);
 	upsert(["assets", "not_found_handling"], options.assetConfig.not_found_handling ?? "none");
 	upsert(["assets", "html_handling"], options.assetConfig.html_handling ?? "auto-trailing-slash");
 	upsert(["durable_objects", "bindings"], []);
@@ -763,11 +759,17 @@ function findDroppedComment(before, after) {
 		counts.set(token, remaining - 1);
 	}
 }
-//#endregion
-//#region src/diagnostics.ts
+// src/diagnostics.ts
 const MAX_DIAGNOSTIC_LENGTH = 4096;
 const MAX_DIAGNOSTIC_LINES = 24;
-/** Keep the uploader's error, excluding stdout binding tables and redacting common credential formats. */
+const ERROR_BOX = /(?:^|\n)[ \t]*┌[ \t]*(?:APIError|Error)\b[^\n]*\n(?:[ \t]*│[^\n]*\n)*[ \t]*└[^\n]*/i;
+const LOG_LINE = /^[├│◆◇●▲■└|*o•!x—](?: {2}|$)/;
+const UPLOAD_CONFLICT = /^[ \t]*(?:\S[ \t]+)?(Aborting the upload operation because of conflicts\..*)$/m;
+const SCRIPT_API_ORIGIN = /^[ \t]*(?:\S[ \t]+)?(You are about to upload a Worker that was last updated via the script API\.)/m;
+function withoutLogLines(output) {
+	return output.split("\n").filter((line) => !LOG_LINE.test(line)).join("\n");
+}
+/** Keep the uploader's error, excluding cf's log lines and redacting common credential formats. */
 function cloudflareCommandDiagnostic(result) {
 	const stderr = stripVTControlCharacters(result.stderr).replace(/\r\n?/g, "\n");
 	const stdout = stripVTControlCharacters(result.stdout).replace(/\r\n?/g, "\n");
@@ -780,15 +782,13 @@ function cloudflareCommandDiagnostic(result) {
 		}
 	}
 	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);
+		const box = ERROR_BOX.exec(stdout);
+		const conflict = UPLOAD_CONFLICT.exec(`${stdout}\n${stderr}`);
 		if (box) message = box[0].trim();
+		else if (conflict) message = [SCRIPT_API_ORIGIN.exec(`${stdout}\n${stderr}`)?.[1], conflict[1]].filter(Boolean).join("\n");
 		else {
-			const lines = stdout.split("\n");
-			const abort = lines.find((line) => line.startsWith("■  Aborting the upload operation because of conflicts."));
-			if (abort) {
-				const reason = "You are about to upload a Worker that was last updated via the script API.";
-				message = [lines.includes(`▲  ${reason}`) ? reason : "", abort.slice(3)].filter(Boolean).join("\n");
-			}
+			const stderrBox = ERROR_BOX.exec(stderr);
+			message = stderrBox ? withoutLogLines(stderr.slice(0, stderrBox.index)) + stderrBox[0] + withoutLogLines(stderr.slice(stderrBox.index + stderrBox[0].length)) : withoutLogLines(stderr);
 		}
 	}
 	message = stripVTControlCharacters(message).split(/\n\s*(?:🪵|Logs (?:were )?written|If you think this is a bug)/)[0].trim();
@@ -797,8 +797,7 @@ function cloudflareCommandDiagnostic(result) {
 	const bounded = message.split("\n").slice(0, MAX_DIAGNOSTIC_LINES).join("\n").slice(0, MAX_DIAGNOSTIC_LENGTH);
 	return bounded.length < message.length ? `${bounded}\n[diagnostic truncated]` : bounded;
 }
-//#endregion
-//#region src/version.ts
+// src/version.ts
 const DURABLE_MIGRATION_VERSION_ERROR = 10211;
 const CLOUDFLARE_SECRET_CHANGED_ERROR = 10220;
 /** Encode migration state into Cloudflare's version annotation for safe rollback diagnostics. */
@@ -2406,8 +2405,7 @@ function workersDevSubdomainResult(url) {
 	const workersDevSubdomain = extractWorkersDevSubdomain(url);
 	return workersDevSubdomain ? { workersDevSubdomain } : {};
 }
-//#endregion
-//#region src/metadata.ts
+// src/metadata.ts
 /**
 * Share one authenticated transport for the activator's read-only metadata calls.
 * Writes and unsupported commands use the pinned cf command adapter. Responses
@@ -2497,5 +2495,4 @@ function createCloudflareMetadataRunner(options) {
 		return fallback(operation, runOptions);
 	};
 }
-//#endregion
 export { CloudflareWorkerInspectionError, VOID_SECRET_DRAFT_SOURCE, activateCloudflareVersion, assertCloudflareBindingsPreserved, assertCloudflareDurableObjectLifecycleSupported, assertExistingCloudflareConfig, cloudflareCommandDiagnostic, createCloudflareMetadataRunner, deployCloudflareVersionTraffic, deployCloudflareVersionTriggers, encodeCloudflareVersionMessage, executeCloudflareDeploy, extractWorkersDevSubdomain, normalizeReadinessAccessOrigin, normalizeWorkersDevSubdomain, parseCloudflareVersionMessage, parseRootWranglerConfig, readBindingFieldPresence, readCloudflareTriggerConfig, readCloudflareVersionMigrationTag, readCloudflareWorkerMigrationTag, readConfigEntryString, readExistingCloudflareWorker, readStoredResourceName, readWranglerTopLevelString, renderCloudflareStaticEntry, resolveD1MigrateTarget, stabilizeCloudflareVersionTriggers, stageCloudflareStaticAssets, writeCloudflareFrameworkDeployConfig, writeCloudflareStaticDeployConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/deploy-cloudflare",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "Cloudflare deployment primitives for Void runtimes and deployment adapters.",
   "homepage": "https://void.cloud",
   "bugs": {
@@ -26,15 +26,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@void/deploy-core": "1.4.0",
+    "@void/deploy-core": "1.6.0",
     "jsonc-parser": "^3.3.1"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^5.20261019.1",
-    "@types/node": "^26.6.5",
+    "@cloudflare/workers-types": "^5.20261102.1",
+    "@types/node": "^26.6.6",
     "pathslash": "^0.1.0",
     "typescript": "7.0.2",
-    "vite-plus": "1.3.0"
+    "vite-plus": "1.4.0"
   },
   "scripts": {
     "build": "vp pack",