add some more logging to client for profile loading (#28)

Author: bcaldwell

Diff for: client/src/main.rs

@@ -61,11 +61,19 @@ async fn main() {
     let (client_sender, client_rcv) = mpsc::unbounded_channel();
 
     let client_rcv = UnboundedReceiverStream::new(client_rcv);
-    tokio::task::spawn(client_rcv.map(|x| Ok(x)).forward(ws_write).map(|result| {
-        if let Err(e) = result {
-            error!("error sending websocket msg: {}", e);
-        }
-    }));
+    tokio::task::spawn(
+        client_rcv
+            .map(|x| {
+                info!(message=?x, "sending message on websocket");
+                Ok(x)
+            })
+            .forward(ws_write)
+            .map(|result| {
+                if let Err(e) = result {
+                    error!("error sending websocket msg: {}", e);
+                }
+            }),
+    );
 
     let handle_button_requests_join = tokio::spawn(handle_set_button_requests(
         image_update_rx,
@@ -85,6 +93,7 @@ async fn main() {
                     exit(1);
                 }
             };
+            info!("received message on socket, starting to process");
             handle_socket_message(message, image_update_tx.clone(), &device).await;
         })
         .await;
@@ -137,6 +146,7 @@ async fn handle_set_button_requests(
     device: StreamDeckDevice,
 ) {
     while let Some(set_button_request) = rx.recv().await {
+        info!(button = set_button_request.button, "setting button image");
         match set_button_state(&set_button_request, &deck_ref, &device).await {
             Ok(_) => (),
             Err(e) => {
@@ -176,6 +186,10 @@ async fn set_button_state(
             .set_button_image(set_button_request.button, resized_image)
             .map_err(|e| anyhow!("failed to set button image: {}", e))?;
 
+        info!(
+            button = set_button_request.button,
+            "finished setting button image"
+        );
         return Ok(());
     }
 
@@ -189,6 +203,10 @@ async fn set_button_state(
             .set_button_rgb(set_button_request.button, &color)
             .map_err(|e| anyhow!("failed to set button color: {}", e))?;
 
+        info!(
+            button = set_button_request.button,
+            "finished setting button image"
+        );
         return Ok(());
     }
 
@@ -212,14 +230,19 @@ async fn handle_socket_message(
         }
     };
 
-    let msg = match serde_json::from_str(msg) {
+    let msg: WsActions = match serde_json::from_str(msg) {
         Ok(msg) => msg,
         Err(err) => {
             info!(?msg, "unknown message type ({:?}), ignoring", err);
             return;
         }
     };
 
+    info!(
+        message_type = msg.type_string(),
+        "processing message from websocket"
+    );
+
     let r = match msg {
         WsActions::SetButton { index, button } => image_update_tx
             .send(SetButtonRequest {
@@ -381,7 +404,7 @@ fn is_time_to_toggle_sleep(
         match std::time::SystemTime::now().duration_since(last_button_press_time) {
             Ok(t) => t,
             Err(e) => {
-                print!(
+                error!(
                     "failed to determine the time since last sleep, assuming no change: {}",
                     e
                 );

Diff for: sdc_core/src/types/ws_types.rs

@@ -7,6 +7,17 @@ pub enum WsActions {
     SetButton { index: u8, button: SetButtonUI },
 }
 
+impl WsActions {
+    pub fn type_string(&self) -> String {
+        match self {
+            WsActions::ButtonPressed { .. } => "Button Pressed",
+            WsActions::SetButtons { .. } => "Set Buttons",
+            WsActions::SetButton { .. } => "Set Button",
+        }
+        .to_string()
+    }
+}
+
 #[derive(Debug, serde::Serialize, serde::Deserialize, Clone)]
 pub struct SetButtonUI {
     pub image: Option<String>,

Diff for: server/src/ws_api.rs

@@ -239,7 +239,7 @@ async fn handle_profile_sync_request(
         }
     };
     let msg = Message::text(msg);
-    error!(client=?id, profile=?profile, "sending set button event");
+    info!(client=?id, profile=?profile.name, "sending set button event");
     match send_ws_message(&id, clients.clone(), msg).await {
         Ok(_) => (),
         Err(err) => error!(error =?err, client=?id, "failed to send button pressed message"),