feat: automatic mixed port fallback (#7579)

* feat: automatically select an available mixed proxy port

* fix: coordinate listener port changes

* fix: detect Windows listener port conflicts
This commit is contained in:
wonfen
2026-07-25 05:47:28 +08:00
committed by GitHub
parent 91d0643b5c
commit 7796259b03
47 changed files with 1644 additions and 192 deletions
+36 -120
View File
@@ -9,13 +9,13 @@ import {
TextField,
} from '@mui/material'
import { useLockFn, useRequest } from 'ahooks'
import { forwardRef, useImperativeHandle, useRef, useState } from 'react'
import { forwardRef, useImperativeHandle, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { BaseDialog, Switch } from '@/components/base'
import { useClashInfo } from '@/hooks/use-clash'
import { useDisplayedMixedPort } from '@/hooks/use-displayed-mixed-port'
import { useVerge } from '@/hooks/use-verge'
import { isPortInUse } from '@/services/cmds'
import { saveProxyPorts } from '@/services/cmds'
import { showNotice } from '@/services/notice-service'
import getSystem from '@/utils/get-system'
@@ -31,14 +31,12 @@ const generateRandomPort = () =>
export const ClashPortViewer = forwardRef<ClashPortViewerRef>((_, ref) => {
const { t } = useTranslation()
const { clashInfo, patchInfo } = useClashInfo()
const { verge, patchVerge } = useVerge()
const { verge } = useVerge()
const displayedMixedPort = useDisplayedMixedPort()
const [open, setOpen] = useState(false)
// Mixed Port
const [mixedPort, setMixedPort] = useState(
verge?.verge_mixed_port ?? clashInfo?.mixed_port ?? 7897,
)
const [mixedPort, setMixedPort] = useState(displayedMixedPort)
// 其他端口状态
const [socksPort, setSocksPort] = useState(verge?.verge_socks_port ?? 7898)
@@ -58,50 +56,35 @@ export const ClashPortViewer = forwardRef<ClashPortViewerRef>((_, ref) => {
verge?.verge_tproxy_enabled ?? false,
)
// 保存打开对话框时的原始值,用于在检测到端口被占用时恢复
const originalPortsRef = useRef<Record<string, any> | null>(null)
// 添加保存请求,防止GUI卡死
const { loading, run: saveSettings } = useRequest(
async (params: { clashConfig: any; vergeConfig: any }) => {
const { clashConfig, vergeConfig } = params
await Promise.all([patchInfo(clashConfig), patchVerge(vergeConfig)])
const { loading, runAsync: saveSettings } = useRequest(saveProxyPorts, {
manual: true,
onSuccess: (outcome) => {
if (outcome.status === 'conflict') {
showNotice.error('settings.modals.clashPort.messages.portInUse', {
port: outcome.port,
})
return
}
setOpen(false)
showNotice.success('settings.modals.clashPort.messages.saved')
},
{
manual: true,
onSuccess: () => {
setOpen(false)
showNotice.success('settings.modals.clashPort.messages.saved')
},
onError: (error) => {
showNotice.error('settings.modals.clashPort.messages.saveFailed', error)
},
onError: (error) => {
showNotice.error('settings.modals.clashPort.messages.saveFailed', error)
},
)
})
useImperativeHandle(ref, () => ({
open: () => {
originalPortsRef.current = {
mixedPort: verge?.verge_mixed_port ?? clashInfo?.mixed_port ?? 7897,
socksPort: verge?.verge_socks_port ?? 7898,
socksEnabled: verge?.verge_socks_enabled ?? false,
httpPort: verge?.verge_port ?? 7899,
httpEnabled: verge?.verge_http_enabled ?? false,
redirPort: verge?.verge_redir_port ?? 7895,
redirEnabled: verge?.verge_redir_enabled ?? false,
tproxyPort: verge?.verge_tproxy_port ?? 7896,
tproxyEnabled: verge?.verge_tproxy_enabled ?? false,
}
setMixedPort(originalPortsRef.current.mixedPort)
setSocksPort(originalPortsRef.current.socksPort)
setSocksEnabled(originalPortsRef.current.socksEnabled)
setHttpPort(originalPortsRef.current.httpPort)
setHttpEnabled(originalPortsRef.current.httpEnabled)
setRedirPort(originalPortsRef.current.redirPort)
setRedirEnabled(originalPortsRef.current.redirEnabled)
setTproxyPort(originalPortsRef.current.tproxyPort)
setTproxyEnabled(originalPortsRef.current.tproxyEnabled)
setMixedPort(displayedMixedPort)
setSocksPort(verge?.verge_socks_port ?? 7898)
setSocksEnabled(verge?.verge_socks_enabled ?? false)
setHttpPort(verge?.verge_port ?? 7899)
setHttpEnabled(verge?.verge_http_enabled ?? false)
setRedirPort(verge?.verge_redir_port ?? 7895)
setRedirEnabled(verge?.verge_redir_enabled ?? false)
setTproxyPort(verge?.verge_tproxy_port ?? 7896)
setTproxyEnabled(verge?.verge_tproxy_enabled ?? false)
setOpen(true)
},
close: () => setOpen(false),
@@ -136,80 +119,13 @@ export const ClashPortViewer = forwardRef<ClashPortViewerRef>((_, ref) => {
return
}
const original = originalPortsRef.current
const changedPorts: number[] = []
if (mixedPort !== original?.mixedPort) changedPorts.push(mixedPort)
if (socksEnabled && socksPort !== original?.socksPort)
changedPorts.push(socksPort)
if (httpEnabled && httpPort !== original?.httpPort)
changedPorts.push(httpPort)
if (redirEnabled && redirPort !== original?.redirPort)
changedPorts.push(redirPort)
if (tproxyEnabled && tproxyPort !== original?.tproxyPort)
changedPorts.push(tproxyPort)
for (const port of changedPorts) {
try {
const inUse = await isPortInUse(port)
if (inUse) {
showNotice.error('settings.modals.clashPort.messages.portInUse', {
port,
})
if (original) {
setMixedPort(original.mixedPort)
setSocksPort(original.socksPort)
setSocksEnabled(original.socksEnabled)
setHttpPort(original.httpPort)
setHttpEnabled(original.httpEnabled)
setRedirPort(original.redirPort)
setRedirEnabled(original.redirEnabled)
setTproxyPort(original.tproxyPort)
setTproxyEnabled(original.tproxyEnabled)
} else {
setMixedPort(
verge?.verge_mixed_port ?? clashInfo?.mixed_port ?? 7897,
)
setSocksPort(verge?.verge_socks_port ?? 7898)
setSocksEnabled(verge?.verge_socks_enabled ?? false)
setHttpPort(verge?.verge_port ?? 7899)
setHttpEnabled(verge?.verge_http_enabled ?? false)
setRedirPort(verge?.verge_redir_port ?? 7895)
setRedirEnabled(verge?.verge_redir_enabled ?? false)
setTproxyPort(verge?.verge_tproxy_port ?? 7896)
setTproxyEnabled(verge?.verge_tproxy_enabled ?? false)
}
return
}
} catch (error) {
showNotice.error(error)
return
}
}
// 准备配置数据
const clashConfig = {
'mixed-port': mixedPort,
'socks-port': socksPort,
port: httpPort,
'redir-port': redirPort,
'tproxy-port': tproxyPort,
}
const vergeConfig = {
verge_mixed_port: mixedPort,
verge_socks_port: socksPort,
verge_socks_enabled: socksEnabled,
verge_port: httpPort,
verge_http_enabled: httpEnabled,
verge_redir_port: redirPort,
verge_redir_enabled: redirEnabled,
verge_tproxy_port: tproxyPort,
verge_tproxy_enabled: tproxyEnabled,
}
// 提交保存请求
saveSettings({ clashConfig, vergeConfig })
await saveSettings({
mixedPort,
socks: { enabled: socksEnabled, port: socksPort },
http: { enabled: httpEnabled, port: httpPort },
redir: { enabled: redirEnabled, port: redirPort },
tproxy: { enabled: tproxyEnabled, port: tproxyPort },
})
})
return (
@@ -32,6 +32,7 @@ import {
TooltipIcon,
} from '@/components/base'
import { EditorViewer } from '@/components/profile/editor-viewer'
import { useDisplayedMixedPort } from '@/hooks/use-displayed-mixed-port'
import { useSystemProxyState } from '@/hooks/use-system-proxy-state'
import { useVerge } from '@/hooks/use-verge'
import { useClashConfigData, useSystemData } from '@/providers/app-data-context'
@@ -188,27 +189,19 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
}, [clashConfig?.mixedPort, enabled, value.pac, invalidateProxyState])
const { systemProxyAddress } = useSystemData()
const displayedMixedPort = useDisplayedMixedPort()
// 为当前状态计算系统代理地址
const getSystemProxyAddress = useMemo(() => {
if (!clashConfig) return '-'
const isPacMode = value.pac ?? false
if (isPacMode) {
const host = value.proxy_host || '127.0.0.1'
const port = verge?.verge_mixed_port || clashConfig.mixedPort || 7897
return `${host}:${port}`
return `${host}:${displayedMixedPort}`
} else {
return systemProxyAddress
}
}, [
value.pac,
value.proxy_host,
verge?.verge_mixed_port,
clashConfig,
systemProxyAddress,
])
}, [value.pac, value.proxy_host, displayedMixedPort, systemProxyAddress])
const getCurrentPacUrl = useMemo(() => {
const host = value.proxy_host || '127.0.0.1'
return embeddedServerPort
@@ -377,7 +370,7 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
if (pacContent) {
pacContent = pacContent.replace(/%proxy_host%/g, value.proxy_host)
// 将 mixed-port 转换为字符串
const mixedPortStr = (clashConfig?.mixedPort || '').toString()
const mixedPortStr = displayedMixedPort.toString()
pacContent = pacContent.replace(/%mixed-port%/g, mixedPortStr)
}
+30 -13
View File
@@ -25,7 +25,7 @@ import { useTranslation } from 'react-i18next'
import { BaseDialog } from '@/components/base'
import { useClash } from '@/hooks/use-clash'
import { useProxiesData } from '@/providers/app-data-context'
import { isPortInUse } from '@/services/cmds'
import { probeListener, type ListenerTransport } from '@/services/cmds'
import { showNotice } from '@/services/notice-service'
import {
isInteractableMember,
@@ -59,12 +59,14 @@ interface TunnelProxyOption {
member: ResolvedProxyMember
}
type TunnelNetwork = ListenerTransport | 'tcp+udp'
interface TunnelFormValues {
localAddr: string
localPort: string
targetAddr: string
targetPort: string
network: string
network: TunnelNetwork
group: string
proxy: ProxyMemberOccurrenceBinding | null
}
@@ -222,14 +224,6 @@ export const TunnelsViewer = forwardRef<TunnelsViewerRef>((_, ref) => {
)
return
}
const inUse = await isPortInUse(Number(localPort))
if (inUse) {
showNotice.error('settings.modals.clashPort.messages.portInUse', {
port: localPort,
})
return
}
// 目标地址校验 (host)
const targetHost = normalizeHost(targetAddr)
if (!targetHost) {
@@ -260,8 +254,10 @@ export const TunnelsViewer = forwardRef<TunnelsViewerRef>((_, ref) => {
}
// 构造新 entry
const transports: ListenerTransport[] =
network === 'tcp+udp' ? ['tcp', 'udp'] : [network]
const entry: TunnelEntry = {
network: network === 'tcp+udp' ? ['tcp', 'udp'] : [network],
network: transports,
address: formatHostPort(localHost, localPort),
target: formatHostPort(targetHost, targetPort),
...(latestSelectedProxy
@@ -269,8 +265,29 @@ export const TunnelsViewer = forwardRef<TunnelsViewerRef>((_, ref) => {
: {}),
}
const candidateTunnels = [...draftTunnels, entry]
try {
const outcome = await probeListener({
address: entry.address,
transports,
})
if (outcome.status === 'conflict') {
showNotice.error('settings.modals.clashPort.messages.portInUse', {
port: outcome.port,
})
return
}
if (outcome.status !== 'available') {
showNotice.error(outcome.message)
return
}
} catch (error) {
showNotice.error(error)
return
}
// 写入配置 + 清空输入
setDraftTunnels((prev) => [...prev, entry])
setDraftTunnels(candidateTunnels)
setValues((v) => ({
...v,
@@ -369,7 +386,7 @@ export const TunnelsViewer = forwardRef<TunnelsViewerRef>((_, ref) => {
onChange={(e) =>
setValues((v) => ({
...v,
network: e.target.value as string,
network: e.target.value as TunnelNetwork,
}))
}
>
+3 -3
View File
@@ -9,6 +9,7 @@ import { updateGeo, type LogLevel } from 'tauri-plugin-mihomo-api'
import { DialogRef, Switch, TooltipIcon } from '@/components/base'
import { useClash } from '@/hooks/use-clash'
import { useClashLog } from '@/hooks/use-clash-log'
import { useDisplayedMixedPort } from '@/hooks/use-displayed-mixed-port'
import { useVerge } from '@/hooks/use-verge'
import { invoke_uwp_tool } from '@/services/cmds'
import { showNotice } from '@/services/notice-service'
@@ -36,6 +37,7 @@ const SettingClash = ({ onError }: Props) => {
const { clash, version, mutateClash, patchClash } = useClash()
const { verge, patchVerge } = useVerge()
const displayedMixedPort = useDisplayedMixedPort()
const [, setClashLog] = useClashLog()
const {
@@ -45,8 +47,6 @@ const SettingClash = ({ onError }: Props) => {
'unified-delay': unifiedDelay,
} = clash ?? {}
const { verge_mixed_port } = verge ?? {}
// 独立跟踪DNS设置开关状态
const [dnsSettingsEnabled, setDnsSettingsEnabled] = useState(() => {
return verge?.enable_dns_settings ?? false
@@ -223,7 +223,7 @@ const SettingClash = ({ onError }: Props) => {
autoComplete="new-password"
disabled={false}
size="small"
value={verge_mixed_port ?? 7897}
value={displayedMixedPort}
sx={{ width: 100, input: { py: '7.5px', cursor: 'pointer' } }}
onClick={(e) => {
portRef.current?.open()