thread through the id to the actual message events

this is more accurate, since managing the lifetime of the websocket
connection is a bit tricky

3 files changed, 16 insertions, 28 deletions

diff --git a/teleterm-web/src/lib.rs b/teleterm-web/src/lib.rs
index 5c7d5c1..9ec713e 100644
--- a/teleterm-web/src/lib.rs
+++ b/teleterm-web/src/lib.rs
@@ -16,7 +16,7 @@ enum Msg {
     List(seed::fetch::ResponseDataResult<Vec<crate::model::Session>>),
     Refresh,
     StartWatching(String),
-    Watch(ws::WebSocketEvent),
+    Watch(String, ws::WebSocketEvent),
 }
 
 fn init(_: Url, orders: &mut impl Orders<Msg>) -> Init<crate::model::Model> {
@@ -49,7 +49,7 @@ fn update(
             log(&format!("watching {}", id));
             model.watch(&id, orders);
         }
-        Msg::Watch(event) => match event {
+        Msg::Watch(id, event) => match event {
             ws::WebSocketEvent::Connected(_) => {
                 log("connected");
             }
@@ -58,18 +58,10 @@ fn update(
                 model.watch_disconnect();
             }
             ws::WebSocketEvent::Message(msg) => {
-                log(&format!(
-                    "message from id {}: {:?}",
-                    model.watch_id().unwrap(),
-                    msg
-                ));
+                log(&format!("message from id {}: {:?}", id, msg));
             }
             ws::WebSocketEvent::Error(e) => {
-                log(&format!(
-                    "error from id {}: {:?}",
-                    model.watch_id().unwrap(),
-                    e
-                ));
+                log(&format!("error from id {}: {:?}", id, e));
             }
         },
     }
diff --git a/teleterm-web/src/model.rs b/teleterm-web/src/model.rs
index 0e6f82d..fb36902 100644
--- a/teleterm-web/src/model.rs
+++ b/teleterm-web/src/model.rs
@@ -4,7 +4,6 @@ const LIST_URL: &str = "http://127.0.0.1:4145/list";
 const WATCH_URL: &str = "ws://127.0.0.1:4145/watch";
 
 struct WatchConn {
-    id: String,
     #[allow(dead_code)] // no idea why it thinks this is dead
     ws: WebSocket,
 }
@@ -35,13 +34,11 @@ impl Model {
     ) {
         let ws = crate::ws::connect(
             &format!("{}?id={}", WATCH_URL, id),
+            id,
             crate::Msg::Watch,
             orders,
         );
-        self.watch_conn = Some(WatchConn {
-            id: id.to_string(),
-            ws,
-        })
+        self.watch_conn = Some(WatchConn { ws })
     }
 
     pub fn sessions(&self) -> &[Session] {
@@ -52,14 +49,6 @@ impl Model {
         self.sessions = sessions;
     }
 
-    pub fn watch_id(&self) -> Option<&str> {
-        if let Some(conn) = &self.watch_conn {
-            Some(&conn.id)
-        } else {
-            None
-        }
-    }
-
     pub fn watch_disconnect(&mut self) {
         self.watch_conn = None;
     }
diff --git a/teleterm-web/src/ws.rs b/teleterm-web/src/ws.rs
index a0c30a4..c5f9761 100644
--- a/teleterm-web/src/ws.rs
+++ b/teleterm-web/src/ws.rs
@@ -11,12 +11,14 @@ pub(crate) enum WebSocketEvent {
 
 pub(crate) fn connect(
     url: &str,
-    msg: fn(WebSocketEvent) -> crate::Msg,
+    id: &str,
+    msg: fn(String, WebSocketEvent) -> crate::Msg,
     orders: &mut impl Orders<crate::Msg>,
 ) -> WebSocket {
     let ws = WebSocket::new(url).unwrap();
 
     register_ws_handler(
+        id,
         WebSocket::set_onopen,
         WebSocketEvent::Connected,
         msg,
@@ -24,6 +26,7 @@ pub(crate) fn connect(
         orders,
     );
     register_ws_handler(
+        id,
         WebSocket::set_onclose,
         WebSocketEvent::Disconnected,
         msg,
@@ -31,6 +34,7 @@ pub(crate) fn connect(
         orders,
     );
     register_ws_handler(
+        id,
         WebSocket::set_onmessage,
         WebSocketEvent::Message,
         msg,
@@ -38,6 +42,7 @@ pub(crate) fn connect(
         orders,
     );
     register_ws_handler(
+        id,
         WebSocket::set_onerror,
         WebSocketEvent::Error,
         msg,
@@ -49,9 +54,10 @@ pub(crate) fn connect(
 }
 
 fn register_ws_handler<T, F>(
+    id: &str,
     ws_cb_setter: fn(&WebSocket, Option<&js_sys::Function>),
     msg: F,
-    ws_msg: fn(WebSocketEvent) -> crate::Msg,
+    ws_msg: fn(String, WebSocketEvent) -> crate::Msg,
     ws: &web_sys::WebSocket,
     orders: &mut impl Orders<crate::Msg>,
 ) where
@@ -60,8 +66,9 @@ fn register_ws_handler<T, F>(
 {
     let (app, msg_mapper) = (orders.clone_app(), orders.msg_mapper());
 
+    let id = id.to_string();
     let closure = Closure::new(move |data| {
-        app.update(msg_mapper(ws_msg(msg(data))));
+        app.update(msg_mapper(ws_msg(id.clone(), msg(data))));
     });
 
     ws_cb_setter(ws, Some(closure.as_ref().unchecked_ref()));