@vinext/cloudflare 1.0.0-beta.5 → 1.0.0-beta.7

package/dist/prerender-kv-populate.js

@@ -1,11 +1,11 @@
 import { createKvKeySpace } from "./cache/kv-key.js";
-import path from "node:path";
 import fs from "node:fs";
-import { getRenderedAppRoutes, readPrerenderManifest } from "vinext/internal/server/prerender-manifest";
+import path from "node:path";
+import { getRenderedAppRoutes, getRenderedMetadataRoutes, readPrerenderManifest } from "vinext/internal/server/prerender-manifest";
 import { appIsrCacheKey } from "vinext/internal/server/isr-cache";
-import { buildAppPageCacheTags } from "vinext/internal/server/app-page-cache";
+import { buildAppPageCacheTags, buildAppRouteCacheTags } from "vinext/internal/server/app-page-cache";
 import { normalizePregeneratedPathname } from "vinext/internal/server/pregenerated-concrete-paths";
-import { getOutputPath, getRscOutputPath } from "vinext/internal/utils/prerender-output-paths";
+import { getAppRouteOutputPath, getOutputPath, getRscOutputPath } from "vinext/internal/utils/prerender-output-paths";
 //#region src/prerender-kv-populate.ts
 /**
 * Deploy-time KV population for App Router prerendered artifacts.
@@ -111,6 +111,38 @@ function buildPrerenderKVPairs(serverDir, options) {
 		}
 		routeCount++;
 	}
+	for (const route of getRenderedMetadataRoutes(manifest.routes)) {
+		const pathname = route.path ?? route.route;
+		let artifactPath;
+		try {
+			artifactPath = resolveContainedFile(prerenderDir, getAppRouteOutputPath(pathname));
+		} catch (error) {
+			console.warn(`[vinext] Skipping metadata prerender KV seed for ${pathname}: ${formatUnknownError(error)}`);
+			continue;
+		}
+		if (!fs.existsSync(artifactPath)) continue;
+		const cachePathname = normalizePregeneratedPathname(pathname);
+		if (typeof route.revalidate === "number" && route.revalidate <= 0) continue;
+		const revalidateSeconds = typeof route.revalidate === "number" ? route.revalidate : void 0;
+		const expireSeconds = typeof route.expire === "number" ? route.expire : void 0;
+		const staleSeconds = typeof route.stale === "number" && route.stale >= 0 ? route.stale : void 0;
+		const expirationTtl = revalidateSeconds === void 0 ? void 0 : ttlSeconds;
+		const tags = buildAppRouteCacheTags(cachePathname, route.tags ?? [], route.routeSegments ?? []);
+		const metadata = buildMetadata(tags);
+		const routeKey = appIsrCacheKey(cachePathname, "route", manifest.buildId);
+		pairs.push({
+			key: keySpace.entryKey(routeKey),
+			value: buildCacheEntry({
+				kind: "APP_ROUTE",
+				body: fs.readFileSync(artifactPath).toString("base64"),
+				headers: route.headers ?? {},
+				status: route.responseStatus ?? 200
+			}, tags, now, revalidateSeconds, expireSeconds, staleSeconds),
+			...expirationTtl !== void 0 ? { expiration_ttl: expirationTtl } : {},
+			...metadata ? { metadata } : {}
+		});
+		routeCount++;
+	}
 	return {
 		routeCount,
 		pairs

package/dist/tpr.js

@@ -1,10 +1,10 @@
 import { createKvKeySpace } from "./cache/kv-key.js";
 import { createRequire } from "node:module";
-import path from "node:path";
 import fs from "node:fs";
+import path from "node:path";
+import { VINEXT_REVALIDATE_HEADER } from "vinext/internal/server/headers";
 import { spawn } from "node:child_process";
 import { pathToFileURL } from "node:url";
-import { VINEXT_REVALIDATE_HEADER } from "vinext/internal/server/headers";
 import { isrCacheKey } from "vinext/internal/server/isr-cache";
 import { buildAppPageCacheTags } from "vinext/internal/server/app-page-cache";
 //#region src/tpr.ts

package/dist/version-deploy.d.ts

@@ -5,6 +5,7 @@ import { execFileSync } from "node:child_process";
 type WranglerVersionUploadResult = {
   versionId: string;
   previewUrl: string | null;
+  workerName: string | null;
   output: string;
 };
 type WranglerVersionDeployResult = {
@@ -16,6 +17,7 @@ type WranglerVersionTraffic = {
   percentage: number;
 };
 type WranglerDeploymentStatus = {
+  deploymentId: string | null;
   versions: WranglerVersionTraffic[];
   output: string;
 };
@@ -24,19 +26,20 @@ type WranglerVersionArgs = {
   env: string | undefined;
 };
 declare function parseVersionId(output: string): string | null;
+declare function parseUploadedWorkerName(output: string): string | null;
 declare function parseWranglerVersionUploadOutput(output: string): WranglerVersionUploadResult;
-declare function buildWranglerVersionUploadArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config"> & {
+declare function buildWranglerVersionUploadArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose"> & {
   previewAlias?: string;
 }): WranglerVersionArgs;
-declare function buildWranglerVersionDeployArgs(versionTraffic: readonly WranglerVersionTraffic[], options: Pick<DeployOptions, "preview" | "env" | "name" | "config">): WranglerVersionArgs;
-declare function buildWranglerDeploymentsStatusArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config">): WranglerVersionArgs;
-declare function buildWranglerTriggersDeployArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config">): WranglerVersionArgs;
+declare function buildWranglerVersionDeployArgs(versionTraffic: readonly WranglerVersionTraffic[], options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">): WranglerVersionArgs;
+declare function buildWranglerDeploymentsStatusArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">): WranglerVersionArgs;
+declare function buildWranglerTriggersDeployArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">): WranglerVersionArgs;
 declare function parseWranglerDeploymentStatusOutput(output: string): WranglerDeploymentStatus;
-declare function runWranglerVersionUpload(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config"> & {
+declare function runWranglerVersionUpload(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose"> & {
   previewAlias?: string;
 }, execute?: typeof execFileSync): WranglerVersionUploadResult;
-declare function runWranglerVersionDeploy(root: string, versionTraffic: readonly WranglerVersionTraffic[], options: Pick<DeployOptions, "preview" | "env" | "name" | "config">, phase?: "stage" | "promote-warmed" | "promote-uploaded", execute?: typeof execFileSync): WranglerVersionDeployResult;
-declare function runWranglerDeploymentStatus(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config">, execute?: typeof execFileSync): WranglerDeploymentStatus;
-declare function runWranglerTriggersDeploy(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config">, execute?: typeof execFileSync): WranglerVersionDeployResult;
+declare function runWranglerVersionDeploy(root: string, versionTraffic: readonly WranglerVersionTraffic[], options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">, phase?: "stage" | "promote-warmed" | "promote-uploaded", execute?: typeof execFileSync): WranglerVersionDeployResult;
+declare function runWranglerDeploymentStatus(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">, execute?: typeof execFileSync): WranglerDeploymentStatus;
+declare function runWranglerTriggersDeploy(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">, execute?: typeof execFileSync): WranglerVersionDeployResult;
 //#endregion
-export { WranglerDeploymentStatus, WranglerVersionDeployResult, WranglerVersionTraffic, WranglerVersionUploadResult, buildWranglerDeploymentsStatusArgs, buildWranglerTriggersDeployArgs, buildWranglerVersionDeployArgs, buildWranglerVersionUploadArgs, parseVersionId, parseWorkersDevUrl, parseWranglerDeploymentStatusOutput, parseWranglerVersionUploadOutput, runWranglerDeploymentStatus, runWranglerTriggersDeploy, runWranglerVersionDeploy, runWranglerVersionUpload };
+export { WranglerDeploymentStatus, WranglerVersionDeployResult, WranglerVersionTraffic, WranglerVersionUploadResult, buildWranglerDeploymentsStatusArgs, buildWranglerTriggersDeployArgs, buildWranglerVersionDeployArgs, buildWranglerVersionUploadArgs, parseUploadedWorkerName, parseVersionId, parseWorkersDevUrl, parseWranglerDeploymentStatusOutput, parseWranglerVersionUploadOutput, runWranglerDeploymentStatus, runWranglerTriggersDeploy, runWranglerVersionDeploy, runWranglerVersionUpload };

package/dist/version-deploy.js

@@ -1,4 +1,5 @@
 import { parseWorkersDevUrl } from "./workers-dev-url.js";
+import { parseCdnWarmupDeploymentUrl } from "./worker-deployment-url.js";
 import { buildNodeCliInvocation, resolveWranglerBin, validateWranglerEnvName } from "./deploy.js";
 import { execFileSync } from "node:child_process";
 //#region src/version-deploy.ts
@@ -56,16 +57,24 @@ function findPreviewUrlInUploadJson(parsed) {
 	]);
 }
 function parseVersionId(output) {
-	return output.match(/\b[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\b/)?.[0] ?? null;
+	const versionIdPattern = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}";
+	const labeledVersionId = output.match(new RegExp(`Worker\\s+Version\\s+ID\\s*:\\s*(${versionIdPattern})\\b`, "i"))?.[1];
+	if (labeledVersionId) return labeledVersionId;
+	return output.match(new RegExp(`\\b${versionIdPattern}\\b`))?.[0] ?? null;
+}
+function parseUploadedWorkerName(output) {
+	return output.match(/^\s*Uploaded\s+(\S+)\s+\(\d+(?:\.\d+)?\s+sec\)\s*$/im)?.[1] ?? null;
 }
 function parseWranglerVersionUploadOutput(output) {
 	const parsed = parseJsonObject(output);
 	const versionId = findVersionIdInUploadJson(parsed) ?? parseVersionId(output);
 	const previewUrl = findPreviewUrlInUploadJson(parsed) ?? parseWorkersDevUrl(output);
+	const workerName = parseUploadedWorkerName(output);
 	if (!versionId) throw new Error("Could not detect Worker version ID from `wrangler versions upload` output.");
 	return {
 		versionId,
 		previewUrl,
+		workerName,
 		output
 	};
 }
@@ -123,7 +132,7 @@ function buildWranglerTriggersDeployArgs(options) {
 		env
 	};
 }
-function runWranglerCommand(root, args, execute = execFileSync) {
+function runWranglerCommand(root, args, execute = execFileSync, verbose = false) {
 	const invocation = buildNodeCliInvocation(resolveWranglerBin(root), args);
 	const execOpts = {
 		cwd: root,
@@ -132,7 +141,7 @@ function runWranglerCommand(root, args, execute = execFileSync) {
 		shell: false
 	};
 	const output = execute(invocation.file, invocation.args, execOpts);
-	if (output.trim()) for (const line of output.trim().split("\n")) console.log(`  ${line}`);
+	if (verbose && output.trim()) for (const line of output.trim().split("\n")) console.log(`  ${line}`);
 	return output;
 }
 function errorText(error) {
@@ -176,6 +185,11 @@ function parseWranglerDeploymentStatusOutput(output) {
 	const parsed = parseJsonObject(output);
 	if (!parsed) throw new Error("Could not parse `wrangler deployments status --json` output.");
 	return {
+		deploymentId: findStringInRecord(Array.isArray(parsed) ? parsed.at(-1) : parsed, [
+			"id",
+			"deployment_id",
+			"deploymentId"
+		]),
 		versions: parseDeploymentVersions(parsed),
 		output
 	};
@@ -185,7 +199,7 @@ function runWranglerVersionUpload(root, options, execute = execFileSync) {
 	if (env) console.log(`\n  Uploading Worker version for env: ${env}...`);
 	else console.log("\n  Uploading Worker version for production...");
 	try {
-		return parseWranglerVersionUploadOutput(runWranglerCommand(root, args, execute));
+		return parseWranglerVersionUploadOutput(runWranglerCommand(root, args, execute, options.verbose === true));
 	} catch (error) {
 		if (isMissingWorkerVersionUploadError(error)) throw withInitialDeployRequiredMessage();
 		throw error;
@@ -197,7 +211,7 @@ function runWranglerVersionDeploy(root, versionTraffic, options, phase = "promot
 	if (phase === "stage") console.log(`\n  Staging uploaded Worker version at 0% for CDN warmup in ${target}...`);
 	else if (phase === "promote-warmed") console.log(`\n  Promoting warmed Worker version to ${target}...`);
 	else console.log(`\n  Promoting uploaded Worker version to ${target}...`);
-	const output = runWranglerCommand(root, args, execute);
+	const output = runWranglerCommand(root, args, execute, options.verbose === true);
 	return {
 		deployedUrl: parseWorkersDevUrl(output),
 		output
@@ -205,19 +219,19 @@ function runWranglerVersionDeploy(root, versionTraffic, options, phase = "promot
 }
 function runWranglerDeploymentStatus(root, options, execute = execFileSync) {
 	const { args, env } = buildWranglerDeploymentsStatusArgs(options);
-	if (env) console.log(`\n  Reading current Worker deployment for env: ${env}...`);
+	if (options.verbose) if (env) console.log(`\n  Reading current Worker deployment for env: ${env}...`);
 	else console.log("\n  Reading current Worker deployment...");
-	return parseWranglerDeploymentStatusOutput(runWranglerCommand(root, args, execute));
+	return parseWranglerDeploymentStatusOutput(runWranglerCommand(root, args, execute, options.verbose === true));
 }
 function runWranglerTriggersDeploy(root, options, execute = execFileSync) {
 	const { args, env } = buildWranglerTriggersDeployArgs(options);
 	if (env) console.log(`\n  Applying Worker triggers for env: ${env}...`);
 	else console.log("\n  Applying Worker triggers...");
-	const output = runWranglerCommand(root, args, execute);
+	const output = runWranglerCommand(root, args, execute, options.verbose === true);
 	return {
-		deployedUrl: parseWorkersDevUrl(output),
+		deployedUrl: parseCdnWarmupDeploymentUrl(output),
 		output
 	};
 }
 //#endregion
-export { buildWranglerDeploymentsStatusArgs, buildWranglerTriggersDeployArgs, buildWranglerVersionDeployArgs, buildWranglerVersionUploadArgs, parseVersionId, parseWorkersDevUrl, parseWranglerDeploymentStatusOutput, parseWranglerVersionUploadOutput, runWranglerDeploymentStatus, runWranglerTriggersDeploy, runWranglerVersionDeploy, runWranglerVersionUpload };
+export { buildWranglerDeploymentsStatusArgs, buildWranglerTriggersDeployArgs, buildWranglerVersionDeployArgs, buildWranglerVersionUploadArgs, parseUploadedWorkerName, parseVersionId, parseWorkersDevUrl, parseWranglerDeploymentStatusOutput, parseWranglerVersionUploadOutput, runWranglerDeploymentStatus, runWranglerTriggersDeploy, runWranglerVersionDeploy, runWranglerVersionUpload };

package/dist/version-headers.d.ts

@@ -0,0 +1,2 @@
+import { VINEXT_EXPECTED_WORKER_VERSION_HEADER } from "vinext/internal/server/headers";
+export { VINEXT_EXPECTED_WORKER_VERSION_HEADER };

package/dist/version-headers.js

@@ -0,0 +1,2 @@
+import { VINEXT_EXPECTED_WORKER_VERSION_HEADER } from "vinext/internal/server/headers";
+export { VINEXT_EXPECTED_WORKER_VERSION_HEADER };

package/dist/worker-deployment-url.d.ts

@@ -1,4 +1,10 @@
 //#region src/worker-deployment-url.d.ts
 declare function parseWorkerDeploymentUrl(output: string): string | null;
+/**
+ * Parse the concrete hostname that Wrangler reports after applying Worker
+ * triggers. Catch-all routes are valid warmup targets even though they are not
+ * canonical deployment URLs for general CLI reporting.
+ */
+declare function parseCdnWarmupDeploymentUrl(output: string): string | null;
 //#endregion
