@leejpsd/nextjs-cache-handler 0.4.0 → 0.4.2

package/dist/index.cjs

@@ -528,7 +528,7 @@ return 1
 `;
 
 // src/shared/lua/revalidate-hard.lua
-var revalidate_hard_default = "-- revalidate-hard.lua\n--\n-- Atomically remove every entry referenced by a tag and stamp the tag's\n-- expiration marker. Used by `updateTags(tags, { expire: 0 })` \u2014 the hard\n-- invalidation path triggered by `updateTag()` server actions in Next.js 16.\n--\n-- KEYS[1]   : tag set key (e.g. \"next-cache:tag:posts\")\n-- KEYS[2]   : tag-expiration marker key (e.g. \"next-cache:tag-expiration:posts\")\n-- ARGV[1]   : current timestamp in milliseconds\n-- ARGV[2]   : marker TTL in seconds (default: 1 day so cross-deployment\n--             readers can still observe the invalidation)\n--\n-- Returns: number of entries that were deleted.\n\nlocal tagKey = KEYS[1]\nlocal markerKey = KEYS[2]\nlocal nowMs = ARGV[1]\nlocal markerTtl = tonumber(ARGV[2])\n\nlocal entries = redis.call('SMEMBERS', tagKey)\nlocal deleted = 0\n\nif #entries > 0 then\n  -- DEL accepts varargs; unpack the entry list.\n  redis.call('DEL', unpack(entries))\n  deleted = #entries\nend\n\n-- Drop the tag set itself; on next SET it'll be recreated by set-with-tags.\nredis.call('DEL', tagKey)\n\n-- Stamp the invalidation timestamp. Readers compare this against an entry's\n-- timestamp inside `getExpiration` to decide whether soft-tag-only entries\n-- should be considered stale.\nredis.call('SET', markerKey, nowMs, 'EX', markerTtl)\n\nreturn deleted\n";
+var revalidate_hard_default = "-- revalidate-hard.lua\n--\n-- Atomically remove every entry referenced by a tag and stamp the tag's\n-- expiration marker. Used by the hard invalidation path \u2014 `updateTags(tags)`\n-- with no durations (updateTag(), single-arg revalidateTag()) or an explicit\n-- `{ expire: 0 }`.\n--\n-- KEYS[1]   : tag set key (e.g. \"next-cache:tag:posts\")\n-- KEYS[2]   : tag-expiration marker key (e.g. \"next-cache:tag-expiration:posts\")\n-- ARGV[1]   : marker value \"<staleMs>|<expiredMs>\" (hard: both equal)\n-- ARGV[2]   : marker TTL in seconds (default: 1 day so cross-deployment\n--             readers can still observe the invalidation)\n--\n-- Returns: number of entries that were deleted.\n\nlocal tagKey = KEYS[1]\nlocal markerKey = KEYS[2]\nlocal marker = ARGV[1]\nlocal markerTtl = tonumber(ARGV[2])\n\nlocal entries = redis.call('SMEMBERS', tagKey)\nlocal deleted = 0\n\nif #entries > 0 then\n  -- DEL accepts varargs; unpack the entry list.\n  redis.call('DEL', unpack(entries))\n  deleted = #entries\nend\n\n-- Drop the tag set itself; on next SET it'll be recreated by set-with-tags.\nredis.call('DEL', tagKey)\n\n-- Stamp the invalidation timestamp. Readers compare this against an entry's\n-- timestamp inside `getExpiration` to decide whether soft-tag-only entries\n-- should be considered stale.\nredis.call('SET', markerKey, marker, 'EX', markerTtl)\n\nreturn deleted\n";
 
 // src/shared/lua/refresh-tag-lock.lua
 var refresh_tag_lock_default = `-- refresh-tag-lock.lua
@@ -883,6 +883,23 @@ var DEFAULT_LOCK_TTL_SEC = 10;
 var ONE_YEAR_SEC = 60 * 60 * 24 * 365;
 var FALLBACK_TTL_SEC = 3600;
 var TAG_EXP_MARKER_TTL_SEC = 60 * 60 * 24 * 7;
