test(connections): retain only allocation and formatting guards

Reduce snapshot and table tests to reference reuse, notification suppression, and visible-row formatting cost.

Changelog.md

@@ -29,7 +29,6 @@
 - 修复全局模式默认停在 `DIRECT` 或 `REJECT` 导致流量未经代理，现自动切换到第一个策略组
 - 修复订阅中未加引号的 REALITY `short-id`（如 `1234e123`）被误读为数字，导致订阅无法启用
 - 修复订阅中唯一的代理组名为 `GLOBAL` 或没有代理组时，规则模式下代理页面显示「未获取到代理信息」
-- 修复切换订阅后节点延迟显示旧订阅结果，进入代理页面时主动刷新延迟记录
 
 **🍎 macOS**
 
@@ -49,6 +48,7 @@
 
 - 优化连接、规则和日志筛选：切换页面后保留过滤条件
 - 优化全局模式代理列表：仅显示 `GLOBAL` 节点，选中其中的策略组时才显示该组
+- 优化连接和规则页面的资源占用，减少连接列表更新及排序时的卡顿
 
 **🍎 macOS**
 

src/components/connection/connection-relative-time.test.ts

@@ -0,0 +1,40 @@
+import { useSyncExternalStore } from 'react'
+import { afterEach, expect, it, vi } from 'vitest'
+
+vi.mock('dayjs', () => ({ default: () => ({ from: () => '' }) }))
+vi.mock('react', () => ({
+  memo: (component: unknown) => component,
+  useSyncExternalStore: vi.fn((_subscribe, getSnapshot) => getSnapshot()),
+}))
+
+afterEach(() => {
+  vi.useRealTimers()
+  vi.unstubAllGlobals()
+})
+
+it('keeps at most one interval while visible and none while hidden or unsubscribed', async () => {
+  vi.useFakeTimers()
+  vi.stubGlobal('window', globalThis)
+  const visibility = Object.assign(new EventTarget(), { hidden: true })
+  vi.stubGlobal('document', visibility)
+  const { RelativeTime } = await import('./connection-relative-time')
+  RelativeTime({ start: '' })
+  const [subscribe] = vi.mocked(useSyncExternalStore).mock.calls[0]
+  const unsubscribeFirst = subscribe(() => {})
+  const unsubscribeSecond = subscribe(() => {})
+  expect(vi.getTimerCount()).toBe(0)
+  visibility.hidden = false
+  visibility.dispatchEvent(new Event('visibilitychange'))
+  expect(vi.getTimerCount()).toBe(1)
+  visibility.hidden = true
+  visibility.dispatchEvent(new Event('visibilitychange'))
+  expect(vi.getTimerCount()).toBe(0)
+  visibility.hidden = false
+  visibility.dispatchEvent(new Event('visibilitychange'))
+  expect(vi.getTimerCount()).toBe(1)
+  unsubscribeFirst()
+  unsubscribeSecond()
+  expect(vi.getTimerCount()).toBe(0)
+  visibility.dispatchEvent(new Event('visibilitychange'))
+  expect(vi.getTimerCount()).toBe(0)
+})

src/components/connection/connection-relative-time.tsx

