refactor a bit

1 files changed, 28 insertions, 30 deletions

diff --git a/teleterm-web/src/lib.rs b/teleterm-web/src/lib.rs
index 8b770a5..99c68f1 100644
--- a/teleterm-web/src/lib.rs
+++ b/teleterm-web/src/lib.rs
@@ -13,51 +13,49 @@ const WATCH_URL: &str = "ws://127.0.0.1:4145/watch";
 
 #[derive(Clone)]
 enum Msg {
-    Connected(JsValue),
-    Disconnected(JsValue),
-    Message(MessageEvent),
-    Error(JsValue),
+    Watch(ws::WebSocketEvent),
 }
 
 struct Model {
-    ws: WebSocket,
+    watch_conn: WebSocket,
 }
 
 fn init(_: Url, orders: &mut impl Orders<Msg>) -> Init<Model> {
     log("init");
-    let ws = ws::connect(WATCH_URL, orders);
-    log("created ws");
-    Init::new(Model { ws })
+    let watch_conn = ws::connect(WATCH_URL, Msg::Watch, orders);
+    Init::new(Model { watch_conn })
 }
 
 fn update(msg: Msg, model: &mut Model, _orders: &mut impl Orders<Msg>) {
     log("update");
     match msg {
-        Msg::Connected(_) => {
-            log("connected");
-            match model.ws.send_with_str("ping1") {
-                Ok(_) => log("sent ping1 successfully"),
-                Err(e) => {
-                    log(&format!("error sending ping: {:?}", e));
-                    return;
+        Msg::Watch(event) => match event {
+            ws::WebSocketEvent::Connected(_) => {
+                log("connected");
+                match model.watch_conn.send_with_str("ping1") {
+                    Ok(_) => log("sent ping1 successfully"),
+                    Err(e) => {
+                        log(&format!("error sending ping: {:?}", e));
+                        return;
+                    }
                 }
-            }
-            match model.ws.send_with_str("ping2") {
-                Ok(_) => log("sent ping2 successfully"),
-                Err(e) => {
-                    log(&format!("error sending ping: {:?}", e));
+                match model.watch_conn.send_with_str("ping2") {
+                    Ok(_) => log("sent ping2 successfully"),
+                    Err(e) => {
+                        log(&format!("error sending ping: {:?}", e));
+                    }
                 }
             }
-        }
-        Msg::Disconnected(_) => {
-            log("disconnected");
-        }
-        Msg::Message(msg) => {
-            log(&format!("message {:?}", msg));
-        }
-        Msg::Error(e) => {
-            log(&format!("error {:?}", e));
-        }
+            ws::WebSocketEvent::Disconnected(_) => {
+                log("disconnected");
+            }
+            ws::WebSocketEvent::Message(msg) => {
+                log(&format!("message {:?}", msg));
+            }
+            ws::WebSocketEvent::Error(e) => {
+                log(&format!("error {:?}", e));
+            }
+        },
     }
 }