Add relay pulse functionality

emgauwa-controller/src/relay_loop.rs

@@ -1,4 +1,4 @@
-use std::time::Duration;
+use std::time::{Duration, Instant};
 
 use actix::Addr;
 use chrono::{Local, Timelike};
@@ -35,6 +35,8 @@ async fn run_relays(app_state: &Addr<AppState>) -> Result<(), EmgauwaError> {
 	init_relay_states(&mut relay_states, &this);
 	calc_relay_states(&mut relay_states, &mut this, app_state).await?;
 
+	let mut duration_override = None;
+
 	loop {
 		log::debug!(
 			"Relay loop at {}: {}",
@@ -44,9 +46,12 @@ async fn run_relays(app_state: &Addr<AppState>) -> Result<(), EmgauwaError> {
 
 		let notifier_future = notifier.notified();
 		pin_mut!(notifier_future);
-		let mut changed = timeout(get_next_duration(&this), &mut notifier_future)
-			.await
-			.is_ok();
+		let mut changed = timeout(
+			get_next_duration(&this, &mut duration_override),
+			&mut notifier_future,
+		)
+		.await
+		.is_ok();
 
 		check_weekday(app_state, &mut last_weekday, &mut changed).await?;
 
@@ -55,6 +60,25 @@ async fn run_relays(app_state: &Addr<AppState>) -> Result<(), EmgauwaError> {
 			this = utils::app_state_get_this(app_state).await?;
 		}
 
+		let now_pulse = Instant::now();
+		duration_override = this
+			.relays
+			.iter_mut()
+			.filter_map(|relay| match relay.check_pulsing(&now_pulse) {
+				None => None,
+				Some(pulse) => {
+					let dur = pulse - now_pulse;
+					log::debug!(
+						"Pulsing relay {} for {}s until {:?} ",
+						relay.r.number,
+						dur.as_secs(),
+						pulse
+					);
+					Some(dur)
+				}
+			})
+			.min();
+
 		calc_relay_states(&mut relay_states, &mut this, app_state).await?;
 	}
 }
@@ -72,18 +96,26 @@ async fn calc_relay_states(
 	app_state: &Addr<AppState>,
 ) -> Result<(), EmgauwaError> {
 	let now = Local::now().time();
+	let now_pulse = Instant::now();
 
 	this.relays
 		.iter_mut()
 		.zip(relay_states.iter_mut())
 		.for_each(|(relay, state)| {
-			relay.is_on = Some(relay.active_schedule.is_on(&now));
+			relay.is_on = Some(
+				relay.active_schedule.is_on(&now) || relay.check_pulsing(&now_pulse).is_some(),
+			);
 			*state = relay.is_on;
 		});
 	utils::app_state_update_relays_on(app_state, relay_states.clone()).await
 }
 
-fn get_next_duration(this: &Controller) -> Duration {
+fn get_next_duration(this: &Controller, duration_override: &mut Option<Duration>) -> Duration {
+	if let Some(duration) = duration_override {
+		log::debug!("Duration override. Waiting for {}s", duration.as_secs());
+		return *duration;
+	}
+
 	let now = Local::now().time();
 	let now_in_s = now.num_seconds_from_midnight();
 	let next_timestamp = this