Allow to use HA Scripts as Button Entity

src/client/event.rs

@@ -42,8 +42,8 @@ impl HomeAssistantClient {
         let entity_change = match entity_type {
             "light" => light_event_to_entity_change(event.data),
             "switch" | "input_boolean" => switch_event_to_entity_change(event.data),
-            "button" | "input_button" => {
-                // the button entity is stateless and the remote doesn't need to be notified when the button was pressed externally
+            "button" | "input_button" | "script" => {
+                // the button & script entity is stateless and the remote doesn't need to be notified when the button was pressed externally
                 return Ok(());
             }
             "cover" => cover_event_to_entity_change(event.data),

src/client/get_states.rs

@@ -59,6 +59,7 @@ impl HomeAssistantClient {
                     "input_boolean" => "switch",
                     "binary_sensor" => "sensor",
                     "input_button" => "button",
+                    "script" => "button",
                     v => v,
                 },
             };

src/client/service/button.rs

@@ -0,0 +1,27 @@
+// Copyright (c) 2022 Unfolded Circle ApS, Markus Zehnder <markus.z@unfoldedcircle.com>
+// SPDX-License-Identifier: MPL-2.0
+
+//! Button entity specific HA service call logic.
+
+use crate::client::service::cmd_from_str;
+use crate::errors::ServiceError;
+use serde_json::Value;
+use uc_api::intg::EntityCommand;
+use uc_api::ButtonCommand;
+
+pub(crate) fn handle_button(msg: &EntityCommand) -> Result<(String, Option<Value>), ServiceError> {
+    let cmd: ButtonCommand = cmd_from_str(&msg.cmd_id)?;
+
+    let entity: Vec<&str> = msg.entity_id.split('.').collect();
+
+    let service_call: &str = match entity[0] {
+        "script" => entity[1],
+        &_ => "press",
+    };
+
+    let result = match cmd {
+        ButtonCommand::Push => (service_call.into(), None),
+    };
+
+    Ok(result)
+}

src/client/service/mod.rs

@@ -17,6 +17,7 @@ use serde_json::{Map, Value};
 use uc_api::intg::EntityCommand;
 use uc_api::EntityType;
 
+mod button;
 mod climate;
 mod cover;
 mod light;
@@ -41,7 +42,7 @@ impl Handler<CallService> for HomeAssistantClient {
 
         // map Remote Two command name & parameters to HA service name and service_data payload
         let (service, service_data) = match msg.command.entity_type {
-            EntityType::Button => Ok(("press".to_string(), None)),
+            EntityType::Button => button::handle_button(&msg.command),
             EntityType::Switch => switch::handle_switch(&msg.command),
             EntityType::Climate => climate::handle_climate(&msg.command),
             EntityType::Cover => cover::handle_cover(&msg.command),