Add handler for relay states

emgauwa-controller/src/app_state.rs

@@ -3,6 +3,7 @@ use std::sync::Arc;
 use actix::{Actor, Context, Handler, Message};
 use emgauwa_lib::errors::EmgauwaError;
 use emgauwa_lib::models::Controller;
+use emgauwa_lib::types::RelayStates;
 use futures::executor::block_on;
 use sqlx::{Pool, Sqlite};
 use tokio::sync::Notify;
@@ -13,8 +14,8 @@ pub struct Reload {}
 
 #[derive(Message)]
 #[rtype(result = "()")]
-pub struct UpdateRelaysOn {
+pub struct UpdateRelayStates {
-	pub relays_are_on: Vec<Option<bool>>,
+	pub relay_states: RelayStates,
 }
 
 #[derive(Message)]
@@ -74,17 +75,11 @@ impl Handler<Reload> for AppState {
 	}
 }
 
-impl Handler<UpdateRelaysOn> for AppState {
+impl Handler<UpdateRelayStates> for AppState {
 	type Result = ();
 
-	fn handle(&mut self, msg: UpdateRelaysOn, _ctx: &mut Self::Context) -> Self::Result {
+	fn handle(&mut self, msg: UpdateRelayStates, _ctx: &mut Self::Context) -> Self::Result {
-		self.this
+		self.this.apply_relay_states(&msg.relay_states);
-			.relays
-			.iter_mut()
-			.zip(msg.relays_are_on.iter())
-			.for_each(|(relay, is_on)| {
-				relay.is_on = *is_on;
-			});
 
 		self.notify_relay_change();
 	}

emgauwa-controller/src/relay_loop.rs

@@ -5,6 +5,7 @@ use chrono::Local;
 use emgauwa_lib::constants::RELAYS_RETRY_TIMEOUT;
 use emgauwa_lib::errors::EmgauwaError;
 use emgauwa_lib::models::Controller;
+use emgauwa_lib::types::RelayStates;
 use futures::pin_mut;
 use tokio::time;
 use tokio::time::timeout;
@@ -30,7 +31,7 @@ async fn run_relays(app_state: &Addr<AppState>) -> Result<(), EmgauwaError> {
 
 	let mut last_weekday = emgauwa_lib::utils::get_weekday();
 	let mut this = utils::app_state_get_this(app_state).await?;
-	let mut relay_states: Vec<Option<bool>> = Vec::new();
+	let mut relay_states: RelayStates = Vec::new();
 	init_relay_states(&mut relay_states, &this);
 
 	loop {
@@ -80,7 +81,7 @@ async fn run_relays(app_state: &Addr<AppState>) -> Result<(), EmgauwaError> {
 	}
 }
 
-fn init_relay_states(relay_states: &mut Vec<Option<bool>>, this: &Controller) {
+fn init_relay_states(relay_states: &mut RelayStates, this: &Controller) {
 	relay_states.clear();
 	for _ in 0..this.c.relay_count {
 		relay_states.push(None);

emgauwa-controller/src/utils.rs

@@ -3,6 +3,7 @@ use std::sync::Arc;
 use actix::Addr;
 use emgauwa_lib::errors::EmgauwaError;
 use emgauwa_lib::models::Controller;
+use emgauwa_lib::types::RelayStates;
 use tokio::sync::Notify;
 
 use crate::app_state;
@@ -42,11 +43,11 @@ pub async fn app_state_reload(app_state: &Addr<AppState>) -> Result<(), EmgauwaE
 
 pub async fn app_state_update_relays_on(
 	app_state: &Addr<AppState>,
-	relay_states: Vec<Option<bool>>,
+	relay_states: RelayStates,
 ) -> Result<(), EmgauwaError> {
 	app_state
-		.send(app_state::UpdateRelaysOn {
+		.send(app_state::UpdateRelayStates {
-			relays_are_on: relay_states,
+			relay_states: relay_states,
 		})
 		.await
 		.map_err(EmgauwaError::from)

emgauwa-controller/src/ws/mod.rs

@@ -78,7 +78,9 @@ async fn read_app_state(
 	loop {
 		notifier.notified().await;
 		log::debug!("Relay change detected");
-		let ws_action = ControllerWsAction::Register(app_state_get_this(&app_state).await?);
+		let this = app_state_get_this(&app_state).await?;
+		let relay_states = this.get_relay_states();
+		let ws_action = ControllerWsAction::RelayStates((this.c.uid, relay_states));
 
 		let ws_action_json = serde_json::to_string(&ws_action)?;
 		tx.unbounded_send(Message::text(ws_action_json))
@@ -122,9 +124,6 @@ async fn handle_message(
 				log::error!("Error deserializing action: {:?}", e);
 			}
 		},
-		Message::Ping(_) => {
-			log::debug!("Received ping");
-		}
 		_ => {}
 	}
 }

emgauwa-core/src/handlers/v1/ws/controllers/handlers.rs

@@ -1,7 +1,10 @@
+use std::hash::{Hash, Hasher};
+
 use actix::{Actor, AsyncContext};
 use emgauwa_lib::db::{DbController, DbJunctionRelaySchedule, DbRelay, DbSchedule};
 use emgauwa_lib::errors::{DatabaseError, EmgauwaError};
 use emgauwa_lib::models::{Controller, FromDbModel};
+use emgauwa_lib::types::{ControllerUid, RelayStates};
 use futures::executor::block_on;
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
@@ -81,4 +84,18 @@ impl ControllerWs {
 		log::debug!("Done registering controller");
 		Ok(())
 	}
+
+	pub fn handle_relay_states(
+		&mut self,
+		ctx: &mut <ControllerWs as Actor>::Context,
+		controller_uid: ControllerUid,
+		relay_states: RelayStates,
+	) -> Result<(), EmgauwaError> {
+		log::debug!(
+			"Received relay states: {:?} for {}",
+			relay_states,
+			controller_uid
+		);
+		Ok(())
+	}
 }

emgauwa-core/src/handlers/v1/ws/controllers/mod.rs

@@ -54,6 +54,9 @@ impl ControllerWs {
 	) {
 		let action_res = match action {
 			ControllerWsAction::Register(controller) => self.handle_register(conn, ctx, controller),
+			ControllerWsAction::RelayStates((controller_uid, relay_states)) => {
+				self.handle_relay_states(ctx, controller_uid, relay_states)
+			}
 			_ => Ok(()),
 		};
 		if let Err(e) = action_res {

emgauwa-lib/src/models/controller.rs

@@ -7,6 +7,7 @@ use sqlx::Sqlite;
 use crate::db::DbController;
 use crate::errors::{DatabaseError, EmgauwaError};
 use crate::models::{convert_db_list_cache, FromDbModel, Relay};
+use crate::types::RelayStates;
 
 #[derive(Serialize, Deserialize, Debug, Clone, MessageResponse)]
 pub struct Controller {
@@ -48,4 +49,17 @@ impl Controller {
 		}
 		Ok(())
 	}
+
+	pub fn apply_relay_states(&mut self, relay_states: &RelayStates) {
+		self.relays
+			.iter_mut()
+			.zip(relay_states.iter())
+			.for_each(|(relay, is_on)| {
+				relay.is_on = *is_on;
+			});
+	}
+
+	pub fn get_relay_states(&self) -> RelayStates {
+		self.relays.iter().map(|r| r.is_on).collect()
+	}
 }

emgauwa-lib/src/types/mod.rs

@@ -14,6 +14,8 @@ use crate::models::{Controller, Relay};
 
 pub type Weekday = i64;
 
+pub type RelayStates = Vec<Option<bool>>;
+
 #[derive(Debug, Serialize, Deserialize, Message)]
 #[rtype(result = "Result<(), EmgauwaError>")]
 pub enum ControllerWsAction {
@@ -22,4 +24,5 @@ pub enum ControllerWsAction {
 	Schedules(Vec<DbSchedule>),
 	Relays(Vec<Relay>),
 	Controller(Controller),
+	RelayStates((ControllerUid, RelayStates)),
 }