Add AsyncHandler for wrapping task spawning

src-tauri/src/feat/clash.rs

@@ -3,6 +3,7 @@ use crate::{
     core::{handle, tray, CoreManager},
     logging_error,
     module::mihomo::MihomoManager,
+    process::AsyncHandler,
     utils::{logging::Type, resolve},
 };
 use serde_yaml::{Mapping, Value};
@@ -10,7 +11,7 @@ use tauri::Manager;
 
 /// Restart the Clash core
 pub fn restart_clash_core() {
-    tauri::async_runtime::spawn(async {
+    AsyncHandler::spawn(move || async move {
         match CoreManager::global().restart_core().await {
             Ok(_) => {
                 handle::Handle::refresh_clash();
@@ -26,19 +27,17 @@ pub fn restart_clash_core() {
 
 /// Restart the application
 pub fn restart_app() {
-    tauri::async_runtime::spawn_blocking(|| {
-        tauri::async_runtime::block_on(async {
-            logging_error!(Type::Core, true, CoreManager::global().stop_core().await);
-            resolve::resolve_reset_async().await;
-            let app_handle = handle::Handle::global().app_handle().unwrap();
-            std::thread::sleep(std::time::Duration::from_secs(1));
-            tauri::process::restart(&app_handle.env());
-        });
+    AsyncHandler::spawn(move || async move {
+        logging_error!(Type::Core, true, CoreManager::global().stop_core().await);
+        resolve::resolve_reset_async().await;
+        let app_handle = handle::Handle::global().app_handle().unwrap();
+        std::thread::sleep(std::time::Duration::from_secs(1));
+        tauri::process::restart(&app_handle.env());
     });
 }
 
 fn after_change_clash_mode() {
-    tauri::async_runtime::spawn(async {
+    AsyncHandler::spawn(move || async {
         match MihomoManager::global().get_connections().await {
             Ok(connections) => {
                 if let Some(connections_array) = connections["connections"].as_array() {
@@ -64,7 +63,7 @@ pub fn change_clash_mode(mode: String) {
     let json_value = serde_json::json!({
         "mode": mode
     });
-    tauri::async_runtime::spawn(async move {
+    AsyncHandler::spawn(move || async move {
         log::debug!(target: "app", "change clash mode to {mode}");
         match MihomoManager::global().patch_configs(json_value).await {
             Ok(_) => {

src-tauri/src/feat/profile.rs

@@ -2,12 +2,13 @@ use crate::{
     cmd,
     config::{Config, PrfItem, PrfOption},
     core::{handle, CoreManager, *},
+    process::AsyncHandler,
 };
 use anyhow::{bail, Result};
 
 /// Toggle proxy profile
 pub fn toggle_proxy_profile(profile_index: String) {
-    tauri::async_runtime::spawn(async move {
+    AsyncHandler::spawn(|| async move {
         let app_handle = handle::Handle::global().app_handle().unwrap();
         match cmd::patch_profiles_config_by_profile_index(app_handle, profile_index).await {
             Ok(_) => {

src-tauri/src/feat/proxy.rs

@@ -1,6 +1,7 @@
 use crate::{
     config::{Config, IVerge},
     core::handle,
+    process::AsyncHandler,
 };
 use std::env;
 use tauri_plugin_clipboard_manager::ClipboardExt;
@@ -10,7 +11,7 @@ pub fn toggle_system_proxy() {
     let enable = Config::verge().draft().enable_system_proxy;
     let enable = enable.unwrap_or(false);
 
-    tauri::async_runtime::spawn(async move {
+    AsyncHandler::spawn(move || async move {
         match super::patch_verge(
             IVerge {
                 enable_system_proxy: Some(!enable),
@@ -28,7 +29,7 @@ pub fn toggle_system_proxy() {
 
 /// Toggle TUN mode on/off
 pub fn toggle_tun_mode(not_save_file: Option<bool>) {
-    // tauri::async_runtime::spawn(async move {
+    // AsyncHandler::spawn(async {
     //     logging!(
     //         info,
     //         Type::Service,
@@ -44,7 +45,7 @@ pub fn toggle_tun_mode(not_save_file: Option<bool>) {
     let enable = Config::verge().data().enable_tun_mode;
     let enable = enable.unwrap_or(false);
 
-    tauri::async_runtime::spawn(async move {
+    AsyncHandler::spawn(async move || {
         match super::patch_verge(
             IVerge {
                 enable_tun_mode: Some(!enable),