Merge pull request #21 from vivid-planet/smaxage

Support s-maxage cache-control value
vivid-planet · Oct 10, 2023 · 79dfe18 · 79dfe18
2 parents 50acccf + a694727
commit 79dfe18
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/cache.ts b/src/cache.ts
@@ -28,15 +28,15 @@ export function parseMeta(res: Response): CacheMeta | null {
     if (!cacheControl) {
         return null;
     }
-    const maxAgeMatch = cacheControl.match(/max-age=(\d+)/);
+    const maxAgeMatch = cacheControl.match(/(max-age|s-maxage)=(\d+)/);
     if (!maxAgeMatch) {
         return null;
     }
 
     const status = res.status;
     const headers = convertHeadersToObject(res.headers);
 
-    const maxAge = parseInt(maxAgeMatch[1], 10) * 1000;
+    const maxAge = parseInt(maxAgeMatch[2], 10) * 1000;
     const staleWhileRevalidateMatch = cacheControl.match(/stale-while-revalidate=(\d+)/);
     if (!staleWhileRevalidateMatch) {
         return { maxAge, headers, status };