Merge pull request #1 from FxQnLr/eta

Eta

1 files changed, 27 insertions, 17 deletions

diff --git a/src/requests/device.rs b/src/requests/device.rs
index 525745a..cbc838e 100644
--- a/src/requests/device.rs
+++ b/src/requests/device.rs
@@ -1,55 +1,65 @@
-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 url = format_url("device", Protocols::Http)?;
+    println!("{}", url);
+    let res = reqwest::Client::new()
+        .put(url)
         .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(())