Merge pull request #5052 from jandubois/revert-https-proxy-agent-bump

Revert: Bump https-proxy-agent from 5.0.1 to 6.1.0

Author: jandubois

package-lock.json

@@ -70,7 +70,7 @@
     "fs-extra": "11.1.0",
     "http-proxy-agent": "5.0.0",
     "http-proxy-middleware": "2.0.6",
-    "https-proxy-agent": "6.1.0",
+    "https-proxy-agent": "5.0.1",
     "intl-messageformat": "10.2.5",
     "jquery": "3.6.3",
     "jsonpath": "1.1.1",

package.json

@@ -8,23 +8,13 @@ import { URL } from 'url';
 import { Agent, ClientRequest, RequestOptions, AgentCallbackReturn } from 'agent-base';
 import Electron from 'electron';
 import HttpProxyAgent from 'http-proxy-agent';
-import { HttpsProxyAgent, HttpsProxyAgentOptions } from 'https-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import { SocksProxyAgent } from 'socks-proxy-agent';
 
 import Logging from '@pkg/utils/logging';
 
 const console = Logging.background;
 
-interface HttpConnectOpts extends net.TcpNetConnectOpts {
-    secureEndpoint: false;
-}
-interface HttpsConnectOpts extends tls.ConnectionOptions {
-    port: number;
-    secureEndpoint: true;
-}
-
-type CustomAgentConnectOpts = HttpConnectOpts | HttpsConnectOpts;
-
 export default class ElectronProxyAgent extends Agent {
   protected session: Electron.Session;
 
@@ -85,25 +75,22 @@ export default class ElectronProxyAgent extends Agent {
   }
 }
 
-class CustomHttpsProxyAgent<Uri extends string> extends HttpsProxyAgent<Uri> {
-  constructor(proxy: Uri | URL, opts?: HttpsProxyAgentOptions<Uri>) {
+class CustomHttpsProxyAgent extends HttpsProxyAgent {
+  constructor(proxyURL: string, opts: HttpsAgentOptions) {
     // Use object destructing here to ensure we only get wanted properties.
-    const { hostname, port, protocol } = new URL(proxy.toString());
+    const { hostname, port, protocol } = new URL(proxyURL);
     const mergedOpts = Object.assign({}, opts, {
       hostname, port, protocol,
     });
 
-    super(proxy, mergedOpts);
-    if (opts) {
-      this.options = opts;
-    }
+    super(mergedOpts);
+    this.options = opts;
   }
 
-  async connect(req: http.ClientRequest, opts: CustomAgentConnectOpts): Promise<net.Socket> {
+  callback(req: ClientRequest, opts: RequestOptions): Promise<net.Socket> {
     const mergedOptions = Object.assign({}, this.options, opts);
-    const socket = await super.connect(req, mergedOptions);
 
-    return socket;
+    return super.callback(req, mergedOptions);
   }
 }