TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-29 16:11:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

refact: restore terminals (#12334)

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou
2025-07-18 11:51:53 +08:00
committed by GitHub
parent 398b0d8d8b
commit bdd3bb946e
6 changed files with 78 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/server/terminal_service.rs
View File

@@ -131,6 +131,8 @@ fn get_or_create_service(
// Ensure cleanup task is running
ensure_cleanup_task();
service.lock().unwrap().needs_session_sync = true;
Ok(service)
}
@@ -540,6 +542,7 @@ pub struct PersistentTerminalService {
pub created_at: Instant,
last_activity: Instant,
pub is_persistent: bool,
needs_session_sync: bool,
}
impl PersistentTerminalService {
@@ -550,6 +553,7 @@ impl PersistentTerminalService {
created_at: Instant::now(),
last_activity: Instant::now(),
is_persistent,
needs_session_sync: false,
}
}
@@ -696,6 +700,19 @@ impl TerminalServiceProxy {
if self.is_persistent {
opened.service_id = self.service_id.clone();
}
if service.needs_session_sync {
if service.sessions.len() > 1 {
// No need to include the current terminal in the list.
// Because the `persistent_sessions` is used to restore the other sessions.
opened.persistent_sessions = service
.sessions
.keys()
.filter(|&id| *id != open.terminal_id)
.cloned()
.collect();
}
service.needs_session_sync = false;
}
response.set_opened(opened);
// Send buffered output
@@ -856,6 +873,12 @@ impl TerminalServiceProxy {
if self.is_persistent {
opened.service_id = service.service_id.clone();
}
if service.needs_session_sync {
if !service.sessions.is_empty() {
opened.persistent_sessions = service.sessions.keys().cloned().collect();
}
service.needs_session_sync = false;
}
response.set_opened(opened);
log::info!(