Merge pull request #1 from beyondkmp/https

Reprioritize to HTTP->SOCKS->HTTPS & use http:// in HTTPS proxy URL

Author: pimterry

src/index.ts

@@ -27,12 +27,7 @@ export async function getSystemProxy(): Promise<ProxyConfig | undefined> {
 
         const noProxy = proxySettings.ExceptionsList || [];
 
-        if (proxySettings.HTTPSEnable && proxySettings.HTTPSProxy && proxySettings.HTTPSPort) {
-            return {
-                proxyUrl: `https://${proxySettings.HTTPSProxy}:${proxySettings.HTTPSPort}`,
-                noProxy
-            };
-        } else if (proxySettings.HTTPEnable && proxySettings.HTTPProxy && proxySettings.HTTPPort) {
+        if (proxySettings.HTTPEnable && proxySettings.HTTPProxy && proxySettings.HTTPPort) {
             return {
                 proxyUrl: `http://${proxySettings.HTTPProxy}:${proxySettings.HTTPPort}`,
                 noProxy
@@ -42,6 +37,11 @@ export async function getSystemProxy(): Promise<ProxyConfig | undefined> {
                 proxyUrl: `socks://${proxySettings.SOCKSProxy}:${proxySettings.SOCKSPort}`,
                 noProxy
             };
+        } else if (proxySettings.HTTPSEnable && proxySettings.HTTPSProxy && proxySettings.HTTPSPort) {
+            return {
+                proxyUrl: `http://${proxySettings.HTTPSProxy}:${proxySettings.HTTPSPort}`,
+                noProxy
+            };
         } else {
             return undefined;
         }