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

feat(config)!: Fulfillment config is now returned at the end of the config

Browse Source 
Previously the fulfillment config was set by setting
`automation.fulfillment`, this will no longer work in the future when
the global automation gets split into modules.
This commit is contained in:
Dreaded_X
2025-09-04 03:42:32 +02:00
parent 0090a77dc1
commit e626caad8a
2 changed files with 77 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config.lua
View File

@@ -1,3 +1,4 @@
local automation = require("automation")
print(_VERSION) print(_VERSION)
local host = automation.util.get_hostname() local host = automation.util.get_hostname()
@@ -16,7 +17,7 @@ local function mqtt_automation(topic)
return "automation/" .. topic return "automation/" .. topic
end end
automation.fulfillment = { local fulfillment = {
openid_url = "https://login.huizinga.dev/api/oidc", openid_url = "https://login.huizinga.dev/api/oidc",
} }
@@ -677,3 +678,5 @@ end)
automation.device_manager:schedule("0 0 20 * * *", function() automation.device_manager:schedule("0 0 20 * * *", function()
bedroom_air_filter:set_on(false) bedroom_air_filter:set_on(false)
end) end)
return fulfillment

163
src/main.rs
View File

@@ -6,7 +6,6 @@ use std::path::Path;
use std::process; use std::process;
use std::time::{SystemTime, UNIX_EPOCH}; use std::time::{SystemTime, UNIX_EPOCH};
use anyhow::anyhow;
use automation_lib::config::{FulfillmentConfig, MqttConfig}; use automation_lib::config::{FulfillmentConfig, MqttConfig};
use automation_lib::device_manager::DeviceManager; use automation_lib::device_manager::DeviceManager;
use automation_lib::helpers; use automation_lib::helpers;
@@ -77,109 +76,93 @@ async fn app() -> anyhow::Result<()> {
// Setup the device handler // Setup the device handler
let device_manager = DeviceManager::new().await; let device_manager = DeviceManager::new().await;
let fulfillment_config = { let lua = mlua::Lua::new();
let lua = mlua::Lua::new();
lua.set_warning_function(|_lua, text, _cont| { lua.set_warning_function(|_lua, text, _cont| {
warn!("{text}"); warn!("{text}");
Ok(()) Ok(())
}); });
let print = lua.create_function(|lua, values: mlua::Variadic<mlua::Value>| { let print = lua.create_function(|lua, values: mlua::Variadic<mlua::Value>| {
// Fortmat the values the same way lua does by default // Fortmat the values the same way lua does by default
let text: String = values let text: String = values
.iter() .iter()
.map(|value| { .map(|value| {
value.to_string().unwrap_or_else(|_| { value.to_string().unwrap_or_else(|_| {
format!("{}: {}", value.type_name(), value.to_pointer().addr()) format!("{}: {}", value.type_name(), value.to_pointer().addr())
})
}) })
.intersperse("\t".to_owned()) })
.collect(); .intersperse("\t".to_owned())
.collect();
// Level 1 of the stack gives us the location that called this function // Level 1 of the stack gives us the location that called this function
let (file, line) = lua let (file, line) = lua
.inspect_stack(1, |debug| { .inspect_stack(1, |debug| {
( (
debug debug
.source() .source()
.short_src .short_src
.unwrap_or("???".into()) .unwrap_or("???".into())
.into_owned(), .into_owned(),
debug.current_line().unwrap_or(0), debug.current_line().unwrap_or(0),
) )
}) })
.unwrap(); .unwrap();
// The target is overridden to make it possible to filter for logs originating from the // The target is overridden to make it possible to filter for logs originating from the
// config // config
info!(target: "automation_config", %file, line, "{text}"); info!(target: "automation_config", %file, line, "{text}");
Ok(()) Ok(())
})?; })?;
lua.globals().set("print", print)?; lua.globals().set("print", print)?;
let automation = lua.create_table()?; let automation = 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 new_mqtt_client = 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
// TODO: When starting up, the devices are not yet created, this could lead to a device being out of sync // 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); let (client, eventloop) = AsyncClient::new(config.into(), 100);
mqtt::start(eventloop, &event_channel); mqtt::start(eventloop, &event_channel);
Ok(WrappedAsyncClient(client)) Ok(WrappedAsyncClient(client))
})?; })?;
automation.set("new_mqtt_client", new_mqtt_client)?; automation.set("new_mqtt_client", new_mqtt_client)?;
automation.set("device_manager", device_manager.clone())?; automation.set("device_manager", device_manager.clone())?;
let util = lua.create_table()?; let util = lua.create_table()?;
let get_env = lua.create_function(|_lua, name: String| { let get_env = lua.create_function(|_lua, name: String| {
std::env::var(name).map_err(mlua::ExternalError::into_lua_err) std::env::var(name).map_err(mlua::ExternalError::into_lua_err)
})?; })?;
util.set("get_env", get_env)?; util.set("get_env", get_env)?;
let get_hostname = lua.create_function(|_lua, ()| { let get_hostname = lua.create_function(|_lua, ()| {
hostname::get() hostname::get()
.map(|name| name.to_str().unwrap_or("unknown").to_owned()) .map(|name| name.to_str().unwrap_or("unknown").to_owned())
.map_err(mlua::ExternalError::into_lua_err) .map_err(mlua::ExternalError::into_lua_err)
})?; })?;
util.set("get_hostname", get_hostname)?; util.set("get_hostname", get_hostname)?;
let get_epoch = lua.create_function(|_lua, ()| { let get_epoch = lua.create_function(|_lua, ()| {
Ok(SystemTime::now() Ok(SystemTime::now()
.duration_since(UNIX_EPOCH) .duration_since(UNIX_EPOCH)
.expect("Time is after UNIX EPOCH") .expect("Time is after UNIX EPOCH")
.as_millis()) .as_millis())
})?; })?;
util.set("get_epoch", get_epoch)?; util.set("get_epoch", get_epoch)?;
automation.set("util", util)?; automation.set("util", util)?;
lua.globals().set("automation", automation)?; lua.register_module("automation", automation)?;
automation_devices::register_with_lua(&lua)?; automation_devices::register_with_lua(&lua)?;
helpers::register_with_lua(&lua)?; helpers::register_with_lua(&lua)?;
// TODO: Make this not hardcoded // TODO: Make this not hardcoded
let config_filename = std::env::var("AUTOMATION_CONFIG").unwrap_or("./config.lua".into()); let config_filename = std::env::var("AUTOMATION_CONFIG").unwrap_or("./config.lua".into());
let config_path = Path::new(&config_filename); let config_path = Path::new(&config_filename);
match lua.load(config_path).exec_async().await {
Err(error) => {
println!("{error}");
Err(error)
}
result => result,
}?;
let automation: mlua::Table = lua.globals().get("automation")?; let fulfillment_config: mlua::Value = lua.load(config_path).eval_async().await?;
let fulfillment_config: Option<mlua::Value> = automation.get("fulfillment")?; let fulfillment_config: FulfillmentConfig = lua.from_value(fulfillment_config)?;
if let Some(fulfillment_config) = fulfillment_config {
let fulfillment_config: FulfillmentConfig = lua.from_value(fulfillment_config)?;
debug!("automation.fulfillment = {fulfillment_config:?}");
fulfillment_config
} else {
return Err(anyhow!("Fulfillment is not configured"));
}
};
// Create google home fulfillment route // Create google home fulfillment route
let fulfillment = Router::new().route("/google_home", post(fulfillment)); let fulfillment = Router::new().route("/google_home", post(fulfillment));