fix: tests and ci

Author: tilman

.github/workflows/ci.yml

@@ -59,10 +59,10 @@ jobs:
         run: redis-cli config set notify-keyspace-events Exe
 
       - name: Install Integration Test Project
-        run: cd test/integration/next-app && pnpm install
+        run: cd test/integration/next-app-15-3-2 && pnpm install
 
       - name: Build Integration Test Project
-        run: cd test/integration/next-app && pnpm build
+        run: cd test/integration/next-app-15-3-2 && pnpm build
 
       - name: Run tests
         run: pnpm test

src/ZodHandler.ts

@@ -0,0 +1,45 @@
+/**
+ * This handler is used to validate the arguments of the get, set, revalidateTag methods against a zod schema.
+ * This is mainly used to test new nextjs versions and to ensure that the arguments are still valid. As we
+ * saw in the past, that arguments against the cache handler changed between different nextjs versions very often (even between patch versions).
+ */
+
+import RedisStringsHandler, {
+  CreateRedisStringsHandlerOptions,
+} from './RedisStringsHandler';
+import { debugVerbose } from './utils/debug';
+
+let cachedHandler: RedisStringsHandler;
+
+export default class CachedHandler {
+  constructor(options: CreateRedisStringsHandlerOptions) {
+    if (!cachedHandler) {
+      console.log('created cached handler');
+      cachedHandler = new RedisStringsHandler(options);
+    }
+  }
+  get(
+    ...args: Parameters<RedisStringsHandler['get']>
+  ): ReturnType<RedisStringsHandler['get']> {
+    debugVerbose('CachedHandler.get called with', args);
+    return cachedHandler.get(...args);
+  }
+  set(
+    ...args: Parameters<RedisStringsHandler['set']>
+  ): ReturnType<RedisStringsHandler['set']> {
+    debugVerbose('CachedHandler.set called with', args);
+    return cachedHandler.set(...args);
+  }
+  revalidateTag(
+    ...args: Parameters<RedisStringsHandler['revalidateTag']>
+  ): ReturnType<RedisStringsHandler['revalidateTag']> {
+    debugVerbose('CachedHandler.revalidateTag called with', args);
+    return cachedHandler.revalidateTag(...args);
+  }
+  resetRequestCache(
+    ...args: Parameters<RedisStringsHandler['resetRequestCache']>
+  ): ReturnType<RedisStringsHandler['resetRequestCache']> {
+    // debug("CachedHandler.resetRequestCache called with", args);
+    return cachedHandler.resetRequestCache(...args);
+  }
+}

test/integration/nextjs-cache-handler.integration.test.ts

@@ -6,8 +6,8 @@ import { join } from 'path';
 import { CacheEntry } from '../../src/RedisStringsHandler';
 import { revalidate as next1503_revalidatedFetch_route } from './next-app-15-0-3/src/app/api/revalidated-fetch/route';
 
-const NEXT_APP_DIR = join(__dirname, 'next-app-15-0-3');
-// const NEXT_APP_DIR = join(__dirname, 'next-app-15-3-2');
+// const NEXT_APP_DIR = join(__dirname, 'next-app-15-0-3');
+const NEXT_APP_DIR = join(__dirname, 'next-app-15-3-2');
 console.log('NEXT_APP_DIR', NEXT_APP_DIR);
 const NEXT_START_PORT = 3055;
 const NEXT_START_URL = `http://localhost:${NEXT_START_PORT}`;