Compare commits

..
Author SHA1 Message Date
Tunglies da7ccebf66 perf(setting): defer layout dialog icon loading to first open
Both settings sections mount the layout dialog, so its eager mount
effect issued about eleven Tauri calls twice per settings-page visit
before the dialog was ever opened. The icon scan now runs once, on the
first open.
2026-11-19 22:58:49 +08:00
Tunglies df4d09167d fix(sysproxy): read the live verge config in the toggle drain loop
The drain loop captured the render-time verge snapshot, so a config
revalidation landing mid-loop left later iterations deciding connection
closing and rollback with stale values. The confirmed-state seed and
the in-loop auto-close check now read through a latest ref.
2026-11-19 22:58:48 +08:00
Tunglies cc202fa312 fix(profile): update editor sequences through functional state
The rule, group and proxy editors mixed functional updaters with writes
computed from render-captured arrays, so two clicks in one React batch
(the second before re-render) read a pre-batch array: deletes dropped
an entry queued by the sibling updater, reorders resolved indices
against a stale list, and add buttons could duplicate past their
uniqueness checks. Every sequence mutation now derives from the live
previous state; the group add buttons keep their translated duplicate
notice and recheck inside the updater.
2026-11-19 22:58:39 +08:00
Tunglies f2c70c5180 fix(setting): keep the copy-success snackbar visible for its full duration
The clipboard handler cleared the success flag with a zero-delay
timeout, so the snackbar configured for 2000 ms was hidden on the next
macrotask. The clear now runs after 2000 ms, resetting the timer on
each copy so a second copy within the window keeps its full duration.
2026-11-19 22:58:30 +08:00
31 changed files with 385 additions and 424 deletions
+3
View File
@@ -28,6 +28,8 @@
<details>
<summary><strong> 🐞 修复问题 </strong></summary>
- 修复「外部控制器」复制成功的提示一闪而过
- 修复订阅的规则、代理组、节点编辑器快速连续操作时条目可能重复或错位
- 修复检测更新后又发布新版时,应用内更新失败
- 修复订阅响应过大导致内存占用过高,限制单次下载为 4 MiB
- 修复全局模式默认停在 `DIRECT` 或 `REJECT` 导致流量未经代理,现自动切换到第一个策略组
@@ -63,6 +65,7 @@
<details>
<summary><strong> 🚀 优化改进 </strong></summary>
- 优化设置页打开时的开销:布局设置弹窗首次打开时才加载图标
- 优化连接、规则和日志筛选:切换页面后保留过滤条件
- 优化全局模式代理列表:仅显示 `GLOBAL` 节点,选中其中的策略组时才显示该组
- 优化设置页开关和选项所在行的鼠标悬停高亮,便于对应说明与控件
+9 -9
View File
@@ -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])
-7
View File
@@ -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"
+1 -1
View File
@@ -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 {
+1 -3
View File
@@ -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>
+2 -3
View File
@@ -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 窗口进行翻转全屏时会短暂地与系统图标重叠渲染。
+20 -26
View File
@@ -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}
+33 -20
View File
@@ -218,7 +218,7 @@ export const GroupsEditorViewer = (props: Props) => {
group={item}
onDelete={() => {
if (isDeleted) {
setDeleteSeq(deleteSeq.filter((v) => v !== item.name))
setDeleteSeq((prev) => prev.filter((v) => v !== item.name))
} else {
setDeleteSeq((prev) => [...prev, item.name])
}
@@ -233,7 +233,7 @@ export const GroupsEditorViewer = (props: Props) => {
type="prepend"
group={item}
onDelete={() => {
setPrependSeq(prependSeq.filter((v) => v.name !== item.name))
setPrependSeq((prev) => prev.filter((v) => v.name !== item.name))
}}
/>
)
@@ -244,7 +244,7 @@ export const GroupsEditorViewer = (props: Props) => {
type="append"
group={item}
onDelete={() => {
setAppendSeq(appendSeq.filter((v) => v.name !== item.name))
setAppendSeq((prev) => prev.filter((v) => v.name !== item.name))
}}
/>
)
@@ -255,21 +255,22 @@ export const GroupsEditorViewer = (props: Props) => {
activeIndex: number,
overIndex: number,
) => {
const list = category === 'prepend' ? prependSeq : appendSeq
const filtered =
category === 'prepend' ? filteredPrependSeq : filteredAppendSeq
const setList = category === 'prepend' ? setPrependSeq : setAppendSeq
const activeRealIndex = findRealIndex(list, filtered, activeIndex)
const overRealIndex = findRealIndex(list, filtered, overIndex)
if (
activeRealIndex < 0 ||
overRealIndex < 0 ||
activeRealIndex === overRealIndex
) {
return
}
// Recompute inside the updater: two writes in one batch must not read the same pre-batch array.
setList((prev) => {
const filtered = prev.filter((v) => match(v.name))
const activeRealIndex = findRealIndex(prev, filtered, activeIndex)
const overRealIndex = findRealIndex(prev, filtered, overIndex)
if (
activeRealIndex < 0 ||
overRealIndex < 0 ||
activeRealIndex === overRealIndex
) {
return prev
}
setList(arrayMove(list, activeRealIndex, overRealIndex))
return arrayMove(prev, activeRealIndex, overRealIndex)
})
}
const fetchContent = useCallback(async () => {
@@ -1019,14 +1020,20 @@ export const GroupsEditorViewer = (props: Props) => {
onClick={() => {
try {
validateGroup()
const values = formIns.getValues()
for (const item of [...prependSeq, ...groupList]) {
if (item.name === formIns.getValues().name) {
if (item.name === values.name) {
throw new Error(
t('profiles.modals.groupsEditor.errors.nameExists'),
)
}
}
setPrependSeq([formIns.getValues(), ...prependSeq])
// Recheck inside the updater so a same-batch second click cannot duplicate the entry.
setPrependSeq((prev) =>
prev.some((v) => v.name === values.name)
? prev
: [values, ...prev],
)
} catch (err) {
showNotice.error(err)
}
@@ -1043,14 +1050,20 @@ export const GroupsEditorViewer = (props: Props) => {
onClick={() => {
try {
validateGroup()
const values = formIns.getValues()
for (const item of [...appendSeq, ...groupList]) {
if (item.name === formIns.getValues().name) {
if (item.name === values.name) {
throw new Error(
t('profiles.modals.groupsEditor.errors.nameExists'),
)
}
}
setAppendSeq([...appendSeq, formIns.getValues()])
// Recheck inside the updater so a same-batch second click cannot duplicate the entry.
setAppendSeq((prev) =>
prev.some((v) => v.name === values.name)
? prev
: [...prev, values],
)
} catch (err) {
showNotice.error(err)
}
+2 -5
View File
@@ -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 (
<>
+15 -20
View File
@@ -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) => {
@@ -123,7 +123,7 @@ export const ProxiesEditorViewer = (props: Props) => {
proxy={item}
onDelete={() => {
if (isDeleted) {
setDeleteSeq(deleteSeq.filter((v) => v !== item.name))
setDeleteSeq((prev) => prev.filter((v) => v !== item.name))
} else {
setDeleteSeq((prev) => [...prev, item.name])
}
@@ -138,7 +138,7 @@ export const ProxiesEditorViewer = (props: Props) => {
type="prepend"
proxy={item}
onDelete={() => {
setPrependSeq(prependSeq.filter((v) => v.name !== item.name))
setPrependSeq((prev) => prev.filter((v) => v.name !== item.name))
}}
/>
)
@@ -149,7 +149,7 @@ export const ProxiesEditorViewer = (props: Props) => {
type="append"
proxy={item}
onDelete={() => {
setAppendSeq(appendSeq.filter((v) => v.name !== item.name))
setAppendSeq((prev) => prev.filter((v) => v.name !== item.name))
}}
/>
)
@@ -160,21 +160,22 @@ export const ProxiesEditorViewer = (props: Props) => {
activeIndex: number,
overIndex: number,
) => {
const list = category === 'prepend' ? prependSeq : appendSeq
const filtered =
category === 'prepend' ? filteredPrependSeq : filteredAppendSeq
const setList = category === 'prepend' ? setPrependSeq : setAppendSeq
const activeRealIndex = findRealIndex(list, filtered, activeIndex)
const overRealIndex = findRealIndex(list, filtered, overIndex)
if (
activeRealIndex < 0 ||
overRealIndex < 0 ||
activeRealIndex === overRealIndex
) {
return
}
// Recompute inside the updater: two writes in one batch must not read the same pre-batch array.
setList((prev) => {
const filtered = prev.filter((v) => hasValidName(v) && match(v.name))
const activeRealIndex = findRealIndex(prev, filtered, activeIndex)
const overRealIndex = findRealIndex(prev, filtered, overIndex)
if (
activeRealIndex < 0 ||
overRealIndex < 0 ||
activeRealIndex === overRealIndex
) {
return prev
}
setList(arrayMove(list, activeRealIndex, overRealIndex))
return arrayMove(prev, activeRealIndex, overRealIndex)
})
}
// 优化:异步分片解析,避免主线程阻塞,解析完成后批量setState
+25 -22
View File
@@ -318,7 +318,7 @@ export const RulesEditorViewer = (props: Props) => {
ruleRaw={item}
onDelete={() => {
if (isDeleted) {
setDeleteSeq(deleteSeq.filter((v) => v !== item))
setDeleteSeq((prev) => prev.filter((v) => v !== item))
} else {
setDeleteSeq((prev) => [...prev, item])
}
@@ -333,13 +333,13 @@ export const RulesEditorViewer = (props: Props) => {
type="prepend"
ruleRaw={item}
onDelete={() => {
setPrependSeq(prependSeq.filter((v) => v !== item))
setPrependSeq((prev) => prev.filter((v) => v !== item))
}}
onAppend={() => {
setAppendSeq((prev) =>
prev.includes(item) ? prev : [...prev, item],
)
setPrependSeq(prependSeq.filter((v) => v !== item))
setPrependSeq((prev) => prev.filter((v) => v !== item))
}}
/>
)
@@ -350,13 +350,13 @@ export const RulesEditorViewer = (props: Props) => {
type="append"
ruleRaw={item}
onDelete={() => {
setAppendSeq(appendSeq.filter((v) => v !== item))
setAppendSeq((prev) => prev.filter((v) => v !== item))
}}
onPrepend={() => {
setPrependSeq((prev) =>
prev.includes(item) ? prev : [...prev, item],
)
setAppendSeq(appendSeq.filter((v) => v !== item))
setAppendSeq((prev) => prev.filter((v) => v !== item))
}}
/>
)
@@ -367,21 +367,22 @@ export const RulesEditorViewer = (props: Props) => {
activeIndex: number,
overIndex: number,
) => {
const list = category === 'prepend' ? prependSeq : appendSeq
const filtered =
category === 'prepend' ? filteredPrependSeq : filteredAppendSeq
const setList = category === 'prepend' ? setPrependSeq : setAppendSeq
const activeRealIndex = findRealIndex(list, filtered, activeIndex)
const overRealIndex = findRealIndex(list, filtered, overIndex)
if (
activeRealIndex < 0 ||
overRealIndex < 0 ||
activeRealIndex === overRealIndex
) {
return
}
// Recompute inside the updater: two writes in one batch must not read the same pre-batch array.
setList((prev) => {
const filtered = prev.filter(match)
const activeRealIndex = findRealIndex(prev, filtered, activeIndex)
const overRealIndex = findRealIndex(prev, filtered, overIndex)
if (
activeRealIndex < 0 ||
overRealIndex < 0 ||
activeRealIndex === overRealIndex
) {
return prev
}
setList(arrayMove(list, activeRealIndex, overRealIndex))
return arrayMove(prev, activeRealIndex, overRealIndex)
})
}
const fetchContent = useCallback(async () => {
@@ -748,8 +749,9 @@ export const RulesEditorViewer = (props: Props) => {
onClick={() => {
try {
const raw = validateRule()
if (prependSeq.includes(raw)) return
setPrependSeq([raw, ...prependSeq])
setPrependSeq((prev) =>
prev.includes(raw) ? prev : [raw, ...prev],
)
} catch (err: any) {
showNotice.error(err)
}
@@ -766,8 +768,9 @@ export const RulesEditorViewer = (props: Props) => {
onClick={() => {
try {
const raw = validateRule()
if (appendSeq.includes(raw)) return
setAppendSeq([...appendSeq, raw])
setAppendSeq((prev) =>
prev.includes(raw) ? prev : [...prev, raw],
)
} catch (err: any) {
showNotice.error(err)
}
+4 -3
View File
@@ -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
+110 -113
View File
@@ -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>
@@ -12,7 +12,7 @@ import {
Tooltip,
} from '@mui/material'
import { useLockFn } from 'ahooks'
import { useState, type Ref } from 'react'
import { useRef, useState, type Ref } from 'react'
import { useTranslation } from 'react-i18next'
import { BaseDialog, DialogRef, Switch } from '@/components/base'
@@ -26,6 +26,10 @@ export function ControllerViewer({ ref }: { ref?: Ref<DialogRef> }) {
const { t } = useTranslation()
const [open, setOpen] = useState(false)
const [copySuccess, setCopySuccess] = useState<null | string>(null)
// A second copy within the window must not be hidden by the first timer.
const copySuccessTimerRef = useRef<ReturnType<typeof setTimeout> | undefined>(
undefined,
)
const [isSaving, setIsSaving] = useState(false)
const { clashInfo, patchInfo } = useClashInfo()
@@ -96,7 +100,11 @@ export function ControllerViewer({ ref }: { ref?: Ref<DialogRef> }) {
try {
await navigator.clipboard.writeText(text)
setCopySuccess(type)
setTimeout(() => setCopySuccess(null))
clearTimeout(copySuccessTimerRef.current)
copySuccessTimerRef.current = setTimeout(
() => setCopySuccess(null),
2000,
)
} catch (err) {
console.warn('[ControllerViewer] copy to clipboard failed:', err)
showNotice.error(
@@ -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>
+21 -19
View File
@@ -14,16 +14,10 @@ import { convertFileSrc } from '@tauri-apps/api/core'
import { join } from '@tauri-apps/api/path'
import { open as openDialog } from '@tauri-apps/plugin-dialog'
import { exists } from '@tauri-apps/plugin-fs'
import { forwardRef, useEffect, useState } from 'react'
import { forwardRef, useEffect, useRef, 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'
@@ -68,9 +62,16 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
const { decorated, toggleDecorations } = useWindowDecorations()
// Icon paths are only reachable from the open dialog; both settings sections
// mount this viewer, so an eager read would double ~11 IPC calls per visit.
// Loaded once per mount, deferred to the first open.
const iconsLoadedRef = useRef(false)
useEffect(() => {
if (!open || iconsLoadedRef.current) return
iconsLoadedRef.current = true
initIconPath()
}, [])
}, [open])
async function initIconPath() {
const appDir = await getAppDir()
@@ -110,6 +111,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 +141,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
value={decorated}
valueProps="checked"
onCatch={onError}
onFormat={switchChangeValue}
onFormat={onSwitchFormat}
onChange={async () => {
await toggleDecorations()
}}
@@ -156,7 +158,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 +174,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 +192,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 +210,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 +278,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 +380,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 +427,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 +447,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 +501,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 })}
>
+35 -54
View File
@@ -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>
+15 -17
View File
@@ -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>
+6 -6
View File
@@ -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 }))
}
+3 -4
View File
@@ -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 -10
View File
@@ -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 })}
>
+8 -3
View File
@@ -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
View File
@@ -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,
+2 -2
View File
@@ -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) => {
+6 -2
View File
@@ -48,10 +48,14 @@ export const useSystemProxyState = () => {
// Coalesce rapid clicks so only the latest requested state is applied.
const pendingRef = useRef<boolean | null>(null)
const busyRef = useRef(false)
// The drain loop outlives the render it started in; reading the config
// through a ref keeps mid-loop revalidations visible to later iterations.
const vergeRef = useRef(verge)
vergeRef.current = verge
const toggleSystemProxy = async (enabled: boolean) => {
// Roll failed optimistic writes back to the latest confirmed state.
let confirmed = verge?.enable_system_proxy ?? false
let confirmed = vergeRef.current?.enable_system_proxy ?? false
mutateVerge((prev) =>
prev ? { ...prev, enable_system_proxy: enabled } : prev,
)
@@ -69,7 +73,7 @@ export const useSystemProxyState = () => {
errorNotice: false,
})
confirmed = target
if (!target && verge?.auto_close_connection) {
if (!target && vergeRef.current?.auto_close_connection) {
await mutate(() => closeAllConnections(), {
id: 'close-all-connections',
errorNotice: false,
+4 -6
View File
@@ -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 })
+3 -15
View File
@@ -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) {
+7 -7
View File
@@ -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 {