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

package/dist/tpr.js

@@ -1,324 +1,23 @@
-import { ENTRY_PREFIX } from "./cache/kv-data-adapter.runtime.js";
-import { createRequire } from "node:module";
-import path from "node:path";
+import { parseWranglerConfig } from "./wrangler-config.js";
 import fs from "node:fs";
-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";
+import path from "node:path";
 //#region src/tpr.ts
 /**
-* TPR: Traffic-aware Pre-Rendering
+* TPR: traffic-aware pre-warm route selection
 *
-* Uses Cloudflare zone analytics to determine which pages actually get
-* traffic, and pre-renders only those during deploy. The pre-rendered
-* HTML is uploaded to KV in the same format ISR uses at runtime — no
-* runtime changes needed.
+* Uses Cloudflare zone analytics to determine which routes should be fed into
+* the standard CDN pre-warming flow.
 *
 * Flow:
-*   1. Parse wrangler config to find custom domain and KV namespace
+*   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. Walk ranked list until coverage threshold is met
-*   5. Start the built production server locally
-*   6. Fetch each hot route to produce HTML
-*   7. Upload pre-rendered HTML to KV (same KVCacheEntry format ISR reads)
+*   4. Return the ranked candidates for standard route resolution and selection
 *
-* TPR is an experimental feature enabled via --experimental-tpr. It
-* gracefully skips when no custom domain, no API token, no traffic data,
-* or no KV namespace is configured.
-*/
-/**
-* Parse wrangler config (JSONC or TOML) to extract the fields TPR needs:
-* account_id, VINEXT_KV_CACHE KV namespace ID, and custom domain.
-*/
-function parseWranglerConfig(root, configPath) {
-	if (configPath) {
-		const filepath = path.resolve(root, configPath);
-		if (!fs.existsSync(filepath)) return null;
-		const content = fs.readFileSync(filepath, "utf-8");
-		if (filepath.endsWith(".toml")) return extractFromTOML(content);
-		try {
-			return extractFromJSON(JSON.parse(stripJsonCommentsAndTrailingCommas(content)));
-		} catch {
-			return null;
-		}
-	}
-	for (const filename of ["wrangler.jsonc", "wrangler.json"]) {
-		const filepath = path.join(root, filename);
-		if (fs.existsSync(filepath)) {
-			const content = fs.readFileSync(filepath, "utf-8");
-			try {
-				return extractFromJSON(JSON.parse(stripJsonCommentsAndTrailingCommas(content)));
-			} catch {
-				continue;
-			}
-		}
-	}
-	const tomlPath = path.join(root, "wrangler.toml");
-	if (fs.existsSync(tomlPath)) return extractFromTOML(fs.readFileSync(tomlPath, "utf-8"));
-	return null;
-}
-/**
-* Strip single-line (//), multi-line comments, and trailing commas from JSONC
-* while preserving strings that contain comment-like text or commas.
-*/
-function stripJsonCommentsAndTrailingCommas(str) {
-	let result = "";
-	let inString = false;
-	let inSingleLine = false;
-	let inMultiLine = false;
-	let escapeNext = false;
-	for (let i = 0; i < str.length; i++) {
-		const ch = str[i];
-		const next = str[i + 1];
-		if (escapeNext) {
-			if (!inSingleLine && !inMultiLine) result += ch;
-			escapeNext = false;
-			continue;
-		}
-		if (ch === "\\" && inString) {
-			result += ch;
-			escapeNext = true;
-			continue;
-		}
-		if (inSingleLine) {
-			if (ch === "\n") {
-				inSingleLine = false;
-				result += ch;
-			}
-			continue;
-		}
-		if (inMultiLine) {
-			if (ch === "*" && next === "/") {
-				inMultiLine = false;
-				i++;
-			}
-			continue;
-		}
-		if (ch === "\"" && !inString) {
-			inString = true;
-			result += ch;
-			continue;
-		}
-		if (ch === "\"" && inString) {
-			inString = false;
-			result += ch;
-			continue;
-		}
-		if (!inString && ch === "/" && next === "/") {
-			inSingleLine = true;
-			i++;
-			continue;
-		}
-		if (!inString && ch === "/" && next === "*") {
-			inMultiLine = true;
-			i++;
-			continue;
-		}
-		if (!inString && ch === "," && isJsonTrailingComma(str, i + 1)) continue;
-		result += ch;
-	}
-	return result;
-}
-function isJsonTrailingComma(str, start) {
-	for (let i = start; i < str.length; i++) {
-		const ch = str[i];
-		const next = str[i + 1];
-		if (ch === void 0) return false;
-		if (/\s/.test(ch)) continue;
-		if (ch === "/" && next === "/") {
-			i += 2;
-			while (i < str.length && str[i] !== "\n") i++;
-			continue;
-		}
-		if (ch === "/" && next === "*") {
-			i += 2;
-			while (i < str.length) {
-				if (str[i] === "*" && str[i + 1] === "/") {
-					i++;
-					break;
-				}
-				i++;
-			}
-			continue;
-		}
-		return ch === "}" || ch === "]";
-	}
-	return false;
-}
-function extractFromJSON(config) {
-	const result = {};
-	if (typeof config.name === "string" && config.name.length > 0) result.name = config.name;
-	if (typeof config.legacy_env === "boolean") result.legacyEnv = config.legacy_env;
-	if (typeof config.account_id === "string") result.accountId = config.account_id;
-	if (Array.isArray(config.kv_namespaces)) {
-		const vinextKV = config.kv_namespaces.find((ns) => ns && typeof ns === "object" && (ns.binding === "VINEXT_KV_CACHE" || ns.binding === "VINEXT_CACHE"));
-		if (vinextKV && typeof vinextKV.id === "string" && vinextKV.id !== "<your-kv-namespace-id>") result.kvNamespaceId = vinextKV.id;
-	}
-	const domain = extractDomainFromRoutes(config.routes) ?? extractDomainFromCustomDomains(config);
-	if (domain) result.customDomain = domain;
-	const env = extractEnvConfigs(config.env);
-	if (env) result.env = env;
-	return result;
-}
-function extractEnvConfigs(envs) {
-	if (!envs || typeof envs !== "object" || Array.isArray(envs)) return void 0;
-	const result = {};
-	for (const [envName, rawConfig] of Object.entries(envs)) {
-		if (!rawConfig || typeof rawConfig !== "object" || Array.isArray(rawConfig)) continue;
-		const envConfig = extractEnvironmentConfig(rawConfig);
-		if (envConfig.name || envConfig.customDomain) result[envName] = envConfig;
-	}
-	return Object.keys(result).length > 0 ? result : void 0;
-}
-function extractEnvironmentConfig(config) {
-	const result = {};
-	if (typeof config.name === "string" && config.name.length > 0) result.name = config.name;
-	const domain = extractDomainFromRoutes(config.routes) ?? extractDomainFromCustomDomains(config);
-	if (domain) result.customDomain = domain;
-	return result;
-}
-function extractDomainFromRoutes(routes) {
-	if (!Array.isArray(routes)) return null;
-	for (const route of routes) if (typeof route === "string") {
-		const domain = cleanDomain(route);
-		if (domain && !domain.includes("workers.dev")) return domain;
-	} else if (route && typeof route === "object") {
-		const r = route;
-		const pattern = typeof r.zone_name === "string" ? r.zone_name : typeof r.pattern === "string" ? r.pattern : null;
-		if (pattern) {
-			const domain = cleanDomain(pattern);
-			if (domain && !domain.includes("workers.dev")) return domain;
-		}
-	}
-	return null;
-}
-function extractDomainFromCustomDomains(config) {
-	if (Array.isArray(config.custom_domains)) {
-		for (const d of config.custom_domains) if (typeof d === "string" && !d.includes("workers.dev")) return cleanDomain(d);
-	}
-	return null;
-}
-/** Strip protocol and trailing wildcards from a route pattern to get a bare domain. */
-function cleanDomain(raw) {
-	return raw.replace(/^https?:\/\//, "").replace(/\/\*$/, "").replace(/\/+$/, "").split("/")[0] || null;
-}
-/**
-* Simple extraction of specific fields from wrangler.toml content.
-* Not a full TOML parser — just enough for the fields we need.
+* TPR is an experimental feature enabled via
+* --experimental-traffic-aware-warm-cache. It gracefully skips when no custom
+* domain, API token, or traffic data exists.
 */
-function extractFromTOML(content) {
-	const result = {};
-	const nameMatch = content.match(/^name\s*=\s*"([^"]+)"/m);
-	if (nameMatch) result.name = nameMatch[1];
-	const legacyEnvMatch = content.match(/^legacy_env\s*=\s*(true|false)\s*$/m);
-	if (legacyEnvMatch) result.legacyEnv = legacyEnvMatch[1] === "true";
-	const accountMatch = content.match(/^account_id\s*=\s*"([^"]+)"/m);
-	if (accountMatch) result.accountId = accountMatch[1];
-	const kvBlocks = content.split(/\[\[kv_namespaces\]\]/);
-	for (let i = 1; i < kvBlocks.length; i++) {
-		const block = kvBlocks[i].split(/\[\[/)[0];
-		const bindingMatch = block.match(/binding\s*=\s*"([^"]+)"/);
-		const idMatch = block.match(/\bid\s*=\s*"([^"]+)"/);
-		if ((bindingMatch?.[1] === "VINEXT_KV_CACHE" || bindingMatch?.[1] === "VINEXT_CACHE") && idMatch?.[1] && idMatch[1] !== "<your-kv-namespace-id>") result.kvNamespaceId = idMatch[1];
-	}
-	const routeMatch = content.match(/^route\s*=\s*"([^"]+)"/m);
-	if (routeMatch) {
-		const domain = cleanDomain(routeMatch[1]);
-		if (domain && !domain.includes("workers.dev")) result.customDomain = domain;
-	}
-	if (!result.customDomain) {
-		const routeBlocks = content.split(/\[\[routes\]\]/);
-		for (let i = 1; i < routeBlocks.length; i++) {
-			const patternMatch = routeBlocks[i].split(/\[\[/)[0].match(/pattern\s*=\s*"([^"]+)"/);
-			if (patternMatch) {
-				const domain = cleanDomain(patternMatch[1]);
-				if (domain && !domain.includes("workers.dev")) {
-					result.customDomain = domain;
-					break;
-				}
-			}
-		}
-	}
-	const env = extractEnvConfigsFromTOML(content);
-	if (env) result.env = env;
-	return result;
-}
-function extractEnvConfigsFromTOML(content) {
-	const result = {};
-	for (const section of getTomlSections(content)) {
-		const envName = section.header.match(/^env\.([^.]+)$/)?.[1];
-		if (envName) {
-			const envConfig = result[envName] ?? {};
-			const nameMatch = section.body.match(/^name\s*=\s*"([^"]+)"/m);
-			if (nameMatch) envConfig.name = nameMatch[1];
-			const domain = extractTomlScalarRouteDomain(section.body) ?? extractTomlRoutesArrayDomain(section.body);
-			if (domain) envConfig.customDomain = domain;
-			if (envConfig.name || envConfig.customDomain) result[envName] = envConfig;
-			continue;
-		}
-		const routesEnvName = section.header.match(/^env\.([^.]+)\.routes$/)?.[1];
-		if (routesEnvName) {
-			const envConfig = result[routesEnvName] ?? {};
-			const domain = extractTomlRouteBlockDomain(section.body);
-			if (domain) envConfig.customDomain = domain;
-			if (envConfig.name || envConfig.customDomain) result[routesEnvName] = envConfig;
-		}
-	}
-	return Object.keys(result).length > 0 ? result : void 0;
-}
-function getTomlSections(content) {
-	const sections = [];
-	let currentHeader = null;
-	let currentBody = [];
-	for (const line of content.split("\n")) {
-		const header = parseTomlSectionHeader(line);
-		if (header) {
-			if (currentHeader) sections.push({
-				header: currentHeader,
-				body: currentBody.join("\n")
-			});
-			currentHeader = header;
-			currentBody = [];
-		} else if (currentHeader) currentBody.push(line);
-	}
-	if (currentHeader) sections.push({
-		header: currentHeader,
-		body: currentBody.join("\n")
-	});
-	return sections;
-}
-function parseTomlSectionHeader(line) {
-	const trimmed = line.trim();
-	if (!trimmed.startsWith("[") || !trimmed.endsWith("]")) return null;
-	const isArrayHeader = trimmed.startsWith("[[") && trimmed.endsWith("]]");
-	const start = isArrayHeader ? 2 : 1;
-	const end = isArrayHeader ? trimmed.length - 2 : trimmed.length - 1;
-	const header = trimmed.slice(start, end).trim();
-	return header.length > 0 ? header : null;
-}
-function extractTomlScalarRouteDomain(section) {
-	const routeMatch = section.match(/^route\s*=\s*"([^"]+)"/m);
-	if (!routeMatch) return null;
-	const domain = cleanDomain(routeMatch[1]);
-	return domain && !domain.includes("workers.dev") ? domain : null;
-}
-function extractTomlRoutesArrayDomain(section) {
-	const routesMatch = section.match(/^routes\s*=\s*\[([\s\S]*?)\]/m);
-	if (!routesMatch) return null;
-	const patternMatch = (routesMatch[1] ?? "").match(/(?:pattern\s*=\s*)?"([^"]+)"/);
-	if (!patternMatch) return null;
-	const domain = cleanDomain(patternMatch[1]);
-	return domain && !domain.includes("workers.dev") ? domain : null;
-}
-function extractTomlRouteBlockDomain(section) {
-	const patternMatch = section.match(/^(?:pattern|zone_name)\s*=\s*"([^"]+)"/m);
-	if (!patternMatch) return null;
-	const domain = cleanDomain(patternMatch[1]);
-	return domain && !domain.includes("workers.dev") ? domain : null;
-}
 /**
 * Generate zone lookup candidates from shortest (2-part) to longest.
 * Tries the most common case first (e.g., "example.com") and progressively
@@ -347,48 +46,44 @@ async function resolveZoneId(domain, apiToken) {
 	}
 	return null;
 }
-/** Resolve the account ID associated with the API token. */
-async function resolveAccountId(apiToken) {
-	const response = await fetch("https://api.cloudflare.com/client/v4/accounts?per_page=1", { headers: {
-		Authorization: `Bearer ${apiToken}`,
-		"Content-Type": "application/json"
-	} });
-	if (!response.ok) return null;
-	const data = await response.json();
-	if (!data.success || !data.result?.length) return null;
-	return data.result[0].id;
-}
 /**
 * Query Cloudflare zone analytics for top page paths by request count
 * over the given time window.
 */
 async function queryTraffic(zoneTag, apiToken, windowHours) {
 	const now = /* @__PURE__ */ new Date();
-	const query = `{
+	const start = /* @__PURE__ */ new Date(now.getTime() - windowHours * 60 * 60 * 1e3);
+	const response = await fetch("https://api.cloudflare.com/client/v4/graphql", {
+		method: "POST",
+		headers: {
+			Authorization: `Bearer ${apiToken}`,
+			"Content-Type": "application/json"
+		},
+		body: JSON.stringify({
+			query: `query($zoneTag: string!, $start: Time!, $end: Time!) {
     viewer {
-      zones(filter: { zoneTag: "${zoneTag}" }) {
+      zones(filter: { zoneTag: $zoneTag }) {
         httpRequestsAdaptiveGroups(
           limit: 10000
-          orderBy: [sum_requests_DESC]
+          orderBy: [count_DESC]
           filter: {
-            datetime_geq: "${(/* @__PURE__ */ new Date(now.getTime() - windowHours * 60 * 60 * 1e3)).toISOString()}"
-            datetime_lt: "${now.toISOString()}"
+            datetime_geq: $start
+            datetime_lt: $end
             requestSource: "eyeball"
           }
         ) {
-          sum { requests }
+          count
           dimensions { clientRequestPath }
         }
       }
     }
-  }`;
-	const response = await fetch("https://api.cloudflare.com/client/v4/graphql", {
-		method: "POST",
-		headers: {
-			Authorization: `Bearer ${apiToken}`,
-			"Content-Type": "application/json"
-		},
-		body: JSON.stringify({ query })
+  }`,
+			variables: {
+				zoneTag,
+				start: start.toISOString(),
+				end: now.toISOString()
+			}
+		})
 	});
 	if (!response.ok) throw new Error(`Zone analytics query failed: ${response.status} ${response.statusText}`);
 	const data = await response.json();
