fixup! simplify

Author: vicb

examples/e2e/app-router/.env

@@ -0,0 +1 @@
+NEXT_PRIVATE_DEBUG_CACHE=1

packages/cloudflare/src/api/overrides/incremental-cache/kv-incremental-cache.ts

@@ -1,11 +1,11 @@
-import { createHash, type Hash } from "node:crypto";
+import { createHash } from "node:crypto";
 
 import { error } from "@opennextjs/aws/adapters/logger.js";
 import type { CacheValue, IncrementalCache, WithLastModified } from "@opennextjs/aws/types/overrides.js";
 import { IgnorableError } from "@opennextjs/aws/utils/error.js";
 
 import { getCloudflareContext } from "../../cloudflare-context.js";
-import { CACHE_KEY_HASH, debugCache, FALLBACK_BUILD_ID, IncrementalCacheEntry } from "../internal.js";
+import { debugCache, FALLBACK_BUILD_ID, IncrementalCacheEntry } from "../internal.js";
 
 export const NAME = "cf-kv-incremental-cache";
 
@@ -14,11 +14,11 @@ export const BINDING_NAME = "NEXT_INC_CACHE_KV";
 export type KeyOptions = {
   isFetch: boolean;
   buildId?: string;
-  hash: Hash;
 };
 
 export function computeCacheKey(key: string, options: KeyOptions) {
-  const { isFetch, buildId, hash } = options;
+  const { isFetch, buildId } = options;
+  const hash = createHash("sha256");
   return `${buildId}/${hash.update(key).digest("hex")}.${isFetch ? "fetch" : "cache"}`.replace(/\/+/g, "/");
 }
 
@@ -109,7 +109,6 @@ class KVIncrementalCache implements IncrementalCache {
     return computeCacheKey(key, {
       buildId: process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID,
       isFetch: Boolean(isFetch),
-      hash: createHash(CACHE_KEY_HASH),
     });
   }
 }

packages/cloudflare/src/api/overrides/incremental-cache/r2-incremental-cache.ts

@@ -1,11 +1,11 @@
-import { createHash, type Hash } from "node:crypto";
+import { createHash } from "node:crypto";
 
 import { error } from "@opennextjs/aws/adapters/logger.js";
 import type { CacheValue, IncrementalCache, WithLastModified } from "@opennextjs/aws/types/overrides.js";
 import { IgnorableError } from "@opennextjs/aws/utils/error.js";
 
 import { getCloudflareContext } from "../../cloudflare-context.js";
-import { CACHE_KEY_HASH, debugCache, FALLBACK_BUILD_ID } from "../internal.js";
+import { debugCache, FALLBACK_BUILD_ID } from "../internal.js";
 
 export const NAME = "cf-r2-incremental-cache";
 
@@ -18,11 +18,11 @@ export type KeyOptions = {
   isFetch: boolean;
   directory?: string;
   buildId?: string;
-  hash: Hash;
 };
 
 export function computeCacheKey(key: string, options: KeyOptions) {
-  const { isFetch, directory, buildId, hash } = options;
+  const { isFetch, directory, buildId } = options;
+  const hash = createHash("sha256");
   return `${directory}/${buildId}/${hash.update(key).digest("hex")}.${isFetch ? "fetch" : "cache"}`.replace(
     /\/+/g,
     "/"
@@ -97,7 +97,6 @@ class R2IncrementalCache implements IncrementalCache {
       directory: getCloudflareContext().env[PREFIX_ENV_NAME] ?? DEFAULT_PREFIX,
       buildId: process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID,
       isFetch: Boolean(isFetch),
-      hash: createHash(CACHE_KEY_HASH),
     });
   }
 }

packages/cloudflare/src/api/overrides/internal.ts

@@ -11,8 +11,4 @@ export const debugCache = (name: string, ...args: unknown[]) => {
   }
 };
 
-// Hash the keys to limit their length.
-// KV has a limit of 512B, R2 has a limit of 1024B.
-export const CACHE_KEY_HASH = "sha256";
-
 export const FALLBACK_BUILD_ID = "no-build-id";

packages/cloudflare/src/cli/commands/populate-cache.ts

@@ -1,4 +1,3 @@
-import { createHash } from "node:crypto";
 import { cpSync, existsSync } from "node:fs";
 import path from "node:path";
 
@@ -31,7 +30,6 @@ import {
   CACHE_DIR as STATIC_ASSETS_CACHE_DIR,
   NAME as STATIC_ASSETS_CACHE_NAME,
 } from "../../api/overrides/incremental-cache/static-assets-incremental-cache.js";
-import { CACHE_KEY_HASH } from "../../api/overrides/internal.js";
 import {
   BINDING_NAME as D1_TAG_BINDING_NAME,
   NAME as D1_TAG_NAME,
@@ -122,11 +120,8 @@ function populateR2IncrementalCache(
       directory: process.env[R2_CACHE_PREFIX_ENV_NAME] ?? R2_CACHE_DEFAULT_PREFIX,
       buildId,
       isFetch,
-      hash: createHash(CACHE_KEY_HASH),
     });
 
-    console.error({ cacheKey, key });
-
     runWrangler(
       options,
       ["r2 object put", JSON.stringify(path.join(bucket, cacheKey)), `--file ${JSON.stringify(fullPath)}`],
@@ -157,7 +152,6 @@ function populateKVIncrementalCache(
     const cacheKey = computeKVCacheKey(key, {
       buildId,
       isFetch,
-      hash: createHash(CACHE_KEY_HASH),
     });
 
     runWrangler(