refactor(Draft): Replace latest() with latest_ref() and data() with data_mut() in multiple files for improved mutability handling and consistency across the codebase (#3987)

* feat: add benchmarking for draft operations and new draft management structure

* Refactor Config Access: Replace `latest()` with `latest_ref()` and `data()` with `data_mut()` in multiple files for improved mutability handling and consistency across the codebase.

* refactor: remove DraftNew implementation and related benchmarks for cleaner codebase

src-tauri/src/core/backup.rs

@@ -78,7 +78,7 @@ impl WebDavClient {
             if let Some(cfg) = lock.as_ref() {
                 cfg.clone()
             } else {
-                let verge = Config::verge().latest().clone();
+                let verge = Config::verge().latest_ref().clone();
                 if verge.webdav_url.is_none()
                     || verge.webdav_username.is_none()
                     || verge.webdav_password.is_none()

src-tauri/src/core/core.rs

@@ -138,14 +138,14 @@ impl CoreManager {
     /// 使用默认配置
     pub async fn use_default_config(&self, msg_type: &str, msg_content: &str) -> Result<()> {
         let runtime_path = dirs::app_home_dir()?.join(RUNTIME_CONFIG);
-        *Config::runtime().draft() = Box::new(IRuntime {
-            config: Some(Config::clash().latest().0.clone()),
+        *Config::runtime().draft_mut() = Box::new(IRuntime {
+            config: Some(Config::clash().latest_ref().0.clone()),
             exists_keys: vec![],
             chain_logs: Default::default(),
         });
         help::save_yaml(
             &runtime_path,
-            &Config::clash().latest().0,
+            &Config::clash().latest_ref().0,
             Some("# Clash Verge Runtime"),
         )?;
         handle::Handle::notice_message(msg_type, msg_content);
@@ -247,7 +247,7 @@ impl CoreManager {
             config_path
         );
 
-        let clash_core = Config::verge().latest().get_valid_clash_core();
+        let clash_core = Config::verge().latest_ref().get_valid_clash_core();
         logging!(info, Type::Config, true, "使用内核: {}", clash_core);
 
         let app_handle = handle::Handle::global().app_handle().unwrap();
@@ -739,7 +739,7 @@ impl CoreManager {
         let app_handle = handle::Handle::global()
             .app_handle()
             .ok_or(anyhow::anyhow!("failed to get app handle"))?;
-        let clash_core = Config::verge().latest().get_valid_clash_core();
+        let clash_core = Config::verge().latest_ref().get_valid_clash_core();
         let config_dir = dirs::app_home_dir()?;
 
         let service_log_dir = dirs::app_home_dir()?.join("logs").join("service");
@@ -1114,9 +1114,9 @@ impl CoreManager {
             return Err(error_message);
         }
 
-        Config::verge().draft().clash_core = clash_core.clone();
+        Config::verge().draft_mut().clash_core = clash_core.clone();
         Config::verge().apply();
-        logging_error!(Type::Core, true, Config::verge().latest().save_file());
+        logging_error!(Type::Core, true, Config::verge().latest_ref().save_file());
 
         let run_path = Config::generate_file(ConfigType::Run).map_err(|e| {
             let msg = e.to_string();

src-tauri/src/core/event_driven_proxy.rs

@@ -428,7 +428,7 @@ impl EventDrivenProxyManager {
     fn get_proxy_config() -> ProxyConfig {
         let (sys_enabled, pac_enabled, guard_enabled) = {
             let verge_config = Config::verge();
-            let verge = verge_config.latest();
+            let verge = verge_config.latest_ref();
             (
                 verge.enable_system_proxy.unwrap_or(false),
                 verge.proxy_auto_config.unwrap_or(false),
@@ -445,7 +445,7 @@ impl EventDrivenProxyManager {
     fn get_expected_pac_config() -> Autoproxy {
         let proxy_host = {
             let verge_config = Config::verge();
-            let verge = verge_config.latest();
+            let verge = verge_config.latest_ref();
             verge
                 .proxy_host
                 .clone()
@@ -459,19 +459,15 @@ impl EventDrivenProxyManager {
     }
 
     fn get_expected_sys_proxy() -> Sysproxy {
-        let (verge_mixed_port, proxy_host) = {
-            let verge_config = Config::verge();
-            let verge = verge_config.latest();
-            (
-                verge.verge_mixed_port,
-                verge
-                    .proxy_host
-                    .clone()
-                    .unwrap_or_else(|| "127.0.0.1".to_string()),
-            )
-        };
-
-        let port = verge_mixed_port.unwrap_or_else(|| Config::clash().data().get_mixed_port());
+        let verge_config = Config::verge();
+        let verge = verge_config.latest_ref();
+        let port = verge
+            .verge_mixed_port
+            .unwrap_or(Config::clash().latest_ref().get_mixed_port());
+        let proxy_host = verge
+            .proxy_host
+            .clone()
+            .unwrap_or_else(|| "127.0.0.1".to_string());
 
         Sysproxy {
             enable: true,
@@ -484,7 +480,7 @@ impl EventDrivenProxyManager {
     fn get_bypass_config() -> String {
         let (use_default, custom_bypass) = {
             let verge_config = Config::verge();
-            let verge = verge_config.latest();
+            let verge = verge_config.latest_ref();
             (
                 verge.use_default_bypass.unwrap_or(true),
                 verge.system_proxy_bypass.clone().unwrap_or_default(),

src-tauri/src/core/hotkey.rs

@@ -25,7 +25,7 @@ impl Hotkey {
 
     pub fn init(&self) -> Result<()> {
         let verge = Config::verge();
-        let enable_global_hotkey = verge.latest().enable_global_hotkey.unwrap_or(true);
+        let enable_global_hotkey = verge.latest_ref().enable_global_hotkey.unwrap_or(true);
 
         logging!(
             debug,
@@ -39,7 +39,7 @@ impl Hotkey {
             return Ok(());
         }
 
-        if let Some(hotkeys) = verge.latest().hotkeys.as_ref() {
+        if let Some(hotkeys) = verge.latest_ref().hotkeys.as_ref() {
             logging!(
                 debug,
                 Type::Hotkey,
@@ -252,7 +252,7 @@ impl Hotkey {
                     logging!(debug, Type::Hotkey, "Executing function directly");
 
                     let is_enable_global_hotkey = Config::verge()
-                        .latest()
+                        .latest_ref()
                         .enable_global_hotkey
                         .unwrap_or(true);
 

src-tauri/src/core/service.rs

@@ -32,7 +32,7 @@ pub struct ServiceState {
 impl ServiceState {
     // 获取当前的服务状态
     pub fn get() -> Self {
-        if let Some(state) = Config::verge().latest().service_state.clone() {
+        if let Some(state) = Config::verge().latest_ref().service_state.clone() {
             return state;
         }
         Self::default()
@@ -41,11 +41,11 @@ impl ServiceState {
     // 保存服务状态
     pub fn save(&self) -> Result<()> {
         let config = Config::verge();
-        let mut latest = config.latest().clone();
+        let mut latest = config.latest_ref().clone();
         latest.service_state = Some(self.clone());
-        *config.draft() = latest;
+        *config.draft_mut() = latest;
         config.apply();
-        let result = config.latest().save_file();
+        let result = config.latest_ref().save_file();
         result
     }
 
@@ -741,7 +741,7 @@ pub(super) async fn start_with_existing_service(config_file: &PathBuf) -> Result
     log::info!(target:"app", "尝试使用现有服务启动核心 (IPC)");
     // logging!(info, Type::Service, true, "尝试使用现有服务启动核心");
 
-    let clash_core = Config::verge().latest().get_valid_clash_core();
+    let clash_core = Config::verge().latest_ref().get_valid_clash_core();
 
     let bin_ext = if cfg!(windows) { ".exe" } else { "" };
     let clash_bin = format!("{clash_core}{bin_ext}");

src-tauri/src/core/sysopt.rs

@@ -29,10 +29,13 @@ static DEFAULT_BYPASS: &str =
     "127.0.0.1,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,172.29.0.0/16,localhost,*.local,*.crashlytics.com,<local>";
 
 fn get_bypass() -> String {
-    let use_default = Config::verge().latest().use_default_bypass.unwrap_or(true);
+    let use_default = Config::verge()
+        .latest_ref()
+        .use_default_bypass
+        .unwrap_or(true);
     let res = {
         let verge = Config::verge();
-        let verge = verge.latest();
+        let verge = verge.latest_ref();
         verge.system_proxy_bypass.clone()
     };
     let custom_bypass = match res {
@@ -72,14 +75,14 @@ impl Sysopt {
         let _lock = self.update_sysproxy.lock().await;
 
         let port = Config::verge()
-            .latest()
+            .latest_ref()
             .verge_mixed_port
-            .unwrap_or(Config::clash().data().get_mixed_port());
+            .unwrap_or(Config::clash().latest_ref().get_mixed_port());
         let pac_port = IVerge::get_singleton_port();
 
         let (sys_enable, pac_enable, proxy_host) = {
             let verge = Config::verge();
-            let verge = verge.latest();
+            let verge = verge.latest_ref();
             (
                 verge.enable_system_proxy.unwrap_or(false),
                 verge.proxy_auto_config.unwrap_or(false),
@@ -239,7 +242,7 @@ impl Sysopt {
 
     /// update the startup
     pub fn update_launch(&self) -> Result<()> {
-        let enable_auto_launch = { Config::verge().latest().enable_auto_launch };
+        let enable_auto_launch = { Config::verge().latest_ref().enable_auto_launch };
         let is_enable = enable_auto_launch.unwrap_or(false);
         logging!(info, true, "Setting auto-launch state to: {:?}", is_enable);
 

src-tauri/src/core/timer.rs

@@ -91,7 +91,7 @@ impl Timer {
         let cur_timestamp = chrono::Local::now().timestamp();
 
         // Collect profiles that need immediate update
-        let profiles_to_update = if let Some(items) = Config::profiles().latest().get_items() {
+        let profiles_to_update = if let Some(items) = Config::profiles().latest_ref().get_items() {
             items
                 .iter()
                 .filter_map(|item| {
@@ -229,7 +229,7 @@ impl Timer {
     fn gen_map(&self) -> HashMap<String, u64> {
         let mut new_map = HashMap::new();
 
-        if let Some(items) = Config::profiles().latest().get_items() {
+        if let Some(items) = Config::profiles().latest_ref().get_items() {
             for item in items.iter() {
                 if let Some(option) = item.option.as_ref() {
                     if let (Some(interval), Some(uid)) = (option.update_interval, &item.uid) {
@@ -376,7 +376,7 @@ impl Timer {
 
         // Get the profile updated timestamp
         let profiles_config = Config::profiles();
-        let profiles = profiles_config.latest();
+        let profiles = profiles_config.latest_ref();
         let items = match profiles.get_items() {
             Some(i) => i,
             None => {
@@ -438,7 +438,7 @@ impl Timer {
         match tokio::time::timeout(std::time::Duration::from_secs(40), async {
             Self::emit_update_event(&uid, true);
 
-            let is_current = Config::profiles().latest().current.as_ref() == Some(&uid);
+            let is_current = Config::profiles().latest_ref().current.as_ref() == Some(&uid);
             logging!(
                 info,
                 Type::Timer,

src-tauri/src/core/tray/mod.rs

@@ -66,7 +66,7 @@ pub struct Tray {
 
 impl TrayState {
     pub fn get_common_tray_icon() -> (bool, Vec<u8>) {
-        let verge = Config::verge().latest().clone();
+        let verge = Config::verge().latest_ref().clone();
         let is_common_tray_icon = verge.common_tray_icon.unwrap_or(false);
         if is_common_tray_icon {
             if let Some(common_icon_path) = find_target_icons("common").unwrap() {
@@ -100,7 +100,7 @@ impl TrayState {
     }
 
     pub fn get_sysproxy_tray_icon() -> (bool, Vec<u8>) {
-        let verge = Config::verge().latest().clone();
+        let verge = Config::verge().latest_ref().clone();
         let is_sysproxy_tray_icon = verge.sysproxy_tray_icon.unwrap_or(false);
         if is_sysproxy_tray_icon {
             if let Some(sysproxy_icon_path) = find_target_icons("sysproxy").unwrap() {
@@ -134,7 +134,7 @@ impl TrayState {
     }
 
     pub fn get_tun_tray_icon() -> (bool, Vec<u8>) {
-        let verge = Config::verge().latest().clone();
+        let verge = Config::verge().latest_ref().clone();
         let is_tun_tray_icon = verge.tun_tray_icon.unwrap_or(false);
         if is_tun_tray_icon {
             if let Some(tun_icon_path) = find_target_icons("tun").unwrap() {
@@ -191,7 +191,7 @@ impl Tray {
     /// 更新托盘点击行为
     pub fn update_click_behavior(&self) -> Result<()> {
         let app_handle = handle::Handle::global().app_handle().unwrap();
-        let tray_event = { Config::verge().latest().tray_event.clone() };
+        let tray_event = { Config::verge().latest_ref().tray_event.clone() };
         let tray_event: String = tray_event.unwrap_or("main_window".into());
         let tray = app_handle.tray_by_id("main").unwrap();
         match tray_event.as_str() {
@@ -251,12 +251,12 @@ impl Tray {
     }
 
     fn update_menu_internal(&self, app_handle: &AppHandle) -> Result<()> {
-        let verge = Config::verge().latest().clone();
+        let verge = Config::verge().latest_ref().clone();
         let system_proxy = verge.enable_system_proxy.as_ref().unwrap_or(&false);
         let tun_mode = verge.enable_tun_mode.as_ref().unwrap_or(&false);
         let mode = {
             Config::clash()
-                .latest()
+                .latest_ref()
                 .0
                 .get("mode")
                 .map(|val| val.as_str().unwrap_or("rule"))
@@ -264,7 +264,7 @@ impl Tray {
                 .to_owned()
         };
         let profile_uid_and_name = Config::profiles()
-            .data()
+            .data_mut()
             .all_profile_uid_and_name()
             .unwrap_or_default();
         let is_lightweight_mode = is_in_lightweight_mode();
@@ -308,7 +308,7 @@ impl Tray {
             }
         };
 
-        let verge = Config::verge().latest().clone();
+        let verge = Config::verge().latest_ref().clone();
         let system_mode = verge.enable_system_proxy.as_ref().unwrap_or(&false);
         let tun_mode = verge.enable_tun_mode.as_ref().unwrap_or(&false);
 
@@ -345,7 +345,7 @@ impl Tray {
             }
         };
 
-        let verge = Config::verge().latest().clone();
+        let verge = Config::verge().latest_ref().clone();
         let system_mode = verge.enable_system_proxy.as_ref().unwrap_or(&false);
         let tun_mode = verge.enable_tun_mode.as_ref().unwrap_or(&false);
 
@@ -389,7 +389,7 @@ impl Tray {
             }
         };
 
-        let verge = Config::verge().latest().clone();
+        let verge = Config::verge().latest_ref().clone();
         let system_proxy = verge.enable_system_proxy.as_ref().unwrap_or(&false);
         let tun_mode = verge.enable_tun_mode.as_ref().unwrap_or(&false);
 
@@ -402,7 +402,7 @@ impl Tray {
 
         let mut current_profile_name = "None".to_string();
         let profiles = Config::profiles();
-        let profiles = profiles.latest();
+        let profiles = profiles.latest_ref();
         if let Some(current_profile_uid) = profiles.get_current() {
             if let Ok(profile) = profiles.get_item(&current_profile_uid) {
                 current_profile_name = match &profile.name {
@@ -461,7 +461,7 @@ impl Tray {
 
         #[cfg(any(target_os = "macos", target_os = "windows"))]
         {
-            let tray_event = { Config::verge().latest().tray_event.clone() };
+            let tray_event = { Config::verge().latest_ref().tray_event.clone() };
             let tray_event: String = tray_event.unwrap_or("main_window".into());
             if tray_event.as_str() != "tray_menu" {
                 builder = builder.show_menu_on_left_click(false);
@@ -471,7 +471,7 @@ impl Tray {
         let tray = builder.build(app_handle)?;
 
         tray.on_tray_icon_event(|_, event| {
-            let tray_event = { Config::verge().latest().tray_event.clone() };
+            let tray_event = { Config::verge().latest_ref().tray_event.clone() };
             let tray_event: String = tray_event.unwrap_or("main_window".into());
             log::debug!(target: "app","tray event: {tray_event:?}");
 
@@ -534,7 +534,7 @@ fn create_tray_menu(
     let version = VERSION.get().unwrap_or(&unknown_version);
 
     let hotkeys = Config::verge()
-        .latest()
+        .latest_ref()
         .hotkeys
         .as_ref()
         .map(|h| {
@@ -554,7 +554,7 @@ fn create_tray_menu(
         .iter()
         .map(|(profile_uid, profile_name)| {
             let is_current_profile = Config::profiles()
-                .data()
+                .data_mut()
                 .is_current_profile_index(profile_uid.to_string());
             CheckMenuItem::with_id(
                 app_handle,