From a84763def6534b688ea4e07c37934b2495d3cca1 Mon Sep 17 00:00:00 2001 From: beyondkmp Date: Wed, 23 Apr 2025 15:53:25 +0800 Subject: [PATCH] fix(proxy): update os-proxy-config patch to correct proxy URL handling (#5222) * 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 --- ...os-proxy-config-npm-1.1.1-af9c7574cc.patch | 32 +++++++++++++++++++ package.json | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 .yarn/patches/os-proxy-config-npm-1.1.1-af9c7574cc.patch diff --git a/.yarn/patches/os-proxy-config-npm-1.1.1-af9c7574cc.patch b/.yarn/patches/os-proxy-config-npm-1.1.1-af9c7574cc.patch new file mode 100644 index 00000000..89d06fb1 --- /dev/null +++ b/.yarn/patches/os-proxy-config-npm-1.1.1-af9c7574cc.patch @@ -0,0 +1,32 @@ +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 + }; + } diff --git a/package.json b/package.json index a03db8f2..21c4e3c2 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "markdown-it": "^14.1.0", "node-stream-zip": "^1.15.0", "officeparser": "^4.1.1", - "os-proxy-config": "^1.1.1", + "os-proxy-config": "patch:os-proxy-config@npm%3A1.1.1#~/.yarn/patches/os-proxy-config-npm-1.1.1-af9c7574cc.patch", "proxy-agent": "^6.5.0", "tar": "^7.4.3", "turndown": "^7.2.0",