Exported proxy and abort signal helper

Author: AyronK

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

@@ -18,7 +18,7 @@
     "next",
     "redis"
   ],
-  "version": "2.1.0-canary",
+  "version": "2.1.0-canary2",
   "type": "module",
   "license": "MIT",
   "description": "Next.js cache handlers",
@@ -34,6 +34,14 @@
     "./instrumentation": {
       "require": "./dist/instrumentation/instrumentation.cjs",
       "import": "./dist/instrumentation/instrumentation.js"
+    },
+    "./cluster/withProxy": {
+      "require": "./dist/helpers/withProxy.cjs",
+      "import": "./dist/helpers/withProxy.js"
+    },
+    "./helpers/withAbortSignal": {
+      "require": "./dist/helpers/withAbortSignal.cjs",
+      "import": "./dist/helpers/withAbortSignal.js"
     }
   },
   "typesVersions": {
@@ -55,6 +63,12 @@
       ],
       "redis-cluster-strings": [
         "dist/handlers/redis-cluster-strings.d.ts"
+      ],
+      "cluster/withProxy": [
+        "dist/helpers/withProxy.d.ts"
+      ],
+      "helpers/withAbortSignal": [
+        "dist/helpers/withAbortSignal.d.ts"
       ]
     }
   },

packages/nextjs-cache-handler/package.json

@@ -1,7 +1,7 @@
 import { Handler } from "./cache-handler.types";
 import { CreateRedisClusterStringsHandlerOptions } from "./redis-cluster-strings.types";
 import createRedisStringsHandler from "./redis-strings";
-import { withAbortSignalWrapper } from "../helpers/redisClusterProxy";
+import { withProxy } from "../helpers/redisClusterProxy";
 
 /**
  * Creates a Handler for handling cache operations using Redis Cluster strings.
@@ -23,7 +23,7 @@ export default function createHandler({
   ...options
 }: CreateRedisClusterStringsHandlerOptions): Handler {
   return createRedisStringsHandler({
-    client: withAbortSignalWrapper(client),
+    client: withProxy(client),
     ...options,
   });
 }

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

@@ -7,7 +7,7 @@ import {
   parseBuffersToStrings,
 } from "../helpers/buffer";
 import { RedisClientType, RedisClusterType } from "@redis/client";
-import { WithAbortSignalCluster } from "../helpers/redisClusterProxy";
+import { RedisClusterWithAbortSignal } from "../helpers/redisClusterProxy";
 
 /**
  * Creates a Handler for handling cache operations using Redis strings.
@@ -33,7 +33,7 @@ export default function createHandler({
   keyExpirationStrategy = "EXPIREAT",
   revalidateTagQuerySize = 10_000,
 }: CreateRedisStringsHandlerOptions<
-  RedisClientType | WithAbortSignalCluster<RedisClusterType>
+  RedisClientType | RedisClusterWithAbortSignal<RedisClusterType>
 >): Handler {
   function assertClientIsReady(): void {
     if (!client.isReady) {

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

@@ -1,28 +1,28 @@
 import type { RedisClusterType } from "@redis/client";
 import { withAbortSignal } from "./withAbortSignal";
 
-export type WithAbortSignalCluster<T extends RedisClusterType> = T & {
+export type RedisClusterWithAbortSignal<T extends RedisClusterType> = T & {
   withAbortSignal(signal: AbortSignal): T;
   isReady: boolean;
 };
 
-export function withAbortSignalWrapper<T extends RedisClusterType>(
-  client: T,
+export function withProxy<T extends RedisClusterType>(
+  cluster: T,
   defaultSignal?: AbortSignal,
-): WithAbortSignalCluster<T> {
+): RedisClusterWithAbortSignal<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(client, handler);
+          return new Proxy(cluster, handler);
         };
       }
 
       if (prop === "isReady") {
-        return client.isOpen;
+        return cluster.replicas.every((s) => s.client?.isReady);
       }
 
       const orig = Reflect.get(target, prop, receiver);
@@ -34,5 +34,5 @@ export function withAbortSignalWrapper<T extends RedisClusterType>(
     },
   };
 
-  return new Proxy(client, handler) as WithAbortSignalCluster<T>;
+  return new Proxy(cluster, handler) as RedisClusterWithAbortSignal<T>;
 }

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

@@ -2,7 +2,12 @@ import { defineConfig } from "tsup";
 
 export const tsup = defineConfig({
   name: "Build cache-handler",
-  entry: ["src/handlers/*.ts", "src/instrumentation/*.ts"],
+  entry: [
+    "src/handlers/*.ts",
+    "src/instrumentation/*.ts",
+    "src/helpers/redisClusterProxy.ts",
+    "src/helpers/withAbortSignal.ts",
+  ],
   splitting: false,
   outDir: "dist",
   clean: false,