* fix(proxy): update os-proxy-config patch to correct proxy URL handling - Modified the os-proxy-config dependency in package.json to apply a patch. - The patch updates the logic in getSystemProxy to correctly handle HTTP and SOCKS proxy settings. * use http instead of https for https proxy
33 lines
1.8 KiB
Diff
Vendored
33 lines
1.8 KiB
Diff
Vendored
diff --git a/dist/index.js b/dist/index.js
|
|
index 663919ac5bb4f9147c5c1b09bd2e379586266a4b..88ff8873ac5beb5eb293f7e741a92fb15b00960c 100644
|
|
--- a/dist/index.js
|
|
+++ b/dist/index.js
|
|
@@ -20,21 +20,21 @@ function getSystemProxy() {
|
|
else if (process.platform === 'darwin') {
|
|
const proxySettings = yield mac_system_proxy_1.getMacSystemProxy();
|
|
const noProxy = proxySettings.ExceptionsList || [];
|
|
- if (proxySettings.HTTPSEnable && proxySettings.HTTPSProxy && proxySettings.HTTPSPort) {
|
|
+ if (proxySettings.HTTPEnable && proxySettings.HTTPProxy && proxySettings.HTTPPort) {
|
|
return {
|
|
- proxyUrl: `https://${proxySettings.HTTPSProxy}:${proxySettings.HTTPSPort}`,
|
|
+ proxyUrl: `http://${proxySettings.HTTPProxy}:${proxySettings.HTTPPort}`,
|
|
noProxy
|
|
};
|
|
}
|
|
- else if (proxySettings.HTTPEnable && proxySettings.HTTPProxy && proxySettings.HTTPPort) {
|
|
+ else if (proxySettings.SOCKSEnable && proxySettings.SOCKSProxy && proxySettings.SOCKSPort) {
|
|
return {
|
|
- proxyUrl: `http://${proxySettings.HTTPProxy}:${proxySettings.HTTPPort}`,
|
|
+ proxyUrl: `socks://${proxySettings.SOCKSProxy}:${proxySettings.SOCKSPort}`,
|
|
noProxy
|
|
};
|
|
}
|
|
- else if (proxySettings.SOCKSEnable && proxySettings.SOCKSProxy && proxySettings.SOCKSPort) {
|
|
+ else if (proxySettings.HTTPSEnable && proxySettings.HTTPSProxy && proxySettings.HTTPSPort) {
|
|
return {
|
|
- proxyUrl: `socks://${proxySettings.SOCKSProxy}:${proxySettings.SOCKSPort}`,
|
|
+ proxyUrl: `http://${proxySettings.HTTPSProxy}:${proxySettings.HTTPSPort}`,
|
|
noProxy
|
|
};
|
|
}
|