Compare commits

..

4 Commits

Author SHA1 Message Date
renovate[bot]
b5853fa4aa
chore(deps): update npm dependencies 2026-03-30 09:28:15 +00:00
wonfen
56291d3d91
chore: replace update URL 2026-03-30 12:01:05 +08:00
Tunglies
7a06a5a069
fix: remove dead localStorage writes and hardcoded key
- Remove unused `dns_settings_enabled` localStorage writes in
  setting-clash.tsx — state is sourced from verge config, these
  writes were never read anywhere.
- Replace hardcoded `'last_check_update'` localStorage read in
  system-info-card.tsx with exported `readLastCheckTime()` from
  the useUpdate hook, keeping the key in a single source of truth.
2026-03-29 02:06:08 +08:00
Tunglies
99bbd7ee5a
fix(home): unify last check update timestamp across settings and home page (#6605)
The settings page "Check for updates" did not update the homepage
"last check update time" because each page managed the timestamp
independently. Centralizes the timestamp in the useUpdate hook
via SWR + localStorage so both pages share a single data source.

Closes https://github.com/clash-verge-rev/clash-verge-rev/issues/6605#issuecomment-4147144987
2026-03-29 01:56:34 +08:00
11 changed files with 76 additions and 107 deletions

14
pnpm-lock.yaml generated
View File

@ -88,7 +88,7 @@ importers:
version: 5.3.0 version: 5.3.0
i18next: i18next:
specifier: ^26.0.0 specifier: ^26.0.0
version: 26.0.1(typescript@6.0.2) version: 26.0.2(typescript@6.0.2)
js-yaml: js-yaml:
specifier: ^4.1.1 specifier: ^4.1.1
version: 4.1.1 version: 4.1.1
@ -121,7 +121,7 @@ importers:
version: 7.72.0(react@19.2.4) version: 7.72.0(react@19.2.4)
react-i18next: react-i18next:
specifier: 17.0.1 specifier: 17.0.1
version: 17.0.1(i18next@26.0.1(typescript@6.0.2))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(typescript@6.0.2) version: 17.0.1(i18next@26.0.2(typescript@6.0.2))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(typescript@6.0.2)
react-markdown: react-markdown:
specifier: 10.1.0 specifier: 10.1.0
version: 10.1.0(@types/react@19.2.14)(react@19.2.4) version: 10.1.0(@types/react@19.2.14)(react@19.2.4)
@ -2491,8 +2491,8 @@ packages:
engines: {node: '>=18'} engines: {node: '>=18'}
hasBin: true hasBin: true
i18next@26.0.1: i18next@26.0.2:
resolution: {integrity: sha512-vtz5sXU4+nkCm8yEU+JJ6yYIx0mkg9e68W0G0PXpnOsmzLajNsW5o28DJMqbajxfsfq0gV3XdrBudsDQnwxfsQ==} resolution: {integrity: sha512-WsK0SdP+7tGzsxpT+Us1s2nvOyx657DatBodaNZe4KcPTPYzkVfRKUygN69mB+sCbbnifRuKz+Ya5JRzd8DNHw==}
peerDependencies: peerDependencies:
typescript: ^5 || ^6 typescript: ^5 || ^6
peerDependenciesMeta: peerDependenciesMeta:
@ -6016,7 +6016,7 @@ snapshots:
husky@9.1.7: {} husky@9.1.7: {}
i18next@26.0.1(typescript@6.0.2): i18next@26.0.2(typescript@6.0.2):
dependencies: dependencies:
'@babel/runtime': 7.29.2 '@babel/runtime': 7.29.2
optionalDependencies: optionalDependencies:
@ -6656,11 +6656,11 @@ snapshots:
dependencies: dependencies:
react: 19.2.4 react: 19.2.4
react-i18next@17.0.1(i18next@26.0.1(typescript@6.0.2))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(typescript@6.0.2): react-i18next@17.0.1(i18next@26.0.2(typescript@6.0.2))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(typescript@6.0.2):
dependencies: dependencies:
'@babel/runtime': 7.29.2 '@babel/runtime': 7.29.2
html-parse-stringify: 3.0.1 html-parse-stringify: 3.0.1
i18next: 26.0.1(typescript@6.0.2) i18next: 26.0.2(typescript@6.0.2)
react: 19.2.4 react: 19.2.4
use-sync-external-store: 1.6.0(react@19.2.4) use-sync-external-store: 1.6.0(react@19.2.4)
optionalDependencies: optionalDependencies:

View File

@ -100,8 +100,7 @@ async function resolveUpdater() {
Object.entries(updateDataNew.platforms).forEach(([key, value]) => { Object.entries(updateDataNew.platforms).forEach(([key, value]) => {
if (value.url) { if (value.url) {
updateDataNew.platforms[key].url = updateDataNew.platforms[key].url = 'https://update.hwdns.net/' + value.url
'https://download.clashverge.dev/' + value.url
} else { } else {
console.log(`[Error]: updateDataNew.platforms.${key} is null`) console.log(`[Error]: updateDataNew.platforms.${key} is null`)
} }

View File

@ -204,7 +204,7 @@ async function processRelease(github, options, tag, isAlpha) {
Object.entries(updateDataNew.platforms).forEach(([key, value]) => { Object.entries(updateDataNew.platforms).forEach(([key, value]) => {
if (value.url) { if (value.url) {
updateDataNew.platforms[key].url = updateDataNew.platforms[key].url =
'https://download.clashverge.dev/' + value.url 'https://update.hwdns.net/' + value.url
} else { } else {
console.log(`[Error]: updateDataNew.platforms.${key} is null`) console.log(`[Error]: updateDataNew.platforms.${key} is null`)
} }

View File

@ -32,8 +32,8 @@
"updater": { "updater": {
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQyOEMyRjBCQkVGOUJEREYKUldUZnZmbStDeStNMHU5Mmo1N24xQXZwSVRYbXA2NUpzZE5oVzlqeS9Bc0t6RVV4MmtwVjBZaHgK", "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQyOEMyRjBCQkVGOUJEREYKUldUZnZmbStDeStNMHU5Mmo1N24xQXZwSVRYbXA2NUpzZE5oVzlqeS9Bc0t6RVV4MmtwVjBZaHgK",
"endpoints": [ "endpoints": [
"https://download.clashverge.dev/https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-proxy.json", "https://update.hwdns.net/https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-proxy.json",
"https://gh-proxy.com/https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-proxy.json", "https://gh-proxy.org/https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-proxy.json",
"https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update.json" "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update.json"
], ],
"windows": { "windows": {

View File

@ -25,7 +25,7 @@
"active": true, "active": true,
"dialog": false, "dialog": false,
"endpoints": [ "endpoints": [
"https://download.clashverge.dev/https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-fixed-webview2-proxy.json", "https://update.hwdns.net/https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-fixed-webview2-proxy.json",
"https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-fixed-webview2.json" "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-fixed-webview2.json"
], ],
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQyOEMyRjBCQkVGOUJEREYKUldUZnZmbStDeStNMHU5Mmo1N24xQXZwSVRYbXA2NUpzZE5oVzlqeS9Bc0t6RVV4MmtwVjBZaHgK" "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQyOEMyRjBCQkVGOUJEREYKUldUZnZmbStDeStNMHU5Mmo1N24xQXZwSVRYbXA2NUpzZE5oVzlqeS9Bc0t6RVV4MmtwVjBZaHgK"

View File

@ -25,7 +25,7 @@
"active": true, "active": true,
"dialog": false, "dialog": false,
"endpoints": [ "endpoints": [
"https://download.clashverge.dev/https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-fixed-webview2-proxy.json", "https://update.hwdns.net/https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-fixed-webview2-proxy.json",
"https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-fixed-webview2.json" "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-fixed-webview2.json"
], ],
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQyOEMyRjBCQkVGOUJEREYKUldUZnZmbStDeStNMHU5Mmo1N24xQXZwSVRYbXA2NUpzZE5oVzlqeS9Bc0t6RVV4MmtwVjBZaHgK" "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQyOEMyRjBCQkVGOUJEREYKUldUZnZmbStDeStNMHU5Mmo1N24xQXZwSVRYbXA2NUpzZE5oVzlqeS9Bc0t6RVV4MmtwVjBZaHgK"

View File

@ -25,7 +25,7 @@
"active": true, "active": true,
"dialog": false, "dialog": false,
"endpoints": [ "endpoints": [
"https://download.clashverge.dev/https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-fixed-webview2-proxy.json", "https://update.hwdns.net/https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-fixed-webview2-proxy.json",
"https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-fixed-webview2.json" "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/updater/update-fixed-webview2.json"
], ],
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQyOEMyRjBCQkVGOUJEREYKUldUZnZmbStDeStNMHU5Mmo1N24xQXZwSVRYbXA2NUpzZE5oVzlqeS9Bc0t6RVV4MmtwVjBZaHgK" "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQyOEMyRjBCQkVGOUJEREYKUldUZnZmbStDeStNMHU5Mmo1N24xQXZwSVRYbXA2NUpzZE5oVzlqeS9Bc0t6RVV4MmtwVjBZaHgK"

View File

@ -7,13 +7,17 @@ import {
} from '@mui/icons-material' } from '@mui/icons-material'
import { Typography, Stack, Divider, Chip, IconButton } from '@mui/material' import { Typography, Stack, Divider, Chip, IconButton } from '@mui/material'
import { useLockFn } from 'ahooks' import { useLockFn } from 'ahooks'
import { useCallback, useEffect, useMemo, useReducer } from 'react' import { useCallback, useEffect, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { useNavigate } from 'react-router' import { useNavigate } from 'react-router'
import { useServiceInstaller } from '@/hooks/use-service-installer' import { useServiceInstaller } from '@/hooks/use-service-installer'
import { useSystemState } from '@/hooks/use-system-state' import { useSystemState } from '@/hooks/use-system-state'
import { useUpdate } from '@/hooks/use-update' import {
useUpdate,
updateLastCheckTime,
readLastCheckTime,
} from '@/hooks/use-update'
import { useVerge } from '@/hooks/use-verge' import { useVerge } from '@/hooks/use-verge'
import { getSystemInfo } from '@/services/cmds' import { getSystemInfo } from '@/services/cmds'
import { showNotice } from '@/services/notice-service' import { showNotice } from '@/services/notice-service'
@ -21,29 +25,6 @@ import { version as appVersion } from '@root/package.json'
import { EnhancedCard } from './enhanced-card' import { EnhancedCard } from './enhanced-card'
interface SystemState {
osInfo: string
lastCheckUpdate: string
}
type SystemStateAction =
| { type: 'set-os-info'; payload: string }
| { type: 'set-last-check-update'; payload: string }
const systemStateReducer = (
state: SystemState,
action: SystemStateAction,
): SystemState => {
switch (action.type) {
case 'set-os-info':
return { ...state, osInfo: action.payload }
case 'set-last-check-update':
return { ...state, lastCheckUpdate: action.payload }
default:
return state
}
}
export const SystemInfoCard = () => { export const SystemInfoCard = () => {
const { t } = useTranslation() const { t } = useTranslation()
const { verge, patchVerge } = useVerge() const { verge, patchVerge } = useVerge()
@ -51,28 +32,18 @@ export const SystemInfoCard = () => {
const { isAdminMode, isSidecarMode } = useSystemState() const { isAdminMode, isSidecarMode } = useSystemState()
const { installServiceAndRestartCore } = useServiceInstaller() const { installServiceAndRestartCore } = useServiceInstaller()
// 自动检查更新逻辑 // 自动检查更新逻辑lastCheckUpdate 由 useUpdate 统一管理)
const { checkUpdate: triggerCheckUpdate } = useUpdate(true, { const { checkUpdate: triggerCheckUpdate, lastCheckUpdate } = useUpdate(true)
onSuccess: () => {
const now = Date.now()
localStorage.setItem('last_check_update', now.toString())
dispatchSystemState({
type: 'set-last-check-update',
payload: new Date(now).toLocaleString(),
})
},
})
// 系统信息状态 const [osInfo, setOsInfo] = useState('')
const [systemState, dispatchSystemState] = useReducer(systemStateReducer, {
osInfo: '', const lastCheckUpdateText = useMemo(
lastCheckUpdate: '-', () => (lastCheckUpdate ? new Date(lastCheckUpdate).toLocaleString() : '-'),
}) [lastCheckUpdate],
)
// 初始化系统信息 // 初始化系统信息
useEffect(() => { useEffect(() => {
let timeoutId: number | undefined
getSystemInfo() getSystemInfo()
.then((info) => { .then((info) => {
const lines = info.split('\n') const lines = info.split('\n')
@ -87,49 +58,23 @@ export const SystemInfoCard = () => {
sysVersion = sysVersion.substring(sysName.length).trim() sysVersion = sysVersion.substring(sysName.length).trim()
} }
dispatchSystemState({ setOsInfo(`${sysName} ${sysVersion}`)
type: 'set-os-info',
payload: `${sysName} ${sysVersion}`,
})
} }
}) })
.catch(console.error) .catch(console.error)
}, [])
// 获取最后检查更新时间 // 如果启用了自动检查更新但没有记录,设置当前时间并延迟检查
const lastCheck = localStorage.getItem('last_check_update') useEffect(() => {
if (lastCheck) { if (!verge?.auto_check_update) return
try { if (readLastCheckTime() !== null) return
const timestamp = parseInt(lastCheck, 10)
if (!isNaN(timestamp)) {
dispatchSystemState({
type: 'set-last-check-update',
payload: new Date(timestamp).toLocaleString(),
})
}
} catch (e) {
console.error('Error parsing last check update time', e)
}
} else if (verge?.auto_check_update) {
// 如果启用了自动检查更新但没有记录,设置当前时间并延迟检查
const now = Date.now()
localStorage.setItem('last_check_update', now.toString())
dispatchSystemState({
type: 'set-last-check-update',
payload: new Date(now).toLocaleString(),
})
timeoutId = window.setTimeout(() => { updateLastCheckTime()
if (verge?.auto_check_update) { const timeoutId = window.setTimeout(() => {
triggerCheckUpdate().catch(console.error) triggerCheckUpdate().catch(console.error)
} }, 5000)
}, 5000) return () => window.clearTimeout(timeoutId)
} }, [verge?.auto_check_update, triggerCheckUpdate])
return () => {
if (timeoutId !== undefined) {
window.clearTimeout(timeoutId)
}
}
}, [verge?.auto_check_update, dispatchSystemState, triggerCheckUpdate])
// 导航到设置页面 // 导航到设置页面
const goToSettings = useCallback(() => { const goToSettings = useCallback(() => {
@ -157,12 +102,6 @@ export const SystemInfoCard = () => {
const onCheckUpdate = useLockFn(async () => { const onCheckUpdate = useLockFn(async () => {
try { try {
const info = await triggerCheckUpdate() const info = await triggerCheckUpdate()
const now = Date.now()
localStorage.setItem('last_check_update', now.toString())
dispatchSystemState({
type: 'set-last-check-update',
payload: new Date(now).toLocaleString(),
})
if (!info?.available) { if (!info?.available) {
showNotice.success( showNotice.success(
'settings.components.verge.advanced.notifications.latestVersion', 'settings.components.verge.advanced.notifications.latestVersion',
@ -280,7 +219,7 @@ export const SystemInfoCard = () => {
{t('home.components.systemInfo.fields.osInfo')} {t('home.components.systemInfo.fields.osInfo')}
</Typography> </Typography>
<Typography variant="body2" fontWeight="medium"> <Typography variant="body2" fontWeight="medium">
{systemState.osInfo} {osInfo}
</Typography> </Typography>
</Stack> </Stack>
<Divider /> <Divider />
@ -341,7 +280,7 @@ export const SystemInfoCard = () => {
'&:hover': { opacity: 0.7 }, '&:hover': { opacity: 0.7 },
}} }}
> >
{systemState.lastCheckUpdate} {lastCheckUpdateText}
</Typography> </Typography>
</Stack> </Stack>
<Divider /> <Divider />

View File

@ -78,7 +78,6 @@ const SettingClash = ({ onError }: Props) => {
const handleDnsToggle = useLockFn(async (enable: boolean) => { const handleDnsToggle = useLockFn(async (enable: boolean) => {
try { try {
setDnsSettingsEnabled(enable) setDnsSettingsEnabled(enable)
localStorage.setItem('dns_settings_enabled', String(enable))
await patchVerge({ enable_dns_settings: enable }) await patchVerge({ enable_dns_settings: enable })
await invoke('apply_dns_config', { apply: enable }) await invoke('apply_dns_config', { apply: enable })
setTimeout(() => { setTimeout(() => {
@ -86,7 +85,6 @@ const SettingClash = ({ onError }: Props) => {
}, 500) }, 500)
} catch (err: any) { } catch (err: any) {
setDnsSettingsEnabled(!enable) setDnsSettingsEnabled(!enable)
localStorage.setItem('dns_settings_enabled', String(!enable))
showNotice.error(err) showNotice.error(err)
await patchVerge({ enable_dns_settings: !enable }).catch(() => {}) await patchVerge({ enable_dns_settings: !enable }).catch(() => {})
throw err throw err

View File

@ -4,6 +4,7 @@ import { useCallback, useRef } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { DialogRef, TooltipIcon } from '@/components/base' import { DialogRef, TooltipIcon } from '@/components/base'
import { updateLastCheckTime } from '@/hooks/use-update'
import { import {
exitApp, exitApp,
exportDiagnosticInfo, exportDiagnosticInfo,
@ -45,6 +46,7 @@ const SettingVergeAdvanced = ({ onError: _ }: Props) => {
const onCheckUpdate = async () => { const onCheckUpdate = async () => {
try { try {
const info = await checkUpdate() const info = await checkUpdate()
updateLastCheckTime()
if (!info?.available) { if (!info?.available) {
showNotice.success( showNotice.success(
'settings.components.verge.advanced.notifications.latestVersion', 'settings.components.verge.advanced.notifications.latestVersion',

View File

@ -1,4 +1,4 @@
import useSWR, { SWRConfiguration } from 'swr' import useSWR, { mutate as globalMutate, SWRConfiguration } from 'swr'
import { checkUpdateSafe } from '@/services/update' import { checkUpdateSafe } from '@/services/update'
@ -12,6 +12,26 @@ export interface UpdateInfo {
downloadAndInstall: (onEvent?: any) => Promise<void> downloadAndInstall: (onEvent?: any) => Promise<void>
} }
// --- Last check timestamp (shared via SWR + localStorage) ---
const LAST_CHECK_KEY = 'last_check_update'
export const readLastCheckTime = (): number | null => {
const stored = localStorage.getItem(LAST_CHECK_KEY)
if (!stored) return null
const ts = parseInt(stored, 10)
return isNaN(ts) ? null : ts
}
export const updateLastCheckTime = (timestamp?: number): number => {
const now = timestamp ?? Date.now()
localStorage.setItem(LAST_CHECK_KEY, now.toString())
globalMutate(LAST_CHECK_KEY, now, false)
return now
}
// --- useUpdate hook ---
export const useUpdate = ( export const useUpdate = (
enabled: boolean = true, enabled: boolean = true,
options?: SWRConfiguration, options?: SWRConfiguration,
@ -36,11 +56,22 @@ export const useUpdate = (
refreshInterval: 24 * 60 * 60 * 1000, // 24 hours refreshInterval: 24 * 60 * 60 * 1000, // 24 hours
dedupingInterval: 60 * 60 * 1000, // 1 hour dedupingInterval: 60 * 60 * 1000, // 1 hour
...options, ...options,
onSuccess: (...args) => {
updateLastCheckTime()
options?.onSuccess?.(...args)
},
})
// Shared last check timestamp
const { data: lastCheckUpdate } = useSWR(LAST_CHECK_KEY, readLastCheckTime, {
revalidateOnFocus: false,
revalidateOnReconnect: false,
}) })
return { return {
updateInfo, updateInfo,
checkUpdate, checkUpdate,
loading: isValidating, loading: isValidating,
lastCheckUpdate: lastCheckUpdate ?? null,
} }
} }