make the web client use raw clients for everything

2 files changed, 20 insertions, 22 deletions

diff --git a/teleterm/src/web/list.rs b/teleterm/src/web/list.rs
index e35efac..2807b7f 100644
--- a/teleterm/src/web/list.rs
+++ b/teleterm/src/web/list.rs
@@ -29,8 +29,7 @@ pub fn run(
                 .context(crate::error::Connect { address }),
         )
     });
-    let client =
-        crate::client::Client::list("teleterm-web", connector, &auth);
+    let client = crate::client::Client::raw("teleterm-web", connector, auth);
 
     let (w_sessions, r_sessions) = tokio::sync::oneshot::channel();
 
@@ -95,6 +94,11 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
             crate::protocol::Message::Error { msg } => {
                 Some(Err(Error::Server { message: msg }))
             }
+            crate::protocol::Message::LoggedIn { .. } => {
+                self.client
+                    .send_message(crate::protocol::Message::list_sessions());
+                None
+            }
             msg => Some(Err(crate::error::Error::UnexpectedMessage {
                 message: msg,
             })),
@@ -116,21 +120,13 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
 
     fn poll_client(&mut self) -> component_future::Poll<(), Error> {
         match component_future::try_ready!(self.client.poll()).unwrap() {
-            crate::client::Event::Disconnect => {
-                let res = Err(Error::ServerDisconnected);
-                self.w_sessions.take().unwrap().send(res).unwrap();
-                return Ok(component_future::Async::Ready(()));
-            }
-            crate::client::Event::Connect => {
-                self.client
-                    .send_message(crate::protocol::Message::list_sessions());
-            }
             crate::client::Event::ServerMessage(msg) => {
                 if let Some(res) = self.server_message(msg) {
                     self.w_sessions.take().unwrap().send(res).unwrap();
                     return Ok(component_future::Async::Ready(()));
                 }
             }
+            _ => unreachable!(),
         }
         Ok(component_future::Async::DidWork)
     }
diff --git a/teleterm/src/web/watch.rs b/teleterm/src/web/watch.rs
index bb44639..2bce9e0 100644
--- a/teleterm/src/web/watch.rs
+++ b/teleterm/src/web/watch.rs
@@ -59,17 +59,14 @@ pub fn run(
                     .context(crate::error::Connect { address }),
             )
         });
-        let client = crate::client::Client::watch(
-            "teleterm-web",
-            connector,
-            &auth,
-            &query_params.id,
-        );
+        let client =
+            crate::client::Client::raw("teleterm-web", connector, &auth);
 
         tokio::spawn(
             Connection::new(
                 gotham::state::request_id(&state),
                 client,
+                &query_params.id,
                 ConnectionState::Connecting(Box::new(
                     stream.context(crate::error::WebSocketAccept),
                 )),
@@ -151,6 +148,7 @@ struct Connection<
 > {
     id: String,
     client: crate::client::Client<S>,
+    watch_id: String,
     conn: ConnectionState,
 }
 
@@ -160,11 +158,13 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
     fn new(
         id: &str,
         client: crate::client::Client<S>,
+        watch_id: &str,
         conn: ConnectionState,
     ) -> Self {
         Self {
             client,
             id: id.to_string(),
+            watch_id: watch_id.to_string(),
             conn,
         }
     }
@@ -181,6 +181,12 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
                     .context(crate::error::SerializeMessage)?;
                 Ok(Some(tungstenite::Message::Text(json)))
             }
+            crate::protocol::Message::LoggedIn { .. } => {
+                self.client.send_message(
+                    crate::protocol::Message::start_watching(&self.watch_id),
+                );
+                Ok(None)
+            }
             _ => Ok(None),
         }
     }
@@ -215,16 +221,12 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
         };
 
         match component_future::try_ready!(self.client.poll()).unwrap() {
-            crate::client::Event::Disconnect => {
-                // TODO: better reconnect handling?
-                return Ok(component_future::Async::Ready(()));
-            }
-            crate::client::Event::Connect => {}
             crate::client::Event::ServerMessage(msg) => {
                 if let Some(msg) = self.handle_client_message(&msg)? {
                     self.conn.send(msg);
                 }
             }
+            _ => unreachable!(),
         }
         Ok(component_future::Async::DidWork)
     }