Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: http caching #3562

Merged
merged 65 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
f69a8b2
feat: http caching
flakey5 Aug 28, 2024
57c0f45
fixup! feat: http caching
flakey5 Sep 14, 2024
c88fb25
fixup! fixup! feat: http caching
flakey5 Sep 15, 2024
0a442b2
fixup! fixup! fixup! feat: http caching
flakey5 Sep 15, 2024
ae6edca
Update lib/handler/cache-handler.js
flakey5 Sep 15, 2024
26b2227
Apply suggestions from code review
flakey5 Sep 16, 2024
81cb021
fixup! fixup! fixup! fixup! feat: http caching
flakey5 Sep 16, 2024
6bff376
fixup! fixup! fixup! fixup! fixup! feat: http caching
flakey5 Sep 16, 2024
2edee29
clarify type for MemoryCacheStore
flakey5 Sep 17, 2024
f128e9a
Apply suggestions from code review
flakey5 Sep 17, 2024
807e764
Apply suggestions from code review
flakey5 Sep 17, 2024
4f8139a
tmp
flakey5 Sep 17, 2024
fabf558
fixup! tmp
flakey5 Sep 17, 2024
4546799
Apply suggestions from code review
flakey5 Sep 19, 2024
5a215d2
perf things, deleteByOrigin
flakey5 Sep 19, 2024
73564e8
incredibly messy and broken impl of streaming idea
flakey5 Sep 20, 2024
3a08528
Merge branch 'main' into flakey5/3231
metcoder95 Sep 20, 2024
cbe7b97
fix tests
flakey5 Sep 20, 2024
edc0772
check if the response is already cached again
flakey5 Sep 21, 2024
d7b24a4
backpressure patch
flakey5 Sep 21, 2024
0877f95
move body out of CacheStoreValue, remove size property
flakey5 Sep 22, 2024
e065a8e
Apply suggestions from code review
flakey5 Sep 24, 2024
230533a
add some comments on createWriteStream
flakey5 Sep 24, 2024
bcd7fa1
fix type tests, make staleAt and deleteAt absolute
flakey5 Sep 24, 2024
9ef03ef
empty the body when overwriting the response
flakey5 Sep 24, 2024
85a99d5
Merge branch 'main' into flakey5/3231
metcoder95 Sep 24, 2024
58839ee
update onError calls
flakey5 Sep 24, 2024
e49a32c
remove request deduplication for now
flakey5 Sep 25, 2024
6469aab
rename value -> opts, storedValue -> value
flakey5 Sep 25, 2024
969deb2
fix types
flakey5 Sep 25, 2024
3370f66
Apply suggestions from code review
flakey5 Sep 25, 2024
263718e
simplify parsing for qualified no-cache and private
flakey5 Sep 26, 2024
b5e483a
fix header omission, some cleanup
flakey5 Sep 26, 2024
7ea49d3
Merge branch 'main' into flakey5/3231
flakey5 Sep 29, 2024
ded27a1
Merge branch 'main' into flakey5/3231
metcoder95 Oct 1, 2024
d983b9c
running the tests in ci is probably a good idea
flakey5 Oct 1, 2024
6b1de1f
fix some testing values
flakey5 Oct 1, 2024
7e482e9
fixup! running the tests in ci is probably a good idea
flakey5 Oct 1, 2024
e433ec6
Update lib/interceptor/cache.js
flakey5 Oct 1, 2024
d8c7368
Update lib/util/cache.js
flakey5 Oct 2, 2024
0a7a99e
update from reviews
flakey5 Oct 2, 2024
43efed2
Update lib/interceptor/cache.js
flakey5 Oct 2, 2024
e765976
Apply suggestions from code review
flakey5 Oct 2, 2024
019f9b4
change from reviews
flakey5 Oct 2, 2024
1db72bb
add promise support back for createReadStream
flakey5 Oct 2, 2024
ab72d14
Apply suggestions from code review
flakey5 Oct 5, 2024
917b530
check if onError was called
flakey5 Oct 5, 2024
2adae09
add docs
flakey5 Oct 8, 2024
0ed33e4
Merge branch 'main' into flakey5/3231
flakey5 Oct 8, 2024
b951bd5
Merge branch 'main' into flakey5/3231
metcoder95 Oct 8, 2024
eda939d
add errorCallback
flakey5 Oct 9, 2024
a43112a
Update types/cache-interceptor.d.ts
flakey5 Oct 9, 2024
684d044
use fake timers and cleanup client
flakey5 Oct 10, 2024
12c2ded
lazy cache wellknown headers
flakey5 Oct 12, 2024
af0875e
Merge branch 'main' into flakey5/3231
metcoder95 Oct 13, 2024
29b1362
Apply suggestions from code review
flakey5 Oct 14, 2024
9e4f15b
Update lib/cache/memory-cache-store.js
flakey5 Oct 14, 2024
a5a3cf3
code review
flakey5 Oct 14, 2024
8bf9864
Apply suggestions from code review
flakey5 Oct 14, 2024
baaa914
Apply suggestions from code review
flakey5 Oct 14, 2024
8bf6b42
code review pt2
flakey5 Oct 14, 2024
05109b1
Update lib/handler/cache-revalidation-handler.js
mcollina Oct 14, 2024
092d9d4
Update lib/handler/cache-handler.js
mcollina Oct 14, 2024
1b91475
Apply suggestions from code review
Uzlopak Oct 14, 2024
e6aeda9
fix
Uzlopak Oct 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ module.exports.RedirectHandler = RedirectHandler
module.exports.interceptors = {
redirect: require('./lib/interceptor/redirect'),
retry: require('./lib/interceptor/retry'),
dump: require('./lib/interceptor/dump')
dump: require('./lib/interceptor/dump'),
cache: require('./lib/interceptor/cache')
}

