diff --git a/src/components/connection/connection-relative-time.tsx b/src/components/connection/connection-relative-time.tsx index 80533dbb6..b8ee533af 100644 --- a/src/components/connection/connection-relative-time.tsx +++ b/src/components/connection/connection-relative-time.tsx @@ -8,7 +8,7 @@ let timerId: number | null = null const listeners = new Set() 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) + } } } diff --git a/src/components/connection/connection-table.tsx b/src/components/connection/connection-table.tsx index bb8d90dc6..111a46a9a 100644 --- a/src/components/connection/connection-table.tsx +++ b/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(null) const [viewport, setViewport] = useState({ scrollTop: 0, height: 0 }) const scrollContainerRef = useRef(null) + const resizeCleanupRef = useRef<(() => void) | null>(null) + useEffect(() => () => resizeCleanupRef.current?.(), []) const rowSnapshotCacheRef = useRef(new Map()) 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 }) diff --git a/src/components/rule/rule-item.tsx b/src/components/rule/rule-item.tsx index 14dbbc8ad..12c283c6a 100644 --- a/src/components/rule/rule-item.tsx +++ b/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 ( @@ -40,7 +41,7 @@ const RuleItem = (props: Props) => { variant="body2" sx={{ lineHeight: 2, minWidth: 30, mr: 2.25, textAlign: 'center' }} > - {value.lineNo} + {lineNo} diff --git a/src/hooks/use-connection-data.ts b/src/hooks/use-connection-data.ts index 99bae9f81..d6471c489 100644 --- a/src/hooks/use-connection-data.ts +++ b/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() + const sameOrder = + nextConnections.length === previousActive.length && + nextConnections.every( + (connection, i) => connection.id === previousActive[i].id, + ) + let previousActiveById: Map | 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() } diff --git a/src/pages/rules.tsx b/src/pages/rules.tsx index 5fc812a78..64ac98e13 100644 --- a/src/pages/rules.tsx +++ b/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) => } + renderItem={(i) => ( + + )} style={{ flex: 1 }} onScroll={handleScroll} />