mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-11-20 02:42:12 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
25bc4db8e9 | ||
|
|
5043b8706d | ||
|
|
2b812f5fa5 | ||
|
|
7074cc5c25 | ||
|
|
a85566a2cb |
@@ -28,8 +28,6 @@
|
||||
<details>
|
||||
<summary><strong> 🐞 修复问题 </strong></summary>
|
||||
|
||||
- 修复「外部控制器」复制成功的提示一闪而过
|
||||
- 修复订阅的规则、代理组、节点编辑器快速连续操作时条目可能重复或错位
|
||||
- 修复检测更新后又发布新版时,应用内更新失败
|
||||
- 修复订阅响应过大导致内存占用过高,限制单次下载为 4 MiB
|
||||
- 修复全局模式默认停在 `DIRECT` 或 `REJECT` 导致流量未经代理,现自动切换到第一个策略组
|
||||
@@ -65,7 +63,6 @@
|
||||
<details>
|
||||
<summary><strong> 🚀 优化改进 </strong></summary>
|
||||
|
||||
- 优化设置页打开时的开销:布局设置弹窗首次打开时才加载图标
|
||||
- 优化连接、规则和日志筛选:切换页面后保留过滤条件
|
||||
- 优化全局模式代理列表:仅显示 `GLOBAL` 节点,选中其中的策略组时才显示该组
|
||||
- 优化设置页开关和选项所在行的鼠标悬停高亮,便于对应说明与控件
|
||||
|
||||
@@ -53,6 +53,15 @@ 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
|
||||
@@ -119,15 +128,6 @@ 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,6 +1,13 @@
|
||||
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 } from './base-switch'
|
||||
export { Switch, switchChangeValue } from './base-switch'
|
||||
export { TooltipIcon } from './base-tooltip-icon'
|
||||
export { VirtualList, type VirtualListHandle } from './virtual-list'
|
||||
export {
|
||||
|
||||
@@ -23,6 +23,8 @@ import { emitTestAll } from '@/services/bus'
|
||||
|
||||
import { EnhancedCard } from './enhanced-card'
|
||||
|
||||
const TEST_LIST_SENSORS = [PointerSensor]
|
||||
|
||||
// 自定义滚动条样式
|
||||
const ScrollBox = styled(Box)(({ theme }) => ({
|
||||
maxHeight: '180px',
|
||||
@@ -205,7 +207,7 @@ export const TestCard = () => {
|
||||
}
|
||||
>
|
||||
<ScrollBox>
|
||||
<DragDropProvider sensors={[PointerSensor]} onDragEnd={onDragEnd}>
|
||||
<DragDropProvider sensors={TEST_LIST_SENSORS} onDragEnd={onDragEnd}>
|
||||
{renderTestItems}
|
||||
</DragDropProvider>
|
||||
</ScrollBox>
|
||||
|
||||
@@ -5,6 +5,8 @@ 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' },
|
||||
@@ -38,7 +40,7 @@ export const WindowResizeHandles = () => {
|
||||
[currentWindow],
|
||||
)
|
||||
|
||||
if (getSystem() !== 'linux' || maximized) return null
|
||||
if (OS !== 'linux' || maximized) return null
|
||||
|
||||
return (
|
||||
<div
|
||||
@@ -59,7 +61,6 @@ export const WindowResizeHandles = () => {
|
||||
}
|
||||
|
||||
export const WindowControls = () => {
|
||||
const OS = getSystem()
|
||||
const { maximized, minimize, close, toggleMaximize } = useWindowControls()
|
||||
|
||||
// 通过前端对 tauri 窗口进行翻转全屏时会短暂地与系统图标重叠渲染。
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { Alert, Box, Typography } from '@mui/material'
|
||||
import { useMemo } from 'react'
|
||||
import { Trans, useTranslation } from 'react-i18next'
|
||||
|
||||
const stageHints = {
|
||||
@@ -14,26 +15,31 @@ interface Props {
|
||||
|
||||
export const EnhanceHint = ({ stage }: Props) => {
|
||||
const { t } = useTranslation()
|
||||
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
|
||||
}
|
||||
/>,
|
||||
]),
|
||||
// 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],
|
||||
)
|
||||
|
||||
return (
|
||||
|
||||
@@ -56,6 +56,8 @@ interface GroupedVirtualListProps<T> {
|
||||
style?: CSSProperties
|
||||
}
|
||||
|
||||
const GROUPED_LIST_SENSORS = [PointerSensor, KeyboardSensor]
|
||||
|
||||
/**
|
||||
* 用于编辑规则/节点/代理组功能的 prepend/original/append 分组虚拟化列表
|
||||
*/
|
||||
@@ -141,7 +143,7 @@ export function GroupedVirtualList<T>(props: GroupedVirtualListProps<T>) {
|
||||
|
||||
return (
|
||||
<DragDropProvider
|
||||
sensors={[PointerSensor, KeyboardSensor]}
|
||||
sensors={GROUPED_LIST_SENSORS}
|
||||
onDragStart={onDragStart}
|
||||
onDragOver={onDragOver}
|
||||
onDragEnd={onDragEnd}
|
||||
|
||||
@@ -218,7 +218,7 @@ export const GroupsEditorViewer = (props: Props) => {
|
||||
group={item}
|
||||
onDelete={() => {
|
||||
if (isDeleted) {
|
||||
setDeleteSeq((prev) => prev.filter((v) => v !== item.name))
|
||||
setDeleteSeq(deleteSeq.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((prev) => prev.filter((v) => v.name !== item.name))
|
||||
setPrependSeq(prependSeq.filter((v) => v.name !== item.name))
|
||||
}}
|
||||
/>
|
||||
)
|
||||
@@ -244,7 +244,7 @@ export const GroupsEditorViewer = (props: Props) => {
|
||||
type="append"
|
||||
group={item}
|
||||
onDelete={() => {
|
||||
setAppendSeq((prev) => prev.filter((v) => v.name !== item.name))
|
||||
setAppendSeq(appendSeq.filter((v) => v.name !== item.name))
|
||||
}}
|
||||
/>
|
||||
)
|
||||
@@ -255,22 +255,21 @@ 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
|
||||
// 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
|
||||
}
|
||||
const activeRealIndex = findRealIndex(list, filtered, activeIndex)
|
||||
const overRealIndex = findRealIndex(list, filtered, overIndex)
|
||||
if (
|
||||
activeRealIndex < 0 ||
|
||||
overRealIndex < 0 ||
|
||||
activeRealIndex === overRealIndex
|
||||
) {
|
||||
return
|
||||
}
|
||||
|
||||
return arrayMove(prev, activeRealIndex, overRealIndex)
|
||||
})
|
||||
setList(arrayMove(list, activeRealIndex, overRealIndex))
|
||||
}
|
||||
|
||||
const fetchContent = useCallback(async () => {
|
||||
@@ -1020,20 +1019,14 @@ export const GroupsEditorViewer = (props: Props) => {
|
||||
onClick={() => {
|
||||
try {
|
||||
validateGroup()
|
||||
const values = formIns.getValues()
|
||||
for (const item of [...prependSeq, ...groupList]) {
|
||||
if (item.name === values.name) {
|
||||
if (item.name === formIns.getValues().name) {
|
||||
throw new Error(
|
||||
t('profiles.modals.groupsEditor.errors.nameExists'),
|
||||
)
|
||||
}
|
||||
}
|
||||
// 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],
|
||||
)
|
||||
setPrependSeq([formIns.getValues(), ...prependSeq])
|
||||
} catch (err) {
|
||||
showNotice.error(err)
|
||||
}
|
||||
@@ -1050,20 +1043,14 @@ export const GroupsEditorViewer = (props: Props) => {
|
||||
onClick={() => {
|
||||
try {
|
||||
validateGroup()
|
||||
const values = formIns.getValues()
|
||||
for (const item of [...appendSeq, ...groupList]) {
|
||||
if (item.name === values.name) {
|
||||
if (item.name === formIns.getValues().name) {
|
||||
throw new Error(
|
||||
t('profiles.modals.groupsEditor.errors.nameExists'),
|
||||
)
|
||||
}
|
||||
}
|
||||
// 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],
|
||||
)
|
||||
setAppendSeq([...appendSeq, formIns.getValues()])
|
||||
} catch (err) {
|
||||
showNotice.error(err)
|
||||
}
|
||||
|
||||
@@ -112,9 +112,12 @@ 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(() => {
|
||||
document.setValue(DEFAULT_SCRIPT)
|
||||
}, [document])
|
||||
setValue(DEFAULT_SCRIPT)
|
||||
}, [setValue])
|
||||
|
||||
return (
|
||||
<>
|
||||
|
||||
@@ -61,21 +61,26 @@ export function ProfileViewer({ onChange, ref }: ProfileViewerProps) {
|
||||
},
|
||||
})
|
||||
|
||||
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)
|
||||
},
|
||||
}))
|
||||
// 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],
|
||||
)
|
||||
|
||||
const handleOk = useLockFn(
|
||||
handleSubmit(async (form) => {
|
||||
|
||||
@@ -123,7 +123,7 @@ export const ProxiesEditorViewer = (props: Props) => {
|
||||
proxy={item}
|
||||
onDelete={() => {
|
||||
if (isDeleted) {
|
||||
setDeleteSeq((prev) => prev.filter((v) => v !== item.name))
|
||||
setDeleteSeq(deleteSeq.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((prev) => prev.filter((v) => v.name !== item.name))
|
||||
setPrependSeq(prependSeq.filter((v) => v.name !== item.name))
|
||||
}}
|
||||
/>
|
||||
)
|
||||
@@ -149,7 +149,7 @@ export const ProxiesEditorViewer = (props: Props) => {
|
||||
type="append"
|
||||
proxy={item}
|
||||
onDelete={() => {
|
||||
setAppendSeq((prev) => prev.filter((v) => v.name !== item.name))
|
||||
setAppendSeq(appendSeq.filter((v) => v.name !== item.name))
|
||||
}}
|
||||
/>
|
||||
)
|
||||
@@ -160,22 +160,21 @@ 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
|
||||
// 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
|
||||
}
|
||||
const activeRealIndex = findRealIndex(list, filtered, activeIndex)
|
||||
const overRealIndex = findRealIndex(list, filtered, overIndex)
|
||||
if (
|
||||
activeRealIndex < 0 ||
|
||||
overRealIndex < 0 ||
|
||||
activeRealIndex === overRealIndex
|
||||
) {
|
||||
return
|
||||
}
|
||||
|
||||
return arrayMove(prev, activeRealIndex, overRealIndex)
|
||||
})
|
||||
setList(arrayMove(list, activeRealIndex, overRealIndex))
|
||||
}
|
||||
|
||||
// 优化:异步分片解析,避免主线程阻塞,解析完成后批量setState
|
||||
|
||||
@@ -318,7 +318,7 @@ export const RulesEditorViewer = (props: Props) => {
|
||||
ruleRaw={item}
|
||||
onDelete={() => {
|
||||
if (isDeleted) {
|
||||
setDeleteSeq((prev) => prev.filter((v) => v !== item))
|
||||
setDeleteSeq(deleteSeq.filter((v) => v !== item))
|
||||
} else {
|
||||
setDeleteSeq((prev) => [...prev, item])
|
||||
}
|
||||
@@ -333,13 +333,13 @@ export const RulesEditorViewer = (props: Props) => {
|
||||
type="prepend"
|
||||
ruleRaw={item}
|
||||
onDelete={() => {
|
||||
setPrependSeq((prev) => prev.filter((v) => v !== item))
|
||||
setPrependSeq(prependSeq.filter((v) => v !== item))
|
||||
}}
|
||||
onAppend={() => {
|
||||
setAppendSeq((prev) =>
|
||||
prev.includes(item) ? prev : [...prev, item],
|
||||
)
|
||||
setPrependSeq((prev) => prev.filter((v) => v !== item))
|
||||
setPrependSeq(prependSeq.filter((v) => v !== item))
|
||||
}}
|
||||
/>
|
||||
)
|
||||
@@ -350,13 +350,13 @@ export const RulesEditorViewer = (props: Props) => {
|
||||
type="append"
|
||||
ruleRaw={item}
|
||||
onDelete={() => {
|
||||
setAppendSeq((prev) => prev.filter((v) => v !== item))
|
||||
setAppendSeq(appendSeq.filter((v) => v !== item))
|
||||
}}
|
||||
onPrepend={() => {
|
||||
setPrependSeq((prev) =>
|
||||
prev.includes(item) ? prev : [...prev, item],
|
||||
)
|
||||
setAppendSeq((prev) => prev.filter((v) => v !== item))
|
||||
setAppendSeq(appendSeq.filter((v) => v !== item))
|
||||
}}
|
||||
/>
|
||||
)
|
||||
@@ -367,22 +367,21 @@ 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
|
||||
// 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
|
||||
}
|
||||
const activeRealIndex = findRealIndex(list, filtered, activeIndex)
|
||||
const overRealIndex = findRealIndex(list, filtered, overIndex)
|
||||
if (
|
||||
activeRealIndex < 0 ||
|
||||
overRealIndex < 0 ||
|
||||
activeRealIndex === overRealIndex
|
||||
) {
|
||||
return
|
||||
}
|
||||
|
||||
return arrayMove(prev, activeRealIndex, overRealIndex)
|
||||
})
|
||||
setList(arrayMove(list, activeRealIndex, overRealIndex))
|
||||
}
|
||||
|
||||
const fetchContent = useCallback(async () => {
|
||||
@@ -749,9 +748,8 @@ export const RulesEditorViewer = (props: Props) => {
|
||||
onClick={() => {
|
||||
try {
|
||||
const raw = validateRule()
|
||||
setPrependSeq((prev) =>
|
||||
prev.includes(raw) ? prev : [raw, ...prev],
|
||||
)
|
||||
if (prependSeq.includes(raw)) return
|
||||
setPrependSeq([raw, ...prependSeq])
|
||||
} catch (err: any) {
|
||||
showNotice.error(err)
|
||||
}
|
||||
@@ -768,9 +766,8 @@ export const RulesEditorViewer = (props: Props) => {
|
||||
onClick={() => {
|
||||
try {
|
||||
const raw = validateRule()
|
||||
setAppendSeq((prev) =>
|
||||
prev.includes(raw) ? prev : [...prev, raw],
|
||||
)
|
||||
if (appendSeq.includes(raw)) return
|
||||
setAppendSeq([...appendSeq, raw])
|
||||
} catch (err: any) {
|
||||
showNotice.error(err)
|
||||
}
|
||||
|
||||
@@ -57,6 +57,8 @@ const chainPointerSensor = PointerSensor.configure({
|
||||
activationConstraints: () => undefined,
|
||||
})
|
||||
|
||||
const CHAIN_SENSORS = [chainPointerSensor, KeyboardSensor]
|
||||
|
||||
type RuntimeConfigWithProxySequence = IConfigData & { proxies?: unknown }
|
||||
|
||||
interface ProxyChainProps {
|
||||
@@ -665,10 +667,7 @@ export const ProxyChain = ({
|
||||
</Button>
|
||||
</Box>
|
||||
) : (
|
||||
<DragDropProvider
|
||||
sensors={[chainPointerSensor, KeyboardSensor]}
|
||||
onDragEnd={handleDragEnd}
|
||||
>
|
||||
<DragDropProvider sensors={CHAIN_SENSORS} onDragEnd={handleDragEnd}>
|
||||
<Box sx={{ borderRadius: 1, minHeight: 60, p: 1 }}>
|
||||
{currentProxyChain.map((proxy, index) => (
|
||||
<SortableProxyChainItem
|
||||
|
||||
@@ -17,7 +17,7 @@ import {
|
||||
} from '@mui/material'
|
||||
import { useLockFn } from 'ahooks'
|
||||
import dayjs from 'dayjs'
|
||||
import { useState } from 'react'
|
||||
import { useMemo, useState } from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
import { updateRuleProvider } from 'tauri-plugin-mihomo-api'
|
||||
|
||||
@@ -42,6 +42,11 @@ 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>>({})
|
||||
|
||||
@@ -166,121 +171,119 @@ export const ProviderButton = () => {
|
||||
|
||||
<DialogContent>
|
||||
<List sx={{ py: 0, minHeight: 250 }}>
|
||||
{Object.entries(ruleProviders || {})
|
||||
.sort()
|
||||
.map(([key, item]) => {
|
||||
const provider = item
|
||||
const time = dayjs(provider.updatedAt)
|
||||
const isUpdating = updating[key]
|
||||
{sortedProviderEntries.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>
|
||||
return {
|
||||
backgroundColor: bgcolor,
|
||||
'&:hover': {
|
||||
backgroundColor: hoverColor,
|
||||
borderColor: alpha(primary.main, 0.3),
|
||||
},
|
||||
}
|
||||
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',
|
||||
}}
|
||||
>
|
||||
<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={{
|
||||
animation: isUpdating
|
||||
? 'spin 1s linear infinite'
|
||||
: 'none',
|
||||
'@keyframes spin': {
|
||||
'0%': { transform: 'rotate(0deg)' },
|
||||
'100%': { transform: 'rotate(360deg)' },
|
||||
},
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
title={t('rules.page.provider.actions.update')}
|
||||
>
|
||||
<RefreshRounded />
|
||||
</IconButton>
|
||||
</Box>
|
||||
</ListItem>
|
||||
)
|
||||
})}
|
||||
<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',
|
||||
}}
|
||||
>
|
||||
<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 { useRef, useState, type Ref } from 'react'
|
||||
import { useState, type Ref } from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import { BaseDialog, DialogRef, Switch } from '@/components/base'
|
||||
@@ -26,10 +26,6 @@ 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()
|
||||
@@ -100,11 +96,7 @@ export function ControllerViewer({ ref }: { ref?: Ref<DialogRef> }) {
|
||||
try {
|
||||
await navigator.clipboard.writeText(text)
|
||||
setCopySuccess(type)
|
||||
clearTimeout(copySuccessTimerRef.current)
|
||||
copySuccessTimerRef.current = setTimeout(
|
||||
() => setCopySuccess(null),
|
||||
2000,
|
||||
)
|
||||
setTimeout(() => setCopySuccess(null))
|
||||
} catch (err) {
|
||||
console.warn('[ControllerViewer] copy to clipboard failed:', err)
|
||||
showNotice.error(
|
||||
|
||||
@@ -42,6 +42,8 @@ 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)
|
||||
@@ -132,7 +134,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] ?? []}
|
||||
value={hotkeyMap[func] ?? EMPTY_KEYS}
|
||||
onChange={(v) => setHotkeyMap((m) => ({ ...m, [func]: v }))}
|
||||
/>
|
||||
</ItemWrapper>
|
||||
|
||||
@@ -14,10 +14,16 @@ 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, useRef, useState } from 'react'
|
||||
import { forwardRef, useEffect, useState } from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import { BaseDialog, DialogRef, Switch, TooltipIcon } from '@/components/base'
|
||||
import {
|
||||
BaseDialog,
|
||||
DialogRef,
|
||||
Switch,
|
||||
TooltipIcon,
|
||||
switchChangeValue,
|
||||
} 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'
|
||||
@@ -62,16 +68,9 @@ 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()
|
||||
@@ -111,7 +110,6 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
close: () => setOpen(false),
|
||||
}))
|
||||
|
||||
const onSwitchFormat = (_e: any, value: boolean) => value
|
||||
const onError = (err: any) => {
|
||||
showNotice.error(err)
|
||||
}
|
||||
@@ -141,7 +139,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={decorated}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={async () => {
|
||||
await toggleDecorations()
|
||||
}}
|
||||
@@ -158,7 +156,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.traffic_graph ?? true}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={(e) => onChangeData({ traffic_graph: e })}
|
||||
onGuard={(e) => patchVerge({ traffic_graph: e })}
|
||||
>
|
||||
@@ -174,7 +172,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.enable_memory_usage ?? true}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={(e) => onChangeData({ enable_memory_usage: e })}
|
||||
onGuard={(e) => patchVerge({ enable_memory_usage: e })}
|
||||
>
|
||||
@@ -192,7 +190,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.enable_group_icon ?? true}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={(e) => onChangeData({ enable_group_icon: e })}
|
||||
onGuard={(e) => patchVerge({ enable_group_icon: e })}
|
||||
>
|
||||
@@ -210,7 +208,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.pause_render_traffic_stats_on_blur ?? true}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={(e) =>
|
||||
onChangeData({ pause_render_traffic_stats_on_blur: e })
|
||||
}
|
||||
@@ -278,7 +276,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.enable_hover_jump_navigator ?? true}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={(e) => onChangeData({ enable_hover_jump_navigator: e })}
|
||||
onGuard={(e) => patchVerge({ enable_hover_jump_navigator: e })}
|
||||
>
|
||||
@@ -380,7 +378,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.collapse_navbar ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={(e) => onChangeData({ collapse_navbar: e })}
|
||||
onGuard={(e) => patchVerge({ collapse_navbar: e })}
|
||||
>
|
||||
@@ -427,7 +425,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.enable_tray_speed ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={(e) => onChangeData({ enable_tray_speed: e })}
|
||||
onGuard={(e) => patchVerge({ enable_tray_speed: e })}
|
||||
>
|
||||
@@ -447,7 +445,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={(e) => onChangeData({ enable_tray_icon: e })}
|
||||
onGuard={(e) => patchVerge({ enable_tray_icon: e })}
|
||||
>
|
||||
@@ -501,7 +499,7 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
|
||||
value={verge?.tray_inline_outbound_modes ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
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, useState } from 'react'
|
||||
import { forwardRef, useMemo, useState } from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import { BaseDialog, DialogRef, Switch, TooltipIcon } from '@/components/base'
|
||||
@@ -17,6 +17,20 @@ 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,
|
||||
@@ -38,6 +52,40 @@ 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))
|
||||
|
||||
@@ -104,9 +152,9 @@ export const MiscViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
}))
|
||||
}
|
||||
>
|
||||
{['trace', 'debug', 'info', 'warn', 'error', 'silent'].map((i) => (
|
||||
<MenuItem value={i} key={i}>
|
||||
{i[0].toUpperCase() + i.slice(1).toLowerCase()}
|
||||
{APP_LOG_LEVEL_OPTIONS.map(({ value, label }) => (
|
||||
<MenuItem value={value} key={value}>
|
||||
{label}
|
||||
</MenuItem>
|
||||
))}
|
||||
</Select>
|
||||
@@ -285,7 +333,7 @@ export const MiscViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
<MenuItem value={6} key={6}>
|
||||
{t('settings.modals.misc.options.proxyLayoutColumns.auto')}
|
||||
</MenuItem>
|
||||
{[1, 2, 3, 4, 5].map((i) => (
|
||||
{PROXY_LAYOUT_COLUMN_VALUES.map((i) => (
|
||||
<MenuItem value={i} key={i}>
|
||||
{i}
|
||||
</MenuItem>
|
||||
@@ -312,36 +360,7 @@ export const MiscViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
}
|
||||
>
|
||||
{/* 1: 1天, 2: 7天, 3: 30天, 4: 90天*/}
|
||||
{[
|
||||
{
|
||||
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) => (
|
||||
{autoLogCleanOptions.map((i) => (
|
||||
<MenuItem key={i.value} value={i.value}>
|
||||
{i.key}
|
||||
</MenuItem>
|
||||
|
||||
@@ -84,6 +84,19 @@ 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,
|
||||
@@ -97,8 +110,7 @@ const buildInitialValues = (verge?: IVergeConfig | null) => ({
|
||||
|
||||
export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
const { t } = useTranslation()
|
||||
const systemName = getSystem()
|
||||
const isWindows = systemName === 'windows'
|
||||
const isWindows = OS === 'windows'
|
||||
const validReg = useMemo(() => getValidReg(isWindows), [isWindows])
|
||||
|
||||
const [open, setOpen] = useState(false)
|
||||
@@ -130,17 +142,7 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
queryFn: getEmbeddedServerPort,
|
||||
})
|
||||
|
||||
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 separator = BYPASS_SEPARATOR
|
||||
|
||||
const { systemProxyAddress } = useSystemData()
|
||||
const displayedMixedPort = useDisplayedMixedPort()
|
||||
@@ -503,7 +505,7 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
checked={value.use_default}
|
||||
onChange={(_, e) => {
|
||||
if (!e && !value.bypass) {
|
||||
const nextBypass = defaultBypass()
|
||||
const nextBypass = DEFAULT_BYPASS
|
||||
setValue((v) => ({
|
||||
...v,
|
||||
use_default: e,
|
||||
@@ -575,7 +577,7 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
|
||||
/>
|
||||
<Box sx={{ padding: '0 2px 5px' }}>
|
||||
<Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 1 }}>
|
||||
{splitBypass(defaultBypass()).map((item) => (
|
||||
{DEFAULT_BYPASS_CHIPS.map((item) => (
|
||||
<Chip key={item} label={item} size="small" />
|
||||
))}
|
||||
</Box>
|
||||
|
||||
@@ -20,6 +20,12 @@ 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()
|
||||
@@ -45,12 +51,6 @@ 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 { useState } from 'react'
|
||||
import { useMemo, useState } from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import {
|
||||
@@ -58,8 +58,9 @@ export function TunViewer({ ref }: { ref?: Ref<DialogRef> }) {
|
||||
dnsMode: '',
|
||||
})
|
||||
|
||||
const routeExcludeAddressItems = splitRouteExcludeAddress(
|
||||
values.routeExcludeAddress,
|
||||
const routeExcludeAddressItems = useMemo(
|
||||
() => splitRouteExcludeAddress(values.routeExcludeAddress),
|
||||
[values.routeExcludeAddress],
|
||||
)
|
||||
const routeExcludeAddressError =
|
||||
values.autoRoute &&
|
||||
|
||||
@@ -189,10 +189,7 @@ export function UpdateViewer({ ref }: { ref?: Ref<DialogRef> }) {
|
||||
void openExternalUrl(url).catch(showNotice.error)
|
||||
}
|
||||
|
||||
const progress = useMemo(() => {
|
||||
if (total <= 0) return 0
|
||||
return Math.min((downloaded / total) * 100, 100)
|
||||
}, [downloaded, total])
|
||||
const progress = total <= 0 ? 0 : Math.min((downloaded / total) * 100, 100)
|
||||
|
||||
useImperativeHandle(ref, () => ({
|
||||
open: () => {
|
||||
|
||||
@@ -5,7 +5,13 @@ import { useRef, useState } from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
import { updateGeo, type LogLevel } from 'tauri-plugin-mihomo-api'
|
||||
|
||||
import { BaseDialog, DialogRef, Switch, TooltipIcon } from '@/components/base'
|
||||
import {
|
||||
BaseDialog,
|
||||
DialogRef,
|
||||
Switch,
|
||||
TooltipIcon,
|
||||
switchChangeValue,
|
||||
} from '@/components/base'
|
||||
import { useClash } from '@/hooks/use-clash'
|
||||
import { useClashLog } from '@/hooks/use-clash-log'
|
||||
import { useDisplayedMixedPort } from '@/hooks/use-displayed-mixed-port'
|
||||
@@ -69,7 +75,6 @@ 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)
|
||||
}
|
||||
@@ -173,7 +178,7 @@ const SettingClash = ({ onError }: Props) => {
|
||||
value={allowLan ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={(e) => onChangeData({ 'allow-lan': e })}
|
||||
onGuard={(e) => patchClash({ 'allow-lan': e })}
|
||||
>
|
||||
@@ -213,7 +218,7 @@ const SettingClash = ({ onError }: Props) => {
|
||||
value={ipv6 ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={(e) => onChangeData({ ipv6: e })}
|
||||
onGuard={(e) => patchClash({ ipv6: e })}
|
||||
>
|
||||
@@ -235,7 +240,7 @@ const SettingClash = ({ onError }: Props) => {
|
||||
value={unifiedDelay ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={(e) => onChangeData({ 'unified-delay': e })}
|
||||
onGuard={(e) => patchClash({ 'unified-delay': e })}
|
||||
>
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import { Box } from '@mui/material'
|
||||
import React from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import { Switch, TooltipIcon } from '@/components/base'
|
||||
import { Switch, TooltipIcon, switchChangeValue } from '@/components/base'
|
||||
import ProxyControlSwitches from '@/components/shared/proxy-control-switches'
|
||||
import { useVerge } from '@/hooks/use-verge'
|
||||
|
||||
@@ -20,10 +19,6 @@ 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 })
|
||||
}
|
||||
@@ -52,7 +47,7 @@ const SettingSystem = ({ onError }: Props) => {
|
||||
value={enable_auto_launch ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={(e) => {
|
||||
onChangeData({ enable_auto_launch: e })
|
||||
}}
|
||||
@@ -85,7 +80,7 @@ const SettingSystem = ({ onError }: Props) => {
|
||||
value={enable_silent_start ?? false}
|
||||
valueProps="checked"
|
||||
onCatch={onError}
|
||||
onFormat={onSwitchFormat}
|
||||
onFormat={switchChangeValue}
|
||||
onChange={(e) => onChangeData({ enable_silent_start: e })}
|
||||
onGuard={(e) => patchVerge({ enable_silent_start: e })}
|
||||
>
|
||||
|
||||
+22
-12
@@ -1,5 +1,6 @@
|
||||
import { useLockFn } from 'ahooks'
|
||||
import i18n from 'i18next'
|
||||
import { useCallback } from 'react'
|
||||
import { getVersion } from 'tauri-plugin-mihomo-api'
|
||||
|
||||
import {
|
||||
@@ -86,23 +87,29 @@ export const useClashMode = (shouldFetch: boolean = true) => {
|
||||
}
|
||||
|
||||
export const useClash = () => {
|
||||
const { data: clash, refetch } = useRuntimeConfig()
|
||||
const { data: clash } = useRuntimeConfig()
|
||||
|
||||
const { data: versionData, refetch: mutateVersion } = useQuery({
|
||||
queryKey: ['getVersion'],
|
||||
queryFn: getVersion,
|
||||
})
|
||||
|
||||
const mutateClash = (updater?: MutateClashUpdater, revalidate?: boolean) => {
|
||||
if (updater === undefined) {
|
||||
return refetch()
|
||||
}
|
||||
void setCacheData<IConfigData>(['getRuntimeConfig'], updater)
|
||||
if (revalidate !== false) {
|
||||
return refetch()
|
||||
}
|
||||
return Promise.resolve()
|
||||
}
|
||||
// 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 patchClash = useLockFn(async (patch: Partial<IConfigData>) => {
|
||||
await mutate(() => patchClashConfig(patch), {
|
||||
@@ -143,7 +150,10 @@ export const useClashInfo = () => {
|
||||
})
|
||||
})
|
||||
|
||||
const invalidateClashConfig = () => revalidateQuery(['getClashConfig'])
|
||||
const invalidateClashConfig = useCallback(
|
||||
() => revalidateQuery(['getClashConfig']),
|
||||
[],
|
||||
)
|
||||
|
||||
return {
|
||||
clashInfo,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useCallback, useSyncExternalStore } from 'react'
|
||||
import { useCallback, useMemo, 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 = JSON.stringify(groups)
|
||||
const groupKey = useMemo(() => JSON.stringify(groups), [groups])
|
||||
|
||||
const subscribe = useCallback(
|
||||
(onSettle: () => void) => {
|
||||
|
||||
@@ -48,14 +48,10 @@ 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 = vergeRef.current?.enable_system_proxy ?? false
|
||||
let confirmed = verge?.enable_system_proxy ?? false
|
||||
mutateVerge((prev) =>
|
||||
prev ? { ...prev, enable_system_proxy: enabled } : prev,
|
||||
)
|
||||
@@ -73,7 +69,7 @@ export const useSystemProxyState = () => {
|
||||
errorNotice: false,
|
||||
})
|
||||
confirmed = target
|
||||
if (!target && vergeRef.current?.auto_close_connection) {
|
||||
if (!target && verge?.auto_close_connection) {
|
||||
await mutate(() => closeAllConnections(), {
|
||||
id: 'close-all-connections',
|
||||
errorNotice: false,
|
||||
|
||||
@@ -177,13 +177,15 @@ 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(regex)
|
||||
const result = log.match(CLASH_LOG_REGEX)
|
||||
if (result) {
|
||||
const [_, _time, type, payload] = result
|
||||
const time = dayjs(_time).format('MM-DD HH:mm:ss')
|
||||
@@ -191,7 +193,7 @@ export async function getClashLogs() {
|
||||
return acc
|
||||
}
|
||||
|
||||
const result2 = log.match(newRegex)
|
||||
const result2 = log.match(CLASH_LOG_NEW_REGEX)
|
||||
if (result2) {
|
||||
const [_, time, type, payload] = result2
|
||||
acc.push({ time, type, payload })
|
||||
|
||||
@@ -514,9 +514,21 @@ export function hideNotice(id: number) {
|
||||
}
|
||||
|
||||
function hideNoticesByCode(code: string) {
|
||||
notices
|
||||
.filter((notice) => notice.code === code)
|
||||
.forEach(({ id }) => hideNotice(id))
|
||||
// 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()
|
||||
}
|
||||
|
||||
export function syncSidecarFailure(snapshot: SidecarFailureSnapshot) {
|
||||
|
||||
@@ -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 {
|
||||
// Check if the address is IPv4
|
||||
const ipv4Regex = /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/
|
||||
return ipv4Regex.test(address)
|
||||
return IPV4_REGEX.test(address)
|
||||
}
|
||||
|
||||
export function isIPv6(address: string): boolean {
|
||||
// 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)
|
||||
return IPV6_REGEX.test(address)
|
||||
}
|
||||
|
||||
export function decodeBase64OrOriginal(str: string): string {
|
||||
|
||||
Reference in New Issue
Block a user