@vinext/cloudflare 1.0.0-beta.10 → 1.0.0-beta.11

package/dist/tpr.js

@@ -1,4 +1,6 @@
 import { parseWranglerConfig } from "./wrangler-config.js";
+import fs from "node:fs";
+import path from "node:path";
 //#region src/tpr.ts
 /**
 * TPR: traffic-aware pre-warm route selection
@@ -7,7 +9,7 @@ import { parseWranglerConfig } from "./wrangler-config.js";
 * the standard CDN pre-warming flow.
 *
 * Flow:
-*   1. Parse wrangler config to find the custom domain
+*   1. Find the custom domain in the generated Worker or Wrangler config
 *   2. Resolve the Cloudflare zone for the custom domain
 *   3. Query zone analytics (GraphQL) for top pages by request count
 *   4. Return the ranked candidates for standard route resolution and selection
@@ -143,9 +145,11 @@ async function resolveTPRRoutes(options) {
 	});
 	const apiToken = process.env.CLOUDFLARE_API_TOKEN;
 	if (!apiToken) return skip("no CLOUDFLARE_API_TOKEN set");
-	const wranglerConfig = parseWranglerConfig(root, config);
-	if (!wranglerConfig) return skip("could not parse wrangler config");
-	const hostname = options.hostname ?? wranglerConfig.env?.[options.env ?? ""]?.customDomain ?? wranglerConfig.customDomain;
+	const wranglerConfig = options.hostname || options.typedConfig ? null : parseWranglerConfig(root, config);
+	const buildOutputConfigPath = path.join(root, ".cloudflare/output/v0/workers/default/worker.config.json");
+	const typedDomains = options.typedConfig && !options.hostname && fs.existsSync(buildOutputConfigPath) ? JSON.parse(fs.readFileSync(buildOutputConfigPath, "utf8")).domains : void 0;
+	if (!wranglerConfig && !options.hostname && !options.typedConfig) return skip("could not parse wrangler config");
+	const hostname = options.hostname ?? (Array.isArray(typedDomains) ? typedDomains.find((domain) => typeof domain === "string" && domain.length > 0) : void 0) ?? wranglerConfig?.env?.[options.env ?? ""]?.customDomain ?? wranglerConfig?.customDomain;
 	if (!hostname) return skip("no custom domain — zone analytics unavailable");
 	console.log(`  TPR: Analyzing zone traffic for ${hostname} (last ${windowHours}h)`);
 	const zoneId = await resolveZoneId(hostname, apiToken);

package/dist/version-deploy.d.ts

@@ -25,19 +25,46 @@ type WranglerVersionArgs = {
   args: string[];
   env: string | undefined;
 };
+type CfVersionArgs = {
+  args: string[];
+  mode: string | undefined;
+};
+export declare function readBuildOutputWorkerName(root: string): string;
 export declare function parseVersionId(output: string): string | null;
 export declare function parseUploadedWorkerName(output: string): string | null;
 export declare function parseWranglerVersionUploadOutput(output: string): WranglerVersionUploadResult;
 export declare function buildWranglerVersionUploadArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose"> & {
   previewAlias?: string;
 }): WranglerVersionArgs;
+export declare function buildCfVersionUploadArgs(options: Pick<DeployOptions, "preview" | "env"> & {
+  previewAlias?: string;
+}): CfVersionArgs;
 export declare function buildWranglerVersionDeployArgs(versionTraffic: readonly WranglerVersionTraffic[], options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">): WranglerVersionArgs;
 export declare function buildWranglerDeploymentsStatusArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">): WranglerVersionArgs;
 export declare function buildWranglerTriggersDeployArgs(options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">): WranglerVersionArgs;
 export declare function parseWranglerDeploymentStatusOutput(output: string): WranglerDeploymentStatus;
+/** The first entry is the deployment currently serving traffic. */
+export declare function parseCfDeploymentStatusOutput(output: string): WranglerDeploymentStatus;
+export declare function runCfDeploymentStatus(root: string, options: {
+  name: string;
+  env?: string;
+  verbose?: boolean;
+}, execute?: typeof execFileSync): WranglerDeploymentStatus;
+export declare function runCfVersionDeploy(root: string, versionTraffic: readonly WranglerVersionTraffic[], options: {
+  name: string;
+  env?: string;
+  verbose?: boolean;
+}, _phase?: "stage" | "promote-warmed" | "promote-uploaded", execute?: typeof execFileSync): WranglerVersionDeployResult;
+export declare function runCfTriggersDeploy(root: string, options: {
+  env?: string;
+  verbose?: boolean;
+}, execute?: typeof execFileSync): WranglerVersionDeployResult;
 export declare function runWranglerVersionUpload(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose"> & {
   previewAlias?: string;
 }, execute?: typeof execFileSync): WranglerVersionUploadResult;
