feat!: Removed AddAdditionalMethods

It has been replaced with the add_methods device attribute.

Cargo.lock

@@ -167,6 +167,7 @@ name = "automation_macro"
 version = "0.1.0"
 dependencies = [
  "itertools",
+ "mlua",
  "proc-macro2",
  "quote",
  "syn 2.0.106",

Cargo.toml

@@ -54,7 +54,7 @@ rumqttc = "0.24.0"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.143"
 serde_repr = "0.1.20"
-syn = { version = "2.0.106", features = ["extra-traits", "full"] }
+syn = { version = "2.0.106" }
 thiserror = "2.0.16"
 tokio = { version = "1", features = ["rt-multi-thread"] }
 tokio-cron-scheduler = "0.14.0"

automation_devices/src/air_filter.rs

@@ -1,7 +1,7 @@
 use async_trait::async_trait;
 use automation_lib::config::InfoConfig;
 use automation_lib::device::{Device, LuaDeviceCreate};
-use automation_macro::{LuaDevice, LuaDeviceConfig};
+use automation_macro::{Device, LuaDeviceConfig};
 use google_home::device::Name;
 use google_home::errors::ErrorCode;
 use google_home::traits::{
@@ -19,8 +19,8 @@ pub struct Config {
     pub url: String,
 }
 
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
-#[traits(OnOff)]
+#[device(traits(OnOff))]
 pub struct AirFilter {
     config: Config,
 }

automation_devices/src/contact_sensor.rs

@@ -8,7 +8,7 @@ use automation_lib::error::DeviceConfigError;
 use automation_lib::event::OnMqtt;
 use automation_lib::messages::ContactMessage;
 use automation_lib::mqtt::WrappedAsyncClient;
-use automation_macro::{LuaDevice, LuaDeviceConfig};
+use automation_macro::{Device, LuaDeviceConfig};
 use google_home::device;
 use google_home::errors::{DeviceError, ErrorCode};
 use google_home::traits::OpenClose;
@@ -35,9 +35,9 @@ pub struct Config {
     pub sensor_type: SensorType,
 
     #[device_config(from_lua, default)]
-    pub callback: ActionCallback<ContactSensor, bool>,
+    pub callback: ActionCallback<(ContactSensor, bool)>,
     #[device_config(from_lua, default)]
-    pub battery_callback: ActionCallback<ContactSensor, f32>,
+    pub battery_callback: ActionCallback<(ContactSensor, f32)>,
 
     #[device_config(from_lua)]
     pub client: WrappedAsyncClient,
@@ -48,8 +48,8 @@ struct State {
     is_closed: bool,
 }
 
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
-#[traits(OpenClose)]
+#[device(traits(OpenClose))]
 pub struct ContactSensor {
     config: Config,
     state: Arc<RwLock<State>>,
@@ -165,14 +165,17 @@ impl OnMqtt for ContactSensor {
                 return;
             }
 
-            self.config.callback.call(self, &!is_closed).await;
+            self.config.callback.call((self.clone(), !is_closed)).await;
 
             debug!(id = self.get_id(), "Updating state to {is_closed}");
             self.state_mut().await.is_closed = is_closed;
         }
 
         if let Some(battery) = message.battery {
-            self.config.battery_callback.call(self, &battery).await;
+            self.config
+                .battery_callback
+                .call((self.clone(), battery))
+                .await;
         }
     }
 }

automation_devices/src/hue_bridge.rs

@@ -3,8 +3,7 @@ use std::net::SocketAddr;
 
 use async_trait::async_trait;
 use automation_lib::device::{Device, LuaDeviceCreate};
-use automation_lib::lua::traits::AddAdditionalMethods;
+use automation_macro::{Device, LuaDeviceConfig};
-use automation_macro::{LuaDevice, LuaDeviceConfig};
 use mlua::LuaSerdeExt;
 use serde::{Deserialize, Serialize};
 use tracing::{error, trace, warn};
@@ -31,8 +30,8 @@ pub struct Config {
     pub flags: FlagIDs,
 }
 
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
-#[traits(AddAdditionalMethods)]
+#[device(add_methods(Self::add_methods))]
 pub struct HueBridge {
     config: Config,
 }
@@ -84,19 +83,8 @@ impl HueBridge {
             }
         }
     }
-}
 
