fixup! delete, lastModified

Author: vicb

packages/cloudflare/src/api/kvCache.ts

@@ -8,6 +8,8 @@ import { getCloudflareContext } from "./get-cloudflare-context.js";
 
 export const CACHE_ASSET_DIR = "cnd-cgi/_next_cache";
 
+export const STATUS_DELETED = 1;
+
 /**
  * Open Next cache based on cloudflare KV and Assets.
  *
@@ -38,26 +40,32 @@ class Cache implements IncrementalCache {
     try {
       this.debug(`- From KV`);
       const kvKey = this.getKVKey(key, isFetch ? "fetch" : "cache");
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      let value: any = await this.kv?.get(kvKey, "json");
-      if (!value && this.assets) {
+
+      let entry = (await this.kv?.get(kvKey, "json")) as {
+        value?: CacheValue<IsFetch>;
+        lastModified?: number;
+        status?: number;
+      } | null;
+      if (entry?.status === STATUS_DELETED) {
+        return {};
+      }
+      if (!entry && this.assets) {
         const url = this.getAssetUrl(key);
         const response = await this.assets.fetch(url);
         this.debug(`- From Assets`);
         if (response.ok) {
-          value = await response.json();
+          entry = {
+            value: await response.json(),
+            // __BUILD_TIMESTAMP_MS__ is injected by ESBuild.
+            lastModified: (globalThis as { __BUILD_TIMESTAMP_MS__?: number }).__BUILD_TIMESTAMP_MS__,
+          };
         }
       }
-      if (value) {
-        this.debug(`-> hit`);
-        return { value };
-      }
+      this.debug(entry ? `-> hit` : `-> miss`);
+      return { value: entry?.value, lastModified: entry?.lastModified };
     } catch {
       throw new RecoverableError(`Failed to get cache [${key}]`);
     }
-
-    this.debug(`-> miss`);
-    throw new RecoverableError(`Not found [${key}]`);
   }
 
   async set<IsFetch extends boolean = false>(
@@ -74,8 +82,16 @@ class Cache implements IncrementalCache {
     this.debug(`Set ${key}`);
     try {
       const kvKey = this.getKVKey(key, isFetch ? "fetch" : "cache");
-      // TODO: add TTL to avoid cache growing too big ?
-      await this.kv.put(kvKey, JSON.stringify(value));
+      // 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.
+      await this.kv.put(
+        kvKey,
+        JSON.stringify({
+          value,
+          lastModified: Date.now(),
+        })
+      );
     } catch {
       throw new RecoverableError(`Failed to set cache [${key}]`);
     }
@@ -91,7 +107,8 @@ class Cache implements IncrementalCache {
     this.debug(`Delete ${key}`);
     try {
       const kvKey = this.getKVKey(key, "cache");
-      await this.kv.delete(kvKey);
+      // 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}]`);
     }

packages/cloudflare/src/cli/build/bundle-server.ts

@@ -69,6 +69,7 @@ export async function bundleServer(config: Config, openNextOptions: BuildOptions
       "process.env.NEXT_RUNTIME": '"nodejs"',
       "process.env.NODE_ENV": '"production"',
       "process.env.NEXT_MINIMAL": "true",
+      "process.env.__BUILD_TIMESTAMP_MS__": String(Date.now()),
     },
     // We need to set platform to node so that esbuild doesn't complain about the node imports
     platform: "node",
@@ -109,6 +110,7 @@ globalThis.Request = CustomRequest;
 Request = globalThis.Request;
 // Makes the edge converter returns either a Response or a Request.
 globalThis.__dangerous_ON_edge_converter_returns_request = true;
+globalThis.__BUILD_TIMESTAMP_MS__ = ${Date.now()};
 `,
     },
   });

packages/cloudflare/src/cli/config.ts

@@ -5,8 +5,6 @@ const PACKAGE_NAME = "@opennextjs/cloudflare";
 
 export type Config = {
   build: {
-    // Timestamp for when the build was started
-    timestamp: number;
     // Whether to skip building the Next.js app or not
     skipNextBuild: boolean;
     // Whether minification should be enabled or not
@@ -72,7 +70,6 @@ export function getConfig(projectOpts: ProjectOptions): Config {
 
   return {
     build: {
-      timestamp: Date.now(),
       skipNextBuild: projectOpts.skipNextBuild,
       shouldMinify: projectOpts.minify,
     },