+export declare function runCfVersionUpload(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose"> & {
+  previewAlias?: string;
+}, execute?: typeof execFileSync): WranglerVersionUploadResult;
 export 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;
 export declare function runWranglerDeploymentStatus(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">, execute?: typeof execFileSync): WranglerDeploymentStatus;
 export declare function runWranglerTriggersDeploy(root: string, options: Pick<DeployOptions, "preview" | "env" | "name" | "config" | "verbose">, execute?: typeof execFileSync): WranglerVersionDeployResult;

package/dist/version-deploy.js

@@ -1,11 +1,26 @@
 import { parseWorkersDevUrl } from "./workers-dev-url.js";
 import { parseCdnWarmupDeploymentUrl } from "./worker-deployment-url.js";
-import { buildNodeCliInvocation, resolveWranglerBin, validateWranglerEnvName } from "./deploy.js";
+import { buildNodeCliInvocation, resolveCfBin, resolveWranglerBin, validateWranglerEnvName } from "./deploy.js";
+import fs from "node:fs";
+import path from "node:path";
 import { execFileSync } from "node:child_process";
+import { stripVTControlCharacters } from "node:util";
 //#region src/version-deploy.ts
 function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function readBuildOutputWorkerName(root) {
+	const configPath = path.join(root, ".cloudflare", "output", "v0", "workers", "default", "worker.config.json");
+	let config;
+	try {
+		config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+	} catch (cause) {
+		throw new Error("Could not read the generated Cloudflare Build Output config. Rebuild the app before deploying.", { cause });
+	}
+	const name = isRecord(config) ? config.name : void 0;
+	if (typeof name !== "string" || name.length === 0) throw new Error("The generated Cloudflare Build Output config does not declare a Worker name.");
+	return name;
+}
 function parseJsonObject(output) {
 	const trimmed = output.trim();
 	if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return null;
@@ -63,7 +78,7 @@ function parseVersionId(output) {
 	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;
+	return stripVTControlCharacters(output).match(/^\s*(?:[│|]\s*)?Uploaded\s+(\S+)\s+\(\d+(?:\.\d+)?\s+sec\)\s*$/im)?.[1] ?? null;
 }
 function parseWranglerVersionUploadOutput(output) {
 	const parsed = parseJsonObject(output);
@@ -90,6 +105,21 @@ function buildWranglerVersionUploadArgs(options) {
 		env
 	};
 }
+function buildCfVersionUploadArgs(options) {
+	const mode = options.env || (options.preview ? "preview" : void 0);
+	const args = [
+		"workers",
+		"versions",
+		"create",
+		"--prebuilt"
+	];
+	if (mode) args.push("--mode", validateWranglerEnvName(mode));
+	if (options.previewAlias) args.push("--preview-alias", options.previewAlias);
+	return {
+		args,
+		mode
+	};
+}
 function buildWranglerVersionDeployArgs(versionTraffic, options) {
 	const args = [
 		"versions",
@@ -145,6 +175,17 @@ function runWranglerCommand(root, args, execute = execFileSync, verbose = false)
 	if (verbose && output.trim()) for (const line of output.trim().split("\n")) console.log(`  ${line}`);
 	return output;
 }
+function runCfCommand(root, args, execute = execFileSync, verbose = false) {
+	const invocation = buildNodeCliInvocation(resolveCfBin(root), args);
+	const output = execute(invocation.file, invocation.args, {
+		cwd: root,
+		stdio: "pipe",
+		encoding: "utf-8",
+		shell: false
+	});
+	if (verbose && output.trim()) for (const line of output.trim().split("\n")) console.log(`  ${line}`);
+	return output;
+}
 function errorText(error) {
 	if (!error || typeof error !== "object") return String(error);
 	const parts = error instanceof Error ? [error.message] : [];
@@ -195,6 +236,69 @@ function parseWranglerDeploymentStatusOutput(output) {
 		output
 	};
 }
+/** The first entry is the deployment currently serving traffic. */
+function parseCfDeploymentStatusOutput(output) {
+	const parsed = parseJsonObject(output);
+	if (!isRecord(parsed) || !Array.isArray(parsed.deployments) || !parsed.deployments.length) throw new Error("Could not parse the active deployment from `cf workers deployments list` output.");
+	const current = parsed.deployments[0];
+	const deploymentId = findStringInRecord(current, [
+		"id",
+		"deployment_id",
+		"deploymentId"
+	]);
+	const versions = parseDeploymentVersions(current);
+	if (!deploymentId || !versions.length) throw new Error("The active `cf workers deployments list` entry is missing its ID or versions.");
+	return {
+		deploymentId,
+		versions,
+		output
+	};
+}
+function runCfDeploymentStatus(root, options, execute = execFileSync) {
+	return parseCfDeploymentStatusOutput(runCfCommand(root, [
+		"workers",
+		"deployments",
+		"list",
+		"--worker",
+		options.name,
+		...options.env ? ["--mode", validateWranglerEnvName(options.env)] : []
+	], execute, options.verbose));
+}
+function runCfVersionDeploy(root, versionTraffic, options, _phase = "promote-uploaded", execute = execFileSync) {
+	const versions = versionTraffic.map(({ versionId, percentage }) => ({
+		version_id: versionId,
+		percentage
+	}));
+	const output = runCfCommand(root, [
+		"workers",
+		"deployments",
+		"create",
+		"--worker",
+		options.name,
+		"--strategy",
+		"percentage",
+		"--versions",
+		JSON.stringify(versions),
+		...options.env ? ["--mode", validateWranglerEnvName(options.env)] : []
+	], execute, options.verbose);
+	return {
+		deployedUrl: parseWorkersDevUrl(output),
+		output
+	};
+}
+function runCfTriggersDeploy(root, options, execute = execFileSync) {
+	const output = runCfCommand(root, [
+		"workers",
+		"triggers",
+		"deploy",
+		"--prebuilt",
+		...options.env ? ["--mode", validateWranglerEnvName(options.env)] : []
+	], execute, options.verbose);
+	return {
+		deployedUrl: parseCdnWarmupDeploymentUrl(output),
+		output
+	};
+}
 function runWranglerVersionUpload(root, options, execute = execFileSync) {
 	const { args, env } = buildWranglerVersionUploadArgs(options);
 	if (env) console.log(`\n  Uploading Worker version for env: ${env}...`);
@@ -208,6 +312,20 @@ function runWranglerVersionUpload(root, options, execute = execFileSync) {
 		throw error;
 	}
 }
+function runCfVersionUpload(root, options, execute = execFileSync) {
+	const workerName = readBuildOutputWorkerName(root);
+	const { args, mode } = buildCfVersionUploadArgs(options);
+	console.log(mode ? `\n  Uploading Worker Build Output in mode: ${mode}...` : "\n  Uploading Worker Build Output...");
+	try {
+		return {
+			...parseWranglerVersionUploadOutput(runCfCommand(root, args, execute, options.verbose === true)),
+			workerName
+		};
+	} catch (error) {
+		if (isMissingWorkerVersionUploadError(error)) throw withInitialDeployRequiredMessage();
+		throw error;
+	}
+}
 function runWranglerVersionDeploy(root, versionTraffic, options, phase = "promote-uploaded", execute = execFileSync) {
 	const { args, env } = buildWranglerVersionDeployArgs(versionTraffic, options);
 	const target = env ? `env: ${env}` : "production";
@@ -239,4 +357,4 @@ function runWranglerTriggersDeploy(root, options, execute = execFileSync) {
 	};
 }
 //#endregion
-export { buildWranglerDeploymentsStatusArgs, buildWranglerTriggersDeployArgs, buildWranglerVersionDeployArgs, buildWranglerVersionUploadArgs, parseUploadedWorkerName, parseVersionId, parseWorkersDevUrl, parseWranglerDeploymentStatusOutput, parseWranglerVersionUploadOutput, runWranglerDeploymentStatus, runWranglerTriggersDeploy, runWranglerVersionDeploy, runWranglerVersionUpload };
+export { buildCfVersionUploadArgs, buildWranglerDeploymentsStatusArgs, buildWranglerTriggersDeployArgs, buildWranglerVersionDeployArgs, buildWranglerVersionUploadArgs, parseCfDeploymentStatusOutput, parseUploadedWorkerName, parseVersionId, parseWorkersDevUrl, parseWranglerDeploymentStatusOutput, parseWranglerVersionUploadOutput, readBuildOutputWorkerName, runCfDeploymentStatus, runCfTriggersDeploy, runCfVersionDeploy, runCfVersionUpload, runWranglerDeploymentStatus, runWranglerTriggersDeploy, runWranglerVersionDeploy, runWranglerVersionUpload };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vinext/cloudflare",
-  "version": "1.0.0-beta.10",
+  "version": "1.0.0-beta.11",
   "description": "Cloudflare cache and image adapters for vinext.",
   "homepage": "https://vinext.dev/",
   "license": "MIT",
@@ -51,15 +51,22 @@
     "@cloudflare/workers-response-store": "0.1.0-beta.2"
   },
   "devDependencies": {
+    "@cloudflare/vite-plugin": "2.0.0-beta.sha-805ec1ff3",
     "@types/node": "^25.9.2",
     "miniflare": "5.20260730.0-alpha",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.3.2",
     "vite-plus": "0.3.2",
     "vitest": "4.1.11",
-    "vinext": "1.0.0-beta.12"
+    "vinext": "1.0.0-beta.13"
   },
   "peerDependencies": {
-    "vinext": "^1.0.0-beta.12"
+    "@cloudflare/vite-plugin": "*",
+    "vinext": "^1.0.0-beta.13"
+  },
+  "peerDependenciesMeta": {
+    "@cloudflare/vite-plugin": {
+      "optional": true
+    }
   },
   "engines": {
     "node": ">=22"