@@ -397,7 +92,7 @@ async function queryTraffic(zoneTag, apiToken, windowHours) {
 	if (!groups || groups.length === 0) return [];
 	return filterTrafficPaths(groups.map((g) => ({
 		path: g.dimensions.clientRequestPath,
-		requests: g.sum.requests
+		requests: g.count
 	})));
 }
 /** Filter out non-page requests (static assets, API routes, internal routes). */
@@ -438,283 +133,35 @@ function selectRoutes(traffic, coverageTarget, limit) {
 		coveragePercent: accumulated / totalRequests * 100
 	};
 }
-/** Pre-render port — high number to avoid collisions with dev servers. */
-const PRERENDER_PORT = 19384;
-/** Max time to wait for the local server to start (ms). */
-const SERVER_STARTUP_TIMEOUT = 3e4;
-/** Max concurrent fetch requests during pre-rendering. */
-const FETCH_CONCURRENCY = 10;
-const NON_CACHEABLE_CACHE_CONTROL_RE = /\b(?:no-store|no-cache|private)\b/i;
-function getTprHeader(headers, name) {
-	const normalizedName = name.toLowerCase();
-	for (const [key, value] of Object.entries(headers)) if (key.toLowerCase() === normalizedName) return value;
-}
-function hasNonCacheableCacheControl(headers) {
-	const cacheControl = getTprHeader(headers, "cache-control");
-	return cacheControl ? NON_CACHEABLE_CACHE_CONTROL_RE.test(cacheControl) : false;
-}
-function readTprRevalidateHeader(headers) {
-	const revalidateHeader = getTprHeader(headers, VINEXT_REVALIDATE_HEADER);
-	if (revalidateHeader === void 0) return void 0;
-	return Number(revalidateHeader);
-}
-function isTprCacheable(headers) {
-	if (hasNonCacheableCacheControl(headers)) return false;
-	const revalidate = readTprRevalidateHeader(headers);
-	return revalidate === void 0 || Number.isFinite(revalidate) && revalidate > 0;
-}
-/**
-* Start a local production server, fetch each route to produce HTML,
-* and return the results. Pages that fail to render are skipped.
-*/
-async function prerenderRoutes(routes, root, hostDomain) {
-	const results = /* @__PURE__ */ new Map();
-	let failedCount = 0;
-	const port = PRERENDER_PORT;
-	const distDir = path.join(root, "dist");
-	if (!fs.existsSync(distDir)) {
-		console.log("  TPR: Skipping pre-render — dist/ directory not found");
-		return results;
-	}
-	const serverProcess = startLocalServer(root, port);
-	try {
-		await waitForServer(port, SERVER_STARTUP_TIMEOUT);
-		for (let i = 0; i < routes.length; i += FETCH_CONCURRENCY) {
-			const promises = routes.slice(i, i + FETCH_CONCURRENCY).map(async (routePath) => {
-				try {
-					const response = await fetch(`http://127.0.0.1:${port}${routePath}`, {
-						headers: {
-							"User-Agent": "vinext-tpr/1.0",
-							...hostDomain ? { Host: hostDomain } : {}
-						},
-						redirect: "manual"
-					});
-					if (response.status < 400) {
-						const headers = {};
-						response.headers.forEach((value, key) => {
-							if (key === "content-type" || key === "cache-control" || key === VINEXT_REVALIDATE_HEADER || key === "location") headers[key] = value;
-						});
-						if (!isTprCacheable(headers)) return;
-						const html = await response.text();
-						results.set(routePath, {
-							html,
-							status: response.status,
-							headers
-						});
-					}
-				} catch {
-					failedCount++;
-				}
-			});
-			await Promise.all(promises);
-		}
-		if (failedCount > 0) console.log(`  TPR: ${failedCount} page(s) failed to pre-render (skipped)`);
-	} finally {
-		serverProcess.kill("SIGTERM");
-		await new Promise((resolve) => {
-			serverProcess.on("exit", resolve);
-			setTimeout(resolve, 2e3);
-		});
-	}
-	return results;
-}
-/**
-* Spawn a subprocess running the vinext production server.
-* Uses the same Node.js binary and resolves vinext from the project root so
-* linked/package-manager-managed installs use the app's vinext peer.
-*/
-function startLocalServer(root, port) {
-	const prodServerPath = resolveVinextProdServerPath(root);
-	const outDir = path.join(root, "dist");
-	const script = [
-		`import(${JSON.stringify(pathToFileURL(prodServerPath).href)})`,
-		`.then(m => m.startProdServer({ port: ${port}, host: "127.0.0.1", outDir: ${JSON.stringify(outDir)} }))`,
-		`.catch(e => { console.error("[vinext-tpr] Server failed to start:", e); process.exit(1); });`
-	].join("");
-	const proc = spawn(process.execPath, [
-		"--input-type=module",
-		"-e",
-		script
-	], {
-		cwd: root,
-		stdio: "pipe",
-		env: {
-			...process.env,
-			NODE_ENV: "production"
-		}
-	});
-	proc.stderr?.on("data", (chunk) => {
-		const msg = chunk.toString().trim();
-		if (msg) console.error(`  [tpr-server] ${msg}`);
-	});
-	return proc;
-}
-function resolveVinextProdServerPath(root) {
-	return createRequire(path.join(root, "package.json")).resolve("vinext/server/prod-server");
-}
-/** Poll the local server until it responds or the timeout is reached. */
-async function waitForServer(port, timeoutMs) {
-	const start = Date.now();
-	while (Date.now() - start < timeoutMs) try {
-		const controller = new AbortController();
-		const timer = setTimeout(() => controller.abort(), 2e3);
-		const response = await fetch(`http://127.0.0.1:${port}/`, {
-			redirect: "manual",
-			signal: controller.signal
-		});
-		clearTimeout(timer);
-		await response.text();
-		return;
-	} catch {
-		await new Promise((r) => setTimeout(r, 300));
-	}
-	throw new Error(`Local production server failed to start within ${timeoutMs / 1e3}s`);
-}
-/** KV bulk API accepts up to 10,000 pairs per request */
-const KV_BATCH_SIZE = 1e4;
-/** Maximum KV expiration TTL: 30 days */
-const MAX_KV_TTL_SECONDS = 720 * 3600;
 /**
-* Build KV bulk API pairs from pre-rendered entries.
-*
-* Key format matches the runtime KVCacheHandler exactly:
-*   ENTRY_PREFIX + isrCacheKey("app", pathname, buildId) + ":html"
-*   → "cache:app:<buildId>:<pathname>:html"
+* Resolve ranked traffic paths. The standard CDN pre-warming flow owns route
+* matching, coverage selection, rendering, and cache admission.
 */
