feat: http caching #3562

flakey5 · 2024-09-07T06:16:04Z

Implements bare-bones opt-in http caching as per rfc9111. Bare-bones in this case means what's required by the spec and a few extra bits, with more coming in future prs.

~~Opening as a draft since there's still some more work to be done (mostly tests, but a bit more functionality-wise)~~

No request cache directives are supported at this time, this will come later.

Response caching directives supported:

public
private
s-maxage
max-age
Expires header
no-cache
no-store
stale-while-revalidate

This relates to...

Closes #3231
Closes #2760
Closes #2256
Closes #1146

Changes

Features

Opt-in http caching
In-memory default cache store

Bug Fixes

n/a

Breaking Changes and Deprecations

n/a

Status

lib/cache/lru-cache-store.js

lib/handler/cache-handler.js

ronag · 2024-09-07T07:44:21Z

Would it maybe be better to use jsdoc types rather than separate type definition files? @mcollina

index.js

lib/cache/lru-cache-store.js

lib/handler/cache-handler.js

lib/interceptor/cache.js

mcollina · 2024-09-09T05:45:12Z

Would it maybe be better to use jsdoc types rather than separate type definition files? @mcollina

I think using type definitions are in line with the rest of the codebase, and therefore the correct implementation.

If we want to migrate to a jsdoc-generated world, let's discuss in another issue!

lib/handler/cache-handler.js

lib/cache/lru-cache-store.js

lib/handler/cache-handler.js

ronag · 2024-09-11T08:29:38Z

@flakey5 please make sure to add me and @IsakT as co-authors (assuming you took some of our code in nxt-undici).

lib/cache/lru-cache-store.js

lib/handler/cache-handler.js

Implements bare-bones http caching as per rfc9111 Closes nodejs#3231 Closes nodejs#2760 Closes nodejs#2256 Closes nodejs#1146 Co-authored-by: Carlos Fuentes <me@metcoder.dev> Co-authored-by: Robert Nagy <ronagy@icloud.com> Co-authored-by: Isak Törnros <isak.tornros@hotmail.com> Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

types/interceptors.d.ts

test/cache-interceptor/cache-stores.js

test/cache-interceptor/interceptor.js

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

lib/cache/memory-cache-store.js

lib/handler/cache-handler.js

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

Co-authored-by: Robert Nagy <ronagy@icloud.com>

lib/cache/memory-cache-store.js

lib/handler/cache-handler.js

lib/handler/cache-revalidation-handler.js

lib/interceptor/cache.js

test/cache-interceptor/interceptor.js

Co-authored-by: Carlos Fuentes <me@metcoder.dev>

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

lib/cache/memory-cache-store.js

types/cache-interceptor.d.ts

Uzlopak

headers could be null or undefined

lib/cache/memory-cache-store.js

Uzlopak

@ronag
Should we use fastTimers?

lib/cache/memory-cache-store.js

lib/interceptor/cache.js

Uzlopak · 2024-10-13T16:51:57Z

lib/interceptor/cache.js

+      }
+
+      Promise.resolve(stream).then(handleStream).catch(err => handler.onError(err))
+


why wrap it?

Suggested change

Promise.resolve(stream).then(handleStream).catch(handler.onError)

The result of createReadStream can be a promise

I think we should try to avoid that. Promises and streams do not play well together, and there are a few horrid edge cases to be aware of when building such APIs, specifically related to error handling. I would prefer for this to not be a promise.

I would prefer for this to not be a promise.

From what I see, stream here is coming from CacheStore's createReadStream. People may bring their cache store implementation, and depending on the implementation the returned value could be a Promise<ReadableStream>, and IMHO undici should accept that.

Let's say, what happens if someone is using redis as their cache backend and all ioredis APIs are async.

actually this was not about promise or not. it was about the unnecessary wrapping in an anonymous function.

Uzlopak

found some issue, which need some love ;)

Co-authored-by: Aras Abbasi <aras.abbasi@googlemail.com>

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

Co-authored-by: Aras Abbasi <aras.abbasi@googlemail.com>

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

Uzlopak · 2024-10-14T08:34:18Z

I will review it shortly ;)

SukkaW · 2024-10-14T13:16:48Z

lib/interceptor/cache.js

+            // https://www.rfc-editor.org/rfc/rfc9111.html#name-age
+            const age = Math.round((Date.now() - value.cachedAt) / 1000)
+
+            value.rawHeaders.push(AGE_HEADER, Buffer.from(`${age}`))


Suggested change

value.rawHeaders.push(AGE_HEADER, Buffer.from(`${age}`))

value.rawHeaders.push(AGE_HEADER, Buffer.from(age))

SukkaW · 2024-10-14T13:17:19Z

lib/interceptor/cache.js

+const CacheRevalidationHandler = require('../handler/cache-revalidation-handler')
+const { UNSAFE_METHODS } = require('../util/cache.js')
+
+const AGE_HEADER = Buffer.from('age')


