fix(home): route IP lookups through the live Clash mixed port (#8356)

* fix(home): route IP lookups through the live Clash mixed port

Assisted-by: MAI Code 2 (high)
Co-authored-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>
Signed-off-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>

* fix: respects bind address and auth for IP check proxy

Assisted-by: Copilot Fusion (Standard) > GPT-6 Luna
Signed-off-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>

---------

Signed-off-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>
Co-authored-by: ❤是纱雾酱哟~ <49941141+Dragon1573@users.noreply.github.com>
This commit is contained in:
Fei Wen
2026-11-20 12:48:04 +00:00
committed by GitHub
co-authored by ❤是纱雾酱哟~
parent d3d91f3855
commit 22188f98c9
2 changed files with 48 additions and 0 deletions
+1
View File
@@ -39,6 +39,7 @@
- 修复「TUN 设置」未手动保存时,界面显示的默认 MTU 1500 未生效
- 修复「链式代理」节点列表按名称排序,未保持订阅中的节点顺序
- 修复规则模式下 Muse AI 解锁检测显示错误的出口地区
- 修复使用系统代理时 IP 信息显示直连地址
**🍎 macOS**
+47
View File
@@ -4,6 +4,7 @@ import { asyncRetry } from 'foxts/async-retry'
import { extractErrorMessage } from 'foxts/extract-error-message'
import { once } from 'foxts/once'
import i18n from 'i18next'
import { getBaseConfig } from 'tauri-plugin-mihomo-api'
import { debugLog } from '@/utils/debug'
@@ -137,6 +138,29 @@ const IP_CHECK_SERVICES: ServiceConfig[] = [
},
]
const getProxyHost = (allowLan: boolean, bindAddress: string) => {
const address = bindAddress.trim().replace(/^\[|\]$/g, '')
const normalizedAddress = address.toLowerCase()
const isIpv6 = normalizedAddress.includes(':')
const isIpv6Wildcard =
isIpv6 &&
normalizedAddress
.split(':')
.every((part) => part === '' || /^0+$/.test(part))
const isWildcard =
normalizedAddress === '*' ||
normalizedAddress === '0.0.0.0' ||
isIpv6Wildcard
if (!allowLan) return '127.0.0.1'
if (!address || isWildcard || normalizedAddress === 'localhost') {
return isIpv6Wildcard ? '[::1]' : '127.0.0.1'
}
return isIpv6 ? `[${address}]` : address
}
// 获取当前IP和地理位置信息
export const getIpInfo = async (): Promise<
IpInfo & { lastFetchTs: number }
@@ -150,6 +174,28 @@ export const getIpInfo = async (): Promise<
)
let lastError: unknown | null = null
const userAgent = await getUserAgentPromise()
const { mixedPort, allowLan, bindAddress, authentication } =
await getBaseConfig()
const proxyUrl = `http://${getProxyHost(allowLan, bindAddress)}:${mixedPort}`
const proxyAuthentication = authentication?.[0]
const authSeparator = proxyAuthentication?.indexOf(':') ?? -1
if (proxyAuthentication !== undefined && authSeparator < 0) {
throw new Error('Invalid mixed proxy authentication configuration')
}
const proxy = {
all:
proxyAuthentication === undefined
? proxyUrl
: {
url: proxyUrl,
basicAuth: {
username: proxyAuthentication.slice(0, authSeparator),
password: proxyAuthentication.slice(authSeparator + 1),
},
},
}
console.debug('User-Agent for IP detection:', userAgent)
for (const service of shuffledServices) {
@@ -168,6 +214,7 @@ export const getIpInfo = async (): Promise<
try {
const response = await fetch(service.url, {
method: 'GET',
proxy,
signal: timeoutController.signal,
connectTimeout: serviceTimeout,
headers: {