@leejpsd/nextjs-cache-handler 0.3.1 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.2
+
+### Patch Changes
+
+- [`6f35ff3`](https://github.com/leejpsd/nextjs-cache-handler/commit/6f35ff3d6eb6d84a842b8afc2677ae2545e2deba) Thanks [@leejpsd](https://github.com/leejpsd)! - Fix: soft revalidation of explicit `cacheTag()` tags — `revalidateTag(tag, "max")` — was a no-op on time-fresh entries. `get()` now folds the entry's own tags into the freshness check and serves tag-invalidated entries as stale-while-revalidate (backdated past `revalidate` so Next schedules a background re-render), matching the spec's soft-invalidation semantics. Hard invalidation (`{ expire: 0 }`) was already correct. Thanks to @eveyrat for the report (#1) and @unitedworldwrestling for the fix approach (#2).
+
 ## 0.3.1
 
 ### Patch Changes

package/dist/cache-components/index.cjs

@@ -975,47 +975,54 @@ async function getImpl(state, cacheKey, softTags) {
     });
     return void 0;
   }
-  if (softTags.length > 0) {
+  const freshnessTags = softTags.length > 0 ? [...softTags, ...envelope.tags] : envelope.tags;
+  let tagStale = false;
+  if (freshnessTags.length > 0) {
     let mostRecent = 0;
-    for (const t of softTags) {
+    for (const t of freshnessTags) {
       const ts = state.localTagTimestamps.get(t);
       if (ts !== void 0 && ts > mostRecent) mostRecent = ts;
     }
     if (mostRecent > envelope.timestamp) {
-      state.emit({
-        type: "cache.miss",
-        meta: { reason: "soft-tag-invalidated" }
-      });
-      return void 0;
+      if (state.opts.staleWhileRevalidate && partition.freshness !== "expired") {
+        tagStale = true;
+      } else {
+        state.emit({ type: "cache.miss", meta: { reason: "tag-invalidated" } });
+        return void 0;
+      }
     }
   }
-  if (partition.freshness === "stale") {
+  const freshness = tagStale ? "stale" : partition.freshness;
+  if (freshness === "stale") {
+    const staleMeta = tagStale ? { freshness, reason: "tag-invalidated" } : { freshness };
     if (state.opts.singleFlight) {
       const isLeader = await tryAcquireRefreshLock(state, cacheKey);
       state.emit({
         type: isLeader ? "cache.stale.refresh.leader" : "cache.stale.refresh.follower",
         ms: Date.now() - start,
-        meta: { freshness: partition.freshness }
+        meta: staleMeta
       });
     } else {
       state.emit({
         type: "cache.stale",
         ms: Date.now() - start,
-        meta: { freshness: partition.freshness }
+        meta: staleMeta
       });
     }
   } else {
     state.emit({
       type: "cache.hit",
       ms: Date.now() - start,
-      meta: { freshness: partition.freshness }
+      meta: { freshness }
     });
   }
+  const revalidateMs = Math.max(0, envelope.revalidate) * 1e3;
+  const outTimestamp = tagStale ? Math.min(envelope.timestamp, Date.now() - revalidateMs - 1) : envelope.timestamp;
   return {
     value: bufferToStream(Buffer.from(envelope.value, "base64")),
     tags: envelope.tags,
     stale: envelope.stale,
-    timestamp: envelope.timestamp,
+    timestamp: outTimestamp,
     expire: envelope.expire,
     revalidate: envelope.revalidate
   };