-impl Device for HueBridge {
+    fn add_methods<M: mlua::UserDataMethods<Self>>(methods: &mut M) {
-    fn get_id(&self) -> String {
-        self.config.identifier.clone()
-    }
-}
-
-impl AddAdditionalMethods for HueBridge {
-    fn add_methods<M: mlua::UserDataMethods<Self>>(methods: &mut M)
-    where
-        Self: Sized + 'static,
-    {
         methods.add_async_method(
             "set_flag",
             async |lua, this, (flag, value): (mlua::Value, bool)| {
@@ -109,3 +97,9 @@ impl AddAdditionalMethods for HueBridge {
         );
     }
 }
+
+impl Device for HueBridge {
+    fn get_id(&self) -> String {
+        self.config.identifier.clone()
+    }
+}

automation_devices/src/hue_group.rs

@@ -2,7 +2,7 @@ use std::net::SocketAddr;
 
 use anyhow::Result;
 use async_trait::async_trait;
-use automation_macro::{LuaDevice, LuaDeviceConfig};
+use automation_macro::{Device, LuaDeviceConfig};
 use google_home::errors::ErrorCode;
 use google_home::traits::OnOff;
 use tracing::{error, trace, warn};
@@ -19,8 +19,8 @@ pub struct Config {
     pub scene_id: String,
 }
 
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
-#[traits(OnOff)]
+#[device(traits(OnOff))]
 pub struct HueGroup {
     config: Config,
 }

automation_devices/src/hue_switch.rs

@@ -4,7 +4,7 @@ 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::{LuaDevice, LuaDeviceConfig};
+use automation_macro::{Device, LuaDeviceConfig};
 use rumqttc::{Publish, matches};
 use serde::Deserialize;
 use tracing::{debug, trace, warn};
@@ -21,19 +21,19 @@ pub struct Config {
     pub client: WrappedAsyncClient,
 
     #[device_config(from_lua, default)]
-    pub left_callback: ActionCallback<HueSwitch, ()>,
+    pub left_callback: ActionCallback<HueSwitch>,
 
     #[device_config(from_lua, default)]
-    pub right_callback: ActionCallback<HueSwitch, ()>,
+    pub right_callback: ActionCallback<HueSwitch>,
 
     #[device_config(from_lua, default)]
-    pub left_hold_callback: ActionCallback<HueSwitch, ()>,
+    pub left_hold_callback: ActionCallback<HueSwitch>,
 
     #[device_config(from_lua, default)]
-    pub right_hold_callback: ActionCallback<HueSwitch, ()>,
+    pub right_hold_callback: ActionCallback<HueSwitch>,
 
     #[device_config(from_lua, default)]
-    pub battery_callback: ActionCallback<HueSwitch, f32>,
+    pub battery_callback: ActionCallback<(HueSwitch, f32)>,
 }
 
 #[derive(Debug, Copy, Clone, Deserialize)]
@@ -55,7 +55,7 @@ struct State {
     battery: Option<f32>,
 }
 
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
 pub struct HueSwitch {
     config: Config,
 }
@@ -104,19 +104,21 @@ impl OnMqtt for HueSwitch {
                 );
 
                 match action {
-                    Action::LeftPressRelease => self.config.left_callback.call(self, &()).await,
+                    Action::LeftPressRelease => self.config.left_callback.call(self.clone()).await,
-                    Action::RightPressRelease => self.config.right_callback.call(self, &()).await,
+                    Action::RightPressRelease => {
-                    Action::LeftHold => self.config.left_hold_callback.call(self, &()).await,
+                        self.config.right_callback.call(self.clone()).await
-                    Action::RightHold => self.config.right_hold_callback.call(self, &()).await,
+                    }
+                    Action::LeftHold => self.config.left_hold_callback.call(self.clone()).await,
+                    Action::RightHold => self.config.right_hold_callback.call(self.clone()).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() {
+                        if self.config.right_hold_callback.is_empty() {
-                            self.config.right_callback.call(self, &()).await
+                            self.config.right_callback.call(self.clone()).await
                         }
                     }
                     Action::LeftHoldRelease => {
-                        if !self.config.left_hold_callback.is_set() {
+                        if self.config.left_hold_callback.is_empty() {
-                            self.config.left_callback.call(self, &()).await
+                            self.config.left_callback.call(self.clone()).await
                         }
                     }
                     _ => {}
@@ -124,7 +126,10 @@ impl OnMqtt for HueSwitch {
             }
 
             if let Some(battery) = message.battery {
-                self.config.battery_callback.call(self, &battery).await;
+                self.config
+                    .battery_callback
+                    .call((self.clone(), battery))
+                    .await;
             }
         }
     }

automation_devices/src/ikea_remote.rs

@@ -5,7 +5,7 @@ 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::{LuaDevice, LuaDeviceConfig};
+use automation_macro::{Device, LuaDeviceConfig};
 use rumqttc::{Publish, matches};
 use tracing::{debug, error, trace};
 
@@ -24,12 +24,12 @@ pub struct Config {
     pub client: WrappedAsyncClient,
 
     #[device_config(from_lua, default)]
-    pub callback: ActionCallback<IkeaRemote, bool>,
+    pub callback: ActionCallback<(IkeaRemote, bool)>,
     #[device_config(from_lua, default)]
-    pub battery_callback: ActionCallback<IkeaRemote, f32>,
+    pub battery_callback: ActionCallback<(IkeaRemote, f32)>,
 }
 
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
 pub struct IkeaRemote {
     config: Config,
 }
@@ -88,12 +88,15 @@ impl OnMqtt for IkeaRemote {
                 };
 
                 if let Some(on) = on {
-                    self.config.callback.call(self, &on).await;
+                    self.config.callback.call((self.clone(), on)).await;
                 }
             }
 
             if let Some(battery) = message.battery {
-                self.config.battery_callback.call(self, &battery).await;
+                self.config
+                    .battery_callback
+                    .call((self.clone(), battery))
+                    .await;
             }
         }
     }

automation_devices/src/kasa_outlet.rs

@@ -4,7 +4,7 @@ use std::str::Utf8Error;
 
 use async_trait::async_trait;
 use automation_lib::device::{Device, LuaDeviceCreate};
-use automation_macro::{LuaDevice, LuaDeviceConfig};
+use automation_macro::{Device, LuaDeviceConfig};
 use bytes::{Buf, BufMut};
 use google_home::errors::{self, DeviceError};
 use google_home::traits::OnOff;
@@ -21,8 +21,8 @@ pub struct Config {
     pub addr: SocketAddr,
 }
 
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
-#[traits(OnOff)]
+#[device(traits(OnOff))]
 pub struct KasaOutlet {
     config: Config,
 }

automation_devices/src/light_sensor.rs

@@ -7,7 +7,7 @@ use automation_lib::device::{Device, LuaDeviceCreate};
 use automation_lib::event::OnMqtt;
 use automation_lib::messages::BrightnessMessage;
 use automation_lib::mqtt::WrappedAsyncClient;