I am not entirely sure why age here is lowercased. If it is Age, we can re-use getWellKnownHeaderBuffer.

ronag · 2024-10-14T13:33:10Z

Guys. Please stop with the nits for now and open follow up PRs.we need to land this.

lib/handler/cache-revalidation-handler.js

mcollina

lgtm, we can do the rest in issue.

@Uzlopak can you take another look?

Co-authored-by: Aras Abbasi <aras.abbasi@googlemail.com>

lib/handler/cache-handler.js

Co-authored-by: Aras Abbasi <aras.abbasi@googlemail.com>

lib/util/cache.js

Uzlopak

I dont see any obvious code smell any more. :)

LGTM

Uzlopak · 2024-10-14T15:33:34Z

Unrelated Test is flaky. see #3731

ronag requested changes Sep 7, 2024

View reviewed changes

metcoder95 reviewed Sep 8, 2024

View reviewed changes

ronag reviewed Sep 10, 2024

View reviewed changes

lib/handler/cache-handler.js Outdated Show resolved Hide resolved

metcoder95 reviewed Sep 10, 2024

View reviewed changes

lib/cache/lru-cache-store.js Outdated Show resolved Hide resolved

lib/handler/cache-handler.js Outdated Show resolved Hide resolved

lib/handler/cache-handler.js Show resolved Hide resolved

lib/handler/cache-handler.js Outdated Show resolved Hide resolved

ronag mentioned this pull request Sep 11, 2024

feat(cache): use vary headers to compare cached response with request headers nxtedition/nxt-undici#3

Closed

ronag reviewed Sep 11, 2024

View reviewed changes

lib/cache/lru-cache-store.js Outdated Show resolved Hide resolved

ronag reviewed Sep 11, 2024

View reviewed changes

lib/handler/cache-handler.js Outdated Show resolved Hide resolved

flakey5 force-pushed the flakey5/3231 branch 2 times, most recently from e07e3ec to 938fa7a Compare September 12, 2024 03:58

flakey5 force-pushed the flakey5/3231 branch from 938fa7a to f69a8b2 Compare September 14, 2024 05:14

fixup! feat: http caching

57c0f45

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

flakey5 marked this pull request as ready for review September 14, 2024 05:29

mcollina requested changes Sep 14, 2024

View reviewed changes

types/interceptors.d.ts Show resolved Hide resolved

test/cache-interceptor/cache-stores.js Outdated Show resolved Hide resolved

test/cache-interceptor/interceptor.js Outdated Show resolved Hide resolved

fixup! fixup! feat: http caching

c88fb25

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

ronag reviewed Sep 15, 2024

View reviewed changes

lib/cache/memory-cache-store.js Show resolved Hide resolved

lib/handler/cache-handler.js Outdated Show resolved Hide resolved

flakey5 and others added 2 commits September 15, 2024 10:55

fixup! fixup! fixup! feat: http caching

0a442b2

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

Update lib/handler/cache-handler.js

ae6edca

Co-authored-by: Robert Nagy <ronagy@icloud.com>

metcoder95 reviewed Sep 16, 2024

View reviewed changes

flakey5 and others added 3 commits September 16, 2024 11:21

Apply suggestions from code review

26b2227

Co-authored-by: Carlos Fuentes <me@metcoder.dev>

fixup! fixup! fixup! fixup! feat: http caching

81cb021

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

fixup! fixup! fixup! fixup! fixup! feat: http caching

6bff376

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

Uzlopak reviewed Sep 16, 2024

View reviewed changes

lib/cache/memory-cache-store.js Outdated Show resolved Hide resolved

lib/cache/memory-cache-store.js Outdated Show resolved Hide resolved

Uzlopak reviewed Sep 16, 2024

View reviewed changes

types/cache-interceptor.d.ts Outdated Show resolved Hide resolved

Uzlopak reviewed Sep 16, 2024

View reviewed changes

lib/cache/memory-cache-store.js Outdated Show resolved Hide resolved

Uzlopak reviewed Sep 16, 2024

View reviewed changes

lib/cache/memory-cache-store.js Show resolved Hide resolved

Uzlopak reviewed Sep 16, 2024

View reviewed changes

lib/cache/memory-cache-store.js Show resolved Hide resolved

Uzlopak reviewed Oct 13, 2024

View reviewed changes

lib/interceptor/cache.js Show resolved Hide resolved

Uzlopak reviewed Oct 13, 2024

View reviewed changes

Uzlopak requested changes Oct 13, 2024

View reviewed changes

flakey5 and others added 6 commits October 13, 2024 23:19

Apply suggestions from code review

29b1362

Co-authored-by: Aras Abbasi <aras.abbasi@googlemail.com>

Update lib/cache/memory-cache-store.js

9e4f15b

Co-authored-by: Aras Abbasi <aras.abbasi@googlemail.com>

code review

a5a3cf3

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

