fixed proxy settings (#34)

Timon0 · timonkurmann · web-flow · commit 2f4311be6706 · 2020-09-02T09:48:52.000+02:00
Co-authored-by: k5t &lt;timon.kurmann@suva.ch&gt;
diff --git a/utils.js b/utils.js
@@ -129,17 +129,20 @@ module.exports = {
                     tunnelOptions.proxy.proxyAuth = `${proxyUrl.username}:${proxyUrl.password}`;
                 }
 
+                const agent = {};
                 if (url.startsWith('https://')) {
                     if (proxy.startsWith('https://')) {
-                        requestOptions.agent = tunnel.httpsOverHttps(tunnelOptions);
+                        agent.https = tunnel.httpsOverHttps(tunnelOptions);
                     } else {
-                        requestOptions.agent = tunnel.httpsOverHttp(tunnelOptions);
+                        agent.https = tunnel.httpsOverHttp(tunnelOptions);
                     }
                 } else if (proxy.startsWith('https://')) {
-                    requestOptions.agent = tunnel.httpOverHttps(tunnelOptions);
+                    agent.http = tunnel.httpOverHttps(tunnelOptions);
                 } else {
-                    requestOptions.agent = tunnel.httpOverHttp(tunnelOptions);
+                    agent.http = tunnel.httpOverHttp(tunnelOptions);
                 }
+
+                requestOptions.agent = agent;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -129,17 +129,20 @@ module.exports = {`
`129`	`129`	tunnelOptions.proxy.proxyAuth = `${proxyUrl.username}:${proxyUrl.password}`;
`130`	`130`	`}`
`131`	`131`
	`132`	`+ const agent = {};`
`132`	`133`	`if (url.startsWith('https://')) {`
`133`	`134`	`if (proxy.startsWith('https://')) {`
`134`		`- requestOptions.agent = tunnel.httpsOverHttps(tunnelOptions);`
	`135`	`+ agent.https = tunnel.httpsOverHttps(tunnelOptions);`
`135`	`136`	`} else {`
`136`		`- requestOptions.agent = tunnel.httpsOverHttp(tunnelOptions);`
	`137`	`+ agent.https = tunnel.httpsOverHttp(tunnelOptions);`
`137`	`138`	`}`
`138`	`139`	`} else if (proxy.startsWith('https://')) {`
`139`		`- requestOptions.agent = tunnel.httpOverHttps(tunnelOptions);`
	`140`	`+ agent.http = tunnel.httpOverHttps(tunnelOptions);`
`140`	`141`	`} else {`
`141`		`- requestOptions.agent = tunnel.httpOverHttp(tunnelOptions);`
	`142`	`+ agent.http = tunnel.httpOverHttp(tunnelOptions);`
`142`	`143`	`}`
	`144`	`+`
	`145`	`+ requestOptions.agent = agent;`
`143`	`146`	`}`
`144`	`147`	`}`
`145`	`148`