refactor(config)!: Move scheduler out of device_manager

Due to changes made in mlua the new scheduler is much simpler. It also
had no real business being part of the device manager, so it has now been
moved to be part of the returned config.

automation_lib/Cargo.toml

@@ -11,7 +11,6 @@ dyn-clone = { workspace = true }
 futures = { workspace = true }
 google_home = { workspace = true }
 hostname = { workspace = true }
-indexmap = { workspace = true }
 inventory = { workspace = true }
 lua_typed = { workspace = true }
 mlua = { workspace = true }
@@ -20,6 +19,4 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
-tokio-cron-scheduler = { workspace = true }
 tracing = { workspace = true }
-uuid = { workspace = true }

automation_lib/src/device_manager.rs

@@ -1,13 +1,10 @@
 use std::collections::HashMap;
-use std::pin::Pin;
 use std::sync::Arc;
 
-use futures::Future;
 use futures::future::join_all;
 use lua_typed::Typed;
 use mlua::FromLua;
 use tokio::sync::{RwLock, RwLockReadGuard};
-use tokio_cron_scheduler::{Job, JobScheduler};
 use tracing::{debug, instrument, trace};
 
 use crate::device::Device;
@@ -19,7 +16,6 @@ pub type DeviceMap = HashMap<String, Box<dyn Device>>;
 pub struct DeviceManager {
     devices: Arc<RwLock<DeviceMap>>,
     event_channel: EventChannel,
-    scheduler: JobScheduler,
 }
 
 impl DeviceManager {
@@ -29,7 +25,6 @@ impl DeviceManager {
         let device_manager = Self {
             devices: Arc::new(RwLock::new(HashMap::new())),
             event_channel,
-            scheduler: JobScheduler::new().await.unwrap(),
         };
 
         tokio::spawn({
@@ -45,8 +40,6 @@ impl DeviceManager {
             }
         });
 
-        device_manager.scheduler.start().await.unwrap();
-
         device_manager
     }
 
@@ -105,42 +98,6 @@ impl mlua::UserData for DeviceManager {
             Ok(())
         });
 
-        methods.add_async_method(
-            "schedule",
-            async |lua, this, (schedule, f): (String, mlua::Function)| {
-                debug!("schedule = {schedule}");
-                // This creates a function, that returns the actual job we want to run
-                let create_job = {
-                    let lua = lua.clone();
-
-                    move |uuid: uuid::Uuid,
-                          _: tokio_cron_scheduler::JobScheduler|
-                          -> Pin<Box<dyn Future<Output = ()> + Send>> {
-                        let lua = lua.clone();
-
-                        // Create the actual function we want to run on a schedule
-                        let future = async move {
-                            let f: mlua::Function =
-                                lua.named_registry_value(uuid.to_string().as_str()).unwrap();
-                            f.call_async::<()>(()).await.unwrap();
-                        };
-
-                        Box::pin(future)
-                    }
-                };
-
-                let job = Job::new_async(schedule.as_str(), create_job).unwrap();
-
-                let uuid = this.scheduler.add(job).await.unwrap();
-
-                // Store the function in the registry
-                lua.set_named_registry_value(uuid.to_string().as_str(), f)
-                    .unwrap();
-
-                Ok(())
-            },
-        );
-
         methods.add_method("event_channel", |_lua, this, ()| Ok(this.event_channel()))
     }
 }

automation_lib/src/lib.rs

@@ -13,7 +13,6 @@ pub mod helpers;
 pub mod lua;
 pub mod messages;
 pub mod mqtt;
-pub mod schedule;
 
 type RegisterFn = fn(lua: &mlua::Lua) -> mlua::Result<mlua::Table>;
 type DefinitionsFn = fn() -> String;

automation_lib/src/schedule.rs

@@ -1,17 +0,0 @@
-use indexmap::IndexMap;
-use serde::Deserialize;
-
-#[derive(Debug, Deserialize, Hash, PartialEq, Eq, Clone, Copy)]
-#[serde(rename_all = "snake_case")]
-pub enum Action {
-    On,
-    Off,
-}
-
-pub type Schedule = IndexMap<String, IndexMap<Action, Vec<String>>>;
-
-// #[derive(Debug, Deserialize)]
-// pub struct Schedule {
-//     pub when: String,
-//     pub actions: IndexMap<Action, Vec<String>>,
-// }