2 files changed, 85 insertions, 30 deletions

diff --git a/src/requests/device.rs b/src/requests/device.rs
index 525745a..f7754a4 100644
--- a/src/requests/device.rs
+++ b/src/requests/device.rs
@@ -1,55 +1,63 @@
-use crate::{error::CliError, default_headers, format_url};
+use crate::{error::CliError, default_headers, format_url, Protocols};
 
-pub fn put(id: String, mac: String, broadcast_addr: String) -> Result<(), CliError> {
-    let res = reqwest::blocking::Client::new()
-        .put(format_url("device")?)
+pub async fn put(id: String, mac: String, broadcast_addr: String, ip: String) -> Result<(), CliError> {
+    let res = reqwest::Client::new()
+        .put(format_url("device", Protocols::Http)?)
         .headers(default_headers()?)
         .body(
             format!(
-                r#"{{"id": "{}", "mac": "{}", "broadcast_addr": "{}"}}"#,
+                r#"{{"id": "{}", "mac": "{}", "broadcast_addr": "{}", "ip": "{}"}}"#,
                 id,
                 mac,
-                broadcast_addr
+                broadcast_addr,
+                ip
             )
         )
         .send()
+        .await
         .map_err(CliError::Reqwest)?
-        .text();
+        .text()
+        .await;
 
     println!("{:?}", res);
     Ok(())
 }
 
-pub fn get(id: String) -> Result<(), CliError> {
-    let res = reqwest::blocking::Client::new()
-        .get(format_url("device")?)
+pub async fn get(id: String) -> Result<(), CliError> {
+    let res = reqwest::Client::new()
+        .get(format_url("device", Protocols::Http)?)
         .headers(default_headers()?)
         .body(
             format!(r#"{{"id": "{}"}}"#, id)
         )
         .send()
+        .await
         .map_err(CliError::Reqwest)?
-        .text();
+        .text()
+        .await;
 
     println!("{:?}", res);
     Ok(())
 }
 
-pub fn post(id: String, mac: String, broadcast_addr: String) -> Result<(), CliError> {
-    let res = reqwest::blocking::Client::new()
-        .post(format_url("device")?)
+pub async fn post(id: String, mac: String, broadcast_addr: String, ip: String) -> Result<(), CliError> {
+    let res = reqwest::Client::new()
+        .post(format_url("device", Protocols::Http)?)
         .headers(default_headers()?)
         .body(
             format!(
-                r#"{{"id": "{}", "mac": "{}", "broadcast_addr": "{}"}}"#,
+                r#"{{"id": "{}", "mac": "{}", "broadcast_addr": "{}", "ip": "{}"}}"#,
                 id,
                 mac,
-                broadcast_addr
+                broadcast_addr,
+                ip
             )
         )
         .send()
+        .await
         .map_err(CliError::Reqwest)?
-        .text();
+        .text()
+        .await;
 
     println!("{:?}", res);
     Ok(())
diff --git a/src/requests/start.rs b/src/requests/start.rs
index 30f65b9..d0c4411 100644
--- a/src/requests/start.rs
+++ b/src/requests/start.rs
@@ -1,37 +1,57 @@
+use std::time::Duration;
+
+use futures_util::{StreamExt, SinkExt};
+use indicatif::{ProgressBar, ProgressStyle};
 use reqwest::StatusCode;
 use serde::Deserialize;
+use tokio_tungstenite::{connect_async, tungstenite::Message};
 
-use crate::{config::SETTINGS, error::CliError, default_headers, ErrorResponse};
+use crate::{error::CliError, default_headers, ErrorResponse, format_url, Protocols};
 
-pub fn start(id: String) -> Result<(), CliError> {
-    let res = reqwest::blocking::Client::new()
-        .post(
-            format!(
-                "{}/start",
-                SETTINGS.get_string("server").map_err(CliError::Config)?
-            )
-        )
+pub async fn start(id: String, ping: bool) -> Result<(), CliError> {
+
+    let send_start = ProgressBar::new(1);
+
+    // TODO: calculate average start-time on server
+    send_start.set_style(
+        ProgressStyle::with_template("{spinner:.green} ({elapsed}) {wide_msg}")
+        .unwrap()
+        .tick_chars("|/-\\\\")
+    );
+
+    let url = format_url("start", Protocols::Http)?;
+
+    send_start.set_message(format!("connect to {}", url));
+    send_start.enable_steady_tick(Duration::from_millis(125));
+
+    let res = reqwest::Client::new()
+        .post(url)
         .headers(default_headers()?)
         .body(
-            format!(r#"{{"id": "{}"}}"#, id)
+            format!(r#"{{"id": "{}", "ping": {}}}"#, id, ping)
         )
         .send()
+        .await
         .map_err(CliError::Reqwest)?;
 
     match res.status() {
         StatusCode::OK => {
             let body = serde_json::from_str::<StartResponse>(
-                &res.text().map_err(CliError::Reqwest)?
+                &res.text().await.map_err(CliError::Reqwest)?
             )
             .map_err(CliError::Serde)?;
 
             if body.boot {
-                println!("successfully started {}", body.id);
+                send_start.println("connected, sent start packet");
+            }
+
+            if ping {
+                send_start.println(status_socket(body.uuid, &send_start).await?.to_string());
             }
         },
         _ => {
             let body = serde_json::from_str::<ErrorResponse>(
-                &res.text().map_err(CliError::Reqwest)?
+                &res.text().await.map_err(CliError::Reqwest)?
             )
             .map_err(CliError::Serde)?;
 
@@ -42,8 +62,35 @@ pub fn start(id: String) -> Result<(), CliError> {
     Ok(())
 }
 
+async fn status_socket(uuid: String, pb: &ProgressBar) -> Result<bool, CliError> {
+    pb.set_message("setup websocket");
+
+    let (mut ws_stream, _response) = connect_async(format_url("status", Protocols::Websocket)?)
+        .await
+        .expect("Failed to connect");
+    pb.println("connected to websocket");
+
+    pb.set_message("send uuid message");
+    ws_stream.send(Message::Text(uuid)).await.unwrap();
+    pb.println("sent uuid message");
+
+    pb.set_message("wait for message");
+    let msg = ws_stream.next().await.unwrap();
+
+    pb.println(format!("msg: {:?}", msg));
+    
+    ws_stream.close(None).await.unwrap();
+    pb.println("connection closed");
+    // TODO: Check for correct UUID and timeout
+    pb.set_message("verifying message");
+    if msg.is_ok() { return Ok(true) }
+
+    Ok(false)
+}
+
 #[derive(Debug, Deserialize)]
 struct StartResponse {
     boot: bool,
     id: String,
+    uuid: String,
 }