@desklink/host 0.3.1 → 0.4.0

package/engine/src/main.rs

@@ -310,7 +310,7 @@ fn print_input_setup() {
             println!(
                 "To undo it: remove the rule, remove the user from the group, reload the rules."
             );
-            println!("Without it the engine still captures the desktop and reports view-only.");
+            println!("Without it the engine still captures the desktop; input actions are refused with input-unavailable.");
         }
     }
 }
@@ -645,7 +645,6 @@ async fn dispatch(
             let open = session::OpenRequest {
                 source: params.source,
                 cursor: params.cursor,
-                permissions: params.permissions,
                 max_width: params.max_width,
                 max_height: params.max_height,
                 bitrate_kbps: params.bitrate_kbps,
@@ -680,6 +679,7 @@ async fn dispatch(
                 },
                 "geometry": session.geometry(),
                 "cursor": session.cursor_info(),
+                "agentIndicator": session.agent_indicator(),
             });
             *current = Some(session);
             Ok(result)

package/engine/src/peer.rs

@@ -5,10 +5,10 @@
 //! module never assumes anything about that channel, which is what keeps the
 //! engine usable by an application that is not this one.
 //!
-//! Input and clipboard ride the session's data channel rather than the local
-//! protocol. The channel is inside the DTLS/SRTP session the engine created for
-//! one authorized grant, so it inherits that session's identity and dies with
-//! it — a revoked session cannot be driven by a client that kept a socket open.
+//! Remote input and clipboard ride the session's data channel; co-located
+//! consumers can also use the local clipboard protocol. The channel is inside
+//! the DTLS/SRTP session opened by a paired consumer and dies with it — a revoked
+//! session cannot be driven by a client that kept a socket open.
 
 use anyhow::{Context, Result};
 use rtc::interceptor::{
@@ -1120,6 +1120,12 @@ impl VideoPeer {
     }
 
     pub async fn close(&self) {
+        let _ = tokio::time::timeout(Duration::from_millis(500), async {
+            while self.control.outstanding_bytes().await.unwrap_or(0) > 0 {
+                tokio::time::sleep(Duration::from_millis(5)).await;
+            }
+        })
+        .await;
         self.feedback.abort();
         let _ = self.control.close().await;
         let _ = self.peer.close().await;

package/engine/src/protocol.rs

@@ -53,14 +53,6 @@ pub struct HelloParams {
     pub protocol: u32,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum Permission {
-    View,
-    Control,
-    Clipboard,
-}
-
 #[derive(Debug, Clone, Deserialize)]
 pub struct IceServerParam {
     #[serde(default)]
@@ -126,8 +118,6 @@ pub struct OpenParams {
     /// Absent means "the portal, with the user's consent".
     #[serde(default)]
     pub source: Option<SourceRequest>,
-    #[serde(default)]
-    pub permissions: Vec<Permission>,
     #[serde(default = "default_max_width")]
     pub max_width: usize,
     #[serde(default = "default_max_height")]
@@ -539,6 +529,13 @@ mod tests {
 
     #[test]
     fn open_defaults_keep_the_desktops_own_pixels_up_to_4k() {
+        for payload in [
+            r#"{}"#,
+            r#"{"permissions":["view"]}"#,
+            r#"{"permissions":["view","unknown-legacy-scope"]}"#,
+        ] {
+            let _: OpenParams = serde_json::from_str(payload).unwrap();
+        }
         let params: OpenParams =
             serde_json::from_str(r#"{"permissions":["view","control"]}"#).unwrap();
         assert_eq!(params.max_width, 3840);