fix(proxies): derive mounted delays from shared snapshots

Remove mirrored item delay state so profile cache invalidation cannot leave reused rows blank until remount. Read current node history when the shared cache is empty and preserve snapshot identity for React subscriptions.

Cargo.lock

@@ -7520,15 +7520,14 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-http"
-version = "2.9.0"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c278945f30912c8c32728265c66d16ca1b139509c4874d00579f5c8c5276605a"
+checksum = "2c57e3451553f95a1db3bfed6a358a77ce5080b6399a242c6eadac113f97abd2"
 dependencies = [
  "bytes",
  "cookie_store",
  "data-url",
  "http",
- "percent-encoding",
  "regex",
  "reqwest 0.12.28",
  "schemars 0.8.22",
@@ -7570,9 +7569,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-notification"
-version = "2.8.1"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14a226bfb8189ec4ab2c1936e66330ad06c44d9f6c54a674338208491dee177f"
+checksum = "5bc6c194a95a535abdfbe3bc1af9a43935b8b9b29c216b8e71af8b59132703cf"
 dependencies = [
  "log",
  "notify-rust",
@@ -7590,9 +7589,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-opener"
-version = "2.7.3"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54592c6718b42ab198bf11bda6a428a3553ca2f2f8e506df56f6a063ec328331"
+checksum = "53810be1b4fed22bb6ac3f4cab5a2b80d9391d1af436bda145607532bc0bb219"
 dependencies = [
  "dunce",
  "glob",

Changelog.md

@@ -29,6 +29,7 @@
 - 修复全局模式默认停在 `DIRECT` 或 `REJECT` 导致流量未经代理，现自动切换到第一个策略组
 - 修复订阅中未加引号的 REALITY `short-id`（如 `1234e123`）被误读为数字，导致订阅无法启用
 - 修复订阅中唯一的代理组名为 `GLOBAL` 或没有代理组时，规则模式下代理页面显示「未获取到代理信息」
+- 修复切换订阅后节点延迟显示旧订阅结果，进入代理页面时主动刷新延迟记录
 
 **🍎 macOS**
 

package.json

@@ -67,7 +67,7 @@
     "dayjs": "1.11.23",
     "foxact": "^0.3.12",
     "foxts": "^5.9.1",
-    "i18next": "^27.0.0",
+    "i18next": "^26.4.2",
     "js-yaml": "^5.4.2",
     "lodash-es": "^4.18.1",
     "meta-json-schema": "^1.19.31",
@@ -79,7 +79,7 @@
     "react-dom": "19.3.1",
     "react-error-boundary": "6.1.6",
     "react-hook-form": "^7.88.0",
-    "react-i18next": "18.0.1",
+    "react-i18next": "17.1.13",
     "react-markdown": "10.1.0",
     "react-router": "^8.4.0",
     "rehype-raw": "^7.0.0",

pnpm-lock.yaml

@@ -239,8 +239,8 @@ importers:
         specifier: ^5.9.1
         version: 5.9.1
       i18next:
-        specifier: ^27.0.0
-        version: 27.0.1(typescript@6.0.3)
+        specifier: ^26.4.2
+        version: 26.4.2(typescript@6.0.3)
       js-yaml:
         specifier: ^5.4.2
         version: 5.4.2
@@ -275,8 +275,8 @@ importers:
         specifier: ^7.88.0
         version: 7.88.0(react@19.3.1)
       react-i18next:
-        specifier: 18.0.1
-        version: 18.0.1(@types/react@19.3.0)(i18next@27.0.1(typescript@6.0.3))(react@19.3.1)(typescript@6.0.3)
+        specifier: 17.1.13
+        version: 17.1.13(i18next@26.4.2(typescript@6.0.3))(react-dom@19.3.1(react@19.3.1))(react@19.3.1)(typescript@6.0.3)
       react-markdown:
         specifier: 10.1.0
         version: 10.1.0(@types/react@19.3.0)(react@19.3.1)(supports-color@7.2.0)
@@ -3689,9 +3689,8 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  i18next@27.0.1:
-    resolution: {integrity: sha512-KaE5ozP8UUeVpOJIwMVbbnpRKpyYQuxd9ZbseJoDzezE3nvLnZZQn20pkzyIJwPI2Uet/Qs3WzPTG812f6F/Eg==}
-    engines: {node: '>=22'}
+  i18next@26.4.2:
+    resolution: {integrity: sha512-RX+R0VLg13IbvRuJSxnqykUFS9vQZTl8wYpWPCIUDWVrSGjsQywB5Y+pjzrkboxGAuYfJZVH1InFTdgBdxq6ug==}
     peerDependencies:
       typescript: ^5 || ^6 || ^7
     peerDependenciesMeta:
@@ -4397,16 +4396,18 @@ packages:
     peerDependencies:
       react: ^16.8.0 || ^17 || ^18 || ^19
 
-  react-i18next@18.0.1:
-    resolution: {integrity: sha512-kPWXI0E/lrPj3+/umcKNzYZVnWmEedLiamMzDIHfbs+5ANf6yzvlZsjKou8f7kaGkfMMDLIZBejV+4aSN1CyBw==}
-    engines: {node: '>=22'}
+  react-i18next@17.1.13:
+    resolution: {integrity: sha512-ZxhOSlyKSKPtbUNPLwYMmE3w3bhoc0jaZJZ6bc7wGOT6cLbrbs//6m01HxCLtFdSjHvFpwFwoPhxxzIlHSs9cw==}
     peerDependencies:
-      '@types/react': '*'
-      i18next: '>= 27.0.1'
-      react: '>= 18.0.0'
+      i18next: '>= 26.2.0'
+      react: '>= 16.8.0'
+      react-dom: '*'
+      react-native: '*'
       typescript: ^5 || ^6 || ^7
     peerDependenciesMeta:
-      '@types/react':
+      react-dom:
+        optional: true
+      react-native:
         optional: true
       typescript:
         optional: true
@@ -8532,7 +8533,7 @@ snapshots:
 
   husky@9.1.7: {}
 
-  i18next@27.0.1(typescript@6.0.3):
+  i18next@26.4.2(typescript@6.0.3):
     optionalDependencies:
       typescript: 6.0.3
 
@@ -9356,13 +9357,15 @@ snapshots:
     dependencies:
       react: 19.3.1
 
-  react-i18next@18.0.1(@types/react@19.3.0)(i18next@27.0.1(typescript@6.0.3))(react@19.3.1)(typescript@6.0.3):
+  react-i18next@17.1.13(i18next@26.4.2(typescript@6.0.3))(react-dom@19.3.1(react@19.3.1))(react@19.3.1)(typescript@6.0.3):
     dependencies:
+      '@babel/runtime': 7.29.7
       html-parse-stringify: 4.0.1
-      i18next: 27.0.1(typescript@6.0.3)
+      i18next: 26.4.2(typescript@6.0.3)
       react: 19.3.1
+      use-sync-external-store: 1.7.0(react@19.3.1)
     optionalDependencies:
-      '@types/react': 19.3.0
+      react-dom: 19.3.1(react@19.3.1)
       typescript: 6.0.3
 
   react-is@16.13.1: {}

src-tauri/Cargo.toml

@@ -72,7 +72,7 @@ sysproxy = { git = "https://github.com/clash-verge-rev/sysproxy-rs.git", branch
 ] }
 network-interface = { version = "2.0.5", features = ["serde"] }
 tauri-plugin-shell = "2.6.0"
-tauri-plugin-opener = "2.7.3"
+tauri-plugin-opener = "2.7.2"
 tauri-plugin-dialog = "2.8.4"
 tauri-plugin-fs = "2.7.1"
 tauri-plugin-deep-link = "2.6.3"
@@ -87,9 +87,9 @@ getrandom = "0.4.3"
 futures = "0.3.34"
 gethostname = "1.1.0"
 scopeguard = "1.2.0"
-tauri-plugin-notification = "2.8.1"
+tauri-plugin-notification = "2.8.0"
 backon = { version = "1.6.0", features = ["tokio-sleep"] }
-tauri-plugin-http = "2.9.0"
+tauri-plugin-http = "2.8.3"
 tracing = { workspace = true }
 tauri-plugin-devtools = { version = "2.2.3", optional = true }
 tauri-plugin-mihomo = { git = "https://github.com/clash-verge-rev/tauri-plugin-mihomo", rev = "7a03d16f4d39b1bb885b7babe66b9e153e34b615" }

src/hooks/use-proxy-delay-state.ts

@@ -1,5 +1,5 @@
 import { useLockFn } from 'ahooks'
-import { useCallback, useEffect, useReducer } from 'react'
+import { useCallback, useSyncExternalStore } from 'react'
 
 import { useVerge } from '@/hooks/use-verge'
 import delayManager, { type DelayUpdate } from '@/services/delay'
@@ -17,13 +17,6 @@ const PRESET_PROXY_NAMES = [
   'COMPATIBLE',
 ]
 
-const identity = (previous: DelayUpdate, next: DelayUpdate): DelayUpdate =>
-  previous.delay === next.delay &&
-  previous.elapsed === next.elapsed &&
-  previous.updatedAt === next.updatedAt
-    ? previous
-    : next
-
 const INITIAL_DELAY: DelayUpdate = { delay: -1, updatedAt: 0 }
 
 export interface UseProxyDelayState {
@@ -42,56 +35,37 @@ export function useProxyDelayState(
   const details = memberDetails(member)
   const unresolved = member.kind === 'unresolved'
   const isPreset = unresolved || PRESET_PROXY_NAMES.includes(name)
-  const [delayState, setDelayState] = useReducer(identity, INITIAL_DELAY)
   const { verge } = useVerge()
   const timeout = verge?.default_latency_timeout || 10000
 
-  useEffect(() => {
-    if (isPreset) return
-    delayManager.setListener(name, groupName, setDelayState)
-    return () => {
-      delayManager.removeListener(name, groupName)
-    }
-  }, [name, groupName, isPreset])
+  const subscribe = useCallback(
+    (onChange: () => void) =>
+      isPreset ? () => {} : delayManager.addListener(name, groupName, onChange),
+    [name, groupName, isPreset],
+  )
+  const read = useCallback(
+    () =>
+      unresolved ? undefined : delayManager.getDelayUpdate(name, groupName),
+    [name, groupName, unresolved],
+  )
+  const cachedUpdate = useSyncExternalStore(subscribe, read, read)
 
-  const updateDelay = useCallback(() => {
-    if (unresolved) {
-      setDelayState(INITIAL_DELAY)
-      return
-    }
-    const cachedUpdate = delayManager.getDelayUpdate(name, groupName)
-    if (cachedUpdate) {
-      setDelayState({ ...cachedUpdate })
-      return
-    }
-
-    const fallbackDelay = delayManager.getDelayFix(member, groupName)
-    if (fallbackDelay === -1) {
-      setDelayState({ delay: -1, updatedAt: 0 })
-      return
-    }
-
-    let updatedAt = 0
-    const history = details?.history
-    if (history && history.length > 0) {
-      const lastRecord = history[history.length - 1]
-      const parsed = Date.parse(lastRecord.time)
-      if (!Number.isNaN(parsed)) {
-        updatedAt = parsed
-      }
-    }
-
-    setDelayState({ delay: fallbackDelay, updatedAt })
-  }, [details?.history, groupName, member, name, unresolved])
-
-  useEffect(() => {
-    updateDelay()
-  }, [updateDelay])
+  const fallbackDelay = delayManager.getDelayFix(member, groupName)
+  const history = details?.history
+  const lastRecord = history?.[history.length - 1]
+  const parsed = lastRecord ? Date.parse(lastRecord.time) : NaN
+  const delayState =
+    cachedUpdate ??
+    (fallbackDelay === -1
+      ? INITIAL_DELAY
+      : {
+          delay: fallbackDelay,
+          updatedAt: Number.isNaN(parsed) ? 0 : parsed,
+        })
 
   const onDelay = useLockFn(async () => {
     if (!isInteractableMember(member)) return
-    setDelayState({ delay: -2, updatedAt: Date.now() })
-    setDelayState(await delayManager.checkDelay(member, groupName, timeout))
+    await delayManager.checkDelay(member, groupName, timeout)
   })
 
   return {

src/pages/proxies.tsx

@@ -49,7 +49,11 @@ const ProxyPage = () => {
   >(null)
 
   const { clashConfig } = useClashConfigData()
-  const { refreshClashConfig } = useAppRefreshers()
+  const { refreshClashConfig, refreshProxy } = useAppRefreshers()
+
+  useEffect(() => {
+    refreshProxy().catch((error) => showNotice.error(error))
+  }, [refreshProxy])
 
   const normalizedMode = clashConfig?.mode?.toLowerCase()
   const curMode = isMode(normalizedMode) ? normalizedMode : undefined

src/providers/app-data-provider.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo, useRef } from 'react'
+import React, { useCallback, useEffect, useMemo, useRef } from 'react'
 import {
   getBaseConfig,
   getRuleProviders,
@@ -6,8 +6,10 @@ import {
 } from 'tauri-plugin-mihomo-api'
 
 import { useClashInfo, useRuntimeConfig } from '@/hooks/use-clash'
+import { useProfiles } from '@/hooks/use-profiles'
 import { useVerge } from '@/hooks/use-verge'
 import { getProxyView, getSystemProxy } from '@/services/cmds'
+import delayManager from '@/services/delay'
 import { useQuery } from '@/services/query-client'
 import { useRunState } from '@/store/app-store-context'
 import { resolveDisplayedMixedPort } from '@/utils/mixed-port'
@@ -53,6 +55,8 @@ export const AppDataProvider = ({
   const { verge } = useVerge()
   const { data: runtimeConfig } = useRuntimeConfig()
   const { clashInfo } = useClashInfo()
+  const { profiles } = useProfiles()
+  const currentProfile = profiles?.current
 
   const {
     data: proxyView,
@@ -102,6 +106,12 @@ export const AppDataProvider = ({
   const runningMode = runState?.mode
 
   const refreshProxy = useStableFn(_refetchProxyView)
+  useEffect(() => {
+    if (currentProfile === undefined) return
+    delayManager.setProfile(currentProfile)
+    void refreshProxy()
+  }, [currentProfile, refreshProxy])
+
   const refreshClashConfig = useStableFn(_refetchClashConfig)
   const refreshRules = useStableFn(_refetchRules)
   const refreshSysproxy = useStableFn(_refetchSysproxy)

src/services/delay.test.ts

@@ -5,26 +5,32 @@ vi.mock('tauri-plugin-mihomo-api', () => ({
   healthcheckNodeInProvider: vi.fn(async () => ({ delay: 120 })),
 }))
 
-import type { ResolvedProxyMember } from '@/types/proxy-view'
+import type { InteractableProxyMember } from '@/types/proxy-view'
 
 import delayManager from './delay'
 
-const node = (name: string) =>
-  ({
-    kind: 'node',
-    ref: { kind: 'node', name, recordId: `r:${name}` },
-    node: {
-      recordId: `r:${name}`,
-      name,
-      history: [],
-      source: { kind: 'core', proxyName: name },
-    },
-  }) as unknown as ResolvedProxyMember
-
-const flush = () => new Promise((resolve) => setTimeout(resolve, 0))
+const node = (
+  name: string,
+): Extract<InteractableProxyMember, { kind: 'node' }> => ({
+  kind: 'node',
+  ref: { kind: 'node', name, recordId: `r:${name}` },
+  node: {
+    recordId: `r:${name}`,
+    name,
+    type: 'Shadowsocks',
+    history: [],
+    source: { kind: 'core', proxyName: name },
+    udp: false,
+    xudp: false,
+    tfo: false,
+    mptcp: false,
+    smux: false,
+  },
+})
 
 let settles = 0
 let unsubscribe: () => void
+const flush = () => new Promise((resolve) => setTimeout(resolve, 0))
 
 beforeEach(() => {
   settles = 0
@@ -39,7 +45,7 @@ describe('group delay completion', () => {
   test('notifies once after a batch settles', async () => {
     const proxies = Array.from({ length: 6 }, (_, index) => node(`n${index}`))
 
-    await delayManager.checkListDelay(proxies as never, 'g', 5000, 2)
+    await delayManager.checkListDelay(proxies, 'g', 5000, 2)
     await flush()
 
     expect(settles).toBe(1)
@@ -51,7 +57,7 @@ describe('group delay completion', () => {
       other += 1
     })
 
-    await delayManager.checkDelay(node('a') as never, 'g', 5000)
+    await delayManager.checkDelay(node('a'), 'g', 5000)
     await flush()
 
     expect(settles).toBe(1)
@@ -59,3 +65,47 @@ describe('group delay completion', () => {
     stop()
   })
 })
+
+describe('profile delay isolation', () => {
+  test('notifies both shared-key occurrences and preserves the surviving subscription', async () => {
+    const first = vi.fn()
+    const second = vi.fn()
+    const stopFirst = delayManager.addListener('a', 'g', first)
+    const stopSecond = delayManager.addListener('a', 'g', second)
+    try {
+      delayManager.setDelay('a', 'g', -2)
+      const pending = delayManager.getDelayUpdate('a', 'g')
+      expect(delayManager.getDelayUpdate('a', 'g')).toBe(pending)
+      await flush()
+      stopFirst()
+      delayManager.setDelay('a', 'g', 120)
+      expect(delayManager.getDelayUpdate('a', 'g')).not.toBe(pending)
+      await flush()
+      expect(first.mock.calls.map(([update]) => update.delay)).toEqual([-2])
+      expect(second.mock.calls.map(([update]) => update.delay)).toEqual([
+        -2, 120,
+      ])
+    } finally {
+      stopFirst()
+      stopSecond()
+    }
+  })
+
+  test('clears cached delays and fences an old batch across a profile switch', async () => {
+    delayManager.setProfile('initial')
+    delayManager.setDelay('cached', 'g', 900)
+    const oldBatch = delayManager.checkListDelay(
+      [node('a'), node('not-started')],
+      'g',
+      5000,
+      1,
+    )
+    delayManager.setProfile('next')
+    expect(delayManager.getDelayUpdate('cached', 'g')).toBeUndefined()
+    delayManager.setDelay('a', 'g', 42)
+    await oldBatch
+    await flush()
+    expect(delayManager.getDelay('a', 'g')).toBe(42)
+    expect(delayManager.getDelayUpdate('not-started', 'g')).toBeUndefined()
+  })
+})

src/services/delay.ts

@@ -29,10 +29,12 @@ export interface DelayUpdate {
 const CACHE_TTL = 30 * 60 * 1000
 
 class DelayManager {
+  private profile: string | null = null
+  private generation = 0
   private cache = new Map<string, DelayUpdate>()
   private urlMap = new Map<string, string>()
 
-  private listenerMap = new Map<string, (update: DelayUpdate) => void>()
+  private listenerMap = new Map<string, Set<(update: DelayUpdate) => void>>()
 
   private groupListenerMap = new Map<string, Set<() => void>>()
   // Consumers compare snapshot identity; replace it only when the group settles.
@@ -49,6 +51,35 @@ class DelayManager {
   private itemFlushScheduled = false
   private groupFlushScheduled = false
 
+  setProfile(profile: string | null) {
+    if (this.profile === profile) return
+    this.profile = profile
+    this.generation += 1
+    this.cache.clear()
+    this.activeBatches.clear()
+    this.pendingItemUpdates.clear()
+    this.pendingGroupUpdates.clear()
+    this.groupSnapshots.clear()
+    this.groupSetSnapshots.clear()
+
+    // Reset before a refreshed proxy snapshot can publish newer history.
+    for (const [key, listeners] of this.listenerMap) {
+      for (const listener of [...listeners]) {
+        try {
+          listener({ delay: -1, updatedAt: 0 })
+        } catch (error) {
+          console.error(
+            `[DelayManager] Failed to reset delay listener: ${key}`,
+            error,
+          )
+        }
+      }
+    }
+    for (const group of this.groupListenerMap.keys()) {
+      this.queueGroupNotification(group)
+    }
+  }
+
   private scheduleOnNextFrame(run: () => void): void {
     if (typeof window !== 'undefined') {
       if (typeof window.requestAnimationFrame === 'function') {
@@ -74,17 +105,19 @@ class DelayManager {
       this.pendingItemUpdates = new Map()
 
       updates.forEach((queue, key) => {
-        const listener = this.listenerMap.get(key)
-        if (!listener) return
+        const listeners = this.listenerMap.get(key)
+        if (!listeners) return
 
         queue.forEach((update) => {
-          try {
-            listener(update)
-          } catch (error) {
-            console.error(
-              `[DelayManager] 通知节点延迟监听器失败: ${key}`,
-              error,
-            )
+          for (const listener of [...listeners]) {
+            try {
+              listener(update)
+            } catch (error) {
+              console.error(
+                `[DelayManager] 通知节点延迟监听器失败: ${key}`,
+                error,
+              )
+            }
           }
         })
       })
@@ -170,18 +203,22 @@ class DelayManager {
     return url || 'http://cp.cloudflare.com/generate_204'
   }
 
-  setListener(
+  addListener(
     name: string,
     group: string,
     listener: (update: DelayUpdate) => void,
-  ) {
+  ): () => void {
     const key = hashKey(name, group)
-    this.listenerMap.set(key, listener)
-  }
+    const listeners = this.listenerMap.get(key) ?? new Set()
+    listeners.add(listener)
+    this.listenerMap.set(key, listeners)
 
-  removeListener(name: string, group: string) {
-    const key = hashKey(name, group)
-    this.listenerMap.delete(key)
+    return () => {
+      const current = this.listenerMap.get(key)
+      if (!current) return
+      current.delete(listener)
+      if (current.size === 0) this.listenerMap.delete(key)
+    }
   }
 
   /** Multiple views may subscribe independently; notifications occur only after settle. */
@@ -237,7 +274,8 @@ class DelayManager {
       return undefined
     }
 
-    return { ...entry }
+    // React's external-store reads must retain identity until the value changes.
+    return entry
   }
 
   getDelay(name: string, group: string) {
@@ -276,19 +314,21 @@ class DelayManager {
     member: InteractableProxyMember,
     group: string,
     timeout: number,
-  ): Promise<DelayUpdate> {
+  ): Promise<void> {
+    const generation = this.generation
     // Entry points own the pending mark; measureDelay only writes results.
     this.setDelay(member.ref.name, group, -2)
-    const update = await this.measureDelay(member, group, timeout)
-    this.queueGroupNotification(group)
-    return update
+    await this.measureDelay(member, group, timeout, generation)
+    if (generation === this.generation) this.queueGroupNotification(group)
   }
 
   private async measureDelay(
     member: InteractableProxyMember,
     group: string,
     timeout: number,
-  ): Promise<DelayUpdate> {
+    generation: number,
+  ): Promise<void> {
+    if (generation !== this.generation) return
     const name = member.ref.name
     const providerName =
       member.kind === 'node' ? providerNameOf(member.node) : undefined
@@ -324,14 +364,18 @@ class DelayManager {
       const elapsed = elapsedTime
       debugLog(`[DelayManager] 延迟测试完成，代理: ${name}, 结果: ${delay}ms`)
 
-      return this.setDelay(name, group, delay, { elapsed })
+      if (generation === this.generation) {
+        this.setDelay(name, group, delay, { elapsed })
+      }
     } catch (error) {
       await new Promise((resolve) => setTimeout(resolve, 500))
       console.error(`[DelayManager] 延迟测试出错，代理: ${name}`, error)
       const delay = 1e6 // error
       const elapsed = Date.now() - startTime
 
-      return this.setDelay(name, group, delay, { elapsed })
+      if (generation === this.generation) {
+        this.setDelay(name, group, delay, { elapsed })
+      }
     }
   }
 
@@ -341,6 +385,7 @@ class DelayManager {
     timeout: number,
     concurrency = 36,
   ) {
+    const generation = this.generation
     debugLog(
       `[DelayManager] 批量测试延迟开始，组: ${group}, 数量: ${proxies.length}, 并发数: ${concurrency}`,
     )
@@ -354,6 +399,7 @@ class DelayManager {
     const startTime = Date.now()
 
     const help = async (): Promise<void> => {
+      if (generation !== this.generation) return
       const currMember = proxies[index++]
       if (!currMember) return
       const currName = currMember.ref.name
@@ -367,13 +413,15 @@ class DelayManager {
         }
 
         // Do not reorder a list around the pointer while batch results are arriving.
-        await this.measureDelay(currMember, group, timeout)
+        await this.measureDelay(currMember, group, timeout, generation)
       } catch (error) {
         console.error(
           `[DelayManager] 批量测试单个代理出错，代理: ${currName}`,
           error,
         )
-        this.setDelay(currName, group, 1e6)
+        if (generation === this.generation) {
+          this.setDelay(currName, group, 1e6)
+        }
       }
 
       return help()
@@ -391,12 +439,14 @@ class DelayManager {
       await Promise.all(promiseList)
     } finally {
       // Always release the batch and notify; otherwise failures leave stale sort state.
-      const remaining = (this.activeBatches.get(group) ?? 1) - 1
-      if (remaining > 0) {
-        this.activeBatches.set(group, remaining)
-      } else {
-        this.activeBatches.delete(group)
-        this.queueGroupNotification(group)
+      if (generation === this.generation) {
+        const remaining = (this.activeBatches.get(group) ?? 1) - 1
+        if (remaining > 0) {
+          this.activeBatches.set(group, remaining)
+        } else {
+          this.activeBatches.delete(group)
+          this.queueGroupNotification(group)
+        }
       }
     }
     const totalTime = Date.now() - startTime