Typos and todos

Dockerfile

@@ -1,10 +1,10 @@
 ##################
 ### BASE STAGE ###
 ##################
-FROM rust:1.72.1 as base
+FROM rust:1.76.0 as base
 
 # Install build dependencies
-RUN cargo install --locked cargo-make trunk strip_cargo_version
+RUN cargo install --locked trunk@^0.18.8 strip_cargo_version
 RUN rustup target add wasm32-unknown-unknown
 RUN rustup target add x86_64-unknown-linux-musl
 

backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hemma"
-version = "0.2.2"
+version = "0.3.3"
 edition = "2021"
 
 [dependencies]
@@ -19,6 +19,7 @@ toml = "0.5.9"
 serde = { version = "1.0.138", features = ["derive"] }
 futures = "0.3.21"
 chrono = { version = "0.4.20", features = ["serde"] }
+rand = "0.8.5"
 
 [dependencies.common]
 path = "../common"

backend/src/main.rs

@@ -1,6 +1,7 @@
 mod collector;
 mod persistence;
 mod tasks;
+mod util;
 
 use clap::Parser;
 use collector::CollectorConfig;

backend/src/tasks/lights.rs

@@ -1,22 +1,22 @@
 use std::collections::HashMap;
 
-use chrono::{DateTime, Datelike, Local, NaiveTime, Weekday};
+use common::{BulbPrefs, ClientMessage, ScriptId, ServerMessage};
-use common::{ClientMessage, ServerMessage};
+use lighter_lib::BulbId;
-use lighter_lib::{BulbColor, BulbId};
 use lighter_manager::manager::{BulbCommand, BulbManager, BulbSelector};
+use lighter_manager::provider::mqtt::BulbsMqtt;
 use serde::{Deserialize, Serialize};
-use std::time::Duration;
 use tokio::select;
-use tokio::sync::{broadcast, mpsc};
-use tokio::task::{spawn, JoinHandle};
-use tokio::time::sleep;
 
 use crate::persistence::PersistenceFile;
