Do not serve stale values from the assets when there is no KV

.changeset/fluffy-taxis-rescue.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+bump `@opennextjs/aws` dependency to `https://pkg.pr.new/@opennextjs/aws@726`

.changeset/spotty-baboons-rule.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Fix: make sure `kvCache` discards expired entries

packages/cloudflare/package.json

@@ -73,7 +73,7 @@
   "dependencies": {
     "@ast-grep/napi": "^0.34.1",
     "@dotenvx/dotenvx": "catalog:",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@724",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@726",
     "enquirer": "^2.4.1",
     "glob": "catalog:",
     "ts-morph": "catalog:",

packages/cloudflare/src/api/kvCache.ts

@@ -7,6 +7,23 @@ export const CACHE_ASSET_DIR = "cnd-cgi/_next_cache";
 
 export const STATUS_DELETED = 1;
 
+// https://github.com/vercel/next.js/blob/9a1cd356/packages/next/src/server/response-cache/types.ts#L26-L38
+export type CachedFetchValue = {
+  kind: "FETCH";
+  data: {
+    headers: { [k: string]: string };
+    body: string;
+    url: string;
+    status?: number;
+    // field used by older versions of Next.js (see: https://github.com/vercel/next.js/blob/fda1ecc/packages/next/src/server/response-cache/types.ts#L23)
+    tags?: string[];
+  };
+  // tags are only present with file-system-cache
+  // fetch cache stores tags outside of cache entry
+  tags?: string[];
+  revalidate: number;
+};
+
 /**
  * Open Next cache based on cloudflare KV and Assets.
  *
@@ -20,7 +37,7 @@ class Cache implements IncrementalCache {
   async get<IsFetch extends boolean = false>(
     key: string,
     isFetch?: IsFetch
-  ): Promise<WithLastModified<CacheValue<IsFetch>>> {
+  ): Promise<WithLastModified<CacheValue<IsFetch>> | null> {
     const cfEnv = getCloudflareContext().env;
     const kv = cfEnv.NEXT_CACHE_WORKERS_KV;
     const assets = cfEnv.ASSETS;
@@ -43,7 +60,7 @@ class Cache implements IncrementalCache {
         const kvKey = this.getKVKey(key, isFetch);
         entry = await kv.get(kvKey, "json");
         if (entry?.status === STATUS_DELETED) {
-          return {};
+          return null;
         }
       }
 
@@ -62,6 +79,17 @@ class Cache implements IncrementalCache {
           };
         }
       }
+
+      const entryValue = entry?.value as CachedFetchValue | undefined;
+      if (entryValue?.kind === "FETCH") {
+        const expires = entryValue.data.headers?.expires;
+        const expiresTime = new Date(expires as string).getTime();
+        if (!isNaN(expiresTime) && expiresTime <= Date.now()) {
+          this.debug(`found expired entry (expire time: ${expires})`);
+          return null;
+        }
+      }
+
       this.debug(entry ? `-> hit` : `-> miss`);
       return { value: entry?.value, lastModified: entry?.lastModified };
     } catch {