diff --git a/src/index.js b/src/index.js index 954717f..280374f 100644 --- a/src/index.js +++ b/src/index.js @@ -39,8 +39,11 @@ const cacheableResponse = ({ Promise.resolve(rawGet(opts)).then(result => { if (result == null) return undefined if (typeof result !== 'object') return result - result.etag = getEtag(result) - return result + // Persist createdAt at write time so HIT max-age can count down. + const value = { ...result } + value.etag = getEtag(value) + if (value.createdAt == null) value.createdAt = Date.now() + return value }) // @keyvhq/memoize only treats forceExpiration === true as a forced refresh. diff --git a/test/ttl.js b/test/ttl.js index 8d698a0..fda32ef 100644 --- a/test/ttl.js +++ b/test/ttl.js @@ -63,3 +63,37 @@ test('sets default ttl', async t => { t.true(cacheControl['must-revalidate']) t.true([86400, 86399].includes(cacheControl['max-age'])) }) + +test.serial( + 'default createdAt is persisted so HIT max-age shrinks', + async t => { + const realNow = Date.now + let now = 1_700_000_000_000 + Date.now = () => now + t.teardown(() => { + Date.now = realNow + }) + + const url = await runServer( + t, + cacheableResponse({ + ttl: 3600000, + staleTtl: false, + get: () => ({ data: { foo: 'bar' } }), + send: ({ res }) => { + res.end('Hello World') + } + }) + ) + + const { headers: miss } = await got(`${url}/kikobeats`) + t.is(miss['x-cache-status'], 'MISS') + t.is(parseCacheControl(miss)['max-age'], 3600) + + now += 30_000 + + const { headers: hit } = await got(`${url}/kikobeats`) + t.is(hit['x-cache-status'], 'HIT') + t.is(parseCacheControl(hit)['max-age'], 3570) + } +)