Skip to content
Open
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
20 changes: 15 additions & 5 deletions test/node-test/balanced-pool.js
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,10 @@ test('getUpstream returns undefined for closed/destroyed upstream', (t) => {
p.strictEqual(result, undefined)
})

function getErrorPort (err) {
return err?.socket?.remotePort ?? err?.port
}

class TestServer {
constructor ({ config: { server, socketHangup, downOnRequests, socketHangupOnRequests }, onRequest }) {
this.config = {
Expand Down Expand Up @@ -604,16 +608,22 @@ describe('weighted round robin', () => {
try {
await client.request({ path: '/', method: 'GET' })
} catch (e) {
const serverWithError =
servers.find(server => server.port === e.port) ||
servers.find(server => {
const serverWithError = servers.find(server => {
if (server.port === getErrorPort(e)) {
return true
}

if (typeof AggregateError === 'function' && e instanceof AggregateError) {
return e.errors.some(e => server.port === (e.socket?.remotePort ?? e.port))
return e.errors.some(err => server.port === getErrorPort(err))
}

return server.port === e.socket.remotePort
return false
})

if (serverWithError === undefined) {
throw e
}

serverWithError.requestsCount++

if (e.code === 'ECONNREFUSED') {
Expand Down
Loading