Merge branch 'main' into feat/disable_cert_validation

Author: zehnm

.idea/runConfigurations/All_Tests.xml

@@ -1,10 +1,10 @@
 [package]
 name = "uc-intg-hass"
 version = "0.12.0"
-edition = "2021"
+edition = "2024"
 authors = ["Markus Zehnder <markus.z@unfoldedcircle.com>"]
 license = "MPL-2.0"
-description = "Unfolded Circle Home-Assistant integration for Remote Two"
+description = "Unfolded Circle Home-Assistant integration for Remote Two/3"
 repository = "https://github.com/unfoldedcircle/integration-home-assistant"
 default-run = "uc-intg-hass"
 

.idea/runConfigurations/Run_intg_home_assistant___mdns_sd_.xml

@@ -11,9 +11,9 @@ use std::env;
 use std::str::FromStr;
 use std::time::Duration;
 use uc_api::intg::ws::{R2Event, R2Request};
-use uc_intg_hass::configuration::{get_configuration, Settings, ENV_HASS_MSG_TRACING};
+use uc_intg_hass::configuration::{ENV_HASS_MSG_TRACING, Settings, get_configuration};
 use uc_intg_hass::{
-    configuration, Controller, NewR2Session, R2EventMsg, R2RequestMsg, SendWsMessage, APP_VERSION,
+    APP_VERSION, Controller, NewR2Session, R2EventMsg, R2RequestMsg, SendWsMessage, configuration,
 };
 use url::Url;
 
@@ -102,7 +102,9 @@ fn parse_args_load_cfg() -> anyhow::Result<Settings> {
 
     env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("debug")).init();
     if let Some(msg_trace) = args.get_one::<String>("trace_level") {
-        env::set_var(ENV_HASS_MSG_TRACING, msg_trace);
+        unsafe {
+            env::set_var(ENV_HASS_MSG_TRACING, msg_trace);
+        }
     }
     let cfg_file = None;
     let mut cfg = get_configuration(cfg_file).expect("Failed to read configuration");
@@ -154,22 +156,22 @@ impl Handler<SendWsMessage> for ServerMock {
 
     fn handle(&mut self, msg: SendWsMessage, _ctx: &mut Self::Context) {
         let msg_name = msg.0.msg.clone().unwrap_or_default();
-        if msg_name == "device_state" {
-            if let Some(msg_data) = msg.0.msg_data.as_ref() {
-                self.connected = msg_data
-                    .as_object()
-                    .and_then(|o| o.get("state"))
-                    .and_then(|s| s.as_str())
-                    == Some("CONNECTED");
-
-                if self.connected {
-                    self.controller_addr.do_send(R2RequestMsg {
-                        ws_id: self.id.clone(),
-                        req_id: 0,
-                        request: R2Request::GetEntityStates,
-                        msg_data: None,
-                    });
-                }
+        if msg_name == "device_state"
+            && let Some(msg_data) = msg.0.msg_data.as_ref()
+        {
+            self.connected = msg_data
+                .as_object()
+                .and_then(|o| o.get("state"))
+                .and_then(|s| s.as_str())
+                == Some("CONNECTED");
+
+            if self.connected {
+                self.controller_addr.do_send(R2RequestMsg {
+                    ws_id: self.id.clone(),
+                    req_id: 0,
+                    request: R2Request::GetEntityStates,
+                    msg_data: None,
+                });
             }
         }
 

.idea/runConfigurations/Run_intg_home_assistant___zeroconf_.xml

@@ -6,8 +6,8 @@
 use actix::{Actor, Context};
 use log::debug;
 
-use crate::client::messages::{ConnectionEvent, ConnectionState};
 use crate::client::HomeAssistantClient;
+use crate::client::messages::{ConnectionEvent, ConnectionState};
 
 impl Actor for HomeAssistantClient {
     type Context = Context<Self>;

Cargo.toml

@@ -10,8 +10,8 @@ use actix_web_actors::ws;
 use awc::ws::CloseReason;
 use log::info;
 
-use crate::client::messages::Close;
 use crate::client::HomeAssistantClient;
+use crate::client::messages::Close;
 
 impl Handler<Close> for HomeAssistantClient {
     type Result = ();

src/bin/ha_test.rs

@@ -6,8 +6,8 @@
 use crate::errors::ServiceError;
 use serde_json::{Map, Value};
 use std::collections::HashMap;
-use uc_api::intg::AvailableIntgEntity;
 use uc_api::EntityType;
+use uc_api::intg::AvailableIntgEntity;
 
 pub(crate) fn convert_button_entity(
     entity_id: String,

src/client/actor.rs

@@ -166,9 +166,9 @@ pub(crate) fn convert_climate_entity(
 mod tests {
     use crate::client::entity::climate_event_to_entity_change;
     use crate::client::model::EventData;
-    use serde_json::{json, Value};
-    use uc_api::intg::EntityChange;
+    use serde_json::{Value, json};
     use uc_api::EntityType;
+    use uc_api::intg::EntityChange;
 
     #[test]
     fn climate_event_heat() {

src/client/close_handler.rs

@@ -11,7 +11,7 @@ use log::warn;
 use serde_json::{Map, Value};
 use std::collections::HashMap;
 use uc_api::intg::AvailableIntgEntity;
-use uc_api::{intg::EntityChange, EntityType, LightFeature};
+use uc_api::{EntityType, LightFeature, intg::EntityChange};
 
 pub(crate) fn map_light_attributes(
     entity_id: &str,