Config Updates and Fixes

Cargo.toml

@@ -15,4 +15,5 @@ license = "Apache-2.0"
 futures = "0.3"
 reqwest = { version = "0.10", features = ["json"] }
 serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
 chrono = "0.4"

src/lib.rs

@@ -61,8 +61,9 @@ pub struct LongLivedToken {
 impl HomeAssistantAPI {
     pub fn new(instance_url: String, client_id: String) -> Arc<RwLock<Self>> {
         let token = Token::None;
+        let http_instance_url = format!("http://{}", instance_url);
         let ret = Arc::new(RwLock::new(Self {
-            instance_url,
+            instance_url: http_instance_url,
             token,
             client_id,
             self_reference: Weak::new(),

src/rest.rs

@@ -318,7 +318,6 @@ impl Rest {
 
         drop(read_lock);
         let response = request.send().await?;
-
         let resp_json: Vec<types::StateObject> = response.json().await?;
 
         Ok(resp_json)

src/types.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-
+use serde_json::Value;
 #[derive(Serialize, Deserialize, Debug)]
 pub struct HaEntityAttribute {
     pub friendly_name: Option<String>,
@@ -141,10 +141,9 @@ pub struct ServiceObject {
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct StateObject {
-    pub attributes: std::collections::HashMap<String, String>,
+    pub attributes: std::collections::HashMap<String, Value>,
     pub entity_id: String,
     pub last_changed: String,
-    pub last_updated: Option<String>,
     pub state: String,
 }