@@ -8,7 +8,7 @@ let timerId: number | null = null
 const listeners = new Set<RelativeTimeListener>()
 
 const startTimer = () => {
-  if (timerId !== null) return
+  if (timerId !== null || document.hidden || listeners.size === 0) return
 
   currentTime = Date.now()
   timerId = window.setInterval(() => {
@@ -18,19 +18,34 @@ const startTimer = () => {
 }
 
 const stopTimer = () => {
-  if (listeners.size > 0 || timerId === null) return
+  if (timerId === null) return
 
   window.clearInterval(timerId)
   timerId = null
 }
 
+const handleVisibilityChange = () => {
+  if (document.hidden) {
+    stopTimer()
+  } else {
+    startTimer()
+    listeners.forEach((listener) => listener())
+  }
+}
+
 const subscribeRelativeTime = (listener: RelativeTimeListener) => {
   listeners.add(listener)
+  if (listeners.size === 1) {
+    document.addEventListener('visibilitychange', handleVisibilityChange)
+  }
   startTimer()
 
   return () => {
     listeners.delete(listener)
-    stopTimer()
+    if (listeners.size === 0) {
+      stopTimer()
+      document.removeEventListener('visibilitychange', handleVisibilityChange)
+    }
   }
 }
 

src/components/connection/connection-table.test.ts

@@ -0,0 +1,75 @@
+import { createElement } from 'react'
+import { renderToStaticMarkup } from 'react-dom/server'
+import { expect, it, vi } from 'vitest'
+
+import { formatConnectionTraffic } from './connection-row-view'
+import { ConnectionTable } from './connection-table'
+
+const sorting = vi.hoisted(() => ({ id: 'download', desc: false }))
+
+vi.mock('react', async (importOriginal) => ({
+  ...(await importOriginal<typeof import('react')>()),
+  useState: (initial: unknown) => [
+    initial === null ? sorting : initial,
+    vi.fn(),
+  ],
+}))
+vi.mock('foxact/use-local-storage', () => ({
+  useLocalStorage: (_key: string, initial: unknown) => [initial, vi.fn()],
+}))
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}))
+vi.mock('./connection-column-manager', () => ({
+  ConnectionColumnManager: () => null,
+}))
+vi.mock('./connection-relative-time', () => ({
+  RelativeTime: () => null,
+}))
+vi.mock('./connection-row-view', async (importOriginal) => {
+  const original =
+    await importOriginal<typeof import('./connection-row-view')>()
+  return {
+    ...original,
+    formatConnectionTraffic: vi.fn(original.formatConnectionTraffic),
+  }
+})
+
+it('formats only virtual rows when sorting numeric columns above the cache bound', () => {
+  const connections: IConnectionsItem[] = Array.from(
+    { length: 2_101 },
+    (_, i) => ({
+      id: `${i}`,
+      metadata: {
+        network: 'tcp',
+        type: 'HTTP',
+        host: `host-${i}`,
+        sourceIP: '',
+        sourcePort: '',
+        destinationPort: '443',
+      },
+      chains: [],
+      rule: '',
+      rulePayload: '',
+      start: '',
+      upload: (i * 3) % 2_101,
+      download: (i * 5) % 2_101,
+      curUpload: (i * 7) % 2_101,
+      curDownload: (i * 11) % 2_101,
+    }),
+  )
+
+  for (const column of ['download', 'upload', 'dlSpeed', 'ulSpeed']) {
+    sorting.id = column
+    vi.mocked(formatConnectionTraffic).mockClear()
+    renderToStaticMarkup(
+      createElement(ConnectionTable, {
+        connections,
+        onShowDetail: vi.fn(),
+        columnManagerOpen: false,
+        onCloseColumnManager: vi.fn(),
+      }),
+    )
+    expect(formatConnectionTraffic).toHaveBeenCalledTimes(24)
+  }
+})

src/components/connection/connection-table.tsx

