feat: Sync printer light with room light

.cargo/config.toml

@@ -1,5 +1,2 @@
 [env]
 RUST_LOG = "automation=debug"
-
-[target.x86_64-unknown-linux-musl]
-rustflags = ["-C", "link-arg=-lc"]

.dockerignore

@@ -2,5 +2,3 @@
 .env
 # Use the rust environment provided by the container
 rust-toolchain.toml
-Dockerfile
-docker-bake.hcl

.gitea/workflows/audit.yaml

@@ -1,28 +0,0 @@
-name: Audit
-
-on:
-  push:
-    paths:
-      - "**/Cargo.toml"
-      - "**/Cargo.lock"
-  schedule:
-    - cron: "0 0 * * *"
-  workflow_dispatch:
-
-jobs:
-  audit:
-    name: cargo audit
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-      - name: Install rust toolchain
-        uses: dtolnay/rust-toolchain@nightly
-      - name: Setup rust cache
-        uses: Swatinem/rust-cache@v2
-      - name: Audit check
-        uses: https://git.huizinga.dev/infra/rust-audit-check@v3.0.0
-        with:
-          token: ${{ secrets.GITEA_TOKEN }}

.gitea/workflows/build.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
     build:
-        uses: infra/workflows/.gitea/workflows/docker.yaml@2bb37b698effa4fba36040d668cfa95d4abc568e
+        uses: dreaded_x/workflows/.gitea/workflows/docker-kubernetes.yaml@ef78704b98c72e4a6b8340f9bff7b085a7bdd95c
         secrets: inherit
         with:
             push_manifests: false
@@ -41,8 +41,6 @@ jobs:
                     -e AUTOMATION__SECRETS__MQTT_PASSWORD=${{ secrets.MQTT_PASSWORD }} \
                     -e AUTOMATION__SECRETS__HUE_TOKEN=${{ secrets.HUE_TOKEN }} \
                     -e AUTOMATION__SECRETS__NTFY_TOPIC=${{ secrets.NTFY_TOPIC }} \
-                    -e AUTOMATION__SECRETS__PRINTER_DEVICE_ID=${{ secrets.PRINTER_DEVICE_ID }} \
-                    -e AUTOMATION__SECRETS__PRINTER_ACCESS_CODE=${{ secrets.PRINTER_ACCESS_CODE }} \
                     $(echo ${{ toJSON(needs.build.outputs.images) }} | jq .automation -r)
 
                   docker network connect web automation_rs

Cargo.toml

@@ -34,10 +34,10 @@ google_home = { path = "./google_home/google_home" }
 google_home_macro = { path = "./google_home/google_home_macro" }
 hostname = "0.4.2"
 inventory = "0.3.24"
-itertools = "0.15.0"
+itertools = "0.14.0"
 json_value_merge = "2.0.1"
 lua_typed = { git = "https://git.huizinga.dev/Dreaded_X/lua_typed" }