-use automation_macro::{LuaDevice, LuaDeviceConfig};
+use automation_macro::{Device, LuaDeviceConfig};
 use rumqttc::Publish;
 use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 use tracing::{debug, trace, warn};
@@ -21,7 +21,7 @@ pub struct Config {
     pub max: isize,
 
     #[device_config(from_lua, default)]
-    pub callback: ActionCallback<LightSensor, bool>,
+    pub callback: ActionCallback<(LightSensor, bool)>,
 
     #[device_config(from_lua)]
     pub client: WrappedAsyncClient,
@@ -34,7 +34,7 @@ pub struct State {
     is_dark: bool,
 }
 
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
 pub struct LightSensor {
     config: Config,
     state: Arc<RwLock<State>>,
@@ -114,7 +114,7 @@ impl OnMqtt for LightSensor {
 
             self.config
                 .callback
-                .call(self, &!self.state().await.is_dark)
+                .call((self.clone(), !self.state().await.is_dark))
                 .await;
         }
     }

automation_devices/src/ntfy.rs

@@ -3,8 +3,7 @@ use std::convert::Infallible;
 
 use async_trait::async_trait;
 use automation_lib::device::{Device, LuaDeviceCreate};
-use automation_lib::lua::traits::AddAdditionalMethods;
+use automation_macro::{Device, LuaDeviceConfig};
-use automation_macro::{LuaDevice, LuaDeviceConfig};
 use mlua::LuaSerdeExt;
 use serde::{Deserialize, Serialize};
 use serde_repr::*;
@@ -118,12 +117,27 @@ pub struct Config {
     pub topic: String,
 }
 
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
-#[traits(AddAdditionalMethods)]
+#[device(add_methods(Self::add_methods))]
 pub struct Ntfy {
     config: Config,
 }
 
+impl Ntfy {
+    fn add_methods<M: mlua::UserDataMethods<Self>>(methods: &mut M) {
+        methods.add_async_method(
+            "send_notification",
+            async |lua, this, notification: mlua::Value| {
+                let notification: Notification = lua.from_value(notification)?;
+
+                this.send(notification).await;
+
+                Ok(())
+            },
+        );
+    }
+}
+
 #[async_trait]
 impl LuaDeviceCreate for Ntfy {
     type Config = Config;
@@ -162,21 +176,3 @@ impl Ntfy {
         }
     }
 }
-
-impl AddAdditionalMethods for Ntfy {
-    fn add_methods<M: mlua::UserDataMethods<Self>>(methods: &mut M)
-    where
-        Self: Sized + 'static,
-    {
-        methods.add_async_method(
-            "send_notification",
-            async |lua, this, notification: mlua::Value| {
-                let notification: Notification = lua.from_value(notification)?;
-
-                this.send(notification).await;
-
-                Ok(())
-            },
-        );
-    }
-}

automation_devices/src/presence.rs

@@ -6,10 +6,9 @@ use automation_lib::action_callback::ActionCallback;
 use automation_lib::config::MqttDeviceConfig;
 use automation_lib::device::{Device, LuaDeviceCreate};
 use automation_lib::event::OnMqtt;
-use automation_lib::lua::traits::AddAdditionalMethods;
 use automation_lib::messages::PresenceMessage;
 use automation_lib::mqtt::WrappedAsyncClient;
-use automation_macro::{LuaDevice, LuaDeviceConfig};
+use automation_macro::{Device, LuaDeviceConfig};
 use rumqttc::Publish;
 use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 use tracing::{debug, trace, warn};
@@ -20,7 +19,7 @@ pub struct Config {
     pub mqtt: MqttDeviceConfig,
 
     #[device_config(from_lua, default)]
-    pub callback: ActionCallback<Presence, bool>,
+    pub callback: ActionCallback<(Presence, bool)>,
 
     #[device_config(from_lua)]
     pub client: WrappedAsyncClient,
@@ -34,8 +33,8 @@ pub struct State {
     current_overall_presence: bool,
 }
 
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
-#[traits(AddAdditionalMethods)]
+#[device(add_methods(Self::add_methods))]
 pub struct Presence {
     config: Config,
     state: Arc<RwLock<State>>,
@@ -49,6 +48,12 @@ impl Presence {
     async fn state_mut(&self) -> RwLockWriteGuard<'_, State> {
         self.state.write().await
     }
+
+    fn add_methods<M: mlua::UserDataMethods<Self>>(methods: &mut M) {
+        methods.add_async_method("overall_presence", async |_lua, this, ()| {
+            Ok(this.state().await.current_overall_presence)
+        });
+    }
 }
 
 #[async_trait]
@@ -118,18 +123,10 @@ impl OnMqtt for Presence {
             debug!("Overall presence updated: {overall_presence}");
             self.state_mut().await.current_overall_presence = overall_presence;
 
-            self.config.callback.call(self, &overall_presence).await;
+            self.config
+                .callback
+                .call((self.clone(), overall_presence))
+                .await;
         }
     }
 }
-
-impl AddAdditionalMethods for Presence {
-    fn add_methods<M: mlua::UserDataMethods<Self>>(methods: &mut M)
-    where
-        Self: Sized + 'static,
-    {
-        methods.add_async_method("overall_presence", async |_lua, this, ()| {
-            Ok(this.state().await.current_overall_presence)
-        });
-    }
-}

automation_devices/src/wake_on_lan.rs

@@ -6,7 +6,7 @@ use automation_lib::device::{Device, LuaDeviceCreate};
 use automation_lib::event::OnMqtt;
 use automation_lib::messages::ActivateMessage;
 use automation_lib::mqtt::WrappedAsyncClient;
-use automation_macro::{LuaDevice, LuaDeviceConfig};
+use automation_macro::{Device, LuaDeviceConfig};
 use eui48::MacAddress;
 use google_home::device;
 use google_home::errors::ErrorCode;
