@trieb.work/nextjs-turbo-redis-cache 1.15.1 → 1.16.1

package/dist/index.mjs

@@ -524,6 +524,19 @@ if (process.env.DEBUG_CACHE_HANDLER) {
 }
 var NEXT_CACHE_IMPLICIT_TAG_ID = "_N_T_";
 var REVALIDATED_TAGS_KEY = "__revalidated_tags__";
+var SUPPORTED_GET_KINDS = [
+  "APP_ROUTE",
+  "APP_PAGE",
+  "PAGES",
+  "FETCH"
+];
+var SUPPORTED_SET_KINDS = [
+  "APP_ROUTE",
+  "APP_PAGE",
+  "PAGES",
+  "REDIRECT",
+  "FETCH"
+];
 var killContainerOnErrorCount = 0;
 var RedisStringsHandler = class {
   constructor({
@@ -689,12 +702,12 @@ var RedisStringsHandler = class {
   }
   async get(key, ctx) {
     try {
-      if (ctx.kind !== "APP_ROUTE" && ctx.kind !== "APP_PAGE" && ctx.kind !== "FETCH") {
+      if (!SUPPORTED_GET_KINDS.includes(ctx.kind)) {
         console.warn(
           "RedisStringsHandler.get() called with",
           key,
           ctx,
-          " this cache handler is only designed and tested for kind APP_ROUTE and APP_PAGE and not for kind ",
+          `this cache handler is only designed and tested for kinds ${SUPPORTED_GET_KINDS.join(", ")} and not for kind`,
           ctx?.kind
         );
       }
@@ -749,7 +762,7 @@ var RedisStringsHandler = class {
           "cacheEntry is mall formed (missing tags)"
         );
       }
-      if (!cacheEntry?.value) {
+      if (cacheEntry?.value === void 0) {
         console.warn(
           "RedisStringsHandler.get() called with",
           key,
@@ -822,21 +835,27 @@ var RedisStringsHandler = class {
   }
   async set(key, data, ctx) {
     try {
-      if (data.kind !== "APP_ROUTE" && data.kind !== "APP_PAGE" && data.kind !== "FETCH") {
+      if (data !== null && !SUPPORTED_SET_KINDS.includes(data.kind)) {
         console.warn(
           "RedisStringsHandler.set() called with",
           key,
           ctx,
           data,
-          " this cache handler is only designed and tested for kind APP_ROUTE and APP_PAGE and not for kind ",
+          `this cache handler is only designed and tested for kinds ${SUPPORTED_SET_KINDS.join(", ")} and not for kind`,
           data?.kind
         );
       }
       await this.assertClientIsReady();
-      if (data.kind === "APP_PAGE" || data.kind === "APP_ROUTE") {
+      if (data?.kind === "APP_PAGE" || data?.kind === "APP_ROUTE") {
         const tags = data.headers["x-next-cache-tags"]?.split(",");
         ctx.tags = [...ctx.tags || [], ...tags || []];
       }
+      if (data === null || data.kind === "PAGES" || data.kind === "REDIRECT") {
+        const implicitTag = NEXT_CACHE_IMPLICIT_TAG_ID + key;
+        if (!ctx.tags?.includes(implicitTag)) {
+          ctx.tags = [...ctx.tags || [], implicitTag];
+        }
+      }
       const cacheEntry = {
         lastModified: Date.now(),
         tags: ctx?.tags || [],
@@ -851,7 +870,10 @@ var RedisStringsHandler = class {
       }
       const revalidate = (
         // For fetch requests in newest versions, the revalidate context property is never used, and instead the revalidate property of the passed-in data is used
-        data.kind === "FETCH" && data.revalidate || ctx.revalidate || ctx.cacheControl?.revalidate || data?.revalidate
+        data?.kind === "FETCH" && data.revalidate || ctx.revalidate || ctx.cacheControl?.revalidate || // Legacy fallback: older Next.js versions attached `revalidate` directly
+        // to the data payload. FETCH is already handled above, so this only
+        // matters for those older, non-discriminated shapes.
+        data?.revalidate
       );
       const expireAt = revalidate && Number.isSafeInteger(revalidate) && revalidate > 0 ? this.estimateExpireAge(revalidate) : this.estimateExpireAge(this.defaultStaleAge);
       const setOperation = redisErrorHandler(
@@ -1404,7 +1426,22 @@ function getRedisCacheComponentsHandler(options = {}) {
   }
   return singletonHandler;
 }
-var redisCacheHandler = getRedisCacheComponentsHandler();
+var resolvedHandler;
+var redisCacheHandler = new Proxy(
+  {},
+  {
+    get(_target, prop) {
+      if (!resolvedHandler) {
+        resolvedHandler = getRedisCacheComponentsHandler();
+      }
+      const value = resolvedHandler[prop];
+      return typeof value === "function" ? value.bind(resolvedHandler) : value;
+    },
+    has(_target, prop) {
+      return prop in RedisCacheComponentsHandler.prototype;
+    }
+  }
+);
 
 // src/index.ts
 var index_default = CachedHandler;