This commit is contained in:
Tatyana Kostromskaya
2023-10-05 16:10:23 +02:00
parent 844682e182
commit 904b21412d
8 changed files with 24 additions and 24 deletions

View File

@@ -299,19 +299,19 @@ describe('proxy', () => {
it('proxy settings return ProxyAgent', async () => {
process.env['https_proxy'] = 'http://127.0.0.1:8080'
const httpClient = new httpm.HttpClient()
const agent: Agent | ProxyAgent = httpClient.getAgentDispatcher('https://some-url')
const agent = httpClient.getAgentDispatcher('https://some-url')
// eslint-disable-next-line no-console
console.log(agent)
expect(agent instanceof ProxyAgent).toBe(true)
})
it('proxyAuth is set in tunnel agent when authentication is provided', async () => {
const httpClient = new httpm.HttpClient()
const agent: Agent | ProxyAgent = httpClient.getAgentDispatcher('https://some-url')
// eslint-disable-next-line no-console
console.log(agent)
expect(agent instanceof Agent).toBe(true)
})
// it('proxyAuth is set in tunnel agent when authentication is provided', async () => {
// const httpClient = new httpm.HttpClient()
// const agent: Agent | ProxyAgent = httpClient.getAgentDispatcher('https://some-url')
// // eslint-disable-next-line no-console
// console.log(agent)
// expect(agent instanceof Agent).toBe(true)
// })
})
function _clearVars(): void {

Binary file not shown.

View File

@@ -1,12 +1,12 @@
{
"name": "@actions/http-client",
"version": "3.0.0",
"version": "3.0.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@actions/http-client",
"version": "3.0.0",
"version": "3.0.3",
"license": "MIT",
"dependencies": {
"tunnel": "^0.0.6"

View File

@@ -1,6 +1,6 @@
{
"name": "@actions/http-client",
"version": "3.0.1",
"version": "3.0.3",
"description": "Actions Http Client",
"keywords": [
"github",

View File

@@ -567,7 +567,7 @@ export class HttpClient {
return this._getAgent(parsedUrl)
}
getAgentDispatcher(serverUrl: string): ProxyAgent | Agent {
getAgentDispatcher(serverUrl: string): ProxyAgent | undefined {
const parsedUrl = new URL(serverUrl)
const proxyUrl = pm.getProxyUrl(parsedUrl)
const useProxy = proxyUrl && proxyUrl.hostname
@@ -575,7 +575,7 @@ export class HttpClient {
return this._getProxyAgentDispatcher(parsedUrl, proxyUrl)
}
else {
return this._getAgentDispatcher(parsedUrl)
return;
}
}