Fix DevTools state and appearance control

Author: DjDeveloperr

client/src/app/AppShell.tsx

@@ -1872,9 +1872,13 @@ export function AppShell({
           if (!selectedSimulator) {
             return;
           }
-          const encoded = JSON.stringify({ type: "toggleAppearance" });
-          if (!sendWebRtcControlMessage(encoded)) {
-            void runAction(() => toggleAppearance(selectedSimulator.udid));
+          if (
+            !sendControl(selectedSimulator.udid, { type: "toggleAppearance" })
+          ) {
+            void runAction(
+              () => toggleAppearance(selectedSimulator.udid),
+              false,
+            );
           }
         }}
         onToggleDebug={() => setDebugVisible((current) => !current)}

server/src/api/routes.rs

@@ -1934,7 +1934,8 @@ async fn handle_control_socket(state: AppState, udid: String, socket: WebSocket)
         ))
         .await;
     let (control_tx, control_rx) = mpsc::unbounded_channel::<ControlMessage>();
-    let control_task = task::spawn(run_control_queue(session, udid.clone(), control_rx));
+    let bridge = state.registry.bridge().clone();
+    let control_task = task::spawn(run_control_queue(session, bridge, udid.clone(), control_rx));
 
     while let Some(message) = receiver.next().await {
         let text = match message {
@@ -1968,6 +1969,7 @@ async fn handle_control_socket(state: AppState, udid: String, socket: WebSocket)
 
 async fn run_control_queue(
     session: SimulatorSession,
+    bridge: NativeBridge,
     udid: String,
     mut receiver: mpsc::UnboundedReceiver<ControlMessage>,
 ) {
@@ -1990,7 +1992,13 @@ async fn run_control_queue(
                 }
             }
         }
-        if let Err(error) = run_control_message(session.clone(), message).await {
+        let result = match message {
+            ControlMessage::ToggleAppearance => {
+                run_toggle_appearance_control(bridge.clone(), udid.clone()).await
+            }
+            message => run_control_message(session.clone(), message).await,
+        };
+        if let Err(error) = result {
             tracing::debug!("Control message failed for {udid}: {error}");
         }
     }
@@ -2094,13 +2102,22 @@ pub(crate) async fn run_control_message(
         ControlMessage::RotateLeft => session.rotate_left(),
         ControlMessage::RotateRight => session.rotate_right(),
         ControlMessage::ToggleAppearance => Err(AppError::bad_request(
-            "`toggleAppearance` requires the WebRTC control channel.",
+            "`toggleAppearance` requires a native bridge control handler.",
         )),
     })
     .await
     .map_err(|error| AppError::internal(format!("Failed to join control task: {error}")))?
 }
 
+pub(crate) async fn run_toggle_appearance_control(
+    bridge: NativeBridge,
+    udid: String,
+) -> Result<(), AppError> {
+    task::spawn_blocking(move || bridge.toggle_appearance(&udid))
+        .await
+        .map_err(|error| AppError::internal(format!("Failed to join control task: {error}")))?
+}
+
 async fn send_key(
     State(state): State<AppState>,
     Path(udid): Path<String>,

server/src/transport/webrtc.rs

@@ -1,6 +1,6 @@
 use crate::api::routes::{
-    apply_stream_quality_payload, run_control_message, AppState, ControlMessage,
-    StreamQualityPayload,
+    apply_stream_quality_payload, run_control_message, run_toggle_appearance_control, AppState,
+    ControlMessage, StreamQualityPayload,
 };
 use crate::error::AppError;
 use crate::metrics::counters::ClientStreamStats;
@@ -512,12 +512,7 @@ async fn run_webrtc_control_queue(
             ControlMessage::ToggleAppearance => {
                 let bridge = state.registry.bridge().clone();
                 let action_udid = udid.clone();
-                let result = task::spawn_blocking(move || bridge.toggle_appearance(&action_udid))
-                    .await
-                    .map_err(|error| {
-                        AppError::internal(format!("Failed to join control task: {error}"))
-                    })
-                    .and_then(|result| result);
+                let result = run_toggle_appearance_control(bridge, action_udid).await;
                 if let Err(error) = result {
                     warn!("WebRTC control message failed for {udid}: {error}");
                 }