6 files changed, 271 insertions, 210 deletions

diff --git a/src/config.rs b/src/config.rs
index 9a9e44b..769269c 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,19 +1,30 @@
-use config::Config;
-use once_cell::sync::Lazy;
+use serde::Deserialize;
 
-pub static SETTINGS: Lazy<Config> = Lazy::new(setup);
+#[derive(Deserialize)]
+pub struct Config {
+    pub apikey: String,
+    pub server: String,
+}
+
+impl Config {
+    pub fn load() -> Result<Config, config::ConfigError> {
+        let config_dir = dirs::config_dir();
+
+        let builder = config::Config::builder();
 
-fn setup() -> Config {
-    #[cfg(not(debug_assertions))]
-    let builder = Config::builder().add_source(config::File::with_name(
-        format!("{}/webol-cli.toml", dirs::config_dir().unwrap().to_string_lossy()).as_str(),
-    ));
+        let builder = if let Some(conf) = config_dir {
+            let dir = conf.to_string_lossy();
+            builder.add_source(config::File::with_name(format!("{dir}/webol-cli").as_str()).required(false))
+        } else {
+            println!("!No config dir found");
+            builder
+        };
 
-    #[cfg(debug_assertions)]
-    let builder = Config::builder().add_source(config::File::with_name("webol-cli.toml"));
+        let build = builder
+            .add_source(config::File::with_name("webol-cli").required(false))
+            .add_source(config::Environment::with_prefix("WEBOL_CLI").separator("_"))
+            .build()?;
 
-    builder
-        .add_source(config::Environment::with_prefix("WEBOL_CLI_").separator("_"))
-        .build()
-        .unwrap()
+        build.try_deserialize()
+    }
 }
diff --git a/src/error.rs b/src/error.rs
index f15c60a..1e6eac1 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,21 +1,43 @@
 use std::{fmt::Debug, num::ParseIntError};
 
-pub enum CliError {
-    Reqwest(reqwest::Error),
-    Config(config::ConfigError),
-    Serde(serde_json::Error),
-    Parse(ParseIntError),
-    WsResponse,
-}
+use reqwest::header::InvalidHeaderValue;
 
-impl Debug for CliError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Reqwest(err) => { err.fmt(f) },
-            Self::Config(err) => { err.fmt(f) },
-            Self::Serde(err) => { err.fmt(f) },
-            Self::Parse(err) => { err.fmt(f) },
-            Self::WsResponse => { f.write_str("Error in Response") },
-        }
-    }
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+    #[error("request: {source}")]
+    Reqwest {
+        #[from]
+        source: reqwest::Error,
+    },
+    #[error("config: {source}")]
+    Config {
+        #[from]
+        source: config::ConfigError,
+    },
+    #[error("serde: {source}")]
+    Serde {
+        #[from]
+        source: serde_json::Error,
+    },
+    #[error("parse int: {source}")]
+    Parse {
+        #[from]
+        source: ParseIntError,
+    },
+    #[error("parse header: {source}")]
+    InvalidHeaderValue {
+        #[from]
+        source: InvalidHeaderValue,
+    },
+    #[error("tungstenite: {source}")]
+    Tungstenite {
+        #[from]
+        source: tokio_tungstenite::tungstenite::Error,
+    },
+    #[error("faulty websocket response")]
+    WsResponse,
+    #[error("authorization failed")]
+    Authorization,
+    #[error("Http error status: {0}")]
+    HttpStatus(u16),
 }
diff --git a/src/main.rs b/src/main.rs
index afe6fac..5a0931d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,21 +1,24 @@
 use std::{fmt::Display, time::Duration};
 
-use clap::{Parser, Command, CommandFactory, Subcommand};
-use clap_complete::{generate, Shell, Generator};
-use config::SETTINGS;
-use error::CliError;
-use indicatif::{ProgressBar, ProgressStyle, MultiProgress};
-use requests::{start::start, device};
-use reqwest::header::{HeaderMap, HeaderValue};
+use crate::config::Config;
+use clap::{Command, CommandFactory, Parser, Subcommand};
+use clap_complete::{generate, Generator, Shell};
+use error::Error;
+use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
+use requests::{device, start::start};
+use reqwest::{
+    header::{HeaderMap, HeaderValue},
+    Response,
+};
 use serde::Deserialize;
 
 mod config;
 mod error;
 mod requests;
 
