Make connections more reliable

Author: suchmememanyskill

moonraker-rs/src/connector/read_deserialize.rs

@@ -5,7 +5,7 @@ use crate::printer_objects::*;
 #[derive(Debug, Deserialize, Clone)]
 pub struct MoonrakerErrorReplyRaw
 {
-    pub code: u32,
+    pub code: i32,
     pub message: String
 }
 

moonraker-rs/src/error.rs

@@ -8,9 +8,11 @@ pub enum Error {
     #[error("Failed to write message to websocket")]
     WebsocketWriteError(#[from] WebSocketError),
     #[error("Moonraker returned an error reply")]
-    MoonrakerErrorReply(u32, String),
+    MoonrakerErrorReply(i32, String),
     #[error("Unknown error")]
     Unknown(String),
     #[error("Internally used")]
     BreakError,
+    #[error("Timeout")]
+    Timeout,
 }

moonraker-rs/src/moonraker_connection.rs

@@ -14,7 +14,7 @@ use serde_json::Value;
 use std::error::Error;
 use std::fmt::Debug;
 use std::sync::Arc;
-use std::time::Duration;
+use std::time::{Duration, Instant};
 use tokio::io::{ReadHalf, WriteHalf};
 use tokio::net::TcpStream;
 use tokio::sync::broadcast::{Receiver, Sender};
@@ -44,7 +44,7 @@ pub struct MoonrakerReply {
 #[derive(Debug, Clone)]
 pub struct MoonrakerErrorReply
 {
-    pub code: u32,
+    pub code: i32,
     pub message: String,
     pub id: u32,
 }
@@ -234,7 +234,8 @@ impl MoonrakerConnection {
                 .recv()
                 .await
                 .expect("Failed to retrieve internal event");
-
+            
+                let now = Instant::now();
             match &*event {
                 WebsocketEvent::MoonrakerReply(reply) if reply.id == id => {
                     let parsed_result: Result<T, serde_json::Error> =
@@ -247,10 +248,17 @@ impl MoonrakerConnection {
                 }
 
                 WebsocketEvent::MoonrakerErrorReply(error) if error.id == id => {
-                    println!("AAAAAAAAAAAAAAAAAAAAAA");
                     return Err(crate::error::Error::MoonrakerErrorReply(error.code, error.message.clone()));
                 }
-                _ => continue, // TODO: This should eventually end
+                _ => {
+                    if now.elapsed().as_secs() > 20 
+                    {
+                        return Err(crate::error::Error::Timeout);
+                    }
+                    else {
+                        continue;
+                    }
+                }, // TODO: This should eventually end
             }
         }
     }

src/event_loop/event_loop.rs

@@ -60,8 +60,8 @@ impl EventLoop
         self.ui_weak
             .upgrade_in_event_loop(move |ui| {
                 ui.global::<AppState>().set_moonraker_connected(false);
-                ui.global::<AppState>().set_klipper_state("Disconnected".into());
-                ui.global::<AppState>().set_klipper_state_message("Disconnected".into());
+                ui.global::<AppState>().set_klipper_state("".into());
+                ui.global::<AppState>().set_klipper_state_message("".into());
             })?;
 
         Ok(())

ui/main.slint

@@ -555,7 +555,7 @@ export component AppWindow inherits Window {
         height: 100%;
     }
 
-    if AppState.moonraker_connected && AppState.klipper_state != "Ready" : VerticalLayout {
+    if AppState.moonraker_connected && AppState.klipper_state != "Ready" && AppState.klipper_state != "" : VerticalLayout {
         width: 100%;
         spacing: 20px;
         Rectangle {}
@@ -589,7 +589,7 @@ export component AppWindow inherits Window {
         Rectangle {}
     }
 
-    if !AppState.moonraker_connected: VerticalLayout
+    if !AppState.moonraker_connected || AppState.klipper_state == "": VerticalLayout
     {
         VerticalLayout {
             width: 100%;