@trieb.work/nextjs-turbo-redis-cache 1.3.0 → 1.4.0

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

@@ -4,8 +4,10 @@ import fetch from 'node-fetch';
 import { createClient } from 'redis';
 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');
+// 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}`;
@@ -126,6 +128,8 @@ describe('Next.js Turbo Redis Cache Integration', () => {
       url: `redis://${process.env.REDISHOST}:${process.env.REDISPORT}`,
     });
     await redisClient.connect();
+
+    console.log('redis key prefix is:', process.env.VERCEL_URL);
   }, 60_000);
 
   afterAll(async () => {
@@ -156,6 +160,7 @@ describe('Next.js Turbo Redis Cache Integration', () => {
       });
 
       it('The data in the redis key should match the expected format', async () => {
+        await delay(REDIS_BACKGROUND_SYNC_DELAY);
         const keys = await redisClient.keys(process.env.VERCEL_URL + '*');
         expect(keys.length).toBeGreaterThan(0);
 
@@ -226,6 +231,7 @@ describe('Next.js Turbo Redis Cache Integration', () => {
       });
 
       it('After the new request was made the redis key and hashmap should be set again', async () => {
+        await delay(REDIS_BACKGROUND_SYNC_DELAY);
         // check Redis keys
         const keys = await redisClient.keys(
           process.env.VERCEL_URL + '/api/cached-static-fetch',
@@ -263,15 +269,17 @@ describe('Next.js Turbo Redis Cache Integration', () => {
       });
 
       if (process.env.SKIP_OPTIONAL_LONG_RUNNER_TESTS !== 'true') {
+        const FIRST_DELAY = 6000;
+        const SECOND_DELAY = 1000;
         it('Third request which is send directly after revalidation time will still serve cache but trigger re-evaluation (stale-while-revalidate)', async () => {
-          await delay(6000);
+          await delay(FIRST_DELAY);
           const res = await fetch(NEXT_START_URL + '/api/revalidated-fetch');
           const data: any = await res.json();
           expect(data.counter).toBe(counter1);
         }, 10_000);
 
         it('Third request which is send directly after revalidation time will serve re-evaluated data (stale-while-revalidate)', async () => {
-          await delay(1000);
+          await delay(SECOND_DELAY);
           const res = await fetch(NEXT_START_URL + '/api/revalidated-fetch');
           const data: any = await res.json();
           expect(data.counter).toBe(counter1 + 1);
@@ -281,7 +289,13 @@ describe('Next.js Turbo Redis Cache Integration', () => {
           const ttl = await redisClient.ttl(
             process.env.VERCEL_URL + '/api/revalidated-fetch',
           );
-          expect(ttl).toBeGreaterThan(3);
+          expect(ttl).toBeLessThan(2 * next1503_revalidatedFetch_route);
+          expect(ttl).toBeGreaterThan(
+            2 * next1503_revalidatedFetch_route -
+              FIRST_DELAY -
+              SECOND_DELAY -
+              REDIS_BACKGROUND_SYNC_DELAY,
+          );
 
           await delay(ttl * 1000 + 500);
 
@@ -429,10 +443,12 @@ describe('Next.js Turbo Redis Cache Integration', () => {
             );
             const data: any = await res.json();
             expect(data.counter).toBe(counter + 4);
-            expect(data.subFetchData.counter).toBe(subCounter + 2); // <- fails in CI only
+            expect(data.subFetchData.counter).toBe(subCounter + 2);
           });
 
           it('After the new request was made the redis key and hashmap should be set again', async () => {
+            await delay(REDIS_BACKGROUND_SYNC_DELAY);
+
             // This cache entry key is the key of the sub-fetch-request, it will be generated by nextjs based on the headers/payload etc.
             // So it should stay the same unless nextjs will change something in there implementation
             const cacheEntryKey =
@@ -483,7 +499,7 @@ describe('Next.js Turbo Redis Cache Integration', () => {
             );
             const data: any = await res.json();
             expect(data.counter).toBe(counter + 5);
-            expect(data.subFetchData.counter).toBe(subCounter + 3); // <- fails in CI only
+            expect(data.subFetchData.counter).toBe(subCounter + 3);
           });
 
           it('After the new request was made the redis key and hashmap should be set again', async () => {
@@ -643,6 +659,7 @@ describe('Next.js Turbo Redis Cache Integration', () => {
 
         it('After the new request was made the redis key and hashmap should be set again', async () => {
           // check Redis keys
+          await delay(REDIS_BACKGROUND_SYNC_DELAY);
           const keys = await redisClient.keys(
             process.env.VERCEL_URL + '/pages/no-fetch/default-page',
           );
@@ -685,6 +702,8 @@ describe('Next.js Turbo Redis Cache Integration', () => {
         firstTimestamp = timestamp!;
         firstCounter = counter!;
 
+        await delay(REDIS_BACKGROUND_SYNC_DELAY);
+
         // test cache entry for 3 keys are set
         const keys1 = await redisClient.keys(
           process.env.VERCEL_URL +
@@ -783,11 +802,11 @@ describe('Next.js Turbo Redis Cache Integration', () => {
         // the page should also be in revalidatedTagsMap so that the nested fetch requests knows that the page was invalidated
         const revalidationTimestamp = await redisClient.hGet(
           process.env.VERCEL_URL + '__revalidated_tags__',
-          '/pages/revalidated-fetch/revalidate15--default-page',
+          '_N_T_/pages/revalidated-fetch/revalidate15--default-page',
         );
-        console.log('revalidationTimestamp', revalidationTimestamp);
-        expect(revalidationTimestamp).toBeDefined();
-        expect(Number(revalidationTimestamp)).toBeLessThan(Number(Date.now()));
+        const ts = Number(revalidationTimestamp);
+        expect(ts).toBeGreaterThan(1);
+        expect(ts).toBeLessThan(Number(Date.now()));
 
         // API route should still be cached
         const keys3 = await redisClient.keys(