-static OVERVIEW_STYLE: &str = "{spinner:.green} ({elapsed}{wide_msg}";
-static OVERVIEW_ERROR: &str = "✗ ({elapsed}) {wide_msg}";
-static OVERVIEW_DONE: &str = "✓ ({elapsed}) {wide_msg}";
+static OVERVIEW_STYLE: &str = "{spinner:.green} ({elapsed_precise}{wide_msg}";
+static OVERVIEW_ERROR: &str = "✗ ({elapsed_precise}) {wide_msg}";
+static OVERVIEW_DONE: &str = "✓ ({elapsed_precise}) {wide_msg}";
 static DEFAULT_STYLE: &str = "  {spinner:.green} {wide_msg}";
 static DONE_STYLE: &str = "  ✓ {wide_msg}";
 static ERROR_STYLE: &str = "  ✗ {wide_msg}";
@@ -35,7 +38,7 @@ enum Commands {
         /// id of the device
         id: String,
         #[arg(short, long)]
-        ping: Option<bool>
+        ping: Option<bool>,
     },
     Device {
         #[command(subcommand)]
@@ -52,7 +55,7 @@ enum DeviceCmd {
         id: String,
         mac: String,
         broadcast_addr: String,
-        ip: String
+        ip: String,
     },
     Get {
         id: String,
@@ -61,35 +64,45 @@ enum DeviceCmd {
         id: String,
         mac: String,
         broadcast_addr: String,
-        ip: String
+        ip: String,
     },
 }
 
 #[tokio::main]
-async fn main() -> Result<(), CliError> {
+async fn main() -> Result<(), anyhow::Error> {
+    let config = Config::load()?;
+
     let cli = Args::parse();
 
     match cli.commands {
         Commands::Start { id, ping } => {
-            start(id, ping.unwrap_or(true)).await?;
-        },
-        Commands::Device { devicecmd } => {
-            match devicecmd {
-                DeviceCmd::Add { id, mac, broadcast_addr, ip } => {
-                    device::put(id, mac, broadcast_addr, ip).await?;
-                },
-                DeviceCmd::Get { id } => {
-                    device::get(id).await?;
-                },
-                DeviceCmd::Edit { id, mac, broadcast_addr, ip } => {
-                    device::post(id, mac, broadcast_addr, ip).await?;
-                },
+            start(&config, id, ping.unwrap_or(true)).await?;
+        }
+        Commands::Device { devicecmd } => match devicecmd {
+            DeviceCmd::Add {
+                id,
+                mac,
+                broadcast_addr,
+                ip,
+            } => {
+                device::put(&config, id, mac, broadcast_addr, ip).await?;
+            }
+            DeviceCmd::Get { id } => {
+                device::get(&config, id).await?;
+            }
+            DeviceCmd::Edit {
+                id,
+                mac,
+                broadcast_addr,
+                ip,
+            } => {
+                device::post(&config, id, mac, broadcast_addr, ip).await?;
             }
         },
         Commands::CliGen { id } => {
             eprintln!("Generating completion file for {id:?}...");
             let mut cmd = Args::command();
-            print_completions(id, &mut cmd)
+            print_completions(id, &mut cmd);
         }
     }
 
@@ -100,29 +113,28 @@ fn print_completions<G: Generator>(gen: G, cmd: &mut Command) {
     generate(gen, cmd, cmd.get_name().to_string(), &mut std::io::stdout());
 }
 
-fn default_headers() -> Result<HeaderMap, CliError> {
+fn default_headers(config: &Config) -> Result<HeaderMap, Error> {
     let mut map = HeaderMap::new();
-    map.append("Accept-Content", HeaderValue::from_str("application/json").unwrap());
-    map.append("Content-Type", HeaderValue::from_str("application/json").unwrap());
-    map.append(
-        "Authorization",
-        HeaderValue::from_str(
-            SETTINGS.get_string("key")
-            .map_err(CliError::Config)?
-            .as_str()
-        ).unwrap()
-    );
+    map.append("Accept-Content", HeaderValue::from_str("application/json")?);
+    map.append("Content-Type", HeaderValue::from_str("application/json")?);
+    map.append("Authorization", HeaderValue::from_str(&config.apikey)?);
 
     Ok(map)
 }
 
-fn format_url(path: &str, protocol: Protocols) -> Result<String, CliError> {
-    Ok(format!(
-        "{}://{}/{}",
-        protocol,
-        SETTINGS.get_string("server").map_err(CliError::Config)?,
-        path
-    ))
+fn format_url(config: &Config, path: &str, protocol: &Protocols) -> String {
+    format!("{}://{}/{}", protocol, config.server, path)
+}
+
+async fn check_success(res: Response) -> Result<String, Error> {
+    let status = res.status();
+    if status.is_success() {
+        Ok(res.text().await?)
+    } else if status.as_u16() == 401 {
+        Err(Error::Authorization)
+    } else {
+        Err(Error::HttpStatus(status.as_u16()))
+    }
 }
 
 fn add_pb(mp: &MultiProgress, template: &str, message: String) -> ProgressBar {
@@ -134,10 +146,9 @@ fn add_pb(mp: &MultiProgress, template: &str, message: String) -> ProgressBar {
     pb
 }
 
-fn finish_pb(pb: ProgressBar, message: String, template: &str) {
+fn finish_pb(pb: &ProgressBar, message: String, template: &str) {
     pb.set_style(ProgressStyle::with_template(template).unwrap());
     pb.finish_with_message(message);
-
 }
 
 enum Protocols {
@@ -149,12 +160,12 @@ impl Display for Protocols {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::Http => f.write_str("http"),
-            Self::Websocket => f.write_str("ws")
+            Self::Websocket => f.write_str("ws"),
         }
     }
 }
 
 #[derive(Debug, Deserialize)]
 struct ErrorResponse {
-    error: String
+    error: String,
 }
diff --git a/src/requests/mod.rs b/src/requests.rs
index 6855db1..6855db1 100644
--- a/src/requests/mod.rs
+++ b/src/requests.rs
diff --git a/src/requests/device.rs b/src/requests/device.rs
index cbc838e..7583406 100644
--- a/src/requests/device.rs
+++ b/src/requests/device.rs
@@ -1,66 +1,58 @@
-use crate::{error::CliError, default_headers, format_url, Protocols};
+use crate::{check_success, config::Config, default_headers, error::Error, format_url, Protocols};
 
-pub async fn put(id: String, mac: String, broadcast_addr: String, ip: String) -> Result<(), CliError> {
-    let url = format_url("device", Protocols::Http)?;
-    println!("{}", url);
+pub async fn put(
+    config: &Config,
+    id: String,
+    mac: String,
+    broadcast_addr: String,
+    ip: String,
+) -> Result<(), Error> {
+    let url = format_url(config, "device", &Protocols::Http);
+    println!("{url}");
     let res = reqwest::Client::new()
         .put(url)
-        .headers(default_headers()?)
-        .body(
-            format!(
-                r#"{{"id": "{}", "mac": "{}", "broadcast_addr": "{}", "ip": "{}"}}"#,
-                id,
-                mac,
-                broadcast_addr,
-                ip
-            )
-        )
+        .headers(default_headers(config)?)
+        .body(format!(
+            r#"{{"id": "{id}", "mac": "{mac}", "broadcast_addr": "{broadcast_addr}", "ip": "{ip}"}}"#,
+        ))
         .send()
-        .await
-        .map_err(CliError::Reqwest)?
-        .text()
-        .await;
+        .await?;
 
-    println!("{:?}", res);
+    let body = check_success(res).await?;
+    println!("{body}");
     Ok(())
 }
 
-pub async fn get(id: String) -> Result<(), CliError> {
+pub async fn get(config: &Config, id: String) -> Result<(), Error> {
     let res = reqwest::Client::new()
-        .get(format_url("device", Protocols::Http)?)
-        .headers(default_headers()?)
-        .body(
-            format!(r#"{{"id": "{}"}}"#, id)
-        )
+        .get(format_url(config, "device", &Protocols::Http))
+        .headers(default_headers(config)?)
+        .body(format!(r#"{{"id": "{id}"}}"#))
         .send()
-        .await
-        .map_err(CliError::Reqwest)?
-        .text()
-        .await;
+        .await?;
 
-    println!("{:?}", res);
+    let body = check_success(res).await?;
+    println!("{body}");
     Ok(())
 }
 
-pub async fn post(id: String, mac: String, broadcast_addr: String, ip: String) -> Result<(), CliError> {
+pub async fn post(
+    config: &Config,
+    id: String,
+    mac: String,
+    broadcast_addr: String,
+    ip: String,
+) -> Result<(), Error> {
     let res = reqwest::Client::new()
-        .post(format_url("device", Protocols::Http)?)
-        .headers(default_headers()?)
-        .body(
-            format!(
-                r#"{{"id": "{}", "mac": "{}", "broadcast_addr": "{}", "ip": "{}"}}"#,
-                id,
-                mac,
-                broadcast_addr,
-                ip
-            )
-        )
+        .post(format_url(config, "device", &Protocols::Http))
+        .headers(default_headers(config)?)
+        .body(format!(
+            r#"{{"id": "{id}", "mac": "{mac}", "broadcast_addr": "{broadcast_addr}", "ip": "{ip}"}}"#,
+        ))
         .send()
-        .await
-        .map_err(CliError::Reqwest)?
-        .text()
-        .await;
+        .await?;
 
-    println!("{:?}", res);
+    let body = check_success(res).await?;
+    println!("{body}");
     Ok(())
 }
diff --git a/src/requests/start.rs b/src/requests/start.rs
index ca4ca44..3afbe3a 100644
--- a/src/requests/start.rs
+++ b/src/requests/start.rs
@@ -1,124 +1,149 @@
-use futures_util::{StreamExt, SinkExt};
+use futures_util::{SinkExt, StreamExt};
 use indicatif::{MultiProgress, ProgressBar};
 use reqwest::StatusCode;
 use serde::Deserialize;
-use tokio_tungstenite::{connect_async, tungstenite::Message};
-
-use crate::{error::CliError, default_headers, ErrorResponse, format_url, Protocols, OVERVIEW_STYLE, DEFAULT_STYLE, DONE_STYLE, finish_pb, ERROR_STYLE, OVERVIEW_ERROR, OVERVIEW_DONE, add_pb};
-
-pub async fn start(id: String, ping: bool) -> Result<(), CliError> {
-
+use tokio_tungstenite::{
+    connect_async,
+    tungstenite::{http::Request, Message},
+};
+
+use crate::{
+    add_pb, config::Config, default_headers, error::Error, finish_pb, format_url, ErrorResponse,
+    Protocols, DEFAULT_STYLE, DONE_STYLE, ERROR_STYLE, OVERVIEW_DONE, OVERVIEW_ERROR,
+    OVERVIEW_STYLE,
+};
+
+pub async fn start(config: &Config, id: String, ping: bool) -> Result<(), Error> {
     let send_start = MultiProgress::new();
-    let overview = add_pb(&send_start, OVERVIEW_STYLE, format!(") start {}", id));
+    let overview = add_pb(&send_start, OVERVIEW_STYLE, format!(") start {id}"));
 
-    // TODO: calculate average start-time on server
-    let url = format_url("start", Protocols::Http)?;
-    let connect = add_pb(&send_start, DEFAULT_STYLE, format!("connect to {}", url));
+    let url = format_url(config, "start", &Protocols::Http);
+    let connect = add_pb(&send_start, DEFAULT_STYLE, format!("connect to {url}"));
     let res = reqwest::Client::new()
         .post(url)
-        .headers(default_headers()?)
-        .body(
-            format!(r#"{{"id": "{}", "ping": {}}}"#, id, ping)
-        )
+        .headers(default_headers(config)?)
+        .body(format!(r#"{{"id": "{id}", "ping": {ping}}}"#))
         .send()
-        .await
-        .map_err(CliError::Reqwest)?;
-    finish_pb(connect, "connected, got response".to_string(), DONE_STYLE);
+        .await?;
+    finish_pb(&connect, "connected, got response".to_string(), DONE_STYLE);
 
     let res_pb = add_pb(&send_start, DEFAULT_STYLE, "analyzing response".to_string());
-    match res.status() {
-        StatusCode::OK => {
-            let body = serde_json::from_str::<StartResponse>(
-                &res.text().await.map_err(CliError::Reqwest)?
-            )
-            .map_err(CliError::Serde)?;
-
-            if body.boot {
-                finish_pb(res_pb, "sent start packet".to_string(), DONE_STYLE);
-            }
 
-            if ping {
-                let status = status_socket(body.uuid, &send_start, &overview, id).await?;
-                if status {
-                    finish_pb(overview, format!("successfully started {}", body.id), OVERVIEW_DONE);
-                } else {
-                    finish_pb(overview, format!("error while starting {}", body.id), OVERVIEW_ERROR);
-                }
-            }
-        },
-        _ => {
-            let body = serde_json::from_str::<ErrorResponse>(
-                &res.text().await.map_err(CliError::Reqwest)?
-            )
-            .map_err(CliError::Serde)?;
+    if res.status() == StatusCode::OK {
+        let body = serde_json::from_str::<StartResponse>(&res.text().await?)?;
 
-            res_pb.finish_with_message(format!("✗ got error: {}", body.error));
+        if body.boot {
+            finish_pb(&res_pb, "sent start packet".to_string(), DONE_STYLE);
         }
+
+        if ping {
+            let status = status_socket(config, body.uuid, &send_start, &overview, id).await?;
+            if status {
+                finish_pb(
+                    &overview,
+                    format!("successfully started {}", body.id),
+                    OVERVIEW_DONE,
+                );
+            } else {
+                finish_pb(
+                    &overview,
+                    format!("error while starting {}", body.id),
+                    OVERVIEW_ERROR,
+                );
+            }
+        }
+    } else {
+        let body = serde_json::from_str::<ErrorResponse>(&res.text().await?)?;
+
+        res_pb.finish_with_message(format!("✗ got error: {}", body.error));
     }
 
     Ok(())
 }
 
-async fn status_socket(uuid: String, pb: &MultiProgress, overview: &ProgressBar, id: String) -> Result<bool, CliError> {
-    // TODO: Remove unwraps
+async fn status_socket(
+    config: &Config,
+    uuid: String,
+    pb: &MultiProgress,
+    overview: &ProgressBar,
+    id: String,
+) -> Result<bool, Error> {
     let ws_pb = add_pb(pb, DEFAULT_STYLE, "connect to websocket".to_string());
-    let (mut ws_stream, _response) = connect_async(format_url("status", Protocols::Websocket)?)
-        .await
-        .expect("Failed to connect");
-    finish_pb(ws_pb, "connected to websocket".to_string(), DONE_STYLE);
-    
+
+    let request = Request::builder()
+        .uri(format_url(config, "status", &Protocols::Websocket))
+        .header("Authorization", &config.apikey)
+        .header("sec-websocket-key", "")
+        .header("host", &config.server)
+        .header("upgrade", "websocket")
+        .header("connection", "upgrade")
+        .header("sec-websocket-version", 13)
+        .body(())
+        .unwrap();
+
+    let (mut ws_stream, _response) = connect_async(request).await?;
+    finish_pb(&ws_pb, "connected to websocket".to_string(), DONE_STYLE);
+
     ws_stream.send(Message::Text(uuid.clone())).await.unwrap();
-    
+
     // Get ETA
     let eta_msg = ws_stream.next().await.unwrap().unwrap();
-    let eta = get_eta(eta_msg.into_text().unwrap(), uuid.clone())? + overview.elapsed().as_secs();
-    overview.set_message(format!("/{}) start {}", eta, id));
+    let eta = get_eta(&eta_msg.into_text().unwrap(), &uuid)?;
+    overview.set_message(format!("/{eta}) start {id}"));
 
     let msg_pb = add_pb(pb, DEFAULT_STYLE, "await message".to_string());
     let msg = ws_stream.next().await.unwrap();
-    finish_pb(msg_pb, "received message".to_string(), DONE_STYLE);
+    finish_pb(&msg_pb, "received message".to_string(), DONE_STYLE);
 
     ws_stream.close(None).await.unwrap();
 
     let v_pb = add_pb(pb, DEFAULT_STYLE, "verify response".to_string());
-    let res = verify_response(msg.unwrap().to_string(), uuid)?;
+    let res = verify_response(&msg.unwrap().to_string(), &uuid)?;
     match res {
         Verified::WrongUuid => {
-            finish_pb(v_pb, "returned wrong uuid".to_string(), ERROR_STYLE);
+            finish_pb(&v_pb, "returned wrong uuid".to_string(), ERROR_STYLE);
             Ok(false)
-        },
-        Verified::ResponseType(res_type) => {
-            match res_type {
-                ResponseType::Start => {
-                    finish_pb(v_pb, "device started".to_string(), DONE_STYLE);
-                    Ok(true)
-                },
-                ResponseType::Timeout => {
-                    finish_pb(v_pb, "ping timed out".to_string(), ERROR_STYLE);
-                    Ok(false)
-                },
-                ResponseType::NotFound => {
-                    finish_pb(v_pb, "unknown uuid".to_string(), ERROR_STYLE);
-                    Ok(false)
-                },
-            }
         }
+        Verified::ResponseType(res_type) => match res_type {
+            ResponseType::Start => {
+                finish_pb(&v_pb, "device started".to_string(), DONE_STYLE);
+                Ok(true)
+            }
+            ResponseType::Timeout => {
+                finish_pb(&v_pb, "ping timed out".to_string(), ERROR_STYLE);
+                Ok(false)
+            }
+            ResponseType::NotFound => {
+                finish_pb(&v_pb, "unknown uuid".to_string(), ERROR_STYLE);
+                Ok(false)
+            }
+        },
     }
 }
 
-fn get_eta(msg: String, uuid: String) -> Result<u64, CliError> {
+fn get_eta(msg: &str, uuid: &str) -> Result<String, Error> {
     let spl: Vec<&str> = msg.split('_').collect();
-    if (spl[0] != "eta") || (spl[2] != uuid) { return Err(CliError::WsResponse); };
-    Ok(u64::from_str_radix(spl[1], 10).map_err(CliError::Parse)?)
+    if (spl[0] != "eta") || (spl[2] != uuid) {
+        return Err(Error::WsResponse);
+    };
+    let input: u64 = spl[1].parse()?;
+
+    let sec = input % 60;
+    let min = (input / 60) % 60;
+    let hou = (input / (60 * 60)) % 60;
+
+    Ok(format!("{hou:0>2}:{min:0>2}:{sec:0>2}"))
 }
 
-fn verify_response(res: String, org_uuid: String) -> Result<Verified, CliError> {
+fn verify_response(res: &str, org_uuid: &str) -> Result<Verified, Error> {
     let spl: Vec<&str> = res.split('_').collect();
     let res_type = spl[0];
     let uuid = spl[1];
-    
-    if uuid != org_uuid { return Ok(Verified::WrongUuid) };
-    
+
+    if uuid != org_uuid {
+        return Ok(Verified::WrongUuid);
+    };
+
     Ok(Verified::ResponseType(ResponseType::from(res_type)?))
 }
 
@@ -131,7 +156,7 @@ struct StartResponse {
 
 enum Verified {
     ResponseType(ResponseType),
-    WrongUuid
+    WrongUuid,
 }
 
 enum ResponseType {
@@ -141,12 +166,12 @@ enum ResponseType {
 }
 
 impl ResponseType {
-    fn from(value: &str) -> Result<Self, CliError> {
+    fn from(value: &str) -> Result<Self, Error> {
         match value {
             "start" => Ok(ResponseType::Start),
             "timeout" => Ok(ResponseType::Timeout),
             "notfound" => Ok(ResponseType::NotFound),
-            _ => Err(CliError::WsResponse),
+            _ => Err(Error::WsResponse),
         }
     }
 }