From 69e65a3959f7a09b4b9585d9ef838a3166e52c20 Mon Sep 17 00:00:00 2001 From: Amamiya Miu Date: Sat, 22 Mar 2025 23:36:21 +0800 Subject: [PATCH] fix: Fix defaultBypass almost always be the default bypass of Windows (#602) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 感谢PR! --- src/renderer/src/pages/sysproxy.tsx | 84 ++++++++++++++--------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src/renderer/src/pages/sysproxy.tsx b/src/renderer/src/pages/sysproxy.tsx index f9a8aaa..4c5d2d7 100644 --- a/src/renderer/src/pages/sysproxy.tsx +++ b/src/renderer/src/pages/sysproxy.tsx @@ -11,44 +11,6 @@ import React from 'react' import { MdDeleteForever } from 'react-icons/md' import { useTranslation } from 'react-i18next' -const defaultBypass: string[] = - platform === 'linux' - ? ['localhost', '127.0.0.1', '192.168.0.0/16', '10.0.0.0/8', '172.16.0.0/12', '::1'] - : platform === 'darwin' - ? [ - '127.0.0.1', - '192.168.0.0/16', - '10.0.0.0/8', - '172.16.0.0/12', - 'localhost', - '*.local', - '*.crashlytics.com', - '' - ] - : [ - 'localhost', - '127.*', - '192.168.*', - '10.*', - '172.16.*', - '172.17.*', - '172.18.*', - '172.19.*', - '172.20.*', - '172.21.*', - '172.22.*', - '172.23.*', - '172.24.*', - '172.25.*', - '172.26.*', - '172.27.*', - '172.28.*', - '172.29.*', - '172.30.*', - '172.31.*', - '' - ] - const defaultPacScript = ` function FindProxyForURL(url, host) { return "PROXY 127.0.0.1:%mixed-port%; SOCKS5 127.0.0.1:%mixed-port%; DIRECT;"; @@ -56,6 +18,44 @@ function FindProxyForURL(url, host) { ` const Sysproxy: React.FC = () => { + const defaultBypass: string[] = + platform === 'linux' + ? ['localhost', '127.0.0.1', '192.168.0.0/16', '10.0.0.0/8', '172.16.0.0/12', '::1'] + : platform === 'darwin' + ? [ + '127.0.0.1', + '192.168.0.0/16', + '10.0.0.0/8', + '172.16.0.0/12', + 'localhost', + '*.local', + '*.crashlytics.com', + '' + ] + : [ + 'localhost', + '127.*', + '192.168.*', + '10.*', + '172.16.*', + '172.17.*', + '172.18.*', + '172.19.*', + '172.20.*', + '172.21.*', + '172.22.*', + '172.23.*', + '172.24.*', + '172.25.*', + '172.26.*', + '172.27.*', + '172.28.*', + '172.29.*', + '172.30.*', + '172.31.*', + '' + ] + const { t } = useTranslation() const { appConfig, patchAppConfig } = useAppConfig() const { sysProxy } = appConfig || ({ sysProxy: { enable: false } } as IAppConfig) @@ -93,20 +93,20 @@ const Sysproxy: React.FC = () => { const onSave = async (): Promise => { setChanged(false) - + // 保存当前的开关状态,以便在失败时恢复 const previousState = values.enable - + try { await patchAppConfig({ sysProxy: values }) await triggerSysProxy(true) - + await patchAppConfig({ sysProxy: { enable: true } }) } catch (e) { setValues({ ...values, enable: previousState }) setChanged(true) alert(e) - + await patchAppConfig({ sysProxy: { enable: false } }) } }