@@ -28,7 +28,7 @@ pub struct Config {
     pub client: WrappedAsyncClient,
 }
 
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
 pub struct WakeOnLAN {
     config: Config,
 }

automation_devices/src/washer.rs

@@ -7,7 +7,7 @@ use automation_lib::device::{Device, LuaDeviceCreate};
 use automation_lib::event::OnMqtt;
 use automation_lib::messages::PowerMessage;
 use automation_lib::mqtt::WrappedAsyncClient;
-use automation_macro::{LuaDevice, LuaDeviceConfig};
+use automation_macro::{Device, LuaDeviceConfig};
 use rumqttc::Publish;
 use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 use tracing::{debug, error, trace};
@@ -21,7 +21,7 @@ pub struct Config {
     pub threshold: f32,
 
     #[device_config(from_lua, default)]
-    pub done_callback: ActionCallback<Washer, ()>,
+    pub done_callback: ActionCallback<Washer>,
 
     #[device_config(from_lua)]
     pub client: WrappedAsyncClient,
@@ -33,7 +33,7 @@ pub struct State {
 }
 
 // TODO: Add google home integration
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
 pub struct Washer {
     config: Config,
     state: Arc<RwLock<State>>,
@@ -109,7 +109,7 @@ impl OnMqtt for Washer {
 
             self.state_mut().await.running = 0;
 
-            self.config.done_callback.call(self, &()).await;
+            self.config.done_callback.call(self.clone()).await;
         } else if power < self.config.threshold {
             // Prevent false positives
             self.state_mut().await.running = 0;

automation_devices/src/zigbee/light.rs

@@ -10,7 +10,7 @@ use automation_lib::device::{Device, LuaDeviceCreate};
 use automation_lib::event::OnMqtt;
 use automation_lib::helpers::serialization::state_deserializer;
 use automation_lib::mqtt::WrappedAsyncClient;
-use automation_macro::{LuaDevice, LuaDeviceConfig, LuaSerialize};
+use automation_macro::{Device, LuaDeviceConfig, LuaSerialize};
 use google_home::device;
 use google_home::errors::ErrorCode;
 use google_home::traits::{Brightness, Color, ColorSetting, ColorTemperatureRange, OnOff};
@@ -34,7 +34,7 @@ pub struct Config<T: LightState> {
     pub mqtt: MqttDeviceConfig,
 
     #[device_config(from_lua, default)]
-    pub callback: ActionCallback<Light<T>, T>,
+    pub callback: ActionCallback<(Light<T>, T)>,
 
     #[device_config(from_lua)]
     pub client: WrappedAsyncClient,
@@ -88,10 +88,10 @@ impl From<StateColorTemperature> for StateBrightness {
     }
 }
 
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
-#[traits(<StateOnOff>: OnOff)]
+#[device(traits(OnOff for <StateOnOff>, <StateBrightness>, <StateColorTemperature>))]
-#[traits(<StateBrightness>: OnOff, Brightness)]
+#[device(traits(Brightness for <StateBrightness>, <StateColorTemperature>))]
-#[traits(<StateColorTemperature>: OnOff, Brightness, ColorSetting)]
+#[device(traits(ColorSetting for <StateColorTemperature>))]
 pub struct Light<T: LightState> {
     config: Config<T>,
 
@@ -165,7 +165,7 @@ impl OnMqtt for Light<StateOnOff> {
 
             self.config
                 .callback
-                .call(self, self.state().await.deref())
+                .call((self.clone(), self.state().await.clone()))
                 .await;
         }
     }
@@ -204,7 +204,7 @@ impl OnMqtt for Light<StateBrightness> {
 
             self.config
                 .callback
-                .call(self, self.state().await.deref())
+                .call((self.clone(), self.state().await.clone()))
                 .await;
         }
     }
@@ -245,7 +245,7 @@ impl OnMqtt for Light<StateColorTemperature> {
 
             self.config
                 .callback
-                .call(self, self.state().await.deref())
+                .call((self.clone(), self.state().await.clone()))
                 .await;
         }
     }

automation_devices/src/zigbee/outlet.rs

@@ -10,7 +10,7 @@ use automation_lib::device::{Device, LuaDeviceCreate};
 use automation_lib::event::OnMqtt;
 use automation_lib::helpers::serialization::state_deserializer;
 use automation_lib::mqtt::WrappedAsyncClient;
-use automation_macro::{LuaDevice, LuaDeviceConfig, LuaSerialize};
+use automation_macro::{Device, LuaDeviceConfig, LuaSerialize};
 use google_home::device;
 use google_home::errors::ErrorCode;
 use google_home::traits::OnOff;
@@ -51,7 +51,7 @@ pub struct Config<T: OutletState> {
     pub outlet_type: OutletType,
 
     #[device_config(from_lua, default)]
-    pub callback: ActionCallback<Outlet<T>, T>,
+    pub callback: ActionCallback<(Outlet<T>, T)>,
 
     #[device_config(from_lua)]
     pub client: WrappedAsyncClient,
@@ -80,9 +80,8 @@ impl From<StatePower> for StateOnOff {
     }
 }
 
-#[derive(Debug, Clone, LuaDevice)]
+#[derive(Debug, Clone, Device)]
-#[traits(<StateOnOff>: OnOff)]
+#[device(traits(OnOff for <StateOnOff>, <StatePower>))]
-#[traits(<StatePower>: OnOff)]
 pub struct Outlet<T: OutletState> {
     config: Config<T>,
 
@@ -155,7 +154,7 @@ impl OnMqtt for Outlet<StateOnOff> {
 
             self.config
                 .callback
-                .call(self, self.state().await.deref())
+                .call((self.clone(), self.state().await.clone()))
                 .await;
         }
     }
@@ -192,7 +191,7 @@ impl OnMqtt for Outlet<StatePower> {
 
             self.config
                 .callback
-                .call(self, self.state().await.deref())
+                .call((self.clone(), self.state().await.clone()))
                 .await;
         }
     }

