mirror/clash-verge-rev-lite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
coolcoala
2025-08-17 16:09:48 +03:00
parent 94e785c75c 2cfd1784d8
commit 9e5c5d5e69
67 changed files with 2601 additions and 1912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/FUNDING.yml vendored
View File

@@ -1 +1,5 @@
custom: ['https://t.me/tribute/app?startapp=dtfk','https://t.me/tribute/app?startapp=dtLE'] custom:
[
"https://t.me/tribute/app?startapp=dtfk",
"https://t.me/tribute/app?startapp=dtLE",
]

3
.github/workflows/autobuild.yml vendored
View File

@@ -193,6 +193,9 @@ jobs:
- os: ubuntu-22.04 - os: ubuntu-22.04
target: x86_64-unknown-linux-gnu target: x86_64-unknown-linux-gnu
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
env:
CARGO_NET_RETRY: "5"
CARGO_HTTP_CHECK_REVOKE: "false"
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v4 uses: actions/checkout@v4

3
.github/workflows/clippy.yml vendored
View File

@@ -17,6 +17,9 @@ jobs:
target: x86_64-unknown-linux-gnu target: x86_64-unknown-linux-gnu
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
env:
CARGO_NET_RETRY: "5"
CARGO_HTTP_CHECK_REVOKE: "false"
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v4 uses: actions/checkout@v4

3
.github/workflows/dev.yml vendored
View File

@@ -28,6 +28,9 @@ jobs:
bundle: dmg bundle: dmg
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
env:
CARGO_NET_RETRY: "5"
CARGO_HTTP_CHECK_REVOKE: "false"
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v4 uses: actions/checkout@v4

3
.github/workflows/fmt.yml vendored
View File

@@ -10,6 +10,9 @@ on:
jobs: jobs:
rustfmt: rustfmt:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
CARGO_NET_RETRY: "5"
CARGO_HTTP_CHECK_REVOKE: "false"
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

1
.github/workflows/release.yml vendored
View File

@@ -603,4 +603,3 @@ jobs:
token: ${{ secrets.TELEGRAM_TOKEN }} token: ${{ secrets.TELEGRAM_TOKEN }}
message_file: release.txt message_file: release.txt
format: markdown format: markdown

1
.gitignore vendored
View File

@@ -10,3 +10,4 @@ scripts/_env.sh
.tool-versions .tool-versions
.idea .idea
.old .old
bun.lock

1
UPDATELOG.md
View File

@@ -27,7 +27,6 @@
- corrected side menu in compressed window - corrected side menu in compressed window
- added check at the main toggle switch, now it cannot be enabled if there are no profiles. - added check at the main toggle switch, now it cannot be enabled if there are no profiles.
## v0.2.1 ## v0.2.1
- added headers "announce-url", "update-always" - added headers "announce-url", "update-always"

24
hooks/use-mobile.ts
View File

@@ -1,19 +1,21 @@
import * as React from "react" import * as React from "react";
const MOBILE_BREAKPOINT = 768 const MOBILE_BREAKPOINT = 768;
export function useIsMobile() { export function useIsMobile() {
const [isMobile, setIsMobile] = React.useState<boolean | undefined>(undefined) const [isMobile, setIsMobile] = React.useState<boolean | undefined>(
undefined,
);
React.useEffect(() => { React.useEffect(() => {
const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`) const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`);
const onChange = () => { const onChange = () => {
setIsMobile(window.innerWidth < MOBILE_BREAKPOINT) setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
} };
mql.addEventListener("change", onChange) mql.addEventListener("change", onChange);
setIsMobile(window.innerWidth < MOBILE_BREAKPOINT) setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
return () => mql.removeEventListener("change", onChange) return () => mql.removeEventListener("change", onChange);
}, []) }, []);
return !!isMobile return !!isMobile;
} }

17
src-tauri/Cargo.lock generated
View File

@@ -256,6 +256,22 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
] ]
[[package]]
name = "async-compression"
version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddb939d66e4ae03cee6091612804ba446b12878410cfa17f785f4dd67d4014e8"
dependencies = [
"brotli",
"flate2",
"futures-core",
"memchr",
"pin-project-lite",
"tokio",
"zstd",
"zstd-safe",
]
[[package]] [[package]]
name = "async-executor" name = "async-executor"
version = "1.13.2" version = "1.13.2"
@@ -5853,6 +5869,7 @@ version = "0.12.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813" checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813"
dependencies = [ dependencies = [
"async-compression",
"base64 0.22.1", "base64 0.22.1",
"bytes", "bytes",
"cookie", "cookie",

2
src-tauri/Cargo.toml
View File

@@ -45,7 +45,7 @@ tokio = { version = "1.45.1", features = [
"sync", "sync",
] } ] }
serde = { version = "1.0.219", features = ["derive"] } serde = { version = "1.0.219", features = ["derive"] }
reqwest = { version = "0.12.20", features = ["json", "rustls-tls", "cookies"] } reqwest = { version = "0.12.20", features = ["json", "rustls-tls", "cookies", "brotli", "gzip", "zstd"] }
regex = "1.11.1" regex = "1.11.1"
sysproxy = { git = "https://github.com/clash-verge-rev/sysproxy-rs" } sysproxy = { git = "https://github.com/clash-verge-rev/sysproxy-rs" }
image = "0.25.6" image = "0.25.6"

12
src-tauri/src/cmd/app.rs
View File

