Dreaded_X/automation_rs
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(config)!: Move new_mqtt_client out of global automation table into separate module
All checks were successful
Build and deploy / build (push) Successful in 10m30s
Details
Build and deploy / Deploy container (push) Successful in 45s
Details

Browse Source 
The function `new_mqtt_client` was the last remaining entry in the
global `automation` table. The function was renamed to `new` and placed
in the new `mqtt` module. As `automation` is now empty, it has been
removed.
This commit is contained in:
Dreaded_X
2025-09-04 04:06:20 +02:00
parent 3d5f6c308c
commit 7a9f464e61
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.lua
View File

@@ -23,7 +23,7 @@ local fulfillment = {
openid_url = "https://login.huizinga.dev/api/oidc", openid_url = "https://login.huizinga.dev/api/oidc",
} }
local mqtt_client = automation.new_mqtt_client({ local mqtt_client = require("mqtt").new({
host = ((host == "zeus" or host == "hephaestus") and "olympus.lan.huizinga.dev") or "mosquitto", host = ((host == "zeus" or host == "hephaestus") and "olympus.lan.huizinga.dev") or "mosquitto",
port = 8883, port = 8883,
client_name = "automation-" .. host, client_name = "automation-" .. host,

9
src/main.rs
View File

@@ -116,9 +116,9 @@ async fn app() -> anyhow::Result<()> {
})?; })?;
lua.globals().set("print", print)?; lua.globals().set("print", print)?;
let automation = lua.create_table()?; let mqtt = lua.create_table()?;
let event_channel = device_manager.event_channel(); let event_channel = device_manager.event_channel();
let new_mqtt_client = lua.create_function(move |lua, config: mlua::Value| { let mqtt_new = lua.create_function(move |lua, config: mlua::Value| {
let config: MqttConfig = lua.from_value(config)?; let config: MqttConfig = lua.from_value(config)?;
// Create a mqtt client // Create a mqtt client
@@ -128,9 +128,8 @@ async fn app() -> anyhow::Result<()> {
Ok(WrappedAsyncClient(client)) Ok(WrappedAsyncClient(client))
})?; })?;
mqtt.set("new", mqtt_new)?;
automation.set("new_mqtt_client", new_mqtt_client)?; lua.register_module("mqtt", mqtt)?;
lua.globals().set("automation", automation)?;
lua.register_module("device_manager", device_manager.clone())?; lua.register_module("device_manager", device_manager.clone())?;