+function encodeTagMarker(state) {
+  return `${state.s}|${state.e === Infinity ? "inf" : state.e}`;
+}
+function decodeTagMarker(raw) {
+  const s = Number.parseInt(raw, 10);
+  if (!Number.isFinite(s)) return null;
+  const sep = raw.indexOf("|");
+  if (sep === -1) return { s, e: s };
+  const tail = raw.slice(sep + 1);
+  if (tail === "inf") return { s, e: Infinity };
+  const e = Number.parseInt(tail, 10);
+  return { s, e: Number.isFinite(e) ? e : s };
+}
+function mergeTagState(map, tag, next) {
+  const prev = map.get(tag);
+  if (!prev || next.s > prev.s) map.set(tag, next);
+}
 function gateRedis(state) {
   const fb = state.opts.fallback;
   const ibp = state.opts.rest.isBuildPhase;
@@ -1067,21 +1084,17 @@ async function getImpl(state, cacheKey, softTags) {
   const freshnessTags = softTags.length > 0 ? [...softTags, ...envelope.tags] : envelope.tags;
   let tagStale = false;
   if (freshnessTags.length > 0) {
-    let mostRecent = 0;
+    const now = Date.now();
     for (const t of freshnessTags) {
-      const ts = Math.max(
-        state.localTagTimestamps.get(t) ?? 0,
-        state.memTagExp.get(t) ?? 0
-      );
-      if (ts > mostRecent) mostRecent = ts;
-    }
-    if (mostRecent > envelope.timestamp) {
-      if (state.opts.staleWhileRevalidate && partition.freshness !== "expired") {
-        tagStale = true;
-      } else {
+      const local = state.localTagTimestamps.get(t);
+      const mem = state.memTagExp.get(t);
+      const st = local && mem ? local.s >= mem.s ? local : mem : local ?? mem;
+      if (!st || st.s <= envelope.timestamp) continue;
+      if (now >= st.e || partition.freshness === "expired") {
         state.emit({ type: "cache.miss", meta: { reason: "tag-invalidated" } });
         return void 0;
       }
+      tagStale = true;
     }
   }
   const freshness = tagStale ? "stale" : partition.freshness;
@@ -1108,15 +1121,13 @@ async function getImpl(state, cacheKey, softTags) {
       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: outTimestamp,
+    timestamp: envelope.timestamp,
     expire: envelope.expire,
-    revalidate: envelope.revalidate
+    revalidate: tagStale ? -1 : envelope.revalidate
   };
 }
 async function setImpl(state, cacheKey, pendingEntry) {
@@ -1130,6 +1141,10 @@ async function setImpl(state, cacheKey, pendingEntry) {
     state.emit({ type: "cache.set.failed", meta: { reason: "pending-rejected" } });
     return;
   }
+  if (entry.expire === 0 && !process.env.__NEXT_DEV_SERVER) {
+    state.emit({ type: "cache.set.skipped", meta: { reason: "dynamic-entry" } });
+    return;
+  }
   let buf;
   try {
     buf = await readStreamFully(entry.value);
@@ -1235,11 +1250,13 @@ async function ensureTagSubscription(state) {
         try {
           const parsed = JSON.parse(message);
           if (!Array.isArray(parsed.t) || typeof parsed.ts !== "number") return;
+          const incoming = {
+            s: parsed.ts,
+            e: typeof parsed.e === "number" ? parsed.e : Infinity
+          };
           for (const tag of parsed.t) {
-            const prev = state.localTagTimestamps.get(tag) ?? 0;
-            if (parsed.ts > prev) state.localTagTimestamps.set(tag, parsed.ts);
-            const prevMem = state.memTagExp.get(tag) ?? 0;
-            if (parsed.ts > prevMem) state.memTagExp.set(tag, parsed.ts);
+            mergeTagState(state.localTagTimestamps, tag, incoming);
+            mergeTagState(state.memTagExp, tag, incoming);
           }
           pruneOldestByTimestamp(state.localTagTimestamps, MAX_LOCAL_TAG_ENTRIES);
           pruneOldestByTimestamp(state.memTagExp, MAX_LOCAL_TAG_ENTRIES);
@@ -1291,17 +1308,17 @@ async function refreshTagsImpl(state) {
           for (let i = 0; i < keys.length; i += 1) {
             const v = values[i];
             if (!v) continue;
-            const ts = Number.parseInt(v, 10);
-            if (!Number.isFinite(ts)) continue;
+            const st = decodeTagMarker(v);
+            if (!st) continue;
             const key = keys[i];
             if (key === void 0) continue;
             const tag = stripExpPrefix(state, key);
-            if (tag) fresh.set(tag, ts);
+            if (tag) fresh.set(tag, st);
           }
         }
-        for (const [tag, ts] of state.localTagTimestamps) {
-          if (ts >= scanStartMs && (fresh.get(tag) ?? 0) < ts) {
-            fresh.set(tag, ts);
+        for (const [tag, st] of state.localTagTimestamps) {
+          if (st.s >= scanStartMs && (fresh.get(tag)?.s ?? 0) < st.s) {
+            fresh.set(tag, st);
           }
         }
         state.localTagTimestamps = fresh;
@@ -1319,7 +1336,7 @@ function escapeMatch(s) {
 var MAX_LOCAL_TAG_ENTRIES = 1e4;
 function pruneOldestByTimestamp(map, maxEntries) {
   if (map.size <= maxEntries) return;
-  const byAge = [...map.entries()].sort((a, b) => a[1] - b[1]);
+  const byAge = [...map.entries()].sort((a, b) => a[1].s - b[1].s);
   const drop = map.size - maxEntries;
   for (let i = 0; i < drop; i += 1) {
     const entry = byAge[i];
@@ -1336,9 +1353,9 @@ async function getExpirationImpl(state, tags) {
   let max = 0;
   for (const t of tags) {
     const local = state.localTagTimestamps.get(t);
-    if (local !== void 0 && local > max) max = local;
+    if (local && Number.isFinite(local.e) && local.e > max) max = local.e;
     const mem = state.memTagExp.get(t);
-    if (mem !== void 0 && mem > max) max = mem;
+    if (mem && Number.isFinite(mem.e) && mem.e > max) max = mem.e;
   }
   if (max > 0) {
     state.emit({ type: "tag.expiration.read", meta: { source: "local", count: tags.length } });
@@ -1359,8 +1376,8 @@ async function getExpirationImpl(state, tags) {
         let m = 0;
         for (const v of values) {
           if (!v) continue;
-          const n = Number.parseInt(v, 10);
-          if (Number.isFinite(n) && n > m) m = n;
+          const st = decodeTagMarker(v);
+          if (st && Number.isFinite(st.e) && st.e > m) m = st.e;
         }
         return m;
       }
@@ -1371,11 +1388,14 @@ async function getExpirationImpl(state, tags) {
 }
 async function updateTagsImpl(state, tags, durations) {
   if (tags.length === 0) return;
-  const isHardExpire = durations?.expire === 0;
+  const isHardExpire = durations === void 0 || durations.expire === 0;
   const now = Date.now();
+  const deadline = isHardExpire ? now : durations.expire !== void 0 && Number.isFinite(durations.expire) ? now + durations.expire * 1e3 : Infinity;
+  const tagState = { s: now, e: deadline };
+  const marker = encodeTagMarker(tagState);
   for (const t of tags) {
-    state.localTagTimestamps.set(t, now);
-    state.memTagExp.set(t, now);
+    mergeTagState(state.localTagTimestamps, t, tagState);
+    mergeTagState(state.memTagExp, t, tagState);
   }
   pruneOldestByTimestamp(state.memTagExp, MAX_LOCAL_TAG_ENTRIES);
   if (!gateRedis(state)) {
@@ -1413,8 +1433,8 @@ async function updateTagsImpl(state, tags, durations) {
               client,
               "revalidateHard",
               [tagKey(state, t), tagExpKey(state, t)],
-              [String(now), String(TAG_EXP_MARKER_TTL_SEC)]
-            ) : client.set(tagExpKey(state, t), String(now), {
+              [marker, String(TAG_EXP_MARKER_TTL_SEC)]
+            ) : client.set(tagExpKey(state, t), marker, {
               EX: TAG_EXP_MARKER_TTL_SEC
             })
           )
@@ -1430,7 +1450,9 @@ async function updateTagsImpl(state, tags, durations) {
         const client = await state.conn.getOrConnect();
         await client?.publish?.(
           invalChannel(state),
-          JSON.stringify({ t: tags, ts: now })
+          JSON.stringify(
+            deadline === Infinity ? { t: tags, ts: now } : { t: tags, ts: now, e: deadline }
+          )
         );
       } catch {
       }
@@ -1472,11 +1494,12 @@ function isEnvelope(value) {
 function isLegacyBufferShape(value) {
   return typeof value === "object" && value !== null && value.type === "Buffer" && Array.isArray(value.data);
 }
-function replacer(_key, value) {
-  if (Buffer.isBuffer(value)) {
+function replacer(key, value) {
+  const raw = this[key];
+  if (Buffer.isBuffer(raw)) {
     const env = {
       __type: "Buffer",
-      data: value.toString("base64")
+      data: raw.toString("base64")
     };
     return env;
   }