From c022d76d6a7057990039a9fe2e1de5e282c4bc14 Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sebastian@calyptus.eu>
Date: Sat, 19 Oct 2024 15:48:26 -0400
Subject: [PATCH] Check tag staleness against the timestamp of the entry

Not current time
---
 .../next/src/server/lib/cache-handlers/default.ts    | 12 ++++++------
 .../server/lib/incremental-cache/tags-manifest.ts    |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/next/src/server/lib/cache-handlers/default.ts b/packages/next/src/server/lib/cache-handlers/default.ts
index ac103340ad2bc..eae1c576b196c 100644
--- a/packages/next/src/server/lib/cache-handlers/default.ts
+++ b/packages/next/src/server/lib/cache-handlers/default.ts
@@ -34,9 +34,6 @@ const DefaultCacheHandler: CacheHandler = {
   async get(cacheKey, softTags) {
     await pendingSets.get(cacheKey)
 
-    if (isTagStale(softTags)) {
-      return
-    }
     const privateEntry = memoryCache.get(cacheKey)
 
     if (!privateEntry) {
@@ -50,11 +47,14 @@ const DefaultCacheHandler: CacheHandler = {
     ) {
       // In memory caches should expire after revalidate time because it is unlikely that
       // a new entry will be able to be used before it is dropped from the cache.
-      return
+      return undefined
     }
 
-    if (isTagStale(entry.tags || [])) {
-      return
+    if (
+      isTagStale(entry.tags, entry.timestamp) ||
+      isTagStale(softTags, entry.timestamp)
+    ) {
+      return undefined
     }
     const [returnStream, newSaved] = entry.value.tee()
     entry.value = newSaved
diff --git a/packages/next/src/server/lib/incremental-cache/tags-manifest.ts b/packages/next/src/server/lib/incremental-cache/tags-manifest.ts
index 824eb395b1745..73804fa1d2b94 100644
--- a/packages/next/src/server/lib/incremental-cache/tags-manifest.ts
+++ b/packages/next/src/server/lib/incremental-cache/tags-manifest.ts
@@ -8,13 +8,13 @@ export const tagsManifest: TagsManifest = {
   items: {},
 }
 
-export const isTagStale = (tags: string[]) => {
+export const isTagStale = (tags: string[], timestamp: number) => {
   for (const tag of tags) {
     const tagEntry = tagsManifest.items[tag]
     if (
       typeof tagEntry?.revalidatedAt === 'number' &&
       // TODO: use performance.now and update file-system-cache?
-      tagEntry.revalidatedAt >= Date.now()
+      tagEntry.revalidatedAt >= timestamp
     ) {
       return true
     }