hexianglong/rustdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: wayland delete restore token (#7988)

Browse Source 
* fix: wayland delete restore token

Signed-off-by: fufesou <shuanglongchen@yeah.net>

* Wayland close session when clearing restore token

Signed-off-by: fufesou <shuanglongchen@yeah.net>

* fix build

Signed-off-by: fufesou <shuanglongchen@yeah.net>

* Refact Wayland option

Signed-off-by: fufesou <shuanglongchen@yeah.net>

* Wayland clear screen selection, fake token

Signed-off-by: fufesou <shuanglongchen@yeah.net>

* fix build web

Signed-off-by: fufesou <shuanglongchen@yeah.net>

* fix: build

Signed-off-by: fufesou <shuanglongchen@yeah.net>

* chore

Signed-off-by: fufesou <shuanglongchen@yeah.net>

---------

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2024-05-09 11:03:59 +08:00
committed by GitHub
Unverified
parent a31a68ba17
commit bbe9017318
48 changed files with 392 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
libs/scrap/src/wayland/pipewire.rs
View File

@@ -30,11 +30,36 @@ lazy_static! {
pub static ref RDP_RESPONSE: Mutex<Option<RdpResponse>> = Mutex::new(None);
}
#[inline]
pub fn close_session() {
let _ = RDP_RESPONSE.lock().unwrap().take();
}
#[inline]
pub fn is_rdp_session_hold() -> bool {
RDP_RESPONSE.lock().unwrap().is_some()
}
pub fn try_close_session() {
let mut rdp_res = RDP_RESPONSE.lock().unwrap();
let mut close = false;
if let Some(rdp_res) = &*rdp_res {
// If is server running and restore token is supported, there's no need to keep the session.
if is_server_running() && rdp_res.is_support_restore_token {
close = true;
}
}
if close {
*rdp_res = None;
}
}
pub struct RdpResponse {
pub conn: Arc<SyncConnection>,
pub streams: Vec<PwStreamInfo>,
pub fd: OwnedFd,
pub session: dbus::Path<'static>,
pub is_support_restore_token: bool,
}
#[derive(Debug, Clone, Copy)]
pub struct PwStreamInfo {
@@ -476,6 +501,7 @@ pub fn request_remote_desktop() -> Result<
OwnedFd,
Vec<PwStreamInfo>,
dbus::Path<'static>,
bool,
),
Box<dyn Error>,
> {
@@ -504,6 +530,14 @@ pub fn request_remote_desktop() -> Result<
"handle_token".to_string(),
Variant(Box::new("u1".to_string())),
);
let mut is_support_restore_token = false;
if let Ok(version) = screencast_portal::version(&portal) {
if version >= 4 {
is_support_restore_token = true;
}
}
// The following code may be improved.
// https://flatpak.github.io/xdg-desktop-portal/#:~:text=To%20avoid%20a%20race%20condition
// To avoid a race condition
@@ -524,6 +558,7 @@ pub fn request_remote_desktop() -> Result<
streams.clone(),
session.clone(),
failure.clone(),
is_support_restore_token,
),
failure_res.clone(),
)?;
@@ -547,7 +582,13 @@ pub fn request_remote_desktop() -> Result<
if let Some(fd_res) = fd_res.clone() {
if let Some(session) = session_res.clone() {
if !streams_res.is_empty() {
return Ok((conn, fd_res, streams_res.clone(), session));
return Ok((
conn,
fd_res,
streams_res.clone(),
session,
is_support_restore_token,
));
}
}
}
@@ -561,6 +602,7 @@ fn on_create_session_response(
streams: Arc<Mutex<Vec<PwStreamInfo>>>,
session: Arc<Mutex<Option<dbus::Path<'static>>>>,
failure: Arc<AtomicBool>,
is_support_restore_token: bool,
) -> impl Fn(
OrgFreedesktopPortalRequestResponse,
&SyncConnection,
@@ -591,15 +633,13 @@ fn on_create_session_response(
let mut args: PropMap = HashMap::new();
// See `is_server_running()` to understand the following code.
if is_server_running() {
if let Ok(version) = screencast_portal::version(&portal) {
if version >= 4 {
let restore_token = config::LocalConfig::get_option(RESTORE_TOKEN_CONF_KEY);
if !restore_token.is_empty() {
args.insert(RESTORE_TOKEN.to_string(), Variant(Box::new(restore_token)));
}
// persist_mode may be configured by the user.
args.insert("persist_mode".to_string(), Variant(Box::new(2u32)));
if is_support_restore_token {
let restore_token = config::LocalConfig::get_option(RESTORE_TOKEN_CONF_KEY);
if !restore_token.is_empty() {
args.insert(RESTORE_TOKEN.to_string(), Variant(Box::new(restore_token)));
}
// persist_mode may be configured by the user.
args.insert("persist_mode".to_string(), Variant(Box::new(2u32)));
}
args.insert(
"handle_token".to_string(),
@@ -613,7 +653,13 @@ fn on_create_session_response(
handle_response(
c,
path,
on_select_sources_response(fd.clone(), streams.clone(), failure.clone(), ses),
on_select_sources_response(
fd.clone(),
streams.clone(),
failure.clone(),
ses,
is_support_restore_token,
),
failure.clone(),
)?;
} else {
@@ -627,7 +673,13 @@ fn on_create_session_response(
handle_response(
c,
path,
on_select_devices_response(fd.clone(), streams.clone(), failure.clone(), ses),
on_select_devices_response(
fd.clone(),
streams.clone(),
failure.clone(),
ses,
is_support_restore_token,
),
failure.clone(),
)?;
}
@@ -641,6 +693,7 @@ fn on_select_devices_response(
streams: Arc<Mutex<Vec<PwStreamInfo>>>,
failure: Arc<AtomicBool>,
session: dbus::Path<'static>,
is_support_restore_token: bool,
) -> impl Fn(
OrgFreedesktopPortalRequestResponse,
&SyncConnection,
@@ -662,7 +715,13 @@ fn on_select_devices_response(
handle_response(
c,
path,
on_select_sources_response(fd.clone(), streams.clone(), failure.clone(), session),
on_select_sources_response(
fd.clone(),
streams.clone(),
failure.clone(),
session,
is_support_restore_token,
),
failure.clone(),
)?;
@@ -675,6 +734,7 @@ fn on_select_sources_response(
streams: Arc<Mutex<Vec<PwStreamInfo>>>,
failure: Arc<AtomicBool>,
session: dbus::Path<'static>,
is_support_restore_token: bool,
) -> impl Fn(
OrgFreedesktopPortalRequestResponse,
&SyncConnection,
@@ -696,7 +756,12 @@ fn on_select_sources_response(
handle_response(
c,
path,
on_start_response(fd.clone(), streams.clone(), session.clone()),
on_start_response(
fd.clone(),
streams.clone(),
session.clone(),
is_support_restore_token,
),
failure.clone(),
)?;
@@ -708,6 +773,7 @@ fn on_start_response(
fd: Arc<Mutex<Option<OwnedFd>>>,
streams: Arc<Mutex<Vec<PwStreamInfo>>>,
session: dbus::Path<'static>,
is_support_restore_token: bool,
) -> impl Fn(
OrgFreedesktopPortalRequestResponse,
&SyncConnection,
@@ -717,15 +783,13 @@ fn on_start_response(
let portal = get_portal(c);
// See `is_server_running()` to understand the following code.
if is_server_running() {
if let Ok(version) = screencast_portal::version(&portal) {
if version >= 4 {
if let Some(restore_token) = r.results.get(RESTORE_TOKEN) {
if let Some(restore_token) = restore_token.as_str() {
config::LocalConfig::set_option(
RESTORE_TOKEN_CONF_KEY.to_owned(),
restore_token.to_owned(),
);
}
if is_support_restore_token {
if let Some(restore_token) = r.results.get(RESTORE_TOKEN) {
if let Some(restore_token) = restore_token.as_str() {
config::LocalConfig::set_option(
RESTORE_TOKEN_CONF_KEY.to_owned(),
restore_token.to_owned(),
);
}
}
}
@@ -752,7 +816,7 @@ pub fn get_capturables() -> Result<Vec<PipeWireCapturable>, Box<dyn Error>> {
};
if rdp_connection.is_none() {
let (conn, fd, streams, session) = request_remote_desktop()?;
let (conn, fd, streams, session, is_support_restore_token) = request_remote_desktop()?;
let conn = Arc::new(conn);
let rdp_res = RdpResponse {
@@ -760,6 +824,7 @@ pub fn get_capturables() -> Result<Vec<PipeWireCapturable>, Box<dyn Error>> {
streams,
fd,
session,
is_support_restore_token,
};
*rdp_connection = Some(rdp_res);
}