Add support for skew protection

Co-authored-by: conico974 <[email protected]>

Author: vicb

.prettierignore

@@ -4,4 +4,4 @@ pnpm-lock.yaml
 .vscode/setting.json
 test-fixtures
 test-snapshots
-playwright-report
+playwright-report

examples/playground14/wrangler.jsonc

@@ -1,7 +1,7 @@
 {
 	"$schema": "node_modules/wrangler/config-schema.json",
 	"main": "worker.ts",
-	"name": "api",
+	"name": "playground14",
 	"compatibility_date": "2024-12-30",
 	"compatibility_flags": ["nodejs_compat", "global_fetch_strictly_public"],
 	"assets": {

examples/playground15/app/api/env/route.ts

@@ -4,5 +4,7 @@
 export const dynamic = "force-dynamic";
 
 export async function GET() {
-	return new Response(JSON.stringify(process.env));
+	return new Response(JSON.stringify(process.env, null, 2), {
+		headers: { "content-type": "application/json" },
+	});
 }

examples/playground15/next.config.mjs

@@ -1,4 +1,4 @@
-import { initOpenNextCloudflareForDev } from "@opennextjs/cloudflare";
+import { initOpenNextCloudflareForDev, getDeploymentId } from "@opennextjs/cloudflare";
 
 initOpenNextCloudflareForDev();
 
@@ -10,6 +10,7 @@ const nextConfig = {
 		// Generate source map to validate the fix for opennextjs/opennextjs-cloudflare#341
 		serverSourceMaps: true,
 	},
+	deploymentId: getDeploymentId(),
 };
 
 export default nextConfig;

examples/playground15/open-next.config.ts

@@ -1,7 +1,13 @@
-import { defineCloudflareConfig } from "@opennextjs/cloudflare";
-import kvIncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/kv-incremental-cache";
+import { defineCloudflareConfig, type OpenNextConfig } from "@opennextjs/cloudflare";
+import r2IncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache";
 
-export default defineCloudflareConfig({
-	incrementalCache: kvIncrementalCache,
-	enableCacheInterception: true,
-});
+export default {
+	...defineCloudflareConfig({
+		incrementalCache: r2IncrementalCache,
+	}),
+	cloudflare: {
+		skewProtection: {
+			enabled: false,
+		},
+	},
+} satisfies OpenNextConfig;

examples/playground15/package.json

@@ -16,7 +16,7 @@
 		"cf-typegen": "wrangler types --env-interface CloudflareEnv"
 	},
 	"dependencies": {
-		"next": "^15.1.7",
+		"next": "^15.3.4",
 		"react": "^19.0.0",
 		"react-dom": "^19.0.0"
 	},

examples/playground15/wrangler.jsonc

@@ -1,18 +1,18 @@
 {
 	"$schema": "node_modules/wrangler/config-schema.json",
 	"main": ".open-next/worker.js",
-	"name": "api",
+	"name": "playground15",
 	"compatibility_date": "2024-12-30",
 	"compatibility_flags": ["nodejs_compat", "global_fetch_strictly_public"],
 	"assets": {
 		"directory": ".open-next/assets",
 		"binding": "ASSETS",
 		"run_worker_first": true
 	},
-	"kv_namespaces": [
+	"r2_buckets": [
 		{
-			"binding": "NEXT_INC_CACHE_KV",
-			"id": "<BINDING_ID>"
+			"binding": "NEXT_INC_CACHE_R2_BUCKET",
+			"bucket_name": "pg15"
 		}
 	],
 	"vars": {

packages/cloudflare/package.json

@@ -65,6 +65,7 @@
 		"@types/mock-fs": "catalog:",
 		"@types/node": "catalog:",
 		"@types/picomatch": "^4.0.0",
+		"cloudflare": "^4.4.1",
 		"diff": "^8.0.2",
 		"esbuild": "catalog:",
 		"eslint": "catalog:",

packages/cloudflare/src/api/cloudflare-context.ts

@@ -65,6 +65,16 @@ declare global {
 		CACHE_PURGE_ZONE_ID?: string;
 		// The API token to use for the cache purge. It should have the `Cache Purge` permission
 		CACHE_PURGE_API_TOKEN?: string;
+
+		// The following variables must be provided when skew protection is enabled
+		// The name of the worker (as defined in the wrangler configuration)
+		CF_WORKER_NAME?: string;
+		// The subdomain where the previews are deployed, i.e. `<version-name>.<domain>.workers.dev`
+		CF_PREVIEW_DOMAIN?: string;
+		// Should have the `Workers Scripts:Read` permission
+		CF_WORKERS_SCRIPTS_API_TOKEN?: string;
+		// Cloudflare account id
+		CF_ACCOUNT_ID?: string;
 	}
 }
 

packages/cloudflare/src/api/config.ts

@@ -161,6 +161,24 @@ interface OpenNextConfig extends AwsOpenNextConfig {
 		 * @default false
 		 */
 		dangerousDisableConfigValidation?: boolean;
+
+		/**
+		 * Skew protection.
+		 *
+		 * Note: Skew Protection is experimental and might break on minor releases.
+		 *
+		 * @default false
+		 */
+		skewProtection?: {
+			// Whether to enable skew protection
+			enabled?: boolean;
+			// Maximum number of versions to retrieve
+			// @default 20
+			maxNumberOfVersions?: number;
+			// Maximum age of versions to retrieve in days
+			// @default 7
+			maxVersionAgeDays?: number;
+		};
 	};
 }
 
@@ -172,4 +190,11 @@ export function getOpenNextConfig(buildOpts: BuildOptions): OpenNextConfig {
 	return buildOpts.config;
 }
 
+/**
+ * @returns Unique deployment ID
+ */
+export function getDeploymentId(): string {
+	return `dpl-${new Date().getTime().toString(36)}`;
+}
+
 export type { OpenNextConfig };