diff --git a/src/components/home/test-card.tsx b/src/components/home/test-card.tsx index 77e854357..9ef986b41 100644 --- a/src/components/home/test-card.tsx +++ b/src/components/home/test-card.tsx @@ -87,18 +87,18 @@ export const TestCard = () => { x.uid === uid ? { ...x, ...patch } : x, ) - mutateVerge({ ...verge, test_list: newList }) + mutateVerge((prev) => ({ ...prev, test_list: newList })) }, - [testList, verge, mutateVerge], + [testList, mutateVerge], ) const onDeleteTestListItem = useCallback( (uid: string) => { const newList = testList.filter((x) => x.uid !== uid) patchVerge({ test_list: newList }) - mutateVerge({ ...verge, test_list: newList }) + mutateVerge((prev) => ({ ...prev, test_list: newList })) }, - [testList, verge, patchVerge, mutateVerge], + [testList, patchVerge, mutateVerge], ) const onDragEnd = useCallback( @@ -129,7 +129,7 @@ export const TestCard = () => { newList.splice(newIndex, 0, removed) // 优化:先本地更新,再异步 patch,避免UI卡死 - mutateVerge({ ...verge, test_list: newList }) + mutateVerge((prev) => ({ ...prev, test_list: newList })) const patchFn = () => { try { patchVerge({ test_list: newList }) @@ -141,7 +141,7 @@ export const TestCard = () => { setTimeout(patchFn, 0) } }, - [testList, verge, mutateVerge, patchVerge], + [testList, mutateVerge, patchVerge], ) // 仅在verge首次加载时初始化测试列表 diff --git a/src/components/setting/mods/layout-viewer.tsx b/src/components/setting/mods/layout-viewer.tsx index ed2799899..4a7dd7017 100644 --- a/src/components/setting/mods/layout-viewer.tsx +++ b/src/components/setting/mods/layout-viewer.tsx @@ -109,7 +109,7 @@ export const LayoutViewer = forwardRef((_, ref) => { showNotice.error(err) } const onChangeData = (patch: Partial) => { - mutateVerge({ ...verge, ...patch }) + mutateVerge((prev) => ({ ...prev, ...patch })) } return ( diff --git a/src/components/setting/mods/sysproxy-viewer.tsx b/src/components/setting/mods/sysproxy-viewer.tsx index 3b5162bb7..30a04760e 100644 --- a/src/components/setting/mods/sysproxy-viewer.tsx +++ b/src/components/setting/mods/sysproxy-viewer.tsx @@ -326,7 +326,7 @@ export const SysproxyViewer = forwardRef((props, ref) => { Promise.resolve().then(async () => { try { if (Object.keys(patch).length > 0) { - mutateVerge({ ...verge, ...patch }) + mutateVerge((prev) => ({ ...prev, ...patch })) } if (Object.keys(patch).length > 0) { await patchVerge(patch) diff --git a/src/components/setting/setting-system.tsx b/src/components/setting/setting-system.tsx index f9992b907..681ac0c49 100644 --- a/src/components/setting/setting-system.tsx +++ b/src/components/setting/setting-system.tsx @@ -25,7 +25,7 @@ const SettingSystem = ({ onError }: Props) => { value: boolean, ) => value const onChangeData = (patch: Partial) => { - mutateVerge({ ...verge, ...patch }) + mutateVerge((prev) => ({ ...prev, ...patch })) } return ( diff --git a/src/components/setting/setting-verge-basic.tsx b/src/components/setting/setting-verge-basic.tsx index 9fdf33091..d593f596b 100644 --- a/src/components/setting/setting-verge-basic.tsx +++ b/src/components/setting/setting-verge-basic.tsx @@ -72,7 +72,7 @@ const SettingVergeBasic = ({ onError }: Props) => { const backupRef = useRef(null) const onChangeData = (patch: any) => { - mutateVerge({ ...verge, ...patch }) + mutateVerge((prev) => ({ ...prev, ...patch })) } const onCopyClashEnv = useCallback(async () => { diff --git a/src/components/shared/proxy-control-switches.tsx b/src/components/shared/proxy-control-switches.tsx index 8d085f36d..844d320cc 100644 --- a/src/components/shared/proxy-control-switches.tsx +++ b/src/components/shared/proxy-control-switches.tsx @@ -163,7 +163,7 @@ const ProxyControlSwitches = ({ }) return false } - mutateVerge({ ...verge, enable_tun_mode: value }) + mutateVerge((prev) => ({ ...prev, enable_tun_mode: value })) await patchVerge({ enable_tun_mode: value }) } diff --git a/src/hooks/use-verge.ts b/src/hooks/use-verge.ts index 553c558b6..6d3561dfa 100644 --- a/src/hooks/use-verge.ts +++ b/src/hooks/use-verge.ts @@ -3,12 +3,16 @@ import { useCallback } from 'react' import { getVergeConfig, patchVergeConfig } from '@/services/cmds' import { mutate } from '@/services/mutate' import { getPreloadConfig, setPreloadConfig } from '@/services/preload' -import { setCacheData, useQuery } from '@/services/query-client' +import { + revalidateQuery, + setCacheData, + useQuery, +} from '@/services/query-client' export const useVerge = () => { const initialVergeConfig = getPreloadConfig() - const { data: verge, refetch } = useQuery({ + const { data: verge } = useQuery({ queryKey: ['getVergeConfig'], queryFn: async () => { const config = await getVergeConfig() @@ -20,23 +24,25 @@ export const useVerge = () => { staleTime: 5000, }) - const mutateVerge = ( - updaterOrData?: - | IVergeConfig - | ((prev: IVergeConfig | undefined) => IVergeConfig | undefined) - | undefined, - ) => { - if (updaterOrData === undefined) { - void refetch() - return - } - void setCacheData( - ['getVergeConfig'], - typeof updaterOrData === 'function' - ? (current) => updaterOrData(current ?? verge) - : updaterOrData, - ) - } + // Stable identity: many consumers list mutateVerge in their own callback + // deps, so a per-render closure here would churn their memoization too. + // The updater receives the live cache value (preload snapshot when the + // cache is still empty) instead of a render-time snapshot, so an older + // render cannot clobber a newer cache write. + const mutateVerge = useCallback( + ( + updater?: (prev: IVergeConfig | undefined) => IVergeConfig | undefined, + ) => { + if (updater === undefined) { + void revalidateQuery(['getVergeConfig']) + return + } + void setCacheData(['getVergeConfig'], (current) => + updater(current ?? getPreloadConfig() ?? undefined), + ) + }, + [], + ) // Callers own the error toast (GuardState onCatch / page onError), so the // funnel must not add a second one.