github/ChatLab
1
0 Fork 0
mirror of https://github.com/hellodigua/ChatLab.git synced 2026-10-25 17:54:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(electron): preserve socks proxy fallback

Browse Source 
Return a recorded SOCKS proxy before a fallback DIRECT rule so local model downloads fail explicitly instead of silently bypassing the configured system proxy.
This commit is contained in:
digua committed 2026-06-26 09:56:32 +08:00
1 parent cbc8728f41
commit 6cc7454049
2 files changed
+2 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/desktop/main/network/proxy-resolver.test.ts
+1
View File
@@ -14,6 +14,7 @@ test('proxyUrlFromElectronResolvedProxy returns the first usable model download
proxyUrlFromElectronResolvedProxy('SOCKS5 127.0.0.1:1080; PROXY 127.0.0.1:7890'),
'http://127.0.0.1:7890'
)
assert.equal(proxyUrlFromElectronResolvedProxy('SOCKS5 127.0.0.1:1080; DIRECT'), 'socks5://127.0.0.1:1080')
assert.equal(proxyUrlFromElectronResolvedProxy('SOCKS5 127.0.0.1:1080'), 'socks5://127.0.0.1:1080')
assert.equal(proxyUrlFromElectronResolvedProxy('SOCKS 127.0.0.1:1080'), 'socks://127.0.0.1:1080')
})
apps/desktop/main/network/proxy-resolver.ts
+1 -1
View File
@@ -10,7 +10,7 @@ export function proxyUrlFromElectronResolvedProxy(resolvedProxy: string): string
for (const rawRule of resolvedProxy.split(';')) {
const rule = rawRule.trim()
if (!rule) continue
if (rule.toUpperCase() === 'DIRECT') return undefined
if (rule.toUpperCase() === 'DIRECT') return firstSocksProxyUrl
const [schemeRaw, targetRaw] = rule.split(/\s+/, 2)
const scheme = schemeRaw?.toUpperCase()