feat: integrate tauri-plugin-clipboard-manager and add system info commands (#5593)

src-tauri/src/cmd/system.rs

@@ -1,59 +1,9 @@
 use std::sync::Arc;
 
-use super::CmdResult;
-use crate::core::{CoreManager, handle, manager::RunningMode};
-use clash_verge_logging::{Type, logging};
-use parking_lot::RwLock;
-use tauri::Manager as _;
-use tauri_plugin_clash_verge_sysinfo::Platform;
-use tauri_plugin_clipboard_manager::ClipboardExt as _;
-
-#[tauri::command]
-pub async fn export_diagnostic_info() -> CmdResult<()> {
-    let app_handle = handle::Handle::app_handle();
-    let info = app_handle.state::<RwLock<Platform>>().read().to_string();
-
-    let app_handle = handle::Handle::app_handle();
-    let cliboard = app_handle.clipboard();
-    if cliboard.write_text(info).is_err() {
-        logging!(error, Type::System, "Failed to write to clipboard");
-    }
-    Ok(())
-}
-
-// TODO 迁移，让新的结构体允许通过 tauri command 正确使用 structure.field 方式获取信息
-#[tauri::command]
-pub async fn get_system_info() -> CmdResult<String> {
-    let app_handle = handle::Handle::app_handle();
-    let info = app_handle.state::<RwLock<Platform>>().read().to_string();
-    Ok(info)
-}
+use crate::core::{CoreManager, manager::RunningMode};
 
 /// 获取当前内核运行模式
 #[tauri::command]
 pub async fn get_running_mode() -> Result<Arc<RunningMode>, String> {
     Ok(CoreManager::global().get_running_mode())
 }
-
-/// 获取应用的运行时间（毫秒）
-#[tauri::command]
-pub fn get_app_uptime() -> u128 {
-    let app_handle = handle::Handle::app_handle();
-    let startup_time = app_handle
-        .state::<RwLock<Platform>>()
-        .read()
-        .appinfo
-        .app_startup_time;
-    startup_time.elapsed().as_millis()
-}
-
-/// 检查应用是否以管理员身份运行
-#[tauri::command]
-pub fn is_admin() -> bool {
-    let app_handle = handle::Handle::app_handle();
-    app_handle
-        .state::<RwLock<Platform>>()
-        .read()
-        .appinfo
-        .app_is_admin
-}

src-tauri/src/config/config.rs

@@ -1,9 +1,13 @@
 use super::{IClashTemp, IProfiles, IVerge};
 use crate::{
-    cmd,
     config::{PrfItem, profiles_append_item_safe},
     constants::{files, timing},
-    core::{CoreManager, handle, service, tray, validate::CoreConfigValidator},
+    core::{
+        CoreManager,
+        handle::{self, Handle},
+        service, tray,
+        validate::CoreConfigValidator,
+    },
     enhance,
     utils::{dirs, help},
 };
@@ -14,6 +18,7 @@ use clash_verge_logging::{Type, logging, logging_error};
 use clash_verge_types::runtime::IRuntime;
 use smartstring::alias::String;
 use std::path::PathBuf;
+use tauri_plugin_clash_verge_sysinfo::is_current_app_handle_admin;
 use tokio::sync::OnceCell;
 use tokio::time::sleep;
 
@@ -60,7 +65,10 @@ impl Config {
         Self::ensure_default_profile_items().await?;
 
         // init Tun mode
-        if !cmd::system::is_admin() && service::is_service_available().await.is_err() {
+        let handle = Handle::app_handle();
+        let is_admin = is_current_app_handle_admin(handle);
+        let is_service_available = service::is_service_available().await.is_ok();
+        if !is_admin && !is_service_available {
             let verge = Self::verge().await;
             verge.edit_draft(|d| {
                 d.enable_tun_mode = Some(false);

src-tauri/src/core/service.rs

@@ -255,15 +255,9 @@ async fn reinstall_service() -> Result<()> {
 #[cfg(target_os = "linux")]
 fn linux_running_as_root() -> bool {
     use crate::core::handle;
-    use parking_lot::RwLock;
-    use tauri::Manager as _;
-    use tauri_plugin_clash_verge_sysinfo::Platform;
+    use tauri_plugin_clash_verge_sysinfo::is_current_app_handle_admin;
     let app_handle = handle::Handle::app_handle();
-    app_handle
-        .state::<RwLock<Platform>>()
-        .read()
-        .appinfo
-        .app_is_admin
+    is_current_app_handle_admin(app_handle)
 }
 
 #[cfg(target_os = "macos")]

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

@@ -1,5 +1,6 @@
 use once_cell::sync::OnceCell;
 use tauri::tray::TrayIconBuilder;
+use tauri_plugin_clash_verge_sysinfo::is_current_app_handle_admin;
 use tauri_plugin_mihomo::models::Proxies;
 use tokio::fs;
 #[cfg(target_os = "macos")]
@@ -303,8 +304,8 @@ impl Tray {
         let verge = Config::verge().await.latest_arc();
         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 tun_mode_available =
-            cmd::system::is_admin() || service::is_service_available().await.is_ok();
+        let tun_mode_available = is_current_app_handle_admin(app_handle)
+            || service::is_service_available().await.is_ok();
         let mode = {
             Config::clash()
                 .await

src-tauri/src/lib.rs

@@ -137,6 +137,10 @@ mod app_init {
     pub fn generate_handlers()
     -> impl Fn(tauri::ipc::Invoke<tauri::Wry>) -> bool + Send + Sync + 'static {
         tauri::generate_handler![
+            tauri_plugin_clash_verge_sysinfo::commands::get_system_info,
+            tauri_plugin_clash_verge_sysinfo::commands::get_app_uptime,
+            tauri_plugin_clash_verge_sysinfo::commands::app_is_admin,
+            tauri_plugin_clash_verge_sysinfo::commands::export_diagnostic_info,
             cmd::get_sys_proxy,
             cmd::get_auto_proxy,
             cmd::open_app_dir,
@@ -155,9 +159,7 @@ mod app_init {
             cmd::notify_ui_ready,
             cmd::update_ui_stage,
             cmd::get_running_mode,
-            cmd::get_app_uptime,
             cmd::get_auto_launch_status,
-            cmd::is_admin,
             cmd::entry_lightweight_mode,
             cmd::exit_lightweight_mode,
             cmd::install_service,
@@ -218,8 +220,6 @@ mod app_init {
             cmd::list_webdav_backup,
             cmd::delete_webdav_backup,
             cmd::restore_webdav_backup,
-            cmd::export_diagnostic_info,
-            cmd::get_system_info,
             cmd::get_unlock_items,
             cmd::check_media_unlock,
         ]