diff --git a/.github/update.log b/.github/update.log
index 461a8ccae6..c5ff32f50f 100644
--- a/.github/update.log
+++ b/.github/update.log
@@ -1028,3 +1028,4 @@ Update On Tue Jun 10 20:37:52 CEST 2025
Update On Wed Jun 11 20:39:57 CEST 2025
Update On Fri Jun 13 20:38:23 CEST 2025
Update On Sat Jun 14 20:35:08 CEST 2025
+Update On Sun Jun 15 20:35:35 CEST 2025
diff --git a/clash-nyanpasu/frontend/nyanpasu/package.json b/clash-nyanpasu/frontend/nyanpasu/package.json
index d245f1214e..3de2a05a98 100644
--- a/clash-nyanpasu/frontend/nyanpasu/package.json
+++ b/clash-nyanpasu/frontend/nyanpasu/package.json
@@ -55,7 +55,7 @@
"@csstools/normalize.css": "12.1.1",
"@emotion/babel-plugin": "11.13.5",
"@emotion/react": "11.14.0",
- "@iconify/json": "2.2.347",
+ "@iconify/json": "2.2.349",
"@monaco-editor/react": "4.7.0",
"@tanstack/react-query": "5.80.6",
"@tanstack/react-router": "1.120.20",
diff --git a/clash-nyanpasu/manifest/version.json b/clash-nyanpasu/manifest/version.json
index 6654ae42d4..4bcd1f95a0 100644
--- a/clash-nyanpasu/manifest/version.json
+++ b/clash-nyanpasu/manifest/version.json
@@ -2,7 +2,7 @@
"manifest_version": 1,
"latest": {
"mihomo": "v1.19.10",
- "mihomo_alpha": "alpha-93ca185",
+ "mihomo_alpha": "alpha-c60750d",
"clash_rs": "v0.8.0",
"clash_premium": "2023-09-05-gdcc8d87",
"clash_rs_alpha": "0.8.0-alpha+sha.22dc4d9"
@@ -69,5 +69,5 @@
"linux-armv7hf": "clash-armv7-unknown-linux-gnueabihf"
}
},
- "updated_at": "2025-06-13T22:21:03.711Z"
+ "updated_at": "2025-06-14T22:21:02.626Z"
}
diff --git a/clash-nyanpasu/package.json b/clash-nyanpasu/package.json
index 1f36e5dda2..47501b7ea3 100644
--- a/clash-nyanpasu/package.json
+++ b/clash-nyanpasu/package.json
@@ -88,7 +88,7 @@
"lint-staged": "16.1.0",
"neostandard": "0.12.1",
"npm-run-all2": "8.0.4",
- "postcss": "8.5.4",
+ "postcss": "8.5.5",
"postcss-html": "1.8.0",
"postcss-import": "16.1.0",
"postcss-scss": "4.0.9",
diff --git a/clash-nyanpasu/pnpm-lock.yaml b/clash-nyanpasu/pnpm-lock.yaml
index 27dab96633..a0dce6744a 100644
--- a/clash-nyanpasu/pnpm-lock.yaml
+++ b/clash-nyanpasu/pnpm-lock.yaml
@@ -54,7 +54,7 @@ importers:
version: 8.33.1(eslint@9.28.0(jiti@2.4.2))(typescript@5.8.3)
autoprefixer:
specifier: 10.4.21
- version: 10.4.21(postcss@8.5.4)
+ version: 10.4.21(postcss@8.5.5)
conventional-changelog-conventionalcommits:
specifier: 9.0.0
version: 9.0.0
@@ -113,17 +113,17 @@ importers:
specifier: 8.0.4
version: 8.0.4
postcss:
- specifier: 8.5.4
- version: 8.5.4
+ specifier: 8.5.5
+ version: 8.5.5
postcss-html:
specifier: 1.8.0
version: 1.8.0
postcss-import:
specifier: 16.1.0
- version: 16.1.0(postcss@8.5.4)
+ version: 16.1.0(postcss@8.5.5)
postcss-scss:
specifier: 4.0.9
- version: 4.0.9(postcss@8.5.4)
+ version: 4.0.9(postcss@8.5.5)
prettier:
specifier: 3.5.3
version: 3.5.3
@@ -337,8 +337,8 @@ importers:
specifier: 11.14.0
version: 11.14.0(@types/react@19.1.6)(react@19.1.0)
'@iconify/json':
- specifier: 2.2.347
- version: 2.2.347
+ specifier: 2.2.349
+ version: 2.2.349
'@monaco-editor/react':
specifier: 4.7.0
version: 4.7.0(monaco-editor@0.52.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
@@ -440,7 +440,7 @@ importers:
version: 3.2.2(vite@6.3.5(@types/node@22.15.30)(jiti@2.4.2)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.88.0)(sass@1.83.0)(stylus@0.62.0)(terser@5.36.0)(tsx@4.19.4)(yaml@2.8.0))
vite-plugin-sass-dts:
specifier: 1.3.31
- version: 1.3.31(postcss@8.5.4)(prettier@3.5.3)(sass-embedded@1.88.0)(vite@6.3.5(@types/node@22.15.30)(jiti@2.4.2)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.88.0)(sass@1.83.0)(stylus@0.62.0)(terser@5.36.0)(tsx@4.19.4)(yaml@2.8.0))
+ version: 1.3.31(postcss@8.5.5)(prettier@3.5.3)(sass-embedded@1.88.0)(vite@6.3.5(@types/node@22.15.30)(jiti@2.4.2)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.88.0)(sass@1.83.0)(stylus@0.62.0)(terser@5.36.0)(tsx@4.19.4)(yaml@2.8.0))
vite-plugin-svgr:
specifier: 4.3.0
version: 4.3.0(rollup@4.40.0)(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.30)(jiti@2.4.2)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.88.0)(sass@1.83.0)(stylus@0.62.0)(terser@5.36.0)(tsx@4.19.4)(yaml@2.8.0))
@@ -1652,8 +1652,8 @@ packages:
'@vue/compiler-sfc':
optional: true
- '@iconify/json@2.2.347':
- resolution: {integrity: sha512-couLr3Btp0O1omfKXqxP+/l4WoYr6vZpBs/BxBeXXT1R9dhXbEw8i8SxnO4FiiSqyIdJ3bVaBPA2tTm2ci8cKQ==}
+ '@iconify/json@2.2.349':
+ resolution: {integrity: sha512-0uWIZXsRomSeeFpAGTlOtt6q9U4wfh4ghS7uBaXytNcVrklAXTDRqrH5tjbMCfLUSBTCEoF70UzrMCg012U7/g==}
'@iconify/types@2.0.0':
resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
@@ -6118,11 +6118,6 @@ packages:
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
hasBin: true
- nanoid@3.3.8:
- resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==}
- engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
- hasBin: true
-
nanoid@5.1.5:
resolution: {integrity: sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==}
engines: {node: ^18 || >=20}
@@ -6538,16 +6533,8 @@ packages:
postcss-value-parser@4.2.0:
resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
- postcss@8.4.47:
- resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==}
- engines: {node: ^10 || ^12 || >=14}
-
- postcss@8.5.3:
- resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}
- engines: {node: ^10 || ^12 || >=14}
-
- postcss@8.5.4:
- resolution: {integrity: sha512-QSa9EBe+uwlGTFmHsPKokv3B/oEMQZxfqW0QqNCyhpa6mB1afzulwn8hihglqAb2pOw+BJgNlmXQ8la2VeHB7w==}
+ postcss@8.5.5:
+ resolution: {integrity: sha512-d/jtm+rdNT8tpXuHY5MMtcbJFBkhXE6593XVR9UoGCH8jSFGci7jGvMGH5RYd5PBJW+00NZQt6gf7CbagJCrhg==}
engines: {node: ^10 || ^12 || >=14}
prelude-ls@1.2.1:
@@ -9413,7 +9400,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@iconify/json@2.2.347':
+ '@iconify/json@2.2.349':
dependencies:
'@iconify/types': 2.0.0
pathe: 1.1.2
@@ -10435,7 +10422,7 @@ snapshots:
'@alloc/quick-lru': 5.2.0
'@tailwindcss/node': 4.1.8
'@tailwindcss/oxide': 4.1.8
- postcss: 8.5.4
+ postcss: 8.5.5
tailwindcss: 4.1.8
'@tanstack/history@1.120.17': {}
@@ -10890,11 +10877,11 @@ snapshots:
'@types/postcss-modules-local-by-default@4.0.2':
dependencies:
- postcss: 8.5.4
+ postcss: 8.5.5
'@types/postcss-modules-scope@3.0.4':
dependencies:
- postcss: 8.5.4
+ postcss: 8.5.5
'@types/prop-types@15.7.14': {}
@@ -11394,14 +11381,14 @@ snapshots:
async@3.2.6: {}
- autoprefixer@10.4.21(postcss@8.5.4):
+ autoprefixer@10.4.21(postcss@8.5.5):
dependencies:
browserslist: 4.24.4
caniuse-lite: 1.0.30001702
fraction.js: 4.3.7
normalize-range: 0.1.2
picocolors: 1.1.1
- postcss: 8.5.4
+ postcss: 8.5.5
postcss-value-parser: 4.2.0
available-typed-arrays@1.0.7:
@@ -13320,9 +13307,9 @@ snapshots:
dependencies:
safer-buffer: 2.1.2
- icss-utils@5.1.0(postcss@8.4.47):
+ icss-utils@5.1.0(postcss@8.5.5):
dependencies:
- postcss: 8.4.47
+ postcss: 8.5.5
ieee754@1.2.1: {}
@@ -14346,8 +14333,6 @@ snapshots:
nanoid@3.3.11: {}
- nanoid@3.3.8: {}
-
nanoid@5.1.5: {}
natural-compare@1.4.0: {}
@@ -14714,59 +14699,59 @@ snapshots:
dependencies:
htmlparser2: 8.0.2
js-tokens: 9.0.1
- postcss: 8.5.4
- postcss-safe-parser: 6.0.0(postcss@8.5.4)
+ postcss: 8.5.5
+ postcss-safe-parser: 6.0.0(postcss@8.5.5)
- postcss-import@16.1.0(postcss@8.5.4):
+ postcss-import@16.1.0(postcss@8.5.5):
dependencies:
- postcss: 8.5.4
+ postcss: 8.5.5
postcss-value-parser: 4.2.0
read-cache: 1.0.0
resolve: 1.22.8
- postcss-js@4.0.1(postcss@8.5.4):
+ postcss-js@4.0.1(postcss@8.5.5):
dependencies:
camelcase-css: 2.0.1
- postcss: 8.5.4
+ postcss: 8.5.5
- postcss-load-config@3.1.4(postcss@8.4.47):
+ postcss-load-config@3.1.4(postcss@8.5.5):
dependencies:
lilconfig: 2.1.0
yaml: 1.10.2
optionalDependencies:
- postcss: 8.4.47
+ postcss: 8.5.5
postcss-media-query-parser@0.2.3: {}
- postcss-modules-extract-imports@3.1.0(postcss@8.4.47):
+ postcss-modules-extract-imports@3.1.0(postcss@8.5.5):
dependencies:
- postcss: 8.4.47
+ postcss: 8.5.5
- postcss-modules-local-by-default@4.0.5(postcss@8.4.47):
+ postcss-modules-local-by-default@4.0.5(postcss@8.5.5):
dependencies:
- icss-utils: 5.1.0(postcss@8.4.47)
- postcss: 8.4.47
+ icss-utils: 5.1.0(postcss@8.5.5)
+ postcss: 8.5.5
postcss-selector-parser: 6.1.2
postcss-value-parser: 4.2.0
- postcss-modules-scope@3.2.0(postcss@8.4.47):
+ postcss-modules-scope@3.2.0(postcss@8.5.5):
dependencies:
- postcss: 8.4.47
+ postcss: 8.5.5
postcss-selector-parser: 6.1.2
postcss-resolve-nested-selector@0.1.6: {}
- postcss-safe-parser@6.0.0(postcss@8.5.4):
+ postcss-safe-parser@6.0.0(postcss@8.5.5):
dependencies:
- postcss: 8.5.4
+ postcss: 8.5.5
- postcss-safe-parser@7.0.1(postcss@8.5.4):
+ postcss-safe-parser@7.0.1(postcss@8.5.5):
dependencies:
- postcss: 8.5.4
+ postcss: 8.5.5
- postcss-scss@4.0.9(postcss@8.5.4):
+ postcss-scss@4.0.9(postcss@8.5.5):
dependencies:
- postcss: 8.5.4
+ postcss: 8.5.5
postcss-selector-parser@6.1.2:
dependencies:
@@ -14778,29 +14763,17 @@ snapshots:
cssesc: 3.0.0
util-deprecate: 1.0.2
- postcss-sorting@8.0.2(postcss@8.5.4):
+ postcss-sorting@8.0.2(postcss@8.5.5):
dependencies:
- postcss: 8.5.4
+ postcss: 8.5.5
- postcss-sorting@9.1.0(postcss@8.5.4):
+ postcss-sorting@9.1.0(postcss@8.5.5):
dependencies:
- postcss: 8.5.4
+ postcss: 8.5.5
postcss-value-parser@4.2.0: {}
- postcss@8.4.47:
- dependencies:
- nanoid: 3.3.8
- picocolors: 1.1.1
- source-map-js: 1.2.1
-
- postcss@8.5.3:
- dependencies:
- nanoid: 3.3.8
- picocolors: 1.1.1
- source-map-js: 1.2.1
-
- postcss@8.5.4:
+ postcss@8.5.5:
dependencies:
nanoid: 3.3.11
picocolors: 1.1.1
@@ -15680,14 +15653,14 @@ snapshots:
stylelint-order@6.0.4(stylelint@16.20.0(typescript@5.8.3)):
dependencies:
- postcss: 8.5.4
- postcss-sorting: 8.0.2(postcss@8.5.4)
+ postcss: 8.5.5
+ postcss-sorting: 8.0.2(postcss@8.5.5)
stylelint: 16.20.0(typescript@5.8.3)
stylelint-order@7.0.0(stylelint@16.20.0(typescript@5.8.3)):
dependencies:
- postcss: 8.5.4
- postcss-sorting: 9.1.0(postcss@8.5.4)
+ postcss: 8.5.5
+ postcss-sorting: 9.1.0(postcss@8.5.5)
stylelint: 16.20.0(typescript@5.8.3)
stylelint-scss@6.12.0(stylelint@16.20.0(typescript@5.8.3)):
@@ -15731,9 +15704,9 @@ snapshots:
micromatch: 4.0.8
normalize-path: 3.0.0
picocolors: 1.1.1
- postcss: 8.5.4
+ postcss: 8.5.5
postcss-resolve-nested-selector: 0.1.6
- postcss-safe-parser: 7.0.1(postcss@8.5.4)
+ postcss-safe-parser: 7.0.1(postcss@8.5.5)
postcss-selector-parser: 7.1.0
postcss-value-parser: 4.2.0
resolve-from: 5.0.0
@@ -16037,14 +16010,14 @@ snapshots:
'@types/postcss-modules-local-by-default': 4.0.2
'@types/postcss-modules-scope': 3.0.4
dotenv: 16.4.5
- icss-utils: 5.1.0(postcss@8.4.47)
+ icss-utils: 5.1.0(postcss@8.5.5)
less: 4.2.0
lodash.camelcase: 4.3.0
- postcss: 8.4.47
- postcss-load-config: 3.1.4(postcss@8.4.47)
- postcss-modules-extract-imports: 3.1.0(postcss@8.4.47)
- postcss-modules-local-by-default: 4.0.5(postcss@8.4.47)
- postcss-modules-scope: 3.2.0(postcss@8.4.47)
+ postcss: 8.5.5
+ postcss-load-config: 3.1.4(postcss@8.5.5)
+ postcss-modules-extract-imports: 3.1.0(postcss@8.5.5)
+ postcss-modules-local-by-default: 4.0.5(postcss@8.5.5)
+ postcss-modules-scope: 3.2.0(postcss@8.5.5)
reserved-words: 0.1.2
sass: 1.83.0
source-map-js: 1.2.1
@@ -16313,10 +16286,10 @@ snapshots:
pathe: 0.2.0
vite: 6.3.5(@types/node@22.15.30)(jiti@2.4.2)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.88.0)(sass@1.83.0)(stylus@0.62.0)(terser@5.36.0)(tsx@4.19.4)(yaml@2.8.0)
- vite-plugin-sass-dts@1.3.31(postcss@8.5.4)(prettier@3.5.3)(sass-embedded@1.88.0)(vite@6.3.5(@types/node@22.15.30)(jiti@2.4.2)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.88.0)(sass@1.83.0)(stylus@0.62.0)(terser@5.36.0)(tsx@4.19.4)(yaml@2.8.0)):
+ vite-plugin-sass-dts@1.3.31(postcss@8.5.5)(prettier@3.5.3)(sass-embedded@1.88.0)(vite@6.3.5(@types/node@22.15.30)(jiti@2.4.2)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.88.0)(sass@1.83.0)(stylus@0.62.0)(terser@5.36.0)(tsx@4.19.4)(yaml@2.8.0)):
dependencies:
- postcss: 8.5.4
- postcss-js: 4.0.1(postcss@8.5.4)
+ postcss: 8.5.5
+ postcss-js: 4.0.1(postcss@8.5.5)
prettier: 3.5.3
sass-embedded: 1.88.0
vite: 6.3.5(@types/node@22.15.30)(jiti@2.4.2)(less@4.2.0)(lightningcss@1.30.1)(sass-embedded@1.88.0)(sass@1.83.0)(stylus@0.62.0)(terser@5.36.0)(tsx@4.19.4)(yaml@2.8.0)
@@ -16348,7 +16321,7 @@ snapshots:
esbuild: 0.25.0
fdir: 6.4.4(picomatch@4.0.2)
picomatch: 4.0.2
- postcss: 8.5.3
+ postcss: 8.5.5
rollup: 4.40.0
tinyglobby: 0.2.13
optionalDependencies:
diff --git a/clash-verge-rev/UPDATELOG.md b/clash-verge-rev/UPDATELOG.md
index 0db4fc6d2b..0b55cdb76d 100644
--- a/clash-verge-rev/UPDATELOG.md
+++ b/clash-verge-rev/UPDATELOG.md
@@ -38,6 +38,7 @@
- 修复提权漏洞，改用带认证的 IPC 通信机制
- 修复静默启动无法使用自动轻量模式
- 修复 JS 脚本转义特殊字符报错
+- 修复 macOS 静默启动时异常启动 Dock 栏图标
---
diff --git a/clash-verge-rev/src-tauri/src/core/hotkey.rs b/clash-verge-rev/src-tauri/src/core/hotkey.rs
index b356ecde2d..b8f87d8fbd 100755
--- a/clash-verge-rev/src-tauri/src/core/hotkey.rs
+++ b/clash-verge-rev/src-tauri/src/core/hotkey.rs
@@ -153,66 +153,76 @@ impl Hotkey {
"=== Hotkey Dashboard Window Operation Start ==="
);
- // 使用异步操作避免阻塞
- AsyncHandler::spawn(move || async move {
+ // 检查是否在轻量模式下，如果是，需要同步处理
+ if crate::module::lightweight::is_in_lightweight_mode() {
logging!(
- debug,
+ info,
Type::Hotkey,
true,
- "Toggle dashboard window visibility"
+ "In lightweight mode, calling open_or_close_dashboard directly"
);
+ crate::feat::open_or_close_dashboard();
+ } else {
+ AsyncHandler::spawn(move || async move {
+ logging!(
+ debug,
+ Type::Hotkey,
+ true,
+ "Toggle dashboard window visibility (async)"
+ );
- // 检查窗口是否存在
- if let Some(window) = handle::Handle::global().get_window() {
- // 如果窗口可见，则隐藏
- match window.is_visible() {
- Ok(visible) => {
- if visible {
- logging!(
- info,
- Type::Window,
- true,
- "Window is visible, hiding it"
- );
- let _ = window.hide();
- } else {
- // 如果窗口不可见，则显示
- logging!(
- info,
- Type::Window,
- true,
- "Window is hidden, showing it"
- );
- if window.is_minimized().unwrap_or(false) {
- let _ = window.unminimize();
+ // 检查窗口是否存在
+ if let Some(window) = handle::Handle::global().get_window() {
+ // 如果窗口可见，则隐藏
+ match window.is_visible() {
+ Ok(visible) => {
+ if visible {
+ logging!(
+ info,
+ Type::Window,
+ true,
+ "Window is visible, hiding it"
+ );
+ let _ = window.hide();
+ } else {
+ // 如果窗口不可见，则显示
+ logging!(
+ info,
+ Type::Window,
+ true,
+ "Window is hidden, showing it"
+ );
+ if window.is_minimized().unwrap_or(false) {
+ let _ = window.unminimize();
+ }
+ let _ = window.show();
+ let _ = window.set_focus();
}
+ }
+ Err(e) => {
+ logging!(
+ warn,
+ Type::Window,
+ true,
+ "Failed to check window visibility: {}",
+ e
+ );
let _ = window.show();
let _ = window.set_focus();
}
}
- Err(e) => {
- logging!(
- warn,
- Type::Window,
- true,
- "Failed to check window visibility: {}",
- e
- );
- let _ = window.show();
- let _ = window.set_focus();
- }
+ } else {
+ // 如果窗口不存在，创建一个新窗口
+ logging!(
+ info,
+ Type::Window,
+ true,
+ "Window does not exist, creating a new one"
+ );
+ resolve::create_window(true);
}
- } else {
- // 如果窗口不存在，创建一个新窗口
- logging!(
- info,
- Type::Window,
- true,
- "Window does not exist, creating a new one"
- );
- resolve::create_window(true);
- }
- });
+ });
+ }
logging!(
debug,
diff --git a/clash-verge-rev/src-tauri/src/feat/window.rs b/clash-verge-rev/src-tauri/src/feat/window.rs
index 0b15f8aee2..40f3c4ca91 100644
--- a/clash-verge-rev/src-tauri/src/feat/window.rs
+++ b/clash-verge-rev/src-tauri/src/feat/window.rs
@@ -13,6 +13,19 @@ pub fn open_or_close_dashboard() {
println!("Attempting to open/close dashboard");
log::info!(target: "app", "Attempting to open/close dashboard");
+ // 检查是否在轻量模式下
+ if crate::module::lightweight::is_in_lightweight_mode() {
+ println!("Currently in lightweight mode, exiting lightweight mode");
+ log::info!(target: "app", "Currently in lightweight mode, exiting lightweight mode");
+
+ crate::module::lightweight::exit_lightweight_mode();
+
+ println!("Creating new window after exiting lightweight mode");
+ log::info!(target: "app", "Creating new window after exiting lightweight mode");
+ resolve::create_window(true);
+ return;
+ }
+
if let Some(window) = handle::Handle::global().get_window() {
println!("Found existing window");
log::info!(target: "app", "Found existing window");
@@ -175,78 +188,30 @@ async fn clean_async() -> bool {
}
pub fn clean() -> bool {
- use tokio::time::{timeout, Duration};
+ use crate::process::AsyncHandler;
- // 使用异步处理
- let rt = tokio::runtime::Runtime::new().unwrap();
- let cleanup_result = rt.block_on(async {
+ let (tx, rx) = std::sync::mpsc::channel();
+
+ AsyncHandler::spawn(move || async move {
log::info!(target: "app", "开始执行清理操作...");
- // 1. 处理TUN模式 - 并行执行，减少等待时间
- let tun_task = async {
- if Config::verge().data().enable_tun_mode.unwrap_or(false) {
- let disable_tun = serde_json::json!({
- "tun": {
- "enable": false
- }
- });
- timeout(
- Duration::from_secs(2),
- MihomoManager::global().patch_configs(disable_tun),
- )
- .await
- .is_ok()
- } else {
- true
- }
- };
+ // 使用已有的异步清理函数
+ let cleanup_result = clean_async().await;
- // 2. 系统代理重置
- let proxy_task = async {
- timeout(
- Duration::from_secs(2),
- sysopt::Sysopt::global().reset_sysproxy(),
- )
- .await
- .is_ok()
- };
-
- // 3. 核心服务停止
- let core_task = async {
- timeout(Duration::from_secs(2), CoreManager::global().stop_core())
- .await
- .is_ok()
- };
-
- // 4. DNS恢复（仅macOS）
- #[cfg(target_os = "macos")]
- let dns_task = async {
- timeout(Duration::from_millis(800), resolve::restore_public_dns())
- .await
- .is_ok()
- };
-
- // 并行执行所有清理任务，提高效率
- let (tun_success, proxy_success, core_success) =
- tokio::join!(tun_task, proxy_task, core_task);
-
- #[cfg(target_os = "macos")]
- let dns_success = dns_task.await;
- #[cfg(not(target_os = "macos"))]
- let dns_success = true;
-
- let all_success = tun_success && proxy_success && core_success && dns_success;
-
- log::info!(
- target: "app",
- "清理操作完成 - TUN: {}, 代理: {}, 核心: {}, DNS: {}, 总体: {}",
- tun_success, proxy_success, core_success, dns_success, all_success
- );
-
- all_success
+ // 发送结果
+ let _ = tx.send(cleanup_result);
});
- cleanup_result
+ match rx.recv_timeout(std::time::Duration::from_secs(8)) {
+ Ok(result) => {
+ log::info!(target: "app", "清理操作完成，结果: {}", result);
+ result
+ }
+ Err(_) => {
+ log::warn!(target: "app", "清理操作超时，返回成功状态避免阻塞");
+ true
+ }
+ }
}
#[cfg(target_os = "macos")]
diff --git a/clash-verge-rev/src-tauri/src/module/lightweight.rs b/clash-verge-rev/src-tauri/src/module/lightweight.rs
index 93a03135e7..529d006be3 100644
--- a/clash-verge-rev/src-tauri/src/module/lightweight.rs
+++ b/clash-verge-rev/src-tauri/src/module/lightweight.rs
@@ -119,6 +119,10 @@ pub fn exit_lightweight_mode() {
set_lightweight_mode(false);
logging!(info, Type::Lightweight, true, "正在退出轻量模式");
+ // macOS激活策略
+ #[cfg(target_os = "macos")]
+ AppHandleManager::global().set_activation_policy_regular();
+
// 重置UI就绪状态
crate::utils::resolve::reset_ui_ready();
}
@@ -168,19 +172,20 @@ fn cancel_window_close_listener() {
fn setup_light_weight_timer() -> Result<()> {
Timer::global().init()?;
-
- let mut timer_map = Timer::global().timer_map.write();
- let delay_timer = Timer::global().delay_timer.write();
- let mut timer_count = Timer::global().timer_count.lock();
-
- let task_id = *timer_count;
- *timer_count += 1;
-
let once_by_minutes = Config::verge()
.latest()
.auto_light_weight_minutes
.unwrap_or(10);
+ // 获取task_id
+ let task_id = {
+ let mut timer_count = Timer::global().timer_count.lock();
+ let id = *timer_count;
+ *timer_count += 1;
+ id
+ };
+
+ // 创建任务
let task = TaskBuilder::default()
.set_task_id(task_id)
.set_maximum_parallel_runnable_num(1)
@@ -191,17 +196,24 @@ fn setup_light_weight_timer() -> Result<()> {
})
.context("failed to create timer task")?;
- delay_timer
- .add_task(task)
- .context("failed to add timer task")?;
+ // 添加任务到定时器
+ {
+ let delay_timer = Timer::global().delay_timer.write();
+ delay_timer
+ .add_task(task)
+ .context("failed to add timer task")?;
+ }
- let timer_task = crate::core::timer::TimerTask {
- task_id,
- interval_minutes: once_by_minutes,
- last_run: chrono::Local::now().timestamp(),
- };
-
- timer_map.insert(LIGHT_WEIGHT_TASK_UID.to_string(), timer_task);
+ // 更新任务映射
+ {
+ let mut timer_map = Timer::global().timer_map.write();
+ let timer_task = crate::core::timer::TimerTask {
+ task_id,
+ interval_minutes: once_by_minutes,
+ last_run: chrono::Local::now().timestamp(),
+ };
+ timer_map.insert(LIGHT_WEIGHT_TASK_UID.to_string(), timer_task);
+ }
logging!(
info,
diff --git a/clash-verge-rev/src-tauri/src/utils/resolve.rs b/clash-verge-rev/src-tauri/src/utils/resolve.rs
index 576279d70e..5af3b56a37 100644
--- a/clash-verge-rev/src-tauri/src/utils/resolve.rs
+++ b/clash-verge-rev/src-tauri/src/utils/resolve.rs
@@ -1,3 +1,5 @@
+#[cfg(target_os = "macos")]
+use crate::AppHandleManager;
use crate::{
config::{Config, IVerge, PrfItem},
core::*,
@@ -218,6 +220,14 @@ pub async fn resolve_setup_async(app_handle: &AppHandle) {
// 创建窗口
let is_silent_start = { Config::verge().data().enable_silent_start }.unwrap_or(false);
+ #[cfg(target_os = "macos")]
+ {
+ if is_silent_start {
+ use crate::AppHandleManager;
+
+ AppHandleManager::global().set_activation_policy_accessory();
+ }
+ }
create_window(!is_silent_start);
// 初始化定时器
@@ -334,49 +344,72 @@ pub fn create_window(is_show: bool) -> bool {
.fullscreen(false)
.inner_size(DEFAULT_WIDTH as f64, DEFAULT_HEIGHT as f64)
.min_inner_size(520.0, 520.0)
- .visible(true) // 立即显示窗口，避免用户等待
- .initialization_script(r#"
- // 添加非侵入式的加载指示器
- document.addEventListener('DOMContentLoaded', function() {
- // 只有在React应用还没有挂载时才显示加载指示器
- if (!document.getElementById('root') || !document.getElementById('root').hasChildNodes()) {
- // 创建加载指示器，但不覆盖整个body
- const loadingDiv = document.createElement('div');
- loadingDiv.id = 'initial-loading-overlay';
- loadingDiv.innerHTML = `
-
-
-
正在加载 Clash Verge...
-
+
+
Loading Clash Verge...
+