automation_lib/src/action_callback.rs

@@ -1,34 +1,28 @@
 use std::marker::PhantomData;
 
 use futures::future::try_join_all;
-use mlua::{FromLua, IntoLua, LuaSerdeExt};
+use mlua::{FromLua, IntoLuaMulti};
-use serde::Serialize;
 
 #[derive(Debug, Clone)]
-struct Internal {
+pub struct ActionCallback<P> {
     callbacks: Vec<mlua::Function>,
-    lua: mlua::Lua,
+    _parameters: PhantomData<P>,
 }
 
-#[derive(Debug, Clone)]
+// NOTE: For some reason the derive macro combined with PhantomData leads to issues where it
-pub struct ActionCallback<T, S> {
+// requires all types part of P to implement default, even if they never actually get constructed.
-    internal: Option<Internal>,
+// By manually implemented Default it works fine.
-    _this: PhantomData<T>,
+impl<P> Default for ActionCallback<P> {
-    _state: PhantomData<S>,
-}
-
-impl<T, S> Default for ActionCallback<T, S> {
     fn default() -> Self {
         Self {
-            internal: None,
+            callbacks: Default::default(),
-            _this: PhantomData::<T>,
+            _parameters: Default::default(),
-            _state: PhantomData::<S>,
         }
     }
 }
 
-impl<T, S> FromLua for ActionCallback<T, S> {
+impl<P> FromLua for ActionCallback<P> {
-    fn from_lua(value: mlua::Value, lua: &mlua::Lua) -> mlua::Result<Self> {
+    fn from_lua(value: mlua::Value, _lua: &mlua::Lua) -> mlua::Result<Self> {
         let callbacks = match value {
             mlua::Value::Function(f) => vec![f],
             mlua::Value::Table(table) => table
@@ -49,40 +43,28 @@ impl<T, S> FromLua for ActionCallback<T, S> {
         };
 
         Ok(ActionCallback {
-            internal: Some(Internal {
+            callbacks,
-                callbacks,
+            _parameters: PhantomData::<P>,
-                lua: lua.clone(),
-            }),
-            _this: PhantomData::<T>,
-            _state: PhantomData::<S>,
         })
     }
 }
 
 // TODO: Return proper error here
-impl<T, S> ActionCallback<T, S>
+impl<P> ActionCallback<P>
 where
-    T: IntoLua + Sync + Send + Clone + 'static,
+    P: IntoLuaMulti + Sync + Clone,
-    S: Serialize,
 {
-    pub async fn call(&self, this: &T, state: &S) {
+    pub async fn call(&self, parameters: P) {
-        let Some(internal) = self.internal.as_ref() else {
-            return;
-        };
-
-        let state = internal.lua.to_value(state).unwrap();
-
         try_join_all(
-            internal
+            self.callbacks
-                .callbacks
                 .iter()
-                .map(async |f| f.call_async::<()>((this.clone(), state.clone())).await),
+                .map(async |f| f.call_async::<()>(parameters.clone()).await),
         )
         .await
         .unwrap();
     }
 
-    pub fn is_set(&self) -> bool {
+    pub fn is_empty(&self) -> bool {
-        self.internal.is_some()
+        self.callbacks.is_empty()
     }
 }

automation_lib/src/helpers/timeout.rs

@@ -29,7 +29,7 @@ impl mlua::UserData for Timeout {
 
         methods.add_async_method(
             "start",
-            async |_lua, this, (timeout, callback): (f32, ActionCallback<mlua::Value, bool>)| {
+            async |_lua, this, (timeout, callback): (f32, ActionCallback<()>)| {
                 if let Some(handle) = this.state.write().await.handle.take() {
                     handle.abort();
                 }
@@ -42,7 +42,7 @@ impl mlua::UserData for Timeout {
                     async move {
                         tokio::time::sleep(timeout).await;
 
-                        callback.call(&mlua::Nil, &false).await;
+                        callback.call(()).await;
                     }
                 }));
 

automation_lib/src/lua/traits.rs

@@ -78,9 +78,3 @@ pub trait OpenClose {
     }
 }
 impl<T> OpenClose for T where T: google_home::traits::OpenClose {}
-
-pub trait AddAdditionalMethods {
-    fn add_methods<M: mlua::UserDataMethods<Self>>(methods: &mut M)
-    where
-        Self: Sized + 'static;
-}

automation_lib/src/mqtt.rs

@@ -28,7 +28,13 @@ impl mlua::UserData for WrappedAsyncClient {
         methods.add_async_method(
             "send_message",
             async |_lua, this, (topic, message): (String, mlua::Value)| {
-                let message = serde_json::to_string(&message).unwrap();
+                // serde_json converts nil => "null", but we actually want nil to send an empty
+                // message
+                let message = if message.is_nil() {
+                    "".into()
+                } else {
+                    serde_json::to_string(&message).unwrap()
+                };
 
                 debug!("message = {message}");
 

automation_macro/Cargo.toml

@@ -11,3 +11,6 @@ itertools = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn = { workspace = true }
+
+[dev-dependencies]
+mlua = { workspace = true }

automation_macro/src/device.rs

@@ -0,0 +1,235 @@
+use std::collections::HashMap;
+
+use proc_macro2::TokenStream as TokenStream2;
+use quote::{ToTokens, quote};
+use syn::parse::{Parse, ParseStream};
+use syn::punctuated::Punctuated;
+use syn::{Attribute, DeriveInput, Token, parenthesized};
+
+enum Attr {
+    Trait(TraitAttr),
+    AddMethods(AddMethodsAttr),
+}
+
+impl Parse for Attr {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        let ident: syn::Ident = input.parse()?;
+
+        let attr;
+        _ = parenthesized!(attr in input);
+
+        let attr = match ident.to_string().as_str() {
+            "traits" => Attr::Trait(attr.parse()?),
+            "add_methods" => Attr::AddMethods(attr.parse()?),
+            _ => {
+                return Err(syn::Error::new(
+                    ident.span(),
+                    "Expected 'traits' or 'add_methods'",
+                ));
+            }
+        };
+
+        Ok(attr)
+    }
+}
+
+struct TraitAttr {
+    traits: Traits,
+    generics: Generics,
+}
+
+impl Parse for TraitAttr {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        Ok(Self {
+            traits: input.parse()?,
+            generics: input.parse()?,
+        })
+    }
+}
+
+#[derive(Default)]
+struct Traits(Vec<syn::Ident>);
+
+impl Traits {
+    fn extend(&mut self, other: &Traits) {
+        self.0.extend_from_slice(&other.0);
+    }
+}
+
+impl Parse for Traits {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        input
+            .call(Punctuated::<_, Token![,]>::parse_separated_nonempty)
+            .map(|traits| traits.into_iter().collect())
+            .map(Self)
+    }
+}
+
+impl ToTokens for Traits {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
+        let Self(traits) = &self;
+
+        tokens.extend(quote! {
+            #(
+                ::automation_lib::lua::traits::#traits::add_methods(methods);
+            )*
+        });
+    }
+}
+
+#[derive(Default)]
+struct Generics(Vec<syn::AngleBracketedGenericArguments>);
+
+impl Generics {
+    fn has_generics(&self) -> bool {
+        !self.0.is_empty()
+    }
+}
+
+impl Parse for Generics {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        if !input.peek(Token![for]) {
+            if input.is_empty() {
+                return Ok(Default::default());
+            } else {
+                return Err(input.error("Expected ')' or 'for'"));
+            }
+        }
+
+        _ = input.parse::<syn::Token![for]>()?;
+
+        input
+            .call(Punctuated::<_, Token![,]>::parse_separated_nonempty)
+            .map(|generics| generics.into_iter().collect())
+            .map(Self)
+    }
+}
+
+#[derive(Clone)]
+struct AddMethodsAttr(syn::Path);
+
+impl Parse for AddMethodsAttr {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        Ok(Self(input.parse()?))
+    }
+}
+
+impl ToTokens for AddMethodsAttr {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
+        let Self(path) = self;
+
+        tokens.extend(quote! {
+            #path
+        });
+    }
+}
+
+struct Implementation {
+    generics: Option<syn::AngleBracketedGenericArguments>,
+    traits: Traits,
+    add_methods: Vec<AddMethodsAttr>,
+}
+
+impl quote::ToTokens for Implementation {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
+        let Self {
+            generics,
+            traits,
+            add_methods,
+        } = &self;
+
+        tokens.extend(quote! {
+            #generics {
+                fn add_methods<M: mlua::UserDataMethods<Self>>(methods: &mut M) {
+                    methods.add_async_function("new", async |_lua, config| {
+                        let device: Self = 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", async |_lua, this, _: ()| { Ok(this.get_id()) });
+
+					#traits
+
+					#(
+						#add_methods(methods);
+					)*
+                }
+            }
+        });
+    }
+}
+
+struct Implementations(Vec<Implementation>);
+
+impl From<Vec<Attr>> for Implementations {
+    fn from(attributes: Vec<Attr>) -> Self {
+        let mut add_methods = Vec::new();
+        let mut all = Traits::default();
+        let mut implementations: HashMap<_, Traits> = HashMap::new();
+        for attribute in attributes {
+            match attribute {
+                Attr::Trait(attribute) => {
+                    if attribute.generics.has_generics() {
+                        for generic in &attribute.generics.0 {
+                            implementations
+                                .entry(Some(generic.clone()))
+                                .or_default()
+                                .extend(&attribute.traits);
+                        }
+                    } else {
+                        all.extend(&attribute.traits);
+                    }
+                }
+                Attr::AddMethods(attribute) => add_methods.push(attribute),
+            }
+        }
+
+        if implementations.is_empty() {
+            implementations.entry(None).or_default().extend(&all);
+        } else {
+            for traits in implementations.values_mut() {
+                traits.extend(&all);
+            }
+        }
+
+        Self(
+            implementations
+                .into_iter()
+                .map(|(generics, traits)| Implementation {
+                    generics,
+                    traits,
+                    add_methods: add_methods.clone(),
+                })
+                .collect(),
+        )
+    }
+}
+
+pub fn device(input: &DeriveInput) -> TokenStream2 {
+    let name = &input.ident;
+
+    let Implementations(imp) = match input
+        .attrs
+        .iter()
+        .filter(|attr| attr.path().is_ident("device"))
+        .map(Attribute::parse_args)
+        .try_collect::<Vec<_>>()
+    {
+        Ok(result) => result.into(),
+        Err(err) => return err.into_compile_error(),
+    };
+
+    quote! {
+        #(
+            impl mlua::UserData for #name #imp
+        )*
+    }
+}

automation_macro/src/impl_device.rs

@@ -1,88 +0,0 @@
-use proc_macro2::TokenStream;
-use quote::{ToTokens, quote};
-use syn::parse::Parse;
-use syn::punctuated::Punctuated;
-use syn::{AngleBracketedGenericArguments, Attribute, DeriveInput, Ident, Path, Token};
-
-#[derive(Debug, Default)]
-struct Impl {
-    generics: Option<AngleBracketedGenericArguments>,
-    traits: Vec<Path>,
-}
-
-impl Parse for Impl {
-    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-        let generics = if input.peek(Token![<]) {
-            let generics = input.parse()?;
-            input.parse::<Token![:]>()?;
-
-            Some(generics)
-        } else {
-            None
-        };
-
-        let traits: Punctuated<_, _> = input.parse_terminated(Path::parse, Token![,])?;
-        let traits = traits.into_iter().collect();
-
-        Ok(Impl { generics, traits })
-    }
-}
-
-impl Impl {
-    fn generate(&self, name: &Ident) -> TokenStream {
-        let generics = &self.generics;
-
-        // If an identifier is specified, assume it is placed in ::automation_lib::lua::traits,
-        // otherwise use the provided path
-        let traits = self.traits.iter().map(|t| {
-            if let Some(ident) = t.get_ident() {
-                quote! {::automation_lib::lua::traits::#ident }
-            } else {
-                t.to_token_stream()
-            }
-        });
-
-        quote! {
-            impl mlua::UserData for #name #generics {
-                fn add_methods<M: mlua::UserDataMethods<Self>>(methods: &mut M) {
-                    methods.add_async_function("new", async |_lua, config| {
-                        let device: Self = 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", async |_lua, this, _: ()| { Ok(this.get_id()) });
-
-                    #(
-                        #traits::add_methods(methods);
-                    )*
-                }
-            }
-        }
-    }
-}
-
-pub fn impl_device_macro(ast: &DeriveInput) -> TokenStream {
-    let name = &ast.ident;
-
-    let impls: TokenStream = ast
-        .attrs
-        .iter()
-        .filter(|attr| attr.path().is_ident("traits"))
-        .flat_map(Attribute::parse_args::<Impl>)
-        .map(|im| im.generate(name))
-        .collect();
-
-    if impls.is_empty() {
-        Impl::default().generate(name)
-    } else {
-        impls
-    }
-}

automation_macro/src/lib.rs

@@ -1,13 +1,12 @@
 #![feature(iter_intersperse)]
-mod impl_device;
+#![feature(iterator_try_collect)]
+mod device;
 mod lua_device_config;
 
 use lua_device_config::impl_lua_device_config_macro;
 use quote::quote;
 use syn::{DeriveInput, parse_macro_input};
 
-use crate::impl_device::impl_device_macro;
-
 #[proc_macro_derive(LuaDeviceConfig, attributes(device_config))]
 pub fn lua_device_config_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = parse_macro_input!(input as DeriveInput);
@@ -15,13 +14,6 @@ pub fn lua_device_config_derive(input: proc_macro::TokenStream) -> proc_macro::T
     impl_lua_device_config_macro(&ast).into()
 }
 
