F

Author: AyronK

packages/nextjs-cache-handler/package-lock.json

@@ -18,7 +18,7 @@
     "next",
     "redis"
   ],
-  "version": "2.1.0-canary6",
+  "version": "2.1.0-canary7",
   "type": "module",
   "license": "MIT",
   "description": "Next.js cache handlers",
@@ -42,6 +42,10 @@
     "./helpers/withAbortSignal": {
       "require": "./dist/helpers/withAbortSignal.cjs",
       "import": "./dist/helpers/withAbortSignal.js"
+    },
+    "./helpers/withAbortSignalProxy": {
+      "require": "./dist/helpers/withAbortSignalProxy.cjs",
+      "import": "./dist/helpers/withAbortSignalProxy.js"
     }
   },
   "typesVersions": {
@@ -66,6 +70,9 @@
       ],
       "helpers/withAbortSignal": [
         "dist/helpers/withAbortSignal.d.ts"
+      ],
+      "helpers/withAbortSignalProxy": [
+        "dist/helpers/withAbortSignalProxy.d.ts"
       ]
     }
   },

packages/nextjs-cache-handler/package.json

@@ -6,8 +6,9 @@ import {
   convertStringsToBuffers,
   parseBuffersToStrings,
 } from "../helpers/buffer";
-import { RedisClientType } from "@redis/client";
+import type { RedisClientType } from "@redis/client";
 import { RedisClusterCacheProxy } from "../helpers/redisClusterProxy";
+import { withAbortSignalProxy } from "../helpers/withAbortSignalProxy";
 
 /**
  * Creates a Handler for handling cache operations using Redis strings.
@@ -25,7 +26,7 @@ import { RedisClusterCacheProxy } from "../helpers/redisClusterProxy";
  * - The `revalidateTag` and `delete` methods handle cache revalidation and deletion.
  */
 export default function createHandler({
-  client,
+  client: innerClient,
   keyPrefix = "",
   sharedTagsKey = "__sharedTags__",
   sharedTagsTtlKey = "__sharedTagsTtl__",
@@ -35,6 +36,8 @@ export default function createHandler({
 }: CreateRedisStringsHandlerOptions<
   RedisClientType | RedisClusterCacheProxy
 >): Handler {
+  const client = withAbortSignalProxy(innerClient);
+
   function assertClientIsReady(): void {
     if (!client.isReady) {
       throw new Error(

packages/nextjs-cache-handler/src/handlers/redis-strings.ts

@@ -1,36 +1,19 @@
 import type { RedisClusterType } from "@redis/client";
-import { withAbortSignal } from "./withAbortSignal";
 
 export type RedisClusterCacheProxy = RedisClusterType & {
-  withAbortSignal(signal: AbortSignal): RedisClusterType;
   isReady: boolean;
 };
 
 export function withProxy<T extends RedisClusterType>(
   cluster: RedisClusterType,
-  defaultSignal?: AbortSignal,
 ): RedisClusterCacheProxy {
-  let signal: AbortSignal | undefined = defaultSignal;
-
   const handler: ProxyHandler<T> = {
     get(target, prop, receiver) {
-      if (prop === "withAbortSignal") {
-        return (s: AbortSignal) => {
-          signal = s;
-          return new Proxy(cluster, handler);
-        };
-      }
-
       if (prop === "isReady") {
         return cluster.replicas.every((s) => s.client?.isReady);
       }
 
-      const orig = Reflect.get(target, prop, receiver);
-
-      if (typeof orig !== "function") return orig;
-
-      return (...args: unknown[]) =>
-        withAbortSignal(() => (orig as Function).apply(target, args), signal);
+      return Reflect.get(target, prop, receiver);
     },
   };
 

packages/nextjs-cache-handler/src/helpers/redisClusterProxy.ts

@@ -0,0 +1,32 @@
+import { withAbortSignal } from "./withAbortSignal";
+
+export type WithAbortSignalProxy<T> = T & {
+  withAbortSignal(signal: AbortSignal): T;
+};
+
+export function withAbortSignalProxy<T extends object>(
+  obj: T,
+  defaultSignal?: AbortSignal,
+): WithAbortSignalProxy<T> {
+  let signal: AbortSignal | undefined = defaultSignal;
+
+  const handler: ProxyHandler<T> = {
+    get(target, prop, receiver) {
+      if (prop === "withAbortSignal") {
+        return (s: AbortSignal) => {
+          signal = s;
+          return new Proxy(obj, handler);
+        };
+      }
+
+      const orig = Reflect.get(target, prop, receiver);
+
+      if (typeof orig !== "function") return orig;
+
+      return (...args: unknown[]) =>
+        withAbortSignal(() => (orig as Function).apply(target, args), signal);
+    },
+  };
+
+  return new Proxy(obj, handler) as WithAbortSignalProxy<T>;
+}

packages/nextjs-cache-handler/src/helpers/withAbortSignalProxy.ts

@@ -7,6 +7,7 @@ export const tsup = defineConfig({
     "src/instrumentation/*.ts",
     "src/helpers/redisClusterProxy.ts",
     "src/helpers/withAbortSignal.ts",
+    "src/helpers/withAbortSignalProxy.ts",
   ],
   splitting: false,
   outDir: "dist",