Apply suggestions from code review

8bf9864

Co-authored-by: Aras Abbasi <aras.abbasi@googlemail.com>

Apply suggestions from code review

baaa914

Co-authored-by: Aras Abbasi <aras.abbasi@googlemail.com>

code review pt2

8bf6b42

Signed-off-by: flakey5 <73616808+flakey5@users.noreply.github.com>

flakey5 force-pushed the flakey5/3231 branch from 0194f19 to 8bf6b42 Compare October 14, 2024 07:36

SukkaW reviewed Oct 14, 2024

View reviewed changes

Uzlopak reviewed Oct 14, 2024

View reviewed changes

lib/handler/cache-revalidation-handler.js Outdated Show resolved Hide resolved

mcollina approved these changes Oct 14, 2024

View reviewed changes

Update lib/handler/cache-revalidation-handler.js

05109b1

Co-authored-by: Aras Abbasi <aras.abbasi@googlemail.com>

Uzlopak reviewed Oct 14, 2024

View reviewed changes

lib/handler/cache-handler.js Outdated Show resolved Hide resolved

Update lib/handler/cache-handler.js

092d9d4

Co-authored-by: Aras Abbasi <aras.abbasi@googlemail.com>

Uzlopak reviewed Oct 14, 2024

View reviewed changes

lib/util/cache.js Outdated Show resolved Hide resolved

Uzlopak reviewed Oct 14, 2024

View reviewed changes

lib/util/cache.js Outdated Show resolved Hide resolved

Uzlopak reviewed Oct 14, 2024

View reviewed changes

lib/util/cache.js Show resolved Hide resolved

Uzlopak added 2 commits October 14, 2024 16:32

Apply suggestions from code review

1b91475

fix

e6aeda9

Uzlopak approved these changes Oct 14, 2024

View reviewed changes

mcollina merged commit 2d40ade into nodejs:main Oct 14, 2024
31 of 32 checks passed

github-actions bot mentioned this pull request Dec 3, 2024

[Release] v7.1.0 #3922

Merged

This was referenced Dec 16, 2024

[Release] v7.1.1 #3952

Closed

[Release] v7.2.0 #3962

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: http caching #3562

feat: http caching #3562

flakey5 commented Sep 7, 2024 •

edited

Loading

ronag commented Sep 7, 2024 •

edited

Loading

mcollina commented Sep 9, 2024

ronag commented Sep 11, 2024 •

edited

Loading

Uzlopak left a comment

Uzlopak left a comment

Uzlopak Oct 13, 2024

flakey5 Oct 14, 2024

mcollina Oct 14, 2024

SukkaW Oct 14, 2024 •

edited

Loading

Uzlopak Oct 14, 2024

Uzlopak left a comment

Uzlopak commented Oct 14, 2024 •

edited

Loading

SukkaW Oct 14, 2024

SukkaW Oct 14, 2024

ronag commented Oct 14, 2024

mcollina left a comment

Uzlopak left a comment

Uzlopak commented Oct 14, 2024

		}

		Promise.resolve(stream).then(handleStream).catch(err => handler.onError(err))

	value.rawHeaders.push(AGE_HEADER, Buffer.from(`${age}`))
	value.rawHeaders.push(AGE_HEADER, Buffer.from(age))

feat: http caching #3562

feat: http caching #3562

Conversation

flakey5 commented Sep 7, 2024 • edited Loading

This relates to...

Changes

Features

Bug Fixes

Breaking Changes and Deprecations

Status

ronag commented Sep 7, 2024 • edited Loading

mcollina commented Sep 9, 2024

ronag commented Sep 11, 2024 • edited Loading

Uzlopak left a comment

Choose a reason for hiding this comment

Uzlopak left a comment

Choose a reason for hiding this comment

Uzlopak Oct 13, 2024

Choose a reason for hiding this comment

flakey5 Oct 14, 2024

Choose a reason for hiding this comment

mcollina Oct 14, 2024

Choose a reason for hiding this comment

SukkaW Oct 14, 2024 • edited Loading

Choose a reason for hiding this comment

Uzlopak Oct 14, 2024

Choose a reason for hiding this comment

Uzlopak left a comment

Choose a reason for hiding this comment

Uzlopak commented Oct 14, 2024 • edited Loading

SukkaW Oct 14, 2024

Choose a reason for hiding this comment

SukkaW Oct 14, 2024

Choose a reason for hiding this comment

ronag commented Oct 14, 2024

mcollina left a comment

Choose a reason for hiding this comment

Uzlopak left a comment

Choose a reason for hiding this comment

Uzlopak commented Oct 14, 2024

flakey5 commented Sep 7, 2024 •

edited

Loading

ronag commented Sep 7, 2024 •

edited

Loading

ronag commented Sep 11, 2024 •

edited

Loading

SukkaW Oct 14, 2024 •

edited

Loading

Uzlopak commented Oct 14, 2024 •

edited

Loading