-#[proc_macro_derive(LuaDevice, attributes(traits))]
-pub fn impl_device(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let ast = parse_macro_input!(input as DeriveInput);
-
-    impl_device_macro(&ast).into()
-}
-
 #[proc_macro_derive(LuaSerialize, attributes(traits))]
 pub fn lua_serialize(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = parse_macro_input!(input as DeriveInput);
@@ -37,3 +29,45 @@ pub fn lua_serialize(input: proc_macro::TokenStream) -> proc_macro::TokenStream
     }
     .into()
 }
+
+/// Derive macro generating an impl for the trait `::mlua::UserData`
+///
+/// # Device traits
+/// The `device(traits)` attribute can be used to tell the macro what traits are implemented so that
+/// the appropriate methods can automatically be registered.
+/// If the struct does not have any type parameters the syntax is very simple:
+/// ```rust
+/// #[device(traits(TraitA, TraitB))]
+/// ```
+///
+/// If the type does have type parameters you will have to manually specify all variations that
+/// have the trait available:
+/// ```rust
+/// #[device(traits(TraitA, TraitB for <StateA>, <StateB>))]
+/// ```
+/// If multiple of these attributes are specified they will all combined appropriately.
+///
+///
+/// ## NOTE
+/// If your type _has_ type parameters any instance of the traits attribute that does not specify
+/// any type parameters will have the traits applied to _all_ other type parameter variations
+/// listed in the other trait attributes. This behavior only applies if there is at least one
+/// instance with type parameters specified.
+///
+/// # Additional methods
+/// Additional methods can be added by using the `device(add_methods)` attribute. This attribute
+/// takes the path to a function with the following signature that can register the additional methods:
+///
+/// ```rust
+/// # struct D;
+/// fn top_secret<M: mlua::UserDataMethods<D>>(methods: &mut M) {}
+/// ```
+/// It can then be registered with:
+/// ```rust
+/// #[device(add_methods(top_secret))]
+/// ```
+#[proc_macro_derive(Device, attributes(device))]
+pub fn device(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let ast = parse_macro_input!(input as DeriveInput);
+    device::device(&ast).into()
+}

