Add expiry to suspense cache based on revalidate (#790)

.changeset/purple-rocks-pump.md

@@ -0,0 +1,5 @@
+---
+'@cloudflare/next-on-pages': minor
+---
+
+add support for the `revalidate` option in fetch

packages/next-on-pages/templates/cache/adaptor.ts

@@ -37,8 +37,12 @@ export class CacheAdaptor {
 	 * @param key Key for the item.
 	 * @param value The value to update.
 	 */
-	public async update(key: string, value: string): Promise<void> {
-		throw new Error(`Method not implemented - ${key}, ${value}`);
+	public async update(
+		key: string,
+		value: string,
+		revalidate?: number,
+	): Promise<void> {
+		throw new Error(`Method not implemented - ${key}, ${value}, ${revalidate}`);
 	}
 
 	/**
@@ -54,7 +58,11 @@ export class CacheAdaptor {
 		};
 
 		// Update the cache entry.
-		const updateOp = this.update(key, JSON.stringify(newEntry));
+		const updateOp = this.update(
+			key,
+			JSON.stringify(newEntry),
+			value.revalidate,
+		);
 
 		switch (newEntry.value?.kind) {
 			case 'FETCH': {

packages/next-on-pages/templates/cache/cache-api.ts

@@ -16,12 +16,14 @@ export default class CacheApiAdaptor extends CacheAdaptor {
 		return response ? response.text() : null;
 	}
 
-	public override async update(key: string, value: string) {
+	public override async update(
+		key: string,
+		value: string,
+		revalidate?: number,
+	) {
 		const cache = await caches.open(this.cacheName);
 
-		// The max-age to use for the cache entry.
-		const maxAge = '31536000'; // 1 year
-
+		const maxAge = revalidate ?? '31536000'; // 1 year
 		const response = new Response(value, {
 			headers: new Headers({
 				'cache-control': `max-age=${maxAge}`,

packages/next-on-pages/templates/cache/kv.ts

@@ -14,10 +14,21 @@ export default class KVAdaptor extends CacheAdaptor {
 		return value ?? null;
 	}
 
-	public override async update(key: string, value: string) {
+	public override async update(
+		key: string,
+		value: string,
+		revalidate?: number,
+	) {
+		const expiry = revalidate
+			? {
+					expirationTtl: revalidate,
+			  }
+			: {};
+
 		await process.env.__NEXT_ON_PAGES__KV_SUSPENSE_CACHE?.put(
 			this.buildCacheKey(key),
 			value,
+			expiry,
 		);
 	}
 }