@leejpsd/nextjs-cache-handler 0.3.1 → 0.3.2

package/dist/index.cjs

@@ -989,47 +989,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
   };