actions
/
toolkit
mirror of https://github.com/actions/toolkit
1
0
Fork 0
Code

fix format

pull/1547/head
Tatyana Kostromskaya 2023-10-05 16:34:31 +02:00
parent 0faced6a0b
commit 129f884271
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/http-client/__tests__/proxy.test.ts
View File

@ -3,7 +3,7 @@
import * as http from 'http' import * as http from 'http'
import * as httpm from '../lib/' import * as httpm from '../lib/'
import * as pm from '../lib/proxy' import * as pm from '../lib/proxy'
import { ProxyAgent } from "undici"; import {ProxyAgent} from 'undici'
// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
const proxy = require('proxy') const proxy = require('proxy')

14
packages/http-client/src/index.ts
View File

@ -6,7 +6,7 @@ import * as ifm from './interfaces'
import * as net from 'net' import * as net from 'net'
import * as pm from './proxy' import * as pm from './proxy'
import * as tunnel from 'tunnel' import * as tunnel from 'tunnel'
import { ProxyAgent } from "undici"; import {ProxyAgent} from 'undici'
export enum HttpCodes { export enum HttpCodes {
OK = 200, OK = 200,
@ -571,7 +571,7 @@ export class HttpClient {
const proxyUrl = pm.getProxyUrl(parsedUrl) const proxyUrl = pm.getProxyUrl(parsedUrl)
const useProxy = proxyUrl && proxyUrl.hostname const useProxy = proxyUrl && proxyUrl.hostname
if (!useProxy) { if (!useProxy) {
return; return
} }
return this._getProxyAgentDispatcher(parsedUrl, proxyUrl) return this._getProxyAgentDispatcher(parsedUrl, proxyUrl)
@ -715,7 +715,7 @@ export class HttpClient {
} }
private _getProxyAgentDispatcher(parsedUrl: URL, proxyUrl: URL): ProxyAgent { private _getProxyAgentDispatcher(parsedUrl: URL, proxyUrl: URL): ProxyAgent {
let proxyAgent; let proxyAgent
if (this._keepAlive) { if (this._keepAlive) {
proxyAgent = this._proxyAgentDispatcher proxyAgent = this._proxyAgentDispatcher
@ -727,19 +727,15 @@ export class HttpClient {
} }
const usingSsl = parsedUrl.protocol === 'https:' const usingSsl = parsedUrl.protocol === 'https:'
let maxSockets = 100
if (this.requestOptions) {
maxSockets = this.requestOptions.maxSockets || http.globalAgent.maxSockets
}
// This is `useProxy` again, but we need to check `proxyURl` directly for TypeScripts's flow analysis. // This is `useProxy` again, but we need to check `proxyURl` directly for TypeScripts's flow analysis.
if (proxyUrl && proxyUrl.hostname) { if (proxyUrl && proxyUrl.hostname) {
proxyAgent = new ProxyAgent({ proxyAgent = new ProxyAgent({
uri: proxyUrl.href, uri: proxyUrl.href,
pipelining: (!this._keepAlive ? 0 : 1), pipelining: !this._keepAlive ? 0 : 1,
...((proxyUrl.username || proxyUrl.password) && { ...((proxyUrl.username || proxyUrl.password) && {
token: `${proxyUrl.username}:${proxyUrl.password}` token: `${proxyUrl.username}:${proxyUrl.password}`
}), })
}) })
this._proxyAgentDispatcher = proxyAgent this._proxyAgentDispatcher = proxyAgent
} }