@desklink/host 0.1.1 → 0.2.0

package/engine/src/main.rs

@@ -30,6 +30,8 @@ mod input;
 #[path = "input_mac.rs"]
 mod input;
 #[cfg(target_os = "linux")]
+mod keeper;
+#[cfg(target_os = "linux")]
 mod keymap;
 #[cfg(target_os = "macos")]
 #[path = "keymap_mac.rs"]
@@ -115,6 +117,7 @@ fn main() {
             0
         }
         "serve" => report(runtime.block_on(serve())),
+        "keep" => keeper::command(&args[1..]),
         "capture-probe" => report(runtime.block_on(probe(
             args.get(1).and_then(|value| value.parse().ok()),
             args.get(2).map(String::as_str),
@@ -154,6 +157,9 @@ fn print_help() {
 
 USAGE:
   desklink-host serve            speak the local control protocol on stdin/stdout
+  desklink-host keep --display :N
+                                 keep one private X screen: kiosk geometry, focus,
+                                 and a JSON-lines window report on stdout
   desklink-host capabilities     print what this machine can do right now
   desklink-host capture-probe [seconds] [display]
                                  capture frames and report the stream; with a
@@ -452,6 +458,14 @@ fn render_event(notice: session::Notice) -> Option<String> {
             "session.frame.changed",
             serde_json::json!({ "sessionId": session_id, "seq": seq, "damage": damage }),
         ),
+        session::SessionEvent::Input { input } => (
+            "session.input",
+            serde_json::json!({ "sessionId": session_id, "input": input }),
+        ),
+        session::SessionEvent::KeyframeRequest { generation } => (
+            "session.keyframeRequest",
+            serde_json::json!({ "sessionId": session_id, "generation": generation }),
+        ),
         session::SessionEvent::RestoreToken(token) => (
             "session.restoreToken",
             serde_json::json!({ "sessionId": session_id, "token": token }),
@@ -581,6 +595,21 @@ async fn dispatch(
                 .map_err(|error| ErrorBody::new("transport", format!("{error:#}")))?;
             Ok(serde_json::json!({ "accepted": true }))
         }
+        "session.restart_ice" => {
+            // The client asks; the engine offers. The fresh offer travels as a
+            // new `session.description` event and the client answers it as
+            // usual, so no new event shape is needed and the session,
+            // generation and control channel survive.
+            let session = require_session(current)?;
+            let params: protocol::SessionRef = serde_json::from_value(request.params.clone())
+                .map_err(|error| ErrorBody::new("malformed", error.to_string()))?;
+            check_session(session, &params.session_id, params.generation)?;
+            session
+                .restart_ice()
+                .await
+                .map_err(|error| ErrorBody::new("transport", format!("{error:#}")))?;
+            Ok(serde_json::json!({ "accepted": true }))
+        }
         "session.clipboard.read" => {
             let session = require_session(current)?;
             let params: protocol::ClipboardParams = serde_json::from_value(request.params.clone())
@@ -625,6 +654,19 @@ async fn dispatch(
                 .frame(params.since, &params.path, params.region)
                 .map_err(|error| ErrorBody::new(error.code, error.message))
         }
+        "session.feed" => {
+            let session = require_session(current)?;
+            let params: protocol::FeedParams = serde_json::from_value(request.params.clone())
+                .map_err(|error| ErrorBody::new("malformed", error.to_string()))?;
+            check_session(session, &params.session_id, None)?;
+            let data = params
+                .access_unit()
+                .map_err(|message| ErrorBody::new("malformed", message))?;
+            session
+                .feed(params.keyframe, data)
+                .map_err(|error| ErrorBody::new(error.code, error.message))?;
+            Ok(serde_json::json!({ "accepted": true }))
+        }
         "session.metrics" => {
             let session = require_session(current)?;
             Ok(serde_json::to_value(session.metrics()).unwrap_or(serde_json::Value::Null))