Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion lib/interceptor/cache.js
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,8 @@ function sendCachedValue (handler, opts, result, age, context, isStale) {
assert(!stream.destroyed, 'stream should not be destroyed')
assert(!stream.readableDidRead, 'stream should not be readableDidRead')

let aborted = false

const controller = {
rawHeaders: [],
rawTrailers: [],
Expand All @@ -343,12 +345,13 @@ function sendCachedValue (handler, opts, result, age, context, isStale) {
return stream.isPaused()
},
get aborted () {
return stream.destroyed
return aborted
},
get reason () {
return stream.errored
},
abort (reason) {
aborted = true
stream.destroy(reason ?? new AbortError())
}
}
Expand Down
73 changes: 73 additions & 0 deletions test/interceptors/cache.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,79 @@ describe('Cache Interceptor', () => {
}
})

// https://github.com/nodejs/undici/issues/5818
test('successful cached response is not aborted', async () => {
const server = createServer({ joinDuplicateHeaders: true }, (_, res) => {
res.setHeader('cache-control', 'max-age=60')
res.end('ok')
}).listen(0)

const client = new Client(`http://localhost:${server.address().port}`)
.compose(interceptors.cache())

after(async () => {
server.close()
await client.close()
})

await once(server, 'listening')

const request = {
origin: 'localhost',
method: 'GET',
path: '/'
}

await (await client.request(request)).body.dump()

const aborted = await new Promise((resolve, reject) => {
client.dispatch(request, {
onRequestStart () {},
onResponseEnd (controller) { resolve(controller.aborted) },
onResponseError (controller, error) { reject(error) }
})
})

strictEqual(aborted, false)
})

test('aborting a cached response reports aborted', async () => {
const server = createServer({ joinDuplicateHeaders: true }, (_, res) => {
res.setHeader('cache-control', 'max-age=60')
res.end('ok')
}).listen(0)

const client = new Client(`http://localhost:${server.address().port}`)
.compose(interceptors.cache())

after(async () => {
server.close()
await client.close()
})

await once(server, 'listening')

const request = {
origin: 'localhost',
method: 'GET',
path: '/'
}

await (await client.request(request)).body.dump()

const aborted = await new Promise((resolve, reject) => {
client.dispatch(request, {
onRequestStart (controller) {
controller.abort()
},
onResponseEnd () { reject(new Error('expected abort')) },
onResponseError (controller) { resolve(controller.aborted) }
})
})

strictEqual(aborted, true)
})

test('shared cache does not store responses with Set-Cookie', async () => {
let requestsToOrigin = 0
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
Expand Down
Loading