YuuMJ1997/mihomo-party
1
0
Fork 0
mirror of https://gh.catmak.name/https://github.com/mihomo-party-org/mihomo-party synced 2025-12-26 20:50:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix defaultBypass almost always be the default bypass of Windows (#602)

Browse Source 
感谢PR!
This commit is contained in:
Amamiya Miu 2025-03-22 23:36:21 +08:00 committed by GitHub
parent 6ffcf544b8
commit 69e65a3959
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/renderer/src/pages/sysproxy.tsx
View File

@ -11,44 +11,6 @@ import React from 'react'
import { MdDeleteForever } from 'react-icons/md' import { MdDeleteForever } from 'react-icons/md'
import { useTranslation } from 'react-i18next' 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',
'<local>'
]
: [
'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.*',
'<local>'
]
const defaultPacScript = ` const defaultPacScript = `
function FindProxyForURL(url, host) { function FindProxyForURL(url, host) {
return "PROXY 127.0.0.1:%mixed-port%; SOCKS5 127.0.0.1:%mixed-port%; DIRECT;"; 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 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',
'<local>'
]
: [
'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.*',
'<local>'
]
const { t } = useTranslation() const { t } = useTranslation()
const { appConfig, patchAppConfig } = useAppConfig() const { appConfig, patchAppConfig } = useAppConfig()
const { sysProxy } = appConfig || ({ sysProxy: { enable: false } } as IAppConfig) const { sysProxy } = appConfig || ({ sysProxy: { enable: false } } as IAppConfig)
@ -93,20 +93,20 @@ const Sysproxy: React.FC = () => {
const onSave = async (): Promise<void> => { const onSave = async (): Promise<void> => {
setChanged(false) setChanged(false)
// 保存当前的开关状态，以便在失败时恢复 // 保存当前的开关状态，以便在失败时恢复
const previousState = values.enable const previousState = values.enable
try { try {
await patchAppConfig({ sysProxy: values }) await patchAppConfig({ sysProxy: values })
await triggerSysProxy(true) await triggerSysProxy(true)
await patchAppConfig({ sysProxy: { enable: true } }) await patchAppConfig({ sysProxy: { enable: true } })
} catch (e) { } catch (e) {
setValues({ ...values, enable: previousState }) setValues({ ...values, enable: previousState })
setChanged(true) setChanged(true)
alert(e) alert(e)
await patchAppConfig({ sysProxy: { enable: false } }) await patchAppConfig({ sysProxy: { enable: false } })
} }
} }