fix(terminal): add more error handling

Also stop polling main websocket on terminal page
ravenclaw900 · Feb 6, 2022 · 7b1c051 · 7b1c051
1 parent c5ebc71
commit 7b1c051
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/src/backend/src/socket_handlers.rs b/src/backend/src/socket_handlers.rs
@@ -121,7 +121,9 @@ pub async fn socket_handler(socket: warp::ws::WebSocket) {
                     )))
                     .await;
             }
-            _ => {}
+            _ => {
+                log::debug!("Got page {}, not handling", message.page);
+            }
         }
     }
 }
@@ -174,7 +176,9 @@ pub async fn term_handler(socket: warp::ws::WebSocket) {
             .await
             .unwrap();
             if result.0.is_ok() {
-                send.send(result.1).await.unwrap();
+                if send.send(result.1).await.is_err() {
+                    break;
+                }
             } else {
                 quit_send.notify_one();
                 break;
@@ -198,10 +202,9 @@ pub async fn term_handler(socket: warp::ws::WebSocket) {
                 if let Some(Ok(data_unwrapped)) = data_msg {
                     data = data_unwrapped;
                 } else {
-                    (*cmd_write.read().await)
+                    let _write = (*cmd_write.read().await)
                         .pty()
-                        .write_all("exit\n".as_bytes())
-                        .unwrap();
+                        .write_all("exit\n".as_bytes());
                     continue;
                 }
                 if data.is_text() && data.to_str().unwrap().get(..4) == Some("size") {

diff --git a/src/frontend/.yarn/install-state.gz b/src/frontend/.yarn/install-state.gz
diff --git a/src/frontend/src/App.svelte b/src/frontend/src/App.svelte
@@ -182,18 +182,21 @@
     };
 
     function pollServer(page: string) {
-        let json: string;
-        if (login) {
-            json = JSON.stringify({
-                page,
-                token,
-            });
-        } else {
-            json = JSON.stringify({
-                page,
-            });
+        if (page != "/terminal") {
+            // Terminal doesn't work if sent
+            let json: string;
+            if (login) {
+                json = JSON.stringify({
+                    page,
+                    token,
+                });
+            } else {
+                json = JSON.stringify({
+                    page,
+                });
+            }
+            socket.send(json);
         }
-        socket.send(json);
     }
 
     function changePage(page: string) {