-use crate::{ClientRequest, State};
+use crate::State;
+
+use self::scripts::{LightScript, Party, Waker};
+
+pub mod scripts;
 
 #[derive(Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
 struct LightsState {
-    wake_schedule: HashMap<BulbId, HashMap<Weekday, NaiveTime>>,
+    script_prefs: HashMap<ScriptId, HashMap<BulbId, BulbPrefs>>,
 }
 
 pub async fn lights_task(state: &State) {
@@ -29,36 +29,43 @@ pub async fn lights_task(state: &State) {
         .await
         .expect("Failed to open lights config");
 
-    let (cmd, bulb_states) = BulbManager::launch(config.bulbs.clone(), config.mqtt.clone())
+    let provider = BulbsMqtt::new(config.bulbs.clone(), config.mqtt.clone());
+    let manager = BulbManager::launch(config.bulbs.clone(), provider)
         .await
         .expect("Failed to launch bulb manager");
 
-    let mut wake_tasks: HashMap<(BulbId, Weekday), JoinHandle<()>> = lights_state
+    let mut scripts: HashMap<ScriptId, Box<dyn LightScript + Send>> = Default::default();
-        .get()
+    scripts.insert(
-        .wake_schedule
+        "waker".to_string(),
-        .iter()
+        Box::new(Waker::create(manager.clone())),
-        .flat_map(|(bulb, schedule)| schedule.iter().map(move |(day, time)| (bulb, day, time)))
+    );
-        .map(|(bulb, day, time)| {
+    scripts.insert(
-            let handle = spawn(wake_task(
+        "party".to_string(),
-                state.client_message.clone(),
+        Box::new(Party::create(manager.clone())),
-                cmd.clone(),
+    );
-                bulb.clone(),
-                *day,
-                *time,
-            ));
 
-            ((bulb.clone(), *day), handle)
+    for (script, prefs) in &lights_state.get().script_prefs {
-        })
+        let Some(script) = scripts.get_mut(script) else {
-        .collect();
+            continue;
+        };
+
+        for (bulb, prefs) in prefs {
+            for (name, value) in &prefs.kvs {
+                script.set_param(bulb, name, value.clone())
+            }
+        }
+    }
 
     loop {
-        let notify = bulb_states.notify_on_change();
         select! {
-            _ = notify => {
+            _ = manager.notify_on_change() => {
-                let lights_state = lights_state.get();
+                for (id, mode) in manager.bulbs().await.clone().into_iter() {
-                for (id, mode) in bulb_states.bulbs().await.clone().into_iter() {
+                    let prefs = scripts.iter_mut()
-                    let wake_schedule = lights_state.wake_schedule.get(&id).cloned().unwrap_or_default();
+                        .map(|(script, prefs)|
-                    let msg = ServerMessage::BulbState { id, mode, wake_schedule };
+                            (script.clone(), prefs.get_params(&id)))
+                        .collect();
+
+                    let msg = ServerMessage::BulbState { id, mode, prefs };
                     if let Err(e) = server_message.send(msg) {
                         error!("broadcast channel error: {e}");
                         return;
@@ -73,58 +80,42 @@ pub async fn lights_task(state: &State) {
 
                 match request.message {
                     ClientMessage::SetBulbColor { id, color } =>  {
-                        if let Err(e) = cmd.send(BulbCommand::SetColor(BulbSelector::Id(id), color)).await {
+                        manager.send_command(BulbCommand::SetColor(BulbSelector::Id(id), color)).await;
-                            error!("bulb manager error: {e}");
-                        }
                     }
                     ClientMessage::SetBulbPower { id, power } =>  {
-                        if let Err(e) = cmd.send(BulbCommand::SetPower(BulbSelector::Id(id), power)).await {
+                        manager.send_command(BulbCommand::SetPower(BulbSelector::Id(id), power)).await;
-                            error!("bulb manager error: {e}");
-                        }
                     }
                     ClientMessage::GetBulbs => {
                         if let Err(e) = request.response.send(ServerMessage::BulbMap(config.bulb_map.clone())).await {
                             error!("GetBulbs response channel error: {e}");
                             return;
                         }
-                        let lights_state = lights_state.get();
+                        for (id, mode) in manager.bulbs().await.clone().into_iter() {
-                        for (id, mode) in bulb_states.bulbs().await.clone().into_iter() {
+                            let prefs = scripts.iter_mut()
-                            let wake_schedule = lights_state.wake_schedule.get(&id).cloned().unwrap_or_default();
+                                .map(|(script, prefs)|
-                            let msg = ServerMessage::BulbState { id, mode, wake_schedule };
+                                    (script.clone(), prefs.get_params(&id)))
+                                .collect();
+
+                            let msg = ServerMessage::BulbState { id, mode, prefs };
                             if let Err(e) = request.response.send(msg).await {
                                 error!("GetBulbs response channel error: {e}");
                                 return;
                             }
                         }
                     }
-                    ClientMessage::SetBulbWakeTime { id, day, time } => {
+                    ClientMessage::SetBulbPref { bulb, script, name, value } => {
-                        if let Err(e) = lights_state.update(|lights_state| {
+                        let Some(s) = scripts.get_mut(&script) else {
-                            let schedule = lights_state.wake_schedule.entry(id.clone()).or_default();
+                            continue;
-                            if let Some(time) = time {
-                                schedule.insert(day, time);
-                            }
-                            else {
-                                schedule.remove(&day);
-                            }
-                        }).await {
-                            error!("Failed to save wake schedule: {e}");
                         };
+                        s.set_param(&bulb, &name, value.clone());
 
-                        if let Some(time) = time {
+                        // TODO handle error
-                            let handle = spawn(wake_task(
+                        lights_state.update(move |state| {
-                                state.client_message.clone(),
+                            state.script_prefs
-                                cmd.clone(),
+                                .entry(script).or_default()
-                                id.clone(),
+                                .entry(bulb).or_default()
-                                day,
+                                .kvs.insert(name, value);
-                                time,
+                        }).await.expect("failed to persist lights state");
-                            ));
-
-                            if let Some(old_handle) = wake_tasks.insert((id, day), handle) {
-                                old_handle.abort();
-                            }
-                        } else if let Some(old_handle) = wake_tasks.remove(&(id, day)) {
-                            old_handle.abort();
-                        }
                     }
                     _ => {}
                 }
@@ -132,112 +123,3 @@ pub async fn lights_task(state: &State) {
         }
     }
 }
-
-async fn wake_task(
-    client_messages: broadcast::Sender<ClientRequest>,
-    cmd: mpsc::Sender<BulbCommand>,
-    id: BulbId,
-    day: Weekday,
-    time: NaiveTime,
-) {
-    let mut alarm = next_alarm(Local::now(), day, time);
-
-    loop {
-        info!("sleeping until {alarm}");
-        sleep((alarm - Local::now()).to_std().unwrap()).await;
-
-        // slowly turn up brightness of bulb
-        for brightness in (1..=75).map(|i| (i as f32) * 0.01) {
-            select! {
-                // abort if the client pokes the bulb
-                _ = wait_for_bulb_command(&id, client_messages.subscribe()) => break,
-                _ = sleep(Duration::from_secs(12)) => {}
-            };
-
-            if cmd
-                .send(BulbCommand::SetColor(
-                    BulbSelector::Id(id.clone()),
-                    BulbColor::Kelvin {
-                        t: 0.0,
-                        b: brightness,
-                    },
-                ))
-                .await
-                .is_err()
-            {
-                return;
-            };
-        }
-
-        alarm = next_alarm(Local::now(), day, time);
-    }
-}
-
-/// Get the next alarm, from a weekday+time schedule.
-fn next_alarm(now: DateTime<Local>, day: Weekday, time: NaiveTime) -> DateTime<Local> {
-    let day_of_alarm = day.num_days_from_monday() as i64;
-    let day_now = now.weekday().num_days_from_monday() as i64;
-
-    let alarm = now + chrono::Duration::days(day_of_alarm - day_now);
-    let mut alarm = alarm
-        .date_naive()
-        .and_time(time)
-        .and_local_timezone(Local)
-        .unwrap();
-
-    if alarm <= now {
-        alarm += chrono::Duration::weeks(1);
-    }
-
-    alarm
-}
-
-/// Wait until we receive a client request that mutates the given bulb
-async fn wait_for_bulb_command(
-    bulb_id: &BulbId,
-    mut client_messages: broadcast::Receiver<ClientRequest>,
-) {
-    loop {
-        match client_messages.recv().await {
-            Err(_) => return,
-            Ok(request) => match request.message {
-                ClientMessage::SetBulbColor { id, .. }
-                | ClientMessage::SetBulbPower { id, .. }
-                | ClientMessage::SetBulbWakeTime { id, .. }
-                    if &id == bulb_id =>
-                {
-                    break
-                }
-                _ => continue,
-            },
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use chrono::{offset::TimeZone, Local, NaiveTime, Weekday};
-
-    use super::next_alarm;
-
-    #[test]
-    fn test_alarm_date() {
-        const FMT: &str = "%Y-%m-%d %H:%M";
-        let now = Local.datetime_from_str("2022-10-18 15:30", FMT).unwrap();
-        let test_values = [
-            (Weekday::Tue, (16, 30), "2022-10-18 16:30"),
-            (Weekday::Tue, (14, 30), "2022-10-25 14:30"),
-            (Weekday::Wed, (15, 30), "2022-10-19 15:30"),
-            (Weekday::Mon, (15, 30), "2022-10-24 15:30"),
-        ];
-
-        for (day, (hour, min), expected) in test_values {
-            let expected = Local.datetime_from_str(expected, FMT).unwrap();
-
-            assert_eq!(
-                next_alarm(now, day, NaiveTime::from_hms(hour, min, 0)),
-                expected
-            );
-        }
-    }
-}

backend/src/tasks/lights/scripts/mod.rs

@@ -0,0 +1,12 @@
+use common::{BulbPrefs, Param};
+use lighter_lib::BulbId;
+
+mod party;
+mod waker;
+pub use party::Party;
+pub use waker::Waker;
+
+pub trait LightScript {
+    fn get_params(&mut self, bulb: &BulbId) -> BulbPrefs;
+    fn set_param(&mut self, bulb: &BulbId, name: &str, value: Param);
+}

backend/src/tasks/lights/scripts/party.rs

@@ -0,0 +1,78 @@
+use std::{collections::HashMap, time::Duration};
+
+use common::{BulbPrefs, Param};
+use lighter_lib::{BulbColor, BulbId};
+use lighter_manager::manager::{BulbCommand, BulbManager, BulbSelector};
+use rand::random;
+use tokio::{spawn, time::sleep};
+
+use crate::util::DeadMansHandle;
+
+use super::LightScript;
+
+pub struct Party {
+    manager: BulbManager,
+    party_tasks: HashMap<BulbId, DeadMansHandle>,
+}
+
+impl Party {
+    pub fn create(manager: BulbManager) -> Self {
+        Party {
+            manager,
+            party_tasks: Default::default(),
+        }
+    }
+}
+
+impl LightScript for Party {
+    fn get_params(&mut self, bulb: &BulbId) -> BulbPrefs {
+        let enabled = self.party_tasks.get(bulb).is_some();
+
+        BulbPrefs {
+            kvs: [("Party".to_string(), Param::Toggle(enabled))]
+                .into_iter()
+                .collect(),
+        }
+    }
+
+    fn set_param(&mut self, bulb: &BulbId, name: &str, param: Param) {
+        if name != "Party" {
+            error!("invalid param name");
+            return;
+        }
+
+        let Param::Toggle(enabled) = param else {
+            error!("invalid param kind");
+            return;
+        };
+
+        if !enabled {
+            self.party_tasks.remove(bulb);
+        } else {
+            let task = spawn(party_task(self.manager.clone(), bulb.clone()));
+            self.party_tasks
+                .insert(bulb.clone(), DeadMansHandle(task.abort_handle()));
+        }
+    }
+}
+
+async fn party_task(manager: BulbManager, id: BulbId) {
+    manager
+        .until_interrupted(id.clone(), async {
+            let mut h: f32 = random();
+            loop {
+                sleep(Duration::from_millis(50)).await;
+
+                h += 0.01;
+                if h > 1.0 {
+                    h = 0.0;
+                }
+
+                let color = BulbColor::HSB { h, s: 1.0, b: 1.0 };
+                manager
+                    .send_command(BulbCommand::SetColor(BulbSelector::Id(id.clone()), color))
+                    .await;
+            }
+        })
+        .await;
+}

backend/src/tasks/lights/scripts/waker.rs

@@ -0,0 +1,204 @@
+use std::{collections::HashMap, time::Duration};
+
+use chrono::{DateTime, Datelike, Local, NaiveTime, Weekday};
+use common::{BulbPrefs, Param};
+use lighter_lib::{BulbColor, BulbId};
+use lighter_manager::manager::{BulbCommand, BulbManager, BulbSelector};
+use tokio::{spawn, time::sleep};
+
+use crate::util::DeadMansHandle;
+
+use super::LightScript;
+
+pub struct Waker {
+    manager: BulbManager,
+    wake_times: HashMap<BulbId, HashMap<Weekday, NaiveTime>>,
+    wake_tasks: HashMap<(BulbId, Weekday), DeadMansHandle>,
+}
+
+impl Waker {
+    pub fn create(manager: BulbManager) -> Self {
+        Waker {
+            manager,
+            wake_times: Default::default(),
+            wake_tasks: Default::default(),
+        }
+    }
+}
+
+const TIME_FMT: &str = "%H:%M";
+const WAKE_TARGET_BRIGHTNESS: u8 = 75;
+const WAKE_TARGET_TEMPERATURE: u8 = 60;
+
+impl LightScript for Waker {
+    fn get_params(&mut self, bulb: &BulbId) -> BulbPrefs {
+        let settings = self.wake_times.entry(bulb.clone()).or_default();
+
+        let kvs = DAYS_OF_WEEK
+            .iter()
+            .map(|day| {
+                let time = match settings.get(day) {
+                    Some(time) => time.format(TIME_FMT).to_string(),
+                    None => String::new(),
+                };
+                (format!("{day:?}"), Param::String(time))
+            })
+            .collect();
+
+        BulbPrefs { kvs }
+    }
+
+    fn set_param(&mut self, bulb: &BulbId, name: &str, time: super::Param) {
+        let settings = self.wake_times.entry(bulb.clone()).or_default();
+
+        let Param::String(time) = time else {
+            error!("invalit param kind");
+            return;
+        };
+
+        let time = NaiveTime::parse_from_str(&time, TIME_FMT)
+            .map(Some)
+            .unwrap_or(None);
+
+        let weekday = match name {
+            "Mon" => Weekday::Mon,
+            "Tue" => Weekday::Tue,
+            "Wed" => Weekday::Wed,
+            "Thu" => Weekday::Thu,
+            "Fri" => Weekday::Fri,
+            "Sat" => Weekday::Sat,
+            "Sun" => Weekday::Sun,
+            _ => {
+                error!("invalit param name");
+                return;
+            }
+        };
+
+        let Some(time) = time else {
+            settings.remove(&weekday);
+            self.wake_tasks.remove(&(bulb.clone(), weekday));
+            return;
+        };
+
+        settings.insert(weekday, time);
+        let task = spawn(wake_task(self.manager.clone(), bulb.clone(), weekday, time));
+        self.wake_tasks
+            .insert((bulb.clone(), weekday), DeadMansHandle(task.abort_handle()));
+    }
+}
+
+const DAYS_OF_WEEK: &[Weekday] = &[
+    Weekday::Mon,
+    Weekday::Tue,
+    Weekday::Wed,
+    Weekday::Thu,
+    Weekday::Fri,
+    Weekday::Sat,
+    Weekday::Sun,
+];
+
+async fn wake_task(manager: BulbManager, id: BulbId, day: Weekday, time: NaiveTime) {
+    let mut alarm = next_alarm(Local::now(), day, time);
+
+    loop {
+        info!("waking lamp {id:?} at {alarm}");
+        sleep((alarm - Local::now()).to_std().unwrap()).await;
+
+        if let Some(bulb) = manager.bulbs().await.get(&id) {
+            // don't wake the bulb if it's already turned on
+            if bulb.power {
+                continue;
+            }
+        } else {
+            warn!("bulb {id:?} does not exist");
+            return;
+        };
+
+        info!("waking lamp {id:?}");
+        let r = manager
+            .until_interrupted(id.clone(), async {
+                // slowly turn up brightness of bulb
+                for brightness in (1..=WAKE_TARGET_BRIGHTNESS).map(|i| (i as f32) * 0.01) {
+                    sleep(Duration::from_secs(12)).await;
+
+                    manager
+                        .send_command(BulbCommand::SetColor(
+                            BulbSelector::Id(id.clone()),
+                            BulbColor::Kelvin {
+                                t: 0.0,
+                                b: brightness,
+                            },
+                        ))
+                        .await
+                }
+
+                // slowly turn up temperature of bulb
+                for temperature in (1..=WAKE_TARGET_TEMPERATURE).map(|i| (i as f32) * 0.01) {
+                    sleep(Duration::from_secs(12)).await;
+
+                    manager
+                        .send_command(BulbCommand::SetColor(
+                            BulbSelector::Id(id.clone()),
+                            BulbColor::Kelvin {
+                                t: temperature,
+                                b: WAKE_TARGET_BRIGHTNESS as f32 * 0.01,
+                            },
+                        ))
+                        .await
+                }
+            })
+            .await;
+
+        if r.is_none() {
+            info!("interrupted waking lamp {id:?}");
+        }
+
+        alarm = next_alarm(Local::now(), day, time);
+    }
+}
+
+/// Get the next alarm, from a weekday+time schedule.
+fn next_alarm(now: DateTime<Local>, day: Weekday, time: NaiveTime) -> DateTime<Local> {
+    let day_of_alarm = day.num_days_from_monday() as i64;
+    let day_now = now.weekday().num_days_from_monday() as i64;
+
+    let alarm = now + chrono::Duration::days(day_of_alarm - day_now);
+    let mut alarm = alarm
+        .date_naive()
+        .and_time(time)
+        .and_local_timezone(Local)
+        .unwrap();
+
+    if alarm <= now {
+        alarm += chrono::Duration::weeks(1);
+    }
+
+    alarm
+}
+
+#[cfg(test)]
+mod test {
+    use super::next_alarm;
+    use chrono::{offset::TimeZone, Local, NaiveTime, Weekday};
+
+    #[test]
+    fn test_alarm_date() {
+        const FMT: &str = "%Y-%m-%d %H:%M";
+        let now = Local.datetime_from_str("2022-10-18 15:30", FMT).unwrap();
+        let test_values = [
+            (Weekday::Tue, (16, 30), "2022-10-18 16:30"),
+            (Weekday::Tue, (14, 30), "2022-10-25 14:30"),
+            (Weekday::Wed, (15, 30), "2022-10-19 15:30"),
+            (Weekday::Mon, (15, 30), "2022-10-24 15:30"),
+        ];
+
+        for (day, (hour, min), expected) in test_values {
+            let expected = Local.datetime_from_str(expected, FMT).unwrap();
+
+            assert_eq!(
+                next_alarm(now, day, NaiveTime::from_hms(hour, min, 0)),
+                expected
+            );
+        }
+    }
+}

backend/src/util.rs

@@ -0,0 +1,16 @@
+use tokio::task::AbortHandle;
+
+/// A tokio task handle that will abort the task when dropped.
+pub struct DeadMansHandle(pub AbortHandle);
+
+impl From<AbortHandle> for DeadMansHandle {
+    fn from(abort: AbortHandle) -> Self {
+        DeadMansHandle(abort)
+    }
+}
+
+impl Drop for DeadMansHandle {
+    fn drop(&mut self) {
+        self.0.abort();
+    }
+}

common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "common"
-version = "0.2.2"
+version = "0.3.3"
 edition = "2021"
 
 [dependencies]

common/src/lib.rs

@@ -1,6 +1,5 @@
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 
-use chrono::{NaiveTime, Weekday};
 use lighter_lib::{BulbColor, BulbId, BulbMode};
 use serde::{Deserialize, Serialize};
 
@@ -15,7 +14,7 @@ pub enum ServerMessage {
     BulbState {
         id: BulbId,
         mode: BulbMode,
-        wake_schedule: HashMap<Weekday, NaiveTime>,
+        prefs: BTreeMap<ScriptId, BulbPrefs>,
     },
 
     BulbMap(BulbMap),
@@ -35,10 +34,11 @@ pub enum ClientMessage {
         id: BulbId,
         power: bool,
     },
-    SetBulbWakeTime {
+    SetBulbPref {
-        id: BulbId,
+        bulb: BulbId,
-        day: Weekday,
+        script: ScriptId,
-        time: Option<NaiveTime>,
+        name: String,
+        value: Param,
     },
 }
 
@@ -78,3 +78,16 @@ impl BulbGroupShape {
         }
     }
 }
+
+pub type ScriptId = String;
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum Param {
+    String(String),
+    Toggle(bool),
+}
+
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub struct BulbPrefs {
+    pub kvs: BTreeMap<String, Param>,
+}

frontend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hemma_web"
-version = "0.2.2"
+version = "0.3.3"
 authors = ["Joakim Hulthe <joakim@hulthe.net"]
 edition = "2021"
 

frontend/index.html

@@ -12,10 +12,8 @@
 		<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu|Ubuntu+Mono&display=swap">
 
 		<!-- pwa manifest -->
-		<!--
 		<link data-trunk rel="copy-file" href="/static/manifest.json">
-		<link rel="manifest" href="/static/manifest.json">
+		<link rel="manifest" href="/manifest.json">
-		-->
 
 		<!-- copy image directory -->
 		<link data-trunk rel="copy-dir" href="/static/images">
@@ -26,7 +24,7 @@
 		<link rel="preload" href="/images/penguin3.svg" as="image">
 
 		<!-- icon -->
-		<link rel="icon" type="image/png" href="/images/icon.png">
+		<link rel="icon" type="image/png" href="/images/penguin2.svg">
 
 		<title>hemma</title>
 		<meta name="description" content="Home automation and information">

frontend/src/page/lights.rs

@@ -1,13 +1,13 @@
 use crate::components::color_picker::{ColorPicker, ColorPickerMsg};
 use crate::css::C;
-use chrono::{NaiveTime, Weekday};
+use common::{BulbGroup, BulbGroupShape, BulbMap, BulbPrefs, ClientMessage, Param, ServerMessage};
-use common::{BulbGroup, BulbGroupShape, BulbMap, ClientMessage, ServerMessage};
 use lighter_lib::{BulbId, BulbMode};
-use seed::{attrs, button, div, h1, h2, h3, input, label, span, table, td, tr, C};
+use seed::{attrs, button, div, empty, h1, h2, input, label, span, table, td, tr, C};
 use seed::{prelude::*, IF};
 use seed_router::Page;
-use std::collections::{BTreeMap, HashMap, HashSet};
+use std::collections::{BTreeMap, HashSet};
 use std::fmt::Write;
+use std::iter::repeat;
 
 /// /lights page
 #[derive(Default)]
@@ -16,8 +16,6 @@ pub struct Model {
 
     select_mode: SelectMode,
 
-    bulb_groups: BTreeMap<String, Vec<BulbId>>,
-
     bulb_map: BulbMap,
 
     /// the currently selected bulbs on the map
@@ -35,7 +33,7 @@ pub struct Model {
 #[derive(Default, Clone)]
 struct BulbState {
     mode: BulbMode,
-    wake_schedule: HashMap<Weekday, NaiveTime>,
+    prefs: BTreeMap<String, BulbPrefs>,
 }
 
 #[derive(Debug)]
@@ -49,7 +47,14 @@ pub enum Msg {
 
     ColorPicker(ColorPickerMsg),
     SetBulbPower(bool),
-    LightTime(String, Weekday),
+
+    /// Set a script parameter value for all selected bulbs.
+    SetParam {
+        script: String,
+        name: String,
+        value: Param,
+    },
+
     SetSelectMode(SelectMode),
 }
 
@@ -76,11 +81,11 @@ impl Page for Model {
                 ServerMessage::BulbState {
                     id,
                     mode: new_mode,
-                    wake_schedule,
+                    prefs,
                 } => {
                     *self.bulb_states.entry(id).or_default() = BulbState {
                         mode: new_mode,
-                        wake_schedule,
+                        prefs,
                     };
                 }
                 ServerMessage::BulbMap(bulb_map) => {
@@ -145,26 +150,25 @@ impl Page for Model {
                     orders.notify(message);
                 });
             }
-            Msg::LightTime(time, day) => {
+            Msg::SetParam {
-                if time.is_empty() {
+                script,
-                    self.for_selected_bulbs(|id, _| {
+                name,
-                        let message = ClientMessage::SetBulbWakeTime {
+                value,
-                            id: id.clone(),
+            } => {
-                            day,
+                self.for_selected_bulbs(|id, bulb| {
-                            time: None,
+                    bulb.prefs
-                        };
+                        .get_mut(&script)
-                        orders.notify(message);
+                        .unwrap() //TOD
-                    });
+                        .kvs
-                } else if let Ok(time) = NaiveTime::parse_from_str(&time, "%H:%M") {
+                        .insert(name.clone(), value.clone());
-                    self.for_selected_bulbs(|id, _| {
+                    let message = ClientMessage::SetBulbPref {
-                        let message = ClientMessage::SetBulbWakeTime {
+                        bulb: id.clone(),
-                            id: id.clone(),
+                        script: script.clone(),
-                            day,
+                        name: name.clone(),
-                            time: Some(time),
+                        value: value.clone(),
-                        };
+                    };
-                        orders.notify(message);
+                    orders.notify(message);
-                    });
+                });
-                }
             }
             Msg::SetSelectMode(mode) => {
                 self.select_mode = mode;
@@ -266,20 +270,44 @@ impl Page for Model {
                 .and_then(|id| self.bulb_states.get(id))
         };
 
-        let calendar_day = |day: Weekday| {
+        let script_param = |script: &str, name: &str, value: &Param| {
-            let time = selected_bulb
+            let name = name.to_string();
-                .and_then(|b| b.wake_schedule.get(&day))
+            let script = script.to_string();
-                .map(|t| t.to_string())
+
-                .unwrap_or_default();
+            match value {
-            tr![
+                Param::String(value) => tr![
-                C![C.calendar_day],
+                    C![C.pref_line],
-                td![day.to_string()],
+                    td![&name],
-                td![input![
+                    td![input![
-                    C![C.calendar_time_input],
+                        C![C.pref_input],
-                    attrs! {At::Placeholder => time},
+                        attrs! {At::Placeholder => &script},
-                    input_ev(Ev::Input, move |input| Msg::LightTime(input, day))
+                        attrs! {At::Value => value},
-                ]],
+                        input_ev(Ev::Input, move |input| Msg::SetParam {
-            ]
+                            script,
+                            name,
+                            value: Param::String(input),
+                        })
+                    ]]
+                ],
+                &Param::Toggle(value) => {
+                    tr![
+                        C![C.pref_line],
+                        button![
+                            if value {
+                                C![C.pref_button_enabled]
+                            } else {
+                                C![C.pref_button]
+                            },
+                            &name,
+                            input_ev(Ev::Click, move |_| Msg::SetParam {
+                                script,
+                                name,
+                                value: Param::Toggle(!value),
+                            })
+                        ]
+                    ]
+                }
+            }
         };
 
         div![
@@ -336,37 +364,43 @@ impl Page for Model {
                 ],
             ],
             div![
-                C![C.calendar_box],
+                C![C.prefs_box],
                 IF!(selected_bulb.is_none() => C![C.cross_out]),
-                h2!["Wake Schedule"],
+                h2!["Settings"],
-                table![
+                if let Some(selected_bulb) = selected_bulb {
-                    calendar_day(Weekday::Mon),
+                    table![selected_bulb
-                    calendar_day(Weekday::Tue),
+                        .prefs
-                    calendar_day(Weekday::Wed),
+                        .iter()
-                    calendar_day(Weekday::Thu),
+                        .flat_map(|(script, prefs)| repeat(script).zip(prefs.kvs.iter()))
-                    calendar_day(Weekday::Fri),
+                        .map(|(script, (name, value))| script_param(script, name, value))]
-                    calendar_day(Weekday::Sat),
+                } else {
-                    calendar_day(Weekday::Sun),
+                    empty![]
-                ],
+                },
             ],
         ]
     }
 }
 
 impl Model {
-    fn for_selected_bulbs(&self, mut f: impl FnMut(&BulbId, &BulbState)) {
+    fn for_selected_bulbs(&mut self, mut f: impl FnMut(&BulbId, &mut BulbState)) {
         if let SelectMode::Map = self.select_mode {
-            self.selected_groups
+            for &index in &self.selected_groups {
-                .iter()
+                let Some(group) = self.bulb_map.groups.get(index) else {
-                .filter_map(|&index| self.bulb_map.groups.get(index))
+                    continue;
-                .flat_map(|group| group.bulbs.iter())
+                };
-                .filter_map(|id| self.bulb_states.get(id).map(|bulb| (id, bulb)))
+
-                .for_each(|(id, bulb)| f(id, bulb));
+                for id in group.bulbs.iter() {
+                    if let Some(bulb) = self.bulb_states.get_mut(id) {
+                        f(id, bulb);
+                    }
+                }
+            }
         } else {
-            self.selected_bulbs
+            for id in &self.selected_bulbs {
-                .iter()
+                if let Some(bulb) = self.bulb_states.get_mut(id) {
-                .filter_map(|id| self.bulb_states.get(id).map(|bulb| (id, bulb)))
+                    f(id, bulb);
-                .for_each(|(id, bulb)| f(id, bulb));
+                };
+            }
         }
     }
 }

frontend/static/images/icon.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="160"
+   height="160"
+   viewBox="0 0 42.333333 42.333333"
+   version="1.1"
+   id="svg8"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     style="fill:#302f3b;fill-opacity:1;stroke:none;stroke-width:13.5876;stroke-linecap:round"
+     id="rect1"
+     width="42.333332"
+     height="42.333332"
+     x="0"
+     y="0" />
+  <g
+     id="layer1"
+     style="display:inline;fill:#ffffff"
+     transform="translate(5.2916666,4.9872409)">
+    <path
+       style="fill:#ffffff;stroke-width:0.177246"
+       d="m 13.134179,31.651166 c -1.367874,-0.18043 -3.4872278,-0.85238 -4.780367,-1.51563 -1.871747,-0.96002 -4.179215,-3.22966 -5.0074297,-4.92534 -1.5914865,-3.25839 -1.6801158,-7.72336 -0.2278948,-11.48085 1.0247424,-2.65144 2.7098602,-4.5706201 5.4768881,-6.2376401 4.4640374,-2.6894 6.9208324,-4.59636 8.5218534,-6.61464 0.435944,-0.54955 0.851411,-0.9404 0.923263,-0.86855 0.34663,0.34663 0.709996,2.45556 0.596276,3.46071 l -0.118698,1.04918 0.543199,-0.3868 c 0.298763,-0.21273 0.754695,-0.66407 1.013185,-1.00297 0.258491,-0.3389 0.531184,-0.55268 0.605988,-0.47507 0.277608,0.28804 0.872923,2.3693 0.872923,3.05181 0,0.78189 -0.07309,0.70941 2.140938,2.12277 3.360595,2.14527 5.28622,5.2741001 5.845846,9.4985401 0.238089,1.79727 0.119928,4.12317 -0.289284,5.69424 -0.438918,1.68512 -1.295306,3.20011 -2.596637,4.59356 -2.715779,2.90803 -6.119638,4.1954 -10.928887,4.13338 -1.132683,-0.0146 -2.298705,-0.0581 -2.591161,-0.0967 z m 5.683631,-1.1265 c 5.074026,-0.89873 8.492767,-3.70496 9.49005,-7.7898 0.358508,-1.46844 0.317005,-5.28368 -0.07569,-6.95754 -0.594746,-2.53514 -2.005266,-4.78931 -3.64922,-5.8318801 -1.428352,-0.90583 -1.561881,-0.82384 -2.840659,1.7442101 -0.615739,1.23654 -1.777129,3.21756 -2.580868,4.40229 l -1.461342,2.15404 0.927607,0.3153 c 1.188141,0.40386 2.476979,1.20634 2.848748,1.77373 0.272049,0.4152 0.269021,0.4806 -0.04735,1.02231 -0.778356,1.33273 -2.272203,1.79512 -5.849412,1.81056 l -2.340153,0.0101 -2.489801,2.46697 c -2.6276133,2.60352 -2.8788341,3.03045 -2.0880964,3.54856 1.8126654,1.18771 7.0732674,1.8772 10.1561944,1.33115 z m 3.183004,-13.17071 c -0.205126,-0.14999 -0.329285,-0.4602 -0.329285,-0.8227 0,-0.96498 1.087198,-1.43355 1.715448,-0.73934 0.872429,0.96402 -0.338235,2.3283 -1.386163,1.56204 z m -3.186586,4.78402 c 1.133944,-0.30198 1.619925,-0.56299 1.85054,-0.9939 0.246861,-0.46126 -0.269147,-0.94676 -1.770094,-1.66543 -1.062457,-0.50872 -1.296906,-0.55176 -3.013183,-0.55311 -1.794444,-0.001 -1.910137,0.0225 -3.231141,0.66815 -1.860639,0.90936 -2.118197,1.48499 -0.948717,2.12031 1.182601,0.64245 5.357705,0.89133 7.112595,0.42398 z m -5.26747,-0.96936 c -1.113796,-0.13246 -1.303724,-0.23853 -1.149022,-0.64168 0.08921,-0.23246 0.582443,-0.27351 3.286452,-0.27351 1.749822,0 3.307658,0.0484 3.461858,0.10758 0.350902,0.13466 0.365077,0.53097 0.02367,0.66198 -0.432127,0.16582 -4.555272,0.2726 -5.622968,0.14563 z m -3.7845902,-3.81466 c 0.7343882,-0.537 0.2478022,-1.88618 -0.6802563,-1.88618 -0.5030742,0 -0.9992445,0.51278 -0.9992445,1.03268 0,0.90987 0.9453857,1.39029 1.6795008,0.8535 z"
+       id="path865" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.5967544,-6.2400058 c 0,0 -0.041418,0.1031026 -0.02862,0.2093299 0.012798,0.1062273 0.084435,0.1741091 0.084435,0.1741091 l -0.083147,0.088222 c 0,0 -0.1053512,-0.138166 -0.073877,-0.2774823 0.031474,-0.1393166 0.1012092,-0.1941783 0.101209,-0.1941787 z"
+       id="path1039" />
+  </g>
+  <g
+     id="layer2"
+     style="display:none" />
+  <g
+     id="layer3"
+     style="display:none" />
+</svg>

frontend/static/images/light.svg

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="900px"
+   height="900px"
+   viewBox="0 0 900 900"
+   version="1.1"
+   xml:space="preserve"
+   id="SVGRoot"
+   inkscape:version="1.3.1 (91b66b0783, 2023-11-16, custom)"
+   sodipodi:docname="light.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs2" />
+<sodipodi:namedview
+   pagecolor="#302f3b"
+   bordercolor="#292929"
+   borderopacity="1"
+   inkscape:showpageshadow="2"
+   inkscape:pageopacity="0.0"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#232323"
+   id="namedview1"
+   inkscape:zoom="0.64016282"
+   inkscape:cx="414.73824"
+   inkscape:cy="449.88555"
+   inkscape:window-width="1684"
+   inkscape:window-height="1010"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="SVGRoot" />
+<style
+   type="text/css"
+   id="style1">
+g.prefab path {
+  vector-effect:non-scaling-stroke;
+  -inkscape-stroke:hairline;
+  fill: none;
+  fill-opacity: 1;
+  stroke-opacity: 1;
+  stroke: #00349c;
+}
+</style>
+
+<circle
+   style="fill:#000000;fill-opacity:0.00697072;stroke:#ffffff;stroke-opacity:1;stroke-width:48;stroke-dasharray:none"
+   id="path3"
+   cx="450"
+   cy="450"
+   r="120" /><path
+   style="fill:#000000;fill-opacity:0.00697069;stroke:#ffffff;stroke-width:51.2769;stroke-dasharray:none;stroke-opacity:1;stroke-linecap:round"
+   d="M 450,252 V 52"
+   id="path4" /><path
+   style="fill:#000000;fill-opacity:0.00697069;stroke:#ffffff;stroke-width:51.2769;stroke-dasharray:none;stroke-opacity:1;stroke-linecap:round"
+   d="m 450.00045,848.81135 v -200"
+   id="path4-6" /><path
+   style="fill:#000000;fill-opacity:0.00697069;stroke:#ffffff;stroke-width:51.2769;stroke-dasharray:none;stroke-opacity:1;stroke-linecap:round"
+   d="m 648.4059,450.40545 h 200"
+   id="path5" /><path
+   style="fill:#000000;fill-opacity:0.00697069;stroke:#ffffff;stroke-width:51.2769;stroke-dasharray:none;stroke-opacity:1;stroke-linecap:round"
+   d="m 51.59455,450.4059 h 200"
+   id="path6" /><path
+   style="fill:#000000;fill-opacity:0.00697069;stroke:#ffffff;stroke-width:51.2769;stroke-dasharray:none;stroke-opacity:1;stroke-linecap:round"
+   d="M 590.29406,310.11152 731.71542,168.69016"
+   id="path7" /><path
+   style="fill:#000000;fill-opacity:0.00697069;stroke:#ffffff;stroke-width:51.2769;stroke-dasharray:none;stroke-opacity:1;stroke-linecap:round"
+   d="M 168.28503,732.12119 309.70639,590.69983"
+   id="path8" /><path
+   style="fill:#000000;fill-opacity:0.00697069;stroke:#ffffff;stroke-width:51.2769;stroke-dasharray:none;stroke-opacity:1;stroke-linecap:round"
+   d="M 590.29438,590.69951 731.71574,732.12087"
+   id="path9" /><path
+   style="fill:#000000;fill-opacity:0.00697069;stroke:#ffffff;stroke-width:51.2769;stroke-dasharray:none;stroke-opacity:1;stroke-linecap:round"
+   d="M 168.28471,168.69048 309.70607,310.11184"
+   id="path10" /></svg>

frontend/static/manifest.json

@@ -0,0 +1,17 @@
+{
+  "name": "Hemma",
+  "short_name": "Hemma",
+  "start_url": "/lights",
+  "display": "standalone",
+  "background_color": "#302f3b",
+  "description": "Styr lampor",
+  "icons": [
+    { "src": "/images/icon_x72.png", "sizes": "72x72", "type": "image/png", "purpose": "maskable" },
+    { "src": "/images/icon_x128.png", "sizes": "128x128", "type": "image/png", "purpose": "maskable" },
+    { "src": "/images/icon_x144.png", "sizes": "144x144", "type": "image/png", "purpose": "maskable" },
+    { "src": "/images/icon_x192.png", "sizes": "192x192", "type": "image/png", "purpose": "maskable" },
+    { "src": "/images/icon_x512.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable" },
+	{ "src": "/images/icon.svg", "sizes": "513x512", "purpose": "maskable" }
+  ]
+}
+

frontend/static/styles/common.scss

@@ -381,14 +381,16 @@ body {
 
 	transition: margin 0.1s ease-out;
 }
-.calendar_day {
+
+
+.pref_line {
 	display: flex;
 	flex-direction: row;
 	justify-content: space-between;
 	margin-top: .3em;
 }
 
-.calendar_time_input {
+.pref_input {
 	background: #453f4b;
 	border: solid 0.35em #5b3f63;
 	border-radius: .3em;
@@ -400,17 +402,49 @@ body {
 	margin-left: .5em;
 }
 
-.calendar_box {
+.pref_button {}
+.pref_button,  .pref_button_enabled {
+	position: relative;
+	width: 100%;
+	
+	font-size: large;
+	font-weight: bold;
+	color: white;
+	text-shadow: 0.1rem 0.1rem 0.3rem black;
+
+	padding: 1rem;
+	border: solid 0.35em #5b3f63;
+	border-radius: 0.3em;
+	background: transparent;
+	overflow: hidden;
+}
+.pref_button_enabled::before {
+	content: "";
+	z-index: -1;
+	width: 20rem;
+	height: 20rem;
+	background-size: 100% 100%;
+	background-image: url(/images/hsb.png);
+	position: absolute;
+	transform: translate(-8.5rem, -2.5rem);
+	animation: infinite linear 3s button_rainbow;
+}
+@keyframes button_rainbow {
+	from { transform: translate(-8.5rem, -2.5rem) rotate(  0deg); }
+	to   { transform: translate(-8.5rem, -2.5rem) rotate(360deg); }
+}
+
+.prefs_box {
 	display: flex;
 	justify-content: center;
 }
 
-.calendar_box > h2 {
+.prefs_box > h2 {
 	writing-mode: sideways-lr;
 	margin-top: auto;
 	margin-bottom: auto;
 }
-.calendar_box > * {
+.prefs_box > * {
 	flex-shrink: 1;
 }