From 1987f105d4ccf16262179a433e636600ad1aaa91 Mon Sep 17 00:00:00 2001 From: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Thu, 8 Oct 2026 02:22:58 +0800 Subject: [PATCH] refactor(proxy): clarify automatic proxy query naming --- src/hooks/use-system-proxy-state.ts | 12 ++++++------ src/services/bus/create-bus-handlers.ts | 6 +----- src/services/cmds.ts | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/hooks/use-system-proxy-state.ts b/src/hooks/use-system-proxy-state.ts index f16d1c106..974b0d63a 100644 --- a/src/hooks/use-system-proxy-state.ts +++ b/src/hooks/use-system-proxy-state.ts @@ -5,7 +5,7 @@ import { useDisplayedMixedPort } from '@/hooks/use-displayed-mixed-port' import { useVerge } from '@/hooks/use-verge' import { useSystemData } from '@/providers/app-data-context' import { - getAutotemProxy, + getAutoProxy, getEmbeddedServerPort, patchVergeConfig, } from '@/services/cmds' @@ -21,8 +21,8 @@ export const useSystemProxyState = () => { const { sysproxy } = useSystemData() const displayedMixedPort = useDisplayedMixedPort() const { data: autoproxy } = useQuery({ - queryKey: ['getAutotemProxy'], - queryFn: getAutotemProxy, + queryKey: ['getAutoProxy'], + queryFn: getAutoProxy, refetchOnWindowFocus: true, refetchOnReconnect: true, }) @@ -99,7 +99,7 @@ export const useSystemProxyState = () => { } // Kept separate so an unreadable config cannot discard OS state that did read. try { - await revalidateQueries([['getSystemProxy'], ['getAutotemProxy']]) + await revalidateQueries([['getSystemProxy'], ['getAutoProxy']]) } catch (error) { console.warn( '[system-proxy] rereading the OS proxy after a toggle failed:', @@ -109,14 +109,14 @@ export const useSystemProxyState = () => { // rather than stay live from a stale cache. await Promise.all([ removeCacheData(['getSystemProxy']), - removeCacheData(['getAutotemProxy']), + removeCacheData(['getAutoProxy']), ]) } } } const invalidateProxyState = () => - revalidateQueries([['getSystemProxy'], ['getAutotemProxy']]) + revalidateQueries([['getSystemProxy'], ['getAutoProxy']]) return { indicator, diff --git a/src/services/bus/create-bus-handlers.ts b/src/services/bus/create-bus-handlers.ts index 957589ea7..c41442704 100644 --- a/src/services/bus/create-bus-handlers.ts +++ b/src/services/bus/create-bus-handlers.ts @@ -72,11 +72,7 @@ export const createEventBus = (deps: BusHandlerDeps) => { 'getRuleProviders', ]), 'verge://refresh-verge-config': () => - deps.revalidateKeys([ - 'getVergeConfig', - 'getSystemProxy', - 'getAutotemProxy', - ]), + deps.revalidateKeys(['getVergeConfig', 'getSystemProxy', 'getAutoProxy']), 'verge://refresh-profiles': () => deps.revalidateKeys(['getProfiles']), 'verge://refresh-proxy-config': handleRefreshProxyConfig, 'verge://notice-message': (payload) => deps.handleNotice(payload), diff --git a/src/services/cmds.ts b/src/services/cmds.ts index c149a88ba..f46377335 100644 --- a/src/services/cmds.ts +++ b/src/services/cmds.ts @@ -256,7 +256,7 @@ export async function getSystemProxy() { return commands.getSysProxy() } -export async function getAutotemProxy() { +export async function getAutoProxy() { try { debugLog('[API] 开始调用 get_auto_proxy') const result = await commands.getAutoProxy()