mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-11-20 02:42:12 +08:00
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4969630f57 | ||
|
|
50fd66925a | ||
|
|
5d2e69ba6c | ||
|
|
71444c9815 | ||
|
|
02a1998b8d |
@@ -67,6 +67,7 @@
|
||||
- 优化全局模式代理列表:仅显示 `GLOBAL` 节点,选中其中的策略组时才显示该组
|
||||
- 优化设置页开关和选项所在行的鼠标悬停高亮,便于对应说明与控件
|
||||
- 优化首页「当前节点」卡片:代理组列表加入 `fallback` 代理组,切换到 `url-test` 或 `fallback` 代理组时同样联动 `select` 代理组
|
||||
- 优化主页流量图表与日志、代理列表的实时刷新和滚动占用,降低高频更新时的 CPU 负载
|
||||
|
||||
**🍎 macOS**
|
||||
|
||||
|
||||
+1
-1
@@ -220,7 +220,7 @@ pub fn run() -> std::process::ExitCode {
|
||||
.set_activation_policy(tauri::ActivationPolicy::Prohibited)?;
|
||||
let scenario = std::env::var("PERF_SCENARIO").unwrap_or_else(|_| "traffic".into());
|
||||
let layer = std::env::var("PERF_LAYER").unwrap_or_else(|_| "component".into());
|
||||
if !matches!(scenario.as_str(), "traffic" | "logs" | "connections")
|
||||
if !matches!(scenario.as_str(), "traffic" | "logs" | "connections" | "proxy")
|
||||
|| !matches!(layer.as_str(), "page" | "component" | "dom")
|
||||
{
|
||||
return Err("invalid perf scene".into());
|
||||
|
||||
@@ -2,6 +2,8 @@ import { layer, scenario, startReplay } from './replay'
|
||||
|
||||
if (scenario === 'traffic') {
|
||||
await import('./traffic')
|
||||
} else if (scenario === 'proxy') {
|
||||
await import('./proxy')
|
||||
} else {
|
||||
const root = document.getElementById('root')!
|
||||
document.body.style.cssText = 'margin:0;font:14px -apple-system,sans-serif'
|
||||
|
||||
@@ -0,0 +1,137 @@
|
||||
// Only this perf build aliases '@tauri-apps/api/core' to a shim that serves
|
||||
// these responses for the proxy scenario; the normal application never
|
||||
// imports it. The runtime-injected __TAURI_INTERNALS__ is read-only, so
|
||||
// interception happens at import resolution instead. Unknown commands pass
|
||||
// through to the real backend (perf_state, event plugin), keeping harness
|
||||
// ownership probes and lifecycle commands working. The proxy scenario is
|
||||
// therefore a JavaScript invoke adapter, not native plugin IPC.
|
||||
|
||||
const GROUP_COUNT = 40
|
||||
const NODES_PER_GROUP = 24
|
||||
|
||||
const capabilities = {
|
||||
udp: true,
|
||||
xudp: false,
|
||||
tfo: false,
|
||||
mptcp: false,
|
||||
smux: false,
|
||||
}
|
||||
|
||||
const history = (delay: number) => [{ time: '2026-11-19T00:00:00Z', delay }]
|
||||
|
||||
const buildProxyView = () => {
|
||||
const records: Record<string, unknown> = {}
|
||||
const groups: {
|
||||
name: string
|
||||
type: string
|
||||
now: string
|
||||
hidden: boolean
|
||||
history: { time: string; delay: number }[]
|
||||
members: unknown[]
|
||||
}[] = []
|
||||
|
||||
for (let g = 0; g < GROUP_COUNT; g++) {
|
||||
const members: unknown[] = []
|
||||
for (let n = 0; n < NODES_PER_GROUP; n++) {
|
||||
const name = `node-${g}-${n}`
|
||||
const recordId = `record-${g}-${n}`
|
||||
records[recordId] = {
|
||||
recordId,
|
||||
name,
|
||||
type: n % 3 === 0 ? 'Shadowsocks' : n % 3 === 1 ? 'Vmess' : 'Trojan',
|
||||
history: history(30 + ((g * 7 + n * 13) % 40) * 10),
|
||||
source: { kind: 'core', proxyName: name },
|
||||
...capabilities,
|
||||
}
|
||||
members.push({ kind: 'node', name, recordId })
|
||||
}
|
||||
groups.push({
|
||||
name: `group-${String(g).padStart(2, '0')}`,
|
||||
type: g % 2 === 0 ? 'Selector' : 'URLTest',
|
||||
now: `node-${g}-0`,
|
||||
hidden: false,
|
||||
history: history(20),
|
||||
members,
|
||||
})
|
||||
}
|
||||
|
||||
return {
|
||||
schemaVersion: 1,
|
||||
orderSource: 'runtime',
|
||||
providerState: 'ready',
|
||||
global: {
|
||||
name: 'GLOBAL',
|
||||
type: 'Selector',
|
||||
now: 'group-00',
|
||||
hidden: true,
|
||||
history: [],
|
||||
members: groups.map((group) => ({ kind: 'group', name: group.name })),
|
||||
...capabilities,
|
||||
},
|
||||
direct: 'DIRECT',
|
||||
groups: groups.map((group) => ({ ...group, ...capabilities })),
|
||||
records,
|
||||
standalone: [],
|
||||
providers: [],
|
||||
}
|
||||
}
|
||||
|
||||
const handlers: Record<string, () => unknown> = {
|
||||
get_proxy_view: buildProxyView,
|
||||
get_verge_config: () => ({
|
||||
language: 'en',
|
||||
theme_mode: 'light',
|
||||
proxy_layout_column: 2,
|
||||
default_latency_timeout: 10000,
|
||||
enable_hover_jump_navigator: true,
|
||||
hover_jump_navigator_delay: 200,
|
||||
pause_render_traffic_stats_on_blur: false,
|
||||
}),
|
||||
get_profiles: () => ({
|
||||
current: 'perf-profile',
|
||||
items: [
|
||||
{
|
||||
uid: 'perf-profile',
|
||||
type: 'remote',
|
||||
name: 'Perf Profile',
|
||||
desc: '',
|
||||
url: '',
|
||||
selected: true,
|
||||
extra: {},
|
||||
option: { update_interval: 0 },
|
||||
},
|
||||
],
|
||||
}),
|
||||
get_clash_info: () => ({
|
||||
mixed_port: 7897,
|
||||
socks_port: 0,
|
||||
port: 0,
|
||||
server: '127.0.0.1:9097',
|
||||
secret: null,
|
||||
}),
|
||||
get_runtime_config: () => null,
|
||||
get_sys_proxy: () => ({ enable: false, bypass: '', pac_file: '' }),
|
||||
get_runtime_state: () => ({
|
||||
mode: 'Sidecar',
|
||||
service: 'ready',
|
||||
serviceUnavailableReason: null,
|
||||
pendingAction: null,
|
||||
sidecarAllowed: true,
|
||||
isAdmin: false,
|
||||
opInFlight: false,
|
||||
serviceUsable: true,
|
||||
tunCapable: false,
|
||||
serviceNeedsAttention: false,
|
||||
}),
|
||||
get_sidecar_failure: () => null,
|
||||
get_pending_failures: () => [],
|
||||
'plugin:mihomo|get_configs': () => ({ mode: 'rule', 'mixed-port': 7897 }),
|
||||
'plugin:mihomo|get_rule_providers': () => ({ providers: {} }),
|
||||
'plugin:mihomo|get_rules': () => ({ rules: [] }),
|
||||
}
|
||||
|
||||
/** Returns the mocked response, or undefined to pass through to the backend. */
|
||||
export const mockCommand = (cmd: string): unknown => {
|
||||
const handler = handlers[cmd]
|
||||
return handler ? handler() : undefined
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
import { ThemeProvider, createTheme } from '@mui/material'
|
||||
import { useEffect } from 'react'
|
||||
import { createRoot } from 'react-dom/client'
|
||||
import { SWRConfig } from 'swr'
|
||||
|
||||
import { AppDataProvider } from '../../src/providers/app-data-provider'
|
||||
import { initializeLanguage } from '../../src/services/i18n'
|
||||
import { setPreloadConfig } from '../../src/services/preload'
|
||||
import { swrConfig } from '../../src/services/query-client'
|
||||
import { AppStoreProvider } from '../../src/store/app-store'
|
||||
|
||||
import '../../src/assets/styles/page.scss'
|
||||
|
||||
const root = document.getElementById('root')!
|
||||
document.body.style.cssText = 'margin:0;font:14px -apple-system,sans-serif'
|
||||
root.style.cssText = 'width:1000px;height:700px;overflow:hidden'
|
||||
new MutationObserver(() => {
|
||||
document.documentElement.dataset.perfDraw = String(Date.now())
|
||||
}).observe(root, { childList: true, characterData: true, subtree: true })
|
||||
|
||||
setPreloadConfig({
|
||||
language: 'en',
|
||||
theme_mode: 'light',
|
||||
pause_render_traffic_stats_on_blur: false,
|
||||
} as IVergeConfig)
|
||||
await initializeLanguage('en')
|
||||
|
||||
const ProxyPage = (await import('../../src/pages/proxies')).default
|
||||
|
||||
const findScroller = () => {
|
||||
const elements = document.querySelectorAll<HTMLElement>('#root *')
|
||||
for (const element of elements) {
|
||||
const { overflowY } = getComputedStyle(element)
|
||||
if (
|
||||
(overflowY === 'auto' || overflowY === 'scroll') &&
|
||||
element.scrollHeight > element.clientHeight
|
||||
) {
|
||||
return element
|
||||
}
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
// Deterministic sawtooth scrolling keeps the virtualizer measuring, the
|
||||
// throttled scroll-position save running and the DOM mutating so the perfDraw
|
||||
// marker tracks view-input delivery. Each applied scroll step counts as one
|
||||
// delivered view input; the interval keeps delivering (throttled by the
|
||||
// browser) while the window is hidden and rAF is suspended.
|
||||
export const ScrollDriver = () => {
|
||||
useEffect(() => {
|
||||
const data = document.documentElement.dataset
|
||||
let stopped = false
|
||||
const step = () => {
|
||||
const scroller = findScroller()
|
||||
if (scroller) {
|
||||
const max = scroller.scrollHeight - scroller.clientHeight
|
||||
if (max > 0) {
|
||||
const next =
|
||||
scroller.scrollTop + 36 > max - 36 ? 0 : scroller.scrollTop + 36
|
||||
scroller.scrollTop = next
|
||||
data.perfScroll = String(Number(data.perfScroll || 0) + 1)
|
||||
data.perfDelivered = String(Number(data.perfDelivered || 0) + 1)
|
||||
}
|
||||
}
|
||||
}
|
||||
const drive = () => {
|
||||
if (stopped) return
|
||||
step()
|
||||
requestAnimationFrame(drive)
|
||||
}
|
||||
const handle = requestAnimationFrame(drive)
|
||||
const timer = window.setInterval(step, 250)
|
||||
return () => {
|
||||
stopped = true
|
||||
cancelAnimationFrame(handle)
|
||||
window.clearInterval(timer)
|
||||
}
|
||||
}, [])
|
||||
return null
|
||||
}
|
||||
|
||||
createRoot(root).render(
|
||||
<SWRConfig value={swrConfig}>
|
||||
<ThemeProvider theme={createTheme()}>
|
||||
<AppStoreProvider>
|
||||
<AppDataProvider>
|
||||
<ProxyPage />
|
||||
<ScrollDriver />
|
||||
</AppDataProvider>
|
||||
</AppStoreProvider>
|
||||
</ThemeProvider>
|
||||
</SWRConfig>,
|
||||
)
|
||||
@@ -0,0 +1,17 @@
|
||||
import { startReplay } from './replay'
|
||||
|
||||
// Thin loader: error handlers must precede scene module evaluation so any
|
||||
// startup failure surfaces in perfError.
|
||||
const data = document.documentElement.dataset
|
||||
window.addEventListener('error', (event) => {
|
||||
data.perfError = event.message
|
||||
})
|
||||
window.addEventListener('unhandledrejection', (event) => {
|
||||
data.perfError = String(event.reason)
|
||||
})
|
||||
|
||||
data.perfStage = 'loader'
|
||||
await import('./proxy-scene')
|
||||
data.perfStage = 'scene'
|
||||
startReplay()
|
||||
data.perfStage = 'replay'
|
||||
@@ -0,0 +1,30 @@
|
||||
// Aliased in place of '@tauri-apps/api/core' only by the perf build. The
|
||||
// direct relative import keeps the original module outside the alias so this
|
||||
// shim can forward to it. Invocation stays byte-identical for every scenario
|
||||
// except proxy, which needs the JavaScript invoke adapter.
|
||||
import {
|
||||
Channel,
|
||||
convertFileSrc,
|
||||
invoke as realInvoke,
|
||||
type InvokeArgs,
|
||||
type InvokeOptions,
|
||||
} from '../../node_modules/@tauri-apps/api/core.js'
|
||||
|
||||
import { mockCommand } from './invoke-mock'
|
||||
import { scenario } from './replay'
|
||||
|
||||
const proxied = scenario === 'proxy'
|
||||
|
||||
export const invoke = async <T>(
|
||||
cmd: string,
|
||||
args?: InvokeArgs,
|
||||
options?: InvokeOptions,
|
||||
): Promise<T> => {
|
||||
if (proxied) {
|
||||
const mocked = mockCommand(cmd)
|
||||
if (mocked !== undefined) return mocked as T
|
||||
}
|
||||
return realInvoke(cmd, args, options)
|
||||
}
|
||||
|
||||
export { Channel, convertFileSrc }
|
||||
@@ -6,5 +6,11 @@ export default mergeConfig(
|
||||
defineConfig({
|
||||
root: 'scripts/perf',
|
||||
build: { outDir: '../../target/perf/dist', target: 'safari16' },
|
||||
resolve: {
|
||||
alias: {
|
||||
'@tauri-apps/api/core': new URL('./tauri-core-shim.ts', import.meta.url)
|
||||
.pathname,
|
||||
},
|
||||
},
|
||||
}),
|
||||
)
|
||||
|
||||
@@ -53,15 +53,6 @@ const StyledTextField = styled(TextField)(({ theme }) => ({
|
||||
},
|
||||
}))
|
||||
|
||||
const iconStyle = {
|
||||
style: {
|
||||
height: '24px',
|
||||
width: '24px',
|
||||
cursor: 'pointer',
|
||||
} as React.CSSProperties,
|
||||
inheritViewBox: true,
|
||||
}
|
||||
|
||||
const useControllableState = <T,>(options: {
|
||||
controlled: T | undefined
|
||||
defaultValue: T
|
||||
@@ -128,6 +119,15 @@ export const BaseSearchBox = ({
|
||||
defaultValue: defaultUseRegularExpression,
|
||||
})
|
||||
|
||||
const iconStyle = {
|
||||
style: {
|
||||
height: '24px',
|
||||
width: '24px',
|
||||
cursor: 'pointer',
|
||||
} as React.CSSProperties,
|
||||
inheritViewBox: true,
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
onSearchRef.current = onSearch
|
||||
}, [onSearch])
|
||||
|
||||
@@ -1,13 +1,6 @@
|
||||
import { styled } from '@mui/material/styles'
|
||||
import { default as MuiSwitch, SwitchProps } from '@mui/material/Switch'
|
||||
|
||||
/**
|
||||
* MUI Switch delivers the boolean as the second onChange argument, so
|
||||
* switch handlers use this adapter to stay boolean-only.
|
||||
*/
|
||||
export const switchChangeValue = (_event: unknown, value: boolean): boolean =>
|
||||
value
|
||||
|
||||
export const Switch = styled((props: SwitchProps) => (
|
||||
<MuiSwitch
|
||||
focusVisibleClassName=".Mui-focusVisible"
|
||||
|
||||
@@ -10,7 +10,7 @@ export { BaseSplitChipEditor } from './base-split-chip-editor'
|
||||
export { BaseStyledSelect } from './base-styled-select'
|
||||
export { BaseStyledTextField } from './base-styled-text-field'
|
||||
export { MonacoEditor } from './monaco-editor'
|
||||
export { Switch, switchChangeValue } from './base-switch'
|
||||
export { Switch } from './base-switch'
|
||||
export { TooltipIcon } from './base-tooltip-icon'
|
||||
export { VirtualList, type VirtualListHandle } from './virtual-list'
|
||||
export {
|
||||
|
||||
@@ -7,7 +7,6 @@ import {
|
||||
useEffectEvent,
|
||||
useImperativeHandle,
|
||||
useMemo,
|
||||
useReducer,
|
||||
useRef,
|
||||
useState,
|
||||
} from 'react'
|
||||
@@ -20,7 +19,6 @@ import {
|
||||
formatTrafficHourMinute,
|
||||
formatTrafficMinuteSecond,
|
||||
formatTrafficName,
|
||||
isSameTrafficData,
|
||||
} from '@/utils/traffic-sampler'
|
||||
|
||||
export interface EnhancedCanvasTrafficGraphRef {
|
||||
@@ -74,16 +72,200 @@ const GRAPH_CONFIG = {
|
||||
|
||||
const STALE_DATA_THRESHOLD = 2500 // ms without fresh data => drop FPS
|
||||
|
||||
// Static sx/style identities keep the emotion cache effective; the remaining
|
||||
// dynamic props (tooltip position, legend colors) stay inline or memoized.
|
||||
const rootSx = {
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
position: 'relative',
|
||||
bgcolor: 'action.hover',
|
||||
borderRadius: 1,
|
||||
cursor: 'pointer',
|
||||
overflow: 'hidden',
|
||||
}
|
||||
|
||||
const canvasStyle = {
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
display: 'block',
|
||||
} as const
|
||||
|
||||
const hoverCanvasStyle = {
|
||||
position: 'absolute',
|
||||
inset: 0,
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
display: 'block',
|
||||
pointerEvents: 'none',
|
||||
} as const
|
||||
|
||||
const overlaySx = {
|
||||
position: 'absolute',
|
||||
top: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
pointerEvents: 'none',
|
||||
}
|
||||
|
||||
const timeRangeBadgeSx = {
|
||||
position: 'absolute',
|
||||
top: 6,
|
||||
left: 40,
|
||||
fontSize: '11px',
|
||||
fontWeight: 'bold',
|
||||
color: 'text.secondary',
|
||||
cursor: 'pointer',
|
||||
pointerEvents: 'all',
|
||||
px: 1,
|
||||
py: 0.5,
|
||||
borderRadius: 0.5,
|
||||
bgcolor: 'rgba(0,0,0,0.05)',
|
||||
'&:hover': {
|
||||
bgcolor: 'rgba(0,0,0,0.1)',
|
||||
},
|
||||
}
|
||||
|
||||
const legendsSx = {
|
||||
position: 'absolute',
|
||||
top: 6,
|
||||
right: 8,
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
gap: 0.5,
|
||||
}
|
||||
|
||||
const chartStyleHintSx = {
|
||||
position: 'absolute',
|
||||
bottom: 6,
|
||||
right: 8,
|
||||
fontSize: '10px',
|
||||
color: 'text.disabled',
|
||||
opacity: 0.7,
|
||||
}
|
||||
|
||||
const diagnosticsSx = {
|
||||
position: 'absolute',
|
||||
bottom: 6,
|
||||
left: 8,
|
||||
fontSize: '9px',
|
||||
color: 'text.disabled',
|
||||
opacity: 0.6,
|
||||
lineHeight: 1.2,
|
||||
}
|
||||
|
||||
const tooltipTimeSx = { color: 'text.secondary', mb: 0.2 }
|
||||
const tooltipUpSx = { color: 'secondary.main', fontWeight: 500 }
|
||||
const tooltipDownSx = { color: 'primary.main', fontWeight: 500 }
|
||||
|
||||
interface TimeDisplayStrategy {
|
||||
maxLabels: number
|
||||
formatTime: (timestamp: number) => string
|
||||
intervalSeconds: number
|
||||
minPixelDistance: number
|
||||
}
|
||||
|
||||
const TIME_DISPLAY_STRATEGIES: Record<TimeRange, TimeDisplayStrategy> = {
|
||||
1: {
|
||||
maxLabels: 6,
|
||||
formatTime: formatTrafficMinuteSecond,
|
||||
intervalSeconds: 10,
|
||||
minPixelDistance: 35,
|
||||
},
|
||||
5: {
|
||||
maxLabels: 6,
|
||||
formatTime: formatTrafficHourMinute,
|
||||
intervalSeconds: 30,
|
||||
minPixelDistance: 38,
|
||||
},
|
||||
10: {
|
||||
maxLabels: 8,
|
||||
formatTime: formatTrafficHourMinute,
|
||||
intervalSeconds: 60,
|
||||
minPixelDistance: 40,
|
||||
},
|
||||
}
|
||||
|
||||
// Per-draw buffers live at module scope: drawing runs synchronously on the
|
||||
// main thread, so slots never overlap a concurrent reader.
|
||||
const yAxisTicks = [
|
||||
{ label: '', y: 0 },
|
||||
{ label: '', y: 0 },
|
||||
{ label: '', y: 0 },
|
||||
]
|
||||
const yAxisTickLabels = new Map<number, string>()
|
||||
const formatYAxisTickLabel = (bytes: number): string => {
|
||||
const cached = yAxisTickLabels.get(bytes)
|
||||
if (cached !== undefined) return cached
|
||||
|
||||
const label =
|
||||
bytes === 0
|
||||
? '0'
|
||||
: bytes < 1024
|
||||
? `${Math.round(bytes)}B`
|
||||
: bytes < 1024 * 1024
|
||||
? `${Math.round(bytes / 1024)}KB`
|
||||
: `${(bytes / (1024 * 1024)).toFixed(1)}MB`
|
||||
if (yAxisTickLabels.size >= 256) yAxisTickLabels.clear()
|
||||
yAxisTickLabels.set(bytes, label)
|
||||
return label
|
||||
}
|
||||
|
||||
const getYAxisTicks = (
|
||||
topValue: number,
|
||||
bottomValue: number,
|
||||
height: number,
|
||||
) => {
|
||||
const padding = GRAPH_CONFIG.padding
|
||||
|
||||
const topY = padding.top + 10
|
||||
const bottomY = height - padding.bottom - 5
|
||||
const middleY = (topY + bottomY) / 2
|
||||
const middleValue = (bottomValue + topValue) / 2
|
||||
|
||||
const [bottomTick, middleTick, topTick] = yAxisTicks
|
||||
bottomTick.label = formatYAxisTickLabel(bottomValue)
|
||||
bottomTick.y = bottomY
|
||||
middleTick.label = formatYAxisTickLabel(middleValue)
|
||||
middleTick.y = middleY
|
||||
topTick.label = formatYAxisTickLabel(topValue)
|
||||
topTick.y = topY
|
||||
|
||||
return yAxisTicks
|
||||
}
|
||||
|
||||
interface TimeAxisPoint {
|
||||
x: number
|
||||
label: string
|
||||
}
|
||||
const timeAxisPoints: TimeAxisPoint[] = []
|
||||
const resetTimeAxisPoints = () => {
|
||||
timeAxisPoints.length = 0
|
||||
}
|
||||
const pushTimeAxisPoint = (x: number, label: string) => {
|
||||
let slot = timeAxisPoints[timeAxisPoints.length]
|
||||
if (!slot) {
|
||||
slot = { x: 0, label: '' }
|
||||
timeAxisPoints.push(slot)
|
||||
}
|
||||
slot.x = x
|
||||
slot.label = label
|
||||
}
|
||||
|
||||
// Gradient stop strings are pure functions of the theme color; the colors
|
||||
// memo builds them once per theme.
|
||||
const GRADIENT_ALPHA_HEX = Math.round(GRAPH_CONFIG.alpha.gradient * 255)
|
||||
.toString(16)
|
||||
.padStart(2, '0')
|
||||
const makeGradientStops = (color: string) => ({
|
||||
start: `${color}${GRADIENT_ALPHA_HEX}`,
|
||||
end: `${color}00`,
|
||||
})
|
||||
|
||||
interface EnhancedCanvasTrafficGraphProps {
|
||||
ref?: Ref<EnhancedCanvasTrafficGraphRef>
|
||||
}
|
||||
|
||||
const displayDataReducer = (
|
||||
current: ITrafficDataPoint[],
|
||||
payload: ITrafficDataPoint[],
|
||||
): ITrafficDataPoint[] =>
|
||||
isSameTrafficData(current, payload) ? current : payload
|
||||
|
||||
export const EnhancedCanvasTrafficGraph = memo(
|
||||
function EnhancedCanvasTrafficGraph({
|
||||
ref,
|
||||
@@ -94,11 +276,9 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
const pause_render_traffic_stats_on_blur =
|
||||
verge.verge?.pause_render_traffic_stats_on_blur ?? true
|
||||
|
||||
const { dataPoints, requestRange, samplerStats } =
|
||||
useTrafficGraphDataEnhanced()
|
||||
|
||||
const [timeRange, setTimeRange] = useState<TimeRange>(10)
|
||||
const [chartStyle, setChartStyle] = useState<'bezier' | 'line'>('bezier')
|
||||
const [badgeStats, setBadgeStats] = useState({ points: 0, compressed: 0 })
|
||||
|
||||
const initialFocusState =
|
||||
typeof document !== 'undefined' ? !document.hidden : true
|
||||
@@ -129,66 +309,49 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
const lastDataTimestampRef = useRef<number>(0)
|
||||
const dataStaleRef = useRef<boolean>(false)
|
||||
|
||||
const [displayData, dispatchDisplayData] = useReducer(
|
||||
displayDataReducer,
|
||||
[],
|
||||
)
|
||||
const debounceTimeoutRef = useRef<number | null>(null)
|
||||
// Live snapshot data for the rAF draw path; React state only tracks the
|
||||
// diagnostics badge inputs so steady-state snapshots stop re-rendering.
|
||||
const displayDataRef = useRef<ITrafficDataPoint[]>([])
|
||||
const yScaleRef = useRef<{ topValue: number; bottomValue: number }>({
|
||||
topValue: 1024,
|
||||
bottomValue: 0,
|
||||
})
|
||||
|
||||
const colors = useMemo(
|
||||
() => ({
|
||||
const colors = useMemo(() => {
|
||||
const base = {
|
||||
up: theme.palette.secondary.main,
|
||||
down: theme.palette.primary.main,
|
||||
grid: theme.palette.divider,
|
||||
text: theme.palette.text.secondary,
|
||||
background: theme.palette.background.paper,
|
||||
}
|
||||
return {
|
||||
...base,
|
||||
gradient: {
|
||||
up: makeGradientStops(base.up),
|
||||
down: makeGradientStops(base.down),
|
||||
},
|
||||
}
|
||||
}, [theme])
|
||||
|
||||
const legendSx = useMemo(
|
||||
() => ({
|
||||
up: {
|
||||
fontSize: '11px',
|
||||
fontWeight: 'bold',
|
||||
color: colors.up,
|
||||
textAlign: 'right',
|
||||
},
|
||||
down: {
|
||||
fontSize: '11px',
|
||||
fontWeight: 'bold',
|
||||
color: colors.down,
|
||||
textAlign: 'right',
|
||||
},
|
||||
}),
|
||||
[theme],
|
||||
[colors],
|
||||
)
|
||||
|
||||
const updateDisplayData = useCallback((newData: ITrafficDataPoint[]) => {
|
||||
if (debounceTimeoutRef.current !== null) {
|
||||
window.clearTimeout(debounceTimeoutRef.current)
|
||||
}
|
||||
debounceTimeoutRef.current = window.setTimeout(() => {
|
||||
dispatchDisplayData(newData)
|
||||
}, 50)
|
||||
}, [])
|
||||
|
||||
useEffect(() => {
|
||||
updateDisplayData(dataPoints)
|
||||
|
||||
return () => {
|
||||
if (debounceTimeoutRef.current !== null) {
|
||||
window.clearTimeout(debounceTimeoutRef.current)
|
||||
debounceTimeoutRef.current = null
|
||||
}
|
||||
}
|
||||
}, [dataPoints, updateDisplayData])
|
||||
|
||||
useEffect(() => {
|
||||
requestRange(timeRange)
|
||||
}, [requestRange, timeRange])
|
||||
|
||||
useEffect(() => {
|
||||
if (displayData.length === 0) {
|
||||
lastDataTimestampRef.current = 0
|
||||
dataStaleRef.current = false
|
||||
return
|
||||
}
|
||||
|
||||
const latestTimestamp =
|
||||
displayData[displayData.length - 1]?.timestamp ?? null
|
||||
if (latestTimestamp) {
|
||||
lastDataTimestampRef.current = latestTimestamp
|
||||
const age = Date.now() - latestTimestamp
|
||||
const stale = age > STALE_DATA_THRESHOLD
|
||||
dataStaleRef.current = stale
|
||||
} else {
|
||||
dataStaleRef.current = false
|
||||
}
|
||||
}, [displayData])
|
||||
|
||||
const handleFocusStateChange = useEffectEvent((focused: boolean) => {
|
||||
isWindowFocusedRef.current = focused
|
||||
|
||||
@@ -270,14 +433,9 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
[],
|
||||
)
|
||||
|
||||
const yScale = useMemo(
|
||||
() => computeYScale(displayData),
|
||||
[computeYScale, displayData],
|
||||
)
|
||||
|
||||
const handleMouseMove = useCallback(
|
||||
(event: React.MouseEvent<HTMLElement>) => {
|
||||
if (displayData.length === 0) return
|
||||
if (displayDataRef.current.length === 0) return
|
||||
|
||||
pendingMousePositionRef.current = {
|
||||
clientX: event.clientX,
|
||||
@@ -294,7 +452,8 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
if (!pendingMousePosition) return
|
||||
|
||||
const canvas = canvasRef.current
|
||||
if (!canvas || displayData.length === 0) return
|
||||
const data = displayDataRef.current
|
||||
if (!canvas || data.length === 0) return
|
||||
|
||||
const rect = canvas.getBoundingClientRect()
|
||||
const mouseX = pendingMousePosition.clientX - rect.left
|
||||
@@ -309,11 +468,11 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
0,
|
||||
Math.min(1, relativeMouseX / effectiveWidth),
|
||||
)
|
||||
const dataIndex = Math.round(ratio * (displayData.length - 1))
|
||||
const dataIndex = Math.round(ratio * (data.length - 1))
|
||||
|
||||
if (dataIndex < 0 || dataIndex >= displayData.length) return
|
||||
if (dataIndex < 0 || dataIndex >= data.length) return
|
||||
|
||||
const dataPoint = displayData[dataIndex]
|
||||
const dataPoint = data[dataIndex]
|
||||
|
||||
const [upValue, upUnit] = parseTraffic(dataPoint.up)
|
||||
const [downValue, downUnit] = parseTraffic(dataPoint.down)
|
||||
@@ -322,7 +481,7 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
? formatTrafficName(dataPoint.timestamp)
|
||||
: t('home.components.traffic.unknownTime')
|
||||
|
||||
const { topValue: tvH, bottomValue: bvH } = yScale
|
||||
const { topValue: tvH, bottomValue: bvH } = yScaleRef.current
|
||||
const upY = calculateY(dataPoint.up, rect.height, tvH, bvH)
|
||||
const downY = calculateY(dataPoint.down, rect.height, tvH, bvH)
|
||||
const highlightY =
|
||||
@@ -359,7 +518,7 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
})
|
||||
})
|
||||
},
|
||||
[displayData, calculateY, yScale, t],
|
||||
[calculateY, t],
|
||||
)
|
||||
|
||||
const handleMouseLeave = useCallback(() => {
|
||||
@@ -375,45 +534,6 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
)
|
||||
}, [])
|
||||
|
||||
const getYAxisTicks = useCallback(
|
||||
(topValue: number, bottomValue: number, height: number) => {
|
||||
const formatTrafficValue = (bytes: number): string => {
|
||||
if (bytes === 0) return '0'
|
||||
if (bytes < 1024) return `${Math.round(bytes)}B`
|
||||
if (bytes < 1024 * 1024) return `${Math.round(bytes / 1024)}KB`
|
||||
return `${(bytes / (1024 * 1024)).toFixed(1)}MB`
|
||||
}
|
||||
|
||||
const padding = GRAPH_CONFIG.padding
|
||||
|
||||
const topY = padding.top + 10
|
||||
const bottomY = height - padding.bottom - 5
|
||||
const middleY = (topY + bottomY) / 2
|
||||
const middleValue = (bottomValue + topValue) / 2
|
||||
|
||||
const ticks = [
|
||||
{
|
||||
value: bottomValue,
|
||||
label: formatTrafficValue(bottomValue),
|
||||
y: bottomY,
|
||||
},
|
||||
{
|
||||
value: middleValue,
|
||||
label: formatTrafficValue(middleValue),
|
||||
y: middleY,
|
||||
},
|
||||
{
|
||||
value: topValue,
|
||||
label: formatTrafficValue(topValue),
|
||||
y: topY,
|
||||
},
|
||||
]
|
||||
|
||||
return ticks
|
||||
},
|
||||
[],
|
||||
)
|
||||
|
||||
const drawYAxis = useCallback(
|
||||
(
|
||||
ctx: CanvasRenderingContext2D,
|
||||
@@ -425,8 +545,6 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
const padding = GRAPH_CONFIG.padding
|
||||
const ticks = getYAxisTicks(topValue, bottomValue, height)
|
||||
|
||||
if (ticks.length === 0) return
|
||||
|
||||
ctx.save()
|
||||
|
||||
ticks.forEach((tick, index) => {
|
||||
@@ -470,37 +588,7 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
|
||||
ctx.restore()
|
||||
},
|
||||
[colors.grid, colors.text, colors.background, getYAxisTicks],
|
||||
)
|
||||
|
||||
const getTimeDisplayStrategy = useCallback(
|
||||
(timeRangeMinutes: TimeRange) => {
|
||||
switch (timeRangeMinutes) {
|
||||
case 1:
|
||||
return {
|
||||
maxLabels: 6,
|
||||
formatTime: formatTrafficMinuteSecond,
|
||||
intervalSeconds: 10,
|
||||
minPixelDistance: 35,
|
||||
}
|
||||
case 5:
|
||||
return {
|
||||
maxLabels: 6,
|
||||
formatTime: formatTrafficHourMinute,
|
||||
intervalSeconds: 30,
|
||||
minPixelDistance: 38,
|
||||
}
|
||||
case 10:
|
||||
default:
|
||||
return {
|
||||
maxLabels: 8,
|
||||
formatTime: formatTrafficHourMinute,
|
||||
intervalSeconds: 60,
|
||||
minPixelDistance: 40,
|
||||
}
|
||||
}
|
||||
},
|
||||
[],
|
||||
[colors.grid, colors.text, colors.background],
|
||||
)
|
||||
|
||||
const drawTimeAxis = useCallback(
|
||||
@@ -516,7 +604,7 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
const effectiveWidth = width - padding.left - padding.right
|
||||
const timeAxisY = height - padding.bottom + 14
|
||||
|
||||
const strategy = getTimeDisplayStrategy(timeRange)
|
||||
const strategy = TIME_DISPLAY_STRATEGIES[timeRange]
|
||||
|
||||
ctx.save()
|
||||
ctx.fillStyle = colors.text
|
||||
@@ -533,15 +621,13 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
Math.ceil((data.length * minPixelDistance) / effectiveWidth),
|
||||
)
|
||||
|
||||
const timePoints: Array<{ index: number; x: number; label: string }> =
|
||||
[]
|
||||
resetTimeAxisPoints()
|
||||
|
||||
if (data.length > 0 && data[0].timestamp) {
|
||||
timePoints.push({
|
||||
index: 0,
|
||||
x: padding.left,
|
||||
label: strategy.formatTime(data[0].timestamp),
|
||||
})
|
||||
pushTimeAxisPoint(
|
||||
padding.left,
|
||||
strategy.formatTime(data[0].timestamp),
|
||||
)
|
||||
}
|
||||
|
||||
for (
|
||||
@@ -553,41 +639,37 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
if (!point.timestamp) continue
|
||||
|
||||
const x = padding.left + (i / (data.length - 1)) * effectiveWidth
|
||||
timePoints.push({
|
||||
index: i,
|
||||
x,
|
||||
label: strategy.formatTime(point.timestamp),
|
||||
})
|
||||
pushTimeAxisPoint(x, strategy.formatTime(point.timestamp))
|
||||
}
|
||||
|
||||
if (data.length > 1 && data[data.length - 1].timestamp) {
|
||||
const lastX = width - padding.right
|
||||
const lastPoint = timePoints[timePoints.length - 1]
|
||||
const lastPoint = timeAxisPoints[timeAxisPoints.length - 1]
|
||||
|
||||
if (!lastPoint || lastX - lastPoint.x >= minPixelDistance) {
|
||||
timePoints.push({
|
||||
index: data.length - 1,
|
||||
x: lastX,
|
||||
label: strategy.formatTime(data[data.length - 1].timestamp),
|
||||
})
|
||||
pushTimeAxisPoint(
|
||||
lastX,
|
||||
strategy.formatTime(data[data.length - 1].timestamp),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
timePoints.forEach((point, index) => {
|
||||
if (index === 0) {
|
||||
for (let i = 0; i < timeAxisPoints.length; i++) {
|
||||
const point = timeAxisPoints[i]
|
||||
if (i === 0) {
|
||||
ctx.textAlign = 'left'
|
||||
} else if (index === timePoints.length - 1) {
|
||||
} else if (i === timeAxisPoints.length - 1) {
|
||||
ctx.textAlign = 'right'
|
||||
} else {
|
||||
ctx.textAlign = 'center'
|
||||
}
|
||||
|
||||
ctx.fillText(point.label, point.x, timeAxisY)
|
||||
})
|
||||
}
|
||||
|
||||
ctx.restore()
|
||||
},
|
||||
[colors.text, timeRange, getTimeDisplayStrategy],
|
||||
[colors.text, timeRange],
|
||||
)
|
||||
|
||||
const drawGrid = useCallback(
|
||||
@@ -632,6 +714,7 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
width: number,
|
||||
height: number,
|
||||
color: string,
|
||||
gradientStops: { start: string; end: string },
|
||||
withGradient = false,
|
||||
topValue: number,
|
||||
bottomValue: number,
|
||||
@@ -655,13 +738,8 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
0,
|
||||
height - padding.bottom,
|
||||
)
|
||||
gradient.addColorStop(
|
||||
0,
|
||||
`${color}${Math.round(GRAPH_CONFIG.alpha.gradient * 255)
|
||||
.toString(16)
|
||||
.padStart(2, '0')}`,
|
||||
)
|
||||
gradient.addColorStop(1, `${color}00`)
|
||||
gradient.addColorStop(0, gradientStops.start)
|
||||
gradient.addColorStop(1, gradientStops.end)
|
||||
|
||||
ctx.beginPath()
|
||||
ctx.moveTo(getX(0), getY(0))
|
||||
@@ -752,6 +830,7 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
|
||||
const drawGraph = useCallback(() => {
|
||||
const canvas = canvasRef.current
|
||||
const displayData = displayDataRef.current
|
||||
if (!canvas || displayData.length === 0) {
|
||||
clearCanvas(canvasRef.current)
|
||||
clearCanvas(hoverCanvasRef.current)
|
||||
@@ -765,7 +844,7 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
// Clear using CSS dimensions; context is already scaled by DPR.
|
||||
ctx.clearRect(0, 0, cssWidth, cssHeight)
|
||||
|
||||
const { topValue, bottomValue } = yScale
|
||||
const { topValue, bottomValue } = yScaleRef.current
|
||||
|
||||
drawYAxis(ctx, cssWidth, cssHeight, topValue, bottomValue)
|
||||
|
||||
@@ -780,6 +859,7 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
cssWidth,
|
||||
cssHeight,
|
||||
colors.down,
|
||||
colors.gradient.down,
|
||||
true,
|
||||
topValue,
|
||||
bottomValue,
|
||||
@@ -792,6 +872,7 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
cssWidth,
|
||||
cssHeight,
|
||||
colors.up,
|
||||
colors.gradient.up,
|
||||
true,
|
||||
topValue,
|
||||
bottomValue,
|
||||
@@ -804,9 +885,7 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
)
|
||||
canvas.dataset.perfDraw = String(displayData.at(-1)?.timestamp ?? 0)
|
||||
}, [
|
||||
displayData,
|
||||
colors,
|
||||
yScale,
|
||||
drawYAxis,
|
||||
drawGrid,
|
||||
drawTimeAxis,
|
||||
@@ -817,6 +896,7 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
|
||||
const drawHoverOverlay = useCallback(() => {
|
||||
const canvas = hoverCanvasRef.current
|
||||
const displayData = displayDataRef.current
|
||||
if (!canvas || displayData.length < 2) {
|
||||
clearCanvas(canvas)
|
||||
return
|
||||
@@ -854,7 +934,7 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
|
||||
ctx.restore()
|
||||
}
|
||||
}, [displayData, colors, syncCanvasSize, clearCanvas])
|
||||
}, [colors, syncCanvasSize, clearCanvas])
|
||||
|
||||
const shouldSkipGraphDraw = useCallback(() => {
|
||||
if (!isDocumentVisibleRef.current) return true
|
||||
@@ -897,6 +977,55 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
})
|
||||
}, [drawGraph, drawHoverOverlay, shouldSkipGraphDraw])
|
||||
|
||||
const handleSnapshot = useCallback(
|
||||
(message: ITrafficWorkerSnapshotMessage) => {
|
||||
const data = message.dataPoints
|
||||
displayDataRef.current = data
|
||||
yScaleRef.current = computeYScale(data)
|
||||
|
||||
if (data.length === 0) {
|
||||
lastDataTimestampRef.current = 0
|
||||
dataStaleRef.current = false
|
||||
} else {
|
||||
const latestTimestamp = data[data.length - 1]?.timestamp ?? null
|
||||
if (latestTimestamp) {
|
||||
lastDataTimestampRef.current = latestTimestamp
|
||||
const age = Date.now() - latestTimestamp
|
||||
const stale = age > STALE_DATA_THRESHOLD
|
||||
dataStaleRef.current = stale
|
||||
} else {
|
||||
dataStaleRef.current = false
|
||||
}
|
||||
}
|
||||
|
||||
scheduleDrawGraph()
|
||||
// The badge is the only snapshot content that still renders; keeping
|
||||
// its state here confines re-renders to actual badge changes, and the
|
||||
// visibility gate skips hidden-phase renders — the re-prime snapshot
|
||||
// on regaining visibility refreshes it.
|
||||
if (!isDocumentVisibleRef.current) return
|
||||
setBadgeStats((prev) =>
|
||||
prev.points === data.length &&
|
||||
prev.compressed === message.samplerStats.compressedBufferSize
|
||||
? prev
|
||||
: {
|
||||
points: data.length,
|
||||
compressed: message.samplerStats.compressedBufferSize,
|
||||
},
|
||||
)
|
||||
},
|
||||
[computeYScale, scheduleDrawGraph],
|
||||
)
|
||||
|
||||
const { requestRange } = useTrafficGraphDataEnhanced({
|
||||
subscribe: false,
|
||||
onSnapshot: handleSnapshot,
|
||||
})
|
||||
|
||||
useEffect(() => {
|
||||
requestRange(timeRange)
|
||||
}, [requestRange, timeRange])
|
||||
|
||||
useEffect(() => {
|
||||
tooltipDataRef.current = tooltipData
|
||||
scheduleHoverDraw()
|
||||
@@ -966,119 +1095,36 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
|
||||
return (
|
||||
<Box
|
||||
sx={{
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
position: 'relative',
|
||||
bgcolor: 'action.hover',
|
||||
borderRadius: 1,
|
||||
cursor: 'pointer',
|
||||
overflow: 'hidden',
|
||||
}}
|
||||
sx={rootSx}
|
||||
onClick={toggleStyle}
|
||||
onMouseMove={handleMouseMove}
|
||||
onMouseLeave={handleMouseLeave}
|
||||
>
|
||||
<canvas
|
||||
ref={canvasRef}
|
||||
style={{
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
display: 'block',
|
||||
}}
|
||||
onClick={toggleStyle}
|
||||
/>
|
||||
<canvas ref={canvasRef} style={canvasStyle} onClick={toggleStyle} />
|
||||
|
||||
{tooltipData.visible && (
|
||||
<canvas
|
||||
ref={hoverCanvasRef}
|
||||
style={{
|
||||
position: 'absolute',
|
||||
inset: 0,
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
display: 'block',
|
||||
pointerEvents: 'none',
|
||||
}}
|
||||
/>
|
||||
<canvas ref={hoverCanvasRef} style={hoverCanvasStyle} />
|
||||
)}
|
||||
|
||||
<Box
|
||||
sx={{
|
||||
position: 'absolute',
|
||||
top: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
pointerEvents: 'none',
|
||||
}}
|
||||
>
|
||||
<Box sx={overlaySx}>
|
||||
<Box
|
||||
component="div"
|
||||
onClick={handleTimeRangeClick}
|
||||
sx={{
|
||||
position: 'absolute',
|
||||
top: 6,
|
||||
left: 40,
|
||||
fontSize: '11px',
|
||||
fontWeight: 'bold',
|
||||
color: 'text.secondary',
|
||||
cursor: 'pointer',
|
||||
pointerEvents: 'all',
|
||||
px: 1,
|
||||
py: 0.5,
|
||||
borderRadius: 0.5,
|
||||
bgcolor: 'rgba(0,0,0,0.05)',
|
||||
'&:hover': {
|
||||
bgcolor: 'rgba(0,0,0,0.1)',
|
||||
},
|
||||
}}
|
||||
sx={timeRangeBadgeSx}
|
||||
>
|
||||
{getTimeRangeText()}
|
||||
</Box>
|
||||
|
||||
<Box
|
||||
sx={{
|
||||
position: 'absolute',
|
||||
top: 6,
|
||||
right: 8,
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
gap: 0.5,
|
||||
}}
|
||||
>
|
||||
<Box
|
||||
sx={{
|
||||
fontSize: '11px',
|
||||
fontWeight: 'bold',
|
||||
color: colors.up,
|
||||
textAlign: 'right',
|
||||
}}
|
||||
>
|
||||
<Box sx={legendsSx}>
|
||||
<Box sx={legendSx.up}>
|
||||
{t('home.components.traffic.legends.upload')}
|
||||
</Box>
|
||||
<Box
|
||||
sx={{
|
||||
fontSize: '11px',
|
||||
fontWeight: 'bold',
|
||||
color: colors.down,
|
||||
textAlign: 'right',
|
||||
}}
|
||||
>
|
||||
<Box sx={legendSx.down}>
|
||||
{t('home.components.traffic.legends.download')}
|
||||
</Box>
|
||||
</Box>
|
||||
|
||||
<Box
|
||||
sx={{
|
||||
position: 'absolute',
|
||||
bottom: 6,
|
||||
right: 8,
|
||||
fontSize: '10px',
|
||||
color: 'text.disabled',
|
||||
opacity: 0.7,
|
||||
}}
|
||||
>
|
||||
<Box sx={chartStyleHintSx}>
|
||||
{t(
|
||||
chartStyle === 'bezier'
|
||||
? 'home.components.traffic.chartStyles.smooth'
|
||||
@@ -1086,20 +1132,10 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
)}
|
||||
</Box>
|
||||
|
||||
<Box
|
||||
sx={{
|
||||
position: 'absolute',
|
||||
bottom: 6,
|
||||
left: 8,
|
||||
fontSize: '9px',
|
||||
color: 'text.disabled',
|
||||
opacity: 0.6,
|
||||
lineHeight: 1.2,
|
||||
}}
|
||||
>
|
||||
<Box sx={diagnosticsSx}>
|
||||
{t('home.components.traffic.diagnostics', {
|
||||
points: displayData.length,
|
||||
compressed: samplerStats.compressedBufferSize,
|
||||
points: badgeStats.points,
|
||||
compressed: badgeStats.compressed,
|
||||
fps: GRAPH_CONFIG.targetFPS,
|
||||
})}
|
||||
</Box>
|
||||
@@ -1127,15 +1163,9 @@ export const EnhancedCanvasTrafficGraph = memo(
|
||||
whiteSpace: 'nowrap',
|
||||
}}
|
||||
>
|
||||
<Box sx={{ color: 'text.secondary', mb: 0.2 }}>
|
||||
{tooltipData.timestamp}
|
||||
</Box>
|
||||
<Box sx={{ color: 'secondary.main', fontWeight: 500 }}>
|
||||
↑ {tooltipData.upSpeed}
|
||||
</Box>
|
||||
<Box sx={{ color: 'primary.main', fontWeight: 500 }}>
|
||||
↓ {tooltipData.downSpeed}
|
||||
</Box>
|
||||
<Box sx={tooltipTimeSx}>{tooltipData.timestamp}</Box>
|
||||
<Box sx={tooltipUpSx}>↑ {tooltipData.upSpeed}</Box>
|
||||
<Box sx={tooltipDownSx}>↓ {tooltipData.downSpeed}</Box>
|
||||
</Box>
|
||||
)}
|
||||
</Box>
|
||||
|
||||
@@ -131,6 +131,15 @@ const CompactStatCard = memo(
|
||||
// 添加显示名称
|
||||
CompactStatCard.displayName = 'CompactStatCard'
|
||||
|
||||
// Element identity is stable, so CompactStatCard's memo comparison holds
|
||||
// across per-second parsedData updates.
|
||||
const uploadSpeedIcon = <ArrowUpwardRounded fontSize="small" />
|
||||
const downloadSpeedIcon = <ArrowDownwardRounded fontSize="small" />
|
||||
const activeConnectionsIcon = <LinkRounded fontSize="small" />
|
||||
const uploadedIcon = <CloudUploadRounded fontSize="small" />
|
||||
const downloadedIcon = <CloudDownloadRounded fontSize="small" />
|
||||
const memoryUsageIcon = <MemoryRounded fontSize="small" />
|
||||
|
||||
const fallbackSx = {
|
||||
p: 2,
|
||||
minHeight: 200,
|
||||
@@ -252,35 +261,35 @@ export const EnhancedTrafficStats = () => {
|
||||
const statCards = useMemo(() => {
|
||||
const cards: StatCardProps[] = [
|
||||
{
|
||||
icon: <ArrowUpwardRounded fontSize="small" />,
|
||||
icon: uploadSpeedIcon,
|
||||
title: t('home.components.traffic.metrics.uploadSpeed'),
|
||||
value: parsedData.up,
|
||||
unit: `${parsedData.upUnit}/s`,
|
||||
color: 'secondary' as const,
|
||||
},
|
||||
{
|
||||
icon: <ArrowDownwardRounded fontSize="small" />,
|
||||
icon: downloadSpeedIcon,
|
||||
title: t('home.components.traffic.metrics.downloadSpeed'),
|
||||
value: parsedData.down,
|
||||
unit: `${parsedData.downUnit}/s`,
|
||||
color: 'primary' as const,
|
||||
},
|
||||
{
|
||||
icon: <LinkRounded fontSize="small" />,
|
||||
icon: activeConnectionsIcon,
|
||||
title: t('home.components.traffic.metrics.activeConnections'),
|
||||
value: parsedData.connectionsCount,
|
||||
unit: '',
|
||||
color: 'success' as const,
|
||||
},
|
||||
{
|
||||
icon: <CloudUploadRounded fontSize="small" />,
|
||||
icon: uploadedIcon,
|
||||
title: t('shared.labels.uploaded'),
|
||||
value: parsedData.uploadTotal,
|
||||
unit: parsedData.uploadTotalUnit,
|
||||
color: 'secondary' as const,
|
||||
},
|
||||
{
|
||||
icon: <CloudDownloadRounded fontSize="small" />,
|
||||
icon: downloadedIcon,
|
||||
title: t('shared.labels.downloaded'),
|
||||
value: parsedData.downloadTotal,
|
||||
unit: parsedData.downloadTotalUnit,
|
||||
@@ -290,7 +299,7 @@ export const EnhancedTrafficStats = () => {
|
||||
|
||||
if (displayMemory) {
|
||||
cards.push({
|
||||
icon: <MemoryRounded fontSize="small" />,
|
||||
icon: memoryUsageIcon,
|
||||
title: t('home.components.traffic.metrics.memoryUsage'),
|
||||
value: parsedData.inuse,
|
||||
unit: parsedData.inuseUnit,
|
||||
|
||||
@@ -23,8 +23,6 @@ import { emitTestAll } from '@/services/bus'
|
||||
|
||||
import { EnhancedCard } from './enhanced-card'
|
||||
|
||||
const TEST_LIST_SENSORS = [PointerSensor]
|
||||
|
||||
// 自定义滚动条样式
|
||||
const ScrollBox = styled(Box)(({ theme }) => ({
|
||||
maxHeight: '180px',
|
||||
@@ -207,7 +205,7 @@ export const TestCard = () => {
|
||||
}
|
||||
>
|
||||
<ScrollBox>
|
||||
<DragDropProvider sensors={TEST_LIST_SENSORS} onDragEnd={onDragEnd}>
|
||||
<DragDropProvider sensors={[PointerSensor]} onDragEnd={onDragEnd}>
|
||||
{renderTestItems}
|
||||
</DragDropProvider>
|
||||
</ScrollBox>
|
||||
|
||||
@@ -42,6 +42,39 @@ const TrafficUnavailableFallback = () => {
|
||||
)
|
||||
}
|
||||
|
||||
// Stable identities keep the emotion sx cache effective across the ~1Hz
|
||||
// traffic-driven re-renders of LayoutTraffic.
|
||||
const boxStyle: Pick<BoxProps, 'sx'> = {
|
||||
sx: {
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
whiteSpace: 'nowrap',
|
||||
},
|
||||
}
|
||||
const memoryBoxStyle: Pick<BoxProps, 'sx'> = {
|
||||
sx: {
|
||||
...boxStyle.sx,
|
||||
cursor: 'auto',
|
||||
},
|
||||
}
|
||||
const iconStyle: Pick<SvgIconProps, 'sx'> = {
|
||||
sx: { mr: '8px', fontSize: 16 },
|
||||
}
|
||||
const valStyle: Pick<TypographyProps, 'component' | 'sx'> = {
|
||||
component: 'span',
|
||||
sx: { flex: '1 1 56px', userSelect: 'none', textAlign: 'center' },
|
||||
}
|
||||
const unitStyle: Pick<TypographyProps, 'component' | 'color' | 'sx'> = {
|
||||
component: 'span',
|
||||
color: 'grey.500',
|
||||
sx: {
|
||||
flex: '0 1 27px',
|
||||
userSelect: 'none',
|
||||
fontSize: '12px',
|
||||
textAlign: 'right',
|
||||
},
|
||||
}
|
||||
|
||||
export const LayoutTraffic = () => {
|
||||
const { t } = useTranslation()
|
||||
const { verge } = useVerge()
|
||||
@@ -74,31 +107,6 @@ export const LayoutTraffic = () => {
|
||||
const [down, downUnit] = parseTraffic(traffic?.down || 0)
|
||||
const [inuse, inuseUnit] = parseTraffic(memory?.inuse || 0)
|
||||
|
||||
const boxStyle: Pick<BoxProps, 'sx'> = {
|
||||
sx: {
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
whiteSpace: 'nowrap',
|
||||
},
|
||||
}
|
||||
const iconStyle: Pick<SvgIconProps, 'sx'> = {
|
||||
sx: { mr: '8px', fontSize: 16 },
|
||||
}
|
||||
const valStyle: Pick<TypographyProps, 'component' | 'sx'> = {
|
||||
component: 'span',
|
||||
sx: { flex: '1 1 56px', userSelect: 'none', textAlign: 'center' },
|
||||
}
|
||||
const unitStyle: Pick<TypographyProps, 'component' | 'color' | 'sx'> = {
|
||||
component: 'span',
|
||||
color: 'grey.500',
|
||||
sx: {
|
||||
flex: '0 1 27px',
|
||||
userSelect: 'none',
|
||||
fontSize: '12px',
|
||||
textAlign: 'right',
|
||||
},
|
||||
}
|
||||
|
||||
return (
|
||||
<ErrorBoundary
|
||||
FallbackComponent={TrafficUnavailableFallback}
|
||||
@@ -120,9 +128,6 @@ export const LayoutTraffic = () => {
|
||||
<Box
|
||||
title={`${t('home.components.traffic.metrics.uploadSpeed')}`}
|
||||
{...boxStyle}
|
||||
sx={{
|
||||
...boxStyle.sx,
|
||||
}}
|
||||
>
|
||||
<ArrowUpwardRounded
|
||||
{...iconStyle}
|
||||
@@ -137,9 +142,6 @@ export const LayoutTraffic = () => {
|
||||
<Box
|
||||
title={`${t('home.components.traffic.metrics.downloadSpeed')}`}
|
||||
{...boxStyle}
|
||||
sx={{
|
||||
...boxStyle.sx,
|
||||
}}
|
||||
>
|
||||
<ArrowDownwardRounded
|
||||
{...iconStyle}
|
||||
@@ -154,11 +156,7 @@ export const LayoutTraffic = () => {
|
||||
{displayMemory && (
|
||||
<Box
|
||||
title={`${t('home.components.traffic.metrics.memoryUsage')} `}
|
||||
{...boxStyle}
|
||||
sx={{
|
||||
...boxStyle.sx,
|
||||
cursor: 'auto',
|
||||
}}
|
||||
{...memoryBoxStyle}
|
||||
color={'disabled'}
|
||||
>
|
||||
<MemoryRounded {...iconStyle} />
|
||||
|
||||
@@ -5,8 +5,6 @@ import { type PointerEvent, useCallback } from 'react'
|
||||
import { useWindowControls } from '@/hooks/use-window'
|
||||
import getSystem from '@/utils/get-system'
|
||||
|
||||
const OS = getSystem()
|
||||
|
||||
const RESIZE_HANDLES = [
|
||||
{ direction: 'North', position: 'north' },
|
||||
{ direction: 'NorthEast', position: 'north-east' },
|
||||
@@ -40,7 +38,7 @@ export const WindowResizeHandles = () => {
|
||||
[currentWindow],
|
||||
)
|
||||
|
||||
if (OS !== 'linux' || maximized) return null
|
||||
if (getSystem() !== 'linux' || maximized) return null
|
||||
|
||||
return (
|
||||
<div
|
||||
@@ -61,6 +59,7 @@ export const WindowResizeHandles = () => {
|
||||
}
|
||||
|
||||
export const WindowControls = () => {
|
||||
const OS = getSystem()
|
||||
const { maximized, minimize, close, toggleMaximize } = useWindowControls()
|
||||
|
||||
// 通过前端对 tauri 窗口进行翻转全屏时会短暂地与系统图标重叠渲染。
|
||||
|
||||
@@ -2,6 +2,7 @@ import { styled, Box } from '@mui/material'
|
||||
import type { ReactNode } from 'react'
|
||||
|
||||
import type { SearchState } from '@/components/base'
|
||||
import { buildRegex } from '@/utils/search-matcher'
|
||||
|
||||
const Item = styled(Box)(({ theme: { palette, typography } }) => ({
|
||||
padding: '8px 0',
|
||||
@@ -47,62 +48,74 @@ interface Props {
|
||||
searchState?: SearchState
|
||||
}
|
||||
|
||||
// Compiling per row multiplied by high-frequency log appends; searchState is
|
||||
// React state, so identity reuse is safe until the search inputs change.
|
||||
let highlightRegexCache: { state: SearchState; regex: RegExp | null } | null =
|
||||
null
|
||||
|
||||
const getHighlightRegex = (searchState: SearchState): RegExp | null => {
|
||||
if (highlightRegexCache?.state === searchState)
|
||||
return highlightRegexCache.regex
|
||||
|
||||
const searchText = searchState.text
|
||||
let pattern: string
|
||||
|
||||
if (searchState.useRegularExpression) {
|
||||
try {
|
||||
new RegExp(searchText)
|
||||
pattern = searchText
|
||||
} catch {
|
||||
pattern = searchText.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
|
||||
}
|
||||
} else {
|
||||
const escaped = searchText.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
|
||||
pattern = searchState.matchWholeWord ? `\\b${escaped}\\b` : escaped
|
||||
}
|
||||
|
||||
const flags = searchState.matchCase ? 'g' : 'gi'
|
||||
const regex = buildRegex(pattern, flags)
|
||||
highlightRegexCache = { state: searchState, regex }
|
||||
return regex
|
||||
}
|
||||
|
||||
const LogItem = ({ value, searchState }: Props) => {
|
||||
const renderHighlightText = (text: string) => {
|
||||
if (!searchState?.text.trim()) return text
|
||||
|
||||
try {
|
||||
const searchText = searchState.text
|
||||
let pattern: string
|
||||
const regex = getHighlightRegex(searchState)
|
||||
if (!regex) return text
|
||||
|
||||
if (searchState.useRegularExpression) {
|
||||
try {
|
||||
new RegExp(searchText)
|
||||
pattern = searchText
|
||||
} catch {
|
||||
pattern = searchText.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
|
||||
}
|
||||
} else {
|
||||
const escaped = searchText.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
|
||||
pattern = searchState.matchWholeWord ? `\\b${escaped}\\b` : escaped
|
||||
const elements: ReactNode[] = []
|
||||
let lastIndex = 0
|
||||
let match: RegExpExecArray | null
|
||||
|
||||
while ((match = regex.exec(text)) !== null) {
|
||||
const start = match.index
|
||||
const matchText = match[0]
|
||||
|
||||
if (matchText === '') {
|
||||
regex.lastIndex += 1
|
||||
continue
|
||||
}
|
||||
|
||||
const flags = searchState.matchCase ? 'g' : 'gi'
|
||||
const regex = new RegExp(pattern, flags)
|
||||
const elements: ReactNode[] = []
|
||||
let lastIndex = 0
|
||||
let match: RegExpExecArray | null
|
||||
|
||||
while ((match = regex.exec(text)) !== null) {
|
||||
const start = match.index
|
||||
const matchText = match[0]
|
||||
|
||||
if (matchText === '') {
|
||||
regex.lastIndex += 1
|
||||
continue
|
||||
}
|
||||
|
||||
if (start > lastIndex) {
|
||||
elements.push(text.slice(lastIndex, start))
|
||||
}
|
||||
|
||||
elements.push(
|
||||
<span key={`highlight-${start}`} className="highlight">
|
||||
{matchText}
|
||||
</span>,
|
||||
)
|
||||
|
||||
lastIndex = start + matchText.length
|
||||
if (start > lastIndex) {
|
||||
elements.push(text.slice(lastIndex, start))
|
||||
}
|
||||
|
||||
if (lastIndex < text.length) {
|
||||
elements.push(text.slice(lastIndex))
|
||||
}
|
||||
elements.push(
|
||||
<span key={`highlight-${start}`} className="highlight">
|
||||
{matchText}
|
||||
</span>,
|
||||
)
|
||||
|
||||
return elements.length ? elements : text
|
||||
} catch {
|
||||
return text
|
||||
lastIndex = start + matchText.length
|
||||
}
|
||||
|
||||
if (lastIndex < text.length) {
|
||||
elements.push(text.slice(lastIndex))
|
||||
}
|
||||
|
||||
return elements.length ? elements : text
|
||||
}
|
||||
|
||||
return (
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { Alert, Box, Typography } from '@mui/material'
|
||||
import { useMemo } from 'react'
|
||||
import { Trans, useTranslation } from 'react-i18next'
|
||||
|
||||
const stageHints = {
|
||||
@@ -15,31 +14,26 @@ interface Props {
|
||||
|
||||
export const EnhanceHint = ({ stage }: Props) => {
|
||||
const { t } = useTranslation()
|
||||
// The component map identity changes only when the active stage changes.
|
||||
const orderComponents = useMemo(
|
||||
() =>
|
||||
Object.fromEntries(
|
||||
Object.keys(stageHints).map((key) => [
|
||||
key,
|
||||
<Box
|
||||
key={key}
|
||||
component={key === stage ? 'strong' : 'span'}
|
||||
sx={
|
||||
key === stage
|
||||
? {
|
||||
fontWeight: 'bold',
|
||||
color: 'primary.contrastText',
|
||||
bgcolor: 'primary.main',
|
||||
borderRadius: 0.5,
|
||||
px: 0.5,
|
||||
boxDecorationBreak: 'clone',
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
/>,
|
||||
]),
|
||||
),
|
||||
[stage],
|
||||
const orderComponents = Object.fromEntries(
|
||||
Object.keys(stageHints).map((key) => [
|
||||
key,
|
||||
<Box
|
||||
key={key}
|
||||
component={key === stage ? 'strong' : 'span'}
|
||||
sx={
|
||||
key === stage
|
||||
? {
|
||||
fontWeight: 'bold',
|
||||
color: 'primary.contrastText',
|
||||
bgcolor: 'primary.main',
|
||||
borderRadius: 0.5,
|
||||
px: 0.5,
|
||||
boxDecorationBreak: 'clone',
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
/>,
|
||||
]),
|
||||
)
|
||||
|
||||
return (
|
||||
|
||||
@@ -56,8 +56,6 @@ interface GroupedVirtualListProps<T> {
|
||||
style?: CSSProperties
|
||||
}
|
||||
|
||||
const GROUPED_LIST_SENSORS = [PointerSensor, KeyboardSensor]
|
||||
|
||||
/**
|
||||
* 用于编辑规则/节点/代理组功能的 prepend/original/append 分组虚拟化列表
|
||||
*/
|
||||
@@ -143,7 +141,7 @@ export function GroupedVirtualList<T>(props: GroupedVirtualListProps<T>) {
|
||||
|
||||
return (
|
||||
<DragDropProvider
|
||||
sensors={GROUPED_LIST_SENSORS}
|
||||
sensors={[PointerSensor, KeyboardSensor]}
|
||||
onDragStart={onDragStart}
|
||||
onDragOver={onDragOver}
|
||||
onDragEnd={onDragEnd}
|
||||
|
||||
@@ -112,12 +112,9 @@ export const ProfileMore = (props: Props) => {
|
||||
document.markSaved(currentValue)
|
||||
})
|
||||
|
||||
// document gets a fresh identity every render; setValue is the stable
|
||||
// useState setter, so the callback keys on it instead.
|
||||
const { setValue } = document
|
||||
const handleResetToDefault = useCallback(() => {
|
||||
setValue(DEFAULT_SCRIPT)
|
||||
}, [setValue])
|
||||
document.setValue(DEFAULT_SCRIPT)
|
||||
}, [document])
|
||||
|
||||
return (
|
||||
<>
|
||||
|
||||
@@ -61,26 +61,21 @@ export function ProfileViewer({ onChange, ref }: ProfileViewerProps) {
|
||||
},
|
||||
})
|
||||
|
||||
// The handle only closes over stable form/state setters.
|
||||
useImperativeHandle(
|
||||
ref,
|
||||
() => ({
|
||||
create: () => {
|
||||
setOpenType('new')
|
||||
setOpen(true)
|
||||
},
|
||||
edit: (item: IProfileItem) => {
|
||||
if (item) {
|
||||
Object.entries(item).forEach(([key, value]) => {
|
||||
setValue(key as any, value)
|
||||
})
|
||||
}
|
||||
setOpenType('edit')
|
||||
setOpen(true)
|
||||
},
|
||||
}),
|
||||
[setValue],
|
||||
)
|
||||
useImperativeHandle(ref, () => ({
|
||||
create: () => {
|
||||
setOpenType('new')
|
||||
setOpen(true)
|
||||
},
|
||||
edit: (item: IProfileItem) => {
|
||||
if (item) {
|
||||
Object.entries(item).forEach(([key, value]) => {
|
||||
setValue(key as any, value)
|
||||
})
|
||||
}
|
||||
setOpenType('edit')
|
||||
setOpen(true)
|
||||
},
|
||||
}))
|
||||
|
||||
const handleOk = useLockFn(
|
||||
handleSubmit(async (form) => {
|
||||
|
||||
@@ -57,8 +57,6 @@ const chainPointerSensor = PointerSensor.configure({
|
||||
activationConstraints: () => undefined,
|
||||
})
|
||||
|
||||
const CHAIN_SENSORS = [chainPointerSensor, KeyboardSensor]
|
||||
|
||||
type RuntimeConfigWithProxySequence = IConfigData & { proxies?: unknown }
|
||||
|
||||
interface ProxyChainProps {
|
||||
@@ -667,7 +665,10 @@ export const ProxyChain = ({
|
||||
</Button>
|
||||
</Box>
|
||||
) : (
|
||||
<DragDropProvider sensors={CHAIN_SENSORS} onDragEnd={handleDragEnd}>
|
||||
<DragDropProvider
|
||||
sensors={[chainPointerSensor, KeyboardSensor]}
|
||||
onDragEnd={handleDragEnd}
|
||||
>
|
||||
<Box sx={{ borderRadius: 1, minHeight: 60, p: 1 }}>
|
||||
{currentProxyChain.map((proxy, index) => (
|
||||
<SortableProxyChainItem
|
||||
|
||||
@@ -60,6 +60,23 @@ const ProxyGroupsChain = lazy(() =>
|
||||
})),
|
||||
)
|
||||
|
||||
const SCROLL_POSITIONS_KEY = 'proxy-scroll-positions'
|
||||
type ScrollPositions = Record<string, number>
|
||||
let scrollPositionsCache: ScrollPositions | undefined
|
||||
|
||||
// Scroll handling runs per frame and is throttled to 500ms writes; keep the
|
||||
// parsed object so saves do not re-read and re-parse localStorage each time.
|
||||
const readScrollPositions = (): ScrollPositions | undefined => {
|
||||
if (scrollPositionsCache) return scrollPositionsCache
|
||||
try {
|
||||
const raw = localStorage.getItem(SCROLL_POSITIONS_KEY)
|
||||
if (raw) scrollPositionsCache = JSON.parse(raw) as ScrollPositions
|
||||
} catch (e) {
|
||||
console.error('Error restoring scroll position:', e)
|
||||
}
|
||||
return scrollPositionsCache
|
||||
}
|
||||
|
||||
function useStableCallback<T extends (...args: any[]) => any>(fn: T): T {
|
||||
const ref = useRef(fn)
|
||||
ref.current = fn
|
||||
@@ -150,13 +167,12 @@ function useProxyRenderState(
|
||||
|
||||
const saveScrollPosition = useCallback(
|
||||
(scrollTop: number) => {
|
||||
const scrollPositions = localStorage.getItem('proxy-scroll-positions')
|
||||
? JSON.parse(localStorage.getItem('proxy-scroll-positions') ?? '{}')
|
||||
: {}
|
||||
const scrollPositions = readScrollPositions() ?? {}
|
||||
scrollPositions[scrollPositionKey] = scrollTop
|
||||
scrollPositionsCache = scrollPositions
|
||||
try {
|
||||
localStorage.setItem(
|
||||
'proxy-scroll-positions',
|
||||
SCROLL_POSITIONS_KEY,
|
||||
JSON.stringify(scrollPositions),
|
||||
)
|
||||
} catch (e) {
|
||||
@@ -167,15 +183,10 @@ function useProxyRenderState(
|
||||
)
|
||||
|
||||
const getScrollPosition = useCallback(() => {
|
||||
try {
|
||||
const savedPositions = localStorage.getItem('proxy-scroll-positions')
|
||||
if (savedPositions) {
|
||||
const positions = JSON.parse(savedPositions)
|
||||
const savedPosition = positions[scrollPositionKey]
|
||||
return savedPosition ?? 0
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error restoring scroll position:', e)
|
||||
const savedPositions = readScrollPositions()
|
||||
if (savedPositions) {
|
||||
const savedPosition = savedPositions[scrollPositionKey]
|
||||
return savedPosition ?? 0
|
||||
}
|
||||
}, [scrollPositionKey])
|
||||
|
||||
@@ -240,9 +251,13 @@ function ChainProxyGroups(props: {
|
||||
|
||||
const rangeExtractor = useCallback(
|
||||
(range: Parameters<typeof defaultRangeExtractor>[0]) => {
|
||||
const activeStickyIndex = [...stickyGroupIndexes]
|
||||
.reverse()
|
||||
.find((index) => index <= range.startIndex)
|
||||
let activeStickyIndex: number | undefined
|
||||
for (let i = stickyGroupIndexes.length - 1; i >= 0; i--) {
|
||||
if (stickyGroupIndexes[i] <= range.startIndex) {
|
||||
activeStickyIndex = stickyGroupIndexes[i]
|
||||
break
|
||||
}
|
||||
}
|
||||
activeStickyIndexRef.current = activeStickyIndex ?? null
|
||||
|
||||
const indexes = defaultRangeExtractor(range)
|
||||
|
||||
@@ -17,7 +17,7 @@ import {
|
||||
} from '@mui/material'
|
||||
import { useLockFn } from 'ahooks'
|
||||
import dayjs from 'dayjs'
|
||||
import { useMemo, useState } from 'react'
|
||||
import { useState } from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
import { updateRuleProvider } from 'tauri-plugin-mihomo-api'
|
||||
|
||||
@@ -42,11 +42,6 @@ export const ProviderButton = () => {
|
||||
const { t } = useTranslation()
|
||||
const [open, setOpen] = useState(false)
|
||||
const { ruleProviders } = useRulesData()
|
||||
|
||||
const sortedProviderEntries = useMemo(
|
||||
() => Object.entries(ruleProviders || {}).sort(),
|
||||
[ruleProviders],
|
||||
)
|
||||
const { refreshRules, refreshRuleProviders } = useAppRefreshers()
|
||||
const [updating, setUpdating] = useState<Record<string, boolean>>({})
|
||||
|
||||
@@ -171,119 +166,121 @@ export const ProviderButton = () => {
|
||||
|
||||
<DialogContent>
|
||||
<List sx={{ py: 0, minHeight: 250 }}>
|
||||
{sortedProviderEntries.map(([key, item]) => {
|
||||
const provider = item
|
||||
const time = dayjs(provider.updatedAt)
|
||||
const isUpdating = updating[key]
|
||||
{Object.entries(ruleProviders || {})
|
||||
.sort()
|
||||
.map(([key, item]) => {
|
||||
const provider = item
|
||||
const time = dayjs(provider.updatedAt)
|
||||
const isUpdating = updating[key]
|
||||
|
||||
return (
|
||||
<ListItem
|
||||
key={key}
|
||||
sx={[
|
||||
{
|
||||
p: 0,
|
||||
mb: '8px',
|
||||
borderRadius: 2,
|
||||
overflow: 'hidden',
|
||||
transition: 'all 0.2s',
|
||||
},
|
||||
({ palette: { mode, primary } }) => {
|
||||
const bgcolor = mode === 'light' ? '#ffffff' : '#24252f'
|
||||
const hoverColor =
|
||||
mode === 'light'
|
||||
? alpha(primary.main, 0.1)
|
||||
: alpha(primary.main, 0.2)
|
||||
return (
|
||||
<ListItem
|
||||
key={key}
|
||||
sx={[
|
||||
{
|
||||
p: 0,
|
||||
mb: '8px',
|
||||
borderRadius: 2,
|
||||
overflow: 'hidden',
|
||||
transition: 'all 0.2s',
|
||||
},
|
||||
({ palette: { mode, primary } }) => {
|
||||
const bgcolor = mode === 'light' ? '#ffffff' : '#24252f'
|
||||
const hoverColor =
|
||||
mode === 'light'
|
||||
? alpha(primary.main, 0.1)
|
||||
: alpha(primary.main, 0.2)
|
||||
|
||||
return {
|
||||
backgroundColor: bgcolor,
|
||||
'&:hover': {
|
||||
backgroundColor: hoverColor,
|
||||
borderColor: alpha(primary.main, 0.3),
|
||||
},
|
||||
}
|
||||
},
|
||||
]}
|
||||
>
|
||||
<ListItemText
|
||||
sx={{ px: 2, py: 1 }}
|
||||
primary={
|
||||
<Box
|
||||
sx={{
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
>
|
||||
<Typography
|
||||
variant="subtitle1"
|
||||
component="div"
|
||||
noWrap
|
||||
title={key}
|
||||
sx={{ display: 'flex', alignItems: 'center' }}
|
||||
>
|
||||
<span style={{ marginRight: '8px' }}>{key}</span>
|
||||
<TypeBox component="span">
|
||||
{provider.ruleCount}
|
||||
</TypeBox>
|
||||
</Typography>
|
||||
|
||||
<Typography
|
||||
variant="body2"
|
||||
color="text.secondary"
|
||||
noWrap
|
||||
>
|
||||
<small>{t('shared.labels.updateAt')}: </small>
|
||||
{time.fromNow()}
|
||||
</Typography>
|
||||
</Box>
|
||||
}
|
||||
secondary={
|
||||
<Box sx={{ display: 'flex' }}>
|
||||
<TypeBox component="span">
|
||||
{typeof provider.vehicleType === 'string'
|
||||
? provider.vehicleType
|
||||
: provider.vehicleType.Unknown}
|
||||
</TypeBox>
|
||||
<TypeBox component="span">
|
||||
{typeof provider.behavior === 'string'
|
||||
? provider.behavior
|
||||
: provider.behavior.Unknown}
|
||||
</TypeBox>
|
||||
</Box>
|
||||
}
|
||||
/>
|
||||
<Divider orientation="vertical" flexItem />
|
||||
<Box
|
||||
sx={{
|
||||
width: 40,
|
||||
display: 'flex',
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
return {
|
||||
backgroundColor: bgcolor,
|
||||
'&:hover': {
|
||||
backgroundColor: hoverColor,
|
||||
borderColor: alpha(primary.main, 0.3),
|
||||
},
|
||||
}
|
||||
},
|
||||
]}
|
||||
>
|
||||
<IconButton
|
||||
size="small"
|
||||
color="primary"
|
||||
onClick={() => updateProvider(key)}
|
||||
disabled={isUpdating}
|
||||
aria-label={t('rules.page.provider.actions.update')}
|
||||
<ListItemText
|
||||
sx={{ px: 2, py: 1 }}
|
||||
primary={
|
||||
<Box
|
||||
sx={{
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
>
|
||||
<Typography
|
||||
variant="subtitle1"
|
||||
component="div"
|
||||
noWrap
|
||||
title={key}
|
||||
sx={{ display: 'flex', alignItems: 'center' }}
|
||||
>
|
||||
<span style={{ marginRight: '8px' }}>{key}</span>
|
||||
<TypeBox component="span">
|
||||
{provider.ruleCount}
|
||||
</TypeBox>
|
||||
</Typography>
|
||||
|
||||
<Typography
|
||||
variant="body2"
|
||||
color="text.secondary"
|
||||
noWrap
|
||||
>
|
||||
<small>{t('shared.labels.updateAt')}: </small>
|
||||
{time.fromNow()}
|
||||
</Typography>
|
||||
</Box>
|
||||
}
|
||||
secondary={
|
||||
<Box sx={{ display: 'flex' }}>
|
||||
<TypeBox component="span">
|
||||
{typeof provider.vehicleType === 'string'
|
||||
? provider.vehicleType
|
||||
: provider.vehicleType.Unknown}
|
||||
</TypeBox>
|
||||
<TypeBox component="span">
|
||||
{typeof provider.behavior === 'string'
|
||||
? provider.behavior
|
||||
: provider.behavior.Unknown}
|
||||
</TypeBox>
|
||||
</Box>
|
||||
}
|
||||
/>
|
||||
<Divider orientation="vertical" flexItem />
|
||||
<Box
|
||||
sx={{
|
||||
animation: isUpdating
|
||||
? 'spin 1s linear infinite'
|
||||
: 'none',
|
||||
'@keyframes spin': {
|
||||
'0%': { transform: 'rotate(0deg)' },
|
||||
'100%': { transform: 'rotate(360deg)' },
|
||||
},
|
||||
width: 40,
|
||||
display: 'flex',
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
title={t('rules.page.provider.actions.update')}
|
||||
>
|
||||
<RefreshRounded />
|
||||
</IconButton>
|
||||
</Box>
|
||||
</ListItem>
|
||||
)
|
||||
})}
|
||||
<IconButton
|
||||
size="small"
|
||||
color="primary"
|
||||
onClick={() => updateProvider(key)}
|
||||
disabled={isUpdating}
|
||||
aria-label={t('rules.page.provider.actions.update')}
|
||||
sx={{
|
||||
animation: isUpdating
|
||||
? 'spin 1s linear infinite'
|
||||
: 'none',
|
||||
'@keyframes spin': {
|
||||
'0%': { transform: 'rotate(0deg)' },
|
||||
'100%': { transform: 'rotate(360deg)' },
|
||||
},
|
||||
}}
|
||||
title={t('rules.page.provider.actions.update')}
|
||||
>
|
||||
<RefreshRounded />
|
||||
</IconButton>
|
||||
</Box>
|
||||
</ListItem>
|
||||
)
|
||||
})}
|
||||
</List>
|
||||
</DialogContent>
|
||||
|
||||
|
||||
@@ -42,8 +42,6 @@ const HOTKEY_FUNC_LABELS: Record<(typeof HOTKEY_FUNC)[number], string> = {
|
||||
reactivate_profiles: 'settings.modals.hotkey.functions.reactivateProfiles',
|
||||
}
|
||||
|
||||
const EMPTY_KEYS: string[] = []
|
||||
|
||||
export const HotkeyViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
const { t } = useTranslation()
|
||||
const [open, setOpen] = useState(false)
|
||||
@@ -134,7 +132,7 @@ export const HotkeyViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
<ItemWrapper key={func} data-setting-target={HOTKEY_FUNC_LABELS[func]}>
|
||||
<Typography>{t(HOTKEY_FUNC_LABELS[func])}</Typography>
|
||||
<HotkeyInput
|
||||
value={hotkeyMap[func] ?? EMPTY_KEYS}
|
||||
value={hotkeyMap[func] ?? []}
|
||||
onChange={(v) => setHotkeyMap((m) => ({ ...m, [func]: v }))}
|
||||
/>
|
||||
</ItemWrapper>
|
||||
|
||||
@@ -17,13 +17,7 @@ import { exists } from '@tauri-apps/plugin-fs'
|
||||
import { forwardRef, useEffect, useState } from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import {
|
||||
BaseDialog,
|
||||
DialogRef,
|
||||
Switch,
|
||||
TooltipIcon,
|
||||
switchChangeValue,
|
||||
} from '@/components/base'
|
||||
import { BaseDialog, DialogRef, Switch, TooltipIcon } from '@/components/base'
|
||||
import { DEFAULT_HOVER_DELAY } from '@/components/proxy/proxy-group-navigator'
|
||||
import { useVerge } from '@/hooks/use-verge'
|
||||
import { useWindowDecorations } from '@/hooks/use-window'
|
||||
@@ -110,6 +104,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
close: () => setOpen(false),
|
||||
}))
|
||||
|
||||
const onSwitchFormat = (_e: any, value: boolean) => value
|
||||
const onError = (err: any) => {
|
||||
showNotice.error(err)
|
||||
}
|
||||
@@ -139,7 +134,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={decorated}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={async () => {
|
||||
await toggleDecorations()
|
||||
}}
|
||||
@@ -156,7 +151,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.traffic_graph ?? true}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) => onChangeData({ traffic_graph: e })}
|
||||
onGuard={(e) => patchVerge({ traffic_graph: e })}
|
||||
>
|
||||
@@ -172,7 +167,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.enable_memory_usage ?? true}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) => onChangeData({ enable_memory_usage: e })}
|
||||
onGuard={(e) => patchVerge({ enable_memory_usage: e })}
|
||||
>
|
||||
@@ -190,7 +185,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.enable_group_icon ?? true}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) => onChangeData({ enable_group_icon: e })}
|
||||
onGuard={(e) => patchVerge({ enable_group_icon: e })}
|
||||
>
|
||||
@@ -208,7 +203,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.pause_render_traffic_stats_on_blur ?? true}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) =>
|
||||
onChangeData({ pause_render_traffic_stats_on_blur: e })
|
||||
}
|
||||
@@ -276,7 +271,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.enable_hover_jump_navigator ?? true}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) => onChangeData({ enable_hover_jump_navigator: e })}
|
||||
onGuard={(e) => patchVerge({ enable_hover_jump_navigator: e })}
|
||||
>
|
||||
@@ -378,7 +373,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.collapse_navbar ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) => onChangeData({ collapse_navbar: e })}
|
||||
onGuard={(e) => patchVerge({ collapse_navbar: e })}
|
||||
>
|
||||
@@ -425,7 +420,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.enable_tray_speed ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) => onChangeData({ enable_tray_speed: e })}
|
||||
onGuard={(e) => patchVerge({ enable_tray_speed: e })}
|
||||
>
|
||||
@@ -445,7 +440,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) => onChangeData({ enable_tray_icon: e })}
|
||||
onGuard={(e) => patchVerge({ enable_tray_icon: e })}
|
||||
>
|
||||
@@ -499,7 +494,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.tray_inline_outbound_modes ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) => onChangeData({ tray_inline_outbound_modes: e })}
|
||||
onGuard={(e) => patchVerge({ tray_inline_outbound_modes: e })}
|
||||
>
|
||||
|
||||
@@ -8,7 +8,7 @@ import {
|
||||
TextField,
|
||||
} from '@mui/material'
|
||||
import { useLockFn } from 'ahooks'
|
||||
import { forwardRef, useMemo, useState } from 'react'
|
||||
import { forwardRef, useState } from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import { BaseDialog, DialogRef, Switch, TooltipIcon } from '@/components/base'
|
||||
@@ -17,20 +17,6 @@ import { showNotice } from '@/services/notice-service'
|
||||
|
||||
import { useSettingDialog } from '../settings-search-context'
|
||||
|
||||
const APP_LOG_LEVEL_OPTIONS = [
|
||||
'trace',
|
||||
'debug',
|
||||
'info',
|
||||
'warn',
|
||||
'error',
|
||||
'silent',
|
||||
].map((level) => ({
|
||||
value: level,
|
||||
label: level[0].toUpperCase() + level.slice(1).toLowerCase(),
|
||||
}))
|
||||
|
||||
const PROXY_LAYOUT_COLUMN_VALUES = [1, 2, 3, 4, 5]
|
||||
|
||||
const buildInitialValues = (verge?: IVergeConfig | null) => ({
|
||||
appLogLevel: verge?.app_log_level ?? 'warn',
|
||||
appLogMaxSize: verge?.app_log_max_size ?? 128,
|
||||
@@ -52,40 +38,6 @@ export const MiscViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
const { t } = useTranslation()
|
||||
const { verge, patchVerge } = useVerge()
|
||||
|
||||
const autoLogCleanOptions = useMemo(
|
||||
() => [
|
||||
{
|
||||
key: t('settings.modals.misc.options.autoLogClean.never'),
|
||||
value: 0,
|
||||
},
|
||||
{
|
||||
key: t('settings.modals.misc.options.autoLogClean.retainDays', {
|
||||
n: 1,
|
||||
}),
|
||||
value: 1,
|
||||
},
|
||||
{
|
||||
key: t('settings.modals.misc.options.autoLogClean.retainDays', {
|
||||
n: 7,
|
||||
}),
|
||||
value: 2,
|
||||
},
|
||||
{
|
||||
key: t('settings.modals.misc.options.autoLogClean.retainDays', {
|
||||
n: 30,
|
||||
}),
|
||||
value: 3,
|
||||
},
|
||||
{
|
||||
key: t('settings.modals.misc.options.autoLogClean.retainDays', {
|
||||
n: 90,
|
||||
}),
|
||||
value: 4,
|
||||
},
|
||||
],
|
||||
[t],
|
||||
)
|
||||
|
||||
const [open, setOpen] = useState(false)
|
||||
const [values, setValues] = useState(() => buildInitialValues(null))
|
||||
|
||||
@@ -152,9 +104,9 @@ export const MiscViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
}))
|
||||
}
|
||||
>
|
||||
{APP_LOG_LEVEL_OPTIONS.map(({ value, label }) => (
|
||||
<MenuItem value={value} key={value}>
|
||||
{label}
|
||||
{['trace', 'debug', 'info', 'warn', 'error', 'silent'].map((i) => (
|
||||
<MenuItem value={i} key={i}>
|
||||
{i[0].toUpperCase() + i.slice(1).toLowerCase()}
|
||||
</MenuItem>
|
||||
))}
|
||||
</Select>
|
||||
@@ -333,7 +285,7 @@ export const MiscViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
<MenuItem value={6} key={6}>
|
||||
{t('settings.modals.misc.options.proxyLayoutColumns.auto')}
|
||||
</MenuItem>
|
||||
{PROXY_LAYOUT_COLUMN_VALUES.map((i) => (
|
||||
{[1, 2, 3, 4, 5].map((i) => (
|
||||
<MenuItem value={i} key={i}>
|
||||
{i}
|
||||
</MenuItem>
|
||||
@@ -360,7 +312,36 @@ export const MiscViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
}
|
||||
>
|
||||
{/* 1: 1天, 2: 7天, 3: 30天, 4: 90天*/}
|
||||
{autoLogCleanOptions.map((i) => (
|
||||
{[
|
||||
{
|
||||
key: t('settings.modals.misc.options.autoLogClean.never'),
|
||||
value: 0,
|
||||
},
|
||||
{
|
||||
key: t('settings.modals.misc.options.autoLogClean.retainDays', {
|
||||
n: 1,
|
||||
}),
|
||||
value: 1,
|
||||
},
|
||||
{
|
||||
key: t('settings.modals.misc.options.autoLogClean.retainDays', {
|
||||
n: 7,
|
||||
}),
|
||||
value: 2,
|
||||
},
|
||||
{
|
||||
key: t('settings.modals.misc.options.autoLogClean.retainDays', {
|
||||
n: 30,
|
||||
}),
|
||||
value: 3,
|
||||
},
|
||||
{
|
||||
key: t('settings.modals.misc.options.autoLogClean.retainDays', {
|
||||
n: 90,
|
||||
}),
|
||||
value: 4,
|
||||
},
|
||||
].map((i) => (
|
||||
<MenuItem key={i.value} value={i.value}>
|
||||
{i.key}
|
||||
</MenuItem>
|
||||
|
||||
@@ -84,19 +84,6 @@ const splitBypass = (value?: string) =>
|
||||
.map((item) => item.trim())
|
||||
.filter(Boolean)
|
||||
|
||||
const OS = getSystem()
|
||||
|
||||
const DEFAULT_BYPASS =
|
||||
OS === 'windows'
|
||||
? 'localhost;127.*;192.168.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;*.local;<local>'
|
||||
: OS === 'linux'
|
||||
? 'localhost,127.0.0.1,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,::1'
|
||||
: '127.0.0.1,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,localhost,*.local,*.crashlytics.com,<local>'
|
||||
|
||||
const DEFAULT_BYPASS_CHIPS = splitBypass(DEFAULT_BYPASS)
|
||||
|
||||
const BYPASS_SEPARATOR = OS === 'windows' ? ';' : ','
|
||||
|
||||
const buildInitialValues = (verge?: IVergeConfig | null) => ({
|
||||
guard: verge?.enable_proxy_guard,
|
||||
enable_bypass_check: verge?.enable_bypass_check ?? true,
|
||||
@@ -110,7 +97,8 @@ const buildInitialValues = (verge?: IVergeConfig | null) => ({
|
||||
|
||||
export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
const { t } = useTranslation()
|
||||
const isWindows = OS === 'windows'
|
||||
const systemName = getSystem()
|
||||
const isWindows = systemName === 'windows'
|
||||
const validReg = useMemo(() => getValidReg(isWindows), [isWindows])
|
||||
|
||||
const [open, setOpen] = useState(false)
|
||||
@@ -142,7 +130,17 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
queryFn: getEmbeddedServerPort,
|
||||
})
|
||||
|
||||
const separator = BYPASS_SEPARATOR
|
||||
const separator = useMemo(() => (isWindows ? ';' : ','), [isWindows])
|
||||
|
||||
const defaultBypass = () => {
|
||||
if (isWindows) {
|
||||
return 'localhost;127.*;192.168.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;*.local;<local>'
|
||||
}
|
||||
if (systemName === 'linux') {
|
||||
return 'localhost,127.0.0.1,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,::1'
|
||||
}
|
||||
return '127.0.0.1,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,localhost,*.local,*.crashlytics.com,<local>'
|
||||
}
|
||||
|
||||
const { systemProxyAddress } = useSystemData()
|
||||
const displayedMixedPort = useDisplayedMixedPort()
|
||||
@@ -505,7 +503,7 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
checked={value.use_default}
|
||||
onChange={(_, e) => {
|
||||
if (!e && !value.bypass) {
|
||||
const nextBypass = DEFAULT_BYPASS
|
||||
const nextBypass = defaultBypass()
|
||||
setValue((v) => ({
|
||||
...v,
|
||||
use_default: e,
|
||||
@@ -577,7 +575,7 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
/>
|
||||
<Box sx={{ padding: '0 2px 5px' }}>
|
||||
<Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 1 }}>
|
||||
{DEFAULT_BYPASS_CHIPS.map((item) => (
|
||||
{splitBypass(defaultBypass()).map((item) => (
|
||||
<Chip key={item} label={item} size="small" />
|
||||
))}
|
||||
</Box>
|
||||
|
||||
@@ -20,12 +20,6 @@ import { showNotice } from '@/services/notice-service'
|
||||
|
||||
import { useSettingDialog } from '../settings-search-context'
|
||||
|
||||
const textProps = {
|
||||
size: 'small',
|
||||
autoComplete: 'off',
|
||||
sx: { width: 135 },
|
||||
} as const
|
||||
|
||||
export function ThemeViewer(props: { ref?: React.Ref<DialogRef> }) {
|
||||
const { ref } = props
|
||||
const { t } = useTranslation()
|
||||
@@ -51,6 +45,12 @@ export function ThemeViewer(props: { ref?: React.Ref<DialogRef> }) {
|
||||
close: () => setOpen(false),
|
||||
}))
|
||||
|
||||
const textProps = {
|
||||
size: 'small',
|
||||
autoComplete: 'off',
|
||||
sx: { width: 135 },
|
||||
} as const
|
||||
|
||||
const handleChange = (field: keyof typeof theme) => (e: any) => {
|
||||
setTheme((t) => ({ ...t, [field]: e.target.value }))
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import {
|
||||
} from '@mui/material'
|
||||
import { useLockFn } from 'ahooks'
|
||||
import type { Ref } from 'react'
|
||||
import { useMemo, useState } from 'react'
|
||||
import { useState } from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import {
|
||||
@@ -58,9 +58,8 @@ export function TunViewer({ ref }: { ref?: Ref<DialogRef> }) {
|
||||
dnsMode: '',
|
||||
})
|
||||
|
||||
const routeExcludeAddressItems = useMemo(
|
||||
() => splitRouteExcludeAddress(values.routeExcludeAddress),
|
||||
[values.routeExcludeAddress],
|
||||
const routeExcludeAddressItems = splitRouteExcludeAddress(
|
||||
values.routeExcludeAddress,
|
||||
)
|
||||
const routeExcludeAddressError =
|
||||
values.autoRoute &&
|
||||
|
||||
@@ -189,7 +189,10 @@ export function UpdateViewer({ ref }: { ref?: Ref<DialogRef> }) {
|
||||
void openExternalUrl(url).catch(showNotice.error)
|
||||
}
|
||||
|
||||
const progress = total <= 0 ? 0 : Math.min((downloaded / total) * 100, 100)
|
||||
const progress = useMemo(() => {
|
||||
if (total <= 0) return 0
|
||||
return Math.min((downloaded / total) * 100, 100)
|
||||
}, [downloaded, total])
|
||||
|
||||
useImperativeHandle(ref, () => ({
|
||||
open: () => {
|
||||
|
||||
@@ -5,13 +5,7 @@ import { useRef, useState } from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
import { updateGeo, type LogLevel } from 'tauri-plugin-mihomo-api'
|
||||
|
||||
import {
|
||||
BaseDialog,
|
||||
DialogRef,
|
||||
Switch,
|
||||
TooltipIcon,
|
||||
switchChangeValue,
|
||||
} from '@/components/base'
|
||||
import { BaseDialog, DialogRef, Switch, TooltipIcon } from '@/components/base'
|
||||
import { useClash } from '@/hooks/use-clash'
|
||||
import { useClashLog } from '@/hooks/use-clash-log'
|
||||
import { useDisplayedMixedPort } from '@/hooks/use-displayed-mixed-port'
|
||||
@@ -75,6 +69,7 @@ const SettingClash = ({ onError }: Props) => {
|
||||
const corsRef = useRef<DialogRef>(null)
|
||||
const tunnelRef = useRef<DialogRef>(null)
|
||||
|
||||
const onSwitchFormat = (_e: any, value: boolean) => value
|
||||
const onChangeData = (patch: Partial<IConfigData>) => {
|
||||
mutateClash((old) => ({ ...old!, ...patch }), false)
|
||||
}
|
||||
@@ -178,7 +173,7 @@ const SettingClash = ({ onError }: Props) => {
|
||||
value={allowLan ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) => onChangeData({ 'allow-lan': e })}
|
||||
onGuard={(e) => patchClash({ 'allow-lan': e })}
|
||||
>
|
||||
@@ -218,7 +213,7 @@ const SettingClash = ({ onError }: Props) => {
|
||||
value={ipv6 ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) => onChangeData({ ipv6: e })}
|
||||
onGuard={(e) => patchClash({ ipv6: e })}
|
||||
>
|
||||
@@ -240,7 +235,7 @@ const SettingClash = ({ onError }: Props) => {
|
||||
value={unifiedDelay ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) => onChangeData({ 'unified-delay': e })}
|
||||
onGuard={(e) => patchClash({ 'unified-delay': e })}
|
||||
>
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { Box } from '@mui/material'
|
||||
import React from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import { Switch, TooltipIcon, switchChangeValue } from '@/components/base'
|
||||
import { Switch, TooltipIcon } from '@/components/base'
|
||||
import ProxyControlSwitches from '@/components/shared/proxy-control-switches'
|
||||
import { useVerge } from '@/hooks/use-verge'
|
||||
|
||||
@@ -19,6 +20,10 @@ const SettingSystem = ({ onError }: Props) => {
|
||||
|
||||
const { enable_auto_launch, enable_silent_start } = verge ?? {}
|
||||
|
||||
const onSwitchFormat = (
|
||||
_e: React.ChangeEvent<HTMLInputElement>,
|
||||
value: boolean,
|
||||
) => value
|
||||
const onChangeData = (patch: Partial<IVergeConfig>) => {
|
||||
mutateVerge({ ...verge, ...patch })
|
||||
}
|
||||
@@ -47,7 +52,7 @@ const SettingSystem = ({ onError }: Props) => {
|
||||
value={enable_auto_launch ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) => {
|
||||
onChangeData({ enable_auto_launch: e })
|
||||
}}
|
||||
@@ -80,7 +85,7 @@ const SettingSystem = ({ onError }: Props) => {
|
||||
value={enable_silent_start ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={switchChangeValue}
|
||||
onFormat={onSwitchFormat}
|
||||
onChange={(e) => onChangeData({ enable_silent_start: e })}
|
||||
onGuard={(e) => patchVerge({ enable_silent_start: e })}
|
||||
>
|
||||
|
||||
+12
-22
@@ -1,6 +1,5 @@
|
||||
import { useLockFn } from 'ahooks'
|
||||
import i18n from 'i18next'
|
||||
import { useCallback } from 'react'
|
||||
import { getVersion } from 'tauri-plugin-mihomo-api'
|
||||
|
||||
import {
|
||||
@@ -87,29 +86,23 @@ export const useClashMode = (shouldFetch: boolean = true) => {
|
||||
}
|
||||
|
||||
export const useClash = () => {
|
||||
const { data: clash } = useRuntimeConfig()
|
||||
const { data: clash, refetch } = useRuntimeConfig()
|
||||
|
||||
const { data: versionData, refetch: mutateVersion } = useQuery({
|
||||
queryKey: ['getVersion'],
|
||||
queryFn: getVersion,
|
||||
})
|
||||
|
||||
// Stable identity: consumers pass mutateClash into their own callbacks.
|
||||
// revalidateQuery hits the same cache key refetch would, without capturing
|
||||
// the per-render refetch closure.
|
||||
const mutateClash = useCallback(
|
||||
(updater?: MutateClashUpdater, revalidate?: boolean) => {
|
||||
if (updater === undefined) {
|
||||
return revalidateQuery(['getRuntimeConfig'])
|
||||
}
|
||||
void setCacheData<IConfigData>(['getRuntimeConfig'], updater)
|
||||
if (revalidate !== false) {
|
||||
return revalidateQuery(['getRuntimeConfig'])
|
||||
}
|
||||
return Promise.resolve()
|
||||
},
|
||||
[],
|
||||
)
|
||||
const mutateClash = (updater?: MutateClashUpdater, revalidate?: boolean) => {
|
||||
if (updater === undefined) {
|
||||
return refetch()
|
||||
}
|
||||
void setCacheData<IConfigData>(['getRuntimeConfig'], updater)
|
||||
if (revalidate !== false) {
|
||||
return refetch()
|
||||
}
|
||||
return Promise.resolve()
|
||||
}
|
||||
|
||||
const patchClash = useLockFn(async (patch: Partial<IConfigData>) => {
|
||||
await mutate(() => patchClashConfig(patch), {
|
||||
@@ -150,10 +143,7 @@ export const useClashInfo = () => {
|
||||
})
|
||||
})
|
||||
|
||||
const invalidateClashConfig = useCallback(
|
||||
() => revalidateQuery(['getClashConfig']),
|
||||
[],
|
||||
)
|
||||
const invalidateClashConfig = () => revalidateQuery(['getClashConfig'])
|
||||
|
||||
return {
|
||||
clashInfo,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useCallback, useMemo, useSyncExternalStore } from 'react'
|
||||
import { useCallback, useSyncExternalStore } from 'react'
|
||||
|
||||
import delayManager, { type DelaySnapshot } from '@/services/delay'
|
||||
import type { ResolvedProxyMember } from '@/types/proxy-view'
|
||||
@@ -32,7 +32,7 @@ export const useGroupsDelays = (
|
||||
groups: readonly string[],
|
||||
): ReadonlyMap<string, DelaySnapshot> => {
|
||||
// Group membership must remain unambiguous when names contain spaces.
|
||||
const groupKey = useMemo(() => JSON.stringify(groups), [groups])
|
||||
const groupKey = JSON.stringify(groups)
|
||||
|
||||
const subscribe = useCallback(
|
||||
(onSettle: () => void) => {
|
||||
|
||||
@@ -158,9 +158,11 @@ const EMPTY_DATA: ITrafficDataPoint[] = []
|
||||
export const useTrafficMonitorEnhanced = (options?: {
|
||||
subscribe?: boolean
|
||||
enabled?: boolean
|
||||
onSnapshot?: (message: ITrafficWorkerSnapshotMessage) => void
|
||||
}) => {
|
||||
const subscribeToSnapshots = options?.subscribe ?? true
|
||||
const enabled = options?.enabled ?? true
|
||||
const onSnapshot = options?.onSnapshot
|
||||
const isVisible = useVisibility()
|
||||
const [latestSnapshot, setLatestSnapshot] = useState<{
|
||||
dataPoints: ITrafficDataPoint[]
|
||||
@@ -174,6 +176,8 @@ export const useTrafficMonitorEnhanced = (options?: {
|
||||
const currentRangeRef = useRef<number>(WORKER_CONFIG.defaultRangeMinutes)
|
||||
const isVisibleRef = useRef(isVisible)
|
||||
isVisibleRef.current = isVisible
|
||||
const onSnapshotRef = useRef(onSnapshot)
|
||||
onSnapshotRef.current = onSnapshot
|
||||
|
||||
// 注册引用计数与Worker生命周期
|
||||
useEffect(() => {
|
||||
@@ -186,9 +190,12 @@ export const useTrafficMonitorEnhanced = (options?: {
|
||||
client.start(currentRangeRef.current)
|
||||
|
||||
let unsubscribe: (() => void) | undefined
|
||||
if (subscribeToSnapshots) {
|
||||
if (subscribeToSnapshots || onSnapshot) {
|
||||
unsubscribe = client.onSnapshot((message) => {
|
||||
if (!isVisibleRef.current) return
|
||||
// onSnapshot is the always-live channel (ignores visibility); the
|
||||
// state mirror below keeps its original always-latest contract.
|
||||
onSnapshotRef.current?.(message)
|
||||
if (!subscribeToSnapshots || !isVisibleRef.current) return
|
||||
setLatestSnapshot({
|
||||
dataPoints: message.dataPoints,
|
||||
samplerStats: message.samplerStats,
|
||||
@@ -203,14 +210,14 @@ export const useTrafficMonitorEnhanced = (options?: {
|
||||
client.stop()
|
||||
}
|
||||
}
|
||||
}, [enabled, subscribeToSnapshots])
|
||||
}, [enabled, subscribeToSnapshots, onSnapshot])
|
||||
|
||||
// Re-prime snapshot ingestion after every visible transition
|
||||
useEffect(() => {
|
||||
if (enabled && subscribeToSnapshots && isVisible) {
|
||||
if (enabled && isVisible && (subscribeToSnapshots || onSnapshot)) {
|
||||
clientRef.current?.requestSnapshot()
|
||||
}
|
||||
}, [enabled, subscribeToSnapshots, isVisible])
|
||||
}, [enabled, subscribeToSnapshots, onSnapshot, isVisible])
|
||||
|
||||
// 添加流量数据
|
||||
const appendData = useCallback(
|
||||
@@ -244,8 +251,12 @@ export const useTrafficMonitorEnhanced = (options?: {
|
||||
/**
|
||||
* 图表数据Hook
|
||||
*/
|
||||
export const useTrafficGraphDataEnhanced = () => {
|
||||
const { graphData, samplerStats } = useTrafficMonitorEnhanced()
|
||||
export const useTrafficGraphDataEnhanced = (options?: {
|
||||
subscribe?: boolean
|
||||
enabled?: boolean
|
||||
onSnapshot?: (message: ITrafficWorkerSnapshotMessage) => void
|
||||
}) => {
|
||||
const { graphData, samplerStats } = useTrafficMonitorEnhanced(options)
|
||||
|
||||
return {
|
||||
...graphData,
|
||||
|
||||
@@ -177,15 +177,13 @@ export async function getProxyView(): Promise<ProxyViewV1> {
|
||||
return view
|
||||
}
|
||||
|
||||
// getClashLogs matches both patterns against every log line.
|
||||
const CLASH_LOG_REGEX = /time="(.+?)"\s+level=(.+?)\s+msg="(.+?)"/
|
||||
const CLASH_LOG_NEW_REGEX = /(.+?)\s+(.+?)\s+(.+)/
|
||||
|
||||
export async function getClashLogs() {
|
||||
const regex = /time="(.+?)"\s+level=(.+?)\s+msg="(.+?)"/
|
||||
const newRegex = /(.+?)\s+(.+?)\s+(.+)/
|
||||
const logs = await commands.getClashLogs()
|
||||
|
||||
return logs.reduce<ILogItem[]>((acc, log) => {
|
||||
const result = log.match(CLASH_LOG_REGEX)
|
||||
const result = log.match(regex)
|
||||
if (result) {
|
||||
const [_, _time, type, payload] = result
|
||||
const time = dayjs(_time).format('MM-DD HH:mm:ss')
|
||||
@@ -193,7 +191,7 @@ export async function getClashLogs() {
|
||||
return acc
|
||||
}
|
||||
|
||||
const result2 = log.match(CLASH_LOG_NEW_REGEX)
|
||||
const result2 = log.match(newRegex)
|
||||
if (result2) {
|
||||
const [_, time, type, payload] = result2
|
||||
acc.push({ time, type, payload })
|
||||
|
||||
@@ -514,21 +514,9 @@ export function hideNotice(id: number) {
|
||||
}
|
||||
|
||||
function hideNoticesByCode(code: string) {
|
||||
// One subscriber notification for the whole batch; per-notice removal
|
||||
// would notify once per item.
|
||||
const remaining: NoticeItem[] = []
|
||||
let removed = false
|
||||
for (const notice of notices) {
|
||||
if (notice.code === code) {
|
||||
removed = true
|
||||
if (notice.timerId) clearTimeout(notice.timerId)
|
||||
} else {
|
||||
remaining.push(notice)
|
||||
}
|
||||
}
|
||||
if (!removed) return
|
||||
notices = remaining
|
||||
notifySubscribers()
|
||||
notices
|
||||
.filter((notice) => notice.code === code)
|
||||
.forEach(({ id }) => hideNotice(id))
|
||||
}
|
||||
|
||||
export function syncSidecarFailure(snapshot: SidecarFailureSnapshot) {
|
||||
|
||||
@@ -19,6 +19,13 @@ let currentRangeMinutes!: number
|
||||
let throttleTimer: ReturnType<typeof setTimeout> | null = null
|
||||
let lastTimestamp: number | undefined
|
||||
let lastBroadcast: ITrafficDataPoint[] = []
|
||||
let lastSamplerVersion = 0
|
||||
|
||||
// The slice for `minutes` can only change without new samples when its oldest
|
||||
// point ages past the range cutoff.
|
||||
const agedPastRange = (reference: ITrafficDataPoint[], minutes: number) =>
|
||||
reference.length > 0 &&
|
||||
Date.now() - reference[0].timestamp >= minutes * 60 * 1000
|
||||
|
||||
const broadcastSnapshot = () => {
|
||||
const dataPoints = sampler.getDataForTimeRange(currentRangeMinutes)
|
||||
@@ -33,6 +40,7 @@ const broadcastSnapshot = () => {
|
||||
|
||||
ctx.postMessage(message)
|
||||
lastBroadcast = dataPoints
|
||||
lastSamplerVersion = sampler.getVersion()
|
||||
}
|
||||
|
||||
const scheduleSnapshot = () => {
|
||||
@@ -55,9 +63,18 @@ ctx.onmessage = (event: MessageEvent<TrafficWorkerRequestMessage>) => {
|
||||
// no handle needed, worker teardown (terminate) drops pending timers
|
||||
ctx.setInterval(() => {
|
||||
if (throttleTimer !== null) return
|
||||
const version = sampler.getVersion()
|
||||
if (
|
||||
version === lastSamplerVersion &&
|
||||
!agedPastRange(lastBroadcast, currentRangeMinutes)
|
||||
) {
|
||||
return
|
||||
}
|
||||
const slice = sampler.getDataForTimeRange(currentRangeMinutes)
|
||||
if (!isSameTrafficData(lastBroadcast, slice)) {
|
||||
broadcastSnapshot()
|
||||
} else {
|
||||
lastSamplerVersion = version
|
||||
}
|
||||
}, 1000)
|
||||
broadcastSnapshot()
|
||||
|
||||
@@ -7,14 +7,33 @@ interface ICompressedDataPoint {
|
||||
|
||||
const pad2 = (value: number) => value.toString().padStart(2, '0')
|
||||
|
||||
// Time labels are derived once per 1Hz timestamp and redrawn several times per
|
||||
// second; the bounded cache keeps axis drawing allocation-free in steady state.
|
||||
const TIME_LABEL_CACHE_LIMIT = 1024
|
||||
const hourMinuteLabels = new Map<number, string>()
|
||||
const minuteSecondLabels = new Map<number, string>()
|
||||
|
||||
export const formatTrafficHourMinute = (timestamp: number) => {
|
||||
const cached = hourMinuteLabels.get(timestamp)
|
||||
if (cached !== undefined) return cached
|
||||
|
||||
const date = new Date(timestamp)
|
||||
return `${pad2(date.getHours())}:${pad2(date.getMinutes())}`
|
||||
const label = `${pad2(date.getHours())}:${pad2(date.getMinutes())}`
|
||||
if (hourMinuteLabels.size >= TIME_LABEL_CACHE_LIMIT) hourMinuteLabels.clear()
|
||||
hourMinuteLabels.set(timestamp, label)
|
||||
return label
|
||||
}
|
||||
|
||||
export const formatTrafficMinuteSecond = (timestamp: number) => {
|
||||
const cached = minuteSecondLabels.get(timestamp)
|
||||
if (cached !== undefined) return cached
|
||||
|
||||
const date = new Date(timestamp)
|
||||
return `${pad2(date.getMinutes())}:${pad2(date.getSeconds())}`
|
||||
const label = `${pad2(date.getMinutes())}:${pad2(date.getSeconds())}`
|
||||
if (minuteSecondLabels.size >= TIME_LABEL_CACHE_LIMIT)
|
||||
minuteSecondLabels.clear()
|
||||
minuteSecondLabels.set(timestamp, label)
|
||||
return label
|
||||
}
|
||||
|
||||
export const formatTrafficName = (timestamp: number) => {
|
||||
@@ -53,10 +72,12 @@ export class TrafficDataSampler {
|
||||
private compressedBuffer: ICompressedDataPoint[] = []
|
||||
private compressedHead = 0
|
||||
private compressionQueue: ITrafficDataPoint[] = []
|
||||
private version = 0
|
||||
|
||||
constructor(private config: ISamplingConfig) {}
|
||||
|
||||
addDataPoint(point: ITrafficDataPoint) {
|
||||
this.version++
|
||||
this.rawBuffer.push(point)
|
||||
|
||||
const rawCutoff = Date.now() - this.config.rawDataMinutes * 60 * 1000
|
||||
@@ -167,7 +188,13 @@ export class TrafficDataSampler {
|
||||
}
|
||||
}
|
||||
|
||||
/** Bumped by every mutation (added points, compression, aging trims, clear). */
|
||||
getVersion(): number {
|
||||
return this.version
|
||||
}
|
||||
|
||||
clear() {
|
||||
this.version++
|
||||
this.rawBuffer = []
|
||||
this.rawHead = 0
|
||||
this.compressedBuffer = []
|
||||
|
||||
@@ -241,17 +241,17 @@ export function parseUrlLike(
|
||||
: result
|
||||
}
|
||||
|
||||
// Both predicates run per parsed proxy URI.
|
||||
const IPV4_REGEX = /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/
|
||||
const IPV6_REGEX =
|
||||
/^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$|^::$|^::1$|^([0-9a-fA-F]{1,4}:)*::([0-9a-fA-F]{1,4}:)*[0-9a-fA-F]{1,4}$/
|
||||
|
||||
export function isIPv4(address: string): boolean {
|
||||
return IPV4_REGEX.test(address)
|
||||
// Check if the address is IPv4
|
||||
const ipv4Regex = /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/
|
||||
return ipv4Regex.test(address)
|
||||
}
|
||||
|
||||
export function isIPv6(address: string): boolean {
|
||||
return IPV6_REGEX.test(address)
|
||||
// Check if the address is IPv6 - simplified regex to avoid backreference issues
|
||||
const ipv6Regex =
|
||||
/^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$|^::$|^::1$|^([0-9a-fA-F]{1,4}:)*::([0-9a-fA-F]{1,4}:)*[0-9a-fA-F]{1,4}$/
|
||||
return ipv6Regex.test(address)
|
||||
}
|
||||
|
||||
export function decodeBase64OrOriginal(str: string): string {
|
||||
|
||||
Reference in New Issue
Block a user