module.exports.cacheStores = {
MemoryCacheStore: require('./lib/cache/memory-cache-store')
}

module.exports.buildConnector = buildConnector
Expand Down
314 changes: 314 additions & 0 deletions lib/cache/memory-cache-store.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,314 @@
'use strict'

flakey5 marked this conversation as resolved.
Show resolved Hide resolved
const EventEmitter = require('node:events')
const { Writable, Readable } = require('node:stream')

// todo clean this up

/**
* @typedef {import('../../types/cache-interceptor.d.ts').default.CacheStore} CacheStore
* @implements {CacheStore}
*
* @typedef {{
* complete: boolean
* value: import('../../types/cache-interceptor.d.ts').default.CacheStoreValue
* emitter: EventEmitter
* }} MemoryStoreValue
*/
class MemoryCacheStore {
#maxEntries = Infinity

#maxEntrySize = Infinity

#entryCount = 0

/**
* @type {Map<string, Map<string, MemoryStoreValue>>}
*/
#data = new Map()

/**
* @param {import('../../types/cache-interceptor.d.ts').default.MemoryCacheStoreOpts | undefined} opts
*/
flakey5 marked this conversation as resolved.
Show resolved Hide resolved
constructor (opts) {
if (opts) {
if (typeof opts !== 'object') {
throw new TypeError('MemoryCacheStore options must be an object')
}

if (opts.maxEntries !== undefined) {
if (
typeof opts.maxEntries !== 'number' ||
!Number.isInteger(opts.maxEntries) ||
opts.maxEntries < 0
) {
throw new TypeError('MemoryCacheStore options.maxEntries must be a non-negative integer')
}
this.#maxEntries = opts.maxEntries
}

if (opts.maxEntrySize !== undefined) {
if (
typeof opts.maxEntrySize !== 'number' ||
!Number.isInteger(opts.maxEntrySize) ||
opts.maxEntrySize < 0
) {
throw new TypeError('MemoryCacheStore options.maxEntrySize must be a non-negative integer')
}
this.#maxEntrySize = opts.maxEntrySize
}
}
}

get isFull () {
return this.#entryCount < this.#maxEntries
}
ronag marked this conversation as resolved.
Show resolved Hide resolved

createReadStream (req) {
if (typeof req !== 'object') {
throw new TypeError(`expected req to be object, got ${typeof req}`)
}

const values = this.#getValues(req, false)
if (!values) {
return
}

/**
* @type {MemoryStoreValue}
*/
let value
const now = Date.now()
flakey5 marked this conversation as resolved.
Show resolved Hide resolved
for (let i = values.length - 1; i >= 0; i--) {
const current = values[i]
const currentCacheValue = current.value
if (now >= currentCacheValue.deleteAt) {
// We've reached expired values, let's delete them
this.#entryCount -= values.length - i
values.length = i
break
}

let matches = true

if (currentCacheValue.vary) {
if (!req.headers) {
matches = false
break
}

for (const key in currentCacheValue.vary) {
if (currentCacheValue.vary[key] !== req.headers[key]) {
matches = false
break
}
}
}

if (matches) {
value = current
break
}
}

return value ? new MemoryStoreReadableStream(value) : undefined
}

createWriteStream (req, value) {
if (typeof req !== 'object') {
throw new TypeError(`expected req to be object, got ${typeof req}`)
}
if (typeof value !== 'object') {
throw new TypeError(`expected value to be object, got ${typeof value}`)
}

if (this.isFull) {
return undefined
}

// TODO see if value already exists or not

const values = this.#getValues(req, true)
this.entryCount++

/**
* TODO what's a better name for this
* @type {MemoryStoreValue}
*/
const storedValue = {
complete: false,
value,
emitter: new EventEmitter()
}

if (
values.length === 0 ||
value.deleteAt < values[values.length - 1].deleteAt
) {
values.push(storedValue)
} else if (value.deleteAt >= values[0].deleteAt) {
values.unshift(storedValue)
} else {
let startIndex = 0
let endIndex = values.length
while (true) {
if (startIndex === endIndex) {
values.splice(startIndex, 0, storedValue)
break
}

const middleIndex = (startIndex + endIndex) / 2
const middleValue = values[middleIndex]
if (value.deleteAt === middleIndex) {
values.splice(middleIndex, 0, storedValue)
break
} else if (value.deleteAt > middleValue.deleteAt) {
endIndex = middleIndex
continue
} else {
startIndex = middleIndex
continue
}
}
}

return new MemoryStoreWritableStream(storedValue)
}

/**
* @param {string} origin
*/
deleteByOrigin (origin) {
this.#data.delete(origin)
}

/**
* @param {import('../../types/dispatcher.d.ts').default.RequestOptions} req
* @returns {MemoryStoreValue[] | undefined}
flakey5 marked this conversation as resolved.
Show resolved Hide resolved
*/
#getValues (req, makeIfDoesntExist) {
// https://www.rfc-editor.org/rfc/rfc9111.html#section-2-3
let cachedPaths = this.#data.get(req.origin)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is req.origin always set?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at this stage yes - we verify its existence in the cache interceptor

if (!cachedPaths) {
if (!makeIfDoesntExist) {
return undefined
}

cachedPaths = new Map()
this.#data.set(req.origin, cachedPaths)
}

let values = cachedPaths.get(`${req.path}:${req.method}`)
if (!values && makeIfDoesntExist) {
values = []
cachedPaths.set(`${req.path}:${req.method}`, values)
}

return values
}
}

