>,
+ is_processing: AtomicBool,
}
impl CoreConfigValidator {
pub fn new() -> Self {
- CoreConfigValidator {
- process_status: Arc::new(Mutex::new(ValidationProcessStatus::Completed)),
+ Self {
+ is_processing: AtomicBool::new(false),
}
}
+ pub fn try_start(&self) -> bool {
+ !self.is_processing.swap(true, Ordering::AcqRel)
+ }
+
+ pub fn finish(&self) {
+ self.is_processing.store(false, Ordering::Release)
+ }
+}
+
+impl CoreConfigValidator {
/// 检查文件是否为脚本文件
- fn is_script_file(path: P) -> Result
- where
- P: AsRef + std::fmt::Display,
- {
+ async fn is_script_file(path: &str) -> Result {
// 1. 先通过扩展名快速判断
- if has_ext(&path, "yaml") || has_ext(&path, "yml") {
+ if has_ext(path, "yaml") || has_ext(path, "yml") {
return Ok(false); // YAML文件不是脚本文件
- } else if has_ext(&path, "js") {
+ } else if has_ext(path, "js") {
return Ok(true); // JS文件是脚本文件
}
// 2. 读取文件内容
- let content = match std::fs::read_to_string(&path) {
+ let content = match fs::read_to_string(path).await {
Ok(content) => content,
Err(err) => {
logging!(
@@ -118,11 +112,11 @@ impl CoreConfigValidator {
}
/// 只进行文件语法检查，不进行完整验证
- fn validate_file_syntax(config_path: &str) -> Result<(bool, String)> {
+ async fn validate_file_syntax(config_path: &str) -> Result<(bool, String)> {
logging!(info, Type::Validate, "开始检查文件: {}", config_path);
// 读取文件内容
- let content = match std::fs::read_to_string(config_path) {
+ let content = match fs::read_to_string(config_path).await {
Ok(content) => content,
Err(err) => {
let error_msg = format!("Failed to read file: {err}").into();
@@ -147,9 +141,9 @@ impl CoreConfigValidator {
}
/// 验证脚本文件语法
- fn validate_script_file(path: &str) -> Result<(bool, String)> {
+ async fn validate_script_file(path: &str) -> Result<(bool, String)> {
// 读取脚本内容
- let content = match std::fs::read_to_string(path) {
+ let content = match fs::read_to_string(path).await {
Ok(content) => content,
Err(err) => {
let error_msg = format!("Failed to read script file: {err}").into();
@@ -219,14 +213,14 @@ impl CoreConfigValidator {
"检测到Merge文件，仅进行语法检查: {}",
config_path
);
- return Self::validate_file_syntax(config_path);
+ return Self::validate_file_syntax(config_path).await;
}
// 检查是否为脚本文件
let is_script = if config_path.ends_with(".js") {
true
} else {
- match Self::is_script_file(config_path) {
+ match Self::is_script_file(config_path).await {
Ok(result) => result,
Err(err) => {
// 如果无法确定文件类型，尝试使用Clash内核验证
@@ -249,7 +243,7 @@ impl CoreConfigValidator {
"检测到脚本文件，使用JavaScript验证: {}",
config_path
);
- return Self::validate_script_file(config_path);
+ return Self::validate_script_file(config_path).await;
}
// 对YAML配置文件使用Clash内核验证
@@ -325,22 +319,18 @@ impl CoreConfigValidator {
/// 验证运行时配置
pub async fn validate_config(&self) -> Result<(bool, String)> {
- if *self.process_status.lock().await == ValidationProcessStatus::Ongoing {
+ if !self.try_start() {
logging!(info, Type::Validate, "验证已在进行中，跳过新的验证请求");
return Ok((true, String::new()));
}
- *self.process_status.lock().await = ValidationProcessStatus::Ongoing;
+ defer! {
+ self.finish();
+ }
logging!(info, Type::Validate, "生成临时配置文件用于验证");
- let result = async {
- let config_path = Config::generate_file(ConfigType::Check).await?;
- let config_path = dirs::path_to_str(&config_path)?;
- Self::validate_config_internal(config_path).await
- }
- .await;
-
- *self.process_status.lock().await = ValidationProcessStatus::Completed;
- result
+ let config_path = Config::generate_file(ConfigType::Check).await?;
+ let config_path = dirs::path_to_str(&config_path)?;
+ Self::validate_config_internal(config_path).await
}
}
diff --git a/src-tauri/src/enhance/chain.rs b/src-tauri/src/enhance/chain.rs
index 8238061c..a9a81ac8 100644
--- a/src-tauri/src/enhance/chain.rs
+++ b/src-tauri/src/enhance/chain.rs
@@ -5,7 +5,7 @@ use crate::{
};
use serde_yaml_ng::Mapping;
use smartstring::alias::String;
-use std::fs;
+use tokio::fs;
#[derive(Debug, Clone)]
pub struct ChainItem {
@@ -83,7 +83,7 @@ impl AsyncChainItemFrom for Option {
match itype {
"script" => Some(ChainItem {
uid,
- data: ChainType::Script(fs::read_to_string(path).ok()?.into()),
+ data: ChainType::Script(fs::read_to_string(path).await.ok()?.into()),
}),
"merge" => Some(ChainItem {
uid,
diff --git a/src-tauri/src/enhance/merge.rs b/src-tauri/src/enhance/merge.rs
index 0210851d..3d0e4bf9 100644
--- a/src-tauri/src/enhance/merge.rs
+++ b/src-tauri/src/enhance/merge.rs
@@ -1,3 +1,5 @@
+use crate::{logging, utils::logging::Type};
+
use super::use_lowercase;
use serde_yaml_ng::{self, Mapping, Value};
@@ -19,7 +21,11 @@ pub fn use_merge(merge: Mapping, config: Mapping) -> Mapping {
deep_merge(&mut config, &Value::from(merge));
config.as_mapping().cloned().unwrap_or_else(|| {
- log::error!("Failed to convert merged config to mapping, using empty mapping");
+ logging!(
+ error,
+ Type::Core,
+ "Failed to convert merged config to mapping, using empty mapping"
+ );
Mapping::new()
})
}
diff --git a/src-tauri/src/enhance/mod.rs b/src-tauri/src/enhance/mod.rs
index 704f199f..e9183170 100644
--- a/src-tauri/src/enhance/mod.rs
+++ b/src-tauri/src/enhance/mod.rs
@@ -6,17 +6,45 @@ pub mod seq;
mod tun;
use self::{chain::*, field::*, merge::*, script::*, seq::*, tun::*};
+use crate::constants;
+use crate::utils::dirs;
use crate::{config::Config, utils::tmpl};
+use crate::{logging, utils::logging::Type};
use serde_yaml_ng::Mapping;
use smartstring::alias::String;
use std::collections::{HashMap, HashSet};
+use tokio::fs;
type ResultLog = Vec<(String, String)>;
+#[derive(Debug)]
+struct ConfigValues {
+ clash_config: Mapping,
+ clash_core: Option,
+ enable_tun: bool,
+ enable_builtin: bool,
+ socks_enabled: bool,
+ http_enabled: bool,
+ enable_dns_settings: bool,
+ #[cfg(not(target_os = "windows"))]
+ redir_enabled: bool,
+ #[cfg(target_os = "linux")]
+ tproxy_enabled: bool,
+}
-/// Enhance mode
-/// 返回最终订阅、该订阅包含的键、和script执行的结果
-pub async fn enhance() -> (Mapping, Vec, HashMap) {
- // config.yaml 的订阅
+#[derive(Debug)]
+struct ProfileItems {
+ config: Mapping,
+ merge_item: ChainItem,
+ script_item: ChainItem,
+ rules_item: ChainItem,
+ proxies_item: ChainItem,
+ groups_item: ChainItem,
+ global_merge: ChainItem,
+ global_script: ChainItem,
+ profile_name: String,
+}
+
+async fn get_config_values() -> ConfigValues {
let clash_config = { Config::clash().await.latest_ref().0.clone() };
let (clash_core, enable_tun, enable_builtin, socks_enabled, http_enabled, enable_dns_settings) = {
@@ -31,12 +59,14 @@ pub async fn enhance() -> (Mapping, Vec, HashMap) {
verge.enable_dns_settings.unwrap_or(false),
)
};
+
#[cfg(not(target_os = "windows"))]
let redir_enabled = {
let verge = Config::verge().await;
let verge = verge.latest_ref();
verge.verge_redir_enabled.unwrap_or(false)
};
+
#[cfg(target_os = "linux")]
let tproxy_enabled = {
let verge = Config::verge().await;
@@ -44,9 +74,189 @@ pub async fn enhance() -> (Mapping, Vec, HashMap) {
verge.verge_tproxy_enabled.unwrap_or(false)
};
+ ConfigValues {
+ clash_config,
+ clash_core,
+ enable_tun,
+ enable_builtin,
+ socks_enabled,
+ http_enabled,
+ enable_dns_settings,
+ #[cfg(not(target_os = "windows"))]
+ redir_enabled,
+ #[cfg(target_os = "linux")]
+ tproxy_enabled,
+ }
+}
+
+async fn collect_profile_items() -> ProfileItems {
// 从profiles里拿东西 - 先收集需要的数据，然后释放锁
let (
- mut config,
+ current,
+ merge_uid,
+ script_uid,
+ rules_uid,
+ proxies_uid,
+ groups_uid,
+ _current_profile_uid,
+ name,
+ ) = {
+ let current = {
+ let profiles = Config::profiles().await;
+ let profiles_clone = profiles.latest_ref().clone();
+ profiles_clone.current_mapping().await.unwrap_or_default()
+ };
+
+ let profiles = Config::profiles().await;
+ let profiles_ref = profiles.latest_ref();
+
+ let merge_uid = profiles_ref.current_merge().unwrap_or_default();
+ let script_uid = profiles_ref.current_script().unwrap_or_default();
+ let rules_uid = profiles_ref.current_rules().unwrap_or_default();
+ let proxies_uid = profiles_ref.current_proxies().unwrap_or_default();
+ let groups_uid = profiles_ref.current_groups().unwrap_or_default();
+ let current_profile_uid = profiles_ref.get_current().unwrap_or_default();
+
+ let name = profiles_ref
+ .get_item(¤t_profile_uid)
+ .ok()
+ .and_then(|item| item.name.clone())
+ .unwrap_or_default();
+
+ (
+ current,
+ merge_uid,
+ script_uid,
+ rules_uid,
+ proxies_uid,
+ groups_uid,
+ current_profile_uid,
+ name,
+ )
+ };
+
+ // 现在获取具体的items，此时profiles锁已经释放
+ let merge_item = {
+ let item = {
+ let profiles = Config::profiles().await;
+ let profiles = profiles.latest_ref();
+ profiles.get_item(merge_uid).ok().cloned()
+ };
+ if let Some(item) = item {
+ >::from_async(&item).await
+ } else {
+ None
+ }
+ }
+ .unwrap_or_else(|| ChainItem {
+ uid: "".into(),
+ data: ChainType::Merge(Mapping::new()),
+ });
+
+ let script_item = {
+ let item = {
+ let profiles = Config::profiles().await;
+ let profiles = profiles.latest_ref();
+ profiles.get_item(script_uid).ok().cloned()
+ };
+ if let Some(item) = item {
+ >::from_async(&item).await
+ } else {
+ None
+ }
+ }
+ .unwrap_or_else(|| ChainItem {
+ uid: "".into(),
+ data: ChainType::Script(tmpl::ITEM_SCRIPT.into()),
+ });
+
+ let rules_item = {
+ let item = {
+ let profiles = Config::profiles().await;
+ let profiles = profiles.latest_ref();
+ profiles.get_item(rules_uid).ok().cloned()
+ };
+ if let Some(item) = item {
+ >::from_async(&item).await
+ } else {
+ None
+ }
+ }
+ .unwrap_or_else(|| ChainItem {
+ uid: "".into(),
+ data: ChainType::Rules(SeqMap::default()),
+ });
+
+ let proxies_item = {
+ let item = {
+ let profiles = Config::profiles().await;
+ let profiles = profiles.latest_ref();
+ profiles.get_item(proxies_uid).ok().cloned()
+ };
+ if let Some(item) = item {
+ >::from_async(&item).await
+ } else {
+ None
+ }
+ }
+ .unwrap_or_else(|| ChainItem {
+ uid: "".into(),
+ data: ChainType::Proxies(SeqMap::default()),
+ });
+
+ let groups_item = {
+ let item = {
+ let profiles = Config::profiles().await;
+ let profiles = profiles.latest_ref();
+ profiles.get_item(groups_uid).ok().cloned()
+ };
+ if let Some(item) = item {
+ >::from_async(&item).await
+ } else {
+ None
+ }
+ }
+ .unwrap_or_else(|| ChainItem {
+ uid: "".into(),
+ data: ChainType::Groups(SeqMap::default()),
+ });
+
+ let global_merge = {
+ let item = {
+ let profiles = Config::profiles().await;
+ let profiles = profiles.latest_ref();
+ profiles.get_item("Merge").ok().cloned()
+ };
+ if let Some(item) = item {
+ >::from_async(&item).await
+ } else {
+ None
+ }
+ }
+ .unwrap_or_else(|| ChainItem {
+ uid: "Merge".into(),
+ data: ChainType::Merge(Mapping::new()),
+ });
+
+ let global_script = {
+ let item = {
+ let profiles = Config::profiles().await;
+ let profiles = profiles.latest_ref();
+ profiles.get_item("Script").ok().cloned()
+ };
+ if let Some(item) = item {
+ >::from_async(&item).await
+ } else {
+ None
+ }
+ }
+ .unwrap_or_else(|| ChainItem {
+ uid: "Script".into(),
+ data: ChainType::Script(tmpl::ITEM_SCRIPT.into()),
+ });
+
+ ProfileItems {
+ config: current,
merge_item,
script_item,
rules_item,
@@ -54,192 +264,19 @@ pub async fn enhance() -> (Mapping, Vec, HashMap) {
groups_item,
global_merge,
global_script,
- profile_name,
- ) = {
- // 收集所有需要的数据，然后释放profiles锁
- let (
- current,
- merge_uid,
- script_uid,
- rules_uid,
- proxies_uid,
- groups_uid,
- _current_profile_uid,
- name,
- ) = {
- // 分离async调用和数据获取，避免借用检查问题
- let current = {
- let profiles = Config::profiles().await;
- let profiles_clone = profiles.latest_ref().clone();
- profiles_clone.current_mapping().await.unwrap_or_default()
- };
+ profile_name: name,
+ }
+}
- // 重新获取锁进行其他操作
- let profiles = Config::profiles().await;
- let profiles_ref = profiles.latest_ref();
+fn process_global_items(
+ mut config: Mapping,
+ global_merge: ChainItem,
+ global_script: ChainItem,
+ profile_name: String,
+) -> (Mapping, Vec, HashMap) {
+ let mut result_map = HashMap::new();
+ let mut exists_keys = use_keys(&config);
- let merge_uid = profiles_ref.current_merge().unwrap_or_default();
- let script_uid = profiles_ref.current_script().unwrap_or_default();
- let rules_uid = profiles_ref.current_rules().unwrap_or_default();
- let proxies_uid = profiles_ref.current_proxies().unwrap_or_default();
- let groups_uid = profiles_ref.current_groups().unwrap_or_default();
- let current_profile_uid = profiles_ref.get_current().unwrap_or_default();
-
- let name = profiles_ref
- .get_item(¤t_profile_uid)
- .ok()
- .and_then(|item| item.name.clone())
- .unwrap_or_default();
-
- (
- current,
- merge_uid,
- script_uid,
- rules_uid,
- proxies_uid,
- groups_uid,
- current_profile_uid,
- name,
- )
- };
-
- // 现在获取具体的items，此时profiles锁已经释放
- let merge = {
- let item = {
- let profiles = Config::profiles().await;
- let profiles = profiles.latest_ref();
- profiles.get_item(&merge_uid).ok().cloned()
- };
- if let Some(item) = item {
- >::from_async(&item).await
- } else {
- None
- }
- }
- .unwrap_or_else(|| ChainItem {
- uid: "".into(),
- data: ChainType::Merge(Mapping::new()),
- });
-
- let script = {
- let item = {
- let profiles = Config::profiles().await;
- let profiles = profiles.latest_ref();
- profiles.get_item(&script_uid).ok().cloned()
- };
- if let Some(item) = item {
- >::from_async(&item).await
- } else {
- None
- }
- }
- .unwrap_or_else(|| ChainItem {
- uid: "".into(),
- data: ChainType::Script(tmpl::ITEM_SCRIPT.into()),
- });
-
- let rules = {
- let item = {
- let profiles = Config::profiles().await;
- let profiles = profiles.latest_ref();
- profiles.get_item(&rules_uid).ok().cloned()
- };
- if let Some(item) = item {
- >::from_async(&item).await
- } else {
- None
- }
- }
- .unwrap_or_else(|| ChainItem {
- uid: "".into(),
- data: ChainType::Rules(SeqMap::default()),
- });
-
- let proxies = {
- let item = {
- let profiles = Config::profiles().await;
- let profiles = profiles.latest_ref();
- profiles.get_item(&proxies_uid).ok().cloned()
- };
- if let Some(item) = item {
- >::from_async(&item).await
- } else {
- None
- }
- }
- .unwrap_or_else(|| ChainItem {
- uid: "".into(),
- data: ChainType::Proxies(SeqMap::default()),
- });
-
- let groups = {
- let item = {
- let profiles = Config::profiles().await;
- let profiles = profiles.latest_ref();
- profiles.get_item(&groups_uid).ok().cloned()
- };
- if let Some(item) = item {
- >::from_async(&item).await
- } else {
- None
- }
- }
- .unwrap_or_else(|| ChainItem {
- uid: "".into(),
- data: ChainType::Groups(SeqMap::default()),
- });
-
- let global_merge = {
- let item = {
- let profiles = Config::profiles().await;
- let profiles = profiles.latest_ref();
- profiles.get_item(&"Merge".into()).ok().cloned()
- };
- if let Some(item) = item {
- >::from_async(&item).await
- } else {
- None
- }
- }
- .unwrap_or_else(|| ChainItem {
- uid: "Merge".into(),
- data: ChainType::Merge(Mapping::new()),
- });
-
- let global_script = {
- let item = {
- let profiles = Config::profiles().await;
- let profiles = profiles.latest_ref();
- profiles.get_item(&"Script".into()).ok().cloned()
- };
- if let Some(item) = item {
- >::from_async(&item).await
- } else {
- None
- }
- }
- .unwrap_or_else(|| ChainItem {
- uid: "Script".into(),
- data: ChainType::Script(tmpl::ITEM_SCRIPT.into()),
- });
-
- (
- current,
- merge,
- script,
- rules,
- proxies,
- groups,
- global_merge,
- global_script,
- name,
- )
- };
-
- let mut result_map = HashMap::new(); // 保存脚本日志
- let mut exists_keys = use_keys(&config); // 保存出现过的keys
-
- // 全局Merge和Script
if let ChainType::Merge(merge) = global_merge.data {
exists_keys.extend(use_keys(&merge));
config = use_merge(merge, config.to_owned());
@@ -247,7 +284,6 @@ pub async fn enhance() -> (Mapping, Vec, HashMap) {
if let ChainType::Script(script) = global_script.data {
let mut logs = vec![];
-
match use_script(script, config.to_owned(), profile_name.to_owned()) {
Ok((res_config, res_logs)) => {
exists_keys.extend(use_keys(&res_config));
@@ -256,11 +292,24 @@ pub async fn enhance() -> (Mapping, Vec, HashMap) {
}
Err(err) => logs.push(("exception".into(), err.to_string().into())),
}
-
result_map.insert(global_script.uid, logs);
}
- // 订阅关联的Merge、Script、Rules、Proxies、Groups
+ (config, exists_keys, result_map)
+}
+
+#[allow(clippy::too_many_arguments)]
+fn process_profile_items(
+ mut config: Mapping,
+ mut exists_keys: Vec,
+ mut result_map: HashMap,
+ rules_item: ChainItem,
+ proxies_item: ChainItem,
+ groups_item: ChainItem,
+ merge_item: ChainItem,
+ script_item: ChainItem,
+ profile_name: String,
+) -> (Mapping, Vec, HashMap) {
if let ChainType::Rules(rules) = rules_item.data {
config = use_seq(rules, config.to_owned(), "rules");
}
@@ -280,7 +329,6 @@ pub async fn enhance() -> (Mapping, Vec, HashMap) {
if let ChainType::Script(script) = script_item.data {
let mut logs = vec![];
-
match use_script(script, config.to_owned(), profile_name) {
Ok((res_config, res_logs)) => {
exists_keys.extend(use_keys(&res_config));
@@ -289,11 +337,20 @@ pub async fn enhance() -> (Mapping, Vec, HashMap) {
}
Err(err) => logs.push(("exception".into(), err.to_string().into())),
}
-
result_map.insert(script_item.uid, logs);
}
- // 合并默认的config
+ (config, exists_keys, result_map)
+}
+
+async fn merge_default_config(
+ mut config: Mapping,
+ clash_config: Mapping,
+ socks_enabled: bool,
+ http_enabled: bool,
+ #[cfg(not(target_os = "windows"))] redir_enabled: bool,
+ #[cfg(target_os = "linux")] tproxy_enabled: bool,
+) -> Mapping {
for (key, value) in clash_config.into_iter() {
if key.as_str() == Some("tun") {
let mut tun = config.get_mut("tun").map_or_else(Mapping::new, |val| {
@@ -353,66 +410,140 @@ pub async fn enhance() -> (Mapping, Vec, HashMap) {
}
}
- // 内建脚本最后跑
+ config
+}
+
+fn apply_builtin_scripts(
+ mut config: Mapping,
+ clash_core: Option,
+ enable_builtin: bool,
+) -> Mapping {
if enable_builtin {
ChainItem::builtin()
.into_iter()
.filter(|(s, _)| s.is_support(clash_core.as_ref()))
.map(|(_, c)| c)
.for_each(|item| {
- log::debug!(target: "app", "run builtin script {}", item.uid);
+ logging!(debug, Type::Core, "run builtin script {}", item.uid);
if let ChainType::Script(script) = item.data {
match use_script(script, config.to_owned(), "".into()) {
Ok((res_config, _)) => {
config = res_config;
}
Err(err) => {
- log::error!(target: "app", "builtin script error `{err}`");
+ logging!(error, Type::Core, "builtin script error `{err}`");
}
}
}
});
}
- config = use_tun(config, enable_tun);
- config = use_sort(config);
+ config
+}
- // 应用独立的DNS配置（如果启用）
- if enable_dns_settings {
- use crate::utils::dirs;
- use std::fs;
+async fn apply_dns_settings(mut config: Mapping, enable_dns_settings: bool) -> Mapping {
+ if enable_dns_settings && let Ok(app_dir) = dirs::app_home_dir() {
+ let dns_path = app_dir.join(constants::files::DNS_CONFIG);
- if let Ok(app_dir) = dirs::app_home_dir() {
- let dns_path = app_dir.join("dns_config.yaml");
-
- if dns_path.exists()
- && let Ok(dns_yaml) = fs::read_to_string(&dns_path)
- && let Ok(dns_config) = serde_yaml_ng::from_str::(&dns_yaml)
+ if dns_path.exists()
+ && let Ok(dns_yaml) = fs::read_to_string(&dns_path).await
+ && let Ok(dns_config) = serde_yaml_ng::from_str::(&dns_yaml)
+ {
+ if let Some(hosts_value) = dns_config.get("hosts")
+ && hosts_value.is_mapping()
{
- // 处理hosts配置
- if let Some(hosts_value) = dns_config.get("hosts")
- && hosts_value.is_mapping()
- {
- config.insert("hosts".into(), hosts_value.clone());
- log::info!(target: "app", "apply hosts configuration");
- }
+ config.insert("hosts".into(), hosts_value.clone());
+ logging!(info, Type::Core, "apply hosts configuration");
+ }
- if let Some(dns_value) = dns_config.get("dns") {
- if let Some(dns_mapping) = dns_value.as_mapping() {
- config.insert("dns".into(), dns_mapping.clone().into());
- log::info!(target: "app", "apply dns_config.yaml (dns section)");
- }
- } else {
- config.insert("dns".into(), dns_config.into());
- log::info!(target: "app", "apply dns_config.yaml");
+ if let Some(dns_value) = dns_config.get("dns") {
+ if let Some(dns_mapping) = dns_value.as_mapping() {
+ config.insert("dns".into(), dns_mapping.clone().into());
+ logging!(info, Type::Core, "apply dns_config.yaml (dns section)");
}
+ } else {
+ config.insert("dns".into(), dns_config.into());
+ logging!(info, Type::Core, "apply dns_config.yaml");
}
}
}
+ config
+}
+
+/// Enhance mode
+/// 返回最终订阅、该订阅包含的键、和script执行的结果
+pub async fn enhance() -> (Mapping, Vec, HashMap) {
+ // gather config values
+ let cfg_vals = get_config_values().await;
+ let ConfigValues {
+ clash_config,
+ clash_core,
+ enable_tun,
+ enable_builtin,
+ socks_enabled,
+ http_enabled,
+ enable_dns_settings,
+ #[cfg(not(target_os = "windows"))]
+ redir_enabled,
+ #[cfg(target_os = "linux")]
+ tproxy_enabled,
+ } = cfg_vals;
+
+ // collect profile items
+ let profile = collect_profile_items().await;
+ let config = profile.config;
+ let merge_item = profile.merge_item;
+ let script_item = profile.script_item;
+ let rules_item = profile.rules_item;
+ let proxies_item = profile.proxies_item;
+ let groups_item = profile.groups_item;
+ let global_merge = profile.global_merge;
+ let global_script = profile.global_script;
+ let profile_name = profile.profile_name;
+
+ // process globals
+ let (config, exists_keys, result_map) =
+ process_global_items(config, global_merge, global_script, profile_name.clone());
+
+ // process profile-specific items
+ let (config, exists_keys, result_map) = process_profile_items(
+ config,
+ exists_keys,
+ result_map,
+ rules_item,
+ proxies_item,
+ groups_item,
+ merge_item,
+ script_item,
+ profile_name,
+ );
+
+ // merge default clash config
+ let config = merge_default_config(
+ config,
+ clash_config,
+ socks_enabled,
+ http_enabled,
+ #[cfg(not(target_os = "windows"))]
+ redir_enabled,
+ #[cfg(target_os = "linux")]
+ tproxy_enabled,
+ )
+ .await;
+
+ // builtin scripts
+ let mut config = apply_builtin_scripts(config, clash_core, enable_builtin);
+
+ config = use_tun(config, enable_tun);
+ config = use_sort(config);
+
+ // dns settings
+ config = apply_dns_settings(config, enable_dns_settings).await;
+
let mut exists_set = HashSet::new();
exists_set.extend(exists_keys);
- exists_keys = exists_set.into_iter().collect();
+ let exists_keys: Vec = exists_set.into_iter().collect();
(config, exists_keys, result_map)
}
diff --git a/src-tauri/src/enhance/tun.rs b/src-tauri/src/enhance/tun.rs
index 92c8f018..a09051fa 100644
--- a/src-tauri/src/enhance/tun.rs
+++ b/src-tauri/src/enhance/tun.rs
@@ -2,6 +2,8 @@ use serde_yaml_ng::{Mapping, Value};
#[cfg(target_os = "macos")]
use crate::process::AsyncHandler;
+#[cfg(target_os = "linux")]
+use crate::{logging, utils::logging::Type};
macro_rules! revise {
($map: expr, $key: expr, $val: expr) => {
@@ -42,9 +44,10 @@ pub fn use_tun(mut config: Mapping, enable: bool) -> Mapping {
if should_override {
revise!(tun_val, "stack", "mixed");
- log::warn!(
- target: "app",
- "gVisor TUN stack detected on Linux; falling back to 'mixed' for compatibility"
+ logging!(
+ warn,
+ Type::Network,
+ "Warning: gVisor TUN stack detected on Linux; falling back to 'mixed' for compatibility"
);
}
}
diff --git a/src-tauri/src/feat/backup.rs b/src-tauri/src/feat/backup.rs
index e2f0957a..fcc8d048 100644
--- a/src-tauri/src/feat/backup.rs
+++ b/src-tauri/src/feat/backup.rs
@@ -2,6 +2,7 @@ use crate::{
config::{Config, IVerge},
core::backup,
logging, logging_error,
+ process::AsyncHandler,
utils::{
dirs::{PathBufExec, app_home_dir, local_backup_dir},
logging::Type,
@@ -12,7 +13,8 @@ use chrono::Utc;
use reqwest_dav::list_cmd::ListFile;
use serde::Serialize;
use smartstring::alias::String;
-use std::{fs, path::PathBuf};
+use std::path::PathBuf;
+use tokio::fs;
#[derive(Debug, Serialize)]
pub struct LocalBackupFile {
@@ -24,7 +26,7 @@ pub struct LocalBackupFile {
/// Create a backup and upload to WebDAV
pub async fn create_backup_and_upload_webdav() -> Result<()> {
- let (file_name, temp_file_path) = backup::create_backup().map_err(|err| {
+ let (file_name, temp_file_path) = backup::create_backup().await.map_err(|err| {
logging!(error, Type::Backup, "Failed to create backup: {err:#?}");
err
})?;
@@ -97,12 +99,14 @@ pub async fn restore_webdav_backup(filename: String) -> Result<()> {
})?;
// extract zip file
- let mut zip = zip::ZipArchive::new(fs::File::open(backup_storage_path.clone())?)?;
+ let value = backup_storage_path.clone();
+ let file = AsyncHandler::spawn_blocking(move || std::fs::File::open(&value)).await??;
+ let mut zip = zip::ZipArchive::new(file)?;
zip.extract(app_home_dir()?)?;
logging_error!(
Type::Backup,
super::patch_verge(
- IVerge {
+ &IVerge {
webdav_url,
webdav_username,
webdav_password,
@@ -119,7 +123,7 @@ pub async fn restore_webdav_backup(filename: String) -> Result<()> {
/// Create a backup and save to local storage
pub async fn create_local_backup() -> Result<()> {
- let (file_name, temp_file_path) = backup::create_backup().map_err(|err| {
+ let (file_name, temp_file_path) = backup::create_backup().await.map_err(|err| {
logging!(
error,
Type::Backup,
@@ -131,7 +135,7 @@ pub async fn create_local_backup() -> Result<()> {
let backup_dir = local_backup_dir()?;
let target_path = backup_dir.join(file_name.as_str());
- if let Err(err) = move_file(temp_file_path.clone(), target_path.clone()) {
+ if let Err(err) = move_file(temp_file_path.clone(), target_path.clone()).await {
logging!(
error,
Type::Backup,
@@ -151,12 +155,12 @@ pub async fn create_local_backup() -> Result<()> {
Ok(())
}
-fn move_file(from: PathBuf, to: PathBuf) -> Result<()> {
+async fn move_file(from: PathBuf, to: PathBuf) -> Result<()> {
if let Some(parent) = to.parent() {
- fs::create_dir_all(parent)?;
+ fs::create_dir_all(parent).await?;
}
- match fs::rename(&from, &to) {
+ match fs::rename(&from, &to).await {
Ok(_) => Ok(()),
Err(rename_err) => {
// Attempt copy + remove as fallback, covering cross-device moves
@@ -165,8 +169,11 @@ fn move_file(from: PathBuf, to: PathBuf) -> Result<()> {
Type::Backup,
"Failed to rename backup file directly, fallback to copy/remove: {rename_err:#?}"
);
- fs::copy(&from, &to).map_err(|err| anyhow!("Failed to copy backup file: {err:#?}"))?;
+ fs::copy(&from, &to)
+ .await
+ .map_err(|err| anyhow!("Failed to copy backup file: {err:#?}"))?;
fs::remove_file(&from)
+ .await
.map_err(|err| anyhow!("Failed to remove temp backup file: {err:#?}"))?;
Ok(())
}
@@ -174,24 +181,25 @@ fn move_file(from: PathBuf, to: PathBuf) -> Result<()> {
}
/// List local backups
-pub fn list_local_backup() -> Result> {
+pub async fn list_local_backup() -> Result> {
let backup_dir = local_backup_dir()?;
if !backup_dir.exists() {
return Ok(vec![]);
}
let mut backups = Vec::new();
- for entry in fs::read_dir(&backup_dir)? {
- let entry = entry?;
+ let mut dir = fs::read_dir(&backup_dir).await?;
+ while let Some(entry) = dir.next_entry().await? {
let path = entry.path();
- if !path.is_file() {
+ let metadata = entry.metadata().await?;
+ if !metadata.is_file() {
continue;
}
- let Some(file_name) = path.file_name().and_then(|name| name.to_str()) else {
- continue;
+ let file_name = match path.file_name().and_then(|name| name.to_str()) {
+ Some(name) => name,
+ None => continue,
};
- let metadata = entry.metadata()?;
let last_modified = metadata
.modified()
.map(|time| chrono::DateTime::::from(time).to_rfc3339())
@@ -239,12 +247,13 @@ pub async fn restore_local_backup(filename: String) -> Result<()> {
let webdav_username = verge_data.webdav_username.clone();
let webdav_password = verge_data.webdav_password.clone();
- let mut zip = zip::ZipArchive::new(fs::File::open(&target_path)?)?;
+ let file = AsyncHandler::spawn_blocking(move || std::fs::File::open(&target_path)).await??;
+ let mut zip = zip::ZipArchive::new(file)?;
zip.extract(app_home_dir()?)?;
logging_error!(
Type::Backup,
super::patch_verge(
- IVerge {
+ &IVerge {
webdav_url,
webdav_username,
webdav_password,
@@ -258,7 +267,7 @@ pub async fn restore_local_backup(filename: String) -> Result<()> {
}
/// Export local backup file to user selected destination
-pub fn export_local_backup(filename: String, destination: String) -> Result<()> {
+pub async fn export_local_backup(filename: String, destination: String) -> Result<()> {
let backup_dir = local_backup_dir()?;
let source_path = backup_dir.join(filename.as_str());
if !source_path.exists() {
@@ -267,10 +276,11 @@ pub fn export_local_backup(filename: String, destination: String) -> Result<()>
let dest_path = PathBuf::from(destination.as_str());
if let Some(parent) = dest_path.parent() {
- fs::create_dir_all(parent)?;
+ fs::create_dir_all(parent).await?;
}
fs::copy(&source_path, &dest_path)
+ .await
.map(|_| ())
.map_err(|err| anyhow!("Failed to export backup file: {err:#?}"))?;
Ok(())
diff --git a/src-tauri/src/feat/clash.rs b/src-tauri/src/feat/clash.rs
index b4143a26..cf031d78 100644
--- a/src-tauri/src/feat/clash.rs
+++ b/src-tauri/src/feat/clash.rs
@@ -1,7 +1,7 @@
use crate::{
config::Config,
core::{CoreManager, handle, tray},
- logging_error,
+ logging, logging_error,
process::AsyncHandler,
utils::{self, logging::Type, resolve},
};
@@ -17,7 +17,7 @@ pub async fn restart_clash_core() {
}
Err(err) => {
handle::Handle::notice_message("set_config::error", format!("{err}"));
- log::error!(target:"app", "{err}");
+ logging!(error, Type::Core, "{err}");
}
}
}
@@ -30,7 +30,7 @@ pub async fn restart_app() {
"restart_app::error",
format!("Failed to cleanup resources: {err}"),
);
- log::error!(target:"app", "Restart failed during cleanup: {err}");
+ logging!(error, Type::Core, "Restart failed during cleanup: {err}");
return;
}
@@ -50,7 +50,7 @@ fn after_change_clash_mode() {
}
}
Err(err) => {
- log::error!(target: "app", "Failed to get connections: {err}");
+ logging!(error, Type::Core, "Failed to get connections: {err}");
}
}
});
@@ -64,7 +64,7 @@ pub async fn change_clash_mode(mode: String) {
let json_value = serde_json::json!({
"mode": mode
});
- log::debug!(target: "app", "change clash mode to {mode}");
+ logging!(debug, Type::Core, "change clash mode to {mode}");
match handle::Handle::mihomo()
.await
.patch_base_config(&json_value)
@@ -91,7 +91,7 @@ pub async fn change_clash_mode(mode: String) {
after_change_clash_mode();
}
}
- Err(err) => log::error!(target: "app", "{err}"),
+ Err(err) => logging!(error, Type::Core, "{err}"),
}
}
@@ -123,7 +123,7 @@ pub async fn test_delay(url: String) -> anyhow::Result {
match response {
Ok(response) => {
- log::trace!(target: "app", "test_delay response: {response:#?}");
+ logging!(trace, Type::Network, "test_delay response: {response:#?}");
if response.status().is_success() {
Ok(start.elapsed().as_millis() as u32)
} else {
@@ -131,7 +131,7 @@ pub async fn test_delay(url: String) -> anyhow::Result {
}
}
Err(err) => {
- log::trace!(target: "app", "test_delay error: {err:#?}");
+ logging!(trace, Type::Network, "test_delay error: {err:#?}");
Err(err)
}
}
diff --git a/src-tauri/src/feat/config.rs b/src-tauri/src/feat/config.rs
index 506f5fa6..1ca9669c 100644
--- a/src-tauri/src/feat/config.rs
+++ b/src-tauri/src/feat/config.rs
@@ -63,23 +63,19 @@ enum UpdateFlags {
LighteWeight = 1 << 10,
}
-/// Patch Verge configuration
-pub async fn patch_verge(patch: IVerge, not_save_file: bool) -> Result<()> {
- Config::verge()
- .await
- .draft_mut()
- .patch_config(patch.clone());
+fn determine_update_flags(patch: &IVerge) -> i32 {
+ let mut update_flags: i32 = UpdateFlags::None as i32;
let tun_mode = patch.enable_tun_mode;
let auto_launch = patch.enable_auto_launch;
let system_proxy = patch.enable_system_proxy;
let pac = patch.proxy_auto_config;
- let pac_content = patch.pac_file_content;
- let proxy_bypass = patch.system_proxy_bypass;
- let language = patch.language;
+ let pac_content = &patch.pac_file_content;
+ let proxy_bypass = &patch.system_proxy_bypass;
+ let language = &patch.language;
let mixed_port = patch.verge_mixed_port;
#[cfg(target_os = "macos")]
- let tray_icon = patch.tray_icon;
+ let tray_icon = &patch.tray_icon;
#[cfg(not(target_os = "macos"))]
let tray_icon: Option = None;
let common_tray_icon = patch.common_tray_icon;
@@ -98,147 +94,156 @@ pub async fn patch_verge(patch: IVerge, not_save_file: bool) -> Result<()> {
let http_enabled = patch.verge_http_enabled;
let http_port = patch.verge_port;
let enable_tray_speed = patch.enable_tray_speed;
- let enable_tray_icon = patch.enable_tray_icon;
+ // let enable_tray_icon = patch.enable_tray_icon;
let enable_global_hotkey = patch.enable_global_hotkey;
- let tray_event = patch.tray_event;
+ let tray_event = &patch.tray_event;
let home_cards = patch.home_cards.clone();
let enable_auto_light_weight = patch.enable_auto_light_weight_mode;
let enable_external_controller = patch.enable_external_controller;
- let res: std::result::Result<(), anyhow::Error> = {
- // Initialize with no flags set
- let mut update_flags: i32 = UpdateFlags::None as i32;
+ let tray_inline_proxy_groups = patch.tray_inline_proxy_groups;
- if tun_mode.is_some() {
- update_flags |= UpdateFlags::ClashConfig as i32;
- update_flags |= UpdateFlags::SystrayMenu as i32;
- update_flags |= UpdateFlags::SystrayTooltip as i32;
- update_flags |= UpdateFlags::SystrayIcon as i32;
- }
- if enable_global_hotkey.is_some() || home_cards.is_some() {
- update_flags |= UpdateFlags::VergeConfig as i32;
- }
- #[cfg(not(target_os = "windows"))]
- if redir_enabled.is_some() || redir_port.is_some() {
- update_flags |= UpdateFlags::RestartCore as i32;
- }
- #[cfg(target_os = "linux")]
- if tproxy_enabled.is_some() || tproxy_port.is_some() {
- update_flags |= UpdateFlags::RestartCore as i32;
- }
- if socks_enabled.is_some()
- || http_enabled.is_some()
- || socks_port.is_some()
- || http_port.is_some()
- || mixed_port.is_some()
- {
- update_flags |= UpdateFlags::RestartCore as i32;
- }
- if auto_launch.is_some() {
- update_flags |= UpdateFlags::Launch as i32;
- }
+ if tun_mode.is_some() {
+ update_flags |= UpdateFlags::ClashConfig as i32;
+ update_flags |= UpdateFlags::SystrayMenu as i32;
+ update_flags |= UpdateFlags::SystrayTooltip as i32;
+ update_flags |= UpdateFlags::SystrayIcon as i32;
+ }
+ if enable_global_hotkey.is_some() || home_cards.is_some() {
+ update_flags |= UpdateFlags::VergeConfig as i32;
+ }
+ #[cfg(not(target_os = "windows"))]
+ if redir_enabled.is_some() || redir_port.is_some() {
+ update_flags |= UpdateFlags::RestartCore as i32;
+ }
+ #[cfg(target_os = "linux")]
+ if tproxy_enabled.is_some() || tproxy_port.is_some() {
+ update_flags |= UpdateFlags::RestartCore as i32;
+ }
+ if socks_enabled.is_some()
+ || http_enabled.is_some()
+ || socks_port.is_some()
+ || http_port.is_some()
+ || mixed_port.is_some()
+ {
+ update_flags |= UpdateFlags::RestartCore as i32;
+ }
+ if auto_launch.is_some() {
+ update_flags |= UpdateFlags::Launch as i32;
+ }
- if system_proxy.is_some() {
- update_flags |= UpdateFlags::SysProxy as i32;
- update_flags |= UpdateFlags::SystrayMenu as i32;
- update_flags |= UpdateFlags::SystrayTooltip as i32;
- update_flags |= UpdateFlags::SystrayIcon as i32;
- }
+ if system_proxy.is_some() {
+ update_flags |= UpdateFlags::SysProxy as i32;
+ update_flags |= UpdateFlags::SystrayMenu as i32;
+ update_flags |= UpdateFlags::SystrayTooltip as i32;
+ update_flags |= UpdateFlags::SystrayIcon as i32;
+ }
- if proxy_bypass.is_some() || pac_content.is_some() || pac.is_some() {
- update_flags |= UpdateFlags::SysProxy as i32;
- }
+ if proxy_bypass.is_some() || pac_content.is_some() || pac.is_some() {
+ update_flags |= UpdateFlags::SysProxy as i32;
+ }
- if language.is_some() {
- update_flags |= UpdateFlags::SystrayMenu as i32;
- }
- if common_tray_icon.is_some()
- || sysproxy_tray_icon.is_some()
- || tun_tray_icon.is_some()
- || tray_icon.is_some()
- || enable_tray_speed.is_some()
- || enable_tray_icon.is_some()
- {
- update_flags |= UpdateFlags::SystrayIcon as i32;
- }
+ if language.is_some() {
+ update_flags |= UpdateFlags::SystrayMenu as i32;
+ }
+ if common_tray_icon.is_some()
+ || sysproxy_tray_icon.is_some()
+ || tun_tray_icon.is_some()
+ || tray_icon.is_some()
+ || enable_tray_speed.is_some()
+ // || enable_tray_icon.is_some()
+ {
+ update_flags |= UpdateFlags::SystrayIcon as i32;
+ }
- if patch.hotkeys.is_some() {
- update_flags |= UpdateFlags::Hotkey as i32;
- update_flags |= UpdateFlags::SystrayMenu as i32;
- }
+ if patch.hotkeys.is_some() {
+ update_flags |= UpdateFlags::Hotkey as i32;
+ update_flags |= UpdateFlags::SystrayMenu as i32;
+ }
- if tray_event.is_some() {
- update_flags |= UpdateFlags::SystrayClickBehavior as i32;
- }
+ if tray_event.is_some() {
+ update_flags |= UpdateFlags::SystrayClickBehavior as i32;
+ }
- if enable_auto_light_weight.is_some() {
- update_flags |= UpdateFlags::LighteWeight as i32;
- }
+ if enable_auto_light_weight.is_some() {
+ update_flags |= UpdateFlags::LighteWeight as i32;
+ }
- // 处理 external-controller 的开关
- if enable_external_controller.is_some() {
- update_flags |= UpdateFlags::RestartCore as i32;
- }
+ if enable_external_controller.is_some() {
+ update_flags |= UpdateFlags::RestartCore as i32;
+ }
- // Process updates based on flags
- if (update_flags & (UpdateFlags::RestartCore as i32)) != 0 {
- Config::generate().await?;
- CoreManager::global().restart_core().await?;
- }
- if (update_flags & (UpdateFlags::ClashConfig as i32)) != 0 {
- CoreManager::global().update_config().await?;
- handle::Handle::refresh_clash();
- }
- if (update_flags & (UpdateFlags::VergeConfig as i32)) != 0 {
- Config::verge().await.draft_mut().enable_global_hotkey = enable_global_hotkey;
- handle::Handle::refresh_verge();
- }
- if (update_flags & (UpdateFlags::Launch as i32)) != 0 {
- sysopt::Sysopt::global().update_launch().await?;
- }
- if (update_flags & (UpdateFlags::SysProxy as i32)) != 0 {
- sysopt::Sysopt::global().update_sysproxy().await?;
- }
- if (update_flags & (UpdateFlags::Hotkey as i32)) != 0
- && let Some(hotkeys) = patch.hotkeys
- {
- hotkey::Hotkey::global().update(hotkeys).await?;
- }
- if (update_flags & (UpdateFlags::SystrayMenu as i32)) != 0 {
- tray::Tray::global().update_menu().await?;
- }
- if (update_flags & (UpdateFlags::SystrayIcon as i32)) != 0 {
- tray::Tray::global().update_icon().await?;
- }
- if (update_flags & (UpdateFlags::SystrayTooltip as i32)) != 0 {
- tray::Tray::global().update_tooltip().await?;
- }
- if (update_flags & (UpdateFlags::SystrayClickBehavior as i32)) != 0 {
- tray::Tray::global().update_click_behavior().await?;
- }
- if (update_flags & (UpdateFlags::LighteWeight as i32)) != 0 {
- if enable_auto_light_weight.unwrap_or(false) {
- lightweight::enable_auto_light_weight_mode().await;
- } else {
- lightweight::disable_auto_light_weight_mode();
- }
- }
+ if tray_inline_proxy_groups.is_some() {
+ update_flags |= UpdateFlags::SystrayMenu as i32;
+ }
- >::Ok(())
- };
- match res {
- Ok(()) => {
- Config::verge().await.apply();
- if !not_save_file {
- // 分离数据获取和异步调用
- let verge_data = Config::verge().await.data_mut().clone();
- verge_data.save_file().await?;
- }
+ update_flags
+}
- Ok(())
- }
- Err(err) => {
- Config::verge().await.discard();
- Err(err)
+async fn process_terminated_flags(update_flags: i32, patch: &IVerge) -> Result<()> {
+ // Process updates based on flags
+ if (update_flags & (UpdateFlags::RestartCore as i32)) != 0 {
+ Config::generate().await?;
+ CoreManager::global().restart_core().await?;
+ }
+ if (update_flags & (UpdateFlags::ClashConfig as i32)) != 0 {
+ CoreManager::global().update_config().await?;
+ handle::Handle::refresh_clash();
+ }
+ if (update_flags & (UpdateFlags::VergeConfig as i32)) != 0 {
+ Config::verge().await.draft_mut().enable_global_hotkey = patch.enable_global_hotkey;
+ handle::Handle::refresh_verge();
+ }
+ if (update_flags & (UpdateFlags::Launch as i32)) != 0 {
+ sysopt::Sysopt::global().update_launch().await?;
+ }
+ if (update_flags & (UpdateFlags::SysProxy as i32)) != 0 {
+ sysopt::Sysopt::global().update_sysproxy().await?;
+ }
+ if (update_flags & (UpdateFlags::Hotkey as i32)) != 0
+ && let Some(hotkeys) = &patch.hotkeys
+ {
+ hotkey::Hotkey::global().update(hotkeys.to_owned()).await?;
+ }
+ if (update_flags & (UpdateFlags::SystrayMenu as i32)) != 0 {
+ tray::Tray::global().update_menu().await?;
+ }
+ if (update_flags & (UpdateFlags::SystrayIcon as i32)) != 0 {
+ tray::Tray::global().update_icon().await?;
+ }
+ if (update_flags & (UpdateFlags::SystrayTooltip as i32)) != 0 {
+ tray::Tray::global().update_tooltip().await?;
+ }
+ if (update_flags & (UpdateFlags::SystrayClickBehavior as i32)) != 0 {
+ tray::Tray::global().update_click_behavior().await?;
+ }
+ if (update_flags & (UpdateFlags::LighteWeight as i32)) != 0 {
+ if patch.enable_auto_light_weight_mode.unwrap_or(false) {
+ lightweight::enable_auto_light_weight_mode().await;
+ } else {
+ lightweight::disable_auto_light_weight_mode();
}
}
+ Ok(())
+}
+
+pub async fn patch_verge(patch: &IVerge, not_save_file: bool) -> Result<()> {
+ Config::verge().await.draft_mut().patch_config(patch);
+
+ let update_flags = determine_update_flags(patch);
+ let process_flag_result: std::result::Result<(), anyhow::Error> = {
+ process_terminated_flags(update_flags, patch).await?;
+ Ok(())
+ };
+
+ if let Err(err) = process_flag_result {
+ Config::verge().await.discard();
+ return Err(err);
+ }
+ Config::verge().await.apply();
+ if !not_save_file {
+ // 分离数据获取和异步调用
+ let verge_data = Config::verge().await.data_ref().clone();
+ verge_data.save_file().await?;
+ }
+ Ok(())
}
diff --git a/src-tauri/src/feat/profile.rs b/src-tauri/src/feat/profile.rs
index 47e8d402..f3832e38 100644
--- a/src-tauri/src/feat/profile.rs
+++ b/src-tauri/src/feat/profile.rs
@@ -18,154 +18,188 @@ pub async fn toggle_proxy_profile(profile_index: String) {
}
}
Err(err) => {
- log::error!(target: "app", "{err}");
+ logging!(error, Type::Tray, "{err}");
}
}
}
-/// Update a profile
-/// If updating current profile, activate it
-/// auto_refresh: 是否自动更新配置和刷新前端
-pub async fn update_profile(
- uid: String,
- option: Option,
- auto_refresh: Option,
-) -> Result<()> {
- logging!(info, Type::Config, "[订阅更新] 开始更新订阅 {}", uid);
- let auto_refresh = auto_refresh.unwrap_or(true); // 默认为true，保持兼容性
+async fn should_update_profile(
+ uid: &String,
+ ignore_auto_update: bool,
+) -> Result)>> {
+ let profiles = Config::profiles().await;
+ let profiles = profiles.latest_ref();
+ let item = profiles.get_item(uid)?;
+ let is_remote = item.itype.as_ref().is_some_and(|s| s == "remote");
- let url_opt = {
- let profiles = Config::profiles().await;
- let profiles = profiles.latest_ref();
- let item = profiles.get_item(&uid)?;
- let is_remote = item.itype.as_ref().is_some_and(|s| s == "remote");
-
- if !is_remote {
- log::info!(target: "app", "[订阅更新] {uid} 不是远程订阅，跳过更新");
- None // 非远程订阅直接更新
- } else if item.url.is_none() {
- log::warn!(target: "app", "[订阅更新] {uid} 缺少URL，无法更新");
- bail!("failed to get the profile item url");
- } else if !item
+ if !is_remote {
+ logging!(
+ info,
+ Type::Config,
+ "[订阅更新] {uid} 不是远程订阅，跳过更新"
+ );
+ Ok(None)
+ } else if item.url.is_none() {
+ logging!(
+ warn,
+ Type::Config,
+ "Warning: [订阅更新] {uid} 缺少URL，无法更新"
+ );
+ bail!("failed to get the profile item url");
+ } else if !ignore_auto_update
+ && !item
.option
.as_ref()
.and_then(|o| o.allow_auto_update)
.unwrap_or(true)
- {
- log::info!(target: "app", "[订阅更新] {} 禁止自动更新，跳过更新", uid);
- None
- } else {
- log::info!(target: "app",
- "[订阅更新] {} 是远程订阅，URL: {}",
- uid,
- item.url.clone().ok_or_else(|| anyhow::anyhow!("Profile URL is None"))?
- );
- Some((
- item.url
- .clone()
- .ok_or_else(|| anyhow::anyhow!("Profile URL is None"))?,
- item.option.clone(),
- ))
- }
+ {
+ logging!(
+ info,
+ Type::Config,
+ "[订阅更新] {} 禁止自动更新，跳过更新",
+ uid
+ );
+ Ok(None)
+ } else {
+ logging!(
+ info,
+ Type::Config,
+ "[订阅更新] {} 是远程订阅，URL: {}",
+ uid,
+ item.url
+ .clone()
+ .ok_or_else(|| anyhow::anyhow!("Profile URL is None"))?
+ );
+ Ok(Some((
+ item.url
+ .clone()
+ .ok_or_else(|| anyhow::anyhow!("Profile URL is None"))?,
+ item.option.clone(),
+ )))
+ }
+}
+
+async fn perform_profile_update(
+ uid: &String,
+ url: &String,
+ opt: Option<&PrfOption>,
+ option: Option<&PrfOption>,
+) -> Result {
+ logging!(info, Type::Config, "[订阅更新] 开始下载新的订阅内容");
+ let mut merged_opt = PrfOption::merge(opt, option);
+ let is_current = {
+ let profiles = Config::profiles().await;
+ profiles.latest_ref().is_current_profile_index(uid)
};
+ let profile_name = {
+ let profiles = Config::profiles().await;
+ profiles
+ .latest_ref()
+ .get_name_by_uid(uid)
+ .unwrap_or_default()
+ };
+ let mut last_err;
- let should_update = match url_opt {
+ match PrfItem::from_url(url, None, None, merged_opt.as_ref()).await {
+ Ok(mut item) => {
+ logging!(info, Type::Config, "[订阅更新] 更新订阅配置成功");
+ profiles_draft_update_item_safe(uid, &mut item).await?;
+ return Ok(is_current);
+ }
+ Err(err) => {
+ logging!(
+ warn,
+ Type::Config,
+ "Warning: [订阅更新] 正常更新失败: {err}，尝试使用Clash代理更新"
+ );
+ last_err = err;
+ }
+ }
+
+ merged_opt.get_or_insert_with(PrfOption::default).self_proxy = Some(true);
+ merged_opt.get_or_insert_with(PrfOption::default).with_proxy = Some(false);
+
+ match PrfItem::from_url(url, None, None, merged_opt.as_ref()).await {
+ Ok(mut item) => {
+ logging!(
+ info,
+ Type::Config,
+ "[订阅更新] 使用 Clash代理 更新订阅配置成功"
+ );
+ profiles_draft_update_item_safe(uid, &mut item).await?;
+ handle::Handle::notice_message("update_with_clash_proxy", profile_name);
+ drop(last_err);
+ return Ok(is_current);
+ }
+ Err(err) => {
+ logging!(
+ warn,
+ Type::Config,
+ "Warning: [订阅更新] 正常更新失败: {err}，尝试使用Clash代理更新"
+ );
+ last_err = err;
+ }
+ }
+
+ merged_opt.get_or_insert_with(PrfOption::default).self_proxy = Some(false);
+ merged_opt.get_or_insert_with(PrfOption::default).with_proxy = Some(true);
+
+ match PrfItem::from_url(url, None, None, merged_opt.as_ref()).await {
+ Ok(mut item) => {
+ logging!(
+ info,
+ Type::Config,
+ "[订阅更新] 使用 系统代理 更新订阅配置成功"
+ );
+ profiles_draft_update_item_safe(uid, &mut item).await?;
+ handle::Handle::notice_message("update_with_clash_proxy", profile_name);
+ drop(last_err);
+ return Ok(is_current);
+ }
+ Err(err) => {
+ logging!(
+ warn,
+ Type::Config,
+ "Warning: [订阅更新] 正常更新失败: {err}，尝试使用系统代理更新"
+ );
+ last_err = err;
+ }
+ }
+
+ handle::Handle::notice_message(
+ "update_failed_even_with_clash",
+ format!("{profile_name} - {last_err}"),
+ );
+ Ok(is_current)
+}
+
+pub async fn update_profile(
+ uid: &String,
+ option: Option<&PrfOption>,
+ auto_refresh: bool,
+ ignore_auto_update: bool,
+) -> Result<()> {
+ logging!(info, Type::Config, "[订阅更新] 开始更新订阅 {}", uid);
+ let url_opt = should_update_profile(uid, ignore_auto_update).await?;
+
+ let should_refresh = match url_opt {
Some((url, opt)) => {
- log::info!(target: "app", "[订阅更新] 开始下载新的订阅内容");
- let merged_opt = PrfOption::merge(opt.clone(), option.clone());
-
- // 尝试使用正常设置更新
- match PrfItem::from_url(&url, None, None, merged_opt.clone()).await {
- Ok(item) => {
- log::info!(target: "app", "[订阅更新] 更新订阅配置成功");
- let profiles = Config::profiles().await;
-
- // 使用Send-safe helper函数
- let result = profiles_draft_update_item_safe(uid.clone(), item).await;
- result?;
-
- let is_current = Some(uid.clone()) == profiles.latest_ref().get_current();
- log::info!(target: "app", "[订阅更新] 是否为当前使用的订阅: {is_current}");
- is_current && auto_refresh
- }
- Err(err) => {
- // 首次更新失败，尝试使用Clash代理
- log::warn!(target: "app", "[订阅更新] 正常更新失败: {err}，尝试使用Clash代理更新");
-
- // 发送通知
- handle::Handle::notice_message("update_retry_with_clash", uid.clone());
-
- // 保存原始代理设置
- let original_with_proxy = merged_opt.as_ref().and_then(|o| o.with_proxy);
- let original_self_proxy = merged_opt.as_ref().and_then(|o| o.self_proxy);
-
- // 创建使用Clash代理的选项
- let mut fallback_opt = merged_opt.unwrap_or_default();
- fallback_opt.with_proxy = Some(false);
- fallback_opt.self_proxy = Some(true);
-
- // 使用Clash代理重试
- match PrfItem::from_url(&url, None, None, Some(fallback_opt)).await {
- Ok(mut item) => {
- log::info!(target: "app", "[订阅更新] 使用Clash代理更新成功");
-
- // 恢复原始代理设置到item
- if let Some(option) = item.option.as_mut() {
- option.with_proxy = original_with_proxy;
- option.self_proxy = original_self_proxy;
- }
-
- // 更新到配置
- let profiles = Config::profiles().await;
-
- // 使用 Send-safe 方法进行数据操作
- profiles_draft_update_item_safe(uid.clone(), item.clone()).await?;
-
- // 获取配置名称用于通知
- let profile_name = item.name.clone().unwrap_or_else(|| uid.clone());
-
- // 发送通知告知用户自动更新使用了回退机制
- handle::Handle::notice_message("update_with_clash_proxy", profile_name);
-
- let is_current = Some(uid.clone()) == profiles.data_ref().get_current();
- log::info!(target: "app", "[订阅更新] 是否为当前使用的订阅: {is_current}");
- is_current && auto_refresh
- }
- Err(retry_err) => {
- log::error!(target: "app", "[订阅更新] 使用Clash代理更新仍然失败: {retry_err}");
- handle::Handle::notice_message(
- "update_failed_even_with_clash",
- format!("{retry_err}"),
- );
- return Err(retry_err);
- }
- }
- }
- }
+ perform_profile_update(uid, &url, opt.as_ref(), option).await? && auto_refresh
}
None => auto_refresh,
};
- if should_update {
+ if should_refresh {
logging!(info, Type::Config, "[订阅更新] 更新内核配置");
match CoreManager::global().update_config().await {
Ok(_) => {
logging!(info, Type::Config, "[订阅更新] 更新成功");
handle::Handle::refresh_clash();
- // if let Err(err) = cmd::proxy::force_refresh_proxies().await {
- // logging!(
- // error,
- // Type::Config,
- // true,
- // "[订阅更新] 代理组刷新失败: {}",
- // err
- // );
- // }
}
Err(err) => {
logging!(error, Type::Config, "[订阅更新] 更新失败: {}", err);
handle::Handle::notice_message("update_failed", format!("{err}"));
- log::error!(target: "app", "{err}");
+ logging!(error, Type::Config, "{err}");
}
}
}
diff --git a/src-tauri/src/feat/proxy.rs b/src-tauri/src/feat/proxy.rs
index ef063026..731cec20 100644
--- a/src-tauri/src/feat/proxy.rs
+++ b/src-tauri/src/feat/proxy.rs
@@ -1,35 +1,32 @@
use crate::{
config::{Config, IVerge},
core::handle,
+ logging,
+ utils::logging::Type,
};
use std::env;
use tauri_plugin_clipboard_manager::ClipboardExt;
/// Toggle system proxy on/off
pub async fn toggle_system_proxy() {
- // 获取当前系统代理状态
- let enable = {
- let verge = Config::verge().await;
-
- verge.latest_ref().enable_system_proxy.unwrap_or(false)
- };
- // 获取自动关闭连接设置
- let auto_close_connection = {
- let verge = Config::verge().await;
-
- verge.latest_ref().auto_close_connection.unwrap_or(false)
- };
+ let verge = Config::verge().await;
+ let enable = verge.latest_ref().enable_system_proxy.unwrap_or(false);
+ let auto_close_connection = verge.latest_ref().auto_close_connection.unwrap_or(false);
// 如果当前系统代理即将关闭，且自动关闭连接设置为true，则关闭所有连接
if enable
&& auto_close_connection
&& let Err(err) = handle::Handle::mihomo().await.close_all_connections().await
{
- log::error!(target: "app", "Failed to close all connections: {err}");
+ logging!(
+ error,
+ Type::ProxyMode,
+ "Failed to close all connections: {err}"
+ );
}
let patch_result = super::patch_verge(
- IVerge {
+ &IVerge {
enable_system_proxy: Some(!enable),
..IVerge::default()
},
@@ -39,7 +36,7 @@ pub async fn toggle_system_proxy() {
match patch_result {
Ok(_) => handle::Handle::refresh_verge(),
- Err(err) => log::error!(target: "app", "{err}"),
+ Err(err) => logging!(error, Type::ProxyMode, "{err}"),
}
}
@@ -49,7 +46,7 @@ pub async fn toggle_tun_mode(not_save_file: Option) {
let enable = enable.unwrap_or(false);
match super::patch_verge(
- IVerge {
+ &IVerge {
enable_tun_mode: Some(!enable),
..IVerge::default()
},
@@ -58,7 +55,7 @@ pub async fn toggle_tun_mode(not_save_file: Option) {
.await
{
Ok(_) => handle::Handle::refresh_verge(),
- Err(err) => log::error!(target: "app", "{err}"),
+ Err(err) => logging!(error, Type::ProxyMode, "{err}"),
}
}
@@ -113,12 +110,16 @@ pub async fn copy_clash_env() {
}
"fish" => format!("set -x http_proxy {http_proxy}; set -x https_proxy {http_proxy}"),
_ => {
- log::error!(target: "app", "copy_clash_env: Invalid env type! {env_type}");
+ logging!(
+ error,
+ Type::ProxyMode,
+ "copy_clash_env: Invalid env type! {env_type}"
+ );
return;
}
};
if cliboard.write_text(export_text).is_err() {
- log::error!(target: "app", "Failed to write to clipboard");
+ logging!(error, Type::ProxyMode, "Failed to write to clipboard");
}
}
diff --git a/src-tauri/src/feat/window.rs b/src-tauri/src/feat/window.rs
index 57cfc810..a23a41f2 100644
--- a/src-tauri/src/feat/window.rs
+++ b/src-tauri/src/feat/window.rs
@@ -14,7 +14,7 @@ pub async fn open_or_close_dashboard() {
async fn open_or_close_dashboard_internal() {
let _ = lightweight::exit_lightweight_mode().await;
let result = WindowManager::toggle_main_window().await;
- log::info!(target: "app", "Window toggle result: {result:?}");
+ logging!(info, Type::Window, "Window toggle result: {result:?}");
}
pub async fn quit() {
@@ -47,7 +47,7 @@ pub async fn clean_async() -> bool {
let tun_task = async {
let tun_enabled = Config::verge()
.await
- .data_ref()
+ .latest_ref()
.enable_tun_mode
.unwrap_or(false);
@@ -71,16 +71,20 @@ pub async fn clean_async() -> bool {
.await
{
Ok(Ok(_)) => {
- log::info!(target: "app", "TUN模式已禁用");
+ logging!(info, Type::Window, "TUN模式已禁用");
true
}
Ok(Err(e)) => {
- log::warn!(target: "app", "禁用TUN模式失败: {e}");
+ logging!(warn, Type::Window, "Warning: 禁用TUN模式失败: {e}");
// 超时不阻塞退出
true
}
Err(_) => {
- log::warn!(target: "app", "禁用TUN模式超时（可能系统正在关机），继续退出流程");
+ logging!(
+ warn,
+ Type::Window,
+ "Warning: 禁用TUN模式超时（可能系统正在关机），继续退出流程"
+ );
true
}
}
@@ -101,7 +105,7 @@ pub async fn clean_async() -> bool {
.unwrap_or(false);
if !sys_proxy_enabled {
- log::info!(target: "app", "系统代理未启用，跳过重置");
+ logging!(info, Type::Window, "系统代理未启用，跳过重置");
return true;
}
@@ -110,19 +114,23 @@ pub async fn clean_async() -> bool {
if is_shutting_down {
// sysproxy-rs 操作注册表(避免.exe的dll错误)
- log::info!(target: "app", "检测到正在关机，syspro-rs操作注册表关闭系统代理");
+ logging!(
+ info,
+ Type::Window,
+ "检测到正在关机，syspro-rs操作注册表关闭系统代理"
+ );
match Sysproxy::get_system_proxy() {
Ok(mut sysproxy) => {
sysproxy.enable = false;
if let Err(e) = sysproxy.set_system_proxy() {
- log::warn!(target: "app", "关机时关闭系统代理失败: {e}");
+ logging!(warn, Type::Window, "Warning: 关机时关闭系统代理失败: {e}");
} else {
- log::info!(target: "app", "系统代理已关闭（通过注册表）");
+ logging!(info, Type::Window, "系统代理已关闭（通过注册表）");
}
}
Err(e) => {
- log::warn!(target: "app", "关机时获取代理设置失败: {e}");
+ logging!(warn, Type::Window, "Warning: 关机时获取代理设置失败: {e}");
}
}
@@ -136,7 +144,7 @@ pub async fn clean_async() -> bool {
}
// 正常退出：使用 sysproxy.exe 重置代理
- log::info!(target: "app", "sysproxy.exe重置系统代理");
+ logging!(info, Type::Window, "sysproxy.exe重置系统代理");
match timeout(
Duration::from_secs(2),
@@ -145,15 +153,19 @@ pub async fn clean_async() -> bool {
.await
{
Ok(Ok(_)) => {
- log::info!(target: "app", "系统代理已重置");
+ logging!(info, Type::Window, "系统代理已重置");
true
}
Ok(Err(e)) => {
- log::warn!(target: "app", "重置系统代理失败: {e}");
+ logging!(warn, Type::Window, "Warning: 重置系统代理失败: {e}");
true
}
Err(_) => {
- log::warn!(target: "app", "重置系统代理超时，继续退出流程");
+ logging!(
+ warn,
+ Type::Window,
+ "Warning: 重置系统代理超时，继续退出流程"
+ );
true
}
}
@@ -169,11 +181,11 @@ pub async fn clean_async() -> bool {
.unwrap_or(false);
if !sys_proxy_enabled {
- log::info!(target: "app", "系统代理未启用，跳过重置");
+ logging!(info, Type::Window, "系统代理未启用，跳过重置");
return true;
}
- log::info!(target: "app", "开始重置系统代理...");
+ logging!(info, Type::Window, "开始重置系统代理...");
match timeout(
Duration::from_millis(1500),
@@ -182,15 +194,15 @@ pub async fn clean_async() -> bool {
.await
{
Ok(Ok(_)) => {
- log::info!(target: "app", "系统代理已重置");
+ logging!(info, Type::Window, "系统代理已重置");
true
}
Ok(Err(e)) => {
- log::warn!(target: "app", "重置系统代理失败: {e}");
+ logging!(warn, Type::Window, "Warning: 重置系统代理失败: {e}");
true
}
Err(_) => {
- log::warn!(target: "app", "重置系统代理超时，继续退出");
+ logging!(warn, Type::Window, "Warning: 重置系统代理超时，继续退出");
true
}
}
@@ -206,11 +218,15 @@ pub async fn clean_async() -> bool {
match timeout(stop_timeout, CoreManager::global().stop_core()).await {
Ok(_) => {
- log::info!(target: "app", "core已停止");
+ logging!(info, Type::Window, "core已停止");
true
}
Err(_) => {
- log::warn!(target: "app", "停止core超时（可能系统正在关机），继续退出");
+ logging!(
+ warn,
+ Type::Window,
+ "Warning: 停止core超时（可能系统正在关机），继续退出"
+ );
true
}
}
@@ -226,11 +242,11 @@ pub async fn clean_async() -> bool {
.await
{
Ok(_) => {
- log::info!(target: "app", "DNS设置已恢复");
+ logging!(info, Type::Window, "DNS设置已恢复");
true
}
Err(_) => {
- log::warn!(target: "app", "恢复DNS设置超时");
+ logging!(warn, Type::Window, "Warning: 恢复DNS设置超时");
false
}
}
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 5942ac15..c6db41c0 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -10,6 +10,9 @@ mod feat;
mod module;
mod process;
pub mod utils;
+use crate::constants::files;
+#[cfg(target_os = "macos")]
+use crate::module::lightweight;
#[cfg(target_os = "linux")]
use crate::utils::linux;
#[cfg(target_os = "macos")]
@@ -19,6 +22,7 @@ use crate::{
process::AsyncHandler,
utils::{resolve, server},
};
+use anyhow::Result;
use config::Config;
use once_cell::sync::OnceCell;
use tauri::{AppHandle, Manager};
@@ -28,11 +32,8 @@ use tauri_plugin_deep_link::DeepLinkExt;
use utils::logging::Type;
pub static APP_HANDLE: OnceCell = OnceCell::new();
-
/// Application initialization helper functions
mod app_init {
- use anyhow::Result;
-
use super::*;
/// Initialize singleton monitoring for other instances
@@ -91,14 +92,14 @@ mod app_init {
}
app.deep_link().on_open_url(|event| {
- let url = event.urls().first().map(|u| u.to_string());
- if let Some(url) = url {
- AsyncHandler::spawn(|| async {
- if let Err(e) = resolve::resolve_scheme(url.into()).await {
- logging!(error, Type::Setup, "Failed to resolve scheme: {}", e);
- }
- });
- }
+ let urls = event.urls();
+ AsyncHandler::spawn(move || async move {
+ if let Some(url) = urls.first()
+ && let Err(e) = resolve::resolve_scheme(url.as_ref()).await
+ {
+ logging!(error, Type::Setup, "Failed to resolve scheme: {}", e);
+ }
+ });
});
Ok(())
@@ -115,7 +116,7 @@ mod app_init {
{
auto_start_plugin_builder = auto_start_plugin_builder
.macos_launcher(MacosLauncher::LaunchAgent)
- .app_name(app.config().identifier.clone());
+ .app_name(&app.config().identifier);
}
app.handle().plugin(auto_start_plugin_builder.build())?;
Ok(())
@@ -125,7 +126,7 @@ mod app_init {
pub fn setup_window_state(app: &tauri::App) -> Result<(), Box> {
logging!(info, Type::Setup, "初始化窗口状态管理...");
let window_state_plugin = tauri_plugin_window_state::Builder::new()
- .with_filename("window_state.json")
+ .with_filename(files::WINDOW_STATE)
.with_state_flags(tauri_plugin_window_state::StateFlags::default())
.build();
app.handle().plugin(window_state_plugin)?;
@@ -141,6 +142,8 @@ mod app_init {
cmd::open_logs_dir,
cmd::open_web_url,
cmd::open_core_dir,
+ cmd::open_app_log,
+ cmd::open_core_log,
cmd::get_portable_flag,
cmd::get_network_interfaces,
cmd::get_system_hostname,
@@ -285,6 +288,11 @@ pub fn run() {
pub async fn handle_reopen(has_visible_windows: bool) {
handle::Handle::global().init();
+ if lightweight::is_in_lightweight_mode() {
+ lightweight::exit_lightweight_mode().await;
+ return;
+ }
+
if !has_visible_windows {
handle::Handle::global().set_activation_policy_regular();
let _ = WindowManager::show_main_window().await;
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index f69742fc..4f3d6015 100755
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -10,6 +10,5 @@ fn main() {
std::env::set_var("CLASH_VERGE_DISABLE_TRAY", "1");
}
}
-
app_lib::run();
}
diff --git a/src-tauri/src/module/lightweight.rs b/src-tauri/src/module/lightweight.rs
index 08ea8575..d5c3900e 100644
--- a/src-tauri/src/module/lightweight.rs
+++ b/src-tauri/src/module/lightweight.rs
@@ -1,6 +1,6 @@
use crate::{
config::Config,
- core::{handle, timer::Timer, tray::Tray},
+ core::{handle, timer::Timer},
log_err, logging,
process::AsyncHandler,
utils::logging::Type,
@@ -43,49 +43,42 @@ impl LightweightState {
static LIGHTWEIGHT_STATE: AtomicU8 = AtomicU8::new(LightweightState::Normal as u8);
-static WINDOW_CLOSE_HANDLER: AtomicU32 = AtomicU32::new(0);
-static WEBVIEW_FOCUS_HANDLER: AtomicU32 = AtomicU32::new(0);
-
-fn set_state(new: LightweightState) {
- LIGHTWEIGHT_STATE.store(new.as_u8(), Ordering::Release);
- match new {
- LightweightState::Normal => {
- logging!(info, Type::Lightweight, "轻量模式已关闭");
- }
- LightweightState::In => {
- logging!(info, Type::Lightweight, "轻量模式已开启");
- }
- LightweightState::Exiting => {
- logging!(info, Type::Lightweight, "正在退出轻量模式");
- }
- }
-}
+static WINDOW_CLOSE_HANDLER_ID: AtomicU32 = AtomicU32::new(0);
+static WEBVIEW_FOCUS_HANDLER_ID: AtomicU32 = AtomicU32::new(0);
+#[inline]
fn get_state() -> LightweightState {
LIGHTWEIGHT_STATE.load(Ordering::Acquire).into()
}
-// 检查是否处于轻量模式
+#[inline]
+fn try_transition(from: LightweightState, to: LightweightState) -> bool {
+ LIGHTWEIGHT_STATE
+ .compare_exchange(
+ from.as_u8(),
+ to.as_u8(),
+ Ordering::AcqRel,
+ Ordering::Relaxed,
+ )
+ .is_ok()
+}
+
+#[inline]
+fn record_state_and_log(state: LightweightState) {
+ LIGHTWEIGHT_STATE.store(state.as_u8(), Ordering::Release);
+ match state {
+ LightweightState::Normal => logging!(info, Type::Lightweight, "轻量模式已关闭"),
+ LightweightState::In => logging!(info, Type::Lightweight, "轻量模式已开启"),
+ LightweightState::Exiting => logging!(info, Type::Lightweight, "正在退出轻量模式"),
+ }
+}
+
+#[inline]
pub fn is_in_lightweight_mode() -> bool {
get_state() == LightweightState::In
}
-// 设置轻量模式状态（仅 Normal <-> In）
-async fn set_lightweight_mode(value: bool) {
- let current = get_state();
- if value && current != LightweightState::In {
- set_state(LightweightState::In);
- } else if !value && current != LightweightState::Normal {
- set_state(LightweightState::Normal);
- }
-
- // 只有在状态可用时才触发托盘更新
- if let Err(e) = Tray::global().update_part().await {
- log::warn!("Failed to update tray: {e}");
- }
-}
-
-pub async fn run_once_auto_lightweight() {
+pub async fn auto_lightweight_boot() -> Result<()> {
let verge_config = Config::verge().await;
let enable_auto = verge_config
.data_mut()
@@ -96,39 +89,23 @@ pub async fn run_once_auto_lightweight() {
.enable_silent_start
.unwrap_or(false);
- if !(enable_auto && is_silent_start) {
- logging!(
- info,
- Type::Lightweight,
- "不满足静默启动且自动进入轻量模式的条件，跳过自动进入轻量模式"
- );
- return;
+ if is_silent_start {
+ logging!(info, Type::Lightweight, "静默启动：直接进入轻量模式");
+ let _ = entry_lightweight_mode().await;
+ return Ok(());
}
- set_lightweight_mode(true).await;
+ if !enable_auto {
+ logging!(info, Type::Lightweight, "未开启自动轻量模式，跳过初始化");
+ return Ok(());
+ }
+
+ logging!(
+ info,
+ Type::Lightweight,
+ "非静默启动：注册自动轻量模式监听器"
+ );
enable_auto_light_weight_mode().await;
-}
-
-pub async fn auto_lightweight_mode_init() -> Result<()> {
- let is_silent_start =
- { Config::verge().await.latest_ref().enable_silent_start }.unwrap_or(false);
- let enable_auto = {
- Config::verge()
- .await
- .latest_ref()
- .enable_auto_light_weight_mode
- }
- .unwrap_or(false);
-
- if enable_auto && !is_silent_start {
- logging!(
- info,
- Type::Lightweight,
- "非静默启动直接挂载自动进入轻量模式监听器！"
- );
- set_state(LightweightState::Normal);
- enable_auto_light_weight_mode().await;
- }
Ok(())
}
@@ -151,43 +128,18 @@ pub fn disable_auto_light_weight_mode() {
}
pub async fn entry_lightweight_mode() -> bool {
- // 尝试从 Normal -> In
- if LIGHTWEIGHT_STATE
- .compare_exchange(
- LightweightState::Normal as u8,
- LightweightState::In as u8,
- Ordering::Acquire,
- Ordering::Relaxed,
- )
- .is_err()
- {
+ if !try_transition(LightweightState::Normal, LightweightState::In) {
logging!(info, Type::Lightweight, "无需进入轻量模式，跳过调用");
return false;
}
-
+ record_state_and_log(LightweightState::In);
WindowManager::destroy_main_window();
-
- set_lightweight_mode(true).await;
let _ = cancel_light_weight_timer();
-
- // 回到 In
- set_state(LightweightState::In);
-
true
}
-// 添加从轻量模式恢复的函数
pub async fn exit_lightweight_mode() -> bool {
- // 尝试从 In -> Exiting
- if LIGHTWEIGHT_STATE
- .compare_exchange(
- LightweightState::In as u8,
- LightweightState::Exiting as u8,
- Ordering::Acquire,
- Ordering::Relaxed,
- )
- .is_err()
- {
+ if !try_transition(LightweightState::In, LightweightState::Exiting) {
logging!(
info,
Type::Lightweight,
@@ -195,16 +147,10 @@ pub async fn exit_lightweight_mode() -> bool {
);
return false;
}
-
+ record_state_and_log(LightweightState::Exiting);
WindowManager::show_main_window().await;
-
- set_lightweight_mode(false).await;
let _ = cancel_light_weight_timer();
-
- // 回到 Normal
- set_state(LightweightState::Normal);
-
- logging!(info, Type::Lightweight, "轻量模式退出完成");
+ record_state_and_log(LightweightState::Normal);
true
}
@@ -215,24 +161,31 @@ pub async fn add_light_weight_timer() {
fn setup_window_close_listener() {
if let Some(window) = handle::Handle::get_window() {
- let handler = window.listen("tauri://close-requested", move |_event| {
+ let old_id = WINDOW_CLOSE_HANDLER_ID.swap(0, Ordering::AcqRel);
+ if old_id != 0 {
+ window.unlisten(old_id);
+ }
+ let handler_id = window.listen("tauri://close-requested", move |_event| {
std::mem::drop(AsyncHandler::spawn(|| async {
if let Err(e) = setup_light_weight_timer().await {
- log::warn!("Failed to setup light weight timer: {e}");
+ logging!(
+ warn,
+ Type::Lightweight,
+ "Warning: Failed to setup light weight timer: {e}"
+ );
}
}));
logging!(info, Type::Lightweight, "监听到关闭请求，开始轻量模式计时");
});
-
- WINDOW_CLOSE_HANDLER.store(handler, Ordering::Release);
+ WINDOW_CLOSE_HANDLER_ID.store(handler_id, Ordering::Release);
}
}
fn cancel_window_close_listener() {
if let Some(window) = handle::Handle::get_window() {
- let handler = WINDOW_CLOSE_HANDLER.swap(0, Ordering::AcqRel);
- if handler != 0 {
- window.unlisten(handler);
+ let id = WINDOW_CLOSE_HANDLER_ID.swap(0, Ordering::AcqRel);
+ if id != 0 {
+ window.unlisten(id);
logging!(info, Type::Lightweight, "取消了窗口关闭监听");
}
}
@@ -240,7 +193,11 @@ fn cancel_window_close_listener() {
fn setup_webview_focus_listener() {
if let Some(window) = handle::Handle::get_window() {
- let handler = window.listen("tauri://focus", move |_event| {
+ let old_id = WEBVIEW_FOCUS_HANDLER_ID.swap(0, Ordering::AcqRel);
+ if old_id != 0 {
+ window.unlisten(old_id);
+ }
+ let handler_id = window.listen("tauri://focus", move |_event| {
log_err!(cancel_light_weight_timer());
logging!(
info,
@@ -248,37 +205,45 @@ fn setup_webview_focus_listener() {
"监听到窗口获得焦点，取消轻量模式计时"
);
});
-
- WEBVIEW_FOCUS_HANDLER.store(handler, Ordering::Release);
+ WEBVIEW_FOCUS_HANDLER_ID.store(handler_id, Ordering::Release);
}
}
fn cancel_webview_focus_listener() {
if let Some(window) = handle::Handle::get_window() {
- let handler = WEBVIEW_FOCUS_HANDLER.swap(0, Ordering::AcqRel);
- if handler != 0 {
- window.unlisten(handler);
+ let id = WEBVIEW_FOCUS_HANDLER_ID.swap(0, Ordering::AcqRel);
+ if id != 0 {
+ window.unlisten(id);
logging!(info, Type::Lightweight, "取消了窗口焦点监听");
}
}
}
async fn setup_light_weight_timer() -> Result<()> {
- Timer::global().init().await?;
+ if let Err(e) = Timer::global().init().await {
+ return Err(e).context("failed to initialize timer");
+ }
+
let once_by_minutes = Config::verge()
.await
.latest_ref()
.auto_light_weight_minutes
.unwrap_or(10);
- // 获取task_id
+ {
+ let timer_map = Timer::global().timer_map.read();
+ if timer_map.contains_key(LIGHT_WEIGHT_TASK_UID) {
+ logging!(warn, Type::Timer, "轻量模式计时器已存在，跳过创建");
+ return Ok(());
+ }
+ }
+
let task_id = {
Timer::global()
.timer_count
.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
};
- // 创建任务
let task = TaskBuilder::default()
.set_task_id(task_id)
.set_maximum_parallel_runnable_num(1)
@@ -289,7 +254,6 @@ async fn setup_light_weight_timer() -> Result<()> {
})
.context("failed to create timer task")?;
- // 添加任务到定时器
{
let delay_timer = Timer::global().delay_timer.write();
delay_timer
@@ -297,7 +261,6 @@ async fn setup_light_weight_timer() -> Result<()> {
.context("failed to add timer task")?;
}
- // 更新任务映射
{
let mut timer_map = Timer::global().timer_map.write();
let timer_task = crate::core::timer::TimerTask {
diff --git a/src-tauri/src/process/guard.rs b/src-tauri/src/process/guard.rs
index e4a48909..a776094f 100644
--- a/src-tauri/src/process/guard.rs
+++ b/src-tauri/src/process/guard.rs
@@ -1,13 +1,20 @@
use anyhow::Result;
use tauri_plugin_shell::process::CommandChild;
+use crate::{logging, utils::logging::Type};
+
#[derive(Debug)]
pub struct CommandChildGuard(Option);
impl Drop for CommandChildGuard {
fn drop(&mut self) {
if let Err(err) = self.kill() {
- log::error!(target: "app", "Failed to kill child process: {}", err);
+ logging!(
+ error,
+ Type::Service,
+ "Failed to kill child process: {}",
+ err
+ );
}
}
}
diff --git a/src-tauri/src/utils/autostart.rs b/src-tauri/src/utils/autostart.rs
index 06d360ed..b4dc4965 100644
--- a/src-tauri/src/utils/autostart.rs
+++ b/src-tauri/src/utils/autostart.rs
@@ -1,7 +1,7 @@
#[cfg(target_os = "windows")]
+use crate::{logging, utils::logging::Type};
+#[cfg(target_os = "windows")]
use anyhow::{Result, anyhow};
-#[cfg(target_os = "windows")]
-use log::info;
#[cfg(target_os = "windows")]
use std::{os::windows::process::CommandExt, path::Path, path::PathBuf};
@@ -49,15 +49,15 @@ pub async fn create_shortcut() -> Result<()> {
.remove_if_exists()
.await
.inspect(|_| {
- info!(target: "app", "成功移除旧启动快捷方式");
+ logging!(info, Type::Setup, "成功移除旧启动快捷方式");
})
.inspect_err(|err| {
- log::error!(target: "app", "移除旧启动快捷方式失败: {err}");
+ logging!(error, Type::Setup, "移除旧启动快捷方式失败: {err}");
});
// 如果新快捷方式已存在，直接返回成功
if new_shortcut_path.exists() {
- info!(target: "app", "启动快捷方式已存在");
+ logging!(info, Type::Setup, "启动快捷方式已存在");
return Ok(());
}
@@ -83,7 +83,7 @@ pub async fn create_shortcut() -> Result<()> {
return Err(anyhow!("创建快捷方式失败: {}", error_msg));
}
- info!(target: "app", "成功创建启动快捷方式");
+ logging!(info, Type::Setup, "成功创建启动快捷方式");
Ok(())
}
@@ -102,22 +102,22 @@ pub async fn remove_shortcut() -> Result<()> {
.remove_if_exists()
.await
.inspect(|_| {
- info!(target: "app", "成功删除旧启动快捷方式");
+ logging!(info, Type::Setup, "成功删除旧启动快捷方式");
removed_any = true;
})
.inspect_err(|err| {
- log::error!(target: "app", "删除旧启动快捷方式失败: {err}");
+ logging!(error, Type::Setup, "删除旧启动快捷方式失败: {err}");
});
let _ = new_shortcut_path
.remove_if_exists()
.await
.inspect(|_| {
- info!(target: "app", "成功删除启动快捷方式");
+ logging!(info, Type::Setup, "成功删除启动快捷方式");
removed_any = true;
})
.inspect_err(|err| {
- log::error!(target: "app", "删除启动快捷方式失败: {err}");
+ logging!(error, Type::Setup, "删除启动快捷方式失败: {err}");
});
Ok(())
diff --git a/src-tauri/src/utils/dirs.rs b/src-tauri/src/utils/dirs.rs
index 3730be82..18ea6fac 100644
--- a/src-tauri/src/utils/dirs.rs
+++ b/src-tauri/src/utils/dirs.rs
@@ -1,4 +1,8 @@
-use crate::{core::handle, logging, utils::logging::Type};
+use crate::{
+ core::{CoreManager, handle, manager::RunningMode},
+ logging,
+ utils::logging::Type,
+};
use anyhow::Result;
use async_trait::async_trait;
use once_cell::sync::OnceCell;
@@ -20,7 +24,6 @@ pub static PORTABLE_FLAG: OnceCell = OnceCell::new();
pub static CLASH_CONFIG: &str = "config.yaml";
pub static VERGE_CONFIG: &str = "verge.yaml";
pub static PROFILE_YAML: &str = "profiles.yaml";
-pub static DNS_CONFIG: &str = "dns_config.yaml";
/// init portable flag
pub fn init_portable_flag() -> Result<()> {
@@ -58,7 +61,11 @@ pub fn app_home_dir() -> Result {
match app_handle.path().data_dir() {
Ok(dir) => Ok(dir.join(APP_ID)),
Err(e) => {
- log::error!(target: "app", "Failed to get the app home directory: {e}");
+ logging!(
+ error,
+ Type::File,
+ "Failed to get the app home directory: {e}"
+ );
Err(anyhow::anyhow!("Failed to get the app homedirectory"))
}
}
@@ -72,7 +79,11 @@ pub fn app_resources_dir() -> Result {
match app_handle.path().resource_dir() {
Ok(dir) => Ok(dir.join("resources")),
Err(e) => {
- log::error!(target: "app", "Failed to get the resource directory: {e}");
+ logging!(
+ error,
+ Type::File,
+ "Failed to get the resource directory: {e}"
+ );
Err(anyhow::anyhow!("Failed to get the resource directory"))
}
}
@@ -122,6 +133,11 @@ pub fn app_logs_dir() -> Result {
Ok(app_home_dir()?.join("logs"))
}
+// latest verge log
+pub fn app_latest_log() -> Result {
+ Ok(app_logs_dir()?.join("latest.log"))
+}
+
/// local backups dir
pub fn local_backup_dir() -> Result {
let dir = app_home_dir()?.join(BACKUP_DIR);
@@ -167,6 +183,15 @@ pub fn service_log_dir() -> Result {
Ok(log_dir)
}
+pub fn clash_latest_log() -> Result {
+ match *CoreManager::global().get_running_mode() {
+ RunningMode::Service => Ok(service_log_dir()?.join("service_latest.log")),
+ RunningMode::Sidecar | RunningMode::NotRunning => {
+ Ok(sidecar_log_dir()?.join("sidecar_latest.log"))
+ }
+ }
+}
+
pub fn path_to_str(path: &PathBuf) -> Result<&str> {
let path_str = path
.as_os_str()
@@ -211,7 +236,11 @@ pub fn ensure_mihomo_safe_dir() -> Option {
if home_config.exists() || fs::create_dir_all(&home_config).is_ok() {
Some(home_config)
} else {
- log::error!(target: "app", "Failed to create safe directory: {home_config:?}");
+ logging!(
+ error,
+ Type::File,
+ "Failed to create safe directory: {home_config:?}"
+ );
None
}
})
diff --git a/src-tauri/src/utils/draft.rs b/src-tauri/src/utils/draft.rs
index 044f6f1f..c34bbfb6 100644
--- a/src-tauri/src/utils/draft.rs
+++ b/src-tauri/src/utils/draft.rs
@@ -24,22 +24,21 @@ impl From for Draft {
///
/// # Methods
/// - `data_mut`: Returns a mutable reference to the committed data.
-/// - `data_ref`: Returns an immutable reference to the committed data.
/// - `draft_mut`: Creates or retrieves a mutable reference to the draft data, cloning the committed data if no draft exists.
/// - `latest_ref`: Returns an immutable reference to the draft data if it exists, otherwise to the committed data.
/// - `apply`: Commits the draft data, replacing the committed data and returning the old committed value if a draft existed.
/// - `discard`: Discards the draft data and returns it if it existed.
impl Draft> {
+ /// 正式数据视图
+ pub fn data_ref(&self) -> MappedRwLockReadGuard<'_, Box> {
+ RwLockReadGuard::map(self.inner.read(), |inner| &inner.0)
+ }
+
/// 可写正式数据
pub fn data_mut(&self) -> MappedRwLockWriteGuard<'_, Box