Skip to content

Commit

Permalink
Make sure RequestOptions.keepAlive is applied properly on node20 runt…
Browse files Browse the repository at this point in the history
…ime (#1572)
  • Loading branch information
teatimeguest committed Feb 28, 2024
1 parent df3315b commit ff435e5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
6 changes: 6 additions & 0 deletions packages/http-client/__tests__/keepalive.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ describe('basics', () => {
_http.dispose()
})

it.each([true, false])('creates Agent with keepAlive %s', keepAlive => {
const http = new httpm.HttpClient('http-client-tests', [], {keepAlive})
const agent = http.getAgent('http://postman-echo.com')
expect(agent).toHaveProperty('keepAlive', keepAlive)
})

it('does basic http get request with keepAlive true', async () => {
const res: httpm.HttpClientResponse = await _http.get(
'http://postman-echo.com/get'
Expand Down
11 changes: 3 additions & 8 deletions packages/http-client/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ export class HttpClient {
agent = this._proxyAgent
}

if (this._keepAlive && !useProxy) {
if (!useProxy) {
agent = this._agent
}

Expand Down Expand Up @@ -690,18 +690,13 @@ export class HttpClient {
this._proxyAgent = agent
}

// if reusing agent across request and tunneling agent isn't assigned create a new agent
if (this._keepAlive && !agent) {
// if tunneling agent isn't assigned create a new agent
if (!agent) {
const options = {keepAlive: this._keepAlive, maxSockets}
agent = usingSsl ? new https.Agent(options) : new http.Agent(options)
this._agent = agent
}

// if not using private agent and tunnel agent isn't setup then use global agent
if (!agent) {
agent = usingSsl ? https.globalAgent : http.globalAgent
}

if (usingSsl && this._ignoreSslError) {
// we don't want to set NODE_TLS_REJECT_UNAUTHORIZED=0 since that will affect request for entire process
// http.RequestOptions doesn't expose a way to modify RequestOptions.agent.options
Expand Down

0 comments on commit ff435e5

Please sign in to comment.