svrjs/svrjs-cache-mod
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add support for "s-maxage" directive in "Cache-Control" header

Browse source
This commit is contained in:
Dorian Niemiec 2024-12-15 20:47:38 +01:00
parent e59d95bce0
commit 5b5f7bb0e7
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/utils/cacheControlUtils.js
View file

@ -20,12 +20,18 @@ function shouldCacheResponse(cacheControl, isAuthenticated) {
if (cacheControl["public"]) { if (cacheControl["public"]) {
return true; return true;
} }
return !isAuthenticated && cacheControl["max-age"] !== undefined; return (
!isAuthenticated &&
(cacheControl["max-age"] !== undefined ||
cacheControl["s-maxage"] !== undefined)
);
} }
function isCacheValid(entry, requestHeaders) { function isCacheValid(entry, requestHeaders) {
const { timestamp, cacheControl } = entry; const { timestamp, cacheControl } = entry;
const maxAge = parseInt(cacheControl["max-age"], 10); const maxAge = cacheControl["s-maxage"]
? parseInt(cacheControl["s-maxage"], 10)
: parseInt(cacheControl["max-age"], 10);
if (Date.now() - timestamp > maxAge * 1000) { if (Date.now() - timestamp > maxAge * 1000) {
return false; return false;
} }

10
tests/utils/cacheControlUtils.test.js
View file

@ -81,6 +81,16 @@ describe("shouldCacheResponse", () => {
expect(shouldCacheResponse(cacheControl, true)).toBe(false); expect(shouldCacheResponse(cacheControl, true)).toBe(false);
}); });
test("should return true if s-maxage is present and not authenticated", () => {
const cacheControl = { "s-maxage": "3600" };
expect(shouldCacheResponse(cacheControl, false)).toBe(true);
});
test("should return false if s-maxage is present and authenticated", () => {
const cacheControl = { "s-maxage": "3600" };
expect(shouldCacheResponse(cacheControl, true)).toBe(false);
});
test("should return false if no relevant directives are present", () => { test("should return false if no relevant directives are present", () => {
const cacheControl = {}; const cacheControl = {};
expect(shouldCacheResponse(cacheControl, false)).toBe(false); expect(shouldCacheResponse(cacheControl, false)).toBe(false);