feat(config)!: Config now returns the mqtt config instead of the client

Instead the client is now created on the rust side based on the config.
Devices that require the mqtt client will now instead need to be
constructor using a function. This function receives the mqtt client.

automation_lib/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+automation_macro = { workspace = true }
 async-trait = { workspace = true }
 automation_cast = { workspace = true }
 bytes = { workspace = true }

automation_lib/src/config.rs

@@ -1,34 +1,6 @@
-use std::time::Duration;
-
 use lua_typed::Typed;
-use rumqttc::{MqttOptions, Transport};
 use serde::Deserialize;
 
-#[derive(Debug, Clone, Deserialize, Typed)]
-pub struct MqttConfig {
-    pub host: String,
-    pub port: u16,
-    pub client_name: String,
-    pub username: String,
-    pub password: String,
-    #[serde(default)]
-    pub tls: bool,
-}
-
-impl From<MqttConfig> for MqttOptions {
-    fn from(value: MqttConfig) -> Self {
-        let mut mqtt_options = MqttOptions::new(value.client_name, value.host, value.port);
-        mqtt_options.set_credentials(value.username, value.password);
-        mqtt_options.set_keep_alive(Duration::from_secs(5));
-
-        if value.tls {
-            mqtt_options.set_transport(Transport::tls_with_default_config());
-        }
-
-        mqtt_options
-    }
-}
-
 #[derive(Debug, Clone, Deserialize, Typed)]
 pub struct InfoConfig {
     pub name: String,

automation_lib/src/mqtt.rs

@@ -1,15 +1,41 @@
 use std::ops::{Deref, DerefMut};
+use std::time::Duration;
 
+use automation_macro::LuaDeviceConfig;
 use lua_typed::Typed;
-use mlua::{FromLua, LuaSerdeExt};
-use rumqttc::{AsyncClient, Event, EventLoop, Incoming};
+use mlua::FromLua;
+use rumqttc::{AsyncClient, Event, Incoming, MqttOptions, Transport};
+use serde::Deserialize;
 use tracing::{debug, warn};
 
-use crate::Module;
-use crate::config::MqttConfig;
-use crate::device_manager::DeviceManager;
 use crate::event::{self, EventChannel};
 
+#[derive(Debug, Clone, LuaDeviceConfig, Deserialize, Typed)]
+pub struct MqttConfig {
+    pub host: String,
+    pub port: u16,
+    pub client_name: String,
+    pub username: String,
+    pub password: String,
+    #[serde(default)]
+    #[typed(default)]
+    pub tls: bool,
+}
+
+impl From<MqttConfig> for MqttOptions {
+    fn from(value: MqttConfig) -> Self {
+        let mut mqtt_options = MqttOptions::new(value.client_name, value.host, value.port);
+        mqtt_options.set_credentials(value.username, value.password);
+        mqtt_options.set_keep_alive(Duration::from_secs(5));
+
+        if value.tls {
+            mqtt_options.set_transport(Transport::tls_with_default_config());
+        }
+
+        mqtt_options
+    }
+}
+
 #[derive(Debug, Clone, FromLua)]
 pub struct WrappedAsyncClient(pub AsyncClient);
 
@@ -34,20 +60,6 @@ impl Typed for WrappedAsyncClient {
 
         Some(output)
     }
-
-    fn generate_footer() -> Option<String> {
-        let mut output = String::new();
-
-        let type_name = Self::type_name();
-
-        output += &format!("mqtt.{type_name} = {{}}\n");
-        output += &format!("---@param device_manager {}\n", DeviceManager::type_name());
-        output += &format!("---@param config {}\n", MqttConfig::type_name());
-        output += &format!("---@return {type_name}\n");
-        output += "function mqtt.new(device_manager, config) end\n";
-
-        Some(output)
-    }
 }
 
 impl Deref for WrappedAsyncClient {
@@ -90,8 +102,9 @@ impl mlua::UserData for WrappedAsyncClient {
     }
 }
 
-pub fn start(mut eventloop: EventLoop, event_channel: &EventChannel) {
+pub fn start(config: MqttConfig, event_channel: &EventChannel) -> WrappedAsyncClient {
     let tx = event_channel.get_tx();
+    let (client, mut eventloop) = AsyncClient::new(config.into(), 100);
 
     tokio::spawn(async move {
         debug!("Listening for MQTT events");
@@ -110,42 +123,6 @@ pub fn start(mut eventloop: EventLoop, event_channel: &EventChannel) {
             }
         }
     });
+
+    WrappedAsyncClient(client)
 }
-
-fn create_module(lua: &mlua::Lua) -> mlua::Result<mlua::Table> {
-    let mqtt = lua.create_table()?;
-    let mqtt_new = lua.create_function(
-        move |lua, (device_manager, config): (DeviceManager, mlua::Value)| {
-            let event_channel = device_manager.event_channel();
-            let config: MqttConfig = lua.from_value(config)?;
-
-            // Create a mqtt client
-            // TODO: When starting up, the devices are not yet created, this could lead to a device being out of sync
-            let (client, eventloop) = AsyncClient::new(config.into(), 100);
-            start(eventloop, &event_channel);
-
-            Ok(WrappedAsyncClient(client))
-        },
-    )?;
-    mqtt.set("new", mqtt_new)?;
-
-    Ok(mqtt)
-}
-
-fn generate_definitions() -> String {
-    let mut output = String::new();
-
-    output += "---@meta\n\nlocal mqtt\n\n";
-
-    output += &MqttConfig::generate_full().expect("WrappedAsyncClient should have generate_full");
-    output += "\n";
-    output +=
-        &WrappedAsyncClient::generate_full().expect("WrappedAsyncClient should have generate_full");
-    output += "\n";
-
-    output += "return mqtt";
-
-    output
-}
-
-inventory::submit! {Module::new("automation:mqtt", create_module, Some(generate_definitions))}