mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-06-08 02:12:49 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix GUI closing immediately when enabling service

Browse Source 
- Add retry logic with up to 10 attempts for IPC connection
- Detect service installation/startup state to prevent premature closure
- Implement exponential backoff for connection retries
- Check installing_service() flag for accurate service state detection

This fixes the issue where the GUI would close within ~500ms when
enabling the service due to 'Access is denied' IPC errors.

Fixes #7010
This commit is contained in:
GlassOnTin 2025-05-29 15:04:15 +01:00
parent 4f8f34ec01
commit 1d24fcb2d0
1 changed files with 62 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/ui_interface.rs
View File

@ -1157,9 +1157,14 @@ async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver<ipc:
#[cfg(target_os = "windows")]
let mut enable_file_transfer = "".to_owned();
let is_cm = crate::common::is_cm();
let mut connection_attempts = 0;
let max_attempts = 10; // Give service time to start
loop {
if let Ok(mut c) = ipc::connect(1000, "").await {
// Increase timeout and retry attempts when service might be starting
let timeout = if connection_attempts < 3 { 1000 } else { 2000 };
if let Ok(mut c) = ipc::connect(timeout, "").await {
connection_attempts = 0; // Reset on successful connection
let mut timer = crate::rustdesk_interval(time::interval(time::Duration::from_secs(1)));
loop {
tokio::select! {
@ -1167,9 +1172,31 @@ async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver<ipc:
match res {
Err(err) => {
log::error!("ipc connection closed: {}", err);
// Don't quit immediately if we're starting the service
// Give the service time to start and allow retries
if is_cm {
// Check if service is starting up
let mut service_starting = false;
#[cfg(windows)]
{
// On Windows, check if we're in elevated mode or if service is being installed
let is_elevated = crate::platform::is_elevated(None).unwrap_or(false);
service_starting = !is_elevated && (crate::platform::installing_service() ||
(crate::platform::is_installed() && !crate::platform::is_root()));
}
#[cfg(not(windows))]
{
// On other platforms, check if service is installed but not running as root
service_starting = crate::platform::is_installed() &&
!crate::platform::is_root();
}
if !service_starting {
crate::ui_cm_interface::quit_cm();
}
}
break;
}
#[cfg(not(any(target_os = "android", target_os = "ios")))]
@ -1247,6 +1274,36 @@ async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver<ipc:
.unwrap()
.insert("ipc-closed".to_owned(), "Y".to_owned());
break;
} else {
// Connection failed
connection_attempts += 1;
log::warn!("IPC connection attempt {} failed", connection_attempts);
// Only quit if we've exceeded max attempts and not during service startup
if is_cm && connection_attempts >= max_attempts {
let mut service_starting = false;
#[cfg(windows)]
{
// On Windows, check if service is being installed/started
let is_elevated = crate::platform::is_elevated(None).unwrap_or(false);
service_starting = !is_elevated && (crate::platform::installing_service() ||
(crate::platform::is_installed() && !crate::platform::is_root()));
}
#[cfg(not(windows))]
{
// On other platforms
service_starting = crate::platform::is_installed() &&
!crate::platform::is_root();
}
if !service_starting {
log::error!("Failed to connect after {} attempts, quitting", max_attempts);
crate::ui_cm_interface::quit_cm();
break;
}
}
}
*UI_STATUS.lock().unwrap() = UiStatus {
status_num: -1,
@ -1259,7 +1316,9 @@ async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver<ipc:
#[cfg(feature = "flutter")]
video_conn_count,
};
sleep(1.).await;
// Use exponential backoff for retries during service startup
let sleep_time = if connection_attempts < 5 { 1. } else { 2. };
sleep(sleep_time).await;
}
}