@@ -223,6 +223,16 @@ const compareConnectionCellValue = (
   right: IConnectionsItem,
   getSnapshot: (row: IConnectionsItem) => TableRowSnapshot,
 ) => {
+  switch (field) {
+    case 'download':
+      return (left.download ?? 0) - (right.download ?? 0)
+    case 'upload':
+      return (left.upload ?? 0) - (right.upload ?? 0)
+    case 'dlSpeed':
+      return (left.curDownload ?? 0) - (right.curDownload ?? 0)
+    case 'ulSpeed':
+      return (left.curUpload ?? 0) - (right.curUpload ?? 0)
+  }
   const leftValue = getConnectionCellValue(field, getSnapshot(left))
   const rightValue = getConnectionCellValue(field, getSnapshot(right))
 
@@ -491,6 +501,8 @@ export const ConnectionTable = (props: Props) => {
   const [sorting, setSorting] = useState<SortingState | null>(null)
   const [viewport, setViewport] = useState({ scrollTop: 0, height: 0 })
   const scrollContainerRef = useRef<HTMLDivElement | null>(null)
+  const resizeCleanupRef = useRef<(() => void) | null>(null)
+  useEffect(() => () => resizeCleanupRef.current?.(), [])
   const rowSnapshotCacheRef = useRef(new Map<string, TableRowSnapshot>())
   const getRowSnapshot = useCallback((row: IConnectionsItem) => {
     const cache = rowSnapshotCacheRef.current
@@ -664,6 +676,7 @@ export const ConnectionTable = (props: Props) => {
       minWidth: number,
       maxWidth: number | undefined,
     ) => {
+      resizeCleanupRef.current?.()
       const handleMove = (clientX: number) => {
         const nextWidth = Math.max(
           minWidth,
@@ -686,8 +699,10 @@ export const ConnectionTable = (props: Props) => {
         window.removeEventListener('touchmove', handleTouchMove)
         window.removeEventListener('touchend', cleanup)
         window.removeEventListener('touchcancel', cleanup)
+        resizeCleanupRef.current = null
       }
 
+      resizeCleanupRef.current = cleanup
       window.addEventListener('mousemove', handleMouseMove)
       window.addEventListener('mouseup', cleanup)
       window.addEventListener('touchmove', handleTouchMove, { passive: true })

src/components/rule/rule-item.tsx

@@ -16,7 +16,8 @@ const COLOR = [
 ]
 
 interface Props {
-  value: Rule & { lineNo: number }
+  value: Rule
+  lineNo: number
 }
 
 const parseColor = (text: string) => {
@@ -31,7 +32,7 @@ const parseColor = (text: string) => {
 }
 
 const RuleItem = (props: Props) => {
-  const { value } = props
+  const { value, lineNo } = props
 
   return (
     <Item sx={{ borderBottom: '1px solid var(--divider-color)' }}>
@@ -40,7 +41,7 @@ const RuleItem = (props: Props) => {
         variant="body2"
         sx={{ lineHeight: 2, minWidth: 30, mr: 2.25, textAlign: 'center' }}
       >
-        {value.lineNo}
+        {lineNo}
       </Typography>
 
       <Box sx={{ userSelect: 'text' }}>

src/hooks/use-connection-data.test.ts

@@ -0,0 +1,79 @@
+import { useSyncExternalStore } from 'react'
+import { afterEach, expect, it, vi } from 'vitest'
+
+const socket = vi.hoisted(() => ({
+  addListener:
+    vi.fn<
+      (listener: (message: { type: string; data: string }) => void) => void
+    >(),
+  close: async () => {},
+}))
+
+vi.mock('react', () => ({
+  useCallback: (callback: unknown) => callback,
+  useMemo: (factory: () => unknown) => factory(),
+  useSyncExternalStore: vi.fn((_subscribe, getSnapshot) => getSnapshot()),
+}))
+vi.mock('tauri-plugin-mihomo-api', () => ({
+  MihomoWebSocket: { connect_connections: async () => socket },
+}))
+
+afterEach(() => {
+  vi.useRealTimers()
+  vi.unstubAllGlobals()
+})
+
+it('reuses unchanged snapshot and list references without notifying subscribers', async () => {
+  vi.useFakeTimers()
+  vi.setSystemTime(10_000)
+  vi.stubGlobal('window', globalThis)
+  const { useConnectionData: readConnectionData } = await import(
+    './use-connection-data'
+  )
+  readConnectionData()
+  const [subscribe, read] = vi
+    .mocked(
+      useSyncExternalStore<
+        ReturnType<typeof readConnectionData>['response']['data']
+      >,
+    )
+    .mock.calls.at(-1)!
+  const listener = vi.fn()
+  const unsubscribe = subscribe(listener)
+  await Promise.resolve()
+  const onMessage = socket.addListener.mock.calls[0][0]
+  const connections: IConnectionsItem[] = [
+    {
+      id: 'a',
+      metadata: {
+        network: 'tcp',
+        type: 'HTTP',
+        host: 'example.com',
+        sourceIP: '',
+        sourcePort: '',
+        destinationPort: '443',
+      },
+      chains: [],
+      rule: '',
+      rulePayload: '',
+      start: '',
+      upload: 0,
+      download: 0,
+    },
+  ]
+  const send = (uploadTotal = 0) => {
+    vi.advanceTimersByTime(500)
+    onMessage({
+      type: 'Text',
+      data: JSON.stringify({ connections, uploadTotal, downloadTotal: 0 }),
+    })
+    return read()
+  }
+  const first = send()
+  expect(send()).toBe(first)
+  expect(listener).toHaveBeenCalledTimes(1)
+  const totalsOnly = send(100)
+  expect(totalsOnly.activeConnections).toBe(first.activeConnections)
+  expect(totalsOnly.closedConnections).toBe(first.closedConnections)
+  unsubscribe()
+})

src/hooks/use-connection-data.ts

@@ -150,25 +150,49 @@ const mergeConnectionSnapshot = (
   const nextConnections = payload.connections ?? []
   const previousActive = previous.activeConnections ?? []
   const previousClosed = previous.closedConnections ?? []
-  const previousActiveById = new Map<string, IConnectionsItem>()
+  const sameOrder =
+    nextConnections.length === previousActive.length &&
+    nextConnections.every(
+      (connection, i) => connection.id === previousActive[i].id,
+    )
+  let previousActiveById: Map<string, IConnectionsItem> | undefined
 
-  for (let i = 0; i < previousActive.length; i++) {
-    const previousConnection = previousActive[i]
-    previousActiveById.set(previousConnection.id, previousConnection)
+  if (!sameOrder) {
+    previousActiveById = new Map()
+    for (let i = 0; i < previousActive.length; i++) {
+      const previousConnection = previousActive[i]
+      previousActiveById.set(previousConnection.id, previousConnection)
+    }
   }
 
-  const activeConnections: IConnectionsItem[] = []
+  let activeConnections = sameOrder ? previousActive : []
   for (let i = 0; i < nextConnections.length; i++) {
     const connection = nextConnections[i]
-    const previousConnection = previousActiveById.get(connection.id)
-    if (previousConnection) previousActiveById.delete(connection.id)
-    activeConnections.push(normalizeConnection(connection, previousConnection))
+    const previousConnection = sameOrder
+      ? previousActive[i]
+      : previousActiveById?.get(connection.id)
+    previousActiveById?.delete(connection.id)
+    const normalized = normalizeConnection(connection, previousConnection)
+    if (activeConnections[i] === normalized) continue
+    if (activeConnections === previousActive) {
+      activeConnections = previousActive.slice()
+    }
+    activeConnections[i] = normalized
   }
 
-  if (previousActiveById.size === 0) {
+  const uploadTotal = payload.uploadTotal ?? 0
+  const downloadTotal = payload.downloadTotal ?? 0
+  if (!previousActiveById?.size) {
+    if (
+      activeConnections === previousActive &&
+      uploadTotal === previous.uploadTotal &&
+      downloadTotal === previous.downloadTotal
+    ) {
+      return previous
+    }
     return {
-      uploadTotal: payload.uploadTotal ?? 0,
-      downloadTotal: payload.downloadTotal ?? 0,
+      uploadTotal,
+      downloadTotal,
       activeConnections,
       closedConnections: previousClosed,
     }
@@ -198,8 +222,8 @@ const mergeConnectionSnapshot = (
   }
 
   return {
-    uploadTotal: payload.uploadTotal ?? 0,
-    downloadTotal: payload.downloadTotal ?? 0,
+    uploadTotal,
+    downloadTotal,
     activeConnections,
     closedConnections,
   }
@@ -227,7 +251,9 @@ const flushPendingMessage = () => {
 
   lastFlushAt = Date.now()
 
-  connectionData = mergeConnectionSnapshot(payload, connectionData)
+  const nextData = mergeConnectionSnapshot(payload, connectionData)
+  if (nextData === connectionData) return
+  connectionData = nextData
   notifyConnectionListeners()
 }
 

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

@@ -48,7 +48,10 @@ export function useProxyDelayState(
 
   useEffect(() => {
     if (isPreset) return
-    return delayManager.addListener(name, groupName, setDelayState)
+    delayManager.setListener(name, groupName, setDelayState)
+    return () => {
+      delayManager.removeListener(name, groupName)
+    }
   }, [name, groupName, isPreset])
 
   const updateDelay = useCallback(() => {
@@ -87,7 +90,8 @@ export function useProxyDelayState(
 
   const onDelay = useLockFn(async () => {
     if (!isInteractableMember(member)) return
-    await delayManager.checkDelay(member, groupName, timeout)
+    setDelayState({ delay: -2, updatedAt: Date.now() })
+    setDelayState(await delayManager.checkDelay(member, groupName, timeout))
   })
 
   return {

src/pages/proxies.tsx

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

src/pages/rules.tsx

@@ -34,13 +34,11 @@ const RulesPage = () => {
   }, [refreshRules, refreshRuleProviders, pageVisible])
 
   const filteredRules = useMemo(() => {
-    const rulesWithLineNo = rules.map((item, index) => ({
-      ...item,
-      // UI-only derived data; keep app context/SWR data immutable
-      lineNo: index + 1,
-    }))
-
-    return rulesWithLineNo.filter((item) => match(item.payload ?? ''))
+    const indices: number[] = []
+    for (let i = 0; i < rules.length; i++) {
+      if (match(rules[i].payload ?? '')) indices.push(i)
+    }
+    return indices
   }, [rules, match])
 
   const handleScroll = useCallback((e: Event) => {
@@ -90,7 +88,12 @@ const RulesPage = () => {
             ref={virtuosoRef}
             count={filteredRules.length}
             estimateSize={40}
-            renderItem={(i) => <RuleItem value={filteredRules[i]} />}
+            renderItem={(i) => (
+              <RuleItem
+                value={rules[filteredRules[i]]}
+                lineNo={filteredRules[i] + 1}
+              />
+            )}
             style={{ flex: 1 }}
             onScroll={handleScroll}
           />

src/providers/app-data-provider.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useRef } from 'react'
+import React, { useCallback, useMemo, useRef } from 'react'
 import {
   getBaseConfig,
   getRuleProviders,
@@ -6,10 +6,8 @@ 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'
@@ -55,8 +53,6 @@ export const AppDataProvider = ({
   const { verge } = useVerge()
   const { data: runtimeConfig } = useRuntimeConfig()
   const { clashInfo } = useClashInfo()
-  const { profiles } = useProfiles()
-  const currentProfile = profiles?.current
 
   const {
     data: proxyView,
@@ -106,12 +102,6 @@ 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,32 +5,26 @@ vi.mock('tauri-plugin-mihomo-api', () => ({
   healthcheckNodeInProvider: vi.fn(async () => ({ delay: 120 })),
 }))
 
-import type { InteractableProxyMember } from '@/types/proxy-view'
+import type { ResolvedProxyMember } from '@/types/proxy-view'
 
 import delayManager from './delay'
 
-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,
-  },
-})
+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))
 
 let settles = 0
 let unsubscribe: () => void
-const flush = () => new Promise((resolve) => setTimeout(resolve, 0))
 
 beforeEach(() => {
   settles = 0
@@ -45,7 +39,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, 'g', 5000, 2)
+    await delayManager.checkListDelay(proxies as never, 'g', 5000, 2)
     await flush()
 
     expect(settles).toBe(1)
@@ -57,7 +51,7 @@ describe('group delay completion', () => {
       other += 1
     })
 
-    await delayManager.checkDelay(node('a'), 'g', 5000)
+    await delayManager.checkDelay(node('a') as never, 'g', 5000)
     await flush()
 
     expect(settles).toBe(1)
@@ -65,44 +59,3 @@ 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)
-      await flush()
-      stopFirst()
-      delayManager.setDelay('a', 'g', 120)
-      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,12 +29,10 @@ 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, Set<(update: DelayUpdate) => void>>()
+  private listenerMap = new Map<string, (update: DelayUpdate) => void>()
 
   private groupListenerMap = new Map<string, Set<() => void>>()
   // Consumers compare snapshot identity; replace it only when the group settles.
@@ -51,35 +49,6 @@ 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') {
@@ -105,19 +74,17 @@ class DelayManager {
       this.pendingItemUpdates = new Map()
 
       updates.forEach((queue, key) => {
-        const listeners = this.listenerMap.get(key)
-        if (!listeners) return
+        const listener = this.listenerMap.get(key)
+        if (!listener) return
 
         queue.forEach((update) => {
-          for (const listener of [...listeners]) {
-            try {
-              listener(update)
-            } catch (error) {
-              console.error(
-                `[DelayManager] 通知节点延迟监听器失败: ${key}`,
-                error,
-              )
-            }
+          try {
+            listener(update)
+          } catch (error) {
+            console.error(
+              `[DelayManager] 通知节点延迟监听器失败: ${key}`,
+              error,
+            )
           }
         })
       })
@@ -203,22 +170,18 @@ class DelayManager {
     return url || 'http://cp.cloudflare.com/generate_204'
   }
 
-  addListener(
+  setListener(
     name: string,
     group: string,
     listener: (update: DelayUpdate) => void,
-  ): () => void {
+  ) {
     const key = hashKey(name, group)
-    const listeners = this.listenerMap.get(key) ?? new Set()
-    listeners.add(listener)
-    this.listenerMap.set(key, listeners)
+    this.listenerMap.set(key, listener)
+  }
 
-    return () => {
-      const current = this.listenerMap.get(key)
-      if (!current) return
-      current.delete(listener)
-      if (current.size === 0) this.listenerMap.delete(key)
-    }
+  removeListener(name: string, group: string) {
+    const key = hashKey(name, group)
+    this.listenerMap.delete(key)
   }
 
   /** Multiple views may subscribe independently; notifications occur only after settle. */
@@ -313,21 +276,19 @@ class DelayManager {
     member: InteractableProxyMember,
     group: string,
     timeout: number,
-  ): Promise<void> {
-    const generation = this.generation
+  ): Promise<DelayUpdate> {
     // Entry points own the pending mark; measureDelay only writes results.
     this.setDelay(member.ref.name, group, -2)
-    await this.measureDelay(member, group, timeout, generation)
-    if (generation === this.generation) this.queueGroupNotification(group)
+    const update = await this.measureDelay(member, group, timeout)
+    this.queueGroupNotification(group)
+    return update
   }
 
   private async measureDelay(
     member: InteractableProxyMember,
     group: string,
     timeout: number,
-    generation: number,
-  ): Promise<void> {
-    if (generation !== this.generation) return
+  ): Promise<DelayUpdate> {
     const name = member.ref.name
     const providerName =
       member.kind === 'node' ? providerNameOf(member.node) : undefined
@@ -363,18 +324,14 @@ class DelayManager {
       const elapsed = elapsedTime
       debugLog(`[DelayManager] 延迟测试完成，代理: ${name}, 结果: ${delay}ms`)
 
-      if (generation === this.generation) {
-        this.setDelay(name, group, delay, { elapsed })
-      }
+      return 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
 
-      if (generation === this.generation) {
-        this.setDelay(name, group, delay, { elapsed })
-      }
+      return this.setDelay(name, group, delay, { elapsed })
     }
   }
 
@@ -384,7 +341,6 @@ class DelayManager {
     timeout: number,
     concurrency = 36,
   ) {
-    const generation = this.generation
     debugLog(
       `[DelayManager] 批量测试延迟开始，组: ${group}, 数量: ${proxies.length}, 并发数: ${concurrency}`,
     )
@@ -398,7 +354,6 @@ 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
@@ -412,15 +367,13 @@ class DelayManager {
         }
 
         // Do not reorder a list around the pointer while batch results are arriving.
-        await this.measureDelay(currMember, group, timeout, generation)
+        await this.measureDelay(currMember, group, timeout)
       } catch (error) {
         console.error(
           `[DelayManager] 批量测试单个代理出错，代理: ${currName}`,
           error,
         )
-        if (generation === this.generation) {
-          this.setDelay(currName, group, 1e6)
-        }
+        this.setDelay(currName, group, 1e6)
       }
 
       return help()
@@ -438,14 +391,12 @@ class DelayManager {
       await Promise.all(promiseList)
     } finally {
       // Always release the batch and notify; otherwise failures leave stale sort state.
-      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 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