-export { parseWorkerDeploymentUrl };
+export { parseCdnWarmupDeploymentUrl, parseWorkerDeploymentUrl };

package/dist/worker-deployment-url.js

@@ -3,6 +3,28 @@ import { parseWorkersDevUrl } from "./workers-dev-url.js";
 function parseWorkerDeploymentUrl(output) {
 	return parseWorkersDevUrl(output) ?? parseCustomDomainUrl(output);
 }
+/**
+* Parse the concrete hostname that Wrangler reports after applying Worker
+* triggers. Catch-all routes are valid warmup targets even though they are not
+* canonical deployment URLs for general CLI reporting.
+*/
+function parseCdnWarmupDeploymentUrl(output) {
+	return parseCustomDomainUrl(output) ?? parseCatchAllWorkerRouteOrigin(output) ?? parseWorkersDevUrl(output);
+}
+function parseCatchAllWorkerRouteOrigin(output) {
+	for (const line of output.split(/\r?\n/)) {
+		const route = line.trim().split(/\s+/, 1)[0];
+		if (!route || !route.endsWith("/*")) continue;
+		try {
+			const url = new URL(route.includes("://") ? route : `https://${route}`);
+			if (url.protocol !== "https:" && url.protocol !== "http:" || url.hostname.includes("*") || url.username !== "" || url.password !== "" || url.port !== "" || url.pathname !== "/*" || url.search !== "" || url.hash !== "") continue;
+			return url.origin;
+		} catch {
+			continue;
+		}
+	}
+	return null;
+}
 function parseCustomDomainUrl(output) {
 	for (const line of output.split(/\r?\n/)) {
 		const match = /^\s*(\S+)\s+\(custom domain(?: - zone (?:id|name): [^)]+)?\)(?: \[([^\]\r\n]+)\])?\s*$/.exec(line);
