Improved long press behaviour when there is no long press callback

This new power measurement feature is used to turn the kettle off
automatically once it is done boiling

.gitattributes

@@ -0,0 +1 @@
+*.xcf filter=lfs diff=lfs merge=lfs -text

Cargo.toml

@@ -9,46 +9,12 @@ members = [
   "automation_cast",
   "google_home/google_home",
   "google_home/google_home_macro",
+  "automation_devices",
+  "automation_lib",
 ]
 
-
+[workspace.dependencies]
-[dependencies]
+mlua = { version = "0.10.1", features = [
-automation_macro = { path = "./automation_macro" }
-automation_cast = { path = "./automation_cast/" }
-rumqttc = "0.18"
-serde = { version = "1.0.149", features = ["derive"] }
-serde_json = "1.0.89"
-google_home = { path = "./google_home/google_home/" }
-paste = "1.0.10"
-tokio = { version = "1", features = ["rt-multi-thread"] }
-dotenvy = "0.15.0"
-reqwest = { version = "0.11.13", features = [
-  "json",
-  "rustls-tls",
-], default-features = false } # Use rustls, since the other packages also use rustls
-axum = "0.6.1"
-serde_repr = "0.1.10"
-tracing = "0.1.37"
-bytes = "1.3.0"
-pollster = "0.2.5"
-regex = "1.7.0"
-async-trait = "0.1.61"
-futures = "0.3.25"
-eui48 = { version = "1.1.0", default-features = false, features = [
-  "disp_hexstring",
-  "serde",
-] }
-thiserror = "1.0.38"
-anyhow = "1.0.68"
-wakey = "0.3.0"
-console-subscriber = "0.1.8"
-tracing-subscriber = "0.3.16"
-serde_with = "3.2.0"
-enum_dispatch = "0.3.12"
-indexmap = { version = "2.0.0", features = ["serde"] }
-serde_yaml = "0.9.27"
-tokio-cron-scheduler = "0.9.4"
-mlua = { version = "0.9.7", features = [
   "lua54",
   "vendored",
   "macros",
@@ -56,11 +22,67 @@ mlua = { version = "0.9.7", features = [
   "async",
   "send",
 ] }
-once_cell = "1.19.0"
+automation_macro = { path = "./automation_macro" }
-hostname = "0.4.0"
+automation_cast = { path = "./automation_cast" }
-tokio-util = { version = "0.7.11", features = ["full"] }
+automation_lib = { path = "./automation_lib" }
-uuid = { version = "1.8.0", features = ["v4"] }
+automation_devices = { path = "./automation_devices" }
+google_home = { path = "./google_home/google_home" }
+google_home_macro = { path = "./google_home/google_home_macro" }
+tokio = { version = "1", features = ["rt-multi-thread"] }
+rumqttc = "0.24.0"
+tracing = "0.1.37"
+anyhow = "1.0.68"
+async-trait = "0.1.83"
+axum = "0.7.9"
+bytes = "1.3.0"
+dotenvy = "0.15.0"
 dyn-clone = "1.0.17"
+eui48 = { version = "1.1.0", features = [
+  "disp_hexstring",
+  "serde",
+], default-features = false }
+futures = "0.3.25"
+hostname = "0.4.0"
+impls = "1.0.3"
+indexmap = { version = "2.0.0", features = ["serde"] }
+itertools = "0.13.0"
+json_value_merge = "2.0.0"
+pollster = "0.4.0"
+proc-macro2 = "1.0.81"
+quote = "1.0.36"
+reqwest = { version = "0.12.9", features = [
+  "json",
+  "rustls-tls",
+], default-features = false } # Use rustls, since the other packages also use rustls
+serde = { version = "1.0.149", features = ["derive"] }
+serde_json = "1.0.89"
+serde_repr = "0.1.10"
+syn = { version = "2.0.60", features = ["extra-traits", "full"] }
+thiserror = "2.0.5"
+tokio-cron-scheduler = "0.13.0"
+tokio-util = { version = "0.7.11", features = ["full"] }
+tracing-subscriber = "0.3.16"
+uuid = "1.8.0"
+wakey = "0.3.0"
+air_filter_types = { git = "https://git.huizinga.dev/Dreaded_X/airfilter", tag = "v0.4.4" }
+
+[dependencies]
+automation_lib = { workspace = true }
+automation_devices = { workspace = true }
+google_home = { workspace = true }
+mlua = { workspace = true }
+tokio = { workspace = true }
+hostname = { workspace = true }
+rumqttc = { workspace = true }
+axum = { workspace = true }
+tracing = { workspace = true }
+anyhow = { workspace = true }
+dotenvy = { workspace = true }
+tracing-subscriber = { workspace = true }
+serde = { workspace = true }
+thiserror = { workspace = true }
+serde_json = { workspace = true }
+reqwest = { workspace = true }
 
 [patch.crates-io]
 wakey = { git = "https://git.huizinga.dev/Dreaded_X/wakey" }

automation_devices/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "automation_devices"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+automation_lib = { workspace = true }
+automation_macro = { workspace = true }
+automation_cast = { workspace = true }
+google_home = { workspace = true }
+mlua = { workspace = true }
+async-trait = { workspace = true }
+dyn-clone = { workspace = true }
+rumqttc = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+serde_json = { workspace = true }
+impls = { workspace = true }
+serde = { workspace = true }
+reqwest = { workspace = true }           # Use rustls, since the other packages also use rustls
+anyhow = { workspace = true }
+axum = { workspace = true }
+bytes = { workspace = true }
+thiserror = { workspace = true }
+eui48 = { workspace = true }
+wakey = { workspace = true }
+air_filter_types = { workspace = true }

automation_devices/src/air_filter.rs

@@ -1,6 +1,6 @@
-use std::sync::Arc;
-
 use async_trait::async_trait;
+use automation_lib::config::InfoConfig;
+use automation_lib::device::{Device, LuaDeviceCreate};
 use automation_macro::LuaDeviceConfig;
 use google_home::device::Name;
 use google_home::errors::ErrorCode;
@@ -9,58 +9,57 @@ use google_home::traits::{
     TemperatureUnit,
 };
 use google_home::types::Type;
-use rumqttc::Publish;
+use thiserror::Error;
-use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
+use tracing::{debug, trace};
-use tracing::{debug, error, trace, warn};
-
-use super::LuaDeviceCreate;
-use crate::config::{InfoConfig, MqttDeviceConfig};
-use crate::devices::Device;
-use crate::event::OnMqtt;
-use crate::messages::{AirFilterFanState, AirFilterState, SetAirFilterFanState};
-use crate::mqtt::WrappedAsyncClient;
 
 #[derive(Debug, Clone, LuaDeviceConfig)]
 pub struct Config {
     #[device_config(flatten)]
     pub info: InfoConfig,
-    #[device_config(flatten)]
+    pub url: String,
-    pub mqtt: MqttDeviceConfig,
-    #[device_config(from_lua)]
-    pub client: WrappedAsyncClient,
 }
 
 #[derive(Debug, Clone)]
 pub struct AirFilter {
     config: Config,
-    state: Arc<RwLock<AirFilterState>>,
 }
 
+#[derive(Debug, Error)]
+pub enum Error {
+    #[error("Connection error")]
+    ReqwestError(#[from] reqwest::Error),
+}
+
+impl From<Error> for google_home::errors::ErrorCode {
+    fn from(value: Error) -> Self {
+        match value {
+            // Assume that if we encounter a ReqwestError the device is offline
+            Error::ReqwestError(_) => {
+                Self::DeviceError(google_home::errors::DeviceError::DeviceOffline)
+            }
+        }
+    }
+}
+
+// TODO: Handle error properly
 impl AirFilter {
-    async fn set_speed(&self, state: AirFilterFanState) {
+    async fn set_fan_speed(&self, speed: air_filter_types::FanSpeed) -> Result<(), Error> {
-        let message = SetAirFilterFanState::new(state);
+        let message = air_filter_types::SetFanSpeed::new(speed);
+        let url = format!("{}/state/fan", self.config.url);
+        let client = reqwest::Client::new();
+        client.put(url).json(&message).send().await?;
 
-        let topic = format!("{}/set", self.config.mqtt.topic);
+        Ok(())
-        // TODO: Handle potential errors here
-        self.config
-            .client
-            .publish(
-                &topic,
-                rumqttc::QoS::AtLeastOnce,
-                false,
-                serde_json::to_string(&message).unwrap(),
-            )
-            .await
-            .map_err(|err| warn!("Failed to update state on {topic}: {err}"))
-            .ok();
     }
 
-    async fn state(&self) -> RwLockReadGuard<AirFilterState> {
+    async fn get_fan_state(&self) -> Result<air_filter_types::FanState, Error> {
-        self.state.read().await
+        let url = format!("{}/state/fan", self.config.url);
+        Ok(reqwest::get(url).await?.json().await?)
     }
 
-    async fn state_mut(&self) -> RwLockWriteGuard<AirFilterState> {
+    async fn get_sensor_data(&self) -> Result<air_filter_types::SensorData, Error> {
-        self.state.write().await
+        let url = format!("{}/state/sensor", self.config.url);
+        Ok(reqwest::get(url).await?.json().await?)
     }
 }
 
@@ -72,19 +71,7 @@ impl LuaDeviceCreate for AirFilter {
     async fn create(config: Self::Config) -> Result<Self, Self::Error> {
         trace!(id = config.info.identifier(), "Setting up AirFilter");
 
-        config
+        Ok(Self { config })
-            .client
-            .subscribe(&config.mqtt.topic, rumqttc::QoS::AtLeastOnce)
-            .await?;
-
-        let state = AirFilterState {
-            state: AirFilterFanState::Off,
-            humidity: 0.0,
-            temperature: 0.0,
-        };
-        let state = Arc::new(RwLock::new(state));
-
-        Ok(Self { config, state })
     }
 }
 
@@ -95,30 +82,6 @@ impl Device for AirFilter {
 }
 
 #[async_trait]
-impl OnMqtt for AirFilter {
-    async fn on_mqtt(&self, message: Publish) {
-        if !rumqttc::matches(&message.topic, &self.config.mqtt.topic) {
-            return;
-        }
-
-        let state = match AirFilterState::try_from(message) {
-            Ok(state) => state,
-            Err(err) => {
-                error!(id = Device::get_id(self), "Failed to parse message: {err}");
-                return;
-            }
-        };
-
-        if state == *self.state().await {
-            return;
-        }
-
-        debug!(id = Device::get_id(self), "Updating state to {state:?}");
-
-        *self.state_mut().await = state;
-    }
-}
-
 impl google_home::Device for AirFilter {
     fn get_device_type(&self) -> Type {
         Type::AirPurifier
@@ -132,8 +95,8 @@ impl google_home::Device for AirFilter {
         Device::get_id(self)
     }
 
-    fn is_online(&self) -> bool {
+    async fn is_online(&self) -> bool {
-        true
+        self.get_sensor_data().await.is_ok()
     }
 
     fn get_room_hint(&self) -> Option<&str> {
@@ -148,16 +111,16 @@ impl google_home::Device for AirFilter {
 #[async_trait]
 impl OnOff for AirFilter {
     async fn on(&self) -> Result<bool, ErrorCode> {
-        Ok(self.state().await.state != AirFilterFanState::Off)
+        Ok(self.get_fan_state().await?.speed != air_filter_types::FanSpeed::Off)
     }
 
     async fn set_on(&self, on: bool) -> Result<(), ErrorCode> {
         debug!("Turning on air filter: {on}");
 
         if on {
-            self.set_speed(AirFilterFanState::High).await;
+            self.set_fan_speed(air_filter_types::FanSpeed::High).await?;
         } else {
-            self.set_speed(AirFilterFanState::Off).await;
+            self.set_fan_speed(air_filter_types::FanSpeed::Off).await?;
         }
 
         Ok(())
@@ -203,11 +166,12 @@ impl FanSpeed for AirFilter {
     }
 
     async fn current_fan_speed_setting(&self) -> Result<String, ErrorCode> {
-        let speed = match self.state().await.state {
+        let speed = self.get_fan_state().await?.speed;
-            AirFilterFanState::Off => "off",
+        let speed = match speed {
-            AirFilterFanState::Low => "low",
+            air_filter_types::FanSpeed::Off => "off",
-            AirFilterFanState::Medium => "medium",
+            air_filter_types::FanSpeed::Low => "low",
-            AirFilterFanState::High => "high",
+            air_filter_types::FanSpeed::Medium => "medium",
+            air_filter_types::FanSpeed::High => "high",
         };
 
         Ok(speed.into())
@@ -215,19 +179,19 @@ impl FanSpeed for AirFilter {
 
     async fn set_fan_speed(&self, fan_speed: String) -> Result<(), ErrorCode> {
         let fan_speed = fan_speed.as_str();
-        let state = if fan_speed == "off" {
+        let speed = if fan_speed == "off" {
-            AirFilterFanState::Off
+            air_filter_types::FanSpeed::Off
         } else if fan_speed == "low" {
-            AirFilterFanState::Low
+            air_filter_types::FanSpeed::Low
         } else if fan_speed == "medium" {
-            AirFilterFanState::Medium
+            air_filter_types::FanSpeed::Medium
         } else if fan_speed == "high" {
-            AirFilterFanState::High
+            air_filter_types::FanSpeed::High
         } else {
             return Err(google_home::errors::DeviceError::TransientError.into());
         };
 
-        self.set_speed(state).await;
+        self.set_fan_speed(speed).await?;
 
         Ok(())
     }
@@ -240,7 +204,7 @@ impl HumiditySetting for AirFilter {
     }
 
     async fn humidity_ambient_percent(&self) -> Result<isize, ErrorCode> {
-        Ok(self.state().await.humidity.round() as isize)
+        Ok(self.get_sensor_data().await?.humidity().round() as isize)
     }
 }
 
@@ -255,8 +219,8 @@ impl TemperatureSetting for AirFilter {
         TemperatureUnit::Celsius
     }
 
-    async fn temperature_ambient_celsius(&self) -> f32 {
+    async fn temperature_ambient_celsius(&self) -> Result<f32, ErrorCode> {
         // HACK: Round to one decimal place
-        (10.0 * self.state().await.temperature).round() / 10.0
+        Ok((10.0 * self.get_sensor_data().await?.temperature()).round() / 10.0)
     }
 }

automation_devices/src/contact_sensor.rs

@@ -2,23 +2,30 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use async_trait::async_trait;
+use automation_lib::action_callback::ActionCallback;
+use automation_lib::config::{InfoConfig, MqttDeviceConfig};
+use automation_lib::device::{Device, LuaDeviceCreate};
+use automation_lib::error::DeviceConfigError;
+use automation_lib::event::{OnMqtt, OnPresence};
+use automation_lib::messages::{ContactMessage, PresenceMessage};
+use automation_lib::mqtt::WrappedAsyncClient;
+use automation_lib::presence::DEFAULT_PRESENCE;
 use automation_macro::LuaDeviceConfig;
-use google_home::traits::OnOff;
+use google_home::device;
+use google_home::errors::{DeviceError, ErrorCode};
+use google_home::traits::OpenClose;
+use google_home::types::Type;
+use serde::Deserialize;
 use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 use tokio::task::JoinHandle;
-use tokio_util::task::LocalPoolHandle;
 use tracing::{debug, error, trace, warn};
 
-use super::{Device, LuaDeviceCreate};
+#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Copy)]
-use crate::config::MqttDeviceConfig;
+pub enum SensorType {
-use crate::device_manager::WrappedDevice;
+    Door,
-use crate::devices::DEFAULT_PRESENCE;
+    Drawer,
-use crate::error::DeviceConfigError;
+    Window,
-use crate::event::{OnMqtt, OnPresence};
+}
-use crate::messages::{ContactMessage, PresenceMessage};
-use crate::mqtt::WrappedAsyncClient;
-use crate::traits::Timeout;
-use crate::LUA;
 
 // NOTE: If we add more presence devices we might need to move this out of here
 #[derive(Debug, Clone, LuaDeviceConfig)]
@@ -29,65 +36,28 @@ pub struct PresenceDeviceConfig {
     pub timeout: Duration,
 }
 
-#[derive(Debug, Clone, LuaDeviceConfig)]
-pub struct TriggerConfig {
-    #[device_config(from_lua)]
-    pub devices: Vec<WrappedDevice>,
-    #[device_config(default, with(|t: Option<_>| t.map(Duration::from_secs)))]
-    pub timeout: Option<Duration>,
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct ActionCallback(uuid::Uuid);
-
-impl<'lua> FromLua<'lua> for ActionCallback {
-    fn from_lua(value: mlua::Value<'lua>, lua: &'lua mlua::Lua) -> mlua::Result<Self> {
-        let uuid = uuid::Uuid::new_v4();
-        lua.set_named_registry_value(&uuid.to_string(), value)?;
-
-        Ok(ActionCallback(uuid))
-    }
-}
-
-impl ActionCallback {
-    async fn call(&self, closed: bool) {
-        let pool = LocalPoolHandle::new(1);
-        let uuid = self.0;
-
-        pool.spawn_pinned(move || async move {
-            let lua = LUA.lock().await;
-            let action: mlua::Value = lua.named_registry_value(&uuid.to_string())?;
-            match action {
-                mlua::Value::Function(f) => f.call_async::<_, ()>(closed).await,
-                _ => todo!("Only functions are currently supported"),
-            }
-        })
-        .await
-        .unwrap()
-        .unwrap()
-    }
-}
-
 #[derive(Debug, Clone, LuaDeviceConfig)]
 pub struct Config {
-    pub identifier: String,
+    #[device_config(flatten)]
+    pub info: InfoConfig,
     #[device_config(flatten)]
     pub mqtt: MqttDeviceConfig,
     #[device_config(from_lua, default)]
     pub presence: Option<PresenceDeviceConfig>,
-    #[device_config(from_lua)]
+
-    pub trigger: Option<TriggerConfig>,
+    #[device_config(default(SensorType::Window))]
+    pub sensor_type: SensorType,
+
+    #[device_config(from_lua, default)]
+    pub callback: ActionCallback<ContactSensor, bool>,
     #[device_config(from_lua)]
     pub client: WrappedAsyncClient,
-    #[device_config(from_lua)]
-    pub action: ActionCallback,
 }
 
 #[derive(Debug)]
 struct State {
     overall_presence: bool,
     is_closed: bool,
-    previous: Vec<bool>,
     handle: Option<JoinHandle<()>>,
 }
 
@@ -113,27 +83,7 @@ impl LuaDeviceCreate for ContactSensor {
     type Error = DeviceConfigError;
 
     async fn create(config: Self::Config) -> Result<Self, Self::Error> {
-        trace!(id = config.identifier, "Setting up ContactSensor");
+        trace!(id = config.info.identifier(), "Setting up ContactSensor");
-
-        let mut previous = Vec::new();
-        // Make sure the devices implement the required traits
-        if let Some(trigger) = &config.trigger {
-            for device in &trigger.devices {
-                {
-                    let id = device.get_id().to_owned();
-                    if (device.cast() as Option<&dyn OnOff>).is_none() {
-                        return Err(DeviceConfigError::MissingTrait(id, "OnOff".into()));
-                    }
-
-                    if trigger.timeout.is_none()
-                        && (device.cast() as Option<&dyn Timeout>).is_none()
-                    {
-                        return Err(DeviceConfigError::MissingTrait(id, "Timeout".into()));
-                    }
-                }
-            }
-            previous.resize(trigger.devices.len(), false);
-        }
 
         config
             .client
@@ -143,7 +93,6 @@ impl LuaDeviceCreate for ContactSensor {
         let state = State {
             overall_presence: DEFAULT_PRESENCE,
             is_closed: true,
-            previous,
             handle: None,
         };
         let state = Arc::new(RwLock::new(state));
@@ -154,7 +103,61 @@ impl LuaDeviceCreate for ContactSensor {
 
 impl Device for ContactSensor {
     fn get_id(&self) -> String {
-        self.config.identifier.clone()
+        self.config.info.identifier()
+    }
+}
+
+#[async_trait]
+impl google_home::Device for ContactSensor {
+    fn get_device_type(&self) -> google_home::types::Type {
+        match self.config.sensor_type {
+            SensorType::Door => Type::Door,
+            SensorType::Drawer => Type::Drawer,
+            SensorType::Window => Type::Window,
+        }
+    }
+
+    fn get_id(&self) -> String {
+        Device::get_id(self)
+    }
+
+    fn get_device_name(&self) -> google_home::device::Name {
+        device::Name::new(&self.config.info.name)
+    }
+
+    fn get_room_hint(&self) -> Option<&str> {
+        self.config.info.room.as_deref()
+    }
+
+    fn will_report_state(&self) -> bool {
+        false
+    }
+
+    async fn is_online(&self) -> bool {
+        true
+    }
+}
+
+#[async_trait]
+impl OpenClose for ContactSensor {
+    fn discrete_only_open_close(&self) -> Option<bool> {
+        Some(true)
+    }
+
+    fn query_only_open_close(&self) -> Option<bool> {
+        Some(true)
+    }
+
+    async fn open_percent(&self) -> Result<u8, ErrorCode> {
+        if self.state().await.is_closed {
+            Ok(0)
+        } else {
+            Ok(100)
+        }
+    }
+
+    async fn set_open_percent(&self, _open_percent: u8) -> Result<(), ErrorCode> {
+        Err(DeviceError::ActionNotAvailable.into())
     }
 }
 
@@ -184,46 +187,11 @@ impl OnMqtt for ContactSensor {
             return;
         }
 
+        self.config.callback.call(self, &!is_closed).await;
+
         debug!(id = self.get_id(), "Updating state to {is_closed}");
         self.state_mut().await.is_closed = is_closed;
 
-        self.config.action.call(self.is_closed).await;
-
-        if let Some(trigger) = &self.config.trigger {
-            if !is_closed {
-                for (light, previous) in trigger
-                    .devices
-                    .iter()
-                    .zip(self.state_mut().await.previous.iter_mut())
-                {
-                    if let Some(light) = light.cast() as Option<&dyn OnOff> {
-                        *previous = light.on().await.unwrap();
-                        light.set_on(true).await.ok();
-                    }
-                }
-            } else {
-                for (light, previous) in trigger
-                    .devices
-                    .iter()
-                    .zip(self.state_mut().await.previous.iter())
-                {
-                    if !previous {
-                        // If the timeout is zero just turn the light off directly
-                        if trigger.timeout.is_none()
-                            && let Some(light) = light.cast() as Option<&dyn OnOff>
-                        {
-                            light.set_on(false).await.ok();
-                        } else if let Some(timeout) = trigger.timeout
-                            && let Some(light) = light.cast() as Option<&dyn Timeout>
-                        {
-                            light.start_timeout(timeout).await.unwrap();
-                        }
-                        // TODO: Put a warning/error on creation if either of this has to option to fail
-                    }
-                }
-            }
-        }
-
         // Check if this contact sensor works as a presence device
         // If not we are done here
         let presence = match &self.config.presence {

automation_devices/src/debug_bridge.rs

@@ -1,16 +1,14 @@
 use std::convert::Infallible;
 
 use async_trait::async_trait;
+use automation_lib::config::MqttDeviceConfig;
+use automation_lib::device::{Device, LuaDeviceCreate};
+use automation_lib::event::{OnDarkness, OnPresence};
+use automation_lib::messages::{DarknessMessage, PresenceMessage};
+use automation_lib::mqtt::WrappedAsyncClient;
 use automation_macro::LuaDeviceConfig;
 use tracing::{trace, warn};
 
-use super::LuaDeviceCreate;
-use crate::config::MqttDeviceConfig;
-use crate::devices::Device;
-use crate::event::{OnDarkness, OnPresence};
-use crate::messages::{DarknessMessage, PresenceMessage};
-use crate::mqtt::WrappedAsyncClient;
-
 #[derive(Debug, LuaDeviceConfig, Clone)]
 pub struct Config {
     pub identifier: String,

automation_devices/src/hue_bridge.rs

@@ -2,14 +2,12 @@ use std::convert::Infallible;
 use std::net::SocketAddr;
 
 use async_trait::async_trait;
+use automation_lib::device::{Device, LuaDeviceCreate};
+use automation_lib::event::{OnDarkness, OnPresence};
 use automation_macro::LuaDeviceConfig;
 use serde::{Deserialize, Serialize};
 use tracing::{error, trace, warn};
 
-use super::LuaDeviceCreate;
-use crate::devices::Device;
-use crate::event::{OnDarkness, OnPresence};
-
 #[derive(Debug)]
 pub enum Flag {
     Presence,

automation_devices/src/hue_group.rs

@@ -0,0 +1,162 @@
+use std::net::SocketAddr;
+
+use anyhow::Result;
+use async_trait::async_trait;
+use automation_macro::LuaDeviceConfig;
+use google_home::errors::ErrorCode;
+use google_home::traits::OnOff;
+use tracing::{error, trace, warn};
+
+use super::{Device, LuaDeviceCreate};
+
+#[derive(Debug, Clone, LuaDeviceConfig)]
+pub struct Config {
+    pub identifier: String,
+    #[device_config(rename("ip"), with(|ip| SocketAddr::new(ip, 80)))]
+    pub addr: SocketAddr,
+    pub login: String,
+    pub group_id: isize,
+    pub scene_id: String,
+}
+
+#[derive(Debug, Clone)]
+pub struct HueGroup {
+    config: Config,
+}
+
+// Couple of helper function to get the correct urls
+#[async_trait]
+impl LuaDeviceCreate for HueGroup {
+    type Config = Config;
+    type Error = rumqttc::ClientError;
+
+    async fn create(config: Self::Config) -> Result<Self, Self::Error> {
+        trace!(id = config.identifier, "Setting up AudioSetup");
+
+        Ok(Self { config })
+    }
+}
+
+impl HueGroup {
+    fn url_base(&self) -> String {
+        format!("http://{}/api/{}", self.config.addr, self.config.login)
+    }
+
+    fn url_set_action(&self) -> String {
+        format!("{}/groups/{}/action", self.url_base(), self.config.group_id)
+    }
+
+    fn url_get_state(&self) -> String {
+        format!("{}/groups/{}", self.url_base(), self.config.group_id)
+    }
+}
+
+impl Device for HueGroup {
+    fn get_id(&self) -> String {
+        self.config.identifier.clone()
+    }
+}
+
+#[async_trait]
+impl OnOff for HueGroup {
+    async fn set_on(&self, on: bool) -> Result<(), ErrorCode> {
+        let message = if on {
+            message::Action::scene(self.config.scene_id.clone())
+        } else {
+            message::Action::on(false)
+        };
+
+        let res = reqwest::Client::new()
+            .put(self.url_set_action())
+            .json(&message)
+            .send()
+            .await;
+
+        match res {
+            Ok(res) => {
+                let status = res.status();
+                if !status.is_success() {
+                    warn!(id = self.get_id(), "Status code is not success: {status}");
+                }
+            }
+            Err(err) => error!(id = self.get_id(), "Error: {err}"),
+        }
+
+        Ok(())
+    }
+
+    async fn on(&self) -> Result<bool, ErrorCode> {
+        let res = reqwest::Client::new()
+            .get(self.url_get_state())
+            .send()
+            .await;
+
+        match res {
+            Ok(res) => {
+                let status = res.status();
+                if !status.is_success() {
+                    warn!(id = self.get_id(), "Status code is not success: {status}");
+                }
+
+                let on = match res.json::<message::Info>().await {
+                    Ok(info) => info.any_on(),
+                    Err(err) => {
+                        error!(id = self.get_id(), "Failed to parse message: {err}");
+                        // TODO: Error code
+                        return Ok(false);
+                    }
+                };
+
+                return Ok(on);
+            }
+            Err(err) => error!(id = self.get_id(), "Error: {err}"),
+        }
+
+        Ok(false)
+    }
+}
+
+mod message {
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Debug, Serialize, Deserialize)]
+    pub struct Action {
+        #[serde(skip_serializing_if = "Option::is_none")]
+        on: Option<bool>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        scene: Option<String>,
+    }
+
+    impl Action {
+        pub fn on(on: bool) -> Self {
+            Self {
+                on: Some(on),
+                scene: None,
+            }
+        }
+
+        pub fn scene(scene: String) -> Self {
+            Self {
+                on: None,
+                scene: Some(scene),
+            }
+        }
+    }
+
+    #[derive(Debug, Serialize, Deserialize)]
+    struct State {
+        all_on: bool,
+        any_on: bool,
+    }
+
+    #[derive(Debug, Serialize, Deserialize)]
+    pub struct Info {
+        state: State,
+    }
+
+    impl Info {
+        pub fn any_on(&self) -> bool {
+            self.state.any_on
+        }
+    }
+}

automation_devices/src/hue_switch.rs

@@ -0,0 +1,116 @@
+use async_trait::async_trait;
+use automation_lib::action_callback::ActionCallback;
+use automation_lib::config::{InfoConfig, MqttDeviceConfig};
+use automation_lib::device::{Device, LuaDeviceCreate};
+use automation_lib::event::OnMqtt;
+use automation_lib::mqtt::WrappedAsyncClient;
+use automation_macro::LuaDeviceConfig;
+use rumqttc::{matches, Publish};
+use serde::Deserialize;
+use tracing::{debug, trace, warn};
+
+#[derive(Debug, Clone, LuaDeviceConfig)]
+pub struct Config {
+    #[device_config(flatten)]
+    pub info: InfoConfig,
+
+    #[device_config(flatten)]
+    pub mqtt: MqttDeviceConfig,
+
+    #[device_config(from_lua)]
+    pub client: WrappedAsyncClient,
+
+    #[device_config(from_lua, default)]
+    pub left_callback: ActionCallback<HueSwitch, ()>,
+
+    #[device_config(from_lua, default)]
+    pub right_callback: ActionCallback<HueSwitch, ()>,
+
+    #[device_config(from_lua, default)]
+    pub left_hold_callback: ActionCallback<HueSwitch, ()>,
+
+    #[device_config(from_lua, default)]
+    pub right_hold_callback: ActionCallback<HueSwitch, ()>,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+#[serde(rename_all = "snake_case")]
+enum Action {
+    LeftPress,
+    LeftPressRelease,
+    LeftHold,
+    LeftHoldRelease,
+    RightPress,
+    RightPressRelease,
+    RightHold,
+    RightHoldRelease,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+struct State {
+    action: Action,
+}
+
+#[derive(Debug, Clone)]
+pub struct HueSwitch {
+    config: Config,
+}
+
+impl Device for HueSwitch {
+    fn get_id(&self) -> String {
+        self.config.info.identifier()
+    }
+}
+
+#[async_trait]
+impl LuaDeviceCreate for HueSwitch {
+    type Config = Config;
+    type Error = rumqttc::ClientError;
+
+    async fn create(config: Self::Config) -> Result<Self, Self::Error> {
+        trace!(id = config.info.identifier(), "Setting up HueSwitch");
+
+        config
+            .client
+            .subscribe(&config.mqtt.topic, rumqttc::QoS::AtLeastOnce)
+            .await?;
+
+        Ok(Self { config })
+    }
+}
+
+#[async_trait]
+impl OnMqtt for HueSwitch {
+    async fn on_mqtt(&self, message: Publish) {
+        // Check if the message is from the device itself or from a remote
+        if matches(&message.topic, &self.config.mqtt.topic) {
+            let action = match serde_json::from_slice::<State>(&message.payload) {
+                Ok(message) => message.action,
+                Err(err) => {
+                    warn!(id = Device::get_id(self), "Failed to parse message: {err}");
+                    return;
+                }
+            };
+            debug!(id = Device::get_id(self), "Remote action = {:?}", action);
+
+            match action {
+                Action::LeftPressRelease => self.config.left_callback.call(self, &()).await,
+                Action::RightPressRelease => self.config.right_callback.call(self, &()).await,
+                Action::LeftHold => self.config.left_hold_callback.call(self, &()).await,
+                Action::RightHold => self.config.right_hold_callback.call(self, &()).await,
+                // If there is no hold action, the switch will act like a normal release
+                Action::RightHoldRelease => {
+                    if !self.config.right_hold_callback.is_set() {
+                        self.config.right_callback.call(self, &()).await
+                    }
+                }
+                Action::LeftHoldRelease => {
+                    if !self.config.left_hold_callback.is_set() {
+                        self.config.left_callback.call(self, &()).await
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+}

automation_devices/src/ikea_remote.rs

@@ -0,0 +1,91 @@
+use automation_lib::action_callback::ActionCallback;
+use automation_lib::config::{InfoConfig, MqttDeviceConfig};
+use automation_lib::device::{Device, LuaDeviceCreate};
+use automation_lib::event::OnMqtt;
+use automation_lib::messages::{RemoteAction, RemoteMessage};
+use automation_lib::mqtt::WrappedAsyncClient;
+use automation_macro::LuaDeviceConfig;
+use axum::async_trait;
+use rumqttc::{matches, Publish};
+use tracing::{debug, error, trace};
+
+#[derive(Debug, Clone, LuaDeviceConfig)]
+pub struct Config {
+    #[device_config(flatten)]
+    pub info: InfoConfig,
+
+    #[device_config(default)]
+    pub single_button: bool,
+
+    #[device_config(flatten)]
+    pub mqtt: MqttDeviceConfig,
+
+    #[device_config(from_lua)]
+    pub client: WrappedAsyncClient,
+
+    #[device_config(from_lua)]
+    pub callback: ActionCallback<IkeaRemote, bool>,
+}
+
+#[derive(Debug, Clone)]
+pub struct IkeaRemote {
+    config: Config,
+}
+
+impl Device for IkeaRemote {
+    fn get_id(&self) -> String {
+        self.config.info.identifier()
+    }
+}
+
+#[async_trait]
+impl LuaDeviceCreate for IkeaRemote {
+    type Config = Config;
+    type Error = rumqttc::ClientError;
+
+    async fn create(config: Self::Config) -> Result<Self, Self::Error> {
+        trace!(id = config.info.identifier(), "Setting up IkeaRemote");
+
+        config
+            .client
+            .subscribe(&config.mqtt.topic, rumqttc::QoS::AtLeastOnce)
+            .await?;
+
+        Ok(Self { config })
+    }
+}
+
+#[async_trait]
+impl OnMqtt for IkeaRemote {
+    async fn on_mqtt(&self, message: Publish) {
+        // Check if the message is from the deviec itself or from a remote
+        if matches(&message.topic, &self.config.mqtt.topic) {
+            let action = match RemoteMessage::try_from(message) {
+                Ok(message) => message.action(),
+                Err(err) => {
+                    error!(id = Device::get_id(self), "Failed to parse message: {err}");
+                    return;
+                }
+            };
+            debug!(id = Device::get_id(self), "Remote action = {:?}", action);
+
+            let on = if self.config.single_button {
+                match action {
+                    RemoteAction::On => Some(true),
+                    RemoteAction::BrightnessMoveUp => Some(false),
+                    _ => None,
+                }
+            } else {
+                match action {
+                    RemoteAction::On => Some(true),
+                    RemoteAction::Off => Some(false),
+                    _ => None,
+                }
+            };
+
+            if let Some(on) = on {
+                self.config.callback.call(self, &on).await;
+            }
+        }
+    }
+}

automation_devices/src/kasa_outlet.rs

@@ -3,17 +3,17 @@ use std::net::SocketAddr;
 use std::str::Utf8Error;
 
 use async_trait::async_trait;
+use automation_lib::device::{Device, LuaDeviceCreate};
+use automation_lib::event::OnPresence;
 use automation_macro::LuaDeviceConfig;
 use bytes::{Buf, BufMut};
 use google_home::errors::{self, DeviceError};
-use google_home::traits;
+use google_home::traits::OnOff;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
-use tracing::trace;
+use tracing::{debug, trace};
-
-use super::{Device, LuaDeviceCreate};
 
 #[derive(Debug, Clone, LuaDeviceConfig)]
 pub struct Config {
@@ -206,7 +206,7 @@ impl Response {
 }
 
 #[async_trait]
-impl traits::OnOff for KasaOutlet {
+impl OnOff for KasaOutlet {
     async fn on(&self) -> Result<bool, errors::ErrorCode> {
         let mut stream = TcpStream::connect(self.config.addr)
             .await
@@ -275,3 +275,13 @@ impl traits::OnOff for KasaOutlet {
             .or(Err(DeviceError::TransientError.into()))
     }
 }
+
+#[async_trait]
+impl OnPresence for KasaOutlet {
+    async fn on_presence(&self, presence: bool) {
+        if !presence {
+            debug!(id = Device::get_id(self), "Turning device off");
+            self.set_on(false).await.ok();
+        }
+    }
+}

automation_devices/src/lib.rs

@@ -0,0 +1,159 @@
+mod air_filter;
+mod contact_sensor;
+mod debug_bridge;
+mod hue_bridge;
+mod hue_group;
+mod hue_switch;
+mod ikea_remote;
+mod kasa_outlet;
+mod light_sensor;
+mod wake_on_lan;
+mod washer;
+mod zigbee;
+
+use std::ops::Deref;
+
+use automation_cast::Cast;
+use automation_lib::device::{Device, LuaDeviceCreate};
+use zigbee::light::{LightBrightness, LightOnOff};
+use zigbee::outlet::{OutletOnOff, OutletPower};
+
+pub use self::air_filter::AirFilter;
+pub use self::contact_sensor::ContactSensor;
+pub use self::debug_bridge::DebugBridge;
+pub use self::hue_bridge::HueBridge;
+pub use self::hue_group::HueGroup;
+pub use self::hue_switch::HueSwitch;
+pub use self::ikea_remote::IkeaRemote;
+pub use self::kasa_outlet::KasaOutlet;
+pub use self::light_sensor::LightSensor;
+pub use self::wake_on_lan::WakeOnLAN;
+pub use self::washer::Washer;
+
+macro_rules! register_device {
+    ($lua:expr, $device:ty) => {
+        $lua.globals()
+            .set(stringify!($device), $lua.create_proxy::<$device>()?)?;
+    };
+}
+
+macro_rules! impl_device {
+    ($device:ty) => {
+        impl mlua::UserData for $device {
+            fn add_methods<M: mlua::UserDataMethods<Self>>(methods: &mut M) {
+                methods.add_async_function("new", |_lua, config| async {
+                    let device: $device = LuaDeviceCreate::create(config)
+                        .await
+                        .map_err(mlua::ExternalError::into_lua_err)?;
+
+                    Ok(device)
+                });
+
+                methods.add_method("__box", |_lua, this, _: ()| {
+                    let b: Box<dyn Device> = Box::new(this.clone());
+                    Ok(b)
+                });
+
+                methods.add_async_method("get_id", |_lua, this, _: ()| async move { Ok(this.get_id()) });
+
+                if impls::impls!($device: google_home::traits::OnOff) {
+                    methods.add_async_method("set_on", |_lua, this, on: bool| async move {
+                        (this.deref().cast() as Option<&dyn google_home::traits::OnOff>)
+                            .expect("Cast should be valid")
+                            .set_on(on)
+                            .await
+                            .unwrap();
+
+                        Ok(())
+                    });
+
+                    methods.add_async_method("on", |_lua, this, _: ()| async move {
+                        Ok((this.deref().cast() as Option<&dyn google_home::traits::OnOff>)
+                            .expect("Cast should be valid")
+                            .on()
+                            .await
+                            .unwrap())
+                    });
+                }
+
+                if impls::impls!($device: google_home::traits::Brightness) {
+                    methods.add_async_method("set_brightness", |_lua, this, brightness: u8| async move {
+                        (this.deref().cast() as Option<&dyn google_home::traits::Brightness>)
+                            .expect("Cast should be valid")
+                            .set_brightness(brightness)
+                            .await
+                            .unwrap();
+
+                        Ok(())
+                    });
+
+                    methods.add_async_method("brightness", |_lua, this, _: ()| async move {
+                        Ok((this.deref().cast() as Option<&dyn google_home::traits::Brightness>)
+                            .expect("Cast should be valid")
+                            .brightness()
+                            .await
+                            .unwrap())
+                    });
+                }
+
+                if impls::impls!($device: google_home::traits::OpenClose) {
+					// TODO: Make discrete_only_open_close and query_only_open_close static, that way we can
+					// add only the supported functions and drop _percet if discrete is true
+					methods.add_async_method("set_open_percent", |_lua, this, open_percent: u8| async move {
+						(this.deref().cast() as Option<&dyn google_home::traits::OpenClose>)
+							.expect("Cast should be valid")
+							.set_open_percent(open_percent)
+							.await
+							.unwrap();
+
+						Ok(())
+					});
+
+                    methods.add_async_method("open_percent", |_lua, this, _: ()| async move {
+                        Ok((this.deref().cast() as Option<&dyn google_home::traits::OpenClose>)
+                            .expect("Cast should be valid")
+                            .open_percent()
+                            .await
+                            .unwrap())
+                    });
+                }
+            }
+        }
+    };
+}
+
+impl_device!(LightOnOff);
+impl_device!(LightBrightness);
+impl_device!(OutletOnOff);
+impl_device!(OutletPower);
+impl_device!(AirFilter);
+impl_device!(ContactSensor);
+impl_device!(DebugBridge);
+impl_device!(HueBridge);
+impl_device!(HueGroup);
+impl_device!(HueSwitch);
+impl_device!(IkeaRemote);
+impl_device!(KasaOutlet);
+impl_device!(LightSensor);
+impl_device!(WakeOnLAN);
+impl_device!(Washer);
+
+pub fn register_with_lua(lua: &mlua::Lua) -> mlua::Result<()> {
+    register_device!(lua, LightOnOff);
+    register_device!(lua, LightBrightness);
+    register_device!(lua, OutletOnOff);
+    register_device!(lua, OutletPower);
+    register_device!(lua, AirFilter);
+    register_device!(lua, ContactSensor);
+    register_device!(lua, DebugBridge);
+    register_device!(lua, HueBridge);
+    register_device!(lua, HueGroup);
+    register_device!(lua, HueSwitch);
+    register_device!(lua, IkeaRemote);
+    register_device!(lua, KasaOutlet);
+    register_device!(lua, LightSensor);
+    register_device!(lua, WakeOnLAN);
+    register_device!(lua, Washer);
+
+    Ok(())
+}

automation_devices/src/light_sensor.rs

@@ -1,18 +1,16 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
+use automation_lib::config::MqttDeviceConfig;
+use automation_lib::device::{Device, LuaDeviceCreate};
+use automation_lib::event::{self, Event, EventChannel, OnMqtt};
+use automation_lib::messages::BrightnessMessage;
+use automation_lib::mqtt::WrappedAsyncClient;
 use automation_macro::LuaDeviceConfig;
 use rumqttc::Publish;
 use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 use tracing::{debug, trace, warn};
 
-use super::LuaDeviceCreate;
-use crate::config::MqttDeviceConfig;
-use crate::devices::Device;
-use crate::event::{self, Event, EventChannel, OnMqtt};
-use crate::messages::BrightnessMessage;
-use crate::mqtt::WrappedAsyncClient;
-
 #[derive(Debug, Clone, LuaDeviceConfig)]
 pub struct Config {
     pub identifier: String,

automation_devices/src/wake_on_lan.rs

@@ -1,6 +1,11 @@
 use std::net::Ipv4Addr;
 
 use async_trait::async_trait;
+use automation_lib::config::{InfoConfig, MqttDeviceConfig};
+use automation_lib::device::{Device, LuaDeviceCreate};
+use automation_lib::event::OnMqtt;
+use automation_lib::messages::ActivateMessage;
+use automation_lib::mqtt::WrappedAsyncClient;
 use automation_macro::LuaDeviceConfig;
 use eui48::MacAddress;
 use google_home::device;
@@ -10,12 +15,6 @@ use google_home::types::Type;
 use rumqttc::Publish;
 use tracing::{debug, error, trace};
 
-use super::{Device, LuaDeviceCreate};
-use crate::config::{InfoConfig, MqttDeviceConfig};
-use crate::event::OnMqtt;
-use crate::messages::ActivateMessage;
-use crate::mqtt::WrappedAsyncClient;
-
 #[derive(Debug, Clone, LuaDeviceConfig)]
 pub struct Config {
     #[device_config(flatten)]
@@ -76,6 +75,7 @@ impl OnMqtt for WakeOnLAN {
     }
 }
 
+#[async_trait]
 impl google_home::Device for WakeOnLAN {
     fn get_device_type(&self) -> Type {
         Type::Scene
@@ -92,7 +92,7 @@ impl google_home::Device for WakeOnLAN {
         Device::get_id(self)
     }
 
-    fn is_online(&self) -> bool {
+    async fn is_online(&self) -> bool {
         true
     }
 

automation_devices/src/washer.rs

@@ -1,18 +1,17 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
+use automation_lib::config::MqttDeviceConfig;
+use automation_lib::device::{Device, LuaDeviceCreate};
+use automation_lib::event::{self, Event, EventChannel, OnMqtt};
+use automation_lib::messages::PowerMessage;
+use automation_lib::mqtt::WrappedAsyncClient;
+use automation_lib::ntfy::{Notification, Priority};
 use automation_macro::LuaDeviceConfig;
 use rumqttc::Publish;
 use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 use tracing::{debug, error, trace, warn};
 
-use super::ntfy::Priority;
-use super::{Device, LuaDeviceCreate, Notification};
-use crate::config::MqttDeviceConfig;
-use crate::event::{self, Event, EventChannel, OnMqtt};
-use crate::messages::PowerMessage;
-use crate::mqtt::WrappedAsyncClient;
-
 #[derive(Debug, Clone, LuaDeviceConfig)]
 pub struct Config {
     pub identifier: String,

automation_devices/src/zigbee/light.rs

@@ -0,0 +1,299 @@
+use std::fmt::Debug;
+use std::ops::Deref;
+use std::sync::Arc;
+
+use anyhow::Result;
+use async_trait::async_trait;
+use automation_lib::action_callback::ActionCallback;
+use automation_lib::config::{InfoConfig, MqttDeviceConfig};
+use automation_lib::device::{Device, LuaDeviceCreate};
+use automation_lib::event::{OnMqtt, OnPresence};
+use automation_lib::helpers::serialization::state_deserializer;
+use automation_lib::mqtt::WrappedAsyncClient;
+use automation_macro::LuaDeviceConfig;
+use google_home::device;
+use google_home::errors::ErrorCode;
+use google_home::traits::{Brightness, OnOff};
+use google_home::types::Type;
+use rumqttc::{matches, Publish};
+use serde::{Deserialize, Serialize};
+use serde_json::json;
+use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
+use tracing::{debug, trace, warn};
+
+pub trait LightState:
+    Debug + Clone + Default + Sync + Send + Serialize + Into<StateOnOff> + 'static
+{
+}
+
+#[derive(Debug, Clone, LuaDeviceConfig)]
+pub struct Config<T: LightState> {
+    #[device_config(flatten)]
+    pub info: InfoConfig,
+    #[device_config(flatten)]
+    pub mqtt: MqttDeviceConfig,
+
+    #[device_config(from_lua, default)]
+    pub callback: ActionCallback<Light<T>, T>,
+
+    #[device_config(from_lua)]
+    pub client: WrappedAsyncClient,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+pub struct StateOnOff {
+    #[serde(deserialize_with = "state_deserializer")]
+    state: bool,
+}
+
+impl LightState for StateOnOff {}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+pub struct StateBrightness {
+    #[serde(deserialize_with = "state_deserializer")]
+    state: bool,
+    brightness: f64,
+}
+
+impl LightState for StateBrightness {}
+
+impl From<StateBrightness> for StateOnOff {
+    fn from(state: StateBrightness) -> Self {
+        StateOnOff { state: state.state }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct Light<T: LightState> {
+    config: Config<T>,
+
+    state: Arc<RwLock<T>>,
+}
+
+pub type LightOnOff = Light<StateOnOff>;
+pub type LightBrightness = Light<StateBrightness>;
+
+impl<T: LightState> Light<T> {
+    async fn state(&self) -> RwLockReadGuard<T> {
+        self.state.read().await
+    }
+
+    async fn state_mut(&self) -> RwLockWriteGuard<T> {
+        self.state.write().await
+    }
+}
+
+#[async_trait]
+impl<T: LightState> LuaDeviceCreate for Light<T> {
+    type Config = Config<T>;
+    type Error = rumqttc::ClientError;
+
+    async fn create(config: Self::Config) -> Result<Self, Self::Error> {
+        trace!(id = config.info.identifier(), "Setting up IkeaOutlet");
+
+        config
+            .client
+            .subscribe(&config.mqtt.topic, rumqttc::QoS::AtLeastOnce)
+            .await?;
+
+        Ok(Self {
+            config,
+            state: Default::default(),
+        })
+    }
+}
+
+impl<T: LightState> Device for Light<T> {
+    fn get_id(&self) -> String {
+        self.config.info.identifier()
+    }
+}
+
+#[async_trait]
+impl OnMqtt for Light<StateOnOff> {
+    async fn on_mqtt(&self, message: Publish) {
+        // Check if the message is from the device itself or from a remote
+        if matches(&message.topic, &self.config.mqtt.topic) {
+            let state = match serde_json::from_slice::<StateOnOff>(&message.payload) {
+                Ok(state) => state,
+                Err(err) => {
+                    warn!(id = Device::get_id(self), "Failed to parse message: {err}");
+                    return;
+                }
+            };
+
+            // No need to do anything if the state has not changed
+            if state.state == self.state().await.state {
+                return;
+            }
+
+            self.state_mut().await.state = state.state;
+            debug!(
+                id = Device::get_id(self),
+                "Updating state to {:?}",
+                self.state().await
+            );
+
+            self.config
+                .callback
+                .call(self, self.state().await.deref())
+                .await;
+        }
+    }
+}
+
+#[async_trait]
+impl OnMqtt for Light<StateBrightness> {
+    async fn on_mqtt(&self, message: Publish) {
+        // Check if the message is from the deviec itself or from a remote
+        if matches(&message.topic, &self.config.mqtt.topic) {
+            let state = match serde_json::from_slice::<StateBrightness>(&message.payload) {
+                Ok(state) => state,
+                Err(err) => {
+                    warn!(id = Device::get_id(self), "Failed to parse message: {err}");
+                    return;
+                }
+            };
+
+            {
+                let current_state = self.state().await;
+                // No need to do anything if the state has not changed
+                if state.state == current_state.state
+                    && state.brightness == current_state.brightness
+                {
+                    return;
+                }
+            }
+
+            self.state_mut().await.state = state.state;
+            self.state_mut().await.brightness = state.brightness;
+            debug!(
+                id = Device::get_id(self),
+                "Updating state to {:?}",
+                self.state().await
+            );
+
+            self.config
+                .callback
+                .call(self, self.state().await.deref())
+                .await;
+        }
+    }
+}
+
+#[async_trait]
+impl<T: LightState> OnPresence for Light<T> {
+    async fn on_presence(&self, presence: bool) {
+        if !presence {
+            debug!(id = Device::get_id(self), "Turning device off");
+            self.set_on(false).await.ok();
+        }
+    }
+}
+
+#[async_trait]
+impl<T: LightState> google_home::Device for Light<T> {
+    fn get_device_type(&self) -> Type {
+        Type::Light
+    }
+
+    fn get_device_name(&self) -> device::Name {
+        device::Name::new(&self.config.info.name)
+    }
+
+    fn get_id(&self) -> String {
+        Device::get_id(self)
+    }
+
+    async fn is_online(&self) -> bool {
+        true
+    }
+
+    fn get_room_hint(&self) -> Option<&str> {
+        self.config.info.room.as_deref()
+    }
+
+    fn will_report_state(&self) -> bool {
+        // TODO: Implement state reporting
+        false
+    }
+}
+
+#[async_trait]
+impl<T> OnOff for Light<T>
+where
+    T: LightState,
+{
+    async fn on(&self) -> Result<bool, ErrorCode> {
+        let state = self.state().await;
+        let state: StateOnOff = state.deref().clone().into();
+        Ok(state.state)
+    }
+
+    async fn set_on(&self, on: bool) -> Result<(), ErrorCode> {
+        let message = json!({
+            "state": if on { "ON" } else { "OFF"}
+        });
+
+        debug!(id = Device::get_id(self), "{message}");
+
+        let topic = format!("{}/set", self.config.mqtt.topic);
+        // TODO: Handle potential errors here
+        self.config
+            .client
+            .publish(
+                &topic,
+                rumqttc::QoS::AtLeastOnce,
+                false,
+                serde_json::to_string(&message).unwrap(),
+            )
+            .await
+            .map_err(|err| warn!("Failed to update state on {topic}: {err}"))
+            .ok();
+
+        Ok(())
+    }
+}
+
+const FACTOR: f64 = 30.0;
+
+#[async_trait]
+impl<T> Brightness for Light<T>
+where
+    T: LightState,
+    T: Into<StateBrightness>,
+{
+    async fn brightness(&self) -> Result<u8, ErrorCode> {
+        let state = self.state().await;
+        let state: StateBrightness = state.deref().clone().into();
+        let brightness =
+            100.0 * f64::log10(state.brightness / FACTOR + 1.0) / f64::log10(254.0 / FACTOR + 1.0);
+
+        Ok(brightness.clamp(0.0, 100.0).round() as u8)
+    }
+
+    async fn set_brightness(&self, brightness: u8) -> Result<(), ErrorCode> {
+        let brightness =
+            FACTOR * ((FACTOR / (FACTOR + 254.0)).powf(-(brightness as f64) / 100.0) - 1.0);
+
+        let message = json!({
+            "brightness": brightness.clamp(0.0, 254.0).round() as u8
+        });
+
+        let topic = format!("{}/set", self.config.mqtt.topic);
+        // TODO: Handle potential errors here
+        self.config
+            .client
+            .publish(
+                &topic,
+                rumqttc::QoS::AtLeastOnce,
+                false,
+                serde_json::to_string(&message).unwrap(),
+            )
+            .await
+            .map_err(|err| warn!("Failed to update state on {topic}: {err}"))
+            .ok();
+
+        Ok(())
+    }
+}

automation_devices/src/zigbee/mod.rs

@@ -0,0 +1,2 @@
+pub mod light;
+pub mod outlet;

automation_devices/src/zigbee/outlet.rs

@@ -0,0 +1,275 @@
+use std::fmt::Debug;
+use std::ops::Deref;
+use std::sync::Arc;
+
+use anyhow::Result;
+use async_trait::async_trait;
+use automation_lib::action_callback::ActionCallback;
+use automation_lib::config::{InfoConfig, MqttDeviceConfig};
+use automation_lib::device::{Device, LuaDeviceCreate};
+use automation_lib::event::{OnMqtt, OnPresence};
+use automation_lib::helpers::serialization::state_deserializer;
+use automation_lib::mqtt::WrappedAsyncClient;
+use automation_macro::LuaDeviceConfig;
+use google_home::device;
+use google_home::errors::ErrorCode;
+use google_home::traits::OnOff;
+use google_home::types::Type;
+use rumqttc::{matches, Publish};
+use serde::{Deserialize, Serialize};
+use serde_json::json;
+use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
+use tracing::{debug, trace, warn};
+
+pub trait OutletState:
+    Debug + Clone + Default + Sync + Send + Serialize + Into<StateOnOff> + 'static
+{
+}
+
+#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Copy)]
+pub enum OutletType {
+    Outlet,
+    Kettle,
+}
+
+impl From<OutletType> for Type {
+    fn from(outlet: OutletType) -> Self {
+        match outlet {
+            OutletType::Outlet => Type::Outlet,
+            OutletType::Kettle => Type::Kettle,
+        }
+    }
+}
+
+#[derive(Debug, Clone, LuaDeviceConfig)]
+pub struct Config<T: OutletState> {
+    #[device_config(flatten)]
+    pub info: InfoConfig,
+    #[device_config(flatten)]
+    pub mqtt: MqttDeviceConfig,
+    #[device_config(default(OutletType::Outlet))]
+    pub outlet_type: OutletType,
+
+    // TODO: One presence is reworked, this should be removed!
+    #[device_config(default(true))]
+    pub presence_auto_off: bool,
+
+    #[device_config(from_lua, default)]
+    pub callback: ActionCallback<Outlet<T>, T>,
+
+    #[device_config(from_lua)]
+    pub client: WrappedAsyncClient,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+pub struct StateOnOff {
+    #[serde(deserialize_with = "state_deserializer")]
+    state: bool,
+}
+
+impl OutletState for StateOnOff {}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+pub struct StatePower {
+    #[serde(deserialize_with = "state_deserializer")]
+    state: bool,
+    power: f64,
+}
+
+impl OutletState for StatePower {}
+
+impl From<StatePower> for StateOnOff {
+    fn from(state: StatePower) -> Self {
+        StateOnOff { state: state.state }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct Outlet<T: OutletState> {
+    config: Config<T>,
+
+    state: Arc<RwLock<T>>,
+}
+
+pub type OutletOnOff = Outlet<StateOnOff>;
+pub type OutletPower = Outlet<StatePower>;
+
+impl<T: OutletState> Outlet<T> {
+    async fn state(&self) -> RwLockReadGuard<T> {
+        self.state.read().await
+    }
+
+    async fn state_mut(&self) -> RwLockWriteGuard<T> {
+        self.state.write().await
+    }
+}
+
+#[async_trait]
+impl<T: OutletState> LuaDeviceCreate for Outlet<T> {
+    type Config = Config<T>;
+    type Error = rumqttc::ClientError;
+
+    async fn create(config: Self::Config) -> Result<Self, Self::Error> {
+        trace!(id = config.info.identifier(), "Setting up IkeaOutlet");
+
+        config
+            .client
+            .subscribe(&config.mqtt.topic, rumqttc::QoS::AtLeastOnce)
+            .await?;
+
+        Ok(Self {
+            config,
+            state: Default::default(),
+        })
+    }
+}
+
+impl<T: OutletState> Device for Outlet<T> {
+    fn get_id(&self) -> String {
+        self.config.info.identifier()
+    }
+}
+
+#[async_trait]
+impl OnMqtt for Outlet<StateOnOff> {
+    async fn on_mqtt(&self, message: Publish) {
+        // Check if the message is from the device itself or from a remote
+        if matches(&message.topic, &self.config.mqtt.topic) {
+            let state = match serde_json::from_slice::<StateOnOff>(&message.payload) {
+                Ok(state) => state,
+                Err(err) => {
+                    warn!(id = Device::get_id(self), "Failed to parse message: {err}");
+                    return;
+                }
+            };
+
+            // No need to do anything if the state has not changed
+            if state.state == self.state().await.state {
+                return;
+            }
+
+            self.state_mut().await.state = state.state;
+            debug!(
+                id = Device::get_id(self),
+                "Updating state to {:?}",
+                self.state().await
+            );
+
+            self.config
+                .callback
+                .call(self, self.state().await.deref())
+                .await;
+        }
+    }
+}
+
+#[async_trait]
+impl OnMqtt for Outlet<StatePower> {
+    async fn on_mqtt(&self, message: Publish) {
+        // Check if the message is from the deviec itself or from a remote
+        if matches(&message.topic, &self.config.mqtt.topic) {
+            let state = match serde_json::from_slice::<StatePower>(&message.payload) {
+                Ok(state) => state,
+                Err(err) => {
+                    warn!(id = Device::get_id(self), "Failed to parse message: {err}");
+                    return;
+                }
+            };
+
+            {
+                let current_state = self.state().await;
+                // No need to do anything if the state has not changed
+                if state.state == current_state.state && state.power == current_state.power {
+                    return;
+                }
+            }
+
+            self.state_mut().await.state = state.state;
+            self.state_mut().await.power = state.power;
+            debug!(
+                id = Device::get_id(self),
+                "Updating state to {:?}",
+                self.state().await
+            );
+
+            self.config
+                .callback
+                .call(self, self.state().await.deref())
+                .await;
+        }
+    }
+}
+
+#[async_trait]
+impl<T: OutletState> OnPresence for Outlet<T> {
+    async fn on_presence(&self, presence: bool) {
+        if self.config.presence_auto_off && !presence {
+            debug!(id = Device::get_id(self), "Turning device off");
+            self.set_on(false).await.ok();
+        }
+    }
+}
+
+#[async_trait]
+impl<T: OutletState> google_home::Device for Outlet<T> {
+    fn get_device_type(&self) -> Type {
+        self.config.outlet_type.into()
+    }
+
+    fn get_device_name(&self) -> device::Name {
+        device::Name::new(&self.config.info.name)
+    }
+
+    fn get_id(&self) -> String {
+        Device::get_id(self)
+    }
+
+    async fn is_online(&self) -> bool {
+        true
+    }
+
+    fn get_room_hint(&self) -> Option<&str> {
+        self.config.info.room.as_deref()
+    }
+
+    fn will_report_state(&self) -> bool {
+        // TODO: Implement state reporting
+        false
+    }
+}
+
+#[async_trait]
+impl<T> OnOff for Outlet<T>
+where
+    T: OutletState,
+{
+    async fn on(&self) -> Result<bool, ErrorCode> {
+        let state = self.state().await;
+        let state: StateOnOff = state.deref().clone().into();
+        Ok(state.state)
+    }
+
+    async fn set_on(&self, on: bool) -> Result<(), ErrorCode> {
+        let message = json!({
+            "state": if on { "ON" } else { "OFF"}
+        });
+
+        debug!(id = Device::get_id(self), "{message}");
+
+        let topic = format!("{}/set", self.config.mqtt.topic);
+        // TODO: Handle potential errors here
+        self.config
+            .client
+            .publish(
+                &topic,
+                rumqttc::QoS::AtLeastOnce,
+                false,
+                serde_json::to_string(&message).unwrap(),
+            )
+            .await
+            .map_err(|err| warn!("Failed to update state on {topic}: {err}"))
+            .ok();
+
+        Ok(())
+    }
+}

automation_lib/Cargo.toml

@@ -0,0 +1,28 @@
+[package]
+name = "automation_lib"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+automation_macro = { workspace = true }
+automation_cast = { workspace = true }
+google_home = { workspace = true }
+rumqttc = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+reqwest = { workspace = true }
+serde_repr = { workspace = true }
+tracing = { workspace = true }
+bytes = { workspace = true }
+pollster = { workspace = true }
+async-trait = { workspace = true }
+futures = { workspace = true }
+thiserror = { workspace = true }
+indexmap = { workspace = true }
+tokio-cron-scheduler = { workspace = true }
+mlua = { workspace = true }
+tokio-util = { workspace = true }
+uuid = { workspace = true }
+dyn-clone = { workspace = true }
+impls = { workspace = true }

automation_lib/src/action_callback.rs

@@ -0,0 +1,71 @@
+use std::marker::PhantomData;
+
+use mlua::{FromLua, IntoLua, LuaSerdeExt};
+use serde::Serialize;
+
+#[derive(Debug, Clone)]
+struct Internal {
+    uuid: uuid::Uuid,
+    lua: mlua::Lua,
+}
+
+#[derive(Debug, Clone)]
+pub struct ActionCallback<T, S> {
+    internal: Option<Internal>,
+    _this: PhantomData<T>,
+    _state: PhantomData<S>,
+}
+
+impl<T, S> Default for ActionCallback<T, S> {
+    fn default() -> Self {
+        Self {
+            internal: None,
+            _this: PhantomData::<T>,
+            _state: PhantomData::<S>,
+        }
+    }
+}
+
+impl<T, S> FromLua for ActionCallback<T, S> {
+    fn from_lua(value: mlua::Value, lua: &mlua::Lua) -> mlua::Result<Self> {
+        let uuid = uuid::Uuid::new_v4();
+        lua.set_named_registry_value(&uuid.to_string(), value)?;
+
+        Ok(ActionCallback {
+            internal: Some(Internal {
+                uuid,
+                lua: lua.clone(),
+            }),
+            _this: PhantomData::<T>,
+            _state: PhantomData::<S>,
+        })
+    }
+}
+
+// TODO: Return proper error here
+impl<T, S> ActionCallback<T, S>
+where
+    T: IntoLua + Sync + Send + Clone + 'static,
+    S: Serialize,
+{
+    pub async fn call(&self, this: &T, state: &S) {
+        let Some(internal) = self.internal.as_ref() else {
+            return;
+        };
+
+        let state = internal.lua.to_value(state).unwrap();
+
+        let callback: mlua::Value = internal
+            .lua
+            .named_registry_value(&internal.uuid.to_string())
+            .unwrap();
+        match callback {
+            mlua::Value::Function(f) => f.call_async::<()>((this.clone(), state)).await.unwrap(),
+            _ => todo!("Only functions are currently supported"),
+        }
+    }
+
+    pub fn is_set(&self) -> bool {
+        self.internal.is_some()
+    }
+}

automation_lib/src/device.rs

@@ -0,0 +1,99 @@
+use std::fmt::Debug;
+
+use automation_cast::Cast;
+use dyn_clone::DynClone;
+use google_home::traits::OnOff;
+use mlua::ObjectLike;
+
+use crate::event::{OnDarkness, OnMqtt, OnNotification, OnPresence};
+
+// TODO: Make this a proper macro
+macro_rules! impl_device {
+    ($device:ty) => {
+        impl mlua::UserData for $device {
+            fn add_methods<M: mlua::UserDataMethods<Self>>(methods: &mut M) {
+                methods.add_async_function("new", |_lua, config| async {
+                    let device: $device = LuaDeviceCreate::create(config)
+                        .await
+                        .map_err(mlua::ExternalError::into_lua_err)?;
+
+                    Ok(device)
+                });
+
+                methods.add_method("__box", |_lua, this, _: ()| {
+                    let b: Box<dyn Device> = Box::new(this.clone());
+                    Ok(b)
+                });
+
+                methods.add_async_method("get_id", |_lua, this, _: ()| async move { Ok(this.get_id()) });
+
+                if impls::impls!($device: google_home::traits::OnOff) {
+                    methods.add_async_method("set_on", |_lua, this, on: bool| async move {
+                        (this.deref().cast() as Option<&dyn google_home::traits::OnOff>)
+                            .expect("Cast should be valid")
+                            .set_on(on)
+                            .await
+                            .unwrap();
+
+                        Ok(())
+                    });
+
+                    methods.add_async_method("is_on", |_lua, this, _: ()| async move {
+                        Ok((this.deref().cast() as Option<&dyn google_home::traits::OnOff>)
+                            .expect("Cast should be valid")
+                            .on()
+                            .await
+                            .unwrap())
+                    });
+                }
+            }
+        }
+    };
+}
+pub(crate) use impl_device;
+
+#[async_trait::async_trait]
+pub trait LuaDeviceCreate {
+    type Config;
+    type Error;
+
+    async fn create(config: Self::Config) -> Result<Self, Self::Error>
+    where
+        Self: Sized;
+}
+
+pub trait Device:
+    Debug
+    + DynClone
+    + Sync
+    + Send
+    + Cast<dyn google_home::Device>
+    + Cast<dyn OnMqtt>
+    + Cast<dyn OnPresence>
+    + Cast<dyn OnDarkness>
+    + Cast<dyn OnNotification>
+    + Cast<dyn OnOff>
+{
+    fn get_id(&self) -> String;
+}
+
+impl mlua::FromLua for Box<dyn Device> {
+    fn from_lua(value: mlua::Value, _lua: &mlua::Lua) -> mlua::Result<Self> {
+        match value {
+            mlua::Value::UserData(ud) => {
+                let ud = if ud.is::<Box<dyn Device>>() {
+                    ud
+                } else {
+                    ud.call_method::<_>("__box", ())?
+                };
+
+                let b = ud.borrow::<Self>()?.clone();
+                Ok(b)
+            }
+            _ => Err(mlua::Error::RuntimeError("Expected user data".into())),
+        }
+    }
+}
+impl mlua::UserData for Box<dyn Device> {}
+
+dyn_clone::clone_trait_object!(Device);

automation_lib/src/device_manager.rs

@@ -1,62 +1,15 @@
 use std::collections::HashMap;
-use std::ops::Deref;
 use std::pin::Pin;
 use std::sync::Arc;
 
 use futures::future::join_all;
 use futures::Future;
-use google_home::traits::OnOff;
-use mlua::FromLua;
 use tokio::sync::{RwLock, RwLockReadGuard};
 use tokio_cron_scheduler::{Job, JobScheduler};
-use tokio_util::task::LocalPoolHandle;
 use tracing::{debug, instrument, trace};
 
-use crate::devices::Device;
+use crate::device::Device;
 use crate::event::{Event, EventChannel, OnDarkness, OnMqtt, OnNotification, OnPresence};
-use crate::LUA;
-
-#[derive(Debug, FromLua, Clone)]
-pub struct WrappedDevice(Box<dyn Device>);
-
-impl WrappedDevice {
-    pub fn new(device: impl Device + 'static) -> Self {
-        Self(Box::new(device))
-    }
-}
-
-impl Deref for WrappedDevice {
-    type Target = Box<dyn Device>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl mlua::UserData for WrappedDevice {
-    fn add_methods<'lua, M: mlua::prelude::LuaUserDataMethods<'lua, Self>>(methods: &mut M) {
-        methods.add_async_method("get_id", |_lua, this, _: ()| async { Ok(this.get_id()) });
-
-        methods.add_async_method("set_on", |_lua, this, on: bool| async move {
-            if let Some(device) = this.cast() as Option<&dyn OnOff> {
-                device.set_on(on).await.unwrap()
-            };
-
-            Ok(())
-        });
-
-        methods.add_async_method("is_on", |_lua, this, _: ()| async move {
-            let device = this.0.read().await;
-            let device = device.as_ref();
-
-            if let Some(device) = device.cast() as Option<&dyn OnOff> {
-                return Ok(device.on().await.unwrap());
-            };
-
-            Ok(false)
-        });
-    }
-}
 
 pub type DeviceMap = HashMap<String, Box<dyn Device>>;
 
@@ -187,27 +140,10 @@ impl DeviceManager {
     }
 }
 
-fn run_schedule(
-    uuid: uuid::Uuid,
-    _: tokio_cron_scheduler::JobScheduler,
-) -> Pin<Box<dyn Future<Output = ()> + Send>> {
-    Box::pin(async move {
-        // Lua is not Send, so we need to make sure that the task stays on the same thread
-        let pool = LocalPoolHandle::new(1);
-        pool.spawn_pinned(move || async move {
-            let lua = LUA.lock().await;
-            let f: mlua::Function = lua.named_registry_value(uuid.to_string().as_str()).unwrap();
-            f.call_async::<_, ()>(()).await.unwrap();
-        })
-        .await
-        .unwrap();
-    })
-}
-
 impl mlua::UserData for DeviceManager {
-    fn add_methods<'lua, M: mlua::UserDataMethods<'lua, Self>>(methods: &mut M) {
+    fn add_methods<M: mlua::UserDataMethods<Self>>(methods: &mut M) {
-        methods.add_async_method("add", |_lua, this, device: WrappedDevice| async move {
+        methods.add_async_method("add", |_lua, this, device: Box<dyn Device>| async move {
-            this.add(device.0).await;
+            this.add(device).await;
 
             Ok(())
         });
@@ -216,23 +152,38 @@ impl mlua::UserData for DeviceManager {
             "schedule",
             |lua, this, (schedule, f): (String, mlua::Function)| async move {
                 debug!("schedule = {schedule}");
-                let job = Job::new_async(schedule.as_str(), run_schedule).unwrap();
+                // This creates a function, that returns the actual job we want to run
+                let create_job = {
+                    let lua = lua.clone();
+
+                    move |uuid: uuid::Uuid,
+                          _: tokio_cron_scheduler::JobScheduler|
+                          -> Pin<Box<dyn Future<Output = ()> + Send>> {
+                        let lua = lua.clone();
+
+                        // Create the actual function we want to run on a schedule
+                        let future = async move {
+                            let f: mlua::Function =
+                                lua.named_registry_value(uuid.to_string().as_str()).unwrap();
+                            f.call_async::<()>(()).await.unwrap();
+                        };
+
+                        Box::pin(future)
+                    }
+                };
+
+                let job = Job::new_async(schedule.as_str(), create_job).unwrap();
 
                 let uuid = this.scheduler.add(job).await.unwrap();
 
                 // Store the function in the registry
-                lua.set_named_registry_value(&uuid.to_string(), f).unwrap();
+                lua.set_named_registry_value(uuid.to_string().as_str(), f)
+                    .unwrap();
 
                 Ok(())
             },
         );
 
-        // methods.add_async_method("add_schedule", |lua, this, schedule| async {
-        //     let schedule = lua.from_value(schedule)?;
-        //     this.add_schedule(schedule).await;
-        //     Ok(())
-        // });
-
         methods.add_method("event_channel", |_lua, this, ()| Ok(this.event_channel()))
     }
 }

automation_lib/src/error.rs

@@ -1,10 +1,7 @@
 use std::{error, fmt, result};
 
-use axum::http::status::InvalidStatusCode;
-use axum::response::IntoResponse;
 use bytes::Bytes;
 use rumqttc::ClientError;
-use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 #[derive(Debug, Clone)]
@@ -101,68 +98,3 @@ pub enum LightSensorError {
     #[error(transparent)]
     SubscribeError(#[from] ClientError),
 }
-
-#[derive(Debug, Error)]
-#[error("{source}")]
-pub struct ApiError {
-    status_code: axum::http::StatusCode,
-    source: Box<dyn std::error::Error>,
-}
-
-impl ApiError {
-    pub fn new(status_code: axum::http::StatusCode, source: Box<dyn std::error::Error>) -> Self {
-        Self {
-            status_code,
-            source,
-        }
-    }
-}
-
-impl From<ApiError> for ApiErrorJson {
-    fn from(value: ApiError) -> Self {
-        let error = ApiErrorJsonError {
-            code: value.status_code.as_u16(),
-            status: value.status_code.to_string(),
-            reason: value.source.to_string(),
-        };
-
-        Self { error }
-    }
-}
-
-impl IntoResponse for ApiError {
-    fn into_response(self) -> axum::response::Response {
-        (
-            self.status_code,
-            serde_json::to_string::<ApiErrorJson>(&self.into())
-                .expect("Serialization should not fail"),
-        )
-            .into_response()
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct ApiErrorJsonError {
-    code: u16,
-    status: String,
-    reason: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ApiErrorJson {
-    error: ApiErrorJsonError,
-}
-
-impl TryFrom<ApiErrorJson> for ApiError {
-    type Error = InvalidStatusCode;
-
-    fn try_from(value: ApiErrorJson) -> result::Result<Self, Self::Error> {
-        let status_code = axum::http::StatusCode::from_u16(value.error.code)?;
-        let source = value.error.reason.into();
-
-        Ok(Self {
-            status_code,
-            source,
-        })
-    }
-}

automation_lib/src/event.rs

@@ -3,7 +3,7 @@ use mlua::FromLua;
 use rumqttc::Publish;
 use tokio::sync::mpsc;
 
-use crate::devices::Notification;
+use crate::ntfy::Notification;
 
 #[derive(Debug, Clone)]
 pub enum Event {

automation_lib/src/helpers/mod.rs

@@ -0,0 +1,11 @@
+pub mod serialization;
+mod timeout;
+
+pub use timeout::Timeout;
+
+pub fn register_with_lua(lua: &mlua::Lua) -> mlua::Result<()> {
+    lua.globals()
+        .set("Timeout", lua.create_proxy::<Timeout>()?)?;
+
+    Ok(())
+}

automation_lib/src/helpers/serialization.rs

@@ -0,0 +1,16 @@
+use serde::de::{self, Unexpected};
+use serde::{Deserialize, Deserializer};
+
+pub fn state_deserializer<'de, D>(deserializer: D) -> Result<bool, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    match String::deserialize(deserializer)?.as_ref() {
+        "ON" => Ok(true),
+        "OFF" => Ok(false),
+        other => Err(de::Error::invalid_value(
+            Unexpected::Str(other),
+            &"Value expected was either ON or OFF",
+        )),
+    }
+}

automation_lib/src/helpers/timeout.rs

@@ -0,0 +1,76 @@
+use std::sync::Arc;
+use std::time::Duration;
+
+use tokio::sync::RwLock;
+use tokio::task::JoinHandle;
+use tracing::debug;
+
+use crate::action_callback::ActionCallback;
+
+#[derive(Debug, Default)]
+pub struct State {
+    handle: Option<JoinHandle<()>>,
+}
+
+#[derive(Debug, Clone)]
+pub struct Timeout {
+    state: Arc<RwLock<State>>,
+}
+
+impl mlua::UserData for Timeout {
+    fn add_methods<M: mlua::UserDataMethods<Self>>(methods: &mut M) {
+        methods.add_function("new", |_lua, ()| {
+            let device = Self {
+                state: Default::default(),
+            };
+
+            Ok(device)
+        });
+
+        methods.add_async_method(
+            "start",
+            |_lua, this, (timeout, callback): (u64, ActionCallback<mlua::Value, bool>)| async move {
+                if let Some(handle) = this.state.write().await.handle.take() {
+                    handle.abort();
+                }
+
+                debug!("Running timeout callback after {timeout}s");
+
+                let timeout = Duration::from_secs(timeout);
+
+                this.state.write().await.handle = Some(tokio::spawn({
+                    async move {
+                        tokio::time::sleep(timeout).await;
+
+                        callback.call(&mlua::Nil, &false).await;
+                    }
+                }));
+
+                Ok(())
+            },
+        );
+
+        methods.add_async_method("cancel", |_lua, this, ()| async move {
+            debug!("Canceling timeout callback");
+
+            if let Some(handle) = this.state.write().await.handle.take() {
+                handle.abort();
+            }
+
+            Ok(())
+        });
+
+        methods.add_async_method("is_waiting", |_lua, this, ()| async move {
+            debug!("Canceling timeout callback");
+
+            if let Some(handle) = this.state.read().await.handle.as_ref() {
+                debug!("Join handle: {}", handle.is_finished());
+                return Ok(!handle.is_finished());
+            }
+
+            debug!("Join handle: None");
+
+            Ok(false)
+        });
+    }
+}

automation_lib/src/lib.rs

@@ -0,0 +1,16 @@
+#![allow(incomplete_features)]
+#![feature(specialization)]
+#![feature(let_chains)]
+
+pub mod action_callback;
+pub mod config;
+pub mod device;
+pub mod device_manager;
+pub mod error;
+pub mod event;
+pub mod helpers;
+pub mod messages;
+pub mod mqtt;
+pub mod ntfy;
+pub mod presence;
+pub mod schedule;

automation_lib/src/messages.rs

@@ -241,40 +241,3 @@ impl TryFrom<Bytes> for HueMessage {
         serde_json::from_slice(&bytes).or(Err(ParseError::InvalidPayload(bytes.clone())))
     }
 }
-
-// TODO: Import this from the air_filter code itself instead of copying
-#[derive(PartialEq, Eq, Debug, Clone, Copy, Deserialize, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum AirFilterFanState {
-    Off,
-    Low,
-    Medium,
-    High,
-}
-
-#[derive(Debug, Clone, Copy, Deserialize, Serialize)]
-pub struct SetAirFilterFanState {
-    state: AirFilterFanState,
-}
-
-#[derive(PartialEq, Debug, Clone, Copy, Deserialize, Serialize)]
-pub struct AirFilterState {
-    pub state: AirFilterFanState,
-    pub humidity: f32,
-    pub temperature: f32,
-}
-
-impl SetAirFilterFanState {
-    pub fn new(state: AirFilterFanState) -> Self {
-        Self { state }
-    }
-}
-
-impl TryFrom<Publish> for AirFilterState {
-    type Error = ParseError;
-
-    fn try_from(message: Publish) -> Result<Self, Self::Error> {
-        serde_json::from_slice(&message.payload)
-            .or(Err(ParseError::InvalidPayload(message.payload.clone())))
-    }
-}

automation_lib/src/ntfy.rs

@@ -1,14 +1,15 @@
 use std::collections::HashMap;
 use std::convert::Infallible;
+use std::ops::Deref;
 
 use async_trait::async_trait;
+use automation_cast::Cast;
 use automation_macro::LuaDeviceConfig;
 use serde::Serialize;
 use serde_repr::*;
 use tracing::{error, trace, warn};
 
-use super::LuaDeviceCreate;
+use crate::device::{impl_device, Device, LuaDeviceCreate};
-use crate::devices::Device;
 use crate::event::{self, Event, EventChannel, OnNotification, OnPresence};
 
 #[derive(Debug, Serialize_repr, Clone, Copy)]
@@ -125,6 +126,8 @@ pub struct Ntfy {
     config: Config,
 }
 
+impl_device!(Ntfy);
+
 #[async_trait]
 impl LuaDeviceCreate for Ntfy {
     type Config = Config;

automation_lib/src/presence.rs

@@ -1,15 +1,16 @@
 use std::collections::HashMap;
+use std::ops::Deref;
 use std::sync::Arc;
 
 use async_trait::async_trait;
+use automation_cast::Cast;
 use automation_macro::LuaDeviceConfig;
 use rumqttc::Publish;
 use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 use tracing::{debug, trace, warn};
 
-use super::LuaDeviceCreate;
 use crate::config::MqttDeviceConfig;
-use crate::devices::Device;
+use crate::device::{impl_device, Device, LuaDeviceCreate};
 use crate::event::{self, Event, EventChannel, OnMqtt};
 use crate::messages::PresenceMessage;
 use crate::mqtt::WrappedAsyncClient;
@@ -48,6 +49,8 @@ impl Presence {
     }
 }
 
+impl_device!(Presence);
+
 #[async_trait]
 impl LuaDeviceCreate for Presence {
     type Config = Config;

automation_macro/Cargo.toml

@@ -7,14 +7,7 @@ edition = "2021"
 proc-macro = true
 
 [dependencies]
-automation_cast = { path = "../automation_cast" }
+itertools = { workspace = true }
-async-trait = "0.1.80"
+proc-macro2 = { workspace = true }
-itertools = "0.12.1"
+quote = { workspace = true }
-proc-macro2 = "1.0.81"
+syn = { workspace = true }
-quote = "1.0.36"
-serde = { version = "1.0.202", features = ["derive"] }
-syn = { version = "2.0.60", features = ["extra-traits", "full"] }
-serde_json = "1.0.118"
-
-[dev-dependencies]
-serde = { version = "1.0.202", features = ["derive"] }

automation_macro/src/lua_device_config.rs

@@ -260,9 +260,10 @@ pub fn impl_lua_device_config_macro(ast: &DeriveInput) -> TokenStream {
         })
         .collect();
 
+    let (impl_generics, type_generics, where_clause) = ast.generics.split_for_impl();
     let impl_from_lua = quote! {
-        impl<'lua> mlua::FromLua<'lua> for #name {
+        impl #impl_generics mlua::FromLua for #name #type_generics #where_clause {
-            fn from_lua(value: mlua::Value<'lua>, lua: &'lua mlua::Lua) -> mlua::Result<Self> {
+            fn from_lua(value: mlua::Value, lua: &mlua::Lua) -> mlua::Result<Self> {
                 if !value.is_table() {
                     panic!("Expected table");
                 }

config.lua

@@ -21,9 +21,7 @@ automation.fulfillment = {
 }
 
 local mqtt_client = automation.new_mqtt_client({
-	host = (host == "zeus" and "olympus.lan.huizinga.dev")
+	host = ((host == "zeus" or host == "hephaestus") and "olympus.lan.huizinga.dev") or "mosquitto",
-		or (host == "hephaestus" and "olympus.vpn.huizinga.dev")
-		or "mosquitto",
 	port = 8883,
 	client_name = "automation-" .. host,
 	username = "mqtt",
@@ -36,12 +34,11 @@ automation.device_manager:add(Ntfy.new({
 	event_channel = automation.device_manager:event_channel(),
 }))
 
-local presence = Presence.new({
+automation.device_manager:add(Presence.new({
 	topic = mqtt_automation("presence/+/#"),
 	client = mqtt_client,
 	event_channel = automation.device_manager:event_channel(),
-})
+}))
-automation.device_manager:add(presence)
 
 automation.device_manager:add(DebugBridge.new({
 	identifier = "debug_bridge",
@@ -49,7 +46,7 @@ automation.device_manager:add(DebugBridge.new({
 	client = mqtt_client,
 }))
 
-local hue_ip = "10.0.0.146"
+local hue_ip = "10.0.0.102"
 local hue_token = automation.util.get_env("HUE_TOKEN")
 
 automation.device_manager:add(HueBridge.new({
@@ -62,6 +59,47 @@ automation.device_manager:add(HueBridge.new({
 	},
 }))
 
+local kitchen_lights = HueGroup.new({
+	identifier = "kitchen_lights",
+	ip = hue_ip,
+	login = hue_token,
+	group_id = 7,
+	scene_id = "7MJLG27RzeRAEVJ",
+})
+automation.device_manager:add(kitchen_lights)
+local living_lights = HueGroup.new({
+	identifier = "living_lights",
+	ip = hue_ip,
+	login = hue_token,
+	group_id = 1,
+	scene_id = "SNZw7jUhQ3cXSjkj",
+})
+automation.device_manager:add(living_lights)
+local living_lights_relax = HueGroup.new({
+	identifier = "living_lights",
+	ip = hue_ip,
+	login = hue_token,
+	group_id = 1,
+	scene_id = "eRJ3fvGHCcb6yNw",
+})
+automation.device_manager:add(living_lights_relax)
+
+automation.device_manager:add(HueSwitch.new({
+	name = "Switch",
+	room = "Living",
+	client = mqtt_client,
+	topic = mqtt_z2m("living/switch"),
+	left_callback = function()
+		kitchen_lights:set_on(not kitchen_lights:on())
+	end,
+	right_callback = function()
+		living_lights:set_on(not living_lights:on())
+	end,
+	right_hold_callback = function()
+		living_lights_relax:set_on(true)
+	end,
+}))
+
 automation.device_manager:add(LightSensor.new({
 	identifier = "living_light_sensor",
 	topic = mqtt_z2m("living/light"),
@@ -77,42 +115,115 @@ automation.device_manager:add(WakeOnLAN.new({
 	topic = mqtt_automation("appliance/living_room/zeus"),
 	client = mqtt_client,
 	mac_address = "30:9c:23:60:9c:13",
-	broadcast_ip = "10.0.0.255",
+	broadcast_ip = "10.0.3.255",
 }))
 
-local living_mixer = KasaOutlet.new({ identifier = "living_mixer", ip = "10.0.0.49" })
+local living_mixer = OutletOnOff.new({
+	name = "Mixer",
+	room = "Living Room",
+	topic = mqtt_z2m("living/mixer"),
+	client = mqtt_client,
+})
 automation.device_manager:add(living_mixer)
-local living_speakers = KasaOutlet.new({ identifier = "living_speakers", ip = "10.0.0.182" })
+local living_speakers = OutletOnOff.new({
+	name = "Speakers",
+	room = "Living Room",
+	topic = mqtt_z2m("living/speakers"),
+	client = mqtt_client,
+})
 automation.device_manager:add(living_speakers)
 
-automation.device_manager:add(AudioSetup.new({
+automation.device_manager:add(IkeaRemote.new({
-	identifier = "living_audio",
+	name = "Remote",
-	topic = mqtt_z2m("living/remote"),
+	room = "Living Room",
 	client = mqtt_client,
-	mixer = living_mixer,
+	topic = mqtt_z2m("living/remote"),
-	speakers = living_speakers,
+	single_button = true,
+	callback = function(_, on)
+		if on then
+			if living_mixer:on() then
+				living_mixer:set_on(false)
+				living_speakers:set_on(false)
+			else
+				living_mixer:set_on(true)
+				living_speakers:set_on(true)
+			end
+		else
+			if not living_mixer:on() then
+				living_mixer:set_on(true)
+			else
+				living_speakers:set_on(not living_speakers:on())
+			end
+		end
+	end,
 }))
 
-automation.device_manager:add(IkeaOutlet.new({
+local function kettle_timeout()
+	local timeout = Timeout.new()
+
+	return function(self, state)
+		if state.state and state.power < 100 then
+			timeout:start(3, function()
+				self:set_on(false)
+			end)
+		else
+			timeout:cancel()
+		end
+	end
+end
+
+local kettle = OutletPower.new({
 	outlet_type = "Kettle",
 	name = "Kettle",
 	room = "Kitchen",
 	topic = mqtt_z2m("kitchen/kettle"),
 	client = mqtt_client,
-	timeout = debug and 5 or 300,
+	callback = kettle_timeout(),
-	remotes = {
+})
-		{ topic = mqtt_z2m("bedroom/remote") },
+automation.device_manager:add(kettle)
-		{ topic = mqtt_z2m("kitchen/remote") },
+
-	},
+local function set_kettle(_, on)
+	kettle:set_on(on)
+end
+
+automation.device_manager:add(IkeaRemote.new({
+	name = "Remote",
+	room = "Bedroom",
+	client = mqtt_client,
+	topic = mqtt_z2m("bedroom/remote"),
+	single_button = true,
+	callback = set_kettle,
 }))
 
-automation.device_manager:add(IkeaOutlet.new({
+automation.device_manager:add(IkeaRemote.new({
-	outlet_type = "Light",
+	name = "Remote",
+	room = "Kitchen",
+	client = mqtt_client,
+	topic = mqtt_z2m("kitchen/remote"),
+	single_button = true,
+	callback = set_kettle,
+}))
+
+local function off_timeout(duration)
+	local timeout = Timeout.new()
+
+	return function(self, state)
+		if state.state then
+			timeout:start(duration, function()
+				self:set_on(false)
+			end)
+		else
+			timeout:cancel()
+		end
+	end
+end
+
+automation.device_manager:add(LightOnOff.new({
 	name = "Light",
 	room = "Bathroom",
 	topic = mqtt_z2m("bathroom/light"),
 	client = mqtt_client,
-	timeout = debug and 60 or 45 * 60,
+	callback = off_timeout(debug and 60 or 45 * 60),
 }))
 
 automation.device_manager:add(Washer.new({
@@ -123,107 +234,274 @@ automation.device_manager:add(Washer.new({
 	event_channel = automation.device_manager:event_channel(),
 }))
 
-automation.device_manager:add(IkeaOutlet.new({
+automation.device_manager:add(OutletOnOff.new({
-	outlet_type = "Charger",
+	presence_auto_off = false,
 	name = "Charger",
 	room = "Workbench",
 	topic = mqtt_z2m("workbench/charger"),
 	client = mqtt_client,
-	timeout = debug and 5 or 20 * 3600,
+	callback = off_timeout(debug and 5 or 20 * 3600),
 }))
 
-automation.device_manager:add(IkeaOutlet.new({
+automation.device_manager:add(OutletOnOff.new({
 	name = "Outlet",
 	room = "Workbench",
 	topic = mqtt_z2m("workbench/outlet"),
 	client = mqtt_client,
 }))
 
-local hallway_lights = HueGroup.new({
+local workbench_light = LightBrightness.new({
-	identifier = "hallway_lights",
+	name = "Light",
+	room = "Workbench",
+	topic = mqtt_z2m("workbench/light"),
+	client = mqtt_client,
+})
+automation.device_manager:add(workbench_light)
+
+automation.device_manager:add(IkeaRemote.new({
+	name = "Remote",
+	room = "Workbench",
+	client = mqtt_client,
+	topic = mqtt_z2m("workbench/remote"),
+	callback = function(_, on)
+		workbench_light:set_on(on)
+	end,
+}))
+
+local hallway_top_light = HueGroup.new({
+	identifier = "hallway_top_light",
+	ip = hue_ip,
+	login = hue_token,
+	group_id = 83,
+	scene_id = "QeufkFDICEHWeKJ7",
+})
+automation.device_manager:add(HueSwitch.new({
+	name = "SwitchBottom",
+	room = "Hallway",
+	client = mqtt_client,
+	topic = mqtt_z2m("hallway/switchbottom"),
+	left_callback = function()
+		hallway_top_light:set_on(not hallway_top_light:on())
+	end,
+}))
+automation.device_manager:add(HueSwitch.new({
+	name = "SwitchTop",
+	room = "Hallway",
+	client = mqtt_client,
+	topic = mqtt_z2m("hallway/switchtop"),
+	left_callback = function()
+		hallway_top_light:set_on(not hallway_top_light:on())
+	end,
+}))
+
+local hallway_light_automation = {
+	timeout = Timeout.new(),
+	forced = false,
+	switch_callback = function(self, on)
+		self.timeout:cancel()
+		self.group.set_on(on)
+		self.forced = on
+	end,
+	door_callback = function(self, open)
+		if open then
+			self.timeout:cancel()
+
+			self.group.set_on(true)
+		elseif not self.forced then
+			self.timeout:start(debug and 10 or 2 * 60, function()
+				if self.trash:open_percent() == 0 then
+					self.group.set_on(false)
+				end
+			end)
+		end
+	end,
+	trash_callback = function(self, open)
+		if open then
+			self.group.set_on(true)
+		else
+			if not self.timeout:is_waiting() and self.door:open_percent() == 0 and not self.forced then
+				self.group.set_on(false)
+			end
+		end
+	end,
+	light_callback = function(self, on)
+		if on and self.trash:open_percent() == 0 and self.door:open_percent() == 0 then
+			-- If the door and trash are not open, that means the light got turned on manually
+			self.timeout:cancel()
+			self.forced = true
+		elseif not on then
+			-- The light is never forced when it is off
+			self.forced = false
+		end
+	end,
+}
+
+local hallway_storage = LightBrightness.new({
+	name = "Storage",
+	room = "Hallway",
+	topic = mqtt_z2m("hallway/storage"),
+	client = mqtt_client,
+	callback = function(_, state)
+		hallway_light_automation:light_callback(state.state)
+	end,
+})
+automation.device_manager:add(hallway_storage)
+
+local hallway_bottom_lights = HueGroup.new({
+	identifier = "hallway_bottom_lights",
 	ip = hue_ip,
 	login = hue_token,
 	group_id = 81,
 	scene_id = "3qWKxGVadXFFG4o",
-	timer_id = 1,
-	remotes = {
-		{ topic = mqtt_z2m("hallway/remote") },
-	},
-	client = mqtt_client,
 })
-automation.device_manager:add(hallway_lights)
+automation.device_manager:add(hallway_bottom_lights)
 
-automation.device_manager:add(ContactSensor.new({
+hallway_light_automation.group = {
-	identifier = "hallway_frontdoor",
+	set_on = function(on)
+		if on then
+			hallway_storage:set_brightness(80)
+		else
+			hallway_storage:set_on(false)
+		end
+		hallway_bottom_lights:set_on(on)
+	end,
+}
+
+automation.device_manager:add(IkeaRemote.new({
+	name = "Remote",
+	room = "Hallway",
+	client = mqtt_client,
+	topic = mqtt_z2m("hallway/remote"),
+	callback = function(_, on)
+		hallway_light_automation:switch_callback(on)
+	end,
+}))
+local hallway_frontdoor = ContactSensor.new({
+	name = "Frontdoor",
+	room = "Hallway",
+	sensor_type = "Door",
 	topic = mqtt_z2m("hallway/frontdoor"),
 	client = mqtt_client,
 	presence = {
 		topic = mqtt_automation("presence/contact/frontdoor"),
 		timeout = debug and 10 or 15 * 60,
 	},
-	trigger = {
+	callback = function(_, open)
-		devices = { hallway_lights },
+		hallway_light_automation:door_callback(open)
-		timeout = debug and 10 or 2 * 60,
-	},
-	action = function(closed)
-		-- if state then
-		-- 	hallway_lights:set_on(true)
-		-- 	presence:set_presence("contact/frontdoor", true)
-		-- else
-		-- 	-- TODO: New timeout implementation -> Device stores timestamp of last state change.
-		-- 	-- Generic timeout implementation then works by storing the timestamp at the start and comparing once the timer expires.
-		-- 	-- If the timestamp has changed -> Cancel the state change
-		-- 	-- Maybe add some sort identifier, such that if the function gets called repeatedly it will overwrite the existing timeout?
-		-- 	-- Tag? Autogenerated from position in lua code? Not sure if that is possible
-		-- 	automation.timeout(2 * 60, function()
-		-- 		hallway_lights:set_on(false)
-		-- 	end)
-		-- 	automation.timeout(15 * 60, function()
-		-- 		presence:set_presence("contact/frontdoor", false)
-		-- 	end)
-		-- end
 	end,
-}))
+})
+automation.device_manager:add(hallway_frontdoor)
+hallway_light_automation.door = hallway_frontdoor
 
-local function trash_action(device)
+local hallway_trash = ContactSensor.new({
-	local previous = device:is_on()
+	name = "Trash",
-	local function f(closed)
+	room = "Hallway",
-		if closed then
+	sensor_type = "Drawer",
-			if not previous then
-				device:set_on(false)
-			end
-		else
-			previous = device:is_on()
-			device:set_on(true)
-		end
-	end
-
-	return f
-end
-
-automation.device_manager:add(ContactSensor.new({
-	identifier = "hallway_trash",
 	topic = mqtt_z2m("hallway/trash"),
 	client = mqtt_client,
-	trigger = { devices = {} },
+	callback = function(_, open)
-	action = trash_action(hallway_lights),
+		hallway_light_automation:trash_callback(open)
+	end,
+})
+automation.device_manager:add(hallway_trash)
+hallway_light_automation.trash = hallway_trash
+
+automation.device_manager:add(LightOnOff.new({
+	name = "Light",
+	room = "Guest Room",
+	topic = mqtt_z2m("guest/light"),
+	client = mqtt_client,
 }))
 
 local bedroom_air_filter = AirFilter.new({
 	name = "Air Filter",
 	room = "Bedroom",
-	topic = "pico/filter/bedroom",
+	url = "http://10.0.0.103",
-	client = mqtt_client,
 })
 automation.device_manager:add(bedroom_air_filter)
 
+local bedroom_lights = HueGroup.new({
+	identifier = "bedroom_lights",
+	ip = hue_ip,
+	login = hue_token,
+	group_id = 3,
+	scene_id = "PvRs-lGD4VRytL9",
+})
+automation.device_manager:add(bedroom_lights)
+local bedroom_lights_relax = HueGroup.new({
+	identifier = "bedroom_lights",
+	ip = hue_ip,
+	login = hue_token,
+	group_id = 3,
+	scene_id = "60tfTyR168v2csz",
+})
+automation.device_manager:add(bedroom_lights_relax)
+
+automation.device_manager:add(HueSwitch.new({
+	name = "Switch",
+	room = "Bedroom",
+	client = mqtt_client,
+	topic = mqtt_z2m("bedroom/switch"),
+	left_callback = function()
+		bedroom_lights:set_on(not bedroom_lights:on())
+	end,
+	left_hold_callback = function()
+		bedroom_lights_relax:set_on(true)
+	end,
+}))
+
+automation.device_manager:add(ContactSensor.new({
+	name = "Balcony",
+	room = "Living Room",
+	sensor_type = "Door",
+	topic = mqtt_z2m("living/balcony"),
+	client = mqtt_client,
+}))
+automation.device_manager:add(ContactSensor.new({
+	name = "Window",
+	room = "Living Room",
+	topic = mqtt_z2m("living/window"),
+	client = mqtt_client,
+}))
+automation.device_manager:add(ContactSensor.new({
+	name = "Window",
+	room = "Bedroom",
+	topic = mqtt_z2m("bedroom/window"),
+	client = mqtt_client,
+}))
+automation.device_manager:add(ContactSensor.new({
+	name = "Window",
+	room = "Guest Room",
+	topic = mqtt_z2m("guest/window"),
+	client = mqtt_client,
+}))
+
+local storage_light = LightBrightness.new({
+	name = "Light",
+	room = "Storage",
+	topic = mqtt_z2m("storage/light"),
+	client = mqtt_client,
+})
+automation.device_manager:add(storage_light)
+
+automation.device_manager:add(ContactSensor.new({
+	name = "Door",
+	room = "Storage",
+	sensor_type = "Door",
+	topic = mqtt_z2m("storage/door"),
+	client = mqtt_client,
+	callback = function(_, open)
+		if open then
+			storage_light:set_brightness(100)
+		else
+			storage_light:set_on(false)
+		end
+	end,
+}))
+
 automation.device_manager:schedule("0 0 19 * * *", function()
 	bedroom_air_filter:set_on(true)
 end)
 automation.device_manager:schedule("0 0 20 * * *", function()
 	bedroom_air_filter:set_on(false)
 end)
-
-automation.timeout(10, function()
-	print("Cool stuff")
-end)

google_home/google_home/Cargo.toml

@@ -6,13 +6,12 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-automation_cast = { path = "../../automation_cast/" }
+automation_cast = { workspace = true }
-google_home_macro = { path = "../google_home_macro/" }
+google_home_macro = { workspace = true }
-serde = { version = "1.0.149", features = ["derive"] }
+serde = { workspace = true }
-serde_json = "1.0.89"
+serde_json = { workspace = true }
-thiserror = "1.0.37"
+thiserror = { workspace = true }
-tokio = { version = "1", features = ["sync", "full"] }
+tokio = { workspace = true }
-async-trait = "0.1.61"
+async-trait = { workspace = true }
-futures = "0.3.25"
+futures = { workspace = true }
-anyhow = "1.0.75"
+json_value_merge = { workspace = true }
-json_value_merge = "2.0.0"

google_home/google_home/src/device.rs

@@ -11,7 +11,7 @@ pub trait Device: DeviceFulfillment {
     fn get_device_type(&self) -> Type;
     fn get_device_name(&self) -> Name;
     fn get_id(&self) -> String;
-    fn is_online(&self) -> bool;
+    async fn is_online(&self) -> bool;
 
     // Default values that can optionally be overridden
     fn will_report_state(&self) -> bool {
@@ -37,29 +37,39 @@ pub trait Device: DeviceFulfillment {
         }
         device.device_info = self.get_device_info();
 
-        let (traits, attributes) = DeviceFulfillment::sync(self).await.unwrap();
+        // TODO: Return the appropriate error
-
+        if let Ok((traits, attributes)) = DeviceFulfillment::sync(self).await {
-        device.traits = traits;
+            device.traits = traits;
-        device.attributes = attributes;
+            device.attributes = attributes;
+        }
 
         device
     }
 
     async fn query(&self) -> response::query::Device {
         let mut device = response::query::Device::new();
-        if !self.is_online() {
+        if !self.is_online().await {
             device.set_offline();
         }
 
-        device.state = DeviceFulfillment::query(self).await.unwrap();
+        // TODO: Return the appropriate error
+        if let Ok(state) = DeviceFulfillment::query(self).await {
+            device.state = state;
+        }
 
         device
     }
 
     async fn execute(&self, command: Command) -> Result<(), ErrorCode> {
-        DeviceFulfillment::execute(self, command.clone())
+        // TODO: Do something with the return value, or just get rut of the return value?
+        if DeviceFulfillment::execute(self, command.clone())
             .await
-            .unwrap();
+            .is_err()
+        {
+            return Err(ErrorCode::DeviceError(
+                crate::errors::DeviceError::TransientError,
+            ));
+        }
 
         Ok(())
     }

google_home/google_home/src/fulfillment.rs

@@ -140,7 +140,7 @@ impl GoogleHome {
                             if let Some(device) = devices.get(id.as_str())
                                 && let Some(device) = device.as_ref().cast()
                             {
-                                if !device.is_online() {
+                                if !device.is_online().await {
                                     return (id, Ok(false));
                                 }
 

google_home/google_home/src/traits.rs

@@ -14,6 +14,18 @@ traits! {
         async fn on(&self) -> Result<bool, ErrorCode>,
         "action.devices.commands.OnOff" => async fn set_on(&self, on: bool) -> Result<(), ErrorCode>,
     },
+    "action.devices.traits.OpenClose" => trait OpenClose {
+        discrete_only_open_close: Option<bool>,
+        command_only_open_close: Option<bool>,
+        query_only_open_close: Option<bool>,
+        async fn open_percent(&self) -> Result<u8, ErrorCode>,
+        "action.devices.commands.OpenClose" => async fn set_open_percent(&self, open_percent: u8) -> Result<(), ErrorCode>,
+    },
+    "action.devices.traits.Brightness" => trait Brightness {
+        command_only_brightness: Option<bool>,
+        async fn brightness(&self) -> Result<u8, ErrorCode>,
+        "action.devices.commands.BrightnessAbsolute" => async fn set_brightness(&self, brightness: u8) -> Result<(), ErrorCode>,
+    },
     "action.devices.traits.Scene" => trait Scene {
         scene_reversible: Option<bool>,
 
@@ -40,7 +52,7 @@ traits! {
         // TODO: Add rename
         temperatureUnitForUX: TemperatureUnit,
 
-        async fn temperature_ambient_celsius(&self) -> f32,
+        async fn temperature_ambient_celsius(&self) -> Result<f32, ErrorCode>,
     }
 }
 

google_home/google_home/src/types.rs

@@ -12,4 +12,10 @@ pub enum Type {
     Scene,
     #[serde(rename = "action.devices.types.AIRPURIFIER")]
     AirPurifier,
+    #[serde(rename = "action.devices.types.DOOR")]
+    Door,
+    #[serde(rename = "action.devices.types.WINDOW")]
+    Window,
+    #[serde(rename = "action.devices.types.DRAWER")]
+    Drawer,
 }

google_home/google_home_macro/Cargo.toml

@@ -7,6 +7,6 @@ edition = "2021"
 proc-macro = true
 
 [dependencies]
-proc-macro2 = "1.0.81"
+proc-macro2 = { workspace = true }
-quote = "1.0.36"
+quote = { workspace = true }
-syn = { version = "2.0.60", features = ["extra-traits", "full"] }
+syn = { workspace = true }

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2024-07-25"
+channel = "nightly-2024-12-06"
 components = ["rustfmt", "clippy", "rust-analyzer"]
 profile = "minimal"

src/devices/audio_setup.rs

@@ -1,127 +0,0 @@
-use async_trait::async_trait;
-use automation_macro::LuaDeviceConfig;
-use google_home::traits::OnOff;
-use tracing::{debug, error, trace, warn};
-
-use super::{Device, LuaDeviceCreate};
-use crate::config::MqttDeviceConfig;
-use crate::device_manager::WrappedDevice;
-use crate::error::DeviceConfigError;
-use crate::event::{OnMqtt, OnPresence};
-use crate::messages::{RemoteAction, RemoteMessage};
-use crate::mqtt::WrappedAsyncClient;
-
-#[derive(Debug, Clone, LuaDeviceConfig)]
-pub struct Config {
-    pub identifier: String,
-    #[device_config(flatten)]
-    pub mqtt: MqttDeviceConfig,
-    #[device_config(from_lua)]
-    pub mixer: WrappedDevice,
-    #[device_config(from_lua)]
-    pub speakers: WrappedDevice,
-    #[device_config(from_lua)]
-    pub client: WrappedAsyncClient,
-}
-
-#[derive(Debug, Clone)]
-pub struct AudioSetup {
-    config: Config,
-}
-
-#[async_trait]
-impl LuaDeviceCreate for AudioSetup {
-    type Config = Config;
-    type Error = DeviceConfigError;
-
-    async fn create(config: Self::Config) -> Result<Self, Self::Error> {
-        trace!(id = config.identifier, "Setting up AudioSetup");
-
-        {
-            let mixer_id = config.mixer.get_id().to_owned();
-            if (config.mixer.cast() as Option<&dyn OnOff>).is_none() {
-                return Err(DeviceConfigError::MissingTrait(mixer_id, "OnOff".into()));
-            }
-
-            let speakers_id = config.speakers.get_id().to_owned();
-            if (config.speakers.cast() as Option<&dyn OnOff>).is_none() {
-                return Err(DeviceConfigError::MissingTrait(speakers_id, "OnOff".into()));
-            }
-        }
-
-        config
-            .client
-            .subscribe(&config.mqtt.topic, rumqttc::QoS::AtLeastOnce)
-            .await?;
-
-        Ok(AudioSetup { config })
-    }
-}
-
-impl Device for AudioSetup {
-    fn get_id(&self) -> String {
-        self.config.identifier.clone()
-    }
-}
-
-#[async_trait]
-impl OnMqtt for AudioSetup {
-    async fn on_mqtt(&self, message: rumqttc::Publish) {
-        if !rumqttc::matches(&message.topic, &self.config.mqtt.topic) {
-            return;
-        }
-
-        let action = match RemoteMessage::try_from(message) {
-            Ok(message) => message.action(),
-            Err(err) => {
-                error!(id = self.get_id(), "Failed to parse message: {err}");
-                return;
-            }
-        };
-
-        if let (Some(mixer), Some(speakers)) = (
-            self.config.mixer.cast() as Option<&dyn OnOff>,
-            self.config.speakers.cast() as Option<&dyn OnOff>,
-        ) {
-            match action {
-				RemoteAction::On => {
-					if mixer.on().await.unwrap() {
-						speakers.set_on(false).await.unwrap();
-						mixer.set_on(false).await.unwrap();
-					} else {
-						speakers.set_on(true).await.unwrap();
-						mixer.set_on(true).await.unwrap();
-					}
-				},
-				RemoteAction::BrightnessMoveUp => {
-					if !mixer.on().await.unwrap() {
-						mixer.set_on(true).await.unwrap();
-					} else if speakers.on().await.unwrap() {
-						speakers.set_on(false).await.unwrap();
-					} else {
-						speakers.set_on(true).await.unwrap();
-					}
-				},
-				RemoteAction::BrightnessStop => { /* Ignore this action */ },
-				_ => warn!("Expected ikea shortcut button which only supports 'on' and 'brightness_move_up', got: {action:?}")
-			}
-        }
-    }
-}
-
-#[async_trait]
-impl OnPresence for AudioSetup {
-    async fn on_presence(&self, presence: bool) {
-        if let (Some(mixer), Some(speakers)) = (
-            self.config.mixer.cast() as Option<&dyn OnOff>,
-            self.config.speakers.cast() as Option<&dyn OnOff>,
-        ) {
-            // Turn off the audio setup when we leave the house
-            if !presence {
-                debug!(id = self.get_id(), "Turning devices off");
-                speakers.set_on(false).await.unwrap();
-                mixer.set_on(false).await.unwrap();
-            }
-        }
-    }
-}

src/devices/hue_group.rs

@@ -1,312 +0,0 @@
-use std::net::SocketAddr;
-use std::time::Duration;
-
-use anyhow::{anyhow, Context, Result};
-use async_trait::async_trait;
-use automation_macro::LuaDeviceConfig;
-use google_home::errors::ErrorCode;
-use google_home::traits::OnOff;
-use rumqttc::{Publish, SubscribeFilter};
-use tracing::{debug, error, trace, warn};
-
-use super::{Device, LuaDeviceCreate};
-use crate::config::MqttDeviceConfig;
-use crate::event::OnMqtt;
-use crate::messages::{RemoteAction, RemoteMessage};
-use crate::mqtt::WrappedAsyncClient;
-use crate::traits::Timeout;
-
-#[derive(Debug, Clone, LuaDeviceConfig)]
-pub struct Config {
-    pub identifier: String,
-    #[device_config(rename("ip"), with(|ip| SocketAddr::new(ip, 80)))]
-    pub addr: SocketAddr,
-    pub login: String,
-    pub group_id: isize,
-    pub timer_id: isize,
-    pub scene_id: String,
-    #[device_config(default)]
-    pub remotes: Vec<MqttDeviceConfig>,
-    #[device_config(from_lua)]
-    pub client: WrappedAsyncClient,
-}
-
-#[derive(Debug, Clone)]
-pub struct HueGroup {
-    config: Config,
-}
-
-// Couple of helper function to get the correct urls
-#[async_trait]
-impl LuaDeviceCreate for HueGroup {
-    type Config = Config;
-    type Error = rumqttc::ClientError;
-
-    async fn create(config: Self::Config) -> Result<Self, Self::Error> {
-        trace!(id = config.identifier, "Setting up AudioSetup");
-
-        if !config.remotes.is_empty() {
-            config
-                .client
-                .subscribe_many(config.remotes.iter().map(|remote| SubscribeFilter {
-                    path: remote.topic.clone(),
-                    qos: rumqttc::QoS::AtLeastOnce,
-                }))
-                .await?;
-        }
-
-        Ok(Self { config })
-    }
-}
-
-impl HueGroup {
-    fn url_base(&self) -> String {
-        format!("http://{}/api/{}", self.config.addr, self.config.login)
-    }
-
-    fn url_set_schedule(&self) -> String {
-        format!("{}/schedules/{}", self.url_base(), self.config.timer_id)
-    }
-
-    fn url_set_action(&self) -> String {
-        format!("{}/groups/{}/action", self.url_base(), self.config.group_id)
-    }
-
-    fn url_get_state(&self) -> String {
-        format!("{}/groups/{}", self.url_base(), self.config.group_id)
-    }
-}
-
-impl Device for HueGroup {
-    fn get_id(&self) -> String {
-        self.config.identifier.clone()
-    }
-}
-
-#[async_trait]
-impl OnMqtt for HueGroup {
-    async fn on_mqtt(&self, message: Publish) {
-        if !self
-            .config
-            .remotes
-            .iter()
-            .any(|remote| rumqttc::matches(&message.topic, &remote.topic))
-        {
-            return;
-        }
-
-        let action = match RemoteMessage::try_from(message) {
-            Ok(message) => message.action(),
-            Err(err) => {
-                error!(id = self.get_id(), "Failed to parse message: {err}");
-                return;
-            }
-        };
-
-        debug!("Action: {action:#?}");
-
-        match action {
-            RemoteAction::On | RemoteAction::BrightnessMoveUp => self.set_on(true).await.unwrap(),
-            RemoteAction::Off | RemoteAction::BrightnessMoveDown => {
-                self.set_on(false).await.unwrap()
-            }
-            RemoteAction::BrightnessStop => { /* Ignore this action */ }
-        };
-    }
-}
-
-#[async_trait]
-impl OnOff for HueGroup {
-    async fn set_on(&self, on: bool) -> Result<(), ErrorCode> {
-        // Abort any timer that is currently running
-        self.stop_timeout().await.unwrap();
-
-        let message = if on {
-            message::Action::scene(self.config.scene_id.clone())
-        } else {
-            message::Action::on(false)
-        };
-
-        let res = reqwest::Client::new()
-            .put(self.url_set_action())
-            .json(&message)
-            .send()
-            .await;
-
-        match res {
-            Ok(res) => {
-                let status = res.status();
-                if !status.is_success() {
-                    warn!(id = self.get_id(), "Status code is not success: {status}");
-                }
-            }
-            Err(err) => error!(id = self.get_id(), "Error: {err}"),
-        }
-
-        Ok(())
-    }
-
-    async fn on(&self) -> Result<bool, ErrorCode> {
-        let res = reqwest::Client::new()
-            .get(self.url_get_state())
-            .send()
-            .await;
-
-        match res {
-            Ok(res) => {
-                let status = res.status();
-                if !status.is_success() {
-                    warn!(id = self.get_id(), "Status code is not success: {status}");
-                }
-
-                let on = match res.json::<message::Info>().await {
-                    Ok(info) => info.any_on(),
-                    Err(err) => {
-                        error!(id = self.get_id(), "Failed to parse message: {err}");
-                        // TODO: Error code
-                        return Ok(false);
-                    }
-                };
-
-                return Ok(on);
-            }
-            Err(err) => error!(id = self.get_id(), "Error: {err}"),
-        }
-
-        Ok(false)
-    }
-}
-
-#[async_trait]
-impl Timeout for HueGroup {
-    async fn start_timeout(&self, timeout: Duration) -> Result<()> {
-        // Abort any timer that is currently running
-        self.stop_timeout().await?;
-
-        // NOTE: This uses an existing timer, as we are unable to cancel it on the hub otherwise
-        let message = message::Timeout::new(Some(timeout));
-        let res = reqwest::Client::new()
-            .put(self.url_set_schedule())
-            .json(&message)
-            .send()
-            .await
-            .context("Failed to start timeout")?;
-
-        let status = res.status();
-        if !status.is_success() {
-            return Err(anyhow!(
-                "Hue bridge returned unsuccessful status '{status}'"
-            ));
-        }
-
-        Ok(())
-    }
-
-    async fn stop_timeout(&self) -> Result<()> {
-        let message = message::Timeout::new(None);
-        let res = reqwest::Client::new()
-            .put(self.url_set_schedule())
-            .json(&message)
-            .send()
-            .await
-            .context("Failed to stop timeout")?;
-
-        let status = res.status();
-        if !status.is_success() {
-            return Err(anyhow!(
-                "Hue bridge returned unsuccessful status '{status}'"
-            ));
-        }
-
-        Ok(())
-    }
-}
-
-mod message {
-    use std::time::Duration;
-
-    use serde::ser::SerializeStruct;
-    use serde::{Deserialize, Serialize};
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Action {
-        #[serde(skip_serializing_if = "Option::is_none")]
-        on: Option<bool>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        scene: Option<String>,
-    }
-
-    impl Action {
-        pub fn on(on: bool) -> Self {
-            Self {
-                on: Some(on),
-                scene: None,
-            }
-        }
-
-        pub fn scene(scene: String) -> Self {
-            Self {
-                on: None,
-                scene: Some(scene),
-            }
-        }
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    struct State {
-        all_on: bool,
-        any_on: bool,
-    }
-
-    #[derive(Debug, Serialize, Deserialize)]
-    pub struct Info {
-        state: State,
-    }
-
-    impl Info {
-        pub fn any_on(&self) -> bool {
-            self.state.any_on
-        }
-
-        // pub fn all_on(&self) -> bool {
-        // 	self.state.all_on
-        // }
-    }
-
-    #[derive(Debug)]
-    pub struct Timeout {
-        timeout: Option<Duration>,
-    }
-
-    impl Timeout {
-        pub fn new(timeout: Option<Duration>) -> Self {
-            Self { timeout }
-        }
-    }
-
-    impl Serialize for Timeout {
-        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-        where
-            S: serde::Serializer,
-        {
-            let len = if self.timeout.is_some() { 2 } else { 1 };
-            let mut state = serializer.serialize_struct("TimerMessage", len)?;
-            if self.timeout.is_some() {
-                state.serialize_field("status", "enabled")?;
-            } else {
-                state.serialize_field("status", "disabled")?;
-            }
-
-            if let Some(timeout) = self.timeout {
-                let seconds = timeout.as_secs() % 60;
-                let minutes = (timeout.as_secs() / 60) % 60;
-                let hours = timeout.as_secs() / 3600;
-
-                let time = format!("PT{hours:<02}:{minutes:<02}:{seconds:<02}");
-                state.serialize_field("localtime", &time)?;
-            };
-
-            state.end()
-        }
-    }
-}

src/devices/ikea_outlet.rs

@@ -1,259 +0,0 @@
-use std::sync::Arc;
-use std::time::Duration;
-
-use anyhow::Result;
-use async_trait::async_trait;
-use automation_macro::LuaDeviceConfig;
-use google_home::device;
-use google_home::errors::ErrorCode;
-use google_home::traits::{self, OnOff};
-use google_home::types::Type;
-use rumqttc::{matches, Publish, SubscribeFilter};
-use serde::Deserialize;
-use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
-use tokio::task::JoinHandle;
-use tracing::{debug, error, trace, warn};
-
-use super::LuaDeviceCreate;
-use crate::config::{InfoConfig, MqttDeviceConfig};
-use crate::devices::Device;
-use crate::event::{OnMqtt, OnPresence};
-use crate::messages::{OnOffMessage, RemoteAction, RemoteMessage};
-use crate::mqtt::WrappedAsyncClient;
-use crate::traits::Timeout;
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Copy)]
-pub enum OutletType {
-    Outlet,
-    Kettle,
-    Charger,
-    Light,
-}
-
-#[derive(Debug, Clone, LuaDeviceConfig)]
-pub struct Config {
-    #[device_config(flatten)]
-    pub info: InfoConfig,
-    #[device_config(flatten)]
-    pub mqtt: MqttDeviceConfig,
-    #[device_config(default(OutletType::Outlet))]
-    pub outlet_type: OutletType,
-    #[device_config(default, with(|t: Option<_>| t.map(Duration::from_secs)))]
-    pub timeout: Option<Duration>,
-    #[device_config(default)]
-    pub remotes: Vec<MqttDeviceConfig>,
-
-    #[device_config(from_lua)]
-    pub client: WrappedAsyncClient,
-}
-
-#[derive(Debug)]
-pub struct State {
-    last_known_state: bool,
-    handle: Option<JoinHandle<()>>,
-}
-
-#[derive(Debug, Clone)]
-pub struct IkeaOutlet {
-    config: Config,
-
-    state: Arc<RwLock<State>>,
-}
-
-impl IkeaOutlet {
-    async fn state(&self) -> RwLockReadGuard<State> {
-        self.state.read().await
-    }
-
-    async fn state_mut(&self) -> RwLockWriteGuard<State> {
-        self.state.write().await
-    }
-}
-
-#[async_trait]
-impl LuaDeviceCreate for IkeaOutlet {
-    type Config = Config;
-    type Error = rumqttc::ClientError;
-
-    async fn create(config: Self::Config) -> Result<Self, Self::Error> {
-        trace!(id = config.info.identifier(), "Setting up IkeaOutlet");
-
-        if !config.remotes.is_empty() {
-            config
-                .client
-                .subscribe_many(config.remotes.iter().map(|remote| SubscribeFilter {
-                    path: remote.topic.clone(),
-                    qos: rumqttc::QoS::AtLeastOnce,
-                }))
-                .await?;
-        }
-
-        config
-            .client
-            .subscribe(&config.mqtt.topic, rumqttc::QoS::AtLeastOnce)
-            .await?;
-
-        let state = State {
-            last_known_state: false,
-            handle: None,
-        };
-        let state = Arc::new(RwLock::new(state));
-
-        Ok(Self { config, state })
-    }
-}
-
-impl Device for IkeaOutlet {
-    fn get_id(&self) -> String {
-        self.config.info.identifier()
-    }
-}
-
-#[async_trait]
-impl OnMqtt for IkeaOutlet {
-    async fn on_mqtt(&self, message: Publish) {
-        // Check if the message is from the deviec itself or from a remote
-        if matches(&message.topic, &self.config.mqtt.topic) {
-            // Update the internal state based on what the device has reported
-            let state = match OnOffMessage::try_from(message) {
-                Ok(state) => state.state(),
-                Err(err) => {
-                    error!(id = Device::get_id(self), "Failed to parse message: {err}");
-                    return;
-                }
-            };
-
-            // No need to do anything if the state has not changed
-            if state == self.state().await.last_known_state {
-                return;
-            }
-
-            // Abort any timer that is currently running
-            self.stop_timeout().await.unwrap();
-
-            debug!(id = Device::get_id(self), "Updating state to {state}");
-            self.state_mut().await.last_known_state = state;
-
-            // If this is a kettle start a timeout for turning it of again
-            if state && let Some(timeout) = self.config.timeout {
-                self.start_timeout(timeout).await.unwrap();
-            }
-        } else if self
-            .config
-            .remotes
-            .iter()
-            .any(|remote| rumqttc::matches(&message.topic, &remote.topic))
-        {
-            let action = match RemoteMessage::try_from(message) {
-                Ok(message) => message.action(),
-                Err(err) => {
-                    error!(id = Device::get_id(self), "Failed to parse message: {err}");
-                    return;
-                }
-            };
-
-            match action {
-				RemoteAction::On => self.set_on(true).await.unwrap(),
-				RemoteAction::BrightnessMoveUp => self.set_on(false).await.unwrap(),
-				RemoteAction::BrightnessStop => { /* Ignore this action */ },
-				_ => warn!("Expected ikea shortcut button which only supports 'on' and 'brightness_move_up', got: {action:?}")
-			}
-        }
-    }
-}
-
-#[async_trait]
-impl OnPresence for IkeaOutlet {
-    async fn on_presence(&self, presence: bool) {
-        // Turn off the outlet when we leave the house (Not if it is a battery charger)
-        if !presence && self.config.outlet_type != OutletType::Charger {
-            debug!(id = Device::get_id(self), "Turning device off");
-            self.set_on(false).await.ok();
-        }
-    }
-}
-
-impl google_home::Device for IkeaOutlet {
-    fn get_device_type(&self) -> Type {
-        match self.config.outlet_type {
-            OutletType::Outlet => Type::Outlet,
-            OutletType::Kettle => Type::Kettle,
-            OutletType::Light => Type::Light, // Find a better device type for this, ideally would like to use charger, but that needs more work
-            OutletType::Charger => Type::Outlet, // Find a better device type for this, ideally would like to use charger, but that needs more work
-        }
-    }
-
-    fn get_device_name(&self) -> device::Name {
-        device::Name::new(&self.config.info.name)
-    }
-
-    fn get_id(&self) -> String {
-        Device::get_id(self)
-    }
-
-    fn is_online(&self) -> bool {
-        true
-    }
-
-    fn get_room_hint(&self) -> Option<&str> {
-        self.config.info.room.as_deref()
-    }
-
-    fn will_report_state(&self) -> bool {
-        // TODO: Implement state reporting
-        false
-    }
-}
-
-#[async_trait]
-impl traits::OnOff for IkeaOutlet {
-    async fn on(&self) -> Result<bool, ErrorCode> {
-        Ok(self.state().await.last_known_state)
-    }
-
-    async fn set_on(&self, on: bool) -> Result<(), ErrorCode> {
-        let message = OnOffMessage::new(on);
-
-        let topic = format!("{}/set", self.config.mqtt.topic);
-        // TODO: Handle potential errors here
-        self.config
-            .client
-            .publish(
-                &topic,
-                rumqttc::QoS::AtLeastOnce,
-                false,
-                serde_json::to_string(&message).unwrap(),
-            )
-            .await
-            .map_err(|err| warn!("Failed to update state on {topic}: {err}"))
-            .ok();
-
-        Ok(())
-    }
-}
-
-#[async_trait]
-impl crate::traits::Timeout for IkeaOutlet {
-    async fn start_timeout(&self, timeout: Duration) -> Result<()> {
-        // Abort any timer that is currently running
-        self.stop_timeout().await?;
-
-        let device = self.clone();
-        self.state_mut().await.handle = Some(tokio::spawn(async move {
-            debug!(id = device.get_id(), "Starting timeout ({timeout:?})...");
-            tokio::time::sleep(timeout).await;
-            debug!(id = device.get_id(), "Turning outlet off!");
-            device.set_on(false).await.unwrap();
-        }));
-
-        Ok(())
-    }
-
-    async fn stop_timeout(&self) -> Result<()> {
-        if let Some(handle) = self.state_mut().await.handle.take() {
-            handle.abort();
-        }
-
-        Ok(())
-    }
-}

src/devices/mod.rs

@@ -1,123 +0,0 @@
-mod air_filter;
-mod audio_setup;
-mod contact_sensor;
-mod debug_bridge;
-mod hue_bridge;
-mod hue_group;
-mod ikea_outlet;
-mod kasa_outlet;
-mod light_sensor;
-mod ntfy;
-mod presence;
-mod wake_on_lan;
-mod washer;
-
-use std::fmt::Debug;
-
-use async_trait::async_trait;
-use automation_cast::Cast;
-use dyn_clone::DynClone;
-use google_home::traits::OnOff;
-
-pub use self::air_filter::AirFilter;
-pub use self::audio_setup::AudioSetup;
-pub use self::contact_sensor::ContactSensor;
-pub use self::debug_bridge::DebugBridge;
-pub use self::hue_bridge::HueBridge;
-pub use self::hue_group::HueGroup;
-pub use self::ikea_outlet::IkeaOutlet;
-pub use self::kasa_outlet::KasaOutlet;
-pub use self::light_sensor::LightSensor;
-pub use self::ntfy::{Notification, Ntfy};
-pub use self::presence::{Presence, DEFAULT_PRESENCE};
-pub use self::wake_on_lan::WakeOnLAN;
-pub use self::washer::Washer;
-use crate::event::{OnDarkness, OnMqtt, OnNotification, OnPresence};
-use crate::traits::Timeout;
-
-#[async_trait]
-pub trait LuaDeviceCreate {
-    type Config;
-    type Error;
-
-    async fn create(config: Self::Config) -> Result<Self, Self::Error>
-    where
-        Self: Sized;
-}
-
-macro_rules! register_device {
-    ($lua:expr, $device:ty) => {
-        $lua.globals()
-            .set(stringify!($device), $lua.create_proxy::<$device>()?)?;
-    };
-}
-
-macro_rules! impl_device {
-    ($lua:expr, $device:ty) => {
-        impl mlua::UserData for $device {
-            fn add_methods<'lua, M: mlua::UserDataMethods<'lua, Self>>(methods: &mut M) {
-                methods.add_async_function("new", |lua, config: mlua::Value| async {
-                    let config = mlua::FromLua::from_lua(config, lua)?;
-
-                    // TODO: Using crate:: could cause issues
-                    let device: $device = crate::devices::LuaDeviceCreate::create(config)
-                        .await
-                        .map_err(mlua::ExternalError::into_lua_err)?;
-
-                    Ok(crate::device_manager::WrappedDevice::new(device))
-                });
-            }
-        }
-    };
-}
-
-impl_device!(lua, AirFilter);
-impl_device!(lua, AudioSetup);
-impl_device!(lua, ContactSensor);
-impl_device!(lua, DebugBridge);
-impl_device!(lua, HueBridge);
-impl_device!(lua, HueGroup);
-impl_device!(lua, IkeaOutlet);
-impl_device!(lua, KasaOutlet);
-impl_device!(lua, LightSensor);
-impl_device!(lua, Ntfy);
-impl_device!(lua, Presence);
-impl_device!(lua, WakeOnLAN);
-impl_device!(lua, Washer);
-
-pub fn register_with_lua(lua: &mlua::Lua) -> mlua::Result<()> {
-    register_device!(lua, AirFilter);
-    register_device!(lua, AudioSetup);
-    register_device!(lua, ContactSensor);
-    register_device!(lua, DebugBridge);
-    register_device!(lua, HueBridge);
-    register_device!(lua, HueGroup);
-    register_device!(lua, IkeaOutlet);
-    register_device!(lua, KasaOutlet);
-    register_device!(lua, LightSensor);
-    register_device!(lua, Ntfy);
-    register_device!(lua, Presence);
-    register_device!(lua, WakeOnLAN);
-    register_device!(lua, Washer);
-
-    Ok(())
-}
-
-pub trait Device:
-    Debug
-    + DynClone
-    + Sync
-    + Send
-    + Cast<dyn google_home::Device>
-    + Cast<dyn OnMqtt>
-    + Cast<dyn OnMqtt>
-    + Cast<dyn OnPresence>
-    + Cast<dyn OnDarkness>
-    + Cast<dyn OnNotification>
-    + Cast<dyn OnOff>
-    + Cast<dyn Timeout>
-{
-    fn get_id(&self) -> String;
-}
-
-dyn_clone::clone_trait_object!(Device);

src/lib.rs

@@ -1,19 +0,0 @@
-#![allow(incomplete_features)]
-#![feature(specialization)]
-#![feature(let_chains)]
-#![feature(unboxed_closures)]
-
-use once_cell::sync::Lazy;
-use tokio::sync::Mutex;
-pub mod auth;
-pub mod config;
-pub mod device_manager;
-pub mod devices;
-pub mod error;
-pub mod event;
-pub mod messages;
-pub mod mqtt;
-pub mod schedule;
-pub mod traits;
-
-pub static LUA: Lazy<Mutex<mlua::Lua>> = Lazy::new(|| Mutex::new(mlua::Lua::new()));

src/main.rs

@@ -1,13 +1,16 @@
+mod web;
+
+use std::net::SocketAddr;
 use std::path::Path;
 use std::process;
 
 use anyhow::anyhow;
-use automation::auth::User;
+use automation_lib::config::{FulfillmentConfig, MqttConfig};
-use automation::config::{FulfillmentConfig, MqttConfig};
+use automation_lib::device_manager::DeviceManager;
-use automation::device_manager::DeviceManager;
+use automation_lib::helpers;
-use automation::error::ApiError;
+use automation_lib::mqtt::{self, WrappedAsyncClient};
-use automation::mqtt::{self, WrappedAsyncClient};
+use automation_lib::ntfy::Ntfy;
-use automation::{devices, LUA};
+use automation_lib::presence::Presence;
 use axum::extract::{FromRef, State};
 use axum::http::StatusCode;
 use axum::routing::post;
@@ -16,8 +19,9 @@ use dotenvy::dotenv;
 use google_home::{GoogleHome, Request, Response};
 use mlua::LuaSerdeExt;
 use rumqttc::AsyncClient;
-use tokio_util::task::LocalPoolHandle;
+use tokio::net::TcpListener;
 use tracing::{debug, error, info, warn};
+use web::{ApiError, User};
 
 #[derive(Clone)]
 struct AppState {
@@ -74,7 +78,7 @@ async fn app() -> anyhow::Result<()> {
     let device_manager = DeviceManager::new().await;
 
     let fulfillment_config = {
-        let lua = LUA.lock().await;
+        let lua = mlua::Lua::new();
 
         lua.set_warning_function(|_lua, text, _cont| {
             warn!("{text}");
@@ -97,21 +101,6 @@ async fn app() -> anyhow::Result<()> {
         automation.set("new_mqtt_client", new_mqtt_client)?;
         automation.set("device_manager", device_manager.clone())?;
 
-        let timeout = lua.create_function(|lua, (t, f): (u64, mlua::Function)| {
-            let pool = LocalPoolHandle::new(1);
-            let key = lua.create_registry_value(f).unwrap();
-            pool.spawn_pinned(move || async move {
-                tokio::time::sleep(std::time::Duration::from_secs(t)).await;
-                let lua = LUA.lock().await;
-                let f: mlua::Function = lua.registry_value(&key).unwrap();
-                f.call_async::<_, ()>(()).await.unwrap();
-                lua.remove_registry_value(key).unwrap();
-            });
-
-            Ok(())
-        })?;
-        automation.set("timeout", timeout)?;
-
         let util = lua.create_table()?;
         let get_env = lua.create_function(|_lua, name: String| {
             std::env::var(name).map_err(mlua::ExternalError::into_lua_err)
@@ -127,7 +116,11 @@ async fn app() -> anyhow::Result<()> {
 
         lua.globals().set("automation", automation)?;
 
-        devices::register_with_lua(&lua)?;
+        automation_devices::register_with_lua(&lua)?;
+        helpers::register_with_lua(&lua)?;
+        lua.globals().set("Ntfy", lua.create_proxy::<Ntfy>()?)?;
+        lua.globals()
+            .set("Presence", lua.create_proxy::<Presence>()?)?;
 
         // TODO: Make this not hardcoded
         let config_filename = std::env::var("AUTOMATION_CONFIG").unwrap_or("./config.lua".into());
@@ -163,11 +156,10 @@ async fn app() -> anyhow::Result<()> {
         });
 
     // Start the web server
-    let addr = fulfillment_config.into();
+    let addr: SocketAddr = fulfillment_config.into();
     info!("Server started on http://{addr}");
-    axum::Server::try_bind(&addr)?
+    let listener = TcpListener::bind(addr).await?;
-        .serve(app.into_make_service())
+    axum::serve(listener, app).await?;
-        .await?;
 
     Ok(())
 }

src/traits.rs

@@ -1,10 +0,0 @@
-use std::time::Duration;
-
-use anyhow::Result;
-use async_trait::async_trait;
-
-#[async_trait]
-pub trait Timeout: Sync + Send {
-    async fn start_timeout(&self, _timeout: Duration) -> Result<()>;
-    async fn stop_timeout(&self) -> Result<()>;
-}

src/web.rs

@@ -1,10 +1,78 @@
+use std::result;
+
 use axum::async_trait;
 use axum::extract::{FromRef, FromRequestParts};
 use axum::http::request::Parts;
+use axum::http::status::InvalidStatusCode;
 use axum::http::StatusCode;
-use serde::Deserialize;
+use axum::response::IntoResponse;
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
 
-use crate::error::{ApiError, ApiErrorJson};
+#[derive(Debug, Error)]
+#[error("{source}")]
+pub struct ApiError {
+    status_code: axum::http::StatusCode,
+    source: Box<dyn std::error::Error>,
+}
+
+impl ApiError {
+    pub fn new(status_code: axum::http::StatusCode, source: Box<dyn std::error::Error>) -> Self {
+        Self {
+            status_code,
+            source,
+        }
+    }
+}
+
+impl From<ApiError> for ApiErrorJson {
+    fn from(value: ApiError) -> Self {
+        let error = ApiErrorJsonError {
+            code: value.status_code.as_u16(),
+            status: value.status_code.to_string(),
+            reason: value.source.to_string(),
+        };
+
+        Self { error }
+    }
+}
+
+impl IntoResponse for ApiError {
+    fn into_response(self) -> axum::response::Response {
+        (
+            self.status_code,
+            serde_json::to_string::<ApiErrorJson>(&self.into())
+                .expect("Serialization should not fail"),
+        )
+            .into_response()
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+struct ApiErrorJsonError {
+    code: u16,
+    status: String,
+    reason: String,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ApiErrorJson {
+    error: ApiErrorJsonError,
+}
+
+impl TryFrom<ApiErrorJson> for ApiError {
+    type Error = InvalidStatusCode;
+
+    fn try_from(value: ApiErrorJson) -> result::Result<Self, Self::Error> {
+        let status_code = axum::http::StatusCode::from_u16(value.error.code)?;
+        let source = value.error.reason.into();
+
+        Ok(Self {
+            status_code,
+            source,
+        })
+    }
+}
 
 #[derive(Debug, Deserialize)]
 pub struct User {
@@ -25,6 +93,8 @@ where
 
         // Create a request to the auth server
         // TODO: Do some discovery to find the correct url for this instead of assuming
+        // TODO: I think we can also just run Authlia in front of the endpoint instead
+        // This would then give us a header containing the logged in user info?
         let mut req = reqwest::Client::new().get(format!("{}/userinfo", openid_url));
 
         // Add auth header to the request if it exists