-mlua = { version = "0.12.0", features = [
+mlua = { version = "0.11.6", features = [
   "lua54",
   "vendored",
   "macros",
@@ -51,11 +51,11 @@ reqwest = { version = "0.13.3", features = [
   "json",
   "rustls",
 ], default-features = false } # Use rustls, since the other packages also use rustls
-rumqttc-next = "0.34.0"
+rumqttc = "0.25.1"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 serde_repr = "0.1.20"
-syn = { version = "3.0.3" }
+syn = { version = "2.0.117" }
 thiserror = "2.0.18"
 tokio = { version = "1", features = ["rt-multi-thread"] }
 tokio-cron-scheduler = "0.15.1"
@@ -80,6 +80,7 @@ lua_typed = { workspace = true }
 inventory = { workspace = true }
 mlua = { workspace = true }
 reqwest = { workspace = true }
+rumqttc = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
@@ -87,7 +88,6 @@ tokio = { workspace = true }
 tokio-cron-scheduler = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
-rumqttc-next = { workspace = true }
 
 [patch.crates-io]
 wakey = { git = "https://git.huizinga.dev/Dreaded_X/wakey" }

Dockerfile

@@ -1,4 +1,5 @@
-FROM rust:1.98-alpine3.24 AS base
+FROM rust:1.95 AS base
+ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN cargo install cargo-chef --locked --version 0.1.71 && \
     cargo install cargo-auditable --locked --version 0.6.6
 WORKDIR /app
@@ -9,7 +10,6 @@ COPY . .
 RUN cargo chef prepare --recipe-path recipe.json
 
 FROM base AS builder
-RUN apk add --no-cache g++=15.2.0-r5 cmake=4.2.3-r0 make=4.4.1-r4 openssl-dev=3.5.8-r0 openssl-libs-static=3.5.8-r0
 # HACK: Now we can use unstable feature while on stable rust!
 ENV RUSTC_BOOTSTRAP=1
 COPY --from=planner /app/recipe.json recipe.json
@@ -20,8 +20,7 @@ ARG RELEASE_VERSION
 ENV RELEASE_VERSION=${RELEASE_VERSION}
 RUN cargo auditable build --release
 
-
-FROM gcr.io/distroless/static-debian13:nonroot AS runtime
+FROM gcr.io/distroless/cc-debian13:nonroot AS runtime
 COPY --from=builder /app/target/release/automation /app/automation
 ENV AUTOMATION__ENTRYPOINT=/app/config/config.lua
 ENV LUA_PATH="/app/?.lua;;"

automation_devices/Cargo.toml

@@ -17,7 +17,7 @@ inventory = { workspace = true }
 lua_typed = { workspace = true }
 mlua = { workspace = true }
 reqwest = { workspace = true }
-rumqttc-next = { workspace = true }
+rumqttc = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_repr = { workspace = true }

automation_devices/src/bambu.rs

@@ -12,7 +12,7 @@ use bambulab::{Command, Message};
 use google_home::errors::{self};
 use google_home::traits::OnOff;
 use lua_typed::Typed;
-use tracing::{debug, trace};
+use tracing::trace;
 
 use crate::{DebugWrap, LuaDeviceCreate};
 
@@ -104,7 +104,6 @@ impl LuaDeviceCreate for Bambu {
                             bambu.config.callbacks.state.call(bambu.clone()).await;
                         }
                         Message::Connected => {
-                            debug!(id = bambu.config.device_id, "Connected");
                             client.publish(Command::PushAll).await.unwrap();
 
                             bambu.config.callbacks.connected.call(bambu.clone()).await;

automation_devices/src/contact_sensor.rs

@@ -159,10 +159,7 @@ impl OpenClose for ContactSensor {
 #[async_trait]
 impl OnMqtt for ContactSensor {
     async fn on_mqtt(&self, message: rumqttc::Publish) {
-        if !rumqttc::matches(
-            str::from_utf8(&message.topic).expect("Topic should be valid"),
-            &self.config.mqtt.topic,
-        ) {
+        if !rumqttc::matches(&message.topic, &self.config.mqtt.topic) {
             return;
         }
 

automation_devices/src/hue_switch.rs

@@ -98,10 +98,7 @@ impl LuaDeviceCreate for HueSwitch {
 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(
-            str::from_utf8(&message.topic).expect("Topic should be valid"),
-            &self.config.mqtt.topic,
-        ) {
+        if matches(&message.topic, &self.config.mqtt.topic) {
             let message = match serde_json::from_slice::<State>(&message.payload) {
                 Ok(message) => message,
                 Err(err) => {

automation_devices/src/ikea_remote.rs

@@ -70,10 +70,7 @@ impl LuaDeviceCreate for IkeaRemote {
 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(
-            str::from_utf8(&message.topic).expect("Topic should be valid"),
-            &self.config.mqtt.topic,
-        ) {
+        if matches(&message.topic, &self.config.mqtt.topic) {
             let message = match RemoteMessage::try_from(message) {
                 Ok(message) => message,
                 Err(err) => {

automation_devices/src/light_sensor.rs

@@ -85,10 +85,7 @@ impl Device for LightSensor {
 #[async_trait]
 impl OnMqtt for LightSensor {
     async fn on_mqtt(&self, message: Publish) {
-        if !rumqttc::matches(
-            str::from_utf8(&message.topic).expect("Topic should be valid"),
-            &self.config.mqtt.topic,
-        ) {
+        if !rumqttc::matches(&message.topic, &self.config.mqtt.topic) {
             return;
         }
 

automation_devices/src/presence.rs

@@ -105,10 +105,7 @@ impl Device for Presence {
 #[async_trait]
 impl OnMqtt for Presence {
     async fn on_mqtt(&self, message: Publish) {
-        if !rumqttc::matches(
-            str::from_utf8(&message.topic).expect("Topic should be valid"),
-            &self.config.mqtt.topic,
-        ) {
+        if !rumqttc::matches(&message.topic, &self.config.mqtt.topic) {
             return;
         }
 
@@ -119,9 +116,7 @@ impl OnMqtt for Presence {
             .find('+')
             .or(self.config.mqtt.topic.find('#'))
             .expect("Presence::create fails if it does not contain wildcards");
-        let device_name: String = str::from_utf8(&message.topic[offset..])
-            .expect("Topic should be valid")
-            .into();
+        let device_name = message.topic[offset..].into();
 
         if message.payload.is_empty() {
             // Remove the device from the map

automation_devices/src/wake_on_lan.rs

@@ -66,10 +66,7 @@ impl Device for WakeOnLAN {
 #[async_trait]
 impl OnMqtt for WakeOnLAN {
     async fn on_mqtt(&self, message: Publish) {
-        if !rumqttc::matches(
-            str::from_utf8(&message.topic).expect("Topic should be valid"),
-            &self.config.mqtt.topic,
-        ) {
+        if !rumqttc::matches(&message.topic, &self.config.mqtt.topic) {
             return;
         }
 

automation_devices/src/washer.rs

@@ -89,10 +89,7 @@ const HYSTERESIS: isize = 10;
 #[async_trait]
 impl OnMqtt for Washer {
     async fn on_mqtt(&self, message: Publish) {
-        if !rumqttc::matches(
-            str::from_utf8(&message.topic).expect("Topic should be valid"),
-            &self.config.mqtt.topic,
-        ) {
+        if !rumqttc::matches(&message.topic, &self.config.mqtt.topic) {
             return;
         }
 

automation_devices/src/zigbee/light.rs

@@ -1,4 +1,3 @@
-use core::str;
 use std::fmt::Debug;
 use std::ops::Deref;
 use std::sync::Arc;
@@ -17,7 +16,7 @@ use google_home::errors::ErrorCode;
 use google_home::traits::{Brightness, Color, ColorSetting, ColorTemperatureRange, OnOff};
 use google_home::types::Type;
 use lua_typed::Typed;
-use rumqttc::{Publish, PublishOptions, matches};
+use rumqttc::{Publish, matches};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
@@ -178,10 +177,7 @@ where
 impl OnMqtt for LightOnOff {
     async fn on_mqtt(&self, message: Publish) {
         // Check if the message is from the device itself or from a remote
-        if matches(
-            str::from_utf8(&message.topic).expect("Topic should be valid"),
-            &self.config.mqtt.topic,
-        ) {
+        if matches(&message.topic, &self.config.mqtt.topic) {
             let state = match serde_json::from_slice::<StateOnOff>(&message.payload) {
                 Ok(state) => state,
                 Err(err) => {
@@ -214,10 +210,7 @@ impl OnMqtt for LightOnOff {
 impl OnMqtt for LightBrightness {
     async fn on_mqtt(&self, message: Publish) {
         // Check if the message is from the deviec itself or from a remote
-        if matches(
-            str::from_utf8(&message.topic).expect("Topic should be valid"),
-            &self.config.mqtt.topic,
-        ) {
+        if matches(&message.topic, &self.config.mqtt.topic) {
             let state = match serde_json::from_slice::<StateBrightness>(&message.payload) {
                 Ok(state) => state,
                 Err(err) => {
@@ -256,10 +249,7 @@ impl OnMqtt for LightBrightness {
 impl OnMqtt for LightColorTemperature {
     async fn on_mqtt(&self, message: Publish) {
         // Check if the message is from the deviec itself or from a remote
-        if matches(
-            str::from_utf8(&message.topic).expect("Topic should be valid"),
-            &self.config.mqtt.topic,
-        ) {
+        if matches(&message.topic, &self.config.mqtt.topic) {
             let state = match serde_json::from_slice::<StateColorTemperature>(&message.payload) {
                 Ok(state) => state,
                 Err(err) => {
@@ -352,8 +342,9 @@ where
             .client
             .publish(
                 &topic,
+                rumqttc::QoS::AtLeastOnce,
+                false,
                 serde_json::to_string(&message).unwrap(),
-                PublishOptions::at_least_once(),
             )
             .await
             .map_err(|err| warn!("Failed to update state on {topic}: {err}"))
@@ -395,8 +386,9 @@ where
             .client
             .publish(
                 &topic,
+                rumqttc::QoS::AtLeastOnce,
+                false,
                 serde_json::to_string(&message).unwrap(),
-                PublishOptions::at_least_once(),
             )
             .await
             .map_err(|err| warn!("Failed to update state on {topic}: {err}"))
@@ -442,8 +434,9 @@ where
             .client
             .publish(
                 &topic,
+                rumqttc::QoS::AtLeastOnce,
+                false,
                 serde_json::to_string(&message).unwrap(),
-                PublishOptions::at_least_once(),
             )
             .await
             .map_err(|err| warn!("Failed to update state on {topic}: {err}"))

automation_devices/src/zigbee/outlet.rs

@@ -16,7 +16,7 @@ use google_home::errors::ErrorCode;
 use google_home::traits::OnOff;
 use google_home::types::Type;
 use lua_typed::Typed;
-use rumqttc::{Publish, PublishOptions, matches};
+use rumqttc::{Publish, matches};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
@@ -162,10 +162,7 @@ where
 impl OnMqtt for OutletOnOff {
     async fn on_mqtt(&self, message: Publish) {
         // Check if the message is from the device itself or from a remote
-        if matches(
-            str::from_utf8(&message.topic).expect("Topic should be valid"),
-            &self.config.mqtt.topic,
-        ) {
+        if matches(&message.topic, &self.config.mqtt.topic) {
             let state = match serde_json::from_slice::<StateOnOff>(&message.payload) {
                 Ok(state) => state,
                 Err(err) => {
@@ -198,10 +195,7 @@ impl OnMqtt for OutletOnOff {
 impl OnMqtt for OutletPower {
     async fn on_mqtt(&self, message: Publish) {
         // Check if the message is from the deviec itself or from a remote
-        if matches(
-            str::from_utf8(&message.topic).expect("Topic should be valid"),
-            &self.config.mqtt.topic,
-        ) {
+        if matches(&message.topic, &self.config.mqtt.topic) {
             let state = match serde_json::from_slice::<StatePower>(&message.payload) {
                 Ok(state) => state,
                 Err(err) => {
@@ -290,8 +284,9 @@ where
             .client
             .publish(
                 &topic,
+                rumqttc::QoS::AtLeastOnce,
+                false,
                 serde_json::to_string(&message).unwrap(),
-                PublishOptions::at_least_once(),
             )
             .await
             .map_err(|err| warn!("Failed to update state on {topic}: {err}"))

automation_lib/Cargo.toml

@@ -15,7 +15,7 @@ hostname = { workspace = true }
 inventory = { workspace = true }
 lua_typed = { workspace = true }
 mlua = { workspace = true }
-rumqttc-next = { workspace = true }
+rumqttc = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }

automation_lib/src/mqtt.rs

@@ -1,9 +1,10 @@
 use std::ops::{Deref, DerefMut};
+use std::time::Duration;
 
 use automation_macro::LuaDeviceConfig;
 use lua_typed::Typed;
 use mlua::FromLua;
-use rumqttc::{AsyncClient, Event, Incoming, MqttOptions, PublishOptions, Transport};
+use rumqttc::{AsyncClient, Event, Incoming, MqttOptions, Transport};
 use serde::Deserialize;
 use tracing::{debug, warn};
 
@@ -23,9 +24,9 @@ pub struct MqttConfig {
 
 impl From<MqttConfig> for MqttOptions {
     fn from(value: MqttConfig) -> Self {
-        let mut mqtt_options = MqttOptions::new(value.client_name, (value.host, value.port));
+        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(5);
+        mqtt_options.set_keep_alive(Duration::from_secs(5));
 
         if value.tls {
             mqtt_options.set_transport(Transport::tls_with_default_config());
@@ -91,7 +92,7 @@ impl mlua::UserData for WrappedAsyncClient {
                 debug!("message = {message}");
 
                 this.0
-                    .publish(topic, message, PublishOptions::at_least_once().retained())
+                    .publish(topic, rumqttc::QoS::AtLeastOnce, true, message)
                     .await
                     .unwrap();
 
@@ -103,7 +104,7 @@ impl mlua::UserData for WrappedAsyncClient {
 
 pub fn start(config: MqttConfig, event_channel: &EventChannel) -> WrappedAsyncClient {
     let tx = event_channel.get_tx();
-    let (client, mut eventloop) = AsyncClient::builder(config.into()).capacity(100).build();
+    let (client, mut eventloop) = AsyncClient::new(config.into(), 100);
 
     tokio::spawn(async move {
         debug!("Listening for MQTT events");

automation_macro/src/lua_device_config.rs

@@ -182,7 +182,7 @@ fn field_from_lua(field: &Field) -> TokenStream {
 		.iter()
 		.filter_map(|arg| match arg {
 			Argument::Flatten { .. } => Some(quote! {
-				mlua::LuaSerdeExt::from_value_with(lua, value.clone(), mlua::serde::DeserializeOptions::new().deny_unsupported_types(false))?
+				mlua::LuaSerdeExt::from_value_with(lua, value.clone(), mlua::DeserializeOptions::new().deny_unsupported_types(false))?
 			}),
 			Argument::FromLua { .. } => Some(quote! {
 				if table.contains_key(#table_name)? {

config/config.lua

@@ -10,12 +10,12 @@ return {
 		openid_url = "https://login.huizinga.dev/api/oidc",
 	},
 	mqtt = {
-		host = ((host == "zeus" or host == "hephaestus") and "olympus.huizinga.lan") or "mosquitto",
+		host = ((host == "zeus" or host == "hephaestus") and "olympus.lan.huizinga.dev") or "mosquitto",
 		port = 8883,
 		client_name = "automation-" .. host,
 		username = "mqtt",
 		password = secrets.mqtt_password,
-		tls = false,
+		tls = host == "zeus" or host == "hephaestus",
 	},
 	modules = {
 		require("config.battery"),

config/rooms/guest_bedroom.lua

@@ -13,7 +13,7 @@ function module.setup(mqtt_client)
 	local light = nil
 
 	local bambu = devices.Bambu.new({
-		host = "10.0.0.108",
+		host = "thalia.huizinga.lan",
 		device_id = secrets.printer_device_id,
 		access_code = secrets.printer_access_code,
 		callbacks = {

docker-bake.hcl

@@ -5,9 +5,7 @@ group "default" {
 	targets = ["automation"]
 }
 
-target "docker-metadata-action" {
-	tags = []
-}
+target "docker-metadata-action" {}
 
 target "automation" {
 	inherits = ["docker-metadata-action"]