fixup! fetch cache

Author: vicb

packages/cloudflare/package.json

@@ -69,7 +69,7 @@
     "@types/mock-fs": "catalog:"
   },
   "dependencies": {
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@678",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@684",
     "ts-morph": "catalog:",
     "@dotenvx/dotenvx": "catalog:"
   },

packages/cloudflare/src/api/kvCache.ts

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import type { KVNamespace } from "@cloudflare/workers-types";
-import type { Extension } from "@opennextjs/aws/types/cache";
 import type { CacheValue, IncrementalCache, WithLastModified } from "@opennextjs/aws/types/overrides";
 import { IgnorableError, RecoverableError } from "@opennextjs/aws/utils/error.js";
 
@@ -39,7 +38,7 @@ class Cache implements IncrementalCache {
 
     try {
       this.debug(`- From KV`);
-      const kvKey = this.getKVKey(key, isFetch ? "fetch" : "cache");
+      const kvKey = this.getKVKey(key, isFetch);
 
       let entry = (await this.kv?.get(kvKey, "json")) as {
         value?: CacheValue<IsFetch>;
@@ -50,7 +49,7 @@ class Cache implements IncrementalCache {
         return {};
       }
       if (!entry && this.assets) {
-        const url = this.getAssetUrl(key);
+        const url = this.getAssetUrl(key, isFetch);
         const response = await this.assets.fetch(url);
         this.debug(`- From Assets`);
         if (response.ok) {
@@ -84,7 +83,7 @@ class Cache implements IncrementalCache {
     }
     this.debug(`Set ${key}`);
     try {
-      const kvKey = this.getKVKey(key, isFetch ? "fetch" : "cache");
+      const kvKey = this.getKVKey(key, isFetch);
       // Note: We can not set a TTL as we might fallback to assets,
       //       still removing old data (old BUILD_ID) could help avoiding
       //       the cache growing too big.
@@ -109,20 +108,22 @@ class Cache implements IncrementalCache {
     }
     this.debug(`Delete ${key}`);
     try {
-      const kvKey = this.getKVKey(key, "cache");
+      const kvKey = this.getKVKey(key, /* isFetch= */ false);
       // Do not delete the key as we will then fallback to the assets.
       await this.kv.put(kvKey, JSON.stringify({ status: STATUS_DELETED }));
     } catch (e) {
       throw new RecoverableError(`Failed to delete cache [${key}]`);
     }
   }
 
-  protected getKVKey(key: string, extension: Extension): string {
-    return `${this.getBuildId()}/${key}.${extension}`;
+  protected getKVKey(key: string, isFetch?: boolean): string {
+    return `${this.getBuildId()}/${key}.${isFetch ? "fetch" : "cache"}`;
   }
 
-  protected getAssetUrl(key: string): string {
-    return `http://assets.local/${CACHE_ASSET_DIR}/${this.getBuildId()}/${key}.cache`.replace(/\/\//g, "/");
+  protected getAssetUrl(key: string, isFetch?: boolean): string {
+    return isFetch
+      ? `http://assets.local/${CACHE_ASSET_DIR}/__fetch/${this.getBuildId()}/${key}`
+      : `http://assets.local/${CACHE_ASSET_DIR}/${this.getBuildId()}/${key}.cache`;
   }
 
   protected debug(...args: unknown[]) {

packages/cloudflare/src/cli/build/open-next/copyCacheAssets.ts

@@ -6,10 +6,9 @@ import * as buildHelper from "@opennextjs/aws/build/helper.js";
 import { CACHE_ASSET_DIR } from "../../../api/kvCache.js";
 
 export function copyCacheAssets(options: buildHelper.BuildOptions) {
-  const { appBuildOutputPath, outputDir } = options;
-  const buildId = buildHelper.getBuildId(appBuildOutputPath);
-  const srcPath = join(outputDir, "cache", buildId);
-  const dstPath = join(outputDir, "assets", CACHE_ASSET_DIR, buildId);
+  const { outputDir } = options;
+  const srcPath = join(outputDir, "cache");
+  const dstPath = join(outputDir, "assets", CACHE_ASSET_DIR);
   mkdirSync(dstPath, { recursive: true });
   cpSync(srcPath, dstPath, { recursive: true });
 }