@trieb.work/nextjs-turbo-redis-cache 1.14.1 → 1.15.0

package/test/cache-components/cache-components.integration.spec.ts

@@ -11,6 +11,10 @@ describe('Next.js 16 Cache Components Integration', () => {
   let redisClient: RedisClientType;
   let keyPrefix: string;
 
+  async function delay(ms: number) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+  }
+
   beforeAll(async () => {
     // Connect to Redis
     redisClient = createClient({
@@ -155,6 +159,41 @@ describe('Next.js 16 Cache Components Integration', () => {
     }, 20_000);
   });
 
+  describe('cacheLife functionality', () => {
+    it('should respect expire window and eventually return refreshed data', async () => {
+      const res1 = await fetch(`${BASE_URL}/api/cached-with-cachelife`);
+      const data1 = await res1.json();
+      expect(data1.counter).toBe(1);
+
+      const res2 = await fetch(`${BASE_URL}/api/cached-with-cachelife`);
+      const data2 = await res2.json();
+      expect(data2.counter).toBe(data1.counter);
+      expect(data2.timestamp).toBe(data1.timestamp);
+
+      await delay(6500);
+
+      let refreshedData: any;
+      for (let i = 0; i < 10; i++) {
+        const res = await fetch(`${BASE_URL}/api/cached-with-cachelife`);
+        const data = await res.json();
+
+        if (
+          data.counter !== data1.counter ||
+          data.timestamp !== data1.timestamp
+        ) {
+          refreshedData = data;
+          break;
+        }
+
+        await delay(500);
+      }
+
+      expect(refreshedData).toBeDefined();
+      expect(refreshedData.counter).toBeGreaterThan(data1.counter);
+      expect(refreshedData.timestamp).not.toBe(data1.timestamp);
+    }, 20_000);
+  });
+
   describe('Redis cache handler integration', () => {
     it('should call cache handler get and set methods', async () => {
       // Make request to trigger cache (don't clear first)

package/test/integration/next-app-16-2-3-cache-components/src/app/api/cached-with-cachelife/route.ts

@@ -0,0 +1,24 @@
+import { NextResponse } from 'next/server';
+import { cacheLife, cacheTag } from 'next/cache';
+
+let counter = 0;
+
+export async function GET() {
+  const data = await getCachedDataWithLife();
+  return NextResponse.json(data);
+}
+
+async function getCachedDataWithLife() {
+  'use cache';
+
+  cacheLife({ stale: 1, revalidate: 2, expire: 5 });
+  cacheTag('cache-life-test');
+
+  counter++;
+
+  return {
+    counter,
+    timestamp: Date.now(),
+    profile: { stale: 1, revalidate: 2, expire: 5 },
+  };
+}

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

@@ -432,7 +432,7 @@ describe('Next.js Turbo Redis Cache Integration', () => {
           }
 
           // API route counter of revalidated sub-fetch-request should be the same (request deduplication of fetch requests)
-          expect(data1.subFetchData.counter).toBe(data1.subFetchData.counter);
+          expect(data1.subFetchData.counter).toBe(data2.subFetchData.counter);
           subCounter = data1.subFetchData.counter;
         });
 
@@ -625,6 +625,7 @@ describe('Next.js Turbo Redis Cache Integration', () => {
           );
           // 14 days is default revalidate for pages -> expiration time is 2 * revalidate time -> -10 seconds for testing offset stability
           expect(ttl).toBeGreaterThan(2 * 14 * 24 * 60 * 60 - 30);
+          expect(ttl).toBeLessThanOrEqual(2 * 14 * 24 * 60 * 60);
         });
 
         it('The data in the redis key should match the expected format', async () => {