@@ -20,4 +42,4 @@ function parseCustomDomainUrl(output) {
 	return null;
 }
 //#endregion
-export { parseWorkerDeploymentUrl };
+export { parseCdnWarmupDeploymentUrl, parseWorkerDeploymentUrl };

package/dist/wrangler-version-metadata.d.ts

@@ -0,0 +1,8 @@
+//#region src/wrangler-version-metadata.d.ts
+declare function assertCdnVersionMetadataConfig({ binding, configuredBinding, configPath }: {
+  binding: string;
+  configuredBinding: string | undefined;
+  configPath: string | undefined;
+}): void;
+//#endregion
+export { assertCdnVersionMetadataConfig };

package/dist/wrangler-version-metadata.js

@@ -0,0 +1,9 @@
+//#region src/wrangler-version-metadata.ts
+function assertCdnVersionMetadataConfig({ binding, configuredBinding, configPath }) {
+	if (configuredBinding === binding) return;
+	const location = configPath ? ` in ${configPath}` : "";
+	const found = configuredBinding ? ` declares ${JSON.stringify(configuredBinding)} instead` : " does not declare version_metadata";
+	throw new Error(`[vinext] Cloudflare CDN warmup requires version metadata binding ${JSON.stringify(binding)}, but the effective Wrangler config${location}${found}. Deploy the generated Wrangler config finalized by cdnAdapter(), or add the binding to this effective config and align cdnAdapter({ versionMetadataBinding }) when using a custom name.`);
+}
+//#endregion
+export { assertCdnVersionMetadataConfig };

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@vinext/cloudflare",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.7",
   "description": "Cloudflare adapters for vinext (KV data cache and Images-backed image optimization).",
+  "homepage": "https://vinext.dev/",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -54,10 +55,10 @@
     "@types/node": "^25.9.2",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.2.6",
     "vite-plus": "0.2.6",
-    "vinext": "1.0.0-beta.5"
+    "vinext": "1.0.0-beta.9"
   },
   "peerDependencies": {
-    "vinext": "^1.0.0-beta.5"
+    "vinext": "^1.0.0-beta.9"
   },
   "engines": {
     "node": ">=22"