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
4 changes: 3 additions & 1 deletion lib/dispatcher/agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ class Agent extends DispatcherBase {
if (connected) result.count -= 1
if (result.count <= 0) {
this[kClients].delete(key)
result.dispatcher.close()
if (!result.dispatcher.destroyed) {
result.dispatcher.close()
}
}
this[kOrigins].delete(key)
}
Expand Down
14 changes: 10 additions & 4 deletions lib/dispatcher/pool-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,12 @@ class PoolBase extends DispatcherBase {
}

if (this[kClosedResolve] && queue.isEmpty()) {
const closeAll = new Array(this[kClients].length)
const closeAll = []
for (let i = 0; i < this[kClients].length; i++) {
closeAll[i] = this[kClients][i].close()
const client = this[kClients][i]
if (!client.destroyed) {
closeAll.push(client.close())
}
}
return Promise.all(closeAll)
.then(this[kClosedResolve])
Expand Down Expand Up @@ -119,9 +122,12 @@ class PoolBase extends DispatcherBase {

[kClose] () {
if (this[kQueue].isEmpty()) {
const closeAll = new Array(this[kClients].length)
const closeAll = []
for (let i = 0; i < this[kClients].length; i++) {
closeAll[i] = this[kClients][i].close()
const client = this[kClients][i]
if (!client.destroyed) {
closeAll.push(client.close())
}
}
return Promise.all(closeAll)
} else {
Expand Down
44 changes: 44 additions & 0 deletions test/issue-4806.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
'use strict'

const { test, after } = require('node:test')
const { createServer } = require('node:http')
const { once } = require('node:events')
const { tspl } = require('@matteo.collina/tspl')

const { Agent, request } = require('..')

// https://github.com/nodejs/undici/issues/4806
test('Agent clientTtl cleanup does not trigger unhandled rejections', async (t) => {
t = tspl(t, { plan: 2 })

const server = createServer((req, res) => {
res.end('ok')
})

after(() => server.close())

server.listen(0, async () => {
const agent = new Agent({ clientTtl: 10 })
after(async () => agent.close())

const onUnhandled = (err) => t.fail(err)
process.once('unhandledRejection', onUnhandled)
after(() => process.removeListener('unhandledRejection', onUnhandled))

const origin = `http://localhost:${server.address().port}`

const res1 = await request(origin, { dispatcher: agent })
t.strictEqual(res1.statusCode, 200)

await new Promise(resolve => setTimeout(resolve, 20))

const res2 = await request(origin, { dispatcher: agent })
t.strictEqual(res2.statusCode, 200)
res2.body.resume()
await once(res2.body, 'end')

await new Promise(resolve => setTimeout(resolve, 20))
})

await t.completed
})
Loading