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

package/src/RedisStringsHandler.ts

@@ -444,21 +444,32 @@ export default class RedisStringsHandler {
         'assertClientIsReady called more than 10 times without being ready.',
       );
     }
-    await Promise.race([
-      Promise.all([
-        this.sharedTagsMap.waitUntilReady(),
-        this.revalidatedTagsMap.waitUntilReady(),
-      ]),
-      new Promise((_, reject) =>
-        setTimeout(() => {
-          reject(
-            new Error(
-              'assertClientIsReady: Timeout waiting for Redis maps to be ready',
-            ),
-          );
-        }, 30_000),
-      ),
-    ]);
+    let readyTimeout: ReturnType<typeof setTimeout> | undefined;
+    try {
+      await Promise.race([
+        Promise.all([
+          this.sharedTagsMap.waitUntilReady(),
+          this.revalidatedTagsMap.waitUntilReady(),
+        ]),
+        new Promise((_, reject) => {
+          readyTimeout = setTimeout(() => {
+            reject(
+              new Error(
+                'assertClientIsReady: Timeout waiting for Redis maps to be ready',
+              ),
+            );
+          }, 30_000);
+        }),
+      ]);
+    } finally {
+      // Always clear the timeout: once the race is won (the common case after
+      // the initial sync), the timer would otherwise stay pending for the full
+      // 30s. Timers capture the ambient async context (AsyncLocalStorage),
+      // so in a Next.js server every leaked timer pins the request's store —
+      // and with it the whole response object graph — for at least 30s on
+      // every single cache operation.
+      clearTimeout(readyTimeout);
+    }
     this.clientReadyCalls = 0;
     if (!this.client.isReady) {
       throw new Error(

package/test/README.md

@@ -55,7 +55,7 @@ These tests spawn a real Next.js server as a child process, make `fetch()` reque
 
 ### Standard Integration (`nextjs-cache-handler.integration.test.ts`)
 
-Full cache lifecycle: static pages, fetch caching, revalidation, tag invalidation, TTL behavior. In CI this runs against a matrix of Next.js versions (15.4–16.2).
+Full cache lifecycle: static pages, fetch caching, revalidation, tag invalidation, TTL behavior. In CI this runs against Next.js 15.4, 16.0, 16.2, and 16.3. Nested fetch entries are resolved from their explicit cache tag in Redis's shared-tags map rather than Next.js's internal fetch-key hash, which changed in Next.js 16.3.
 
 ```bash
 pnpm test:integration
@@ -63,7 +63,7 @@ pnpm test:integration
 
 ### Pages Router (`pages-router.integration.test.ts`)
 
-Pages Router cache lifecycle against the `next-pages-16-2-6` app: `PAGES` entry format, TTL derivation from `getStaticProps` `revalidate`, `fallback: 'blocking'` first hits, `notFound: true` (null cache entries), `redirect:` results, and `revalidate: false` TTL fallback.
+Pages Router cache lifecycle against the `next-pages-16-2-6` and `next-pages-16-3-0` apps: `PAGES` entry format, TTL derivation from `getStaticProps` `revalidate`, `fallback: 'blocking'` first hits, `notFound: true` (null cache entries), `redirect:` results, and `revalidate: false` TTL fallback.
 
 Starts **two** `next start` instances of the same build sharing one Redis and proves that on-demand revalidation (`res.revalidate(path)`) triggered on instance A is served fresh by instance B (HTML and `/_next/data` pageData JSON) — the multi-instance ISR scenario behind a load balancer.
 
@@ -81,7 +81,7 @@ pnpm test:integration:build-id-prefix
 
 ### Cache Components (`cache-components/`)
 
-Integration tests specific to Next.js 16 Cache Components (`use cache`). Uses `next-app-16-2-6-cache-components` as the test app.
+Integration tests specific to Next.js 16 Cache Components (`use cache`). CI runs them against the 16.0, 16.2, and 16.3 Cache Components test apps.
 
 | File                                   | What it tests                                                                                          |
 | -------------------------------------- | ------------------------------------------------------------------------------------------------------ |

package/test/nextjs-test-projects/next-app-15-4-11/pnpm-lock.yaml

@@ -492,7 +492,7 @@ packages:
   '@trieb.work/nextjs-turbo-redis-cache@file:../../..':
     resolution: {directory: ../../.., type: directory}
     peerDependencies:
-      next: '>=15.0.3 <16.3.0'
+      next: '>=15.0.3 <17.0.0'
       redis: 4.7.0
 
   '@tybys/wasm-util@0.9.0':

package/test/nextjs-test-projects/next-app-16-0-11/pnpm-lock.yaml

@@ -561,7 +561,7 @@ packages:
   '@trieb.work/nextjs-turbo-redis-cache@file:../../..':
     resolution: {directory: ../../.., type: directory}
     peerDependencies:
-      next: '>=15.0.3 <16.3.0'
+      next: '>=15.0.3 <17.0.0'
       redis: 4.7.0
 
   '@tybys/wasm-util@0.10.1':

package/test/nextjs-test-projects/next-app-16-0-11-cache-components/pnpm-lock.yaml

@@ -568,7 +568,7 @@ packages:
   '@trieb.work/nextjs-turbo-redis-cache@file:../../..':
     resolution: {directory: ../../.., type: directory}
     peerDependencies:
-      next: '>=15.0.3 <16.3.0'
+      next: '>=15.0.3 <17.0.0'
       redis: 4.7.0
 
   '@tybys/wasm-util@0.10.2':

package/test/nextjs-test-projects/next-app-16-2-6/pnpm-lock.yaml

@@ -561,7 +561,7 @@ packages:
   '@trieb.work/nextjs-turbo-redis-cache@file:../../..':
     resolution: {directory: ../../.., type: directory}
     peerDependencies:
-      next: '>=15.0.3 <16.3.0'
+      next: '>=15.0.3 <17.0.0'
       redis: 4.7.0
 
   '@tybys/wasm-util@0.10.1':

package/test/nextjs-test-projects/next-app-16-2-6-cache-components/pnpm-lock.yaml

@@ -561,7 +561,7 @@ packages:
   '@trieb.work/nextjs-turbo-redis-cache@file:../../..':
     resolution: {directory: ../../.., type: directory}
     peerDependencies:
-      next: '>=15.0.3 <16.3.0'
+      next: '>=15.0.3 <17.0.0'
       redis: 4.7.0
 
   '@tybys/wasm-util@0.10.1':

package/test/nextjs-test-projects/next-app-16-3-0/README.md

@@ -0,0 +1,36 @@
+This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
+
+## Getting Started
+
+First, run the development server:
+
+```bash
+npm run dev
+# or
+yarn dev
+# or
+pnpm dev
+# or
+bun dev
+```
+
+Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+
+You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
+
+This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
+
+## Learn More
+
+To learn more about Next.js, take a look at the following resources:
+
+- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
+- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+
+You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
+
+## Deploy on Vercel
+
+The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
+
+Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.

package/test/nextjs-test-projects/next-app-16-3-0/eslint.config.mjs

@@ -0,0 +1,18 @@
+import { defineConfig, globalIgnores } from "eslint/config";
+import nextVitals from "eslint-config-next/core-web-vitals";
+import nextTs from "eslint-config-next/typescript";
+
+const eslintConfig = defineConfig([
+  ...nextVitals,
+  ...nextTs,
+  // Override default ignores of eslint-config-next.
+  globalIgnores([
+    // Default ignores of eslint-config-next:
+    ".next/**",
+    "out/**",
+    "build/**",
+    "next-env.d.ts",
+  ]),
+]);
+
+export default eslintConfig;

package/test/nextjs-test-projects/next-app-16-3-0/next.config.ts

@@ -0,0 +1,7 @@
+import type { NextConfig } from 'next';
+
+const nextConfig: NextConfig = {
+  cacheHandler: require.resolve('@trieb.work/nextjs-turbo-redis-cache'),
+};
+
+export default nextConfig;

package/test/nextjs-test-projects/next-app-16-3-0/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "next-app-16-3-0",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev",
+    "build": "next build",
+    "start": "next start",
+    "lint": "eslint"
+  },
+  "dependencies": {
+    "next": "16.3.0",
+    "react": "19.2.0",
+    "react-dom": "19.2.0",
+    "redis": "4.7.0",
+    "@trieb.work/nextjs-turbo-redis-cache": "file:../../../"
+  },
+  "devDependencies": {
+    "@tailwindcss/postcss": "^4",
+    "@types/node": "^20",
+    "@types/react": "^19",
+    "@types/react-dom": "^19",
+    "eslint": "^9",
+    "eslint-config-next": "16.3.0",
+    "tailwindcss": "^4",
+    "typescript": "^5"
+  }
+}