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

package/dist/wrangler-config.js

@@ -0,0 +1,294 @@
+import fs from "node:fs";
+import path from "node:path";
+//#region src/wrangler-config.ts
+/** Narrow Wrangler config projection shared by deploy-time features. */
+/**
+* Parse the Wrangler fields used by TPR and staged CDN warming.
+*/
+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 namespace = config.kv_namespaces.find((value) => value && typeof value === "object" && (value.binding === "VINEXT_KV_CACHE" || value.binding === "VINEXT_CACHE"));
+		if (namespace && typeof namespace.id === "string" && namespace.id !== "<your-kv-namespace-id>") result.kvNamespaceId = namespace.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.
+*/
+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];
+	for (const block of content.split(/\[\[kv_namespaces\]\]/).slice(1)) {
+		const section = block.split(/\[\[/)[0];
+		const binding = section.match(/binding\s*=\s*"([^"]+)"/)?.[1];
+		const id = section.match(/\bid\s*=\s*"([^"]+)"/)?.[1];
+		if ((binding === "VINEXT_KV_CACHE" || binding === "VINEXT_CACHE") && id && id !== "<your-kv-namespace-id>") result.kvNamespaceId = id;
+	}
+	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\s*=\s*"([^"]+)"/m) ?? section.match(/^zone_name\s*=\s*"([^"]+)"/m);
+	if (!patternMatch) return null;
+	const domain = cleanDomain(patternMatch[1]);
+	return domain && !domain.includes("workers.dev") ? domain : null;
+}
+//#endregion
+export { parseWranglerConfig };

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

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

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.1",
-  "description": "Cloudflare adapters for vinext (KV data cache and Images-backed image optimization).",
+  "version": "1.0.0-beta.11",
+  "description": "Cloudflare cache and image adapters for vinext.",
+  "homepage": "https://vinext.dev/",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -29,10 +30,6 @@
       "types": "./dist/deploy-config.d.ts",
       "import": "./dist/deploy-config.js"
     },
-    "./internal/tpr": {
-      "types": "./dist/tpr.d.ts",
-      "import": "./dist/tpr.js"
-    },
     "./internal/cdn-warm": {
       "types": "./dist/cdn-warm.d.ts",
       "import": "./dist/cdn-warm.js"
@@ -50,20 +47,33 @@
       "import": "./dist/images/*.js"
     }
   },
+  "dependencies": {
+    "@cloudflare/workers-response-store": "0.1.0-beta.2"
+  },
   "devDependencies": {
+    "@cloudflare/vite-plugin": "2.0.0-beta.sha-805ec1ff3",
     "@types/node": "^25.9.2",
-    "vite": "npm:@voidzero-dev/vite-plus-core@0.2.2",
-    "vite-plus": "0.2.2",
-    "vinext": "1.0.0-beta.1"
+    "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.13"
   },
   "peerDependencies": {
-    "vinext": ">=0.0.0"
+    "@cloudflare/vite-plugin": "*",
+    "vinext": "^1.0.0-beta.13"
+  },
+  "peerDependenciesMeta": {
+    "@cloudflare/vite-plugin": {
+      "optional": true
+    }
   },
   "engines": {
     "node": ">=22"
   },
   "scripts": {
     "build": "vp pack",
-    "dev": "vp pack --watch"
+    "dev": "vp pack --watch",
+    "test": "vp run vinext#build && vp run @cloudflare/workers-response-store#build && vp run @vinext/cloudflare#build && VINEXT_RESPONSE_STORE_MODE=self-contained VINEXT_RESPONSE_STORE_LOCATION_HINT=weur pnpm --filter response-store-demo run build && VINEXT_RESPONSE_STORE_LOCATION_HINT=wnam pnpm --filter response-store-demo run build && vitest run"
   }
 }