feat: switch proxy implementation (#1269)

peter-evans · Oct 18, 2022 · b4d5173 · b4d5173
1 parent ad43dcc
commit b4d5173
Show file tree

Hide file tree

Showing 8 changed files with 58,450 additions and 4,874 deletions.
diff --git a/dist/bridge.js b/dist/bridge.js
diff --git a/dist/events.js b/dist/events.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/setup-node-sandbox.js b/dist/setup-node-sandbox.js
diff --git a/dist/setup-sandbox.js b/dist/setup-sandbox.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "@octokit/core": "^3.5.1",
     "@octokit/plugin-paginate-rest": "^2.17.0",
     "@octokit/plugin-rest-endpoint-methods": "^5.13.0",
-    "https-proxy-agent": "^5.0.0",
+    "proxy-agent": "^5.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

diff --git a/src/octokit-client.ts b/src/octokit-client.ts
@@ -1,7 +1,7 @@
 import {Octokit as Core} from '@octokit/core'
 import {paginateRest} from '@octokit/plugin-paginate-rest'
 import {restEndpointMethods} from '@octokit/plugin-rest-endpoint-methods'
-import {HttpsProxyAgent} from 'https-proxy-agent'
+import ProxyAgent from 'proxy-agent'
 export {RestEndpointMethodTypes} from '@octokit/plugin-rest-endpoint-methods'
 export {OctokitOptions} from '@octokit/core/dist-types/types'
 
@@ -11,23 +11,18 @@ export const Octokit = Core.plugin(
   autoProxyAgent
 )
 
-// Octokit plugin to support the https_proxy and no_proxy environment variable
+// Octokit plugin to support the standard environment variables http_proxy, https_proxy and no_proxy
 function autoProxyAgent(octokit: Core) {
-  const proxy = process.env.https_proxy || process.env.HTTPS_PROXY
-
-  const noProxy = process.env.no_proxy || process.env.NO_PROXY
-  let noProxyArray: string[] = []
-  if (noProxy) {
-    noProxyArray = noProxy.split(',')
-  }
+  const proxy =
+    process.env.https_proxy ||
+    process.env.HTTPS_PROXY ||
+    process.env.http_proxy ||
+    process.env.HTTP_PROXY
 
   if (!proxy) return
 
-  const agent = new HttpsProxyAgent(proxy)
+  const agent = new ProxyAgent()
   octokit.hook.before('request', options => {
-    if (noProxyArray.includes(options.request.hostname)) {
-      return
-    }
     options.request.agent = agent
   })
 }