config.lua

@@ -425,49 +425,57 @@ device_manager:add(HueSwitch.new({
 local hallway_light_automation = {
 	timeout = Timeout.new(),
 	forced = false,
-	switch_callback = function(self, on)
+	switch_callback = function(self)
-		self.timeout:cancel()
+		return function(_, on)
-		self.group.set_on(on)
-		self.forced = on
-	end,
-	door_callback = function(self, open)
-		if open then
 			self.timeout:cancel()
-
+			self.group.set_on(on)
-			self.group.set_on(true)
+			self.forced = on
-		elseif not self.forced then
-			self.timeout:start(debug and 10 or 2 * 60, function()
-				if self.trash == nil or self.trash:open_percent() == 0 then
-					self.group.set_on(false)
-				end
-			end)
 		end
 	end,
-	trash_callback = function(self, open)
+	door_callback = function(self)
-		if open then
+		return function(_, open)
-			self.group.set_on(true)
+			if open then
-		else
+				self.timeout:cancel()
-			if
+
-				not self.timeout:is_waiting()
+				self.group.set_on(true)
-				and (self.door == nil or self.door:open_percent() == 0)
+			elseif not self.forced then
-				and not self.forced
+				self.timeout:start(debug and 10 or 2 * 60, function()
-			then
+					if self.trash == nil or self.trash:open_percent() == 0 then
-				self.group.set_on(false)
+						self.group.set_on(false)
+					end
+				end)
 			end
 		end
 	end,
-	light_callback = function(self, on)
+	trash_callback = function(self)
-		if
+		return function(_, open)
-			on
+			if open then
-			and (self.trash == nil or self.trash:open_percent()) == 0
+				self.group.set_on(true)
-			and (self.door == nil or self.door:open_percent() == 0)
+			else
-		then
+				if
-			-- If the door and trash are not open, that means the light got turned on manually
+					not self.timeout:is_waiting()
-			self.timeout:cancel()
+					and (self.door == nil or self.door:open_percent() == 0)
-			self.forced = true
+					and not self.forced
-		elseif not on then
+				then
-			-- The light is never forced when it is off
+					self.group.set_on(false)
-			self.forced = false
+				end
+			end
+		end
+	end,
+	light_callback = function(self)
+		return function(_, state)
+			if
+				state.on
+				and (self.trash == nil or self.trash:open_percent()) == 0
+				and (self.door == nil or 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 state.on then
+				-- The light is never forced when it is off
+				self.forced = false
+			end
 		end
 	end,
 }
@@ -477,9 +485,7 @@ local hallway_storage = LightBrightness.new({
 	room = "Hallway",
 	topic = mqtt_z2m("hallway/storage"),
 	client = mqtt_client,
-	callback = function(_, state)
+	callback = hallway_light_automation:light_callback(),
-		hallway_light_automation:light_callback(state.state)
-	end,
 })
 turn_off_when_away(hallway_storage)
 device_manager:add(hallway_storage)
@@ -504,13 +510,12 @@ hallway_light_automation.group = {
 	end,
 }
 
-local frontdoor_presence = {
+local function presence(duration)
-	timeout = Timeout.new(),
+	local timeout = Timeout.new()
-}
+
-setmetatable(frontdoor_presence, {
+	return function(_, open)
-	__call = function(self, open)
 		if open then
-			self.timeout:cancel()
+			timeout:cancel()
 
 			if not presence_system:overall_presence() then
 				mqtt_client:send_message(mqtt_automation("presence/contact/frontdoor"), {
@@ -519,21 +524,19 @@ setmetatable(frontdoor_presence, {
 				})
 			end
 		else
-			self.timeout:start(debug and 10 or 15 * 60, function()
+			timeout:start(duration, function()
-				mqtt_client:send_message(mqtt_automation("presence/contact/frontdoor"), {})
+				mqtt_client:send_message(mqtt_automation("presence/contact/frontdoor"), nil)
 			end)
 		end
-	end,
+	end
-})
+end
 
 device_manager:add(IkeaRemote.new({
 	name = "Remote",
 	room = "Hallway",
 	client = mqtt_client,
 	topic = mqtt_z2m("hallway/remote"),
-	callback = function(_, on)
+	callback = hallway_light_automation:switch_callback(),
-		hallway_light_automation:switch_callback(on)
-	end,
 	battery_callback = check_battery,
 }))
 local hallway_frontdoor = ContactSensor.new({
@@ -542,14 +545,10 @@ local hallway_frontdoor = ContactSensor.new({
 	sensor_type = "Door",
 	topic = mqtt_z2m("hallway/frontdoor"),
 	client = mqtt_client,
-	presence = {
+	callback = {
-		topic = mqtt_automation("presence/contact/frontdoor"),
+		presence(debug and 10 or 15 * 60),
-		timeout = debug and 10 or 15 * 60,
+		hallway_light_automation:door_callback(),
 	},
-	callback = function(_, open)
-		hallway_light_automation:door_callback(open)
-		frontdoor_presence(open)
-	end,
 	battery_callback = check_battery,
 })
 device_manager:add(hallway_frontdoor)
@@ -561,9 +560,7 @@ local hallway_trash = ContactSensor.new({
 	sensor_type = "Drawer",
 	topic = mqtt_z2m("hallway/trash"),
 	client = mqtt_client,
-	callback = function(_, open)
+	callback = hallway_light_automation:trash_callback(),
-		hallway_light_automation:trash_callback(open)
-	end,
 	battery_callback = check_battery,
 })
 device_manager:add(hallway_trash)

src/main.rs

@@ -7,7 +7,7 @@ mod web;
 use std::net::SocketAddr;
 use std::path::Path;
 use std::process;
-use std::time::{SystemTime, UNIX_EPOCH};
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 use ::config::{Environment, File};
 use automation_lib::config::{FulfillmentConfig, MqttConfig};
@@ -172,6 +172,11 @@ async fn app() -> anyhow::Result<()> {
             .as_millis())
     })?;
     utils.set("get_epoch", get_epoch)?;
+    let sleep = lua.create_async_function(async |_lua, duration: u64| {
+        tokio::time::sleep(Duration::from_millis(duration)).await;
+        Ok(())
+    })?;
+    utils.set("sleep", sleep)?;
     lua.register_module("utils", utils)?;
 
     automation_devices::register_with_lua(&lua)?;