Merge pull request #428 from etemi/master

Configure 'Got' to use HttpsProxyAgent for https URLs
yoheimuta · Aug 8, 2024 · 6cc254e · 6cc254e
2 parents 5b01353 + 903a0c3
commit 6cc254e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/bdist/js/install.mjs b/bdist/js/install.mjs
@@ -2,6 +2,7 @@ import { got } from 'got';
 import { createFetch } from 'got-fetch';
 import npmlog from 'npmlog';
 import { HttpProxyAgent } from 'http-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import * as fs from 'fs';
 import { temporaryFile } from 'tempy';
 import * as tar from 'tar';
@@ -26,7 +27,8 @@ const arch = _arch_mapping[_arch] ?? _arch;
 
 const url = `${protolint_host}/${protolint_path}/v${protolint_version}/${module_name}_${protolint_version}_${platform}_${arch}.tar.gz`;
 
-let agent;
+let httpAgent;
+let httpsAgent;
 
 let proxy_address;
 
@@ -39,11 +41,13 @@ if (!process.env.PROTOLINT_NO_PROXY) {
 }
 
 if (proxy_address) {
-    agent = new HttpProxyAgent(proxy_address);
+    httpAgent = new HttpProxyAgent(proxy_address);
+    httpsAgent = new HttpsProxyAgent(proxy_address);
 }
 
 const agent_config = {
-    http: agent
+    http: httpAgent,
+    https: httpsAgent
 };
 
 const got_config = {

diff --git a/bdist/js/package-lock.json b/bdist/js/package-lock.json
diff --git a/bdist/js/package.json b/bdist/js/package.json
@@ -44,6 +44,7 @@
     "got": "^12.0.0",
     "got-fetch": "^5.1.6",
     "http-proxy-agent": "^7.0.0",
+    "https-proxy-agent": "^7.0.0",
     "npmlog": "^7.0.1",
     "semver": "^7.5.4",
     "tar": "^6.2.0",