@@ -147,7 +147,7 @@ pub async fn download_icon_cache(url: String, name: String) -> CmdResult<String>
Ok(icon_path.to_string_lossy().to_string()) Ok(icon_path.to_string_lossy().to_string())
} else { } else {
let _ = std::fs::remove_file(&temp_path); let _ = std::fs::remove_file(&temp_path);
Err(format!("下载的内容不是有效图片: {url}")) Err(format!("Downloaded content is not a valid image: {url}"))
} }
} }
@@ -209,7 +209,7 @@ pub fn copy_icon_file(path: String, icon_info: IconInfo) -> CmdResult<String> {
/// 通知UI已准备就绪 /// 通知UI已准备就绪
#[tauri::command] #[tauri::command]
pub fn notify_ui_ready() -> CmdResult<()> { pub fn notify_ui_ready() -> CmdResult<()> {
log::info!(target: "app", "前端UI已准备就绪"); log::info!(target: "app", "Frontend UI is ready");
crate::utils::resolve::mark_ui_ready(); crate::utils::resolve::mark_ui_ready();
Ok(()) Ok(())
} }
@@ -217,7 +217,7 @@ pub fn notify_ui_ready() -> CmdResult<()> {
/// UI加载阶段 /// UI加载阶段
#[tauri::command] #[tauri::command]
pub fn update_ui_stage(stage: String) -> CmdResult<()> { pub fn update_ui_stage(stage: String) -> CmdResult<()> {
log::info!(target: "app", "UI加载阶段更新: {stage}"); log::info!(target: "app", "UI loading stage updated: {stage}");
use crate::utils::resolve::UiReadyStage; use crate::utils::resolve::UiReadyStage;
@@ -228,8 +228,8 @@ pub fn update_ui_stage(stage: String) -> CmdResult<()> {
"ResourcesLoaded" => UiReadyStage::ResourcesLoaded, "ResourcesLoaded" => UiReadyStage::ResourcesLoaded,
"Ready" => UiReadyStage::Ready, "Ready" => UiReadyStage::Ready,
_ => { _ => {
log::warn!(target: "app", "未知的UI加载阶段: {stage}"); log::warn!(target: "app", "Unknown UI loading stage: {stage}");
return Err(format!("未知的UI加载阶段: {stage}")); return Err(format!("Unknown UI loading stage: {stage}"));
} }
}; };
@@ -240,7 +240,7 @@ pub fn update_ui_stage(stage: String) -> CmdResult<()> {
/// 重置UI就绪状态 /// 重置UI就绪状态
#[tauri::command] #[tauri::command]
pub fn reset_ui_ready_state() -> CmdResult<()> { pub fn reset_ui_ready_state() -> CmdResult<()> {
log::info!(target: "app", "重置UI就绪状态"); log::info!(target: "app", "Reset UI ready state");
crate::utils::resolve::reset_ui_ready(); crate::utils::resolve::reset_ui_ready();
Ok(()) Ok(())
} }

8
src-tauri/src/cmd/network.rs
View File

@@ -7,7 +7,7 @@ use serde_yaml::Mapping;
/// get the system proxy /// get the system proxy
#[tauri::command] #[tauri::command]
pub async fn get_sys_proxy() -> CmdResult<Mapping> { pub async fn get_sys_proxy() -> CmdResult<Mapping> {
log::debug!(target: "app", "异步获取系统代理配置"); log::debug!(target: "app", "Asynchronously getting system proxy configuration");
let current = AsyncProxyQuery::get_system_proxy().await; let current = AsyncProxyQuery::get_system_proxy().await;
@@ -19,14 +19,14 @@ pub async fn get_sys_proxy() -> CmdResult<Mapping> {
); );
map.insert("bypass".into(), current.bypass.into()); map.insert("bypass".into(), current.bypass.into());
log::debug!(target: "app", "返回系统代理配置: enable={}, {}:{}", current.enable, current.host, current.port); log::debug!(target: "app", "Return system proxy configuration: enable={}, {}:{}", current.enable, current.host, current.port);
Ok(map) Ok(map)
} }
/// 获取自动代理配置 /// 获取自动代理配置
#[tauri::command] #[tauri::command]
pub async fn get_auto_proxy() -> CmdResult<Mapping> { pub async fn get_auto_proxy() -> CmdResult<Mapping> {
log::debug!(target: "app", "开始获取自动代理配置（事件驱动）"); log::debug!(target: "app", "Start retrieving auto proxy configuration (event-driven)");
let proxy_manager = EventDrivenProxyManager::global(); let proxy_manager = EventDrivenProxyManager::global();
@@ -40,7 +40,7 @@ pub async fn get_auto_proxy() -> CmdResult<Mapping> {
map.insert("enable".into(), current.enable.into()); map.insert("enable".into(), current.enable.into());
map.insert("url".into(), current.url.clone().into()); map.insert("url".into(), current.url.clone().into());
log::debug!(target: "app", "返回自动代理配置（缓存）: enable={}, url={}", current.enable, current.url); log::debug!(target: "app", "Return auto proxy configuration (cached): enable={}, url={}", current.enable, current.url);
Ok(map) Ok(map)
} }

183
src-tauri/src/cmd/profile.rs
View File

@@ -6,14 +6,14 @@ use crate::{
utils::{dirs, help, logging::Type}, utils::{dirs, help, logging::Type},
wrap_err, wrap_err,
}; };
use base64::{engine::general_purpose::STANDARD, Engine as _};
use percent_encoding::percent_decode_str;
use serde_yaml::Value;
use std::collections::BTreeMap;
use std::sync::atomic::{AtomicU64, Ordering}; use std::sync::atomic::{AtomicU64, Ordering};
use std::time::Duration; use std::time::Duration;
use tokio::sync::{Mutex, RwLock}; use tokio::sync::{Mutex, RwLock};
use std::collections::BTreeMap;
use url::Url; use url::Url;
use serde_yaml::Value;
use base64::{engine::general_purpose::STANDARD, Engine as _};
use percent_encoding::percent_decode_str;
// 全局互斥锁防止并发配置更新 // 全局互斥锁防止并发配置更新
static PROFILE_UPDATE_MUTEX: Mutex<()> = Mutex::const_new(()); static PROFILE_UPDATE_MUTEX: Mutex<()> = Mutex::const_new(());
@@ -138,20 +138,34 @@ pub async fn import_profile(url: String, option: Option<PrfOption>) -> CmdResult
let profiles = Config::profiles(); let profiles = Config::profiles();
let profiles = profiles.latest(); let profiles = profiles.latest();
profiles.items.as_ref() profiles
.items
.as_ref()
.and_then(|items| items.iter().find(|item| item.url.as_deref() == Some(&url))) .and_then(|items| items.iter().find(|item| item.url.as_deref() == Some(&url)))
.and_then(|item| item.uid.clone()) .and_then(|item| item.uid.clone())
}; };
if let Some(uid) = existing_uid { if let Some(uid) = existing_uid {
logging!(info, Type::Cmd, true, "The profile with URL {} already exists (UID: {}). Running the update...", url, uid); logging!(
info,
Type::Cmd,
true,
"The profile with URL {} already exists (UID: {}). Running the update...",
url,
uid
);
update_profile(uid, option).await update_profile(uid, option).await
} else { } else {
logging!(info, Type::Cmd, true, "Profile with URL {} not found. Create a new one...", url); logging!(
info,
Type::Cmd,
true,
"Profile with URL {} not found. Create a new one...",
url
);
let item = wrap_err!(PrfItem::from_url(&url, None, None, option).await)?; let item = wrap_err!(PrfItem::from_url(&url, None, None, option).await)?;
wrap_err!(Config::profiles().data().append_item(item)) wrap_err!(Config::profiles().data().append_item(item))
} }
} }
/// 重新排序配置文件 /// 重新排序配置文件
@@ -181,20 +195,29 @@ pub async fn delete_profile(index: String) -> CmdResult {
{ {
let profiles_config = Config::profiles(); let profiles_config = Config::profiles();
let mut profiles_data = profiles_config.data(); let mut profiles_data = profiles_config.data();
should_update = profiles_data.delete_item(index.clone()).map_err(|e| e.to_string())?; should_update = profiles_data
.delete_item(index.clone())
.map_err(|e| e.to_string())?;
let was_last_profile = profiles_data.items.as_ref().map_or(true, |items| { let was_last_profile = profiles_data.items.as_ref().is_none_or(|items| {
!items.iter().any(|item| !items
item.itype == Some("remote".to_string()) || item.itype == Some("local".to_string()) .iter()
) .any(|item| matches!(item.itype.as_deref(), Some("remote") | Some("local")))
}); });
if was_last_profile { if was_last_profile {
logging!(info, Type::Cmd, true, "The last profile has been deleted. Disabling proxy modes..."); logging!(
info,
Type::Cmd,
true,
"The last profile has been deleted. Disabling proxy modes..."
);
let verge_config = Config::verge(); let verge_config = Config::verge();
let mut verge_data = verge_config.data(); let mut verge_data = verge_config.data();
if verge_data.enable_tun_mode == Some(true) || verge_data.enable_system_proxy == Some(true) { if verge_data.enable_tun_mode == Some(true)
|| verge_data.enable_system_proxy == Some(true)
{
verge_data.enable_tun_mode = Some(false); verge_data.enable_tun_mode = Some(false);
verge_data.enable_system_proxy = Some(false); verge_data.enable_system_proxy = Some(false);
verge_data.save_file().map_err(|e| e.to_string())?; verge_data.save_file().map_err(|e| e.to_string())?;
@@ -696,23 +719,30 @@ pub fn get_next_update_time(uid: String) -> CmdResult<Option<i64>> {
Ok(next_time) Ok(next_time)
} }
#[tauri::command] #[tauri::command]
pub async fn update_profiles_on_startup() -> CmdResult { pub async fn update_profiles_on_startup() -> CmdResult {
logging!(info, Type::Cmd, true, "Checking profiles for updates at startup..."); logging!(
info,
Type::Cmd,
true,
"Checking profiles for updates at startup..."
);
let profiles_to_update = { let profiles_to_update = {
let profiles = Config::profiles(); let profiles = Config::profiles();
let profiles = profiles.latest(); let profiles = profiles.latest();
profiles.items.as_ref() profiles.items.as_ref().map_or_else(Vec::new, |items| {
.map_or_else( items
Vec::new, .iter()
|items| items.iter() .filter(|item| {
.filter(|item| item.option.as_ref().is_some_and(|opt| opt.update_always == Some(true))) item.option
.as_ref()
.is_some_and(|opt| opt.update_always == Some(true))
})
.filter_map(|item| item.uid.clone()) .filter_map(|item| item.uid.clone())
.collect() .collect()
) })
}; };
if profiles_to_update.is_empty() { if profiles_to_update.is_empty() {
@@ -720,7 +750,13 @@ pub async fn update_profiles_on_startup() -> CmdResult {
return Ok(()); return Ok(());
} }
logging!(info, Type::Cmd, true, "Found profiles to update: {:?}", profiles_to_update); logging!(
info,
Type::Cmd,
true,
"Found profiles to update: {:?}",
profiles_to_update
);
let mut update_futures = Vec::new(); let mut update_futures = Vec::new();
for uid in profiles_to_update { for uid in profiles_to_update {
@@ -729,13 +765,25 @@ pub async fn update_profiles_on_startup() -> CmdResult {
let results = futures::future::join_all(update_futures).await; let results = futures::future::join_all(update_futures).await;
if results.iter().any(|res| res.is_ok()) { if results.iter().any(|res| res.is_ok()) {
logging!(info, Type::Cmd, true, "The startup update is complete, restart the kernel..."); logging!(
CoreManager::global().update_config().await.map_err(|e| e.to_string())?; info,
Type::Cmd,
true,
"The startup update is complete, restart the kernel..."
);
CoreManager::global()
.update_config()
.await
.map_err(|e| e.to_string())?;
handle::Handle::refresh_clash(); handle::Handle::refresh_clash();
} else { } else {
logging!(warn, Type::Cmd, true, "All updates completed with errors on startup."); logging!(
warn,
Type::Cmd,
true,
"All updates completed with errors on startup."
);
} }
Ok(()) Ok(())
@@ -743,7 +791,6 @@ pub async fn update_profiles_on_startup() -> CmdResult {
#[tauri::command] #[tauri::command]
pub async fn create_profile_from_share_link(link: String, template_name: String) -> CmdResult { pub async fn create_profile_from_share_link(link: String, template_name: String) -> CmdResult {
const DEFAULT_TEMPLATE: &str = r#" const DEFAULT_TEMPLATE: &str = r#"
mixed-port: 2080 mixed-port: 2080
allow-lan: true allow-lan: true
@@ -1107,14 +1154,18 @@ pub async fn create_profile_from_share_link(link: String, template_name: String)
let parsed_url = Url::parse(&link).map_err(|e| e.to_string())?; let parsed_url = Url::parse(&link).map_err(|e| e.to_string())?;
let scheme = parsed_url.scheme(); let scheme = parsed_url.scheme();
let proxy_name = parsed_url.fragment() let proxy_name = parsed_url
.fragment()
.map(|f| percent_decode_str(f).decode_utf8_lossy().to_string()) .map(|f| percent_decode_str(f).decode_utf8_lossy().to_string())
.unwrap_or_else(|| "Proxy from Link".to_string()); .unwrap_or_else(|| "Proxy from Link".to_string());
let mut proxy_map: BTreeMap<String, Value> = BTreeMap::new(); let mut proxy_map: BTreeMap<String, Value> = BTreeMap::new();
proxy_map.insert("name".into(), proxy_name.clone().into()); proxy_map.insert("name".into(), proxy_name.clone().into());
proxy_map.insert("type".into(), scheme.into()); proxy_map.insert("type".into(), scheme.into());
proxy_map.insert("server".into(), parsed_url.host_str().unwrap_or_default().into()); proxy_map.insert(
"server".into(),
parsed_url.host_str().unwrap_or_default().into(),
);
proxy_map.insert("port".into(), parsed_url.port().unwrap_or(443).into()); proxy_map.insert("port".into(), parsed_url.port().unwrap_or(443).into());
proxy_map.insert("udp".into(), true.into()); proxy_map.insert("udp".into(), true.into());
@@ -1130,16 +1181,29 @@ pub async fn create_profile_from_share_link(link: String, template_name: String)
"security" if value == "tls" => { "security" if value == "tls" => {
proxy_map.insert("tls".into(), true.into()); proxy_map.insert("tls".into(), true.into());
} }
"flow" => { proxy_map.insert("flow".into(), value.to_string().into()); } "flow" => {
"sni" => { proxy_map.insert("servername".into(), value.to_string().into()); } proxy_map.insert("flow".into(), value.to_string().into());
"fp" => { proxy_map.insert("client-fingerprint".into(), value.to_string().into()); } }
"pbk" => { reality_opts.insert("public-key".into(), value.to_string().into()); } "sni" => {
"sid" => { reality_opts.insert("short-id".into(), value.to_string().into()); } proxy_map.insert("servername".into(), value.to_string().into());
}
"fp" => {
proxy_map.insert("client-fingerprint".into(), value.to_string().into());
}
"pbk" => {
reality_opts.insert("public-key".into(), value.to_string().into());
}
"sid" => {
reality_opts.insert("short-id".into(), value.to_string().into());
}
_ => {} _ => {}
} }
} }
if !reality_opts.is_empty() { if !reality_opts.is_empty() {
proxy_map.insert("reality-opts".into(), serde_yaml::to_value(reality_opts).map_err(|e| e.to_string())?); proxy_map.insert(
"reality-opts".into(),
serde_yaml::to_value(reality_opts).map_err(|e| e.to_string())?,
);
} }
} }
"ss" => { "ss" => {
@@ -1155,19 +1219,32 @@ pub async fn create_profile_from_share_link(link: String, template_name: String)
"vmess" => { "vmess" => {
if let Ok(decoded_bytes) = STANDARD.decode(parsed_url.host_str().unwrap_or_default()) { if let Ok(decoded_bytes) = STANDARD.decode(parsed_url.host_str().unwrap_or_default()) {
if let Ok(json_str) = String::from_utf8(decoded_bytes) { if let Ok(json_str) = String::from_utf8(decoded_bytes) {
if let Ok(vmess_params) = serde_json::from_str::<BTreeMap<String, Value>>(&json_str) { if let Ok(vmess_params) =
if let Some(add) = vmess_params.get("add") { proxy_map.insert("server".into(), add.clone()); } serde_json::from_str::<BTreeMap<String, Value>>(&json_str)
if let Some(port) = vmess_params.get("port") { proxy_map.insert("port".into(), port.clone()); } {
if let Some(id) = vmess_params.get("id") { proxy_map.insert("uuid".into(), id.clone()); } if let Some(add) = vmess_params.get("add") {
if let Some(aid) = vmess_params.get("aid") { proxy_map.insert("alterId".into(), aid.clone()); } proxy_map.insert("server".into(), add.clone());
if let Some(net) = vmess_params.get("net") { proxy_map.insert("network".into(), net.clone()); } }
if let Some(ps) = vmess_params.get("ps") { proxy_map.insert("name".into(), ps.clone()); } if let Some(port) = vmess_params.get("port") {
proxy_map.insert("port".into(), port.clone());
}
if let Some(id) = vmess_params.get("id") {
proxy_map.insert("uuid".into(), id.clone());
}
if let Some(aid) = vmess_params.get("aid") {
proxy_map.insert("alterId".into(), aid.clone());
}
if let Some(net) = vmess_params.get("net") {
proxy_map.insert("network".into(), net.clone());
}
if let Some(ps) = vmess_params.get("ps") {
proxy_map.insert("name".into(), ps.clone());
} }
} }
} }
} }
_ => {
} }
_ => {}
} }
let mut config: Value = serde_yaml::from_str(template_yaml).map_err(|e| e.to_string())?; let mut config: Value = serde_yaml::from_str(template_yaml).map_err(|e| e.to_string())?;
@@ -1177,10 +1254,15 @@ pub async fn create_profile_from_share_link(link: String, template_name: String)
proxies.push(serde_yaml::to_value(proxy_map).map_err(|e| e.to_string())?); proxies.push(serde_yaml::to_value(proxy_map).map_err(|e| e.to_string())?);
} }
if let Some(groups) = config.get_mut("proxy-groups").and_then(|v| v.as_sequence_mut()) { if let Some(groups) = config
.get_mut("proxy-groups")
.and_then(|v| v.as_sequence_mut())
{
for group in groups.iter_mut() { for group in groups.iter_mut() {
if let Some(mapping) = group.as_mapping_mut() { if let Some(mapping) = group.as_mapping_mut() {
if let Some(proxies_list) = mapping.get_mut("proxies").and_then(|p| p.as_sequence_mut()) { if let Some(proxies_list) =
mapping.get_mut("proxies").and_then(|p| p.as_sequence_mut())
{
let new_proxies_list: Vec<Value> = proxies_list let new_proxies_list: Vec<Value> = proxies_list
.iter() .iter()
.map(|p| { .map(|p| {
@@ -1199,7 +1281,12 @@ pub async fn create_profile_from_share_link(link: String, template_name: String)
let new_yaml_content = serde_yaml::to_string(&config).map_err(|e| e.to_string())?; let new_yaml_content = serde_yaml::to_string(&config).map_err(|e| e.to_string())?;
let item = PrfItem::from_local(proxy_name, "Created from share link".into(), Some(new_yaml_content), None) let item = PrfItem::from_local(
proxy_name,
"Created from share link".into(),
Some(new_yaml_content),
None,
)
.map_err(|e| e.to_string())?; .map_err(|e| e.to_string())?;
wrap_err!(Config::profiles().data().append_item(item)) wrap_err!(Config::profiles().data().append_item(item))

8
src-tauri/src/cmd/proxy.rs
View File

@@ -33,7 +33,7 @@ pub async fn get_proxies() -> CmdResult<serde_json::Value> {
state.proxies = Box::new(proxies); state.proxies = Box::new(proxies);
state.need_refresh = false; state.need_refresh = false;
} }
log::debug!(target: "app", "proxies刷新成功"); log::debug!(target: "app", "Proxies refreshed successfully");
} }
let proxies = { let proxies = {
@@ -50,7 +50,7 @@ pub async fn force_refresh_proxies() -> CmdResult<serde_json::Value> {
let app_handle = handle::Handle::global().app_handle().unwrap(); let app_handle = handle::Handle::global().app_handle().unwrap();
let cmd_proxy_state = app_handle.state::<Mutex<CmdProxyState>>(); let cmd_proxy_state = app_handle.state::<Mutex<CmdProxyState>>();
log::debug!(target: "app", "强制刷新代理缓存"); log::debug!(target: "app", "Force refresh proxy cache");
let proxies = manager.get_refresh_proxies().await?; let proxies = manager.get_refresh_proxies().await?;
@@ -61,7 +61,7 @@ pub async fn force_refresh_proxies() -> CmdResult<serde_json::Value> {
state.last_refresh_time = Instant::now(); state.last_refresh_time = Instant::now();
} }
log::debug!(target: "app", "强制刷新代理缓存完成"); log::debug!(target: "app", "Force refresh proxy cache completed");
Ok(proxies) Ok(proxies)
} }
@@ -88,7 +88,7 @@ pub async fn get_providers_proxies() -> CmdResult<serde_json::Value> {
state.providers_proxies = Box::new(providers); state.providers_proxies = Box::new(providers);
state.need_refresh = false; state.need_refresh = false;
} }
log::debug!(target: "app", "providers_proxies刷新成功"); log::debug!(target: "app", "providers_proxies refreshed successfully");
} }
let providers_proxies = { let providers_proxies = {

8
src-tauri/src/cmd/save_profile.rs
View File

@@ -133,17 +133,17 @@ pub async fn save_profile_file(index: String, file_data: Option<String>) -> CmdR
|| (!file_path_str.ends_with(".js") && !is_script_error) || (!file_path_str.ends_with(".js") && !is_script_error)
{ {
// 普通YAML错误使用YAML通知处理 // 普通YAML错误使用YAML通知处理
log::info!(target: "app", "[cmd配置save] YAML配置文件验证失败，发送通知"); log::info!(target: "app", "[cmd config save] YAML config file validation failed, sending notification");
let result = (false, error_msg.clone()); let result = (false, error_msg.clone());
crate::cmd::validate::handle_yaml_validation_notice(&result, "YAML配置文件"); crate::cmd::validate::handle_yaml_validation_notice(&result, "YAML配置文件");
} else if is_script_error { } else if is_script_error {
// 脚本错误使用专门的通知处理 // 脚本错误使用专门的通知处理
log::info!(target: "app", "[cmd配置save] 脚本文件验证失败，发送通知"); log::info!(target: "app", "[cmd config save] Script file validation failed, sending notification");
let result = (false, error_msg.clone()); let result = (false, error_msg.clone());
crate::cmd::validate::handle_script_validation_notice(&result, "脚本文件"); crate::cmd::validate::handle_script_validation_notice(&result, "脚本文件");
} else { } else {
// 普通配置错误使用一般通知 // 普通配置错误使用一般通知
log::info!(target: "app", "[cmd配置save] 其他类型验证失败，发送一般通知"); log::info!(target: "app", "[cmd config save] Other validation failure type, sending general notification");
handle::Handle::notice_message("config_validate::error", &error_msg); handle::Handle::notice_message("config_validate::error", &error_msg);
} }
@@ -154,7 +154,7 @@ pub async fn save_profile_file(index: String, file_data: Option<String>) -> CmdR
error, error,
Type::Config, Type::Config,
true, true,
"[cmd配置save] 验证过程发生错误: {}", "[cmd config save] Error occurred during validation: {}",
e e
); );
// 恢复原始配置文件 // 恢复原始配置文件

6
src-tauri/src/config/draft.rs
View File

@@ -19,11 +19,11 @@ macro_rules! draft_define {
impl Draft<Box<$id>> { impl Draft<Box<$id>> {
#[allow(unused)] #[allow(unused)]
pub fn data(&self) -> MappedMutexGuard<Box<$id>> { pub fn data(&self) -> MappedMutexGuard<'_, Box<$id>> {
MutexGuard::map(self.inner.lock(), |guard| &mut guard.0) MutexGuard::map(self.inner.lock(), |guard| &mut guard.0)
} }
pub fn latest(&self) -> MappedMutexGuard<Box<$id>> { pub fn latest(&self) -> MappedMutexGuard<'_, Box<$id>> {
MutexGuard::map(self.inner.lock(), |inner| { MutexGuard::map(self.inner.lock(), |inner| {
if inner.1.is_none() { if inner.1.is_none() {
&mut inner.0 &mut inner.0
@@ -33,7 +33,7 @@ macro_rules! draft_define {
}) })
} }
pub fn draft(&self) -> MappedMutexGuard<Box<$id>> { pub fn draft(&self) -> MappedMutexGuard<'_, Box<$id>> {
MutexGuard::map(self.inner.lock(), |inner| { MutexGuard::map(self.inner.lock(), |inner| {
if inner.1.is_none() { if inner.1.is_none() {
inner.1 = Some(inner.0.clone()); inner.1 = Some(inner.0.clone());

2
src-tauri/src/config/prfitem.rs
View File

@@ -326,7 +326,7 @@ impl PrfItem {
if let Ok(mut parsed_url) = Url::parse(url) { if let Ok(mut parsed_url) = Url::parse(url) {
if parsed_url.set_host(Some(new_domain)).is_ok() { if parsed_url.set_host(Some(new_domain)).is_ok() {
final_url = parsed_url.to_string(); final_url = parsed_url.to_string();
log::info!(target: "app", "URL host updated to -> {}", final_url); log::info!(target: "app", "URL host updated to -> {final_url}");
} }
} }
} }

10
src-tauri/src/config/profiles.rs
View File

@@ -536,7 +536,7 @@ impl IProfiles {
if Self::is_profile_file(file_name) { if Self::is_profile_file(file_name) {
// 检查是否为全局扩展文件 // 检查是否为全局扩展文件
if protected_files.contains(file_name) { if protected_files.contains(file_name) {
log::debug!(target: "app", "保护全局扩展配置文件: {file_name}"); log::debug!(target: "app", "Protect global extension config file: {file_name}");
continue; continue;
} }
@@ -545,11 +545,11 @@ impl IProfiles {
match std::fs::remove_file(&path) { match std::fs::remove_file(&path) {
Ok(_) => { Ok(_) => {
deleted_files.push(file_name.to_string()); deleted_files.push(file_name.to_string());
log::info!(target: "app", "已清理冗余文件: {file_name}"); log::info!(target: "app", "Cleaned up redundant file: {file_name}");
} }
Err(e) => { Err(e) => {
failed_deletions.push(format!("{file_name}: {e}")); failed_deletions.push(format!("{file_name}: {e}"));
log::warn!(target: "app", "清理文件失败: {file_name} - {e}"); log::warn!(target: "app", "Failed to clean file: {file_name} - {e}");
} }
} }
} }
@@ -679,14 +679,14 @@ impl IProfiles {
if !result.deleted_files.is_empty() { if !result.deleted_files.is_empty() {
log::info!( log::info!(
target: "app", target: "app",
"自动清理完成，删除了 {} 个冗余文件", "Auto cleanup completed, deleted {} redundant files",
result.deleted_files.len() result.deleted_files.len()
); );
} }
Ok(()) Ok(())
} }
Err(e) => { Err(e) => {
log::warn!(target: "app", "自动清理失败: {e}"); log::warn!(target: "app", "Auto cleanup failed: {e}");
Ok(()) Ok(())
} }
} }

4
src-tauri/src/config/verge.rs
View File

@@ -340,7 +340,9 @@ impl IVerge {
} }
pub fn new() -> Self { pub fn new() -> Self {
dirs::verge_path().and_then(|path| help::read_yaml::<IVerge>(&path)).unwrap_or_else(|err| { dirs::verge_path()
.and_then(|path| help::read_yaml::<IVerge>(&path))
.unwrap_or_else(|err| {
log::error!(target: "app", "{err}"); log::error!(target: "app", "{err}");
Self::template() Self::template()
}) })

26
src-tauri/src/core/async_proxy_query.rs
View File

@@ -39,15 +39,15 @@ impl AsyncProxyQuery {
pub async fn get_auto_proxy() -> AsyncAutoproxy { pub async fn get_auto_proxy() -> AsyncAutoproxy {
match timeout(Duration::from_secs(3), Self::get_auto_proxy_impl()).await { match timeout(Duration::from_secs(3), Self::get_auto_proxy_impl()).await {
Ok(Ok(proxy)) => { Ok(Ok(proxy)) => {
log::debug!(target: "app", "异步获取自动代理成功: enable={}, url={}", proxy.enable, proxy.url); log::debug!(target: "app", "Async auto proxy fetch succeeded: enable={}, url={}", proxy.enable, proxy.url);
proxy proxy
} }
Ok(Err(e)) => { Ok(Err(e)) => {
log::warn!(target: "app", "异步获取自动代理失败: {e}"); log::warn!(target: "app", "Async auto proxy fetch failed: {e}");
AsyncAutoproxy::default() AsyncAutoproxy::default()
} }
Err(_) => { Err(_) => {
log::warn!(target: "app", "异步获取自动代理超时"); log::warn!(target: "app", "Async auto proxy fetch timed out");
AsyncAutoproxy::default() AsyncAutoproxy::default()
} }
} }
@@ -57,15 +57,15 @@ impl AsyncProxyQuery {
pub async fn get_system_proxy() -> AsyncSysproxy { pub async fn get_system_proxy() -> AsyncSysproxy {
match timeout(Duration::from_secs(3), Self::get_system_proxy_impl()).await { match timeout(Duration::from_secs(3), Self::get_system_proxy_impl()).await {
Ok(Ok(proxy)) => { Ok(Ok(proxy)) => {
log::debug!(target: "app", "异步获取系统代理成功: enable={}, {}:{}", proxy.enable, proxy.host, proxy.port); log::debug!(target: "app", "Async system proxy fetch succeeded: enable={}, {}:{}", proxy.enable, proxy.host, proxy.port);
proxy proxy
} }
Ok(Err(e)) => { Ok(Err(e)) => {
log::warn!(target: "app", "异步获取系统代理失败: {e}"); log::warn!(target: "app", "Async system proxy fetch failed: {e}");
AsyncSysproxy::default() AsyncSysproxy::default()
} }
Err(_) => { Err(_) => {
log::warn!(target: "app", "异步获取系统代理超时"); log::warn!(target: "app", "Async system proxy fetch timed out");
AsyncSysproxy::default() AsyncSysproxy::default()
} }
} }
@@ -97,7 +97,7 @@ impl AsyncProxyQuery {
RegOpenKeyExW(HKEY_CURRENT_USER, key_path.as_ptr(), 0, KEY_READ, &mut hkey); RegOpenKeyExW(HKEY_CURRENT_USER, key_path.as_ptr(), 0, KEY_READ, &mut hkey);
if result != 0 { if result != 0 {
log::debug!(target: "app", "无法打开注册表项"); log::debug!(target: "app", "Unable to open registry key");
return Ok(AsyncAutoproxy::default()); return Ok(AsyncAutoproxy::default());
} }
@@ -123,7 +123,7 @@ impl AsyncProxyQuery {
.position(|&x| x == 0) .position(|&x| x == 0)
.unwrap_or(url_buffer.len()); .unwrap_or(url_buffer.len());
pac_url = String::from_utf16_lossy(&url_buffer[..end_pos]); pac_url = String::from_utf16_lossy(&url_buffer[..end_pos]);
log::debug!(target: "app", "从注册表读取到PAC URL: {}", pac_url); log::debug!(target: "app", "Read PAC URL from registry: {}", pac_url);
} }
// 2. 检查自动检测设置是否启用 // 2. 检查自动检测设置是否启用
@@ -148,7 +148,7 @@ impl AsyncProxyQuery {
|| (detect_query_result == 0 && detect_value_type == REG_DWORD && auto_detect != 0); || (detect_query_result == 0 && detect_value_type == REG_DWORD && auto_detect != 0);
if pac_enabled { if pac_enabled {
log::debug!(target: "app", "PAC配置启用: URL={}, AutoDetect={}", pac_url, auto_detect); log::debug!(target: "app", "PAC configuration enabled: URL={}, AutoDetect={}", pac_url, auto_detect);
if pac_url.is_empty() && auto_detect != 0 { if pac_url.is_empty() && auto_detect != 0 {
pac_url = "auto-detect".to_string(); pac_url = "auto-detect".to_string();
@@ -159,7 +159,7 @@ impl AsyncProxyQuery {
url: pac_url, url: pac_url,
}) })
} else { } else {
log::debug!(target: "app", "PAC配置未启用"); log::debug!(target: "app", "PAC configuration not enabled");
Ok(AsyncAutoproxy::default()) Ok(AsyncAutoproxy::default())
} }
} }
@@ -194,7 +194,7 @@ impl AsyncProxyQuery {
} }
} }
log::debug!(target: "app", "解析结果: pac_enabled={pac_enabled}, pac_url={pac_url}"); log::debug!(target: "app", "Parse result: pac_enabled={pac_enabled}, pac_url={pac_url}");
Ok(AsyncAutoproxy { Ok(AsyncAutoproxy {
enable: pac_enabled && !pac_url.is_empty(), enable: pac_enabled && !pac_url.is_empty(),
@@ -361,7 +361,7 @@ impl AsyncProxyQuery {
(proxy_server, 8080) (proxy_server, 8080)
}; };
log::debug!(target: "app", "从注册表读取到代理设置: {}:{}, bypass: {}", host, port, bypass_list); log::debug!(target: "app", "Read proxy settings from registry: {}:{}, bypass: {}", host, port, bypass_list);
Ok(AsyncSysproxy { Ok(AsyncSysproxy {
enable: true, enable: true,
@@ -518,7 +518,7 @@ impl AsyncProxyQuery {
}; };
if host.is_empty() { if host.is_empty() {
return Err(anyhow!("无效的代理URL")); return Err(anyhow!("Invalid proxy URL"));
} }
Ok(AsyncSysproxy { Ok(AsyncSysproxy {

2
src-tauri/src/core/backup.rs
View File

@@ -112,7 +112,7 @@ impl WebDavClient {
.redirect(reqwest::redirect::Policy::custom(|attempt| { .redirect(reqwest::redirect::Policy::custom(|attempt| {
// 允许所有请求类型的重定向，包括PUT // 允许所有请求类型的重定向，包括PUT
if attempt.previous().len() >= 5 { if attempt.previous().len() >= 5 {
attempt.error("重定向次数过多") attempt.error("Too many redirects")
} else { } else {
attempt.follow() attempt.follow()
} }

273
src-tauri/src/core/core.rs
View File

@@ -72,7 +72,7 @@ impl CoreManager {
warn, warn,
Type::Config, Type::Config,
true, true,
"无法读取文件以检测类型: {}, 错误: {}", "Failed to read file to detect type: {}, error: {}",
path, path,
err err
); );
@@ -130,7 +130,7 @@ impl CoreManager {
debug, debug,
Type::Config, Type::Config,
true, true,
"无法确定文件类型，默认当作YAML处理: {}", "Unable to determine file type, defaulting to YAML handling: {}",
path path
); );
Ok(false) Ok(false)
@@ -153,7 +153,12 @@ impl CoreManager {
} }
/// 验证运行时配置 /// 验证运行时配置
pub async fn validate_config(&self) -> Result<(bool, String)> { pub async fn validate_config(&self) -> Result<(bool, String)> {
logging!(info, Type::Config, true, "生成临时配置文件用于验证"); logging!(
info,
Type::Config,
true,
"Generate temporary config file for validation"
);
let config_path = Config::generate_file(ConfigType::Check)?; let config_path = Config::generate_file(ConfigType::Check)?;
let config_path = dirs::path_to_str(&config_path)?; let config_path = dirs::path_to_str(&config_path)?;
self.validate_config_internal(config_path).await self.validate_config_internal(config_path).await
@@ -166,7 +171,12 @@ impl CoreManager {
) -> Result<(bool, String)> { ) -> Result<(bool, String)> {
// 检查程序是否正在退出，如果是则跳过验证 // 检查程序是否正在退出，如果是则跳过验证
if handle::Handle::global().is_exiting() { if handle::Handle::global().is_exiting() {
logging!(info, Type::Core, true, "应用正在退出，跳过验证"); logging!(
info,
Type::Core,
true,
"App is exiting, skipping validation"
);
return Ok((true, String::new())); return Ok((true, String::new()));
} }
@@ -183,7 +193,7 @@ impl CoreManager {
info, info,
Type::Config, Type::Config,
true, true,
"检测到Merge文件，仅进行语法检查: {}", "Detected merge file, performing syntax check only: {}",
config_path config_path
); );
return self.validate_file_syntax(config_path).await; return self.validate_file_syntax(config_path).await;
@@ -201,7 +211,7 @@ impl CoreManager {
warn, warn,
Type::Config, Type::Config,
true, true,
"无法确定文件类型: {}, 错误: {}", "Unable to determine file type: {}, error: {}",
config_path, config_path,
err err
); );
@@ -215,7 +225,7 @@ impl CoreManager {
info, info,
Type::Config, Type::Config,
true, true,
"检测到脚本文件，使用JavaScript验证: {}", "Detected script file, validating with JavaScript: {}",
config_path config_path
); );
return self.validate_script_file(config_path).await; return self.validate_script_file(config_path).await;
@@ -226,7 +236,7 @@ impl CoreManager {
info, info,
Type::Config, Type::Config,
true, true,
"使用Clash内核验证配置文件: {}", "Validating config file with Clash core: {}",
config_path config_path
); );
self.validate_config_internal(config_path).await self.validate_config_internal(config_path).await
@@ -235,7 +245,12 @@ impl CoreManager {
async fn validate_config_internal(&self, config_path: &str) -> Result<(bool, String)> { async fn validate_config_internal(&self, config_path: &str) -> Result<(bool, String)> {
// 检查程序是否正在退出，如果是则跳过验证 // 检查程序是否正在退出，如果是则跳过验证
if handle::Handle::global().is_exiting() { if handle::Handle::global().is_exiting() {
logging!(info, Type::Core, true, "应用正在退出，跳过验证"); logging!(
info,
Type::Core,
true,
"App is exiting, skipping validation"
);
return Ok((true, String::new())); return Ok((true, String::new()));
} }
@@ -243,17 +258,23 @@ impl CoreManager {
info, info,
Type::Config, Type::Config,
true, true,
"开始验证配置文件: {}", "Starting validation for config file: {}",
config_path config_path
); );
let clash_core = Config::verge().latest().get_valid_clash_core(); let clash_core = Config::verge().latest().get_valid_clash_core();
logging!(info, Type::Config, true, "使用内核: {}", clash_core); logging!(info, Type::Config, true, "Using core: {}", clash_core);
let app_handle = handle::Handle::global().app_handle().unwrap(); let app_handle = handle::Handle::global().app_handle().unwrap();
let app_dir = dirs::app_home_dir()?; let app_dir = dirs::app_home_dir()?;
let app_dir_str = dirs::path_to_str(&app_dir)?; let app_dir_str = dirs::path_to_str(&app_dir)?;
logging!(info, Type::Config, true, "验证目录: {}", app_dir_str); logging!(
info,
Type::Config,
true,
"Validation directory: {}",
app_dir_str
);
// 使用子进程运行clash验证配置 // 使用子进程运行clash验证配置
let output = app_handle let output = app_handle
@@ -271,56 +292,84 @@ impl CoreManager {
let has_error = let has_error =
!output.status.success() || error_keywords.iter().any(|&kw| stderr.contains(kw)); !output.status.success() || error_keywords.iter().any(|&kw| stderr.contains(kw));
logging!(info, Type::Config, true, "-------- 验证结果 --------"); logging!(
info,
Type::Config,
true,
"-------- Validation Result --------"
);
if !stderr.is_empty() { if !stderr.is_empty() {
logging!(info, Type::Config, true, "stderr输出:\n{}", stderr); logging!(info, Type::Config, true, "stderr output:\n{}", stderr);
} }
if has_error { if has_error {
logging!(info, Type::Config, true, "发现错误，开始处理错误信息"); logging!(
info,
Type::Config,
true,
"Errors found, processing error details"
);
let error_msg = if !stdout.is_empty() { let error_msg = if !stdout.is_empty() {
stdout.to_string() stdout.to_string()
} else if !stderr.is_empty() { } else if !stderr.is_empty() {
stderr.to_string() stderr.to_string()
} else if let Some(code) = output.status.code() { } else if let Some(code) = output.status.code() {
format!("验证进程异常退出，退出码: {code}") format!("Validation process exited abnormally, exit code: {code}")
} else { } else {
"验证进程被终止".to_string() "Validation process was terminated".to_string()
}; };
logging!(info, Type::Config, true, "-------- 验证结束 --------"); logging!(info, Type::Config, true, "-------- Validation End --------");
Ok((false, error_msg)) // 返回错误消息给调用者处理 Ok((false, error_msg)) // 返回错误消息给调用者处理
} else { } else {
logging!(info, Type::Config, true, "验证成功"); logging!(info, Type::Config, true, "Validation succeeded");
logging!(info, Type::Config, true, "-------- 验证结束 --------"); logging!(info, Type::Config, true, "-------- Validation End --------");
Ok((true, String::new())) Ok((true, String::new()))
} }
} }
/// 只进行文件语法检查，不进行完整验证 /// 只进行文件语法检查，不进行完整验证
async fn validate_file_syntax(&self, config_path: &str) -> Result<(bool, String)> { async fn validate_file_syntax(&self, config_path: &str) -> Result<(bool, String)> {
logging!(info, Type::Config, true, "开始检查文件: {}", config_path); logging!(
info,
Type::Config,
true,
"Starting file check: {}",
config_path
);
// 读取文件内容 // 读取文件内容
let content = match std::fs::read_to_string(config_path) { let content = match std::fs::read_to_string(config_path) {
Ok(content) => content, Ok(content) => content,
Err(err) => { Err(err) => {
let error_msg = format!("Failed to read file: {err}"); let error_msg = format!("Failed to read file: {err}");
logging!(error, Type::Config, true, "无法读取文件: {}", error_msg); logging!(
error,
Type::Config,
true,
"Failed to read file: {}",
error_msg
);
return Ok((false, error_msg)); return Ok((false, error_msg));
} }
}; };
// 对YAML文件尝试解析，只检查语法正确性 // 对YAML文件尝试解析，只检查语法正确性
logging!(info, Type::Config, true, "进行YAML语法检查"); logging!(info, Type::Config, true, "Performing YAML syntax check");
match serde_yaml::from_str::<serde_yaml::Value>(&content) { match serde_yaml::from_str::<serde_yaml::Value>(&content) {
Ok(_) => { Ok(_) => {
logging!(info, Type::Config, true, "YAML语法检查通过"); logging!(info, Type::Config, true, "YAML syntax check passed");
Ok((true, String::new())) Ok((true, String::new()))
} }
Err(err) => { Err(err) => {
// 使用标准化的前缀，以便错误处理函数能正确识别 // 使用标准化的前缀，以便错误处理函数能正确识别
let error_msg = format!("YAML syntax error: {err}"); let error_msg = format!("YAML syntax error: {err}");
logging!(error, Type::Config, true, "YAML语法错误: {}", error_msg); logging!(
error,
Type::Config,
true,
"YAML syntax error: {}",
error_msg
);
Ok((false, error_msg)) Ok((false, error_msg))
} }
} }
@@ -332,13 +381,19 @@ impl CoreManager {
Ok(content) => content, Ok(content) => content,
Err(err) => { Err(err) => {
let error_msg = format!("Failed to read script file: {err}"); let error_msg = format!("Failed to read script file: {err}");
logging!(warn, Type::Config, true, "脚本语法错误: {}", err); logging!(warn, Type::Config, true, "Script syntax error: {}", err);
//handle::Handle::notice_message("config_validate::script_syntax_error", &error_msg); //handle::Handle::notice_message("config_validate::script_syntax_error", &error_msg);
return Ok((false, error_msg)); return Ok((false, error_msg));
} }
}; };
logging!(debug, Type::Config, true, "验证脚本文件: {}", path); logging!(
debug,
Type::Config,
true,
"Validating script file: {}",
path
);
// 使用boa引擎进行基本语法检查 // 使用boa引擎进行基本语法检查
use boa_engine::{Context, Source}; use boa_engine::{Context, Source};
@@ -348,7 +403,13 @@ impl CoreManager {
match result { match result {
Ok(_) => { Ok(_) => {
logging!(debug, Type::Config, true, "脚本语法验证通过: {}", path); logging!(
debug,
Type::Config,
true,
"Script syntax validation passed: {}",
path
);
// 检查脚本是否包含main函数 // 检查脚本是否包含main函数
if !content.contains("function main") if !content.contains("function main")
@@ -356,7 +417,13 @@ impl CoreManager {
&& !content.contains("let main") && !content.contains("let main")
{ {
let error_msg = "Script must contain a main function"; let error_msg = "Script must contain a main function";
logging!(warn, Type::Config, true, "脚本缺少main函数: {}", path); logging!(
warn,
Type::Config,
true,
"Script missing main function: {}",
path
);
//handle::Handle::notice_message("config_validate::script_missing_main", error_msg); //handle::Handle::notice_message("config_validate::script_missing_main", error_msg);
return Ok((false, error_msg.to_string())); return Ok((false, error_msg.to_string()));
} }
@@ -365,7 +432,7 @@ impl CoreManager {
} }
Err(err) => { Err(err) => {
let error_msg = format!("Script syntax error: {err}"); let error_msg = format!("Script syntax error: {err}");
logging!(warn, Type::Config, true, "脚本语法错误: {}", err); logging!(warn, Type::Config, true, "Script syntax error: {}", err);
//handle::Handle::notice_message("config_validate::script_syntax_error", &error_msg); //handle::Handle::notice_message("config_validate::script_syntax_error", &error_msg);
Ok((false, error_msg)) Ok((false, error_msg))
} }
@@ -375,33 +442,55 @@ impl CoreManager {
pub async fn update_config(&self) -> Result<(bool, String)> { pub async fn update_config(&self) -> Result<(bool, String)> {
// 检查程序是否正在退出，如果是则跳过完整验证流程 // 检查程序是否正在退出，如果是则跳过完整验证流程
if handle::Handle::global().is_exiting() { if handle::Handle::global().is_exiting() {
logging!(info, Type::Config, true, "应用正在退出，跳过验证"); logging!(
info,
Type::Config,
true,
"App is exiting, skipping validation"
);
return Ok((true, String::new())); return Ok((true, String::new()));
} }
logging!(info, Type::Config, true, "开始更新配置"); logging!(info, Type::Config, true, "Starting config update");
// 1. 先生成新的配置内容 // 1. 先生成新的配置内容
logging!(info, Type::Config, true, "生成新的配置内容"); logging!(
info,
Type::Config,
true,
"Generating new configuration content"
);
Config::generate().await?; Config::generate().await?;
// 2. 验证配置 // 2. 验证配置
match self.validate_config().await { match self.validate_config().await {
Ok((true, _)) => { Ok((true, _)) => {
logging!(info, Type::Config, true, "配置验证通过"); logging!(info, Type::Config, true, "Configuration validation passed");
// 4. 验证通过后，生成正式的运行时配置 // 4. 验证通过后，生成正式的运行时配置
logging!(info, Type::Config, true, "生成运行时配置"); logging!(info, Type::Config, true, "Generating runtime configuration");
let run_path = Config::generate_file(ConfigType::Run)?; let run_path = Config::generate_file(ConfigType::Run)?;
logging_error!(Type::Config, true, self.put_configs_force(run_path).await); logging_error!(Type::Config, true, self.put_configs_force(run_path).await);
Ok((true, "something".into())) Ok((true, "something".into()))
} }
Ok((false, error_msg)) => { Ok((false, error_msg)) => {
logging!(warn, Type::Config, true, "配置验证失败: {}", error_msg); logging!(
warn,
Type::Config,
true,
"Configuration validation failed: {}",
error_msg
);
Config::runtime().discard(); Config::runtime().discard();
Ok((false, error_msg)) Ok((false, error_msg))
} }
Err(e) => { Err(e) => {
logging!(warn, Type::Config, true, "验证过程发生错误: {}", e); logging!(
warn,
Type::Config,
true,
"Error occurred during validation: {}",
e
);
Config::runtime().discard(); Config::runtime().discard();
Err(e) Err(e)
} }
@@ -435,7 +524,12 @@ impl CoreManager {
impl CoreManager { impl CoreManager {
/// 清理多余的 mihomo 进程 /// 清理多余的 mihomo 进程
async fn cleanup_orphaned_mihomo_processes(&self) -> Result<()> { async fn cleanup_orphaned_mihomo_processes(&self) -> Result<()> {
logging!(info, Type::Core, true, "开始清理多余的 mihomo 进程"); logging!(
info,
Type::Core,
true,
"Starting cleanup of orphaned mihomo processes"
);
// 获取当前管理的进程 PID // 获取当前管理的进程 PID
let current_pid = { let current_pid = {
@@ -471,7 +565,7 @@ impl CoreManager {
debug, debug,
Type::Core, Type::Core,
true, true,
"跳过当前管理的进程: {} (PID: {})", "Skipping currently managed process: {} (PID: {})",
process_name, process_name,
pid pid
); );
@@ -482,13 +576,24 @@ impl CoreManager {
} }
} }
Err(e) => { Err(e) => {
logging!(debug, Type::Core, true, "查找进程时发生错误: {}", e); logging!(
debug,
Type::Core,
true,
"Error occurred while finding processes: {}",
e
);
} }
} }
} }
if pids_to_kill.is_empty() { if pids_to_kill.is_empty() {
logging!(debug, Type::Core, true, "未发现多余的 mihomo 进程"); logging!(
debug,
Type::Core,
true,
"No orphaned mihomo processes found"
);
return Ok(()); return Ok(());
} }
@@ -837,7 +942,12 @@ impl CoreManager {
// 当服务安装失败时的回退逻辑 // 当服务安装失败时的回退逻辑
async fn attempt_service_init(&self) -> Result<()> { async fn attempt_service_init(&self) -> Result<()> {
if service::check_service_needs_reinstall().await { if service::check_service_needs_reinstall().await {
logging!(info, Type::Core, true, "服务版本不匹配或状态异常，执行重装"); logging!(
info,
Type::Core,
true,
"Service version mismatch or abnormal status, performing reinstallation"
);
if let Err(e) = service::reinstall_service().await { if let Err(e) = service::reinstall_service().await {
logging!( logging!(
warn, warn,
@@ -849,7 +959,12 @@ impl CoreManager {
return Err(e); return Err(e);
} }
// 如果重装成功，还需要尝试启动服务 // 如果重装成功，还需要尝试启动服务
logging!(info, Type::Core, true, "服务重装成功，尝试启动服务"); logging!(
info,
Type::Core,
true,
"Service reinstalled successfully, attempting to start"
);
} }
if let Err(e) = self.start_core_by_service().await { if let Err(e) = self.start_core_by_service().await {
@@ -857,14 +972,14 @@ impl CoreManager {
warn, warn,
Type::Core, Type::Core,
true, true,
"通过服务启动核心失败 during attempt_service_init: {}", "Failed to start core via service during attempt_service_init: {}",
e e
); );
// 确保 prefer_sidecar 在 start_core_by_service 失败时也被设置 // 确保 prefer_sidecar 在 start_core_by_service 失败时也被设置
let mut state = service::ServiceState::get(); let mut state = service::ServiceState::get();
if !state.prefer_sidecar { if !state.prefer_sidecar {
state.prefer_sidecar = true; state.prefer_sidecar = true;
state.last_error = Some(format!("通过服务启动核心失败: {e}")); state.last_error = Some(format!("Failed to start core via service: {e}"));
if let Err(save_err) = state.save() { if let Err(save_err) = state.save() {
logging!( logging!(
error, error,
@@ -901,11 +1016,16 @@ impl CoreManager {
info, info,
Type::Core, Type::Core,
true, true,
"服务当前可用或看似可用，尝试通过服务模式启动/重装" "Service currently available or appears available; attempting to start/reinstall via service mode"
); );
match self.attempt_service_init().await { match self.attempt_service_init().await {
Ok(_) => { Ok(_) => {
logging!(info, Type::Core, true, "服务模式成功启动核心"); logging!(
info,
Type::Core,
true,
"Service mode successfully started core"
);
core_started_successfully = true; core_started_successfully = true;
} }
Err(_err) => { Err(_err) => {
@@ -913,7 +1033,7 @@ impl CoreManager {
warn, warn,
Type::Core, Type::Core,
true, true,
"服务模式启动或重装失败。将尝试Sidecar模式回退。" "Service mode start or reinstall failed. Will attempt Sidecar fallback."
); );
} }
} }
@@ -922,7 +1042,7 @@ impl CoreManager {
info, info,
Type::Core, Type::Core,
true, true,
"服务初始不可用 (is_service_available 调用失败)" "Service initially unavailable (is_service_available call failed)"
); );
} }
@@ -931,7 +1051,7 @@ impl CoreManager {
info, info,
Type::Core, Type::Core,
true, true,
"核心未通过服务模式启动，执行Sidecar回退或首次安装逻辑" "Core not started via service mode; performing Sidecar fallback or first-time install logic"
); );
let service_state = service::ServiceState::get(); let service_state = service::ServiceState::get();
@@ -941,7 +1061,7 @@ impl CoreManager {
info, info,
Type::Core, Type::Core,
true, true,
"用户偏好Sidecar模式或先前服务启动失败，使用Sidecar模式启动" "User prefers Sidecar mode or previous service start failed; starting with Sidecar mode"
); );
self.start_core_by_sidecar().await?; self.start_core_by_sidecar().await?;
// 如果 sidecar 启动成功，我们可以认为核心初始化流程到此结束 // 如果 sidecar 启动成功，我们可以认为核心初始化流程到此结束
@@ -953,26 +1073,41 @@ impl CoreManager {
info, info,
Type::Core, Type::Core,
true, true,
"无服务安装记录 (首次运行或状态重置)，尝试安装服务" "No service installation record (first run or state reset); attempting to install service"
); );
match service::install_service().await { match service::install_service().await {
Ok(_) => { Ok(_) => {
logging!(info, Type::Core, true, "服务安装成功(首次尝试)"); logging!(
info,
Type::Core,
true,
"Service installed successfully (first attempt)"
);
let mut new_state = service::ServiceState::default(); let mut new_state = service::ServiceState::default();
new_state.record_install(); new_state.record_install();
new_state.prefer_sidecar = false; new_state.prefer_sidecar = false;
new_state.save()?; new_state.save()?;
if service::is_service_available().await.is_ok() { if service::is_service_available().await.is_ok() {
logging!(info, Type::Core, true, "新安装的服务可用，尝试启动"); logging!(
info,
Type::Core,
true,
"Newly installed service available; attempting to start"
);
if self.start_core_by_service().await.is_ok() { if self.start_core_by_service().await.is_ok() {
logging!(info, Type::Core, true, "新安装的服务启动成功"); logging!(
info,
Type::Core,
true,
"Newly installed service started successfully"
);
} else { } else {
logging!( logging!(
warn, warn,
Type::Core, Type::Core,
true, true,
"新安装的服务启动失败，回退到Sidecar模式" "Newly installed service failed to start; falling back to Sidecar mode"
); );
let mut final_state = service::ServiceState::get(); let mut final_state = service::ServiceState::get();
final_state.prefer_sidecar = true; final_state.prefer_sidecar = true;
@@ -986,7 +1121,7 @@ impl CoreManager {
warn, warn,
Type::Core, Type::Core,
true, true,
"服务安装成功但未能连接/立即可用，回退到Sidecar模式" "Service installed successfully but not connectable/immediately available; falling back to Sidecar mode"
); );
let mut final_state = service::ServiceState::get(); let mut final_state = service::ServiceState::get();
final_state.prefer_sidecar = true; final_state.prefer_sidecar = true;
@@ -999,7 +1134,13 @@ impl CoreManager {
} }
} }
Err(err) => { Err(err) => {
logging!(warn, Type::Core, true, "服务首次安装失败: {}", err); logging!(
warn,
Type::Core,
true,
"Service first-time installation failed: {}",
err
);
let new_state = service::ServiceState { let new_state = service::ServiceState {
last_error: Some(err.to_string()), last_error: Some(err.to_string()),
prefer_sidecar: true, prefer_sidecar: true,
@@ -1062,7 +1203,12 @@ impl CoreManager {
if service::check_service_needs_reinstall().await { if service::check_service_needs_reinstall().await {
service::reinstall_service().await?; service::reinstall_service().await?;
} }
logging!(info, Type::Core, true, "服务可用，使用服务模式启动"); logging!(
info,
Type::Core,
true,
"Service available; starting in service mode"
);
self.start_core_by_service().await?; self.start_core_by_service().await?;
} else { } else {
// 服务不可用，检查用户偏好 // 服务不可用，检查用户偏好
@@ -1072,11 +1218,16 @@ impl CoreManager {
info, info,
Type::Core, Type::Core,
true, true,
"服务不可用，根据用户偏好使用Sidecar模式" "Service unavailable; starting in Sidecar mode per user preference"
); );
self.start_core_by_sidecar().await?; self.start_core_by_sidecar().await?;
} else { } else {
logging!(info, Type::Core, true, "服务不可用，使用Sidecar模式"); logging!(
info,
Type::Core,
true,
"Service unavailable; starting in Sidecar mode"
);
self.start_core_by_sidecar().await?; self.start_core_by_sidecar().await?;
} }
} }

70
src-tauri/src/core/event_driven_proxy.rs
View File

@@ -78,7 +78,7 @@ struct QueryRequest {
response_tx: oneshot::Sender<Autoproxy>, response_tx: oneshot::Sender<Autoproxy>,
} }
// 配置结构体移到外部 // Configuration structure moved to external
struct ProxyConfig { struct ProxyConfig {
sys_enabled: bool, sys_enabled: bool,
pac_enabled: bool, pac_enabled: bool,
@@ -106,59 +106,59 @@ impl EventDrivenProxyManager {
} }
} }
/// 获取自动代理配置（缓存） /// Get automatic proxy configuration (cached)
pub fn get_auto_proxy_cached(&self) -> Autoproxy { pub fn get_auto_proxy_cached(&self) -> Autoproxy {
self.state.read().auto_proxy.clone() self.state.read().auto_proxy.clone()
} }
/// 异步获取最新的自动代理配置 /// Asynchronously get the latest automatic proxy configuration
pub async fn get_auto_proxy_async(&self) -> Autoproxy { pub async fn get_auto_proxy_async(&self) -> Autoproxy {
let (tx, rx) = oneshot::channel(); let (tx, rx) = oneshot::channel();
let query = QueryRequest { response_tx: tx }; let query = QueryRequest { response_tx: tx };
if self.query_sender.send(query).is_err() { if self.query_sender.send(query).is_err() {
log::error!(target: "app", "发送查询请求失败，返回缓存数据"); log::error!(target: "app", "Failed to send query request, returning cached data");
return self.get_auto_proxy_cached(); return self.get_auto_proxy_cached();
} }
match timeout(Duration::from_secs(5), rx).await { match timeout(Duration::from_secs(5), rx).await {
Ok(Ok(result)) => result, Ok(Ok(result)) => result,
_ => { _ => {
log::warn!(target: "app", "查询超时，返回缓存数据"); log::warn!(target: "app", "Query timed out, returning cached data");
self.get_auto_proxy_cached() self.get_auto_proxy_cached()
} }
} }
} }
/// 通知配置变更 /// Notify configuration changed
pub fn notify_config_changed(&self) { pub fn notify_config_changed(&self) {
self.send_event(ProxyEvent::ConfigChanged); self.send_event(ProxyEvent::ConfigChanged);
} }
/// 通知应用启动 /// Notify application started
pub fn notify_app_started(&self) { pub fn notify_app_started(&self) {
self.send_event(ProxyEvent::AppStarted); self.send_event(ProxyEvent::AppStarted);
} }
/// 通知应用即将关闭 /// Notify application stopping
#[allow(dead_code)] #[allow(dead_code)]
pub fn notify_app_stopping(&self) { pub fn notify_app_stopping(&self) {
self.send_event(ProxyEvent::AppStopping); self.send_event(ProxyEvent::AppStopping);
} }
/// 启用系统代理 /// Enable system proxy
#[allow(dead_code)] #[allow(dead_code)]
pub fn enable_proxy(&self) { pub fn enable_proxy(&self) {
self.send_event(ProxyEvent::EnableProxy); self.send_event(ProxyEvent::EnableProxy);
} }
/// 禁用系统代理 /// Disable system proxy
#[allow(dead_code)] #[allow(dead_code)]
pub fn disable_proxy(&self) { pub fn disable_proxy(&self) {
self.send_event(ProxyEvent::DisableProxy); self.send_event(ProxyEvent::DisableProxy);
} }
/// 强制检查代理状态 /// Force check proxy status
#[allow(dead_code)] #[allow(dead_code)]
pub fn force_check(&self) { pub fn force_check(&self) {
self.send_event(ProxyEvent::ForceCheck); self.send_event(ProxyEvent::ForceCheck);
@@ -166,7 +166,7 @@ impl EventDrivenProxyManager {
fn send_event(&self, event: ProxyEvent) { fn send_event(&self, event: ProxyEvent) {
if let Err(e) = self.event_sender.send(event) { if let Err(e) = self.event_sender.send(event) {
log::error!(target: "app", "发送代理事件失败: {e}"); log::error!(target: "app", "Failed to send proxy event: {e}");
} }
} }
@@ -176,18 +176,18 @@ impl EventDrivenProxyManager {
mut query_rx: mpsc::UnboundedReceiver<QueryRequest>, mut query_rx: mpsc::UnboundedReceiver<QueryRequest>,
) { ) {
tokio::spawn(async move { tokio::spawn(async move {
log::info!(target: "app", "事件驱动代理管理器启动"); log::info!(target: "app", "Event-driven proxy manager started");
loop { loop {
tokio::select! { tokio::select! {
event = event_rx.recv() => { event = event_rx.recv() => {
match event { match event {
Some(event) => { Some(event) => {
log::debug!(target: "app", "处理代理事件: {event:?}"); log::debug!(target: "app", "Handling proxy event: {event:?}");
Self::handle_event(&state, event).await; Self::handle_event(&state, event).await;
} }
None => { None => {
log::info!(target: "app", "事件通道关闭，代理管理器停止"); log::info!(target: "app", "Event channel closed, proxy manager stopped");
break; break;
} }
} }
@@ -199,7 +199,7 @@ impl EventDrivenProxyManager {
let _ = query.response_tx.send(result); let _ = query.response_tx.send(result);
} }
None => { None => {
log::info!(target: "app", "查询通道关闭"); log::info!(target: "app", "Query channel closed");
break; break;
} }
} }
@@ -230,7 +230,7 @@ impl EventDrivenProxyManager {
Self::initialize_proxy_state(state).await; Self::initialize_proxy_state(state).await;
} }
ProxyEvent::AppStopping => { ProxyEvent::AppStopping => {
log::info!(target: "app", "清理代理状态"); log::info!(target: "app", "Cleaning up proxy state");
} }
} }
} }
@@ -246,7 +246,7 @@ impl EventDrivenProxyManager {
} }
async fn initialize_proxy_state(state: &Arc<RwLock<ProxyState>>) { async fn initialize_proxy_state(state: &Arc<RwLock<ProxyState>>) {
log::info!(target: "app", "初始化代理状态"); log::info!(target: "app", "Initializing proxy state");
let config = Self::get_proxy_config(); let config = Self::get_proxy_config();
let auto_proxy = Self::get_auto_proxy_with_timeout().await; let auto_proxy = Self::get_auto_proxy_with_timeout().await;
@@ -260,11 +260,11 @@ impl EventDrivenProxyManager {
s.is_healthy = true; s.is_healthy = true;
}); });
log::info!(target: "app", "代理状态初始化完成: sys={}, pac={}", config.sys_enabled, config.pac_enabled); log::info!(target: "app", "Proxy state initialized: sys={}, pac={}", config.sys_enabled, config.pac_enabled);
} }
async fn update_proxy_config(state: &Arc<RwLock<ProxyState>>) { async fn update_proxy_config(state: &Arc<RwLock<ProxyState>>) {
log::debug!(target: "app", "更新代理配置"); log::debug!(target: "app", "Updating proxy configuration");
let config = Self::get_proxy_config(); let config = Self::get_proxy_config();
@@ -288,7 +288,7 @@ impl EventDrivenProxyManager {
return; return;
} }
log::debug!(target: "app", "检查代理状态"); log::debug!(target: "app", "Checking proxy status");
if pac_enabled { if pac_enabled {
Self::check_and_restore_pac_proxy(state).await; Self::check_and_restore_pac_proxy(state).await;
@@ -306,7 +306,7 @@ impl EventDrivenProxyManager {
}); });
if !current.enable || current.url != expected.url { if !current.enable || current.url != expected.url {
log::info!(target: "app", "PAC代理设置异常，正在恢复..."); log::info!(target: "app", "PAC proxy setting abnormal, recovering...");
Self::restore_pac_proxy(&expected.url).await; Self::restore_pac_proxy(&expected.url).await;
sleep(Duration::from_millis(500)).await; sleep(Duration::from_millis(500)).await;
@@ -328,7 +328,7 @@ impl EventDrivenProxyManager {
}); });
if !current.enable || current.host != expected.host || current.port != expected.port { if !current.enable || current.host != expected.host || current.port != expected.port {
log::info!(target: "app", "系统代理设置异常，正在恢复..."); log::info!(target: "app", "System proxy setting abnormal, recovering...");
Self::restore_sys_proxy(&expected).await; Self::restore_sys_proxy(&expected).await;
sleep(Duration::from_millis(500)).await; sleep(Duration::from_millis(500)).await;
@@ -344,7 +344,7 @@ impl EventDrivenProxyManager {
} }
async fn enable_system_proxy(state: &Arc<RwLock<ProxyState>>) { async fn enable_system_proxy(state: &Arc<RwLock<ProxyState>>) {
log::info!(target: "app", "启用系统代理"); log::info!(target: "app", "Enabling system proxy");
let pac_enabled = state.read().pac_enabled; let pac_enabled = state.read().pac_enabled;
@@ -360,7 +360,7 @@ impl EventDrivenProxyManager {
} }
async fn disable_system_proxy(_state: &Arc<RwLock<ProxyState>>) { async fn disable_system_proxy(_state: &Arc<RwLock<ProxyState>>) {
log::info!(target: "app", "禁用系统代理"); log::info!(target: "app", "Disabling system proxy");
#[cfg(not(target_os = "windows"))] #[cfg(not(target_os = "windows"))]
{ {
@@ -373,7 +373,7 @@ impl EventDrivenProxyManager {
} }
async fn switch_proxy_mode(state: &Arc<RwLock<ProxyState>>, to_pac: bool) { async fn switch_proxy_mode(state: &Arc<RwLock<ProxyState>>, to_pac: bool) {
log::info!(target: "app", "切换到{}模式", if to_pac { "PAC" } else { "HTTP代理" }); log::info!(target: "app", "Switching to {} mode", if to_pac { "PAC" } else { "HTTP Proxy" });
if to_pac { if to_pac {
let disabled_sys = Sysproxy::default(); let disabled_sys = Sysproxy::default();
@@ -396,7 +396,7 @@ impl EventDrivenProxyManager {
async fn get_auto_proxy_with_timeout() -> Autoproxy { async fn get_auto_proxy_with_timeout() -> Autoproxy {
let async_proxy = AsyncProxyQuery::get_auto_proxy().await; let async_proxy = AsyncProxyQuery::get_auto_proxy().await;
// 转换为兼容的结构 // Convert to compatible structure
Autoproxy { Autoproxy {
enable: async_proxy.enable, enable: async_proxy.enable,
url: async_proxy.url, url: async_proxy.url,
@@ -406,7 +406,7 @@ impl EventDrivenProxyManager {
async fn get_sys_proxy_with_timeout() -> Sysproxy { async fn get_sys_proxy_with_timeout() -> Sysproxy {
let async_proxy = AsyncProxyQuery::get_system_proxy().await; let async_proxy = AsyncProxyQuery::get_system_proxy().await;
// 转换为兼容的结构 // Convert to compatible structure
Sysproxy { Sysproxy {
enable: async_proxy.enable, enable: async_proxy.enable,
host: async_proxy.host, host: async_proxy.host,
@@ -415,7 +415,7 @@ impl EventDrivenProxyManager {
} }
} }
// 统一的状态更新方法 // Unified state update method
fn update_state_timestamp<F>(state: &Arc<RwLock<ProxyState>>, update_fn: F) fn update_state_timestamp<F>(state: &Arc<RwLock<ProxyState>>, update_fn: F)
where where
F: FnOnce(&mut ProxyState), F: FnOnce(&mut ProxyState),
@@ -534,14 +534,14 @@ impl EventDrivenProxyManager {
let binary_path = match dirs::service_path() { let binary_path = match dirs::service_path() {
Ok(path) => path, Ok(path) => path,
Err(e) => { Err(e) => {
log::error!(target: "app", "获取服务路径失败: {}", e); log::error!(target: "app", "Failed to get service path: {}", e);
return; return;
} }
}; };
let sysproxy_exe = binary_path.with_file_name("sysproxy.exe"); let sysproxy_exe = binary_path.with_file_name("sysproxy.exe");
if !sysproxy_exe.exists() { if !sysproxy_exe.exists() {
log::error!(target: "app", "sysproxy.exe 不存在"); log::error!(target: "app", "sysproxy.exe does not exist");
return; return;
} }
@@ -554,17 +554,17 @@ impl EventDrivenProxyManager {
match output { match output {
Ok(output) => { Ok(output) => {
if !output.status.success() { if !output.status.success() {
log::error!(target: "app", "执行sysproxy命令失败: {:?}", args); log::error!(target: "app", "Failed to execute sysproxy command: {:?}", args);
let stderr = String::from_utf8_lossy(&output.stderr); let stderr = String::from_utf8_lossy(&output.stderr);
if !stderr.is_empty() { if !stderr.is_empty() {
log::error!(target: "app", "sysproxy错误输出: {}", stderr); log::error!(target: "app", "sysproxy stderr: {}", stderr);
} }
} else { } else {
log::debug!(target: "app", "成功执行sysproxy命令: {:?}", args); log::debug!(target: "app", "Successfully executed sysproxy command: {:?}", args);
} }
} }
Err(e) => { Err(e) => {
log::error!(target: "app", "执行sysproxy命令出错: {}", e); log::error!(target: "app", "Error executing sysproxy command: {}", e);
} }
} }
} }

4
src-tauri/src/core/handle.rs
View File

@@ -416,7 +416,7 @@ impl Handle {
info, info,
Type::Frontend, Type::Frontend,
true, true,
"启动过程中发现错误，加入消息队列: {} - {}", "Error found during startup; queued: {} - {}",
status_str, status_str,
msg_str msg_str
); );
@@ -466,7 +466,7 @@ impl Handle {
info, info,
Type::Frontend, Type::Frontend,
true, true,
"发送{}条启动时累积的错误消息", "Sending {} accumulated startup error messages",
errors.len() errors.len()
); );

246
src-tauri/src/core/service.rs
View File

@@ -346,7 +346,7 @@ pub async fn reinstall_service() -> Result<()> {
Ok(()) Ok(())
} }
Err(err) => { Err(err) => {
let error = format!("failed to install service: {}", err); let error = format!("failed to install service: {err}");
service_state.last_error = Some(error.clone()); service_state.last_error = Some(error.clone());
service_state.prefer_sidecar = true; service_state.prefer_sidecar = true;
service_state.save()?; service_state.save()?;
@@ -477,7 +477,12 @@ pub async fn reinstall_service() -> Result<()> {
/// 检查服务状态 - 使用IPC通信 /// 检查服务状态 - 使用IPC通信
pub async fn check_ipc_service_status() -> Result<JsonResponse> { pub async fn check_ipc_service_status() -> Result<JsonResponse> {
logging!(info, Type::Service, true, "开始检查服务状态 (IPC)"); logging!(
info,
Type::Service,
true,
"Starting service status check (IPC)"
);
// 使用IPC通信 // 使用IPC通信
let payload = serde_json::json!({}); let payload = serde_json::json!({});
@@ -495,8 +500,16 @@ pub async fn check_ipc_service_status() -> Result<JsonResponse> {
); */ ); */
if !response.success { if !response.success {
let err_msg = response.error.unwrap_or_else(|| "未知服务错误".to_string()); let err_msg = response
logging!(error, Type::Service, true, "服务响应错误: {}", err_msg); .error
.unwrap_or_else(|| "Unknown service error".to_string());
logging!(
error,
Type::Service,
true,
"Service response error: {}",
err_msg
);
bail!(err_msg); bail!(err_msg);
} }
@@ -516,7 +529,7 @@ pub async fn check_ipc_service_status() -> Result<JsonResponse> {
warn, warn,
Type::Service, Type::Service,
true, true,
"解析嵌套的ResponseBody失败: {}; 尝试其他方式", "Failed to parse nested ResponseBody: {}; trying alternative",
e e
); );
None None
@@ -536,7 +549,7 @@ pub async fn check_ipc_service_status() -> Result<JsonResponse> {
info, info,
Type::Service, Type::Service,
true, true,
"服务检测成功: code={}, msg={}, data存在={}", "Service check succeeded: code={}, msg={}, data_present={}",
json_response.code, json_response.code,
json_response.msg, json_response.msg,
json_response.data.is_some() json_response.data.is_some()
@@ -550,7 +563,7 @@ pub async fn check_ipc_service_status() -> Result<JsonResponse> {
info, info,
Type::Service, Type::Service,
true, true,
"服务检测成功: code={}, msg={}", "Service check succeeded: code={}, msg={}",
json_response.code, json_response.code,
json_response.msg json_response.msg
); );
@@ -561,31 +574,42 @@ pub async fn check_ipc_service_status() -> Result<JsonResponse> {
error, error,
Type::Service, Type::Service,
true, true,
"解析服务响应失败: {}; 原始数据: {:?}", "Failed to parse service response: {}; raw data: {:?}",
e, e,
data data
); );
bail!("无法解析服务响应数据: {}", e) bail!("Unable to parse service response data: {}", e)
} }
} }
} }
} }
None => { None => {
logging!(error, Type::Service, true, "服务响应中没有数据"); logging!(error, Type::Service, true, "No data in service response");
bail!("服务响应中没有数据") bail!("No data in service response")
} }
} }
} }
Err(e) => { Err(e) => {
logging!(error, Type::Service, true, "IPC通信失败: {}", e); logging!(
bail!("无法连接到Koala Clash Service: {}", e) error,
Type::Service,
true,
"IPC communication failed: {}",
e
);
bail!("Unable to connect to Koala Clash Service: {}", e)
} }
} }
} }
/// 检查服务版本 - 使用IPC通信 /// 检查服务版本 - 使用IPC通信
pub async fn check_service_version() -> Result<String> { pub async fn check_service_version() -> Result<String> {
logging!(info, Type::Service, true, "开始检查服务版本 (IPC)"); logging!(
info,
Type::Service,
true,
"Starting service version check (IPC)"
);
let payload = serde_json::json!({}); let payload = serde_json::json!({});
// logging!(debug, Type::Service, true, "发送GetVersion请求"); // logging!(debug, Type::Service, true, "发送GetVersion请求");
@@ -604,8 +628,14 @@ pub async fn check_service_version() -> Result<String> {
if !response.success { if !response.success {
let err_msg = response let err_msg = response
.error .error
.unwrap_or_else(|| "获取服务版本失败".to_string()); .unwrap_or_else(|| "Failed to get service version".to_string());
logging!(error, Type::Service, true, "获取版本错误: {}", err_msg); logging!(
error,
Type::Service,
true,
"Failed to get service version: {}",
err_msg
);
bail!(err_msg); bail!(err_msg);
} }
@@ -618,7 +648,7 @@ pub async fn check_service_version() -> Result<String> {
info, info,
Type::Service, Type::Service,
true, true,
"获取到服务版本: {}", "Service version: {}",
version_str version_str
); );
return Ok(version_str.to_string()); return Ok(version_str.to_string());
@@ -628,7 +658,7 @@ pub async fn check_service_version() -> Result<String> {
error, error,
Type::Service, Type::Service,
true, true,
"嵌套数据中没有version字段: {:?}", "Nested data does not contain version field: {:?}",
nested_data nested_data
); );
} else { } else {
@@ -639,7 +669,7 @@ pub async fn check_service_version() -> Result<String> {
info, info,
Type::Service, Type::Service,
true, true,
"获取到服务版本: {}", "Received service version: {}",
version_response.version version_response.version
); );
return Ok(version_response.version); return Ok(version_response.version);
@@ -649,44 +679,55 @@ pub async fn check_service_version() -> Result<String> {
error, error,
Type::Service, Type::Service,
true, true,
"解析版本响应失败: {}; 原始数据: {:?}", "Failed to parse version response: {}; raw data: {:?}",
e, e,
data data
); );
bail!("无法解析服务版本数据: {}", e) bail!("Unable to parse service version data: {}", e)
} }
} }
} }
bail!("响应中未找到有效的版本信息") bail!("No valid version information found in response")
} }
None => { None => {
logging!(error, Type::Service, true, "版本响应中没有数据"); logging!(error, Type::Service, true, "No data in version response");
bail!("服务版本响应中没有数据") bail!("No data in service version response")
} }
} }
} }
Err(e) => { Err(e) => {
logging!(error, Type::Service, true, "IPC通信失败: {}", e); logging!(
bail!("无法连接到Koala Clash Service: {}", e) error,
Type::Service,
true,
"IPC communication failed: {}",
e
);
bail!("Unable to connect to Koala Clash Service: {}", e)
} }
} }
} }
/// 检查服务是否需要重装 /// 检查服务是否需要重装
pub async fn check_service_needs_reinstall() -> bool { pub async fn check_service_needs_reinstall() -> bool {
logging!(info, Type::Service, true, "开始检查服务是否需要重装"); logging!(
info,
Type::Service,
true,
"Checking whether service needs reinstallation"
);
let service_state = ServiceState::get(); let service_state = ServiceState::get();
if !service_state.can_reinstall() { if !service_state.can_reinstall() {
log::info!(target: "app", "服务重装检查: 处于冷却期或已达最大尝试次数"); log::info!(target: "app", "Service reinstall check: in cooldown period or max attempts reached");
return false; return false;
} }
// 检查版本和可用性 // 检查版本和可用性
match check_service_version().await { match check_service_version().await {
Ok(version) => { Ok(version) => {
log::info!(target: "app", "服务版本检测：当前={version}, 要求={REQUIRED_SERVICE_VERSION}"); log::info!(target: "app", "Service version check: current={version}, required={REQUIRED_SERVICE_VERSION}");
/* logging!( /* logging!(
info, info,
Type::Service, Type::Service,
@@ -698,25 +739,36 @@ pub async fn check_service_needs_reinstall() -> bool {
let needs_reinstall = version != REQUIRED_SERVICE_VERSION; let needs_reinstall = version != REQUIRED_SERVICE_VERSION;
if needs_reinstall { if needs_reinstall {
log::warn!(target: "app", "发现服务版本不匹配，需要重装! 当前={version}, 要求={REQUIRED_SERVICE_VERSION}"); log::warn!(target: "app", "Service version mismatch detected, reinstallation required! current={version}, required={REQUIRED_SERVICE_VERSION}");
logging!(warn, Type::Service, true, "服务版本不匹配，需要重装"); logging!(
warn,
Type::Service,
true,
"Service version mismatch, reinstallation required"
);
// log::debug!(target: "app", "当前版本字节: {:?}", version.as_bytes()); // log::debug!(target: "app", "当前版本字节: {:?}", version.as_bytes());
// log::debug!(target: "app", "要求版本字节: {:?}", REQUIRED_SERVICE_VERSION.as_bytes()); // log::debug!(target: "app", "要求版本字节: {:?}", REQUIRED_SERVICE_VERSION.as_bytes());
} else { } else {
log::info!(target: "app", "服务版本匹配，无需重装"); log::info!(target: "app", "Service version matches, no reinstallation needed");
// logging!(info, Type::Service, true, "服务版本匹配，无需重装"); // logging!(info, Type::Service, true, "服务版本匹配，无需重装");
} }
needs_reinstall needs_reinstall
} }
Err(err) => { Err(err) => {
logging!(error, Type::Service, true, "检查服务版本失败: {}", err); logging!(
error,
Type::Service,
true,
"Failed to check service version: {}",
err
);
// 检查服务是否可用 // 检查服务是否可用
match is_service_available().await { match is_service_available().await {
Ok(()) => { Ok(()) => {
log::info!(target: "app", "服务正在运行但版本检查失败: {err}"); log::info!(target: "app", "Service is running but version check failed: {err}");
/* logging!( /* logging!(
info, info,
Type::Service, Type::Service,
@@ -727,7 +779,7 @@ pub async fn check_service_needs_reinstall() -> bool {
false false
} }
_ => { _ => {
log::info!(target: "app", "服务不可用或未运行，需要重装"); log::info!(target: "app", "Service unavailable or not running, reinstallation needed");
// logging!(info, Type::Service, true, "服务不可用或未运行，需要重装"); // logging!(info, Type::Service, true, "服务不可用或未运行，需要重装");
true true
} }
@@ -738,7 +790,7 @@ pub async fn check_service_needs_reinstall() -> bool {
/// 尝试使用服务启动core /// 尝试使用服务启动core
pub(super) async fn start_with_existing_service(config_file: &PathBuf) -> Result<()> { pub(super) async fn start_with_existing_service(config_file: &PathBuf) -> Result<()> {
log::info!(target:"app", "尝试使用现有服务启动核心 (IPC)"); log::info!(target:"app", "Attempting to start core with existing service (IPC)");
// logging!(info, Type::Service, true, "尝试使用现有服务启动核心"); // logging!(info, Type::Service, true, "尝试使用现有服务启动核心");
let clash_core = Config::verge().latest().get_valid_clash_core(); let clash_core = Config::verge().latest().get_valid_clash_core();
@@ -781,8 +833,16 @@ pub(super) async fn start_with_existing_service(config_file: &PathBuf) -> Result
); */ ); */
if !response.success { if !response.success {
let err_msg = response.error.unwrap_or_else(|| "启动核心失败".to_string()); let err_msg = response
logging!(error, Type::Service, true, "启动核心失败: {}", err_msg); .error
.unwrap_or_else(|| "Failed to start core".to_string());
logging!(
error,
Type::Service,
true,
"Failed to start core: {}",
err_msg
);
bail!(err_msg); bail!(err_msg);
} }
@@ -793,127 +853,140 @@ pub(super) async fn start_with_existing_service(config_file: &PathBuf) -> Result
let msg = data let msg = data
.get("msg") .get("msg")
.and_then(|m| m.as_str()) .and_then(|m| m.as_str())
.unwrap_or("未知错误"); .unwrap_or("Unknown error");
if code_value != 0 { if code_value != 0 {
logging!( logging!(
error, error,
Type::Service, Type::Service,
true, true,
"启动核心返回错误: code={}, msg={}", "Start core returned error: code={}, msg={}",
code_value, code_value,
msg msg
); );
bail!("启动核心失败: {}", msg); bail!("Failed to start core: {}", msg);
} }
} }
} }
logging!(info, Type::Service, true, "服务成功启动核心"); logging!(
info,
Type::Service,
true,
"Service successfully started core"
);
Ok(()) Ok(())
} }
Err(e) => { Err(e) => {
logging!(error, Type::Service, true, "启动核心IPC通信失败: {}", e); logging!(
bail!("无法连接到Koala Clash Service: {}", e) error,
Type::Service,
true,
"Failed to start core via IPC: {}",
e
);
bail!("Unable to connect to Koala Clash Service: {}", e)
} }
} }
} }
// 以服务启动core // 以服务启动core
pub(super) async fn run_core_by_service(config_file: &PathBuf) -> Result<()> { pub(super) async fn run_core_by_service(config_file: &PathBuf) -> Result<()> {
log::info!(target: "app", "正在尝试通过服务启动核心"); log::info!(target: "app", "Attempting to start core via service");
// 先检查服务版本，不受冷却期限制 // 先检查服务版本，不受冷却期限制
let version_check = match check_service_version().await { let version_check = match check_service_version().await {
Ok(version) => { Ok(version) => {
log::info!(target: "app", "检测到服务版本: {version}, 要求版本: {REQUIRED_SERVICE_VERSION}"); log::info!(target: "app", "Detected service version: {version}, required: {REQUIRED_SERVICE_VERSION}");
if version.as_bytes() != REQUIRED_SERVICE_VERSION.as_bytes() { if version.as_bytes() != REQUIRED_SERVICE_VERSION.as_bytes() {
log::warn!(target: "app", "服务版本不匹配，需要重装"); log::warn!(target: "app", "Service version mismatch, reinstallation required");
false false
} else { } else {
log::info!(target: "app", "服务版本匹配"); log::info!(target: "app", "Service version matches");
true true
} }
} }
Err(err) => { Err(err) => {
log::warn!(target: "app", "无法获取服务版本: {err}"); log::warn!(target: "app", "Failed to get service version: {err}");
false false
} }
}; };
if version_check && is_service_available().await.is_ok() { if version_check && is_service_available().await.is_ok() {
log::info!(target: "app", "服务已在运行且版本匹配，尝试使用"); log::info!(target: "app", "Service is running and version matches, attempting to use it");
return start_with_existing_service(config_file).await; return start_with_existing_service(config_file).await;
} }
if !version_check { if !version_check {
log::info!(target: "app", "服务版本不匹配，尝试重装"); log::info!(target: "app", "Service version mismatch, attempting reinstallation");
let service_state = ServiceState::get(); let service_state = ServiceState::get();
if !service_state.can_reinstall() { if !service_state.can_reinstall() {
log::warn!(target: "app", "由于限制无法重装服务"); log::warn!(target: "app", "Cannot reinstall service due to limitations");
if let Ok(()) = start_with_existing_service(config_file).await { if let Ok(()) = start_with_existing_service(config_file).await {
log::info!(target: "app", "尽管版本不匹配，但成功启动了服务"); log::info!(target: "app", "Service started successfully despite version mismatch");
return Ok(()); return Ok(());
} else { } else {
bail!("服务版本不匹配且无法重装，启动失败"); bail!("Service version mismatch and cannot reinstall; startup failed");
} }
} }
log::info!(target: "app", "开始重装服务"); log::info!(target: "app", "Starting service reinstallation");
if let Err(err) = reinstall_service().await { if let Err(err) = reinstall_service().await {
log::warn!(target: "app", "服务重装失败: {err}"); log::warn!(target: "app", "Service reinstallation failed: {err}");
log::info!(target: "app", "尝试使用现有服务"); log::info!(target: "app", "Attempting to use existing service");
return start_with_existing_service(config_file).await; return start_with_existing_service(config_file).await;
} }
log::info!(target: "app", "服务重装成功，尝试启动"); log::info!(target: "app", "Service reinstalled successfully, attempting to start");
return start_with_existing_service(config_file).await; return start_with_existing_service(config_file).await;
} }
// 检查服务状态 // Check service status
match check_ipc_service_status().await { match check_ipc_service_status().await {
Ok(_) => { Ok(_) => {
log::info!(target: "app", "服务可用但未运行核心，尝试启动"); log::info!(target: "app", "Service available but core not running, attempting to start");
if let Ok(()) = start_with_existing_service(config_file).await { if let Ok(()) = start_with_existing_service(config_file).await {
return Ok(()); return Ok(());
} }
} }
Err(err) => { Err(err) => {
log::warn!(target: "app", "服务检查失败: {err}"); log::warn!(target: "app", "Service check failed: {err}");
} }
} }
// 服务不可用或启动失败，检查是否需要重装 // Service unavailable or startup failed, check if reinstallation is needed
if check_service_needs_reinstall().await { if check_service_needs_reinstall().await {
log::info!(target: "app", "服务需要重装"); log::info!(target: "app", "Service needs reinstallation");
if let Err(err) = reinstall_service().await { if let Err(err) = reinstall_service().await {
log::warn!(target: "app", "服务重装失败: {err}"); log::warn!(target: "app", "Service reinstallation failed: {err}");
bail!("Failed to reinstall service: {}", err); bail!("Failed to reinstall service: {}", err);
} }
log::info!(target: "app", "服务重装完成，尝试启动核心"); log::info!(target: "app", "Service reinstallation completed, attempting to start core");
start_with_existing_service(config_file).await start_with_existing_service(config_file).await
} else { } else {
log::warn!(target: "app", "服务不可用且无法重装"); log::warn!(target: "app", "Service unavailable and cannot be reinstalled");
bail!("Service is not available and cannot be reinstalled at this time") bail!("Service is not available and cannot be reinstalled at this time")
} }
} }
/// 通过服务停止core /// 通过服务停止core
pub(super) async fn stop_core_by_service() -> Result<()> { pub(super) async fn stop_core_by_service() -> Result<()> {
logging!(info, Type::Service, true, "通过服务停止核心 (IPC)"); logging!(info, Type::Service, true, "Stopping core via service (IPC)");
let payload = serde_json::json!({}); let payload = serde_json::json!({});
let response = send_ipc_request(IpcCommand::StopClash, payload) let response = send_ipc_request(IpcCommand::StopClash, payload)
.await .await
.context("无法连接到Koala Clash Service")?; .context("Unable to connect to Koala Clash Service")?;
if !response.success { if !response.success {
bail!(response.error.unwrap_or_else(|| "停止核心失败".to_string())); bail!(response
.error
.unwrap_or_else(|| "Failed to stop core".to_string()));
} }
if let Some(data) = &response.data { if let Some(data) = &response.data {
@@ -922,18 +995,18 @@ pub(super) async fn stop_core_by_service() -> Result<()> {
let msg = data let msg = data
.get("msg") .get("msg")
.and_then(|m| m.as_str()) .and_then(|m| m.as_str())
.unwrap_or("未知错误"); .unwrap_or("Unknown error");
if code_value != 0 { if code_value != 0 {
logging!( logging!(
error, error,
Type::Service, Type::Service,
true, true,
"停止核心返回错误: code={}, msg={}", "Stop core returned error: code={}, msg={}",
code_value, code_value,
msg msg
); );
bail!("停止核心失败: {}", msg); bail!("Failed to stop core: {}", msg);
} }
} }
} }
@@ -943,19 +1016,24 @@ pub(super) async fn stop_core_by_service() -> Result<()> {
/// 检查服务是否正在运行 /// 检查服务是否正在运行
pub async fn is_service_available() -> Result<()> { pub async fn is_service_available() -> Result<()> {
logging!(info, Type::Service, true, "开始检查服务是否正在运行"); logging!(
info,
Type::Service,
true,
"Checking whether service is running"
);
match check_ipc_service_status().await { match check_ipc_service_status().await {
Ok(resp) => { Ok(resp) => {
if resp.code == 0 && resp.msg == "ok" && resp.data.is_some() { if resp.code == 0 && resp.msg == "ok" && resp.data.is_some() {
logging!(info, Type::Service, true, "服务正在运行"); logging!(info, Type::Service, true, "Service is running");
Ok(()) Ok(())
} else { } else {
logging!( logging!(
warn, warn,
Type::Service, Type::Service,
true, true,
"服务未正常运行: code={}, msg={}", "Service not running normally: code={}, msg={}",
resp.code, resp.code,
resp.msg resp.msg
); );
@@ -963,7 +1041,13 @@ pub async fn is_service_available() -> Result<()> {
} }
} }
Err(err) => { Err(err) => {
logging!(error, Type::Service, true, "检查服务运行状态失败: {}", err); logging!(
error,
Type::Service,
true,
"Failed to check service running status: {}",
err
);
Err(err) Err(err)
} }
} }
@@ -971,21 +1055,21 @@ pub async fn is_service_available() -> Result<()> {
/// 强制重装服务（UI修复按钮） /// 强制重装服务（UI修复按钮）
pub async fn force_reinstall_service() -> Result<()> { pub async fn force_reinstall_service() -> Result<()> {
log::info!(target: "app", "用户请求强制重装服务"); log::info!(target: "app", "User requested forced service reinstallation");
let service_state = ServiceState::default(); let service_state = ServiceState::default();
service_state.save()?; service_state.save()?;
log::info!(target: "app", "已重置服务状态，开始执行重装"); log::info!(target: "app", "Service state reset, starting reinstallation");
match reinstall_service().await { match reinstall_service().await {
Ok(()) => { Ok(()) => {
log::info!(target: "app", "服务重装成功"); log::info!(target: "app", "Service reinstalled successfully");
Ok(()) Ok(())
} }
Err(err) => { Err(err) => {
log::error!(target: "app", "强制重装服务失败: {err}"); log::error!(target: "app", "Forced service reinstallation failed: {err}");
bail!("强制重装服务失败: {}", err) bail!("Forced service reinstallation failed: {}", err)
} }
} }
} }

126
src-tauri/src/core/service_ipc.rs
View File

@@ -129,14 +129,25 @@ pub async fn send_ipc_request(
winnt::{FILE_SHARE_READ, FILE_SHARE_WRITE, GENERIC_READ, GENERIC_WRITE}, winnt::{FILE_SHARE_READ, FILE_SHARE_WRITE, GENERIC_READ, GENERIC_WRITE},
}; };
logging!(info, Type::Service, true, "正在连接服务 (Windows)..."); logging!(
info,
Type::Service,
true,
"Connecting to service (Windows)..."
);
let command_type = format!("{:?}", command); let command_type = format!("{:?}", command);
let request = match create_signed_request(command, payload) { let request = match create_signed_request(command, payload) {
Ok(req) => req, Ok(req) => req,
Err(e) => { Err(e) => {
logging!(error, Type::Service, true, "创建签名请求失败: {}", e); logging!(
error,
Type::Service,
true,
"Failed to create signed request: {}",
e
);
return Err(e); return Err(e);
} }
}; };
@@ -147,8 +158,14 @@ pub async fn send_ipc_request(
let c_pipe_name = match CString::new(IPC_SOCKET_NAME) { let c_pipe_name = match CString::new(IPC_SOCKET_NAME) {
Ok(name) => name, Ok(name) => name,
Err(e) => { Err(e) => {
logging!(error, Type::Service, true, "创建CString失败: {}", e); logging!(
return Err(anyhow::anyhow!("创建CString失败: {}", e)); error,
Type::Service,
true,
"Failed to create CString: {}",
e
);
return Err(anyhow::anyhow!("Failed to create CString: {}", e));
} }
}; };
@@ -177,29 +194,52 @@ pub async fn send_ipc_request(
} }
let mut pipe = unsafe { File::from_raw_handle(handle as RawHandle) }; let mut pipe = unsafe { File::from_raw_handle(handle as RawHandle) };
logging!(info, Type::Service, true, "服务连接成功 (Windows)"); logging!(
info,
Type::Service,
true,
"Service connection successful (Windows)"
);
let request_bytes = request_json.as_bytes(); let request_bytes = request_json.as_bytes();
let len_bytes = (request_bytes.len() as u32).to_be_bytes(); let len_bytes = (request_bytes.len() as u32).to_be_bytes();
if let Err(e) = pipe.write_all(&len_bytes) { if let Err(e) = pipe.write_all(&len_bytes) {
logging!(error, Type::Service, true, "写入请求长度失败: {}", e); logging!(
error,
Type::Service,
true,
"Failed to write request length: {}",
e
);
return Err(anyhow::anyhow!("写入请求长度失败: {}", e)); return Err(anyhow::anyhow!("写入请求长度失败: {}", e));
} }
if let Err(e) = pipe.write_all(request_bytes) { if let Err(e) = pipe.write_all(request_bytes) {
logging!(error, Type::Service, true, "写入请求内容失败: {}", e); logging!(
error,
Type::Service,
true,
"Failed to write request body: {}",
e
);
return Err(anyhow::anyhow!("写入请求内容失败: {}", e)); return Err(anyhow::anyhow!("写入请求内容失败: {}", e));
} }
if let Err(e) = pipe.flush() { if let Err(e) = pipe.flush() {
logging!(error, Type::Service, true, "刷新管道失败: {}", e); logging!(error, Type::Service, true, "Failed to flush pipe: {}", e);
return Err(anyhow::anyhow!("刷新管道失败: {}", e)); return Err(anyhow::anyhow!("刷新管道失败: {}", e));
} }
let mut response_len_bytes = [0u8; 4]; let mut response_len_bytes = [0u8; 4];
if let Err(e) = pipe.read_exact(&mut response_len_bytes) { if let Err(e) = pipe.read_exact(&mut response_len_bytes) {
logging!(error, Type::Service, true, "读取响应长度失败: {}", e); logging!(
error,
Type::Service,
true,
"Failed to read response length: {}",
e
);
return Err(anyhow::anyhow!("读取响应长度失败: {}", e)); return Err(anyhow::anyhow!("读取响应长度失败: {}", e));
} }
@@ -207,14 +247,26 @@ pub async fn send_ipc_request(
let mut response_bytes = vec![0u8; response_len]; let mut response_bytes = vec![0u8; response_len];
if let Err(e) = pipe.read_exact(&mut response_bytes) { if let Err(e) = pipe.read_exact(&mut response_bytes) {
logging!(error, Type::Service, true, "读取响应内容失败: {}", e); logging!(
error,
Type::Service,
true,
"Failed to read response body: {}",
e
);
return Err(anyhow::anyhow!("读取响应内容失败: {}", e)); return Err(anyhow::anyhow!("读取响应内容失败: {}", e));
} }
let response: IpcResponse = match serde_json::from_slice::<IpcResponse>(&response_bytes) { let response: IpcResponse = match serde_json::from_slice::<IpcResponse>(&response_bytes) {
Ok(r) => r, Ok(r) => r,
Err(e) => { Err(e) => {
logging!(error, Type::Service, true, "服务响应解析失败: {}", e); logging!(
error,
Type::Service,
true,
"Failed to parse service response: {}",
e
);
return Err(anyhow::anyhow!("解析响应失败: {}", e)); return Err(anyhow::anyhow!("解析响应失败: {}", e));
} }
}; };
@@ -222,12 +274,23 @@ pub async fn send_ipc_request(
match verify_response_signature(&response) { match verify_response_signature(&response) {
Ok(valid) => { Ok(valid) => {
if !valid { if !valid {
logging!(error, Type::Service, true, "服务响应签名验证失败"); logging!(
error,
Type::Service,
true,
"Service response signature verification failed"
);
bail!("服务响应签名验证失败"); bail!("服务响应签名验证失败");
} }
} }
Err(e) => { Err(e) => {
logging!(error, Type::Service, true, "验证响应签名时出错: {}", e); logging!(
error,
Type::Service,
true,
"Error verifying response signature: {}",
e
);
return Err(e); return Err(e);
} }
} }
@@ -236,7 +299,7 @@ pub async fn send_ipc_request(
info, info,
Type::Service, Type::Service,
true, true,
"IPC请求完成: 命令={}, 成功={}", "IPC request completed: command={}, success={}",
command_type, command_type,
response.success response.success
); );
@@ -255,7 +318,7 @@ pub async fn send_ipc_request(
) -> Result<IpcResponse> { ) -> Result<IpcResponse> {
use std::os::unix::net::UnixStream; use std::os::unix::net::UnixStream;
logging!(info, Type::Service, true, "正在连接服务 (Unix)..."); logging!(info, Type::Service, true, "Connecting to service (Unix)...");
let command_type = format!("{command:?}"); let command_type = format!("{command:?}");
@@ -271,11 +334,22 @@ pub async fn send_ipc_request(
let mut stream = match UnixStream::connect(IPC_SOCKET_NAME) { let mut stream = match UnixStream::connect(IPC_SOCKET_NAME) {
Ok(s) => { Ok(s) => {
logging!(info, Type::Service, true, "服务连接成功 (Unix)"); logging!(
info,
Type::Service,
true,
"Service connection successful (Unix)"
);
s s
} }
Err(e) => { Err(e) => {
logging!(error, Type::Service, true, "连接到Unix套接字失败: {}", e); logging!(
error,
Type::Service,
true,
"Failed to connect to Unix socket: {}",
e
);
return Err(anyhow::anyhow!("无法连接到服务Unix套接字: {}", e)); return Err(anyhow::anyhow!("无法连接到服务Unix套接字: {}", e));
} }
}; };
@@ -310,7 +384,13 @@ pub async fn send_ipc_request(
let response: IpcResponse = match serde_json::from_slice::<IpcResponse>(&response_bytes) { let response: IpcResponse = match serde_json::from_slice::<IpcResponse>(&response_bytes) {
Ok(r) => r, Ok(r) => r,
Err(e) => { Err(e) => {
logging!(error, Type::Service, true, "服务响应解析失败: {}", e,); logging!(
error,
Type::Service,
true,
"Failed to parse service response: {}",
e,
);
return Err(anyhow::anyhow!("解析响应失败: {}", e)); return Err(anyhow::anyhow!("解析响应失败: {}", e));
} }
}; };
@@ -323,7 +403,13 @@ pub async fn send_ipc_request(
} }
} }
Err(e) => { Err(e) => {
logging!(error, Type::Service, true, "验证响应签名时出错: {}", e); logging!(
error,
Type::Service,
true,
"Error verifying response signature: {}",
e
);
return Err(e); return Err(e);
} }
} }
@@ -332,7 +418,7 @@ pub async fn send_ipc_request(
info, info,
Type::Service, Type::Service,
true, true,
"IPC请求完成: 命令={}, 成功={}", "IPC request completed: command={}, success={}",
command_type, command_type,
response.success response.success
); );

12
src-tauri/src/core/sysopt.rs
View File

@@ -63,7 +63,7 @@ impl Sysopt {
let proxy_manager = EventDrivenProxyManager::global(); let proxy_manager = EventDrivenProxyManager::global();
proxy_manager.notify_app_started(); proxy_manager.notify_app_started();
log::info!(target: "app", "已启用事件驱动代理守卫"); log::info!(target: "app", "Event-driven proxy guard enabled");
Ok(()) Ok(())
} }
@@ -193,7 +193,7 @@ impl Sysopt {
let mut autoproxy = match Autoproxy::get_auto_proxy() { let mut autoproxy = match Autoproxy::get_auto_proxy() {
Ok(ap) => ap, Ok(ap) => ap,
Err(e) => { Err(e) => {
log::warn!(target: "app", "重置代理时获取自动代理配置失败: {e}, 使用默认配置"); log::warn!(target: "app", "Failed to get auto proxy config while resetting: {e}, using default config");
Autoproxy { Autoproxy {
enable: false, enable: false,
url: "".to_string(), url: "".to_string(),
@@ -248,14 +248,14 @@ impl Sysopt {
{ {
if is_enable { if is_enable {
if let Err(e) = startup_shortcut::create_shortcut() { if let Err(e) = startup_shortcut::create_shortcut() {
log::error!(target: "app", "创建启动快捷方式失败: {}", e); log::error!(target: "app", "Failed to create startup shortcut: {}", e);
// 如果快捷方式创建失败，回退到原来的方法 // 如果快捷方式创建失败，回退到原来的方法
self.try_original_autostart_method(is_enable); self.try_original_autostart_method(is_enable);
} else { } else {
return Ok(()); return Ok(());
} }
} else if let Err(e) = startup_shortcut::remove_shortcut() { } else if let Err(e) = startup_shortcut::remove_shortcut() {
log::error!(target: "app", "删除启动快捷方式失败: {}", e); log::error!(target: "app", "Failed to remove startup shortcut: {}", e);
self.try_original_autostart_method(is_enable); self.try_original_autostart_method(is_enable);
} else { } else {
return Ok(()); return Ok(());
@@ -290,11 +290,11 @@ impl Sysopt {
{ {
match startup_shortcut::is_shortcut_enabled() { match startup_shortcut::is_shortcut_enabled() {
Ok(enabled) => { Ok(enabled) => {
log::info!(target: "app", "快捷方式自启动状态: {}", enabled); log::info!(target: "app", "Shortcut auto-launch state: {}", enabled);
return Ok(enabled); return Ok(enabled);
} }
Err(e) => { Err(e) => {
log::error!(target: "app", "检查快捷方式失败，尝试原来的方法: {}", e); log::error!(target: "app", "Failed to check shortcut, falling back to original method: {}", e);
} }
} }
} }

59
src-tauri/src/core/timer.rs
View File

@@ -73,7 +73,7 @@ impl Timer {
logging!( logging!(
info, info,
Type::Timer, Type::Timer,
"已注册的定时任务数量: {}", "Registered timer task count: {}",
timer_map.len() timer_map.len()
); );
@@ -81,7 +81,7 @@ impl Timer {
logging!( logging!(
info, info,
Type::Timer, Type::Timer,
"注册了定时任务 - uid={}, interval={}min, task_id={}", "Registered timer task - uid={}, interval={}min, task_id={}",
uid, uid,
task.interval_minutes, task.interval_minutes,
task.task_id task.task_id
@@ -100,7 +100,12 @@ impl Timer {
let uid = item.uid.as_ref()?; let uid = item.uid.as_ref()?;
if interval > 0 && cur_timestamp - updated >= interval * 60 { if interval > 0 && cur_timestamp - updated >= interval * 60 {
logging!(info, Type::Timer, "需要立即更新的配置: uid={}", uid); logging!(
info,
Type::Timer,
"Profile requires immediate update: uid={}",
uid
);
Some(uid.clone()) Some(uid.clone())
} else { } else {
None None
@@ -116,7 +121,7 @@ impl Timer {
logging!( logging!(
info, info,
Type::Timer, Type::Timer,
"需要立即更新的配置数量: {}", "Number of profiles requiring immediate update: {}",
profiles_to_update.len() profiles_to_update.len()
); );
let timer_map = self.timer_map.read(); let timer_map = self.timer_map.read();
@@ -124,7 +129,7 @@ impl Timer {
for uid in profiles_to_update { for uid in profiles_to_update {
if let Some(task) = timer_map.get(&uid) { if let Some(task) = timer_map.get(&uid) {
logging!(info, Type::Timer, "立即执行任务: uid={}", uid); logging!(info, Type::Timer, "Executing task immediately: uid={}", uid);
if let Err(e) = delay_timer.advance_task(task.task_id) { if let Err(e) = delay_timer.advance_task(task.task_id) {
logging!(warn, Type::Timer, "Failed to advance task {}: {}", uid, e); logging!(warn, Type::Timer, "Failed to advance task {}: {}", uid, e);
} }
@@ -237,7 +242,7 @@ impl Timer {
logging!( logging!(
debug, debug,
Type::Timer, Type::Timer,
"找到定时更新配置: uid={}, interval={}min", "Found scheduled update config: uid={}, interval={}min",
uid, uid,
interval interval
); );
@@ -251,7 +256,7 @@ impl Timer {
logging!( logging!(
debug, debug,
Type::Timer, Type::Timer,
"生成的定时更新配置数量: {}", "Generated scheduled update config count: {}",
new_map.len() new_map.len()
); );
new_map new_map
@@ -267,7 +272,7 @@ impl Timer {
logging!( logging!(
debug, debug,
Type::Timer, Type::Timer,
"当前 timer_map 大小: {}", "Current timer_map size: {}",
timer_map.len() timer_map.len()
); );
@@ -279,7 +284,7 @@ impl Timer {
logging!( logging!(
debug, debug,
Type::Timer, Type::Timer,
"定时任务间隔变更: uid={}, 旧={}, 新={}", "Timer task interval changed: uid={}, old={}, new={}",
uid, uid,
task.interval_minutes, task.interval_minutes,
interval interval
@@ -288,12 +293,12 @@ impl Timer {
} }
None => { None => {
// Task no longer needed // Task no longer needed
logging!(debug, Type::Timer, "定时任务已删除: uid={}", uid); logging!(debug, Type::Timer, "Timer task removed: uid={}", uid);
diff_map.insert(uid.clone(), DiffFlag::Del(task.task_id)); diff_map.insert(uid.clone(), DiffFlag::Del(task.task_id));
} }
_ => { _ => {
// Task exists with same interval, no change needed // Task exists with same interval, no change needed
logging!(debug, Type::Timer, "定时任务保持不变: uid={}", uid); logging!(debug, Type::Timer, "Timer task unchanged: uid={}", uid);
} }
} }
} }
@@ -306,7 +311,7 @@ impl Timer {
logging!( logging!(
debug, debug,
Type::Timer, Type::Timer,
"新增定时任务: uid={}, interval={}min", "Added timer task: uid={}, interval={}min",
uid, uid,
interval interval
); );
@@ -321,6 +326,12 @@ impl Timer {
} }
logging!(debug, Type::Timer, "定时任务变更数量: {}", diff_map.len()); logging!(debug, Type::Timer, "定时任务变更数量: {}", diff_map.len());
logging!(
debug,
Type::Timer,
"Number of timer task changes: {}",
diff_map.len()
);
diff_map diff_map
} }
@@ -363,13 +374,18 @@ impl Timer {
/// Get next update time for a profile /// Get next update time for a profile
pub fn get_next_update_time(&self, uid: &str) -> Option<i64> { pub fn get_next_update_time(&self, uid: &str) -> Option<i64> {
logging!(info, Type::Timer, "获取下次更新时间，uid={}", uid); logging!(info, Type::Timer, "Getting next update time, uid={}", uid);
let timer_map = self.timer_map.read(); let timer_map = self.timer_map.read();
let task = match timer_map.get(uid) { let task = match timer_map.get(uid) {
Some(t) => t, Some(t) => t,
None => { None => {
logging!(warn, Type::Timer, "找不到对应的定时任务，uid={}", uid); logging!(
warn,
Type::Timer,
"Corresponding timer task not found, uid={}",
uid
);
return None; return None;
} }
}; };
@@ -380,7 +396,7 @@ impl Timer {
let items = match profiles.get_items() { let items = match profiles.get_items() {
Some(i) => i, Some(i) => i,
None => { None => {
logging!(warn, Type::Timer, "获取配置列表失败"); logging!(warn, Type::Timer, "Failed to get profile list");
return None; return None;
} }
}; };
@@ -388,7 +404,12 @@ impl Timer {
let profile = match items.iter().find(|item| item.uid.as_deref() == Some(uid)) { let profile = match items.iter().find(|item| item.uid.as_deref() == Some(uid)) {
Some(p) => p, Some(p) => p,
None => { None => {
logging!(warn, Type::Timer, "找不到对应的配置，uid={}", uid); logging!(
warn,
Type::Timer,
"Corresponding profile not found, uid={}",
uid
);
return None; return None;
} }
}; };
@@ -401,7 +422,7 @@ impl Timer {
logging!( logging!(
info, info,
Type::Timer, Type::Timer,
"计算得到下次更新时间: {}, uid={}", "Calculated next update time: {}, uid={}",
next_time, next_time,
uid uid
); );
@@ -410,7 +431,7 @@ impl Timer {
logging!( logging!(
warn, warn,
Type::Timer, Type::Timer,
"更新时间或间隔无效，updated={}, interval={}", "Invalid update time or interval, updated={}, interval={}",
updated, updated,
task.interval_minutes task.interval_minutes
); );
@@ -442,7 +463,7 @@ impl Timer {
logging!( logging!(
info, info,
Type::Timer, Type::Timer,
"配置 {} 是否为当前激活配置: {}", "Is profile {} currently active: {}",
uid, uid,
is_current is_current
); );

43
src-tauri/src/core/tray/mod.rs
View File

@@ -3,7 +3,6 @@ use tauri::tray::TrayIconBuilder;
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
pub mod speed_rate; pub mod speed_rate;
use crate::{ use crate::{
cmd,
config::Config, config::Config,
feat, logging, feat, logging,
module::{lightweight::is_in_lightweight_mode, mihomo::Rate}, module::{lightweight::is_in_lightweight_mode, mihomo::Rate},
@@ -46,7 +45,7 @@ fn should_handle_tray_click() -> bool {
*last_click = now; *last_click = now;
true true
} else { } else {
log::debug!(target: "app", "托盘点击被防抖机制忽略，距离上次点击 {:?}ms", log::debug!(target: "app", "Tray click ignored by debounce; time since last click: {:?}ms",
now.duration_since(*last_click).as_millis()); now.duration_since(*last_click).as_millis());
false false
} }
@@ -231,7 +230,7 @@ impl Tray {
let app_handle = match handle::Handle::global().app_handle() { let app_handle = match handle::Handle::global().app_handle() {
Some(handle) => handle, Some(handle) => handle,
None => { None => {
log::warn!(target: "app", "更新托盘菜单失败: app_handle不存在"); log::warn!(target: "app", "Failed to update tray menu: app_handle not found");
return Ok(()); return Ok(());
} }
}; };
@@ -279,11 +278,11 @@ impl Tray {
profile_uid_and_name, profile_uid_and_name,
is_lightweight_mode, is_lightweight_mode,
)?)); )?));
log::debug!(target: "app", "托盘菜单更新成功"); log::debug!(target: "app", "Tray menu updated successfully");
Ok(()) Ok(())
} }
None => { None => {
log::warn!(target: "app", "更新托盘菜单失败: 托盘不存在"); log::warn!(target: "app", "Failed to update tray menu: tray not found");
Ok(()) Ok(())
} }
} }
@@ -295,7 +294,7 @@ impl Tray {
let app_handle = match handle::Handle::global().app_handle() { let app_handle = match handle::Handle::global().app_handle() {
Some(handle) => handle, Some(handle) => handle,
None => { None => {
log::warn!(target: "app", "更新托盘图标失败: app_handle不存在"); log::warn!(target: "app", "Failed to update tray icon: app_handle not found");
return Ok(()); return Ok(());
} }
}; };
@@ -303,7 +302,7 @@ impl Tray {
let tray = match app_handle.tray_by_id("main") { let tray = match app_handle.tray_by_id("main") {
Some(tray) => tray, Some(tray) => tray,
None => { None => {
log::warn!(target: "app", "更新托盘图标失败: 托盘不存在"); log::warn!(target: "app", "Failed to update tray icon: tray not found");
return Ok(()); return Ok(());
} }
}; };
@@ -332,7 +331,7 @@ impl Tray {
let app_handle = match handle::Handle::global().app_handle() { let app_handle = match handle::Handle::global().app_handle() {
Some(handle) => handle, Some(handle) => handle,
None => { None => {
log::warn!(target: "app", "更新托盘图标失败: app_handle不存在"); log::warn!(target: "app", "Failed to update tray icon: app_handle not found");
return Ok(()); return Ok(());
} }
}; };
@@ -340,7 +339,7 @@ impl Tray {
let tray = match app_handle.tray_by_id("main") { let tray = match app_handle.tray_by_id("main") {
Some(tray) => tray, Some(tray) => tray,
None => { None => {
log::warn!(target: "app", "更新托盘图标失败: 托盘不存在"); log::warn!(target: "app", "Failed to update tray icon: tray not found");
return Ok(()); return Ok(());
} }
}; };
@@ -376,7 +375,7 @@ impl Tray {
let app_handle = match handle::Handle::global().app_handle() { let app_handle = match handle::Handle::global().app_handle() {
Some(handle) => handle, Some(handle) => handle,
None => { None => {
log::warn!(target: "app", "更新托盘提示失败: app_handle不存在"); log::warn!(target: "app", "Failed to update tray tooltip: app_handle not found");
return Ok(()); return Ok(());
} }
}; };
@@ -384,7 +383,7 @@ impl Tray {
let version = match VERSION.get() { let version = match VERSION.get() {
Some(v) => v, Some(v) => v,
None => { None => {
log::warn!(target: "app", "更新托盘提示失败: 版本信息不存在"); log::warn!(target: "app", "Failed to update tray tooltip: version info not found");
return Ok(()); return Ok(());
} }
}; };
@@ -423,7 +422,7 @@ impl Tray {
current_profile_name current_profile_name
))); )));
} else { } else {
log::warn!(target: "app", "更新托盘提示失败: 托盘不存在"); log::warn!(target: "app", "Failed to update tray tooltip: tray not found");
} }
Ok(()) Ok(())
@@ -443,7 +442,7 @@ impl Tray {
pub fn unsubscribe_traffic(&self) {} pub fn unsubscribe_traffic(&self) {}
pub fn create_tray_from_handle(&self, app_handle: &AppHandle) -> Result<()> { pub fn create_tray_from_handle(&self, app_handle: &AppHandle) -> Result<()> {
log::info!(target: "app", "正在从AppHandle创建系统托盘"); log::info!(target: "app", "Creating system tray from AppHandle");
// 获取图标 // 获取图标
let icon_bytes = TrayState::get_common_tray_icon().1; let icon_bytes = TrayState::get_common_tray_icon().1;
@@ -491,20 +490,20 @@ impl Tray {
"tun_mode" => feat::toggle_tun_mode(None), "tun_mode" => feat::toggle_tun_mode(None),
"main_window" => { "main_window" => {
use crate::utils::window_manager::WindowManager; use crate::utils::window_manager::WindowManager;
log::info!(target: "app", "Tray点击事件: 显示主窗口"); log::info!(target: "app", "Tray click: show main window");
if crate::module::lightweight::is_in_lightweight_mode() { if crate::module::lightweight::is_in_lightweight_mode() {
log::info!(target: "app", "当前在轻量模式，正在退出轻量模式"); log::info!(target: "app", "Currently in lightweight mode, exiting lightweight mode");
crate::module::lightweight::exit_lightweight_mode(); crate::module::lightweight::exit_lightweight_mode();
} }
let result = WindowManager::show_main_window(); let result = WindowManager::show_main_window();
log::info!(target: "app", "窗口显示结果: {result:?}"); log::info!(target: "app", "Window show result: {result:?}");
} }
_ => {} _ => {}
} }
} }
}); });
tray.on_menu_event(on_menu_event); tray.on_menu_event(on_menu_event);
log::info!(target: "app", "系统托盘创建成功"); log::info!(target: "app", "System tray created successfully");
Ok(()) Ok(())
} }
@@ -718,18 +717,18 @@ fn on_menu_event(_: &AppHandle, event: MenuEvent) {
} }
"open_window" => { "open_window" => {
use crate::utils::window_manager::WindowManager; use crate::utils::window_manager::WindowManager;
log::info!(target: "app", "托盘菜单点击: 打开窗口"); log::info!(target: "app", "Tray menu click: open window");
if !should_handle_tray_click() { if !should_handle_tray_click() {
return; return;
} }
if crate::module::lightweight::is_in_lightweight_mode() { if crate::module::lightweight::is_in_lightweight_mode() {
log::info!(target: "app", "当前在轻量模式，正在退出"); log::info!(target: "app", "Currently in lightweight mode, exiting");
crate::module::lightweight::exit_lightweight_mode(); crate::module::lightweight::exit_lightweight_mode();
} }
let result = WindowManager::show_main_window(); let result = WindowManager::show_main_window();
log::info!(target: "app", "窗口显示结果: {result:?}"); log::info!(target: "app", "Window show result: {result:?}");
} }
"system_proxy" => { "system_proxy" => {
feat::toggle_system_proxy(); feat::toggle_system_proxy();
@@ -754,7 +753,7 @@ fn on_menu_event(_: &AppHandle, event: MenuEvent) {
if was_lightweight { if was_lightweight {
use crate::utils::window_manager::WindowManager; use crate::utils::window_manager::WindowManager;
let result = WindowManager::show_main_window(); let result = WindowManager::show_main_window();
log::info!(target: "app", "退出轻量模式后显示主窗口: {result:?}"); log::info!(target: "app", "Show main window after exiting lightweight mode: {result:?}");
} }
} }
"quit" => { "quit" => {
@@ -768,6 +767,6 @@ fn on_menu_event(_: &AppHandle, event: MenuEvent) {
} }
if let Err(e) = Tray::global().update_all_states() { if let Err(e) = Tray::global().update_all_states() {
log::warn!(target: "app", "更新托盘状态失败: {e}"); log::warn!(target: "app", "Failed to update tray state: {e}");
} }
} }

4
src-tauri/src/enhance/mod.rs
View File

@@ -202,8 +202,10 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
}); });
let patch_tun = value.as_mapping().cloned().unwrap_or(Mapping::new()); let patch_tun = value.as_mapping().cloned().unwrap_or(Mapping::new());
for (key, value) in patch_tun.into_iter() { for (key, value) in patch_tun.into_iter() {
if !tun.contains_key(&key) {
tun.insert(key, value); tun.insert(key, value);
} }
}
config.insert("tun".into(), tun.into()); config.insert("tun".into(), tun.into());
} else { } else {
if key.as_str() == Some("socks-port") && !socks_enabled { if key.as_str() == Some("socks-port") && !socks_enabled {
@@ -239,7 +241,7 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
.filter(|(s, _)| s.is_support(clash_core.as_ref())) .filter(|(s, _)| s.is_support(clash_core.as_ref()))
.map(|(_, c)| c) .map(|(_, c)| c)
.for_each(|item| { .for_each(|item| {
log::debug!(target: "app", "run builtin script {}", item.uid); log::debug!(target: "app", "run builtin script {0}", item.uid);
if let ChainType::Script(script) = item.data { if let ChainType::Script(script) = item.data {
match use_script(script, config.to_owned(), "".to_string()) { match use_script(script, config.to_owned(), "".to_string()) {
Ok((res_config, _)) => { Ok((res_config, _)) => {

4
src-tauri/src/enhance/script.rs
View File

@@ -141,8 +141,8 @@ fn test_script() {
fn test_escape_unescape() { fn test_escape_unescape() {
let test_string = r#"Hello "World"!\nThis is a test with \u00A9 copyright symbol."#; let test_string = r#"Hello "World"!\nThis is a test with \u00A9 copyright symbol."#;
let escaped = escape_js_string_for_single_quote(test_string); let escaped = escape_js_string_for_single_quote(test_string);
println!("Original: {}", test_string); println!("Original: {test_string}");
println!("Escaped: {}", escaped); println!("Escaped: {escaped}");
let json_str = r#"{"key":"value","nested":{"key":"value"}}"#; let json_str = r#"{"key":"value","nested":{"key":"value"}}"#;
let parsed = parse_json_safely(json_str).unwrap(); let parsed = parse_json_safely(json_str).unwrap();

50
src-tauri/src/feat/profile.rs
View File

@@ -31,7 +31,13 @@ pub async fn update_profile(
option: Option<PrfOption>, option: Option<PrfOption>,
auto_refresh: Option<bool>, auto_refresh: Option<bool>,
) -> Result<()> { ) -> Result<()> {
logging!(info, Type::Config, true, "[订阅更新] 开始更新订阅 {}", uid); logging!(
info,
Type::Config,
true,
"[Subscription Update] Start updating subscription {}",
uid
);
let auto_refresh = auto_refresh.unwrap_or(true); // 默认为true，保持兼容性 let auto_refresh = auto_refresh.unwrap_or(true); // 默认为true，保持兼容性
let url_opt = { let url_opt = {
@@ -41,14 +47,14 @@ pub async fn update_profile(
let is_remote = item.itype.as_ref().is_some_and(|s| s == "remote"); let is_remote = item.itype.as_ref().is_some_and(|s| s == "remote");
if !is_remote { if !is_remote {
log::info!(target: "app", "[订阅更新] {uid} 不是远程订阅，跳过更新"); log::info!(target: "app", "[Subscription Update] {uid} is not a remote subscription, skipping update");
None // 非远程订阅直接更新 None // 非远程订阅直接更新
} else if item.url.is_none() { } else if item.url.is_none() {
log::warn!(target: "app", "[订阅更新] {uid} 缺少URL，无法更新"); log::warn!(target: "app", "[Subscription Update] {uid} is missing URL, cannot update");
bail!("failed to get the profile item url"); bail!("failed to get the profile item url");
} else { } else {
log::info!(target: "app", log::info!(target: "app",
"[订阅更新] {} 是远程订阅，URL: {}", "[Subscription Update] {} is a remote subscription, URL: {}",
uid, uid,
item.url.clone().unwrap() item.url.clone().unwrap()
); );
@@ -58,24 +64,24 @@ pub async fn update_profile(
let should_update = match url_opt { let should_update = match url_opt {
Some((url, opt)) => { Some((url, opt)) => {
log::info!(target: "app", "[订阅更新] 开始下载新的订阅内容"); log::info!(target: "app", "[Subscription Update] Start downloading new subscription content");
let merged_opt = PrfOption::merge(opt.clone(), option.clone()); let merged_opt = PrfOption::merge(opt.clone(), option.clone());
// 尝试使用正常设置更新 // 尝试使用正常设置更新
match PrfItem::from_url(&url, None, None, merged_opt.clone()).await { match PrfItem::from_url(&url, None, None, merged_opt.clone()).await {
Ok(item) => { Ok(item) => {
log::info!(target: "app", "[订阅更新] 更新订阅配置成功"); log::info!(target: "app", "[Subscription Update] Subscription config updated successfully");
let profiles = Config::profiles(); let profiles = Config::profiles();
let mut profiles = profiles.latest(); let mut profiles = profiles.latest();
profiles.update_item(uid.clone(), item)?; profiles.update_item(uid.clone(), item)?;
let is_current = Some(uid.clone()) == profiles.get_current(); let is_current = Some(uid.clone()) == profiles.get_current();
log::info!(target: "app", "[订阅更新] 是否为当前使用的订阅: {is_current}"); log::info!(target: "app", "[Subscription Update] Is current active subscription: {is_current}");
is_current && auto_refresh is_current && auto_refresh
} }
Err(err) => { Err(err) => {
// 首次更新失败，尝试使用Clash代理 // 首次更新失败，尝试使用Clash代理
log::warn!(target: "app", "[订阅更新] 正常更新失败: {err}，尝试使用Clash代理更新"); log::warn!(target: "app", "[Subscription Update] Normal update failed: {err}, trying to update via Clash proxy");
// 发送通知 // 发送通知
handle::Handle::notice_message("update_retry_with_clash", uid.clone()); handle::Handle::notice_message("update_retry_with_clash", uid.clone());
@@ -92,7 +98,7 @@ pub async fn update_profile(
// 使用Clash代理重试 // 使用Clash代理重试
match PrfItem::from_url(&url, None, None, Some(fallback_opt)).await { match PrfItem::from_url(&url, None, None, Some(fallback_opt)).await {
Ok(mut item) => { Ok(mut item) => {
log::info!(target: "app", "[订阅更新] 使用Clash代理更新成功"); log::info!(target: "app", "[Subscription Update] Update via Clash proxy succeeded");
// 恢复原始代理设置到item // 恢复原始代理设置到item
if let Some(option) = item.option.as_mut() { if let Some(option) = item.option.as_mut() {
@@ -112,11 +118,11 @@ pub async fn update_profile(
handle::Handle::notice_message("update_with_clash_proxy", profile_name); handle::Handle::notice_message("update_with_clash_proxy", profile_name);
let is_current = Some(uid.clone()) == profiles.get_current(); let is_current = Some(uid.clone()) == profiles.get_current();
log::info!(target: "app", "[订阅更新] 是否为当前使用的订阅: {is_current}"); log::info!(target: "app", "[Subscription Update] Is current active subscription: {is_current}");
is_current && auto_refresh is_current && auto_refresh
} }
Err(retry_err) => { Err(retry_err) => {
log::error!(target: "app", "[订阅更新] 使用Clash代理更新仍然失败: {retry_err}"); log::error!(target: "app", "[Subscription Update] Update via Clash proxy still failed: {retry_err}");
handle::Handle::notice_message( handle::Handle::notice_message(
"update_failed_even_with_clash", "update_failed_even_with_clash",
format!("{retry_err}"), format!("{retry_err}"),
@@ -131,14 +137,30 @@ pub async fn update_profile(
}; };
if should_update { if should_update {
logging!(info, Type::Config, true, "[订阅更新] 更新内核配置"); logging!(
info,
Type::Config,
true,
"[Subscription Update] Update core configuration"
);
match CoreManager::global().update_config().await { match CoreManager::global().update_config().await {
Ok(_) => { Ok(_) => {
logging!(info, Type::Config, true, "[订阅更新] 更新成功"); logging!(
info,
Type::Config,
true,
"[Subscription Update] Update succeeded"
);
handle::Handle::refresh_clash(); handle::Handle::refresh_clash();
} }
Err(err) => { Err(err) => {
logging!(error, Type::Config, true, "[订阅更新] 更新失败: {}", err); logging!(
error,
Type::Config,
true,
"[Subscription Update] Update failed: {}",
err
);
handle::Handle::notice_message("update_failed", format!("{err}")); handle::Handle::notice_message("update_failed", format!("{err}"));
log::error!(target: "app", "{err}"); log::error!(target: "app", "{err}");
} }

56
src-tauri/src/feat/window.rs
View File

@@ -25,14 +25,14 @@ fn open_or_close_dashboard_internal(bypass_debounce: bool) {
use crate::process::AsyncHandler; use crate::process::AsyncHandler;
use crate::utils::window_manager::WindowManager; use crate::utils::window_manager::WindowManager;
log::info!(target: "app", "Attempting to open/close dashboard (绕过防抖: {bypass_debounce})"); log::info!(target: "app", "Attempting to open/close dashboard (bypass debounce: {bypass_debounce})");
// 热键调用调度到主线程执行，避免 WebView 创建死锁 // 热键调用调度到主线程执行，避免 WebView 创建死锁
if bypass_debounce { if bypass_debounce {
log::info!(target: "app", "热键调用，调度到主线程执行窗口操作"); log::info!(target: "app", "Hotkey invoked, dispatching window operation to main thread");
AsyncHandler::spawn(move || async move { AsyncHandler::spawn(move || async move {
log::info!(target: "app", "主线程中执行热键窗口操作"); log::info!(target: "app", "Executing hotkey window operation on main thread");
if crate::module::lightweight::is_in_lightweight_mode() { if crate::module::lightweight::is_in_lightweight_mode() {
log::info!(target: "app", "Currently in lightweight mode, exiting lightweight mode"); log::info!(target: "app", "Currently in lightweight mode, exiting lightweight mode");
@@ -64,7 +64,7 @@ fn open_or_close_dashboard_internal(bypass_debounce: bool) {
/// 异步优化的应用退出函数 /// 异步优化的应用退出函数
pub fn quit() { pub fn quit() {
use crate::process::AsyncHandler; use crate::process::AsyncHandler;
logging!(debug, Type::System, true, "启动退出流程"); logging!(debug, Type::System, true, "Start exit process");
// 获取应用句柄并设置退出标志 // 获取应用句柄并设置退出标志
let app_handle = handle::Handle::global().app_handle().unwrap(); let app_handle = handle::Handle::global().app_handle().unwrap();
@@ -73,19 +73,24 @@ pub fn quit() {
// 优先关闭窗口，提供立即反馈 // 优先关闭窗口，提供立即反馈
if let Some(window) = handle::Handle::global().get_window() { if let Some(window) = handle::Handle::global().get_window() {
let _ = window.hide(); let _ = window.hide();
log::info!(target: "app", "窗口已隐藏"); log::info!(target: "app", "Window hidden");
} }
// 使用异步任务处理资源清理，避免阻塞 // 使用异步任务处理资源清理，避免阻塞
AsyncHandler::spawn(move || async move { AsyncHandler::spawn(move || async move {
logging!(info, Type::System, true, "开始异步清理资源"); logging!(
info,
Type::System,
true,
"Start asynchronous resource cleanup"
);
let cleanup_result = clean_async().await; let cleanup_result = clean_async().await;
logging!( logging!(
info, info,
Type::System, Type::System,
true, true,
"资源清理完成，退出代码: {}", "Resource cleanup completed, exit code: {}",
if cleanup_result { 0 } else { 1 } if cleanup_result { 0 } else { 1 }
); );
app_handle.exit(if cleanup_result { 0 } else { 1 }); app_handle.exit(if cleanup_result { 0 } else { 1 });
@@ -95,7 +100,12 @@ pub fn quit() {
async fn clean_async() -> bool { async fn clean_async() -> bool {
use tokio::time::{timeout, Duration}; use tokio::time::{timeout, Duration};
logging!(info, Type::System, true, "开始执行异步清理操作..."); logging!(
info,
Type::System,
true,
"Start executing asynchronous cleanup..."
);
// 1. 处理TUN模式 // 1. 处理TUN模式
let tun_task = async { let tun_task = async {
@@ -112,11 +122,11 @@ async fn clean_async() -> bool {
.await .await
{ {
Ok(_) => { Ok(_) => {
log::info!(target: "app", "TUN模式已禁用"); log::info!(target: "app", "TUN mode disabled");
true true
} }
Err(_) => { Err(_) => {
log::warn!(target: "app", "禁用TUN模式超时"); log::warn!(target: "app", "Timeout disabling TUN mode");
false false
} }
} }
@@ -134,11 +144,11 @@ async fn clean_async() -> bool {
.await .await
{ {
Ok(_) => { Ok(_) => {
log::info!(target: "app", "系统代理已重置"); log::info!(target: "app", "System proxy reset");
true true
} }
Err(_) => { Err(_) => {
log::warn!(target: "app", "重置系统代理超时"); log::warn!(target: "app", "Timeout resetting system proxy");
false false
} }
} }
@@ -148,11 +158,11 @@ async fn clean_async() -> bool {
let core_task = async { let core_task = async {
match timeout(Duration::from_secs(3), CoreManager::global().stop_core()).await { match timeout(Duration::from_secs(3), CoreManager::global().stop_core()).await {
Ok(_) => { Ok(_) => {
log::info!(target: "app", "核心服务已停止"); log::info!(target: "app", "Core service stopped");
true true
} }
Err(_) => { Err(_) => {
log::warn!(target: "app", "停止核心服务超时"); log::warn!(target: "app", "Timeout stopping core service");
false false
} }
} }
@@ -168,11 +178,11 @@ async fn clean_async() -> bool {
.await .await
{ {
Ok(_) => { Ok(_) => {
log::info!(target: "app", "DNS设置已恢复"); log::info!(target: "app", "DNS settings restored");
true true
} }
Err(_) => { Err(_) => {
log::warn!(target: "app", "恢复DNS设置超时"); log::warn!(target: "app", "Timeout restoring DNS settings");
false false
} }
} }
@@ -192,7 +202,7 @@ async fn clean_async() -> bool {
info, info,
Type::System, Type::System,
true, true,
"异步清理操作完成 - TUN: {}, 代理: {}, 核心: {}, DNS: {}, 总体: {}", "Asynchronous cleanup completed - TUN: {}, Proxy: {}, Core: {}, DNS: {}, Overall: {}",
tun_success, tun_success,
proxy_success, proxy_success,
core_success, core_success,
@@ -209,7 +219,7 @@ pub fn clean() -> bool {
let (tx, rx) = std::sync::mpsc::channel(); let (tx, rx) = std::sync::mpsc::channel();
AsyncHandler::spawn(move || async move { AsyncHandler::spawn(move || async move {
logging!(info, Type::System, true, "开始执行清理操作..."); logging!(info, Type::System, true, "Start executing cleanup...");
// 使用已有的异步清理函数 // 使用已有的异步清理函数
let cleanup_result = clean_async().await; let cleanup_result = clean_async().await;
@@ -220,7 +230,13 @@ pub fn clean() -> bool {
match rx.recv_timeout(std::time::Duration::from_secs(8)) { match rx.recv_timeout(std::time::Duration::from_secs(8)) {
Ok(result) => { Ok(result) => {
logging!(info, Type::System, true, "清理操作完成，结果: {}", result); logging!(
info,
Type::System,
true,
"Cleanup completed, result: {}",
result
);
result result
} }
Err(_) => { Err(_) => {
@@ -228,7 +244,7 @@ pub fn clean() -> bool {
warn, warn,
Type::System, Type::System,
true, true,
"清理操作超时，返回成功状态避免阻塞" "Cleanup timed out, returning success to avoid blocking"
); );
true true
} }

80
src-tauri/src/lib.rs
View File

@@ -115,7 +115,7 @@ pub fn run() {
.plugin(tauri_plugin_shell::init()) .plugin(tauri_plugin_shell::init())
.plugin(tauri_plugin_deep_link::init()) .plugin(tauri_plugin_deep_link::init())
.setup(|app| { .setup(|app| {
logging!(info, Type::Setup, true, "开始应用初始化..."); logging!(info, Type::Setup, true, "Starting app initialization...");
let mut auto_start_plugin_builder = tauri_plugin_autostart::Builder::new(); let mut auto_start_plugin_builder = tauri_plugin_autostart::Builder::new();
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
{ {
@@ -128,7 +128,7 @@ pub fn run() {
#[cfg(any(target_os = "linux", all(debug_assertions, windows)))] #[cfg(any(target_os = "linux", all(debug_assertions, windows)))]
{ {
use tauri_plugin_deep_link::DeepLinkExt; use tauri_plugin_deep_link::DeepLinkExt;
logging!(info, Type::Setup, true, "注册深层链接..."); logging!(info, Type::Setup, true, "Registering deep links...");
logging_error!(Type::System, true, app.deep_link().register_all()); logging_error!(Type::System, true, app.deep_link().register_all());
} }
@@ -144,7 +144,12 @@ pub fn run() {
}); });
// 窗口管理 // 窗口管理
logging!(info, Type::Setup, true, "初始化窗口状态管理..."); logging!(
info,
Type::Setup,
true,
"Initializing window state management..."
);
let window_state_plugin = tauri_plugin_window_state::Builder::new() let window_state_plugin = tauri_plugin_window_state::Builder::new()
.with_filename("window_state.json") .with_filename("window_state.json")
.with_state_flags(tauri_plugin_window_state::StateFlags::default()) .with_state_flags(tauri_plugin_window_state::StateFlags::default())
@@ -154,7 +159,12 @@ pub fn run() {
// 异步处理 // 异步处理
let app_handle = app.handle().clone(); let app_handle = app.handle().clone();
AsyncHandler::spawn(move || async move { AsyncHandler::spawn(move || async move {
logging!(info, Type::Setup, true, "异步执行应用设置..."); logging!(
info,
Type::Setup,
true,
"Executing app setup asynchronously..."
);
match timeout( match timeout(
Duration::from_secs(30), Duration::from_secs(30),
resolve::resolve_setup_async(&app_handle), resolve::resolve_setup_async(&app_handle),
@@ -162,35 +172,52 @@ pub fn run() {
.await .await
{ {
Ok(_) => { Ok(_) => {
logging!(info, Type::Setup, true, "应用设置成功完成"); logging!(info, Type::Setup, true, "App setup completed successfully");
} }
Err(_) => { Err(_) => {
logging!( logging!(
error, error,
Type::Setup, Type::Setup,
true, true,
"应用设置超时(30秒)，继续执行后续流程" "App setup timed out (30s), continuing with subsequent steps"
); );
} }
} }
}); });
logging!(info, Type::Setup, true, "执行主要设置操作..."); logging!(
info,
Type::Setup,
true,
"Executing main setup operations..."
);
logging!(info, Type::Setup, true, "初始化AppHandleManager..."); logging!(info, Type::Setup, true, "Initializing AppHandleManager...");
AppHandleManager::global().init(app.handle().clone()); AppHandleManager::global().init(app.handle().clone());
logging!(info, Type::Setup, true, "初始化核心句柄..."); logging!(info, Type::Setup, true, "Initializing core handle...");
core::handle::Handle::global().init(app.handle()); core::handle::Handle::global().init(app.handle());
logging!(info, Type::Setup, true, "初始化配置..."); logging!(info, Type::Setup, true, "Initializing config...");
if let Err(e) = utils::init::init_config() { if let Err(e) = utils::init::init_config() {
logging!(error, Type::Setup, true, "初始化配置失败: {}", e); logging!(
error,
Type::Setup,
true,
"Failed to initialize config: {}",
e
);
} }
logging!(info, Type::Setup, true, "初始化资源..."); logging!(info, Type::Setup, true, "Initializing resources...");
if let Err(e) = utils::init::init_resources() { if let Err(e) = utils::init::init_resources() {
logging!(error, Type::Setup, true, "初始化资源失败: {}", e); logging!(
error,
Type::Setup,
true,
"Failed to initialize resources: {}",
e
);
} }
app.manage(Mutex::new(state::proxy::CmdProxyState::default())); app.manage(Mutex::new(state::proxy::CmdProxyState::default()));
@@ -198,13 +225,23 @@ pub fn run() {
tauri::async_runtime::spawn(async { tauri::async_runtime::spawn(async {
tokio::time::sleep(Duration::from_secs(5)).await; tokio::time::sleep(Duration::from_secs(5)).await;
logging!(info, Type::Cmd, true, "Running profile updates at startup..."); logging!(
info,
Type::Cmd,
true,
"Running profile updates at startup..."
);
if let Err(e) = crate::cmd::update_profiles_on_startup().await { if let Err(e) = crate::cmd::update_profiles_on_startup().await {
log::error!("Failed to update profiles on startup: {}", e); log::error!("Failed to update profiles on startup: {e}");
} }
}); });
logging!(info, Type::Setup, true, "初始化完成，继续执行"); logging!(
info,
Type::Setup,
true,
"Initialization completed, continuing"
);
Ok(()) Ok(())
}) })
.invoke_handler(tauri::generate_handler![ .invoke_handler(tauri::generate_handler![
@@ -324,7 +361,7 @@ pub fn run() {
app.run(|app_handle, e| match e { app.run(|app_handle, e| match e {
tauri::RunEvent::Ready | tauri::RunEvent::Resumed => { tauri::RunEvent::Ready | tauri::RunEvent::Resumed => {
logging!(info, Type::System, true, "应用就绪或恢复"); logging!(info, Type::System, true, "App ready or resumed");
AppHandleManager::global().init(app_handle.clone()); AppHandleManager::global().init(app_handle.clone());
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
{ {
@@ -332,7 +369,7 @@ pub fn run() {
.get_handle() .get_handle()
.get_webview_window("main") .get_webview_window("main")
{ {
logging!(info, Type::Window, true, "设置macOS窗口标题"); logging!(info, Type::Window, true, "Setting macOS window title");
let _ = window.set_title("Koala Clash"); let _ = window.set_title("Koala Clash");
} }
} }
@@ -376,7 +413,12 @@ pub fn run() {
if let Some(window) = core::handle::Handle::global().get_window() { if let Some(window) = core::handle::Handle::global().get_window() {
let _ = window.hide(); let _ = window.hide();
} else { } else {
logging!(warn, Type::Window, true, "尝试隐藏窗口但窗口不存在"); logging!(
warn,
Type::Window,
true,
"Tried to hide window but it does not exist"
);
} }
} }
tauri::WindowEvent::Focused(true) => { tauri::WindowEvent::Focused(true) => {

4
src-tauri/src/state/lightweight.rs
View File

@@ -28,9 +28,9 @@ impl LightWeightState {
pub fn set_lightweight_mode(&mut self, value: bool) -> &Self { pub fn set_lightweight_mode(&mut self, value: bool) -> &Self {
self.is_lightweight = value; self.is_lightweight = value;
if value { if value {
logging!(info, Type::Lightweight, true, "轻量模式已开启"); logging!(info, Type::Lightweight, true, "Lightweight mode enabled");
} else { } else {
logging!(info, Type::Lightweight, true, "轻量模式已关闭"); logging!(info, Type::Lightweight, true, "Lightweight mode disabled");
} }
self self
} }

24
src-tauri/src/utils/autostart.rs
View File

@@ -41,9 +41,9 @@ pub fn create_shortcut() -> Result<()> {
let startup_dir = get_startup_dir()?; let startup_dir = get_startup_dir()?;
let shortcut_path = startup_dir.join("Koala-Clash.lnk"); let shortcut_path = startup_dir.join("Koala-Clash.lnk");
// 如果快捷方式已存在，直接返回成功 // If the shortcut already exists, return success directly
if shortcut_path.exists() { if shortcut_path.exists() {
info!(target: "app", "启动快捷方式已存在"); info!(target: "app", "Startup shortcut already exists");
return Ok(()); return Ok(());
} }
@@ -59,36 +59,36 @@ pub fn create_shortcut() -> Result<()> {
let output = std::process::Command::new("powershell") let output = std::process::Command::new("powershell")
.args(["-Command", &powershell_command]) .args(["-Command", &powershell_command])
// 隐藏 PowerShell 窗口 // Hide the PowerShell window
.creation_flags(0x08000000) // CREATE_NO_WINDOW .creation_flags(0x08000000) // CREATE_NO_WINDOW
.output() .output()
.map_err(|e| anyhow!("执行 PowerShell 命令失败: {}", e))?; .map_err(|e| anyhow!("Failed to execute PowerShell command: {}", e))?;
if !output.status.success() { if !output.status.success() {
let error_msg = String::from_utf8_lossy(&output.stderr); let error_msg = String::from_utf8_lossy(&output.stderr);
return Err(anyhow!("创建快捷方式失败: {}", error_msg)); return Err(anyhow!("Failed to create shortcut: {}", error_msg));
} }
info!(target: "app", "成功创建启动快捷方式"); info!(target: "app", "Successfully created startup shortcut");
Ok(()) Ok(())
} }
/// 删除快捷方式 /// Remove the shortcut
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
pub fn remove_shortcut() -> Result<()> { pub fn remove_shortcut() -> Result<()> {
let startup_dir = get_startup_dir()?; let startup_dir = get_startup_dir()?;
let shortcut_path = startup_dir.join("Koala-Clash.lnk"); let shortcut_path = startup_dir.join("Koala-Clash.lnk");
// 如果快捷方式不存在，直接返回成功 // If the shortcut does not exist, return success directly
if !shortcut_path.exists() { if !shortcut_path.exists() {
info!(target: "app", "启动快捷方式不存在，无需删除"); info!(target: "app", "Startup shortcut does not exist, nothing to remove");
return Ok(()); return Ok(());
} }
// 删除快捷方式 // Delete the shortcut
fs::remove_file(&shortcut_path).map_err(|e| anyhow!("删除快捷方式失败: {}", e))?; fs::remove_file(&shortcut_path).map_err(|e| anyhow!("Failed to delete shortcut: {}", e))?;
info!(target: "app", "成功删除启动快捷方式"); info!(target: "app", "Successfully removed startup shortcut");
Ok(()) Ok(())
} }

5
src-tauri/src/utils/resolve.rs
View File

@@ -23,7 +23,6 @@ use tauri::{AppHandle, Manager};
use tokio::net::TcpListener; use tokio::net::TcpListener;
use tauri::Url; use tauri::Url;
use crate::config::PrfOption;
//#[cfg(not(target_os = "linux"))] //#[cfg(not(target_os = "linux"))]
// use window_shadows::set_shadow; // use window_shadows::set_shadow;
@@ -556,7 +555,9 @@ pub async fn resolve_scheme(param: String) -> Result<()> {
for (key, value) in link_parsed.query_pairs() { for (key, value) in link_parsed.query_pairs() {
match key.as_ref() { match key.as_ref() {
"name" => name = Some(value.into_owned()), "name" => name = Some(value.into_owned()),
"url" => url_param = Some(percent_decode_str(&value).decode_utf8_lossy().to_string()), "url" => {
url_param = Some(percent_decode_str(&value).decode_utf8_lossy().to_string())
}
_ => {} _ => {}
} }
} }

8
src-tauri/src/utils/window_manager.rs
View File

@@ -53,7 +53,7 @@ fn get_window_operation_debounce() -> &'static Mutex<Instant> {
fn should_handle_window_operation() -> bool { fn should_handle_window_operation() -> bool {
if WINDOW_OPERATION_IN_PROGRESS.load(Ordering::Acquire) { if WINDOW_OPERATION_IN_PROGRESS.load(Ordering::Acquire) {
log::warn!(target: "app", "[防抖] 窗口操作已在进行中，跳过重复调用"); log::warn!(target: "app", "[debounce] Window operation already in progress, skipping duplicate call");
return false; return false;
} }
@@ -62,16 +62,16 @@ fn should_handle_window_operation() -> bool {
let now = Instant::now(); let now = Instant::now();
let elapsed = now.duration_since(*last_operation); let elapsed = now.duration_since(*last_operation);
log::debug!(target: "app", "[防抖] 检查窗口操作间隔: {}ms (需要>={}ms)", log::debug!(target: "app", "[debounce] Checking window operation interval: {}ms (need >={}ms)",
elapsed.as_millis(), WINDOW_OPERATION_DEBOUNCE_MS); elapsed.as_millis(), WINDOW_OPERATION_DEBOUNCE_MS);
if elapsed >= Duration::from_millis(WINDOW_OPERATION_DEBOUNCE_MS) { if elapsed >= Duration::from_millis(WINDOW_OPERATION_DEBOUNCE_MS) {
*last_operation = now; *last_operation = now;
WINDOW_OPERATION_IN_PROGRESS.store(true, Ordering::Release); WINDOW_OPERATION_IN_PROGRESS.store(true, Ordering::Release);
log::info!(target: "app", "[防抖] 窗口操作被允许执行"); log::info!(target: "app", "[debounce] Window operation allowed to execute");
true true
} else { } else {
log::warn!(target: "app", "[防抖] 窗口操作被防抖机制忽略，距离上次操作 {}ms < {}ms", log::warn!(target: "app", "[debounce] Window operation ignored by debounce: {}ms since last < {}ms",
elapsed.as_millis(), WINDOW_OPERATION_DEBOUNCE_MS); elapsed.as_millis(), WINDOW_OPERATION_DEBOUNCE_MS);
false false
} }

1
src-tauri/webview2.arm64.json
View File

@@ -31,4 +31,3 @@
} }
} }
} }

16
src/components/connection/connection-table.tsx
View File

@@ -73,7 +73,11 @@ interface Props {
scrollerRef: (element: HTMLElement | Window | null) => void; scrollerRef: (element: HTMLElement | Window | null) => void;
} }
const ColumnResizer = ({ header }: { header: Header<ConnectionRow, unknown> }) => { const ColumnResizer = ({
header,
}: {
header: Header<ConnectionRow, unknown>;
}) => {
return ( return (
<div <div
onMouseDown={header.getResizeHandler()} onMouseDown={header.getResizeHandler()}
@@ -82,7 +86,7 @@ const ColumnResizer = ({ header }: { header: Header<ConnectionRow, unknown> }) =
"absolute right-0 top-0 h-full w-1 cursor-col-resize select-none touch-none", "absolute right-0 top-0 h-full w-1 cursor-col-resize select-none touch-none",
"bg-transparent hover:bg-primary/50 active:bg-primary", "bg-transparent hover:bg-primary/50 active:bg-primary",
"transition-colors duration-150", "transition-colors duration-150",
header.column.getIsResizing() && "bg-primary" header.column.getIsResizing() && "bg-primary",
)} )}
style={{ style={{
transform: header.column.getIsResizing() ? `translateX(0px)` : "", transform: header.column.getIsResizing() ? `translateX(0px)` : "",
@@ -141,7 +145,7 @@ export const ConnectionTable = (props: Props) => {
useEffect(() => { useEffect(() => {
localStorage.setItem( localStorage.setItem(
"connection-table-widths", "connection-table-widths",
JSON.stringify(columnSizing) JSON.stringify(columnSizing),
); );
}, [columnSizing]); }, [columnSizing]);
@@ -286,7 +290,7 @@ export const ConnectionTable = (props: Props) => {
maxSize: 220, maxSize: 220,
}, },
], ],
[columnSizing] [columnSizing],
); );
const table = useReactTable({ const table = useReactTable({
@@ -331,7 +335,7 @@ export const ConnectionTable = (props: Props) => {
key={header.id} key={header.id}
className={cn( className={cn(
"sticky top-0 z-10", "sticky top-0 z-10",
"p-2 text-xs font-semibold select-none border-r last:border-r-0 bg-background h-10" "p-2 text-xs font-semibold select-none border-r last:border-r-0 bg-background h-10",
)} )}
style={{ style={{
width: header.getSize(), width: header.getSize(),
@@ -344,7 +348,7 @@ export const ConnectionTable = (props: Props) => {
? null ? null
: flexRender( : flexRender(
header.column.columnDef.header, header.column.columnDef.header,
header.getContext() header.getContext(),
)} )}
</div> </div>
{header.column.getCanResize() && ( {header.column.getCanResize() && (

70
src/components/home/power-button.tsx
View File

@@ -1,24 +1,26 @@
import React from 'react'; import React from "react";
import { cn } from '@root/lib/utils'; import { cn } from "@root/lib/utils";
import { Power } from 'lucide-react'; import { Power } from "lucide-react";
export interface PowerButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> { export interface PowerButtonProps
extends React.ButtonHTMLAttributes<HTMLButtonElement> {
checked?: boolean; checked?: boolean;
loading?: boolean; loading?: boolean;
} }
export const PowerButton = React.forwardRef<HTMLButtonElement, PowerButtonProps>( export const PowerButton = React.forwardRef<
({ className, checked = false, loading = false, ...props }, ref) => { HTMLButtonElement,
const state = checked ? 'on' : 'off'; PowerButtonProps
>(({ className, checked = false, loading = false, ...props }, ref) => {
const state = checked ? "on" : "off";
return ( return (
<div className="relative flex items-center justify-center h-44 w-44"> <div className="relative flex items-center justify-center h-44 w-44">
<div <div
className={cn( className={cn(
'absolute h-28 w-28 rounded-full blur-3xl transition-all duration-500', "absolute h-28 w-28 rounded-full blur-3xl transition-all duration-500",
state === 'on' ? 'bg-green-400/60' : 'bg-red-500/40', state === "on" ? "bg-green-400/60" : "bg-red-500/40",
props.disabled && 'opacity-0' props.disabled && "opacity-0",
)} )}
/> />
@@ -28,37 +30,43 @@ export const PowerButton = React.forwardRef<HTMLButtonElement, PowerButtonProps>
disabled={loading || props.disabled} disabled={loading || props.disabled}
data-state={state} data-state={state}
className={cn( className={cn(
'relative z-10 flex items-center justify-center h-36 w-36 rounded-full border-2', "relative z-10 flex items-center justify-center h-36 w-36 rounded-full border-2",
'backdrop-blur-sm bg-white/10 border-white/20', "backdrop-blur-sm bg-white/10 border-white/20",
'text-red-500 shadow-[0_0_30px_rgba(239,68,68,0.6)]', "text-red-500 shadow-[0_0_30px_rgba(239,68,68,0.6)]",
'data-[state=on]:text-green-500 dark:data-[state=on]:text-white', "data-[state=on]:text-green-500 dark:data-[state=on]:text-white",
'data-[state=on]:shadow-[0_0_50px_rgba(34,197,94,1)]', "data-[state=on]:shadow-[0_0_50px_rgba(34,197,94,1)]",
'transition-all duration-300 hover:scale-105 active:scale-95 focus:outline-none', "transition-all duration-300 hover:scale-105 active:scale-95 focus:outline-none",
'disabled:cursor-not-allowed disabled:scale-100', "disabled:cursor-not-allowed disabled:scale-100",
// Стили ТОЛЬКО для отключенного состояния (но не для загрузки) // Стили ТОЛЬКО для отключенного состояния (но не для загрузки)
(props.disabled && !loading) && 'grayscale opacity-50 shadow-none bg-slate-100/70 border-slate-300/80', props.disabled &&
className !loading &&
"grayscale opacity-50 shadow-none bg-slate-100/70 border-slate-300/80",
className,
)} )}
{...props} {...props}
> >
<Power className={cn( <Power
className={cn(
"h-20 w-20", "h-20 w-20",
!props.disabled && "active:scale-90 transition-transform duration-300" !props.disabled &&
)} /> "active:scale-90 transition-transform duration-300",
)}
/>
</button> </button>
{loading && ( {loading && (
<div className="absolute inset-0 flex items-center justify-center z-20"> <div className="absolute inset-0 flex items-center justify-center z-20">
<div className={cn( <div
'h-full w-full animate-spin rounded-full border-4', className={cn(
'border-transparent', "h-full w-full animate-spin rounded-full border-4",
checked ? 'border-t-green-500' : 'border-t-red-500', "border-transparent",
'blur-xs' checked ? "border-t-green-500" : "border-t-red-500",
)} /> "blur-xs",
)}
/>
</div> </div>
)} )}
</div> </div>
); );
} });
);

65
src/components/layout/sidebar.tsx
View File

@@ -1,16 +1,18 @@
import { Link } from 'react-router-dom'; import { Link } from "react-router-dom";
import { import {
Sidebar, Sidebar,
SidebarContent, SidebarFooter, SidebarContent,
SidebarFooter,
SidebarGroup, SidebarGroup,
SidebarGroupContent, SidebarGroupContent,
SidebarHeader, SidebarHeader,
SidebarMenu, SidebarMenu,
SidebarMenuButton, SidebarMenuButton,
SidebarMenuItem, useSidebar, SidebarMenuItem,
} from "@/components/ui/sidebar" useSidebar,
import { t } from 'i18next'; } from "@/components/ui/sidebar";
import { cn } from '@root/lib/utils'; import { t } from "i18next";
import { cn } from "@root/lib/utils";
import { import {
Home, Home,
@@ -19,21 +21,22 @@ import {
Cable, Cable,
ListChecks, ListChecks,
FileText, FileText,
Settings, EarthLock, Settings,
} from 'lucide-react'; EarthLock,
} from "lucide-react";
import { UpdateButton } from "@/components/layout/update-button"; import { UpdateButton } from "@/components/layout/update-button";
import React from "react"; import React from "react";
import { SheetClose } from '@/components/ui/sheet'; import { SheetClose } from "@/components/ui/sheet";
import logo from "@/assets/image/logo.png" import logo from "@/assets/image/logo.png";
const menuItems = [ const menuItems = [
{ title: 'Home', url: '/home', icon: Home }, { title: "Home", url: "/home", icon: Home },
{ title: 'Profiles', url: '/profile', icon: Users }, { title: "Profiles", url: "/profile", icon: Users },
{ title: 'Proxies', url: '/proxies', icon: Server }, { title: "Proxies", url: "/proxies", icon: Server },
{ title: 'Connections', url: '/connections', icon: Cable }, { title: "Connections", url: "/connections", icon: Cable },
{ title: 'Rules', url: '/rules', icon: ListChecks }, { title: "Rules", url: "/rules", icon: ListChecks },
{ title: 'Logs', url: '/logs', icon: FileText }, { title: "Logs", url: "/logs", icon: FileText },
{ title: 'Settings', url: '/settings', icon: Settings }, { title: "Settings", url: "/settings", icon: Settings },
]; ];
export function AppSidebar() { export function AppSidebar() {
@@ -41,18 +44,15 @@ export function AppSidebar() {
return ( return (
<Sidebar variant="floating" collapsible="icon"> <Sidebar variant="floating" collapsible="icon">
<SidebarHeader> <SidebarHeader>
<SidebarMenuButton size="lg" <SidebarMenuButton
size="lg"
className={cn( className={cn(
"flex h-12 items-center transition-all duration-200", "flex h-12 items-center transition-all duration-200",
"group-data-[state=expanded]:w-full group-data-[state=expanded]:gap-2 group-data-[state=expanded]:px-3", "group-data-[state=expanded]:w-full group-data-[state=expanded]:gap-2 group-data-[state=expanded]:px-3",
"group-data-[state=collapsed]:w-full group-data-[state=collapsed]:justify-center" "group-data-[state=collapsed]:w-full group-data-[state=collapsed]:justify-center",
)} )}
> >
<img <img src={logo} alt="logo" className="h-6 w-6 flex-shrink-0" />
src={logo}
alt="logo"
className="h-6 w-6 flex-shrink-0"
/>
<span className="font-semibold whitespace-nowrap group-data-[state=collapsed]:hidden"> <span className="font-semibold whitespace-nowrap group-data-[state=collapsed]:hidden">
Koala Clash Koala Clash
</span> </span>
@@ -69,30 +69,29 @@ export function AppSidebar() {
key={item.title} key={item.title}
to={item.url} to={item.url}
className={cn( className={cn(
'flex items-center gap-3 rounded-lg px-3 py-2 text-muted-foreground transition-all hover:text-primary', "flex items-center gap-3 rounded-lg px-3 py-2 text-muted-foreground transition-all hover:text-primary",
'data-[active=true]:font-semibold data-[active=true]:border' "data-[active=true]:font-semibold data-[active=true]:border",
)} )}
> >
<item.icon className="h-4 w-4 drop-shadow-md" /> <item.icon className="h-4 w-4 drop-shadow-md" />
{t(item.title)} {t(item.title)}
</Link> </Link>
) );
return ( return (
<SidebarMenuItem key={item.title} className="my-1"> <SidebarMenuItem key={item.title} className="my-1">
<SidebarMenuButton <SidebarMenuButton
asChild asChild
isActive={isActive} isActive={isActive}
tooltip={t(item.title)}> tooltip={t(item.title)}
>
{isMobile ? ( {isMobile ? (
<SheetClose asChild> <SheetClose asChild>{linkElement}</SheetClose>
{linkElement}
</SheetClose>
) : ( ) : (
linkElement linkElement
)} )}
</SidebarMenuButton> </SidebarMenuButton>
</SidebarMenuItem> </SidebarMenuItem>
) );
})} })}
</SidebarMenu> </SidebarMenu>
</SidebarGroupContent> </SidebarGroupContent>
@@ -104,5 +103,5 @@ export function AppSidebar() {
</div> </div>
</SidebarFooter> </SidebarFooter>
</Sidebar> </Sidebar>
) );
} }

2
src/components/layout/update-button.tsx
View File

@@ -36,7 +36,7 @@ export const UpdateButton = (props: Props) => {
return ( return (
<> <>
<UpdateViewer ref={viewerRef} /> <UpdateViewer ref={viewerRef} />
{sidebarState === 'collapsed' ? ( {sidebarState === "collapsed" ? (
<Button <Button
variant="outline" variant="outline"
size="icon" size="icon"

18
src/components/layout/use-custom-theme.ts
View File

@@ -1,7 +1,10 @@
import { useEffect, useMemo, useState } from "react"; import { useEffect, useMemo, useState } from "react";
import { useSetThemeMode, useThemeMode } from "@/services/states"; import { useSetThemeMode, useThemeMode } from "@/services/states";
import { useVerge } from "@/hooks/use-verge"; import { useVerge } from "@/hooks/use-verge";
import { getCurrentWebviewWindow, WebviewWindow } from "@tauri-apps/api/webviewWindow"; import {
getCurrentWebviewWindow,
WebviewWindow,
} from "@tauri-apps/api/webviewWindow";
import { Theme } from "@tauri-apps/api/window"; import { Theme } from "@tauri-apps/api/window";
export const useCustomTheme = () => { export const useCustomTheme = () => {
@@ -12,8 +15,10 @@ export const useCustomTheme = () => {
const mode = useThemeMode(); const mode = useThemeMode();
const setMode = useSetThemeMode(); const setMode = useSetThemeMode();
const [systemTheme, setSystemTheme] = useState( const [systemTheme, setSystemTheme] = useState(() =>
() => window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light" window.matchMedia("(prefers-color-scheme: dark)").matches
? "dark"
: "light",
); );
useEffect(() => { useEffect(() => {
@@ -23,15 +28,15 @@ export const useCustomTheme = () => {
}, [theme_mode, setMode]); }, [theme_mode, setMode]);
useEffect(() => { useEffect(() => {
if (mode !== 'system') return; if (mode !== "system") return;
const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)"); const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
const handleChange = (e: MediaQueryListEvent) => { const handleChange = (e: MediaQueryListEvent) => {
setSystemTheme(e.matches ? "dark" : "light"); setSystemTheme(e.matches ? "dark" : "light");
}; };
mediaQuery.addEventListener('change', handleChange); mediaQuery.addEventListener("change", handleChange);
return () => mediaQuery.removeEventListener('change', handleChange); return () => mediaQuery.removeEventListener("change", handleChange);
}, [mode]); }, [mode]);
useEffect(() => { useEffect(() => {
@@ -45,7 +50,6 @@ export const useCustomTheme = () => {
} else { } else {
appWindow.setTheme(activeTheme as Theme).catch(console.error); appWindow.setTheme(activeTheme as Theme).catch(console.error);
} }
}, [mode, systemTheme, appWindow, theme_mode]); }, [mode, systemTheme, appWindow, theme_mode]);
return {}; return {};

10
src/components/profile/hwid-error-dialog.tsx
View File

@@ -1,12 +1,12 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from "react";
import { useTranslation } from 'react-i18next'; import { useTranslation } from "react-i18next";
import { import {
Dialog, Dialog,
DialogContent, DialogContent,
DialogHeader, DialogHeader,
DialogTitle, DialogTitle,
DialogDescription, DialogDescription,
DialogFooter DialogFooter,
} from "@/components/ui/dialog"; } from "@/components/ui/dialog";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { AlertTriangle } from "lucide-react"; import { AlertTriangle } from "lucide-react";
@@ -21,10 +21,10 @@ export const HwidErrorDialog = () => {
setErrorMessage(customEvent.detail); setErrorMessage(customEvent.detail);
}; };
window.addEventListener('show-hwid-error', handleShowHwidError); window.addEventListener("show-hwid-error", handleShowHwidError);
return () => { return () => {
window.removeEventListener('show-hwid-error', handleShowHwidError); window.removeEventListener("show-hwid-error", handleShowHwidError);
}; };
}, []); }, []);

20
src/components/profile/profile-item.tsx
View File

@@ -65,7 +65,8 @@ import {
ListTree, ListTree,
CheckCircle, CheckCircle,
Infinity, Infinity,
RefreshCw, Network, RefreshCw,
Network,
} from "lucide-react"; } from "lucide-react";
import { t } from "i18next"; import { t } from "i18next";
@@ -299,7 +300,8 @@ export const ProfileItem = (props: Props) => {
}; };
const MAX_NAME_LENGTH = 25; const MAX_NAME_LENGTH = 25;
const truncatedName = name.length > MAX_NAME_LENGTH const truncatedName =
name.length > MAX_NAME_LENGTH
? `${name.slice(0, MAX_NAME_LENGTH)}...` ? `${name.slice(0, MAX_NAME_LENGTH)}...`
: name; : name;
@@ -344,10 +346,7 @@ export const ProfileItem = (props: Props) => {
) : null} ) : null}
</div> </div>
<div className="flex items-center flex-shrink-0"> <div className="flex items-center flex-shrink-0">
<Badge <Badge variant="outline" className="text-xs shadow-sm">
variant="outline"
className="text-xs shadow-sm"
>
{type} {type}
</Badge> </Badge>
</div> </div>
@@ -389,14 +388,13 @@ export const ProfileItem = (props: Props) => {
<div className="flex items-center justify-between"> <div className="flex items-center justify-between">
<div className="flex items-center"> <div className="flex items-center">
<Download className="h-3 w-3 inline mr-1.5" /> <Download className="h-3 w-3 inline mr-1.5" />
<span className="pr-5"> <span className="pr-5">{parseTraffic(download)}</span>
{parseTraffic(download)}
</span>
<Network className="h-3 w-3 inline mr-1.5" /> <Network className="h-3 w-3 inline mr-1.5" />
{total > 0 ? ( {total > 0 ? (
<span>{parseTraffic(total)}</span> <span>{parseTraffic(total)}</span>
) : <Infinity className="h-3 w-3 inline mr-1.5" />} ) : (
<Infinity className="h-3 w-3 inline mr-1.5" />
)}
</div> </div>
</div> </div>
</div> </div>

42
src/components/profile/profile-viewer.tsx
View File

@@ -12,7 +12,8 @@ import {
createProfile, createProfile,
patchProfile, patchProfile,
importProfile, importProfile,
enhanceProfiles, createProfileFromShareLink, enhanceProfiles,
createProfileFromShareLink,
} from "@/services/cmds"; } from "@/services/cmds";
import { useProfiles } from "@/hooks/use-profiles"; import { useProfiles } from "@/hooks/use-profiles";
import { showNotice } from "@/services/noticeService"; import { showNotice } from "@/services/noticeService";
@@ -138,7 +139,9 @@ export const ProfileViewer = forwardRef<ProfileViewerRef, Props>(
setIsCheckingUrl(true); setIsCheckingUrl(true);
const handler = setTimeout(() => { const handler = setTimeout(() => {
const isValid = /^(https?|vmess|vless|ss|socks|trojan):\/\//.test(importUrl); const isValid = /^(https?|vmess|vless|ss|socks|trojan):\/\//.test(
importUrl,
);
setIsUrlValid(isValid); setIsUrlValid(isValid);
setIsCheckingUrl(false); setIsCheckingUrl(false);
}, 500); }, 500);
@@ -165,20 +168,32 @@ export const ProfileViewer = forwardRef<ProfileViewerRef, Props>(
await enhanceProfiles(); await enhanceProfiles();
setOpen(false); setOpen(false);
} catch (err: any) { } catch (err: any) {
const errorMessage = typeof err === 'string' ? err : (err.message || String(err)); const errorMessage =
typeof err === "string" ? err : err.message || String(err);
const lowerErrorMessage = errorMessage.toLowerCase(); const lowerErrorMessage = errorMessage.toLowerCase();
if (lowerErrorMessage.includes('device') || lowerErrorMessage.includes('устройств')) { if (
window.dispatchEvent(new CustomEvent('show-hwid-error', { detail: errorMessage })); lowerErrorMessage.includes("device") ||
lowerErrorMessage.includes("устройств")
) {
window.dispatchEvent(
new CustomEvent("show-hwid-error", { detail: errorMessage }),
);
} else if (!isShareLink && errorMessage.includes("failed to fetch")) { } else if (!isShareLink && errorMessage.includes("failed to fetch")) {
showNotice("info", t("Import failed, retrying with Clash proxy...")); showNotice("info", t("Import failed, retrying with Clash proxy..."));
try { try {
await importProfile(importUrl, { with_proxy: false, self_proxy: true }); await importProfile(importUrl, {
with_proxy: false,
self_proxy: true,
});
showNotice("success", t("Profile Imported with Clash proxy")); showNotice("success", t("Profile Imported with Clash proxy"));
props.onChange(); props.onChange();
await enhanceProfiles(); await enhanceProfiles();
setOpen(false); setOpen(false);
} catch (retryErr: any) { } catch (retryErr: any) {
showNotice("error", `${t("Import failed even with Clash proxy")}: ${retryErr?.message || retryErr.toString()}`); showNotice(
"error",
`${t("Import failed even with Clash proxy")}: ${retryErr?.message || retryErr.toString()}`,
);
} }
} else { } else {
showNotice("error", errorMessage); showNotice("error", errorMessage);
@@ -304,13 +319,20 @@ export const ProfileViewer = forwardRef<ProfileViewerRef, Props>(
{/^(vmess|vless|ss|socks|trojan):\/\//.test(importUrl) && ( {/^(vmess|vless|ss|socks|trojan):\/\//.test(importUrl) && (
<div className="space-y-2"> <div className="space-y-2">
<Label>{t("Template")}</Label> <Label>{t("Template")}</Label>
<Select value={selectedTemplate} onValueChange={setSelectedTemplate}> <Select
value={selectedTemplate}
onValueChange={setSelectedTemplate}
>
<SelectTrigger> <SelectTrigger>
<SelectValue placeholder="Select a template..." /> <SelectValue placeholder="Select a template..." />
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="default">{t("Default Template")}</SelectItem> <SelectItem value="default">
<SelectItem value="without_ru">{t("Template without RU Rules")}</SelectItem> {t("Default Template")}
</SelectItem>
<SelectItem value="without_ru">
{t("Template without RU Rules")}
</SelectItem>
</SelectContent> </SelectContent>
</Select> </Select>
</div> </div>

3
src/components/proxy/proxy-groups.tsx
View File

@@ -24,7 +24,6 @@ import delayManager from "@/services/delay";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { ScrollTopButton } from "../layout/scroll-top-button"; import { ScrollTopButton } from "../layout/scroll-top-button";
function throttle<T extends (...args: any[]) => any>( function throttle<T extends (...args: any[]) => any>(
func: T, func: T,
wait: number, wait: number,
@@ -53,7 +52,6 @@ function throttle<T extends (...args: any[]) => any>(
}; };
} }
interface Props { interface Props {
mode: string; mode: string;
} }
@@ -72,7 +70,6 @@ export const ProxyGroups = memo((props: Props) => {
const scrollerRef = useRef<Element | null>(null); const scrollerRef = useRef<Element | null>(null);
const [showScrollTop, setShowScrollTop] = useState(false); const [showScrollTop, setShowScrollTop] = useState(false);
// Обработчик скролла для показа/скрытия кнопки "Наверх" // Обработчик скролла для показа/скрытия кнопки "Наверх"
const handleScroll = useCallback( const handleScroll = useCallback(
throttle((e: any) => { throttle((e: any) => {

64
src/components/setting/mods/layout-viewer.tsx
View File

@@ -112,7 +112,7 @@ export const LayoutViewer = forwardRef<DialogRef>((props, ref) => {
})); }));
const handleConfigChange = (patch: Partial<IVergeConfig>) => { const handleConfigChange = (patch: Partial<IVergeConfig>) => {
setLocalConfig(prev => ({ ...prev, ...patch })); setLocalConfig((prev) => ({ ...prev, ...patch }));
}; };
const handleIconChange = useLockFn( const handleIconChange = useLockFn(
@@ -133,7 +133,8 @@ export const LayoutViewer = forwardRef<DialogRef>((props, ref) => {
handleConfigChange({ [key]: true }); handleConfigChange({ [key]: true });
} }
} }
}); },
);
const handleSave = useLockFn(async () => { const handleSave = useLockFn(async () => {
setLoading(true); setLoading(true);
@@ -160,12 +161,18 @@ export const LayoutViewer = forwardRef<DialogRef>((props, ref) => {
<> <>
<SettingRow label={t("Tray Icon")}> <SettingRow label={t("Tray Icon")}>
<Select <Select
onValueChange={(value) => handleConfigChange({ tray_icon: value as any })} onValueChange={(value) =>
handleConfigChange({ tray_icon: value as any })
}
value={localConfig.tray_icon ?? "monochrome"} value={localConfig.tray_icon ?? "monochrome"}
> >
<SelectTrigger className="w-40 h-8"><SelectValue /></SelectTrigger> <SelectTrigger className="w-40 h-8">
<SelectValue />
</SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="monochrome">{t("Monochrome")}</SelectItem> <SelectItem value="monochrome">
{t("Monochrome")}
</SelectItem>
<SelectItem value="colorful">{t("Colorful")}</SelectItem> <SelectItem value="colorful">{t("Colorful")}</SelectItem>
</SelectContent> </SelectContent>
</Select> </Select>
@@ -174,34 +181,63 @@ export const LayoutViewer = forwardRef<DialogRef>((props, ref) => {
<SettingRow label={t("Enable Tray Icon")}> <SettingRow label={t("Enable Tray Icon")}>
<Switch <Switch
checked={localConfig.enable_tray_icon ?? true} checked={localConfig.enable_tray_icon ?? true}
onCheckedChange={(checked) => handleConfigChange({ enable_tray_icon: checked })} onCheckedChange={(checked) =>
handleConfigChange({ enable_tray_icon: checked })
}
/> />
</SettingRow> </SettingRow>
</> </>
)} )}
<SettingRow label={t("Common Tray Icon")}> <SettingRow label={t("Common Tray Icon")}>
<Button variant="outline" size="sm" className="h-8" onClick={() => handleIconChange("common")}> <Button
variant="outline"
size="sm"
className="h-8"
onClick={() => handleIconChange("common")}
>
{localConfig.common_tray_icon && commonIcon && ( {localConfig.common_tray_icon && commonIcon && (
<img src={convertFileSrc(commonIcon)} className="h-5 mr-2" alt="common tray icon" /> <img
src={convertFileSrc(commonIcon)}
className="h-5 mr-2"
alt="common tray icon"
/>
)} )}
{localConfig.common_tray_icon ? t("Clear") : t("Browse")} {localConfig.common_tray_icon ? t("Clear") : t("Browse")}
</Button> </Button>
</SettingRow> </SettingRow>
<SettingRow label={t("System Proxy Tray Icon")}> <SettingRow label={t("System Proxy Tray Icon")}>
<Button variant="outline" size="sm" className="h-8" onClick={() => handleIconChange("sysproxy")}> <Button
variant="outline"
size="sm"
className="h-8"
onClick={() => handleIconChange("sysproxy")}
>
{localConfig.sysproxy_tray_icon && sysproxyIcon && ( {localConfig.sysproxy_tray_icon && sysproxyIcon && (
<img src={convertFileSrc(sysproxyIcon)} className="h-5 mr-2" alt="system proxy tray icon" /> <img
src={convertFileSrc(sysproxyIcon)}
className="h-5 mr-2"
alt="system proxy tray icon"
/>
)} )}
{localConfig.sysproxy_tray_icon ? t("Clear") : t("Browse")} {localConfig.sysproxy_tray_icon ? t("Clear") : t("Browse")}
</Button> </Button>
</SettingRow> </SettingRow>
<SettingRow label={t("Tun Tray Icon")}> <SettingRow label={t("Tun Tray Icon")}>
<Button variant="outline" size="sm" className="h-8" onClick={() => handleIconChange("tun")}> <Button
variant="outline"
size="sm"
className="h-8"
onClick={() => handleIconChange("tun")}
>
{localConfig.tun_tray_icon && tunIcon && ( {localConfig.tun_tray_icon && tunIcon && (
<img src={convertFileSrc(tunIcon)} className="h-5 mr-2" alt="tun mode tray icon" /> <img
src={convertFileSrc(tunIcon)}
className="h-5 mr-2"
alt="tun mode tray icon"
/>
)} )}
{localConfig.tun_tray_icon ? t("Clear") : t("Browse")} {localConfig.tun_tray_icon ? t("Clear") : t("Browse")}
</Button> </Button>
@@ -210,7 +246,9 @@ export const LayoutViewer = forwardRef<DialogRef>((props, ref) => {
<DialogFooter> <DialogFooter>
<DialogClose asChild> <DialogClose asChild>
<Button type="button" variant="outline">{t("Cancel")}</Button> <Button type="button" variant="outline">
{t("Cancel")}
</Button>
</DialogClose> </DialogClose>
<Button type="button" onClick={handleSave} disabled={loading}> <Button type="button" onClick={handleSave} disabled={loading}>
{loading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />} {loading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}

9
src/components/setting/setting-system.tsx
View File

@@ -43,7 +43,7 @@ import {
Power, Power,
BellOff, BellOff,
Repeat, Repeat,
Fingerprint Fingerprint,
} from "lucide-react"; } from "lucide-react";
// Модальные окна // Модальные окна
@@ -110,7 +110,7 @@ const SettingSystem = ({ onError }: Props) => {
const { profiles } = useProfiles(); const { profiles } = useProfiles();
const hasProfiles = useMemo(() => { const hasProfiles = useMemo(() => {
const items = profiles?.items ?? []; const items = profiles?.items ?? [];
return items.some(p => p.type === 'local' || p.type === 'remote'); return items.some((p) => p.type === "local" || p.type === "remote");
}, [profiles]); }, [profiles]);
const { const {
@@ -261,7 +261,10 @@ const SettingSystem = ({ onError }: Props) => {
); );
} }
if (e) { if (e) {
return patchVerge({ enable_tun_mode: true, enable_system_proxy: false }); return patchVerge({
enable_tun_mode: true,
enable_system_proxy: false,
});
} else { } else {
return patchVerge({ enable_tun_mode: false }); return patchVerge({ enable_tun_mode: false });
} }

2
src/components/ui/dropdown-menu.tsx
View File

@@ -188,7 +188,7 @@ function DropdownMenuSeparator({
className={cn( className={cn(
"-mx-1 my-1 h-px", "-mx-1 my-1 h-px",
"bg-gray-400/50 dark:bg-white/20", "bg-gray-400/50 dark:bg-white/20",
className className,
)} )}
{...props} {...props}
/> />

246
src/components/ui/sidebar.tsx
View File

@@ -1,54 +1,54 @@
import * as React from "react" import * as React from "react";
import { Slot } from "@radix-ui/react-slot" import { Slot } from "@radix-ui/react-slot";
import { cva, VariantProps } from "class-variance-authority" import { cva, VariantProps } from "class-variance-authority";
import { PanelLeftIcon } from "lucide-react" import { PanelLeftIcon } from "lucide-react";
import { useIsMobile } from "@root/hooks/use-mobile" import { useIsMobile } from "@root/hooks/use-mobile";
import { cn } from "@root/lib/utils" import { cn } from "@root/lib/utils";
import { Button } from "@root/src/components/ui/button" import { Button } from "@root/src/components/ui/button";
import { Input } from "@root/src/components/ui/input" import { Input } from "@root/src/components/ui/input";
import { Separator } from "@root/src/components/ui/separator" import { Separator } from "@root/src/components/ui/separator";
import { import {
Sheet, Sheet,
SheetContent, SheetContent,
SheetDescription, SheetDescription,
SheetHeader, SheetHeader,
SheetTitle, SheetTitle,
} from "@root/src/components/ui/sheet" } from "@root/src/components/ui/sheet";
import { Skeleton } from "@root/src/components/ui/skeleton" import { Skeleton } from "@root/src/components/ui/skeleton";
import { import {
Tooltip, Tooltip,
TooltipContent, TooltipContent,
TooltipProvider, TooltipProvider,
TooltipTrigger, TooltipTrigger,
} from "@root/src/components/ui/tooltip" } from "@root/src/components/ui/tooltip";
const SIDEBAR_COOKIE_NAME = "sidebar_state" const SIDEBAR_COOKIE_NAME = "sidebar_state";
const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7 const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
const SIDEBAR_WIDTH = "16rem" const SIDEBAR_WIDTH = "16rem";
const SIDEBAR_WIDTH_MOBILE = "18rem" const SIDEBAR_WIDTH_MOBILE = "18rem";
const SIDEBAR_WIDTH_ICON = "3rem" const SIDEBAR_WIDTH_ICON = "3rem";
const SIDEBAR_KEYBOARD_SHORTCUT = "b" const SIDEBAR_KEYBOARD_SHORTCUT = "b";
type SidebarContextProps = { type SidebarContextProps = {
state: "expanded" | "collapsed" state: "expanded" | "collapsed";
open: boolean open: boolean;
setOpen: (open: boolean) => void setOpen: (open: boolean) => void;
openMobile: boolean openMobile: boolean;
setOpenMobile: (open: boolean) => void setOpenMobile: (open: boolean) => void;
isMobile: boolean isMobile: boolean;
toggleSidebar: () => void toggleSidebar: () => void;
} };
const SidebarContext = React.createContext<SidebarContextProps | null>(null) const SidebarContext = React.createContext<SidebarContextProps | null>(null);
function useSidebar() { function useSidebar() {
const context = React.useContext(SidebarContext) const context = React.useContext(SidebarContext);
if (!context) { if (!context) {
throw new Error("useSidebar must be used within a SidebarProvider.") throw new Error("useSidebar must be used within a SidebarProvider.");
} }
return context return context;
} }
function SidebarProvider({ function SidebarProvider({
@@ -60,36 +60,36 @@ function SidebarProvider({
children, children,
...props ...props
}: React.ComponentProps<"div"> & { }: React.ComponentProps<"div"> & {
defaultOpen?: boolean defaultOpen?: boolean;
open?: boolean open?: boolean;
onOpenChange?: (open: boolean) => void onOpenChange?: (open: boolean) => void;
}) { }) {
const isMobile = useIsMobile() const isMobile = useIsMobile();
const [openMobile, setOpenMobile] = React.useState(false) const [openMobile, setOpenMobile] = React.useState(false);
// This is the internal state of the sidebar. // This is the internal state of the sidebar.
// We use openProp and setOpenProp for control from outside the component. // We use openProp and setOpenProp for control from outside the component.
const [_open, _setOpen] = React.useState(defaultOpen) const [_open, _setOpen] = React.useState(defaultOpen);
const open = openProp ?? _open const open = openProp ?? _open;
const setOpen = React.useCallback( const setOpen = React.useCallback(
(value: boolean | ((value: boolean) => boolean)) => { (value: boolean | ((value: boolean) => boolean)) => {
const openState = typeof value === "function" ? value(open) : value const openState = typeof value === "function" ? value(open) : value;
if (setOpenProp) { if (setOpenProp) {
setOpenProp(openState) setOpenProp(openState);
} else { } else {
_setOpen(openState) _setOpen(openState);
} }
// This sets the cookie to keep the sidebar state. // This sets the cookie to keep the sidebar state.
document.cookie = `${SIDEBAR_COOKIE_NAME}=${openState}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE}` document.cookie = `${SIDEBAR_COOKIE_NAME}=${openState}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE}`;
}, },
[setOpenProp, open] [setOpenProp, open],
) );
// Helper to toggle the sidebar. // Helper to toggle the sidebar.
const toggleSidebar = React.useCallback(() => { const toggleSidebar = React.useCallback(() => {
return isMobile ? setOpenMobile((open) => !open) : setOpen((open) => !open) return isMobile ? setOpenMobile((open) => !open) : setOpen((open) => !open);
}, [isMobile, setOpen, setOpenMobile]) }, [isMobile, setOpen, setOpenMobile]);
// Adds a keyboard shortcut to toggle the sidebar. // Adds a keyboard shortcut to toggle the sidebar.
React.useEffect(() => { React.useEffect(() => {
@@ -98,18 +98,18 @@ function SidebarProvider({
event.key === SIDEBAR_KEYBOARD_SHORTCUT && event.key === SIDEBAR_KEYBOARD_SHORTCUT &&
(event.metaKey || event.ctrlKey) (event.metaKey || event.ctrlKey)
) { ) {
event.preventDefault() event.preventDefault();
toggleSidebar() toggleSidebar();
}
} }
};
window.addEventListener("keydown", handleKeyDown) window.addEventListener("keydown", handleKeyDown);
return () => window.removeEventListener("keydown", handleKeyDown) return () => window.removeEventListener("keydown", handleKeyDown);
}, [toggleSidebar]) }, [toggleSidebar]);
// We add a state so that we can do data-state="expanded" or "collapsed". // We add a state so that we can do data-state="expanded" or "collapsed".
// This makes it easier to style the sidebar with Tailwind classes. // This makes it easier to style the sidebar with Tailwind classes.
const state = open ? "expanded" : "collapsed" const state = open ? "expanded" : "collapsed";
const contextValue = React.useMemo<SidebarContextProps>( const contextValue = React.useMemo<SidebarContextProps>(
() => ({ () => ({
@@ -121,8 +121,8 @@ function SidebarProvider({
setOpenMobile, setOpenMobile,
toggleSidebar, toggleSidebar,
}), }),
[state, open, setOpen, isMobile, openMobile, setOpenMobile, toggleSidebar] [state, open, setOpen, isMobile, openMobile, setOpenMobile, toggleSidebar],
) );
return ( return (
<SidebarContext.Provider value={contextValue}> <SidebarContext.Provider value={contextValue}>
@@ -138,7 +138,7 @@ function SidebarProvider({
} }
className={cn( className={cn(
"group/sidebar-wrapper has-data-[variant=inset]:bg-sidebar flex min-h-svh w-full", "group/sidebar-wrapper has-data-[variant=inset]:bg-sidebar flex min-h-svh w-full",
className className,
)} )}
{...props} {...props}
> >
@@ -146,7 +146,7 @@ function SidebarProvider({
</div> </div>
</TooltipProvider> </TooltipProvider>
</SidebarContext.Provider> </SidebarContext.Provider>
) );
} }
function Sidebar({ function Sidebar({
@@ -157,11 +157,11 @@ function Sidebar({
children, children,
...props ...props
}: React.ComponentProps<"div"> & { }: React.ComponentProps<"div"> & {
side?: "left" | "right" side?: "left" | "right";
variant?: "sidebar" | "floating" | "inset" variant?: "sidebar" | "floating" | "inset";
collapsible?: "offcanvas" | "icon" | "none" collapsible?: "offcanvas" | "icon" | "none";
}) { }) {
const { isMobile, state, openMobile, setOpenMobile } = useSidebar() const { isMobile, state, openMobile, setOpenMobile } = useSidebar();
if (collapsible === "none") { if (collapsible === "none") {
return ( return (
@@ -169,13 +169,13 @@ function Sidebar({
data-slot="sidebar" data-slot="sidebar"
className={cn( className={cn(
"bg-sidebar text-sidebar-foreground flex h-full w-(--sidebar-width) flex-col", "bg-sidebar text-sidebar-foreground flex h-full w-(--sidebar-width) flex-col",
className className,
)} )}
{...props} {...props}
> >
{children} {children}
</div> </div>
) );
} }
if (isMobile) { if (isMobile) {
@@ -200,7 +200,7 @@ function Sidebar({
<div className="flex h-full w-full flex-col">{children}</div> <div className="flex h-full w-full flex-col">{children}</div>
</SheetContent> </SheetContent>
</Sheet> </Sheet>
) );
} }
return ( return (
@@ -221,7 +221,7 @@ function Sidebar({
"group-data-[side=right]:rotate-180", "group-data-[side=right]:rotate-180",
variant === "floating" || variant === "inset" variant === "floating" || variant === "inset"
? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4)))]" ? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4)))]"
: "group-data-[collapsible=icon]:w-(--sidebar-width-icon)" : "group-data-[collapsible=icon]:w-(--sidebar-width-icon)",
)} )}
/> />
<div <div
@@ -235,7 +235,7 @@ function Sidebar({
variant === "floating" || variant === "inset" variant === "floating" || variant === "inset"
? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4))+2px)]" ? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4))+2px)]"
: "group-data-[collapsible=icon]:w-(--sidebar-width-icon) group-data-[side=left]:border-r group-data-[side=right]:border-l", : "group-data-[collapsible=icon]:w-(--sidebar-width-icon) group-data-[side=left]:border-r group-data-[side=right]:border-l",
className className,
)} )}
{...props} {...props}
> >
@@ -248,7 +248,7 @@ function Sidebar({
</div> </div>
</div> </div>
</div> </div>
) );
} }
function SidebarTrigger({ function SidebarTrigger({
@@ -256,7 +256,7 @@ function SidebarTrigger({
onClick, onClick,
...props ...props
}: React.ComponentProps<typeof Button>) { }: React.ComponentProps<typeof Button>) {
const { toggleSidebar } = useSidebar() const { toggleSidebar } = useSidebar();
return ( return (
<Button <Button
@@ -266,19 +266,19 @@ function SidebarTrigger({
size="icon" size="icon"
className={cn("size-7", className)} className={cn("size-7", className)}
onClick={(event) => { onClick={(event) => {
onClick?.(event) onClick?.(event);
toggleSidebar() toggleSidebar();
}} }}
{...props} {...props}
> >
<PanelLeftIcon /> <PanelLeftIcon />
<span className="sr-only">Toggle Sidebar</span> <span className="sr-only">Toggle Sidebar</span>
</Button> </Button>
) );
} }
function SidebarRail({ className, ...props }: React.ComponentProps<"button">) { function SidebarRail({ className, ...props }: React.ComponentProps<"button">) {
const { toggleSidebar } = useSidebar() const { toggleSidebar } = useSidebar();
return ( return (
<button <button
@@ -295,11 +295,11 @@ function SidebarRail({ className, ...props }: React.ComponentProps<"button">) {
"hover:group-data-[collapsible=offcanvas]:bg-sidebar group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full", "hover:group-data-[collapsible=offcanvas]:bg-sidebar group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full",
"[[data-side=left][data-collapsible=offcanvas]_&]:-right-2", "[[data-side=left][data-collapsible=offcanvas]_&]:-right-2",
"[[data-side=right][data-collapsible=offcanvas]_&]:-left-2", "[[data-side=right][data-collapsible=offcanvas]_&]:-left-2",
className className,
)} )}
{...props} {...props}
/> />
) );
} }
function SidebarInset({ className, ...props }: React.ComponentProps<"main">) { function SidebarInset({ className, ...props }: React.ComponentProps<"main">) {
@@ -309,11 +309,11 @@ function SidebarInset({ className, ...props }: React.ComponentProps<"main">) {
className={cn( className={cn(
"bg-background relative flex w-full flex-1 flex-col", "bg-background relative flex w-full flex-1 flex-col",
"md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-2", "md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-2",
className className,
)} )}
{...props} {...props}
/> />
) );
} }
function SidebarInput({ function SidebarInput({
@@ -327,7 +327,7 @@ function SidebarInput({
className={cn("bg-background h-8 w-full shadow-none", className)} className={cn("bg-background h-8 w-full shadow-none", className)}
{...props} {...props}
/> />
) );
} }
function SidebarHeader({ className, ...props }: React.ComponentProps<"div">) { function SidebarHeader({ className, ...props }: React.ComponentProps<"div">) {
@@ -338,7 +338,7 @@ function SidebarHeader({ className, ...props }: React.ComponentProps<"div">) {
className={cn("flex flex-col gap-2 p-2", className)} className={cn("flex flex-col gap-2 p-2", className)}
{...props} {...props}
/> />
) );
} }
function SidebarFooter({ className, ...props }: React.ComponentProps<"div">) { function SidebarFooter({ className, ...props }: React.ComponentProps<"div">) {
@@ -349,7 +349,7 @@ function SidebarFooter({ className, ...props }: React.ComponentProps<"div">) {
className={cn("flex flex-col gap-2 p-2", className)} className={cn("flex flex-col gap-2 p-2", className)}
{...props} {...props}
/> />
) );
} }
function SidebarSeparator({ function SidebarSeparator({
@@ -363,7 +363,7 @@ function SidebarSeparator({
className={cn("bg-sidebar-border mx-2 w-auto", className)} className={cn("bg-sidebar-border mx-2 w-auto", className)}
{...props} {...props}
/> />
) );
} }
function SidebarContent({ className, ...props }: React.ComponentProps<"div">) { function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
@@ -373,11 +373,11 @@ function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
data-sidebar="content" data-sidebar="content"
className={cn( className={cn(
"flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden", "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
className className,
)} )}
{...props} {...props}
/> />
) );
} }
function SidebarGroup({ className, ...props }: React.ComponentProps<"div">) { function SidebarGroup({ className, ...props }: React.ComponentProps<"div">) {
@@ -388,7 +388,7 @@ function SidebarGroup({ className, ...props }: React.ComponentProps<"div">) {
className={cn("relative flex w-full min-w-0 flex-col p-2", className)} className={cn("relative flex w-full min-w-0 flex-col p-2", className)}
{...props} {...props}
/> />
) );
} }
function SidebarGroupLabel({ function SidebarGroupLabel({
@@ -396,7 +396,7 @@ function SidebarGroupLabel({
asChild = false, asChild = false,
...props ...props
}: React.ComponentProps<"div"> & { asChild?: boolean }) { }: React.ComponentProps<"div"> & { asChild?: boolean }) {
const Comp = asChild ? Slot : "div" const Comp = asChild ? Slot : "div";
return ( return (
<Comp <Comp
@@ -405,11 +405,11 @@ function SidebarGroupLabel({
className={cn( className={cn(
"text-sidebar-foreground/70 ring-sidebar-ring flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium outline-hidden transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0", "text-sidebar-foreground/70 ring-sidebar-ring flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium outline-hidden transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
"group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0", "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
className className,
)} )}
{...props} {...props}
/> />
) );
} }
function SidebarGroupAction({ function SidebarGroupAction({
@@ -417,7 +417,7 @@ function SidebarGroupAction({
asChild = false, asChild = false,
...props ...props
}: React.ComponentProps<"button"> & { asChild?: boolean }) { }: React.ComponentProps<"button"> & { asChild?: boolean }) {
const Comp = asChild ? Slot : "button" const Comp = asChild ? Slot : "button";
return ( return (
<Comp <Comp
@@ -428,11 +428,11 @@ function SidebarGroupAction({
// Increases the hit area of the button on mobile. // Increases the hit area of the button on mobile.
"after:absolute after:-inset-2 md:after:hidden", "after:absolute after:-inset-2 md:after:hidden",
"group-data-[collapsible=icon]:hidden", "group-data-[collapsible=icon]:hidden",
className className,
)} )}
{...props} {...props}
/> />
) );
} }
function SidebarGroupContent({ function SidebarGroupContent({
@@ -446,7 +446,7 @@ function SidebarGroupContent({
className={cn("w-full text-sm", className)} className={cn("w-full text-sm", className)}
{...props} {...props}
/> />
) );
} }
function SidebarMenu({ className, ...props }: React.ComponentProps<"ul">) { function SidebarMenu({ className, ...props }: React.ComponentProps<"ul">) {
@@ -457,7 +457,7 @@ function SidebarMenu({ className, ...props }: React.ComponentProps<"ul">) {
className={cn("flex w-full min-w-0 flex-col gap-1", className)} className={cn("flex w-full min-w-0 flex-col gap-1", className)}
{...props} {...props}
/> />
) );
} }
function SidebarMenuItem({ className, ...props }: React.ComponentProps<"li">) { function SidebarMenuItem({ className, ...props }: React.ComponentProps<"li">) {
@@ -468,7 +468,7 @@ function SidebarMenuItem({ className, ...props }: React.ComponentProps<"li">) {
className={cn("group/menu-item relative", className)} className={cn("group/menu-item relative", className)}
{...props} {...props}
/> />
) );
} }
const sidebarMenuButtonVariants = cva( const sidebarMenuButtonVariants = cva(
@@ -490,8 +490,8 @@ const sidebarMenuButtonVariants = cva(
variant: "default", variant: "default",
size: "default", size: "default",
}, },
} },
) );
function SidebarMenuButton({ function SidebarMenuButton({
asChild = false, asChild = false,
@@ -502,12 +502,12 @@ function SidebarMenuButton({
className, className,
...props ...props
}: React.ComponentProps<"button"> & { }: React.ComponentProps<"button"> & {
asChild?: boolean asChild?: boolean;
isActive?: boolean isActive?: boolean;
tooltip?: string | React.ComponentProps<typeof TooltipContent> tooltip?: string | React.ComponentProps<typeof TooltipContent>;
} & VariantProps<typeof sidebarMenuButtonVariants>) { } & VariantProps<typeof sidebarMenuButtonVariants>) {
const Comp = asChild ? Slot : "button" const Comp = asChild ? Slot : "button";
const { isMobile, state } = useSidebar() const { isMobile, state } = useSidebar();
const button = ( const button = (
<Comp <Comp
@@ -518,16 +518,16 @@ function SidebarMenuButton({
className={cn(sidebarMenuButtonVariants({ variant, size }), className)} className={cn(sidebarMenuButtonVariants({ variant, size }), className)}
{...props} {...props}
/> />
) );
if (!tooltip) { if (!tooltip) {
return button return button;
} }
if (typeof tooltip === "string") { if (typeof tooltip === "string") {
tooltip = { tooltip = {
children: tooltip, children: tooltip,
} };
} }
return ( return (
@@ -540,7 +540,7 @@ function SidebarMenuButton({
{...tooltip} {...tooltip}
/> />
</Tooltip> </Tooltip>
) );
} }
function SidebarMenuAction({ function SidebarMenuAction({
@@ -549,10 +549,10 @@ function SidebarMenuAction({
showOnHover = false, showOnHover = false,
...props ...props
}: React.ComponentProps<"button"> & { }: React.ComponentProps<"button"> & {
asChild?: boolean asChild?: boolean;
showOnHover?: boolean showOnHover?: boolean;
}) { }) {
const Comp = asChild ? Slot : "button" const Comp = asChild ? Slot : "button";
return ( return (
<Comp <Comp
@@ -568,11 +568,11 @@ function SidebarMenuAction({
"group-data-[collapsible=icon]:hidden", "group-data-[collapsible=icon]:hidden",
showOnHover && showOnHover &&
"peer-data-[active=true]/menu-button:text-sidebar-accent-foreground group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 md:opacity-0", "peer-data-[active=true]/menu-button:text-sidebar-accent-foreground group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 md:opacity-0",
className className,
)} )}
{...props} {...props}
/> />
) );
} }
function SidebarMenuBadge({ function SidebarMenuBadge({
@@ -590,11 +590,11 @@ function SidebarMenuBadge({
"peer-data-[size=default]/menu-button:top-1.5", "peer-data-[size=default]/menu-button:top-1.5",
"peer-data-[size=lg]/menu-button:top-2.5", "peer-data-[size=lg]/menu-button:top-2.5",
"group-data-[collapsible=icon]:hidden", "group-data-[collapsible=icon]:hidden",
className className,
)} )}
{...props} {...props}
/> />
) );
} }
function SidebarMenuSkeleton({ function SidebarMenuSkeleton({
@@ -602,12 +602,12 @@ function SidebarMenuSkeleton({
showIcon = false, showIcon = false,
...props ...props
}: React.ComponentProps<"div"> & { }: React.ComponentProps<"div"> & {
showIcon?: boolean showIcon?: boolean;
}) { }) {
// Random width between 50 to 90%. // Random width between 50 to 90%.
const width = React.useMemo(() => { const width = React.useMemo(() => {
return `${Math.floor(Math.random() * 40) + 50}%` return `${Math.floor(Math.random() * 40) + 50}%`;
}, []) }, []);
return ( return (
<div <div
@@ -632,7 +632,7 @@ function SidebarMenuSkeleton({
} }
/> />
</div> </div>
) );
} }
function SidebarMenuSub({ className, ...props }: React.ComponentProps<"ul">) { function SidebarMenuSub({ className, ...props }: React.ComponentProps<"ul">) {
@@ -643,11 +643,11 @@ function SidebarMenuSub({ className, ...props }: React.ComponentProps<"ul">) {
className={cn( className={cn(
"border-sidebar-border mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l px-2.5 py-0.5", "border-sidebar-border mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l px-2.5 py-0.5",
"group-data-[collapsible=icon]:hidden", "group-data-[collapsible=icon]:hidden",
className className,
)} )}
{...props} {...props}
/> />
) );
} }
function SidebarMenuSubItem({ function SidebarMenuSubItem({
@@ -661,7 +661,7 @@ function SidebarMenuSubItem({
className={cn("group/menu-sub-item relative", className)} className={cn("group/menu-sub-item relative", className)}
{...props} {...props}
/> />
) );
} }
function SidebarMenuSubButton({ function SidebarMenuSubButton({
@@ -671,11 +671,11 @@ function SidebarMenuSubButton({
className, className,
...props ...props
}: React.ComponentProps<"a"> & { }: React.ComponentProps<"a"> & {
asChild?: boolean asChild?: boolean;
size?: "sm" | "md" size?: "sm" | "md";
isActive?: boolean isActive?: boolean;
}) { }) {
const Comp = asChild ? Slot : "a" const Comp = asChild ? Slot : "a";
return ( return (
<Comp <Comp
@@ -689,11 +689,11 @@ function SidebarMenuSubButton({
size === "sm" && "text-xs", size === "sm" && "text-xs",
size === "md" && "text-sm", size === "md" && "text-sm",
"group-data-[collapsible=icon]:hidden", "group-data-[collapsible=icon]:hidden",
className className,
)} )}
{...props} {...props}
/> />
) );
} }
export { export {
@@ -721,4 +721,4 @@ export {
SidebarSeparator, SidebarSeparator,
SidebarTrigger, SidebarTrigger,
useSidebar, useSidebar,
} };

6
src/components/ui/skeleton.tsx
View File

@@ -1,4 +1,4 @@
import { cn } from "@root/lib/utils" import { cn } from "@root/lib/utils";
function Skeleton({ className, ...props }: React.ComponentProps<"div">) { function Skeleton({ className, ...props }: React.ComponentProps<"div">) {
return ( return (
@@ -7,7 +7,7 @@ function Skeleton({ className, ...props }: React.ComponentProps<"div">) {
className={cn("bg-accent animate-pulse rounded-md", className)} className={cn("bg-accent animate-pulse rounded-md", className)}
{...props} {...props}
/> />
) );
} }
export { Skeleton } export { Skeleton };

42
src/hooks/useZoomControls.ts
View File

@@ -1,5 +1,5 @@
import { useEffect, useState, useCallback } from 'react'; import { useEffect, useState, useCallback } from "react";
import { WebviewWindow } from '@tauri-apps/api/webviewWindow'; import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
// Константы для управления масштабом // Константы для управления масштабом
const ZOOM_STEP = 0.1; const ZOOM_STEP = 0.1;
@@ -22,7 +22,9 @@ export const useZoomControls = () => {
let initialZoom = 1.0; let initialZoom = 1.0;
console.log(`Physical width: ${size.width}, Scale Factor: ${scaleFactor}, Logical width: ${logicalWidth}`); console.log(
`Physical width: ${size.width}, Scale Factor: ${scaleFactor}, Logical width: ${logicalWidth}`,
);
// 3. Используем логическую ширину для принятия решения // 3. Используем логическую ширину для принятия решения
if (logicalWidth < 1300) { if (logicalWidth < 1300) {
@@ -38,18 +40,24 @@ export const useZoomControls = () => {
setInitialZoom(); setInitialZoom();
}, []); }, []);
const handleZoom = useCallback((delta: number, isReset = false) => { const handleZoom = useCallback(
setZoomLevel(currentZoom => { (delta: number, isReset = false) => {
setZoomLevel((currentZoom) => {
const newZoom = isReset ? 1.0 : currentZoom + delta; const newZoom = isReset ? 1.0 : currentZoom + delta;
const clampedZoom = Math.max(MIN_ZOOM, Math.min(newZoom, MAX_ZOOM)); const clampedZoom = Math.max(MIN_ZOOM, Math.min(newZoom, MAX_ZOOM));
const roundedZoom = Math.round(clampedZoom * 100) / 100; const roundedZoom = Math.round(clampedZoom * 100) / 100;
appWindow.setZoom(roundedZoom); appWindow.setZoom(roundedZoom);
const newStrokeWidth = 2 / roundedZoom; const newStrokeWidth = 2 / roundedZoom;
document.documentElement.style.setProperty('--icon-stroke-width', newStrokeWidth.toString()); document.documentElement.style.setProperty(
"--icon-stroke-width",
newStrokeWidth.toString(),
);
return roundedZoom; return roundedZoom;
}); });
}, [appWindow]); },
[appWindow],
);
useEffect(() => { useEffect(() => {
const handleWheel = (event: WheelEvent) => { const handleWheel = (event: WheelEvent) => {
@@ -63,18 +71,18 @@ export const useZoomControls = () => {
const handleKeyDown = (event: KeyboardEvent) => { const handleKeyDown = (event: KeyboardEvent) => {
if (event.ctrlKey || event.metaKey) { if (event.ctrlKey || event.metaKey) {
switch (event.code) { switch (event.code) {
case 'Equal': case "Equal":
case 'NumpadAdd': case "NumpadAdd":
event.preventDefault(); event.preventDefault();
handleZoom(ZOOM_STEP); handleZoom(ZOOM_STEP);
break; break;
case 'Minus': case "Minus":
case 'NumpadSubtract': case "NumpadSubtract":
event.preventDefault(); event.preventDefault();
handleZoom(-ZOOM_STEP); handleZoom(-ZOOM_STEP);
break; break;
case 'Digit0': case "Digit0":
case 'Numpad0': case "Numpad0":
event.preventDefault(); event.preventDefault();
handleZoom(0, true); handleZoom(0, true);
break; break;
@@ -82,12 +90,12 @@ export const useZoomControls = () => {
} }
}; };
window.addEventListener('wheel', handleWheel, { passive: false }); window.addEventListener("wheel", handleWheel, { passive: false });
window.addEventListener('keydown', handleKeyDown); window.addEventListener("keydown", handleKeyDown);
return () => { return () => {
window.removeEventListener('wheel', handleWheel); window.removeEventListener("wheel", handleWheel);
window.removeEventListener('keydown', handleKeyDown); window.removeEventListener("keydown", handleKeyDown);
}; };
}, [handleZoom]); }, [handleZoom]);
}; };

3
src/index.css
View File

@@ -2,7 +2,7 @@
@import "tw-animate-css"; @import "tw-animate-css";
@theme { @theme {
--tailwind-darkMode: 'class'; --tailwind-darkMode: "class";
} }
@theme inline { @theme inline {
@@ -132,7 +132,6 @@ svg {
stroke-width: var(--icon-stroke-width, 2); stroke-width: var(--icon-stroke-width, 2);
} }
@keyframes gradient-wave { @keyframes gradient-wave {
0% { 0% {
background-position: -200% center; background-position: -200% center;

81
src/pages/_layout.tsx
View File

@@ -27,7 +27,6 @@ import { AppSidebar } from "@/components/layout/sidebar";
import { useZoomControls } from "@/hooks/useZoomControls"; import { useZoomControls } from "@/hooks/useZoomControls";
import { HwidErrorDialog } from "@/components/profile/hwid-error-dialog"; import { HwidErrorDialog } from "@/components/profile/hwid-error-dialog";
const appWindow = getCurrentWebviewWindow(); const appWindow = getCurrentWebviewWindow();
export let portableFlag = false; export let portableFlag = false;
@@ -49,12 +48,17 @@ const handleNoticeMessage = (
mutate("getProfiles"); mutate("getProfiles");
navigate("/"); navigate("/");
showNotice("success", t("Import Subscription Successful")); showNotice("success", t("Import Subscription Successful"));
sessionStorage.setItem('activateProfile', msg); sessionStorage.setItem("activateProfile", msg);
break; break;
case "import_sub_url::error": case "import_sub_url::error":
console.log(msg); console.log(msg);
if (msg.toLowerCase().includes('device') || msg.toLowerCase().includes('устройств')) { if (
window.dispatchEvent(new CustomEvent('show-hwid-error', { detail: msg })); msg.toLowerCase().includes("device") ||
msg.toLowerCase().includes("устройств")
) {
window.dispatchEvent(
new CustomEvent("show-hwid-error", { detail: msg }),
);
} else { } else {
showNotice("error", msg); showNotice("error", msg);
} }
@@ -172,7 +176,10 @@ const Layout = () => {
try { try {
handleNoticeMessage(status, msg, t, navigate); handleNoticeMessage(status, msg, t, navigate);
} catch (error) { } catch (error) {
console.error("[Layout] Failure to process a notification message:", error); console.error(
"[Layout] Failure to process a notification message:",
error,
);
} }
}, 0); }, 0);
}, },
@@ -233,11 +240,17 @@ const Layout = () => {
try { try {
unlisten(); unlisten();
} catch (error) { } catch (error) {
console.error("[Layout] Failed to clear event listener:", error); console.error(
"[Layout] Failed to clear event listener:",
error,
);
} }
}) })
.catch((error) => { .catch((error) => {
console.error("[Layout] Failed to get unlisten function:", error); console.error(
"[Layout] Failed to get unlisten function:",
error,
);
}); });
} }
}); });
@@ -259,7 +272,9 @@ const Layout = () => {
useEffect(() => { useEffect(() => {
if (initRef.current) { if (initRef.current) {
console.log("[Layout] Initialization code has already been executed, skip"); console.log(
"[Layout] Initialization code has already been executed, skip",
);
return; return;
} }
console.log("[Layout] Begin executing initialization code"); console.log("[Layout] Begin executing initialization code");
@@ -305,7 +320,9 @@ const Layout = () => {
} }
initializationAttempts++; initializationAttempts++;
console.log(`[Layout] Start ${initializationAttempts} for the first time`); console.log(
`[Layout] Start ${initializationAttempts} for the first time`,
);
try { try {
removeLoadingOverlay(); removeLoadingOverlay();
@@ -326,7 +343,9 @@ const Layout = () => {
checkReactMount(); checkReactMount();
setTimeout(() => { setTimeout(() => {
console.log("[Layout] React components mount check timeout, continue execution"); console.log(
"[Layout] React components mount check timeout, continue execution",
);
resolve(); resolve();
}, 2000); }, 2000);
}); });
@@ -342,7 +361,9 @@ const Layout = () => {
await notifyBackend("UI ready"); await notifyBackend("UI ready");
isInitialized = true; isInitialized = true;
console.log(`[Layout] The ${initializationAttempts} initialization is complete`); console.log(
`[Layout] The ${initializationAttempts} initialization is complete`,
);
} catch (error) { } catch (error) {
console.error( console.error(
`[Layout] Initialization failure at ${initializationAttempts}:`, `[Layout] Initialization failure at ${initializationAttempts}:`,
@@ -355,7 +376,9 @@ const Layout = () => {
); );
setTimeout(performInitialization, 500); setTimeout(performInitialization, 500);
} else { } else {
console.error("[Layout] All initialization attempts fail, perform emergency initialization"); console.error(
"[Layout] All initialization attempts fail, perform emergency initialization",
);
removeLoadingOverlay(); removeLoadingOverlay();
try { try {
@@ -375,14 +398,19 @@ const Layout = () => {
console.log("[Layout] Start listening for startup completion events"); console.log("[Layout] Start listening for startup completion events");
const unlisten = await listen("verge://startup-completed", () => { const unlisten = await listen("verge://startup-completed", () => {
if (!hasEventTriggered) { if (!hasEventTriggered) {
console.log("[Layout] Receive startup completion event, start initialization"); console.log(
"[Layout] Receive startup completion event, start initialization",
);
hasEventTriggered = true; hasEventTriggered = true;
performInitialization(); performInitialization();
} }
}); });
return unlisten; return unlisten;
} catch (err) { } catch (err) {
console.error("[Layout] Failed to listen for startup completion event:", err); console.error(
"[Layout] Failed to listen for startup completion event:",
err,
);
return () => {}; return () => {};
} }
}; };
@@ -393,18 +421,24 @@ const Layout = () => {
await invoke("update_ui_stage", { stage: "Loading" }); await invoke("update_ui_stage", { stage: "Loading" });
if (!hasEventTriggered && !isInitialized) { if (!hasEventTriggered && !isInitialized) {
console.log("[Layout] Backend is ready, start initialization immediately"); console.log(
"[Layout] Backend is ready, start initialization immediately",
);
hasEventTriggered = true; hasEventTriggered = true;
performInitialization(); performInitialization();
} }
} catch (err) { } catch (err) {
console.log("[Layout] Backend not yet ready, waiting for startup completion event"); console.log(
"[Layout] Backend not yet ready, waiting for startup completion event",
);
} }
}; };
const backupInitialization = setTimeout(() => { const backupInitialization = setTimeout(() => {
if (!hasEventTriggered && !isInitialized) { if (!hasEventTriggered && !isInitialized) {
console.warn("[Layout] Standby initialization trigger: initialization not started within 1.5 seconds"); console.warn(
"[Layout] Standby initialization trigger: initialization not started within 1.5 seconds",
);
hasEventTriggered = true; hasEventTriggered = true;
performInitialization(); performInitialization();
} }
@@ -412,7 +446,9 @@ const Layout = () => {
const emergencyInitialization = setTimeout(() => { const emergencyInitialization = setTimeout(() => {
if (!isInitialized) { if (!isInitialized) {
console.error("[Layout] Emergency initialization trigger: initialization not completed within 5 seconds"); console.error(
"[Layout] Emergency initialization trigger: initialization not completed within 5 seconds",
);
removeLoadingOverlay(); removeLoadingOverlay();
notifyBackend("UI ready").catch(() => {}); notifyBackend("UI ready").catch(() => {});
isInitialized = true; isInitialized = true;
@@ -456,11 +492,10 @@ const Layout = () => {
return ( return (
<> <>
<AppSidebar /> <AppSidebar />
<main <main className="h-screen w-full overflow-y-auto transition-[margin] duration-200 ease-linear">
className="h-screen w-full overflow-y-auto transition-[margin] duration-200 ease-linear"
>
<div className="h-full w-full relative"> <div className="h-full w-full relative">
{routersEles && React.cloneElement(routersEles, { key: location.pathname })} {routersEles &&
React.cloneElement(routersEles, { key: location.pathname })}
</div> </div>
</main> </main>
<HwidErrorDialog /> <HwidErrorDialog />
@@ -468,8 +503,6 @@ const Layout = () => {
); );
}; };
return ( return (
<SWRConfig value={{ errorRetryCount: 3 }}> <SWRConfig value={{ errorRetryCount: 3 }}>
<SidebarProvider defaultOpen={false}> <SidebarProvider defaultOpen={false}>

7
src/pages/connections.tsx
View File

@@ -22,9 +22,7 @@ import {
ConnectionDetail, ConnectionDetail,
ConnectionDetailRef, ConnectionDetailRef,
} from "@/components/connection/connection-detail"; } from "@/components/connection/connection-detail";
import { import { BaseSearchBox } from "@/components/base/base-search-box";
BaseSearchBox,
} from "@/components/base/base-search-box";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { import {
Select, Select,
@@ -96,7 +94,8 @@ const ConnectionsPage = () => {
new Date(b.start || "0").getTime()! - new Date(b.start || "0").getTime()! -
new Date(a.start || "0").getTime()!, new Date(a.start || "0").getTime()!,
), ),
"Upload Speed": (list) => list.sort((a, b) => (b.curUpload ?? 0) - (a.curUpload ?? 0)), "Upload Speed": (list) =>
list.sort((a, b) => (b.curUpload ?? 0) - (a.curUpload ?? 0)),
"Download Speed": (list) => "Download Speed": (list) =>
list.sort((a, b) => (b.curDownload ?? 0) - (a.curDownload ?? 0)), list.sort((a, b) => (b.curDownload ?? 0) - (a.curDownload ?? 0)),
}; };

96
src/pages/home.tsx
View File

@@ -1,4 +1,10 @@
import React, {useRef, useMemo, useCallback, useState, useEffect} from "react"; import React, {
useRef,
useMemo,
useCallback,
useState,
useEffect,
} from "react";
import { useLockFn } from "ahooks"; import { useLockFn } from "ahooks";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -25,7 +31,11 @@ import {
AlertTriangle, AlertTriangle,
Loader2, Loader2,
Globe, Globe,
Send, ExternalLink, RefreshCw, ArrowDown, ArrowUp, Send,
ExternalLink,
RefreshCw,
ArrowDown,
ArrowUp,
} from "lucide-react"; } from "lucide-react";
import { useVerge } from "@/hooks/use-verge"; import { useVerge } from "@/hooks/use-verge";
import { useSystemState } from "@/hooks/use-system-state"; import { useSystemState } from "@/hooks/use-system-state";
@@ -34,7 +44,12 @@ import { Switch } from "@/components/ui/switch";
import { ProxySelectors } from "@/components/home/proxy-selectors"; import { ProxySelectors } from "@/components/home/proxy-selectors";
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert"; import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
import { closeAllConnections } from "@/services/api"; import { closeAllConnections } from "@/services/api";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"; import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from "@/components/ui/tooltip";
import { updateProfile } from "@/services/cmds"; import { updateProfile } from "@/services/cmds";
import { SidebarTrigger } from "@/components/ui/sidebar"; import { SidebarTrigger } from "@/components/ui/sidebar";
import parseTraffic from "@/utils/parse-traffic"; import parseTraffic from "@/utils/parse-traffic";
@@ -61,7 +76,7 @@ const MinimalHomePage: React.FC = () => {
}, [profiles]); }, [profiles]);
const currentProfile = useMemo(() => { const currentProfile = useMemo(() => {
return profileItems.find(p => p.uid === profiles?.current); return profileItems.find((p) => p.uid === profiles?.current);
}, [profileItems, profiles?.current]); }, [profileItems, profiles?.current]);
const currentProfileName = currentProfile?.name || profiles?.current; const currentProfileName = currentProfile?.name || profiles?.current;
@@ -83,10 +98,10 @@ const MinimalHomePage: React.FC = () => {
); );
useEffect(() => { useEffect(() => {
const uidToActivate = sessionStorage.getItem('activateProfile'); const uidToActivate = sessionStorage.getItem("activateProfile");
if (uidToActivate && profileItems.some(p => p.uid === uidToActivate)) { if (uidToActivate && profileItems.some((p) => p.uid === uidToActivate)) {
activateProfile(uidToActivate, false); activateProfile(uidToActivate, false);
sessionStorage.removeItem('activateProfile'); sessionStorage.removeItem("activateProfile");
} }
}, [profileItems, activateProfile]); }, [profileItems, activateProfile]);
@@ -143,7 +158,7 @@ const MinimalHomePage: React.FC = () => {
}); });
const handleUpdateProfile = useLockFn(async () => { const handleUpdateProfile = useLockFn(async () => {
if (!currentProfile?.uid || currentProfile.type !== 'remote') return; if (!currentProfile?.uid || currentProfile.type !== "remote") return;
setIsUpdating(true); setIsUpdating(true);
try { try {
await updateProfile(currentProfile.uid); await updateProfile(currentProfile.uid);
@@ -159,21 +174,21 @@ const MinimalHomePage: React.FC = () => {
const statusInfo = useMemo(() => { const statusInfo = useMemo(() => {
if (isToggling) { if (isToggling) {
return { return {
text: isProxyEnabled ? t('Disconnecting...') : t('Connecting...'), text: isProxyEnabled ? t("Disconnecting...") : t("Connecting..."),
color: isProxyEnabled ? '#f59e0b' : '#84cc16', color: isProxyEnabled ? "#f59e0b" : "#84cc16",
isAnimating: true, isAnimating: true,
}; };
} }
if (isProxyEnabled) { if (isProxyEnabled) {
return { return {
text: t('Connected'), text: t("Connected"),
color: '#22c55e', color: "#22c55e",
isAnimating: false, isAnimating: false,
}; };
} }
return { return {
text: t('Disconnected'), text: t("Disconnected"),
color: '#ef4444', color: "#ef4444",
isAnimating: false, isAnimating: false,
}; };
}, [isToggling, isProxyEnabled, t]); }, [isToggling, isProxyEnabled, t]);
@@ -181,19 +196,16 @@ const MinimalHomePage: React.FC = () => {
return ( return (
<div className="h-full w-full flex flex-col"> <div className="h-full w-full flex flex-col">
<div className="absolute inset-0 opacity-20 pointer-events-none z-0 [transform:translateZ(0)]"> <div className="absolute inset-0 opacity-20 pointer-events-none z-0 [transform:translateZ(0)]">
<img <img src={map} alt="World map" className="w-full h-full object-cover" />
src={map}
alt="World map"
className="w-full h-full object-cover"
/>
</div> </div>
{isProxyEnabled && ( {isProxyEnabled && (
<div <div
className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 h-[500px] w-[500px] rounded-full pointer-events-none z-0 transition-opacity duration-500" className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 h-[500px] w-[500px] rounded-full pointer-events-none z-0 transition-opacity duration-500"
style={{ style={{
background: 'radial-gradient(circle, rgba(34,197,94,0.3) 0%, transparent 70%)', background:
filter: 'blur(100px)', "radial-gradient(circle, rgba(34,197,94,0.3) 0%, transparent 70%)",
filter: "blur(100px)",
}} }}
/> />
)} )}
@@ -219,7 +231,7 @@ const MinimalHomePage: React.FC = () => {
"dark:bg-white/5 dark:border-white/15", "dark:bg-white/5 dark:border-white/15",
"hover:bg-white/90 hover:border-gray-400/70", "hover:bg-white/90 hover:border-gray-400/70",
"dark:hover:bg-white/10 dark:hover:border-white/20", "dark:hover:bg-white/10 dark:hover:border-white/20",
"transition-all duration-200" "transition-all duration-200",
)} )}
> >
<PlusCircle className="h-4 w-4" /> <PlusCircle className="h-4 w-4" />
@@ -241,7 +253,7 @@ const MinimalHomePage: React.FC = () => {
"dark:bg-white/5 dark:border-white/15", "dark:bg-white/5 dark:border-white/15",
"hover:bg-white/90 hover:border-gray-400/70", "hover:bg-white/90 hover:border-gray-400/70",
"dark:hover:bg-white/10 dark:hover:border-white/20", "dark:hover:bg-white/10 dark:hover:border-white/20",
"transition-all duration-200" "transition-all duration-200",
)} )}
> >
<span className="truncate">{currentProfileName}</span> <span className="truncate">{currentProfileName}</span>
@@ -264,7 +276,7 @@ const MinimalHomePage: React.FC = () => {
))} ))}
</DropdownMenuContent> </DropdownMenuContent>
</DropdownMenu> </DropdownMenu>
{currentProfile?.type === 'remote' && ( {currentProfile?.type === "remote" && (
<div className="absolute left-full ml-2"> <div className="absolute left-full ml-2">
<TooltipProvider> <TooltipProvider>
<Tooltip> <Tooltip>
@@ -280,13 +292,19 @@ const MinimalHomePage: React.FC = () => {
"dark:bg-white/5 dark:border-white/10", "dark:bg-white/5 dark:border-white/10",
"hover:bg-white/85 hover:border-gray-400/60", "hover:bg-white/85 hover:border-gray-400/60",
"dark:hover:bg-white/10 dark:hover:border-white/15", "dark:hover:bg-white/10 dark:hover:border-white/15",
"transition-all duration-200" "transition-all duration-200",
)} )}
> >
{isUpdating ? <Loader2 className="h-5 w-5 animate-spin" /> : <RefreshCw className="h-5 w-5" />} {isUpdating ? (
<Loader2 className="h-5 w-5 animate-spin" />
) : (
<RefreshCw className="h-5 w-5" />
)}
</Button> </Button>
</TooltipTrigger> </TooltipTrigger>
<TooltipContent><p>{t("Update Profile")}</p></TooltipContent> <TooltipContent>
<p>{t("Update Profile")}</p>
</TooltipContent>
</Tooltip> </Tooltip>
</TooltipProvider> </TooltipProvider>
</div> </div>
@@ -307,7 +325,7 @@ const MinimalHomePage: React.FC = () => {
"dark:bg-white/5 dark:border-white/15", "dark:bg-white/5 dark:border-white/15",
"hover:bg-white/90 hover:border-gray-400/70", "hover:bg-white/90 hover:border-gray-400/70",
"dark:hover:bg-white/10 dark:hover:border-white/20", "dark:hover:bg-white/10 dark:hover:border-white/20",
"transition-all duration-200" "transition-all duration-200",
)} )}
> >
<PlusCircle className="h-4 w-4" /> <PlusCircle className="h-4 w-4" />
@@ -325,7 +343,7 @@ const MinimalHomePage: React.FC = () => {
className={cn( className={cn(
"max-w-[250px] sm:max-w-xs opacity-50 cursor-not-allowed", "max-w-[250px] sm:max-w-xs opacity-50 cursor-not-allowed",
"backdrop-blur-sm bg-white/50 border-gray-300/40", "backdrop-blur-sm bg-white/50 border-gray-300/40",
"dark:bg-white/3 dark:border-white/10" "dark:bg-white/3 dark:border-white/10",
)} )}
> >
<span className="truncate">{t("No profiles available")}</span> <span className="truncate">{t("No profiles available")}</span>
@@ -335,8 +353,7 @@ const MinimalHomePage: React.FC = () => {
)} )}
</div> </div>
</div> </div>
<div className="flex justify-end"> <div className="flex justify-end"></div>
</div>
</header> </header>
<main className="flex-1 overflow-y-auto flex items-center justify-center"> <main className="flex-1 overflow-y-auto flex items-center justify-center">
@@ -349,9 +366,9 @@ const MinimalHomePage: React.FC = () => {
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
className="inline-flex items-center gap-2 text-base font-semibold text-foreground hover:underline hover:opacity-80 transition-all whitespace-pre-wrap" className="inline-flex items-center gap-2 text-base font-semibold text-foreground hover:underline hover:opacity-80 transition-all whitespace-pre-wrap"
title={currentProfile.announce_url.replace(/\\n/g, '\n')} title={currentProfile.announce_url.replace(/\\n/g, "\n")}
> >
<span>{currentProfile.announce.replace(/\\n/g, '\n')}</span> <span>{currentProfile.announce.replace(/\\n/g, "\n")}</span>
<ExternalLink className="h-4 w-4 flex-shrink-0" /> <ExternalLink className="h-4 w-4 flex-shrink-0" />
</a> </a>
) : ( ) : (
@@ -365,7 +382,7 @@ const MinimalHomePage: React.FC = () => {
<h1 <h1
className={cn( className={cn(
"text-4xl mb-2 font-semibold transition-colors duration-300", "text-4xl mb-2 font-semibold transition-colors duration-300",
statusInfo.isAnimating && "animate-pulse" statusInfo.isAnimating && "animate-pulse",
)} )}
style={{ color: statusInfo.color }} style={{ color: statusInfo.color }}
> >
@@ -450,8 +467,15 @@ const MinimalHomePage: React.FC = () => {
<TooltipProvider> <TooltipProvider>
<Tooltip> <Tooltip>
<TooltipTrigger asChild> <TooltipTrigger asChild>
<a href={currentProfile.support_url} target="_blank" rel="noopener noreferrer" className="transition-colors hover:text-primary"> <a
{(currentProfile.support_url.includes('t.me') || currentProfile.support_url.includes('telegram') || currentProfile.support_url.startsWith('tg://')) ? ( href={currentProfile.support_url}
target="_blank"
rel="noopener noreferrer"
className="transition-colors hover:text-primary"
>
{currentProfile.support_url.includes("t.me") ||
currentProfile.support_url.includes("telegram") ||
currentProfile.support_url.startsWith("tg://") ? (
<Send className="h-5 w-5" /> <Send className="h-5 w-5" />
) : ( ) : (
<Globe className="h-5 w-5" /> <Globe className="h-5 w-5" />

8
src/pages/profiles.tsx
View File

@@ -55,13 +55,7 @@ import {
TooltipTrigger, TooltipTrigger,
} from "@/components/ui/tooltip"; } from "@/components/ui/tooltip";
import { import { PlusCircle, RefreshCw, Zap, FileText, Loader2 } from "lucide-react";
PlusCircle,
RefreshCw,
Zap,
FileText,
Loader2,
} from "lucide-react";
import { SidebarTrigger } from "@/components/ui/sidebar"; import { SidebarTrigger } from "@/components/ui/sidebar";
const ProfilePage = () => { const ProfilePage = () => {

8
src/pages/rules.tsx
View File

@@ -1,4 +1,10 @@
import React, { useState, useMemo, useRef, useEffect, useCallback } from "react"; import React, {
useState,
useMemo,
useRef,
useEffect,
useCallback,
} from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Virtuoso, VirtuosoHandle } from "react-virtuoso"; import { Virtuoso, VirtuosoHandle } from "react-virtuoso";
import { useAppData } from "@/providers/app-data-provider"; import { useAppData } from "@/providers/app-data-provider";

5
src/services/cmds.ts
View File

@@ -401,6 +401,9 @@ export async function getNextUpdateTime(uid: string) {
return invoke<number | null>("get_next_update_time", { uid }); return invoke<number | null>("get_next_update_time", { uid });
} }
export async function createProfileFromShareLink(link: string, templateName: string) { export async function createProfileFromShareLink(
link: string,
templateName: string,
) {
return invoke<void>("create_profile_from_share_link", { link, templateName }); return invoke<void>("create_profile_from_share_link", { link, templateName });
} }

16
src/services/noticeService.ts
View File

@@ -1,21 +1,25 @@
import { toast } from "sonner"; import { toast } from "sonner";
type NoticeType = 'success' | 'error' | 'info' | 'warning'; type NoticeType = "success" | "error" | "info" | "warning";
export const showNotice = (type: NoticeType, message: string, duration?: number) => { export const showNotice = (
type: NoticeType,
message: string,
duration?: number,
) => {
const options = duration ? { duration } : {}; const options = duration ? { duration } : {};
switch (type) { switch (type) {
case 'success': case "success":
toast.success(message, options); toast.success(message, options);
break; break;
case 'error': case "error":
toast.error(message, options); toast.error(message, options);
break; break;
case 'info': case "info":
toast.info(message, options); toast.info(message, options);
break; break;
case 'warning': case "warning":
toast.warning(message, options); toast.warning(message, options);
break; break;
default: default: