From 1065f224a92d057b4cd7f7a1a07ba5caa1b9eb49 Mon Sep 17 00:00:00 2001 From: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Sun, 17 Aug 2025 16:07:49 +0800 Subject: [PATCH] refactor: convert async functions to synchronous for UWP tool invocation --- src-tauri/src/cmd/uwp.rs | 6 +++--- src-tauri/src/core/event_driven_proxy.rs | 2 ++ src-tauri/src/core/win_uwp.rs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src-tauri/src/cmd/uwp.rs b/src-tauri/src/cmd/uwp.rs index 8bf9cec7..dc2eb120 100644 --- a/src-tauri/src/cmd/uwp.rs +++ b/src-tauri/src/cmd/uwp.rs @@ -6,8 +6,8 @@ mod platform { use super::CmdResult; use crate::{core::win_uwp, wrap_err}; - pub async fn invoke_uwp_tool() -> CmdResult { - wrap_err!(win_uwp::invoke_uwptools().await) + pub fn invoke_uwp_tool() -> CmdResult { + wrap_err!(win_uwp::invoke_uwptools()) } } @@ -24,5 +24,5 @@ mod platform { /// Command exposed to Tauri #[tauri::command] pub async fn invoke_uwp_tool() -> CmdResult { - platform::invoke_uwp_tool().await + platform::invoke_uwp_tool() } diff --git a/src-tauri/src/core/event_driven_proxy.rs b/src-tauri/src/core/event_driven_proxy.rs index 8f448565..9357a271 100644 --- a/src-tauri/src/core/event_driven_proxy.rs +++ b/src-tauri/src/core/event_driven_proxy.rs @@ -520,6 +520,7 @@ impl EventDrivenProxyManager { { logging_error!( Type::System, + "{}", Self::execute_sysproxy_command(&["pac", expected_url]) ); } @@ -536,6 +537,7 @@ impl EventDrivenProxyManager { let address = format!("{}:{}", expected.host, expected.port); logging_error!( Type::System, + "{}", Self::execute_sysproxy_command(&["global", &address, &expected.bypass]) ); } diff --git a/src-tauri/src/core/win_uwp.rs b/src-tauri/src/core/win_uwp.rs index 4a19b93f..f76a6b30 100644 --- a/src-tauri/src/core/win_uwp.rs +++ b/src-tauri/src/core/win_uwp.rs @@ -6,7 +6,7 @@ use deelevate::{PrivilegeLevel, Token}; use runas::Command as RunasCommand; use std::process::Command as StdCommand; -pub async fn invoke_uwptools() -> Result<()> { +pub fn invoke_uwptools() -> Result<()> { let resource_dir = dirs::app_resources_dir()?; let tool_path = resource_dir.join("enableLoopback.exe");