class MemoryStoreReadableStream extends Readable {
/**
* @type {MemoryStoreValue}
*/
#value
/**
* @type {Buffer[]}
*/
#chunksToSend

/**
* @param {MemoryStoreValue} value
*/
constructor (value) {
super()

this.#value = value
this.#chunksToSend = [...this.#value.value.body]

if (!value.complete) {
value.emitter.on('write', this.#chunksToSend.push)
value.emitter.on('final', () => {
this.#chunksToSend.push(null)
})
flakey5 marked this conversation as resolved.
Show resolved Hide resolved
}
}

get value () {
return this.#value
}

/**
* @param {number} size
*/
_read (size) {
// TODO what to do if we get a read but we're still waiting on more chunks?
flakey5 marked this conversation as resolved.
Show resolved Hide resolved
if (size > this.#chunksToSend.length) {
size = this.#chunksToSend.length
}

for (let i = 0; i < size; i++) {
this.push(this.#chunksToSend.pop())
}
}
}

// TODO enforce max entry size, ...
class MemoryStoreWritableStream extends Writable {
/**
* @type {MemoryStoreValue}
*/
#value

/**
* @param {MemoryCacheStore} value
*/
constructor (value) {
super()
this.#value = value
flakey5 marked this conversation as resolved.
Show resolved Hide resolved
}

get rawTrailers () {
return this.#value.value.rawTrailers
}

/**
* @param {Buffer[] | undefined} trailers
*/
set rawTrailers (trailers) {
this.#value.value.rawTrailers = trailers
}

/**
* @param {Buffer} chunk
* @param {*} _
* @param {() => void} callback
flakey5 marked this conversation as resolved.
Show resolved Hide resolved
*/
_write (chunk, _, callback) {
this.#value.value.body.push(chunk)
this.#value.emitter.emit('write', chunk)
callback()
}

/**
* @param {() => void} callback
*/
_final (callback) {
this.#value.complete = true
this.#value.emitter.emit('final')

callback()
}

/**
* @param {Error} err
* @param {() => void} callback
*/
_destroy (err, callback) {
this.#value.emitter.emit('error', err)
callback(err)
}
}

module.exports = MemoryCacheStore
Loading
Loading