-function buildTprKVPairs(entries, buildId, defaultRevalidateSeconds) {
-	const now = Date.now();
-	const pairs = [];
-	for (const [routePath, result] of entries) {
-		if (!isTprCacheable(result.headers)) continue;
-		const revalidateSeconds = readTprRevalidateHeader(result.headers) ?? defaultRevalidateSeconds;
-		if (!Number.isFinite(revalidateSeconds) || revalidateSeconds <= 0) continue;
-		const revalidateAt = now + revalidateSeconds * 1e3;
-		const kvTtl = MAX_KV_TTL_SECONDS;
-		const tags = buildAppPageCacheTags(routePath, []);
-		const entry = {
-			value: {
-				kind: "APP_PAGE",
-				html: result.html,
-				headers: result.headers,
-				status: result.status
-			},
-			tags,
-			lastModified: now,
-			revalidateAt
-		};
-		const cacheKey = ENTRY_PREFIX + isrCacheKey("app", routePath, buildId) + ":html";
-		pairs.push({
-			key: cacheKey,
-			value: JSON.stringify(entry),
-			expiration_ttl: kvTtl
-		});
-	}
-	return pairs;
-}
-/**
-* Upload pre-rendered pages to KV using the Cloudflare REST API.
-* Writes in the same KVCacheEntry format that KVCacheHandler reads
-* at runtime, so ISR serves these entries without any code changes.
-*/
-async function uploadToKV(entries, namespaceId, accountId, apiToken, defaultRevalidateSeconds, buildId) {
-	const pairs = buildTprKVPairs(entries, buildId, defaultRevalidateSeconds);
-	for (let i = 0; i < pairs.length; i += KV_BATCH_SIZE) {
-		const batch = pairs.slice(i, i + KV_BATCH_SIZE);
-		const response = await fetch(`https://api.cloudflare.com/client/v4/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/bulk`, {
-			method: "PUT",
-			headers: {
-				Authorization: `Bearer ${apiToken}`,
-				"Content-Type": "application/json"
-			},
-			body: JSON.stringify(batch)
-		});
-		if (!response.ok) {
-			const text = await response.text();
-			throw new Error(`KV bulk upload failed (batch ${Math.floor(i / KV_BATCH_SIZE) + 1}): ${response.status} — ${text}`);
-		}
-	}
-}
-/** Default revalidation TTL for pre-rendered pages (1 hour). */
-const DEFAULT_REVALIDATE_SECONDS = 3600;
-/**
-* Run the TPR pipeline: query traffic, select routes, pre-render, upload.
-*
-* Designed to be called between the build step and wrangler deploy in the
-* `vinext-cloudflare deploy` pipeline. Gracefully skips (never errors) when
-* the prerequisites aren't met.
-*/
-async function runTPR(options) {
-	const startTime = Date.now();
-	const { root, config, coverage, limit, window: windowHours } = options;
+async function resolveTPRRoutes(options) {
+	const { root, config, window: windowHours } = options;
 	const skip = (reason) => ({
-		totalPaths: 0,
-		prerenderedCount: 0,
-		coverageAchieved: 0,
-		durationMs: Date.now() - startTime,
+		routes: [],
 		skipped: reason
 	});
 	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");
-	if (!wranglerConfig.customDomain) return skip("no custom domain — zone analytics unavailable");
-	if (!wranglerConfig.kvNamespaceId) return skip("no VINEXT_KV_CACHE KV namespace configured");
-	const accountId = wranglerConfig.accountId ?? await resolveAccountId(apiToken);
-	if (!accountId) return skip("could not resolve Cloudflare account ID");
-	console.log(`  TPR: Analyzing traffic for ${wranglerConfig.customDomain} (last ${windowHours}h)`);
-	const zoneId = await resolveZoneId(wranglerConfig.customDomain, apiToken);
-	if (!zoneId) return skip(`could not resolve zone for ${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);
+	if (!zoneId) return skip(`could not resolve zone for ${hostname}`);
 	let traffic;
 	try {
 		traffic = await queryTraffic(zoneId, apiToken, windowHours);
-	} catch (err) {
-		return skip(`analytics query failed: ${err instanceof Error ? err.message : String(err)}`);
+	} catch (error) {
+		return skip(`analytics query failed: ${error instanceof Error ? error.message : String(error)}`);
 	}
 	if (traffic.length === 0) return skip("no traffic data available (first deploy?)");
-	const selection = selectRoutes(traffic, coverage, limit);
-	console.log(`  TPR: ${traffic.length.toLocaleString()} unique paths — ${selection.routes.length} pages cover ${Math.round(selection.coveragePercent)}% of traffic`);
-	if (selection.routes.length === 0) return {
-		totalPaths: traffic.length,
-		prerenderedCount: 0,
-		coverageAchieved: 0,
-		durationMs: Date.now() - startTime,
-		skipped: "no pre-renderable routes after filtering"
-	};
-	console.log(`  TPR: Pre-rendering ${selection.routes.length} pages...`);
-	const routePaths = selection.routes.map((r) => r.path);
-	let rendered;
-	try {
-		rendered = await prerenderRoutes(routePaths, root, wranglerConfig.customDomain);
-	} catch (err) {
-		return skip(`pre-rendering failed: ${err instanceof Error ? err.message : String(err)}`);
-	}
-	if (rendered.size === 0) return {
-		totalPaths: traffic.length,
-		prerenderedCount: 0,
-		coverageAchieved: selection.coveragePercent,
-		durationMs: Date.now() - startTime,
-		skipped: "all pages failed to pre-render (request-dependent?)"
-	};
-	let buildId;
-	try {
-		buildId = fs.readFileSync(path.join(root, "dist", "server", "BUILD_ID"), "utf-8").trim();
-	} catch {
-		console.warn("  TPR: Could not read BUILD_ID from dist/server/ — KV keys will not match runtime. Skipping KV upload.");
-		return skip("BUILD_ID not found in dist/server/ — build output may be incomplete");
-	}
-	try {
-		await uploadToKV(rendered, wranglerConfig.kvNamespaceId, accountId, apiToken, DEFAULT_REVALIDATE_SECONDS, buildId);
-	} catch (err) {
-		return skip(`KV upload failed: ${err instanceof Error ? err.message : String(err)}`);
-	}
-	const durationMs = Date.now() - startTime;
-	console.log(`  TPR: Pre-rendered ${rendered.size} pages in ${(durationMs / 1e3).toFixed(1)}s → KV cache`);
-	return {
-		totalPaths: traffic.length,
-		prerenderedCount: rendered.size,
-		coverageAchieved: selection.coveragePercent,
-		durationMs
-	};
+	return { routes: traffic };
 }
 //#endregion
-export { buildTprKVPairs, domainCandidates, parseWranglerConfig, resolveVinextProdServerPath, runTPR };
+export { domainCandidates, filterTrafficPaths, parseWranglerConfig, resolveTPRRoutes, selectRoutes };