Refactor errors and some other stuff/fixes

api.v1.yaml

@@ -748,13 +748,13 @@ components:
         controller_id:
           $ref: '#/components/schemas/controller_id'
         active_schedule:
-          $ref: '#/components/schemas/schedule'
+          $ref: '#/components/schemas/schedule-untagged'
         schedules:
           type: array
           maxItems: 7
           minItems: 7
           items:
-            $ref: '#/components/schemas/schedule'
+            $ref: '#/components/schemas/schedule-untagged'
         tags:
           type: array
           items:
@@ -762,6 +762,20 @@ components:
         is_on:
           type: boolean
           description: NULL when unknown
+    schedule-untagged:
+      title: schedule
+      type: object
+      description: ''
+      properties:
+        id:
+          $ref: '#/components/schemas/schedule_id'
+        name:
+          type: string
+          example: Sprinkler Sunny Day
+        periods:
+          type: array
+          items:
+            $ref: '#/components/schemas/period'
     schedule:
       title: schedule
       type: object

emgauwa-controller/src/main.rs

@@ -1,6 +1,6 @@
 use emgauwa_lib::constants::WEBSOCKET_RETRY_TIMEOUT;
-use emgauwa_lib::db::errors::DatabaseError;
 use emgauwa_lib::db::{DbController, DbJunctionRelaySchedule, DbRelay, DbSchedule};
+use emgauwa_lib::errors::DatabaseError;
 use emgauwa_lib::models::{Controller, FromDbModel};
 use emgauwa_lib::types::{ControllerUid, ControllerWsAction};
 use emgauwa_lib::{db, utils};
@@ -62,7 +62,10 @@ async fn main() {
 
 	let pool = db::init(&settings.database).await;
 
-	let mut conn = pool.acquire().await.unwrap();
+	let mut conn = pool
+		.acquire()
+		.await
+		.expect("Failed to get database connection");
 
 	let db_controller = DbController::get_all(&mut conn)
 		.await
@@ -100,18 +103,9 @@ async fn main() {
 	tokio::spawn(run_relay_loop(settings));
 
 	loop {
-		log::info!(
-			"Trying to connect in {} seconds...",
-			WEBSOCKET_RETRY_TIMEOUT.as_secs()
-		);
-		time::sleep(WEBSOCKET_RETRY_TIMEOUT).await;
-
-		let connect_result = connect_async(&url).await;
-		if let Err(err) = connect_result {
-			log::warn!("Failed to connect to websocket: {}", err,);
-			continue;
-		}
-		let (ws_stream, _) = connect_result.unwrap();
+		match connect_async(&url).await {
+			Ok(connection) => {
+				let (ws_stream, _) = connection;
 
 				let (mut write, read) = ws_stream.split();
 
@@ -126,6 +120,17 @@ async fn main() {
 
 				log::warn!("Lost connection to websocket");
 			}
+			Err(err) => {
+				log::warn!("Failed to connect to websocket: {}", err,);
+			}
+		}
+
+		log::info!(
+			"Retrying to connect in {} seconds...",
+			WEBSOCKET_RETRY_TIMEOUT.as_secs()
+		);
+		time::sleep(WEBSOCKET_RETRY_TIMEOUT).await;
+	}
 }
 
 async fn handle_message(message_result: Result<Message, Error>) {

emgauwa-core/src/app_state.rs

@@ -0,0 +1,71 @@
+use std::collections::HashMap;
+use std::sync::{Arc, Mutex};
+
+use actix::{Actor, Context, Handler, Message, Recipient};
+use emgauwa_lib::errors::DatabaseError;
+use emgauwa_lib::models::Controller;
+use emgauwa_lib::types::{ControllerUid, ControllerWsAction};
+use futures::executor::block_on;
+use sqlx::{Pool, Sqlite};
+
+#[derive(Message)]
+#[rtype(result = "Result<(), DatabaseError>")]
+pub struct DisconnectController {
+	pub controller_uid: ControllerUid,
+}
+
+#[derive(Message)]
+#[rtype(result = "Result<(), DatabaseError>")]
+pub struct ConnectController {
+	pub address: Recipient<ControllerWsAction>,
+	pub controller: Controller,
+}
+
+pub struct AppServer {
+	pub pool: Pool<Sqlite>,
+	pub connected_controllers: Arc<Mutex<HashMap<ControllerUid, Controller>>>,
+}
+
+impl AppServer {
+	pub fn new(pool: Pool<Sqlite>) -> AppServer {
+		AppServer {
+			pool,
+			connected_controllers: Arc::new(Mutex::new(HashMap::new())),
+		}
+	}
+}
+
+impl Actor for AppServer {
+	type Context = Context<Self>;
+}
+
+impl Handler<DisconnectController> for AppServer {
+	type Result = Result<(), DatabaseError>;
+
+	fn handle(&mut self, msg: DisconnectController, _ctx: &mut Self::Context) -> Self::Result {
+		let mut pool_conn = block_on(self.pool.acquire()).unwrap();
+		let mut data = self.connected_controllers.lock().unwrap();
+
+		if let Some(controller) = data.remove(&msg.controller_uid) {
+			if let Err(err) = block_on(controller.c.update_active(&mut pool_conn, false)) {
+				log::error!(
+					"Failed to mark controller {} as inactive: {:?}",
+					controller.c.uid,
+					err
+				);
+			}
+		}
+		Ok(())
+	}
+}
+
+impl Handler<ConnectController> for AppServer {
+	type Result = Result<(), DatabaseError>;
+
+	fn handle(&mut self, msg: ConnectController, _ctx: &mut Self::Context) -> Self::Result {
+		let mut data = self.connected_controllers.lock().unwrap();
+		data.insert(msg.controller.c.uid.clone(), msg.controller);
+
+		Ok(())
+	}
+}

emgauwa-core/src/handlers/errors.rs

@@ -1,83 +0,0 @@
-use std::fmt::{Display, Formatter};
-
-use actix_web::http::StatusCode;
-use actix_web::HttpResponse;
-use emgauwa_lib::db::errors::DatabaseError;
-use serde::ser::SerializeStruct;
-use serde::{Serialize, Serializer};
-
-#[derive(Debug)]
-pub enum ApiError {
-	BadUid,
-	ProtectedSchedule,
-	DatabaseError(DatabaseError),
-	InternalError(String),
-}
-
-impl ApiError {
-	fn get_code(&self) -> StatusCode {
-		match self {
-			ApiError::BadUid => StatusCode::BAD_REQUEST,
-			ApiError::ProtectedSchedule => StatusCode::FORBIDDEN,
-			ApiError::DatabaseError(db_error) => db_error.get_code(),
-			ApiError::InternalError(_) => StatusCode::INTERNAL_SERVER_ERROR,
-		}
-	}
-}
-
-impl Serialize for ApiError {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where
-		S: Serializer,
-	{
-		let mut s = serializer.serialize_struct("error", 2)?;
-		s.serialize_field("code", &self.get_code().as_u16())?;
-		s.serialize_field("description", &String::from(self))?;
-		s.end()
-	}
-}
-
-impl From<&ApiError> for String {
-	fn from(err: &ApiError) -> Self {
-		match err {
-			ApiError::BadUid => String::from("the uid is in a bad format"),
-			ApiError::ProtectedSchedule => String::from("the targeted schedule is protected"),
-			ApiError::DatabaseError(db_err) => String::from(db_err),
-			ApiError::InternalError(msg) => msg.clone(),
-		}
-	}
-}
-
-impl From<&ApiError> for HttpResponse {
-	fn from(err: &ApiError) -> Self {
-		HttpResponse::build(err.get_code()).json(err)
-	}
-}
-
-impl Display for ApiError {
-	fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-		write!(f, "{}: {}", self.get_code(), String::from(self))
-	}
-}
-
-impl actix_web::error::ResponseError for ApiError {
-	fn status_code(&self) -> StatusCode {
-		self.get_code()
-	}
-
-	fn error_response(&self) -> HttpResponse {
-		HttpResponse::from(self)
-	}
-}
-
-impl From<sqlx::Error> for ApiError {
-	fn from(err: sqlx::Error) -> Self {
-		ApiError::DatabaseError(DatabaseError::from(err))
-	}
-}
-
-impl From<DatabaseError> for ApiError {
-	fn from(err: DatabaseError) -> Self {
-		ApiError::DatabaseError(err)
-	}
-}

emgauwa-core/src/handlers/mod.rs

@@ -2,7 +2,6 @@ use actix_web::{error, Error, HttpRequest, HttpResponse};
 use serde::ser::SerializeStruct;
 use serde::{Serialize, Serializer};
 
-pub(crate) mod errors;
 pub mod v1;
 
 enum EmgauwaJsonPayLoadError {

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

@@ -1,20 +1,18 @@
 use actix_web::{delete, get, put, web, HttpResponse};
-use emgauwa_lib::db::errors::DatabaseError;
 use emgauwa_lib::db::DbController;
+use emgauwa_lib::errors::{DatabaseError, EmgauwaError};
 use emgauwa_lib::models::{convert_db_list, Controller, FromDbModel};
 use emgauwa_lib::types::ControllerUid;
 use serde_derive::{Deserialize, Serialize};
 use sqlx::{Pool, Sqlite};
 
-use crate::handlers::errors::ApiError;
-
 #[derive(Debug, Serialize, Deserialize)]
 pub struct RequestController {
 	name: String,
 }
 
 #[get("/api/v1/controllers")]
-pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, ApiError> {
+pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let db_controllers = DbController::get_all(&mut pool_conn).await?;
@@ -28,11 +26,11 @@ pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, ApiErr
 pub async fn show(
 	pool: web::Data<Pool<Sqlite>>,
 	path: web::Path<(String,)>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let (controller_uid,) = path.into_inner();
-	let uid = ControllerUid::try_from(controller_uid.as_str()).or(Err(ApiError::BadUid))?;
+	let uid = ControllerUid::try_from(controller_uid.as_str())?;
 
 	let controller = DbController::get_by_uid(&mut pool_conn, &uid)
 		.await?
@@ -47,11 +45,11 @@ pub async fn update(
 	pool: web::Data<Pool<Sqlite>>,
 	path: web::Path<(String,)>,
 	data: web::Json<RequestController>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let (controller_uid,) = path.into_inner();
-	let uid = ControllerUid::try_from(controller_uid.as_str()).or(Err(ApiError::BadUid))?;
+	let uid = ControllerUid::try_from(controller_uid.as_str())?;
 
 	let controller = DbController::get_by_uid(&mut pool_conn, &uid)
 		.await?
@@ -69,11 +67,11 @@ pub async fn update(
 pub async fn delete(
 	pool: web::Data<Pool<Sqlite>>,
 	path: web::Path<(String,)>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let (controller_uid,) = path.into_inner();
-	let uid = ControllerUid::try_from(controller_uid.as_str()).or(Err(ApiError::BadUid))?;
+	let uid = ControllerUid::try_from(controller_uid.as_str())?;
 
 	DbController::delete_by_uid(&mut pool_conn, uid).await?;
 	Ok(HttpResponse::Ok().json("controller got deleted"))

emgauwa-core/src/handlers/v1/relays.rs

@@ -1,13 +1,11 @@
 use actix_web::{get, put, web, HttpResponse};
-use emgauwa_lib::db::errors::DatabaseError;
 use emgauwa_lib::db::{DbController, DbRelay, DbTag};
+use emgauwa_lib::errors::{DatabaseError, EmgauwaError};
 use emgauwa_lib::models::{convert_db_list, FromDbModel, Relay};
 use emgauwa_lib::types::ControllerUid;
 use serde::{Deserialize, Serialize};
 use sqlx::{Pool, Sqlite};
 
-use crate::handlers::errors::ApiError;
-
 #[derive(Debug, Serialize, Deserialize)]
 pub struct RequestRelay {
 	name: String,
@@ -15,7 +13,7 @@ pub struct RequestRelay {
 }
 
 #[get("/api/v1/relays")]
-pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, ApiError> {
+pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let db_relays = DbRelay::get_all(&mut pool_conn).await?;
@@ -29,7 +27,7 @@ pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, ApiErr
 pub async fn tagged(
 	pool: web::Data<Pool<Sqlite>>,
 	path: web::Path<(String,)>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let (tag,) = path.into_inner();
@@ -47,11 +45,11 @@ pub async fn tagged(
 pub async fn index_for_controller(
 	pool: web::Data<Pool<Sqlite>>,
 	path: web::Path<(String,)>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let (controller_uid,) = path.into_inner();
-	let uid = ControllerUid::try_from(controller_uid.as_str()).or(Err(ApiError::BadUid))?;
+	let uid = ControllerUid::try_from(controller_uid.as_str())?;
 
 	let controller = DbController::get_by_uid(&mut pool_conn, &uid)
 		.await?
@@ -67,11 +65,11 @@ pub async fn index_for_controller(
 pub async fn show_for_controller(
 	pool: web::Data<Pool<Sqlite>>,
 	path: web::Path<(String, i64)>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let (controller_uid, relay_num) = path.into_inner();
-	let uid = ControllerUid::try_from(controller_uid.as_str()).or(Err(ApiError::BadUid))?;
+	let uid = ControllerUid::try_from(controller_uid.as_str())?;
 
 	let controller = DbController::get_by_uid(&mut pool_conn, &uid)
 		.await?
@@ -90,11 +88,11 @@ pub async fn update_for_controller(
 	pool: web::Data<Pool<Sqlite>>,
 	path: web::Path<(String, i64)>,
 	data: web::Json<RequestRelay>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let (controller_uid, relay_num) = path.into_inner();
-	let uid = ControllerUid::try_from(controller_uid.as_str()).or(Err(ApiError::BadUid))?;
+	let uid = ControllerUid::try_from(controller_uid.as_str())?;
 
 	let controller = DbController::get_by_uid(&mut pool_conn, &uid)
 		.await?

emgauwa-core/src/handlers/v1/schedules.rs

@@ -1,14 +1,12 @@
 use actix_web::{delete, get, post, put, web, HttpResponse};
-use emgauwa_lib::db::errors::DatabaseError;
 use emgauwa_lib::db::{DbPeriods, DbSchedule, DbTag};
+use emgauwa_lib::errors::{ApiError, DatabaseError, EmgauwaError};
 use emgauwa_lib::models::{convert_db_list, FromDbModel, Schedule};
 use emgauwa_lib::types::ScheduleUid;
 use serde::{Deserialize, Serialize};
 use sqlx::pool::PoolConnection;
 use sqlx::{Pool, Sqlite};
 
-use crate::handlers::errors::ApiError;
-
 #[derive(Debug, Serialize, Deserialize)]
 pub struct RequestSchedule {
 	name: String,
@@ -17,7 +15,7 @@ pub struct RequestSchedule {
 }
 
 #[get("/api/v1/schedules")]
-pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, ApiError> {
+pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let db_schedules = DbSchedule::get_all(&mut pool_conn).await?;
@@ -30,7 +28,7 @@ pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, ApiErr
 pub async fn tagged(
 	pool: web::Data<Pool<Sqlite>>,
 	path: web::Path<(String,)>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let (tag,) = path.into_inner();
@@ -48,11 +46,11 @@ pub async fn tagged(
 pub async fn show(
 	pool: web::Data<Pool<Sqlite>>,
 	path: web::Path<(String,)>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let (schedule_uid,) = path.into_inner();
-	let uid = ScheduleUid::try_from(schedule_uid.as_str()).or(Err(ApiError::BadUid))?;
+	let uid = ScheduleUid::try_from(schedule_uid.as_str())?;
 
 	let schedule = DbSchedule::get_by_uid(&mut pool_conn, &uid)
 		.await?
@@ -66,7 +64,7 @@ pub async fn show(
 pub async fn add(
 	pool: web::Data<Pool<Sqlite>>,
 	data: web::Json<RequestSchedule>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let new_schedule = DbSchedule::create(
@@ -108,7 +106,7 @@ async fn add_list_single(
 pub async fn add_list(
 	pool: web::Data<Pool<Sqlite>>,
 	data: web::Json<Vec<RequestSchedule>>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let mut db_schedules: Vec<DbSchedule> = Vec::new();
@@ -126,11 +124,11 @@ pub async fn update(
 	pool: web::Data<Pool<Sqlite>>,
 	path: web::Path<(String,)>,
 	data: web::Json<RequestSchedule>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let (schedule_uid,) = path.into_inner();
-	let uid = ScheduleUid::try_from(schedule_uid.as_str()).or(Err(ApiError::BadUid))?;
+	let uid = ScheduleUid::try_from(schedule_uid.as_str())?;
 
 	let schedule = DbSchedule::get_by_uid(&mut pool_conn, &uid)
 		.await?
@@ -152,15 +150,15 @@ pub async fn update(
 pub async fn delete(
 	pool: web::Data<Pool<Sqlite>>,
 	path: web::Path<(String,)>,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let (schedule_uid,) = path.into_inner();
-	let uid = ScheduleUid::try_from(schedule_uid.as_str()).or(Err(ApiError::BadUid))?;
+	let uid = ScheduleUid::try_from(schedule_uid.as_str())?;
 
 	match uid {
-		ScheduleUid::Off => Err(ApiError::ProtectedSchedule),
-		ScheduleUid::On => Err(ApiError::ProtectedSchedule),
+		ScheduleUid::Off => Err(EmgauwaError::from(ApiError::ProtectedSchedule)),
+		ScheduleUid::On => Err(EmgauwaError::from(ApiError::ProtectedSchedule)),
 		ScheduleUid::Any(_) => {
 			DbSchedule::delete_by_uid(&mut pool_conn, uid).await?;
 			Ok(HttpResponse::Ok().json("schedule got deleted"))

emgauwa-core/src/handlers/v1/tags.rs

@@ -1,11 +1,10 @@
 use actix_web::{get, web, HttpResponse};
 use emgauwa_lib::db::DbTag;
+use emgauwa_lib::errors::EmgauwaError;
 use sqlx::{Pool, Sqlite};
 
-use crate::handlers::errors::ApiError;
-
 #[get("/api/v1/tags")]
-pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, ApiError> {
+pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
 
 	let db_tags = DbTag::get_all(&mut pool_conn).await?;

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

@@ -1,168 +0,0 @@
-use std::time::Instant;
-
-use actix::{Actor, ActorContext, AsyncContext, StreamHandler};
-use actix_web_actors::ws;
-use actix_web_actors::ws::ProtocolError;
-use emgauwa_lib::constants::{HEARTBEAT_INTERVAL, HEARTBEAT_TIMEOUT};
-use emgauwa_lib::db::errors::DatabaseError;
-use emgauwa_lib::db::{DbController, DbJunctionRelaySchedule, DbRelay, DbSchedule};
-use emgauwa_lib::models::{Controller, FromDbModel};
-use emgauwa_lib::types::{ConnectedControllersType, ControllerUid, ControllerWsAction};
-use futures::executor::block_on;
-use sqlx::pool::PoolConnection;
-use sqlx::{Pool, Sqlite};
-use ws::Message;
-
-pub struct ControllerWs {
-	pub pool: Pool<Sqlite>,
-	pub controller_uid: Option<ControllerUid>,
-	pub connected_controllers: ConnectedControllersType,
-	pub hb: Instant,
-}
-
-impl Actor for ControllerWs {
-	type Context = ws::WebsocketContext<Self>;
-
-	fn started(&mut self, ctx: &mut Self::Context) {
-		self.hb(ctx);
-	}
-
-	fn stopped(&mut self, _ctx: &mut Self::Context) {
-		if let Some(controller_uid) = &self.controller_uid {
-			let mut pool_conn = block_on(self.pool.acquire()).unwrap();
-
-			let mut data = self.connected_controllers.lock().unwrap();
-			if let Some(controller) = data.remove(controller_uid) {
-				if let Err(err) = block_on(controller.c.update_active(&mut pool_conn, false)) {
-					log::error!(
-						"Failed to mark controller {} as inactive: {:?}",
-						controller.c.uid,
-						err
-					)
-				}
-			}
-		}
-	}
-}
-
-impl ControllerWs {
-	pub fn handle_action(
-		&mut self,
-		conn: &mut PoolConnection<Sqlite>,
-		action: ControllerWsAction,
-	) -> Result<(), DatabaseError> {
-		match action {
-			ControllerWsAction::Register(controller) => {
-				log::info!("Registering controller: {:?}", controller);
-				let c = &controller.c;
-				let controller_db = block_on(DbController::get_by_uid_or_create(
-					conn,
-					&c.uid,
-					&c.name,
-					c.relay_count,
-				))?;
-				block_on(controller_db.update_active(conn, true))?;
-
-				for relay in &controller.relays {
-					let (new_relay, created) =
-						block_on(DbRelay::get_by_controller_and_num_or_create(
-							conn,
-							&controller_db,
-							relay.r.number,
-							&relay.r.name,
-						))?;
-					if created {
-						let mut relay_schedules = Vec::new();
-						for schedule in &relay.schedules {
-							let (new_schedule, _) = block_on(DbSchedule::get_by_uid_or_create(
-								conn,
-								schedule.uid.clone(),
-								&schedule.name,
-								&schedule.periods,
-							))?;
-							relay_schedules.push(new_schedule);
-						}
-
-						block_on(DbJunctionRelaySchedule::set_schedules(
-							conn,
-							&new_relay,
-							relay_schedules.iter().collect(),
-						))?;
-					}
-				}
-
-				let controller_uid = &controller.c.uid;
-				let controller_db = block_on(DbController::get_by_uid(conn, controller_uid))?
-					.ok_or(DatabaseError::InsertGetError)?;
-				let controller = Controller::from_db_model(conn, controller_db)?;
-
-				self.controller_uid = Some(controller_uid.clone());
-
-				let mut data = self.connected_controllers.lock().unwrap();
-				data.insert(controller_uid.clone(), controller);
-
-				Ok(())
-			}
-		}
-	}
-
-	// helper method that sends ping to client every 5 seconds (HEARTBEAT_INTERVAL).
-	fn hb(&self, ctx: &mut ws::WebsocketContext<Self>) {
-		ctx.run_interval(HEARTBEAT_INTERVAL, |act, ctx| {
-			// check client heartbeats
-			if Instant::now().duration_since(act.hb) > HEARTBEAT_TIMEOUT {
-				log::warn!("Websocket Controller heartbeat failed, disconnecting!");
-				ctx.stop();
-				// don't try to send a ping
-				return;
-			}
-
-			ctx.ping(&[]);
-		});
-	}
-}
-
-impl StreamHandler<Result<Message, ProtocolError>> for ControllerWs {
-	fn handle(&mut self, msg: Result<Message, ProtocolError>, ctx: &mut Self::Context) {
-		let mut pool_conn = block_on(self.pool.acquire()).unwrap();
-
-		let msg = match msg {
-			Err(_) => {
-				ctx.stop();
-				return;
-			}
-			Ok(msg) => msg,
-		};
-
-		match msg {
-			Message::Ping(msg) => {
-				self.hb = Instant::now();
-				ctx.pong(&msg)
-			}
-			Message::Pong(_) => {
-				self.hb = Instant::now();
-			}
-			Message::Text(text) => {
-				let action: ControllerWsAction = serde_json::from_str(&text).unwrap();
-				let action_res = self.handle_action(&mut pool_conn, action);
-				if let Err(e) = action_res {
-					log::error!("Error handling action: {:?}", e);
-					ctx.text(serde_json::to_string(&e).unwrap());
-				}
-			}
-			Message::Binary(_) => log::warn!("Received unexpected binary in controller ws"),
-			Message::Close(reason) => {
-				ctx.close(reason);
-				ctx.stop();
-			}
-			Message::Continuation(_) => {
-				ctx.stop();
-			}
-			Message::Nop => (),
-		}
-
-		//let schedules = futures::executor::block_on(DbSchedule::get_all(&mut pool_conn)).unwrap();
-		//let schedules_json = serde_json::to_string(&schedules).unwrap();
-		//ctx.text(schedules_json);
-	}
-}

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

@@ -0,0 +1,70 @@
+use actix::{Actor, AsyncContext};
+use emgauwa_lib::db::{DbController, DbJunctionRelaySchedule, DbRelay, DbSchedule};
+use emgauwa_lib::errors::DatabaseError;
+use emgauwa_lib::models::{Controller, FromDbModel};
+use futures::executor::block_on;
+use sqlx::pool::PoolConnection;
+use sqlx::Sqlite;
+
+use crate::app_state::ConnectController;
+use crate::handlers::v1::ws::controllers::ControllerWs;
+
+impl ControllerWs {
+	pub fn handle_register(
+		&mut self,
+		conn: &mut PoolConnection<Sqlite>,
+		ctx: &mut <ControllerWs as Actor>::Context,
+		controller: Controller,
+	) -> Result<(), DatabaseError> {
+		log::info!("Registering controller: {:?}", controller);
+		let c = &controller.c;
+		let controller_db = block_on(DbController::get_by_uid_or_create(
+			conn,
+			&c.uid,
+			&c.name,
+			c.relay_count,
+		))?;
+		block_on(controller_db.update_active(conn, true))?;
+
+		for relay in &controller.relays {
+			let (new_relay, created) = block_on(DbRelay::get_by_controller_and_num_or_create(
+				conn,
+				&controller_db,
+				relay.r.number,
+				&relay.r.name,
+			))?;
+			if created {
+				let mut relay_schedules = Vec::new();
+				for schedule in &relay.schedules {
+					let (new_schedule, _) = block_on(DbSchedule::get_by_uid_or_create(
+						conn,
+						schedule.uid.clone(),
+						&schedule.name,
+						&schedule.periods,
+					))?;
+					relay_schedules.push(new_schedule);
+				}
+
+				block_on(DbJunctionRelaySchedule::set_schedules(
+					conn,
+					&new_relay,
+					relay_schedules.iter().collect(),
+				))?;
+			}
+		}
+
+		let controller_uid = &controller.c.uid;
+		let controller_db = block_on(DbController::get_by_uid(conn, controller_uid))?
+			.ok_or(DatabaseError::InsertGetError)?;
+		let controller = Controller::from_db_model(conn, controller_db)?;
+
+		let addr = ctx.address();
+		self.controller_uid = Some(controller_uid.clone());
+		self.app_server.do_send(ConnectController {
+			address: addr.recipient(),
+			controller,
+		});
+
+		Ok(())
+	}
+}

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

@@ -0,0 +1,118 @@
+mod handlers;
+
+use std::time::Instant;
+
+use actix::{Actor, ActorContext, Addr, AsyncContext, Handler, StreamHandler};
+use actix_web_actors::ws;
+use actix_web_actors::ws::ProtocolError;
+use emgauwa_lib::constants::{HEARTBEAT_INTERVAL, HEARTBEAT_TIMEOUT};
+use emgauwa_lib::errors::{DatabaseError, EmgauwaError};
+use emgauwa_lib::types::{ControllerUid, ControllerWsAction};
+use futures::executor::block_on;
+use sqlx::pool::PoolConnection;
+use sqlx::{Pool, Sqlite};
+use ws::Message;
+
+use crate::app_state::{AppServer, DisconnectController};
+
+pub struct ControllerWs {
+	pub pool: Pool<Sqlite>,
+	pub controller_uid: Option<ControllerUid>,
+	pub app_server: Addr<AppServer>,
+	pub hb: Instant,
+}
+
+impl Actor for ControllerWs {
+	type Context = ws::WebsocketContext<Self>;
+
+	fn started(&mut self, ctx: &mut Self::Context) {
+		self.hb(ctx);
+	}
+
+	fn stopped(&mut self, _ctx: &mut Self::Context) {
+		if let Some(controller_uid) = &self.controller_uid {
+			self.app_server.do_send(DisconnectController {
+				controller_uid: controller_uid.clone(),
+			})
+		}
+	}
+}
+
+impl ControllerWs {
+	pub fn handle_action(
+		&mut self,
+		conn: &mut PoolConnection<Sqlite>,
+		ctx: &mut <ControllerWs as Actor>::Context,
+		action: ControllerWsAction,
+	) -> Result<(), DatabaseError> {
+		match action {
+			ControllerWsAction::Register(controller) => self.handle_register(conn, ctx, controller),
+		}
+	}
+
+	// helper method that sends ping to client every 5 seconds (HEARTBEAT_INTERVAL).
+	fn hb(&self, ctx: &mut ws::WebsocketContext<Self>) {
+		ctx.run_interval(HEARTBEAT_INTERVAL, |act, ctx| {
+			// check client heartbeats
+			if Instant::now().duration_since(act.hb) > HEARTBEAT_TIMEOUT {
+				log::warn!("Websocket Controller heartbeat failed, disconnecting!");
+				ctx.stop();
+				// don't try to send a ping
+				return;
+			}
+
+			ctx.ping(&[]);
+		});
+	}
+}
+
+impl Handler<ControllerWsAction> for ControllerWs {
+	type Result = Result<(), EmgauwaError>;
+
+	fn handle(&mut self, action: ControllerWsAction, ctx: &mut Self::Context) -> Self::Result {
+		let action_json = serde_json::to_string(&action)?;
+		ctx.text(action_json);
+		Ok(())
+	}
+}
+
+impl StreamHandler<Result<Message, ProtocolError>> for ControllerWs {
+	fn handle(&mut self, msg: Result<Message, ProtocolError>, ctx: &mut Self::Context) {
+		let mut pool_conn = block_on(self.pool.acquire()).unwrap();
+
+		let msg = match msg {
+			Err(_) => {
+				ctx.stop();
+				return;
+			}
+			Ok(msg) => msg,
+		};
+
+		match msg {
+			Message::Ping(msg) => {
+				self.hb = Instant::now();
+				ctx.pong(&msg)
+			}
+			Message::Pong(_) => {
+				self.hb = Instant::now();
+			}
+			Message::Text(text) => {
+				let action: ControllerWsAction = serde_json::from_str(&text).unwrap();
+				let action_res = self.handle_action(&mut pool_conn, ctx, action);
+				if let Err(e) = action_res {
+					log::error!("Error handling action: {:?}", e);
+					ctx.text(serde_json::to_string(&e).unwrap());
+				}
+			}
+			Message::Binary(_) => log::warn!("Received unexpected binary in controller ws"),
+			Message::Close(reason) => {
+				ctx.close(reason);
+				ctx.stop();
+			}
+			Message::Continuation(_) => {
+				ctx.stop();
+			}
+			Message::Nop => (),
+		}
+	}
+}

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

@@ -1,11 +1,12 @@
 use std::time::Instant;
 
+use actix::Addr;
 use actix_web::{get, web, HttpRequest, HttpResponse};
 use actix_web_actors::ws;
-use emgauwa_lib::types::ConnectedControllersType;
+use emgauwa_lib::errors::{ApiError, EmgauwaError};
 use sqlx::{Pool, Sqlite};
 
-use crate::handlers::errors::ApiError;
+use crate::app_state::AppServer;
 use crate::handlers::v1::ws::controllers::ControllerWs;
 
 pub mod controllers;
@@ -13,20 +14,24 @@ pub mod controllers;
 #[get("/api/v1/ws/controllers")]
 pub async fn ws_controllers(
 	pool: web::Data<Pool<Sqlite>>,
-	connected_controllers: web::Data<ConnectedControllersType>,
+	app_server: web::Data<Addr<AppServer>>,
 	req: HttpRequest,
 	stream: web::Payload,
-) -> Result<HttpResponse, ApiError> {
+) -> Result<HttpResponse, EmgauwaError> {
 	let resp = ws::start(
 		ControllerWs {
 			pool: pool.get_ref().clone(),
 			controller_uid: None,
-			connected_controllers: connected_controllers.get_ref().clone(),
+			app_server: app_server.get_ref().clone(),
 			hb: Instant::now(),
 		},
 		&req,
 		stream,
 	)
-	.map_err(|_| ApiError::InternalError(String::from("error starting websocket")));
+	.map_err(|_| {
+		EmgauwaError::from(ApiError::InternalError(String::from(
+			"error starting websocket",
+		)))
+	});
 	resp
 }

emgauwa-core/src/main.rs

@@ -1,16 +1,16 @@
-use std::collections::HashMap;
 use std::net::TcpListener;
-use std::sync::{Arc, Mutex};
 
+use actix::Actor;
 use actix_cors::Cors;
 use actix_web::middleware::TrailingSlash;
 use actix_web::{middleware, web, App, HttpServer};
 use emgauwa_lib::db::DbController;
-use emgauwa_lib::types::ConnectedControllersType;
 use emgauwa_lib::utils::init_logging;
 
+use crate::app_state::AppServer;
 use crate::utils::drop_privileges;
 
+mod app_state;
 mod handlers;
 mod settings;
 mod utils;
@@ -29,15 +29,19 @@ async fn main() -> std::io::Result<()> {
 
 	// This block is to ensure that the connection is dropped after use.
 	{
-		let mut conn = pool.acquire().await.unwrap();
+		let mut conn = pool
+			.acquire()
+			.await
+			.expect("Failed to get database connection");
 		DbController::all_inactive(&mut conn)
 			.await
 			.expect("Error setting all controllers inactive");
 	}
 
-	let connected_controllers: ConnectedControllersType = Arc::new(Mutex::new(HashMap::new()));
+	let app_server = AppServer::new(pool.clone()).start();
 
 	log::info!("Starting server on {}:{}", settings.host, settings.port);
+
 	HttpServer::new(move || {
 		let cors = Cors::default().allow_any_method().allow_any_header();
 
@@ -55,7 +59,7 @@ async fn main() -> std::io::Result<()> {
 			.wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
 			.app_data(web::JsonConfig::default().error_handler(handlers::json_error_handler))
 			.app_data(web::Data::new(pool.clone()))
-			.app_data(web::Data::new(connected_controllers.clone()))
+			.app_data(web::Data::new(app_server.clone()))
 			.service(handlers::v1::controllers::index)
 			.service(handlers::v1::controllers::show)
 			.service(handlers::v1::controllers::update)

emgauwa-lib/src/db/controllers.rs

@@ -4,8 +4,8 @@ use serde_derive::{Deserialize, Serialize};
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
 
-use crate::db::errors::DatabaseError;
 use crate::db::{DbRelay, DbTag};
+use crate::errors::DatabaseError;
 use crate::types::ControllerUid;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

emgauwa-lib/src/db/junction_relay_schedule.rs

@@ -3,8 +3,8 @@ use std::ops::DerefMut;
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
 
-use crate::db::errors::DatabaseError;
 use crate::db::{DbRelay, DbSchedule};
+use crate::errors::DatabaseError;
 use crate::types::Weekday;
 
 pub struct DbJunctionRelaySchedule {

emgauwa-lib/src/db/junction_tag.rs

@@ -3,8 +3,8 @@ use std::ops::DerefMut;
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
 
-use crate::db::errors::DatabaseError;
 use crate::db::{DbRelay, DbSchedule, DbTag};
+use crate::errors::DatabaseError;
 
 pub struct DbJunctionTag {
 	pub id: i64,

emgauwa-lib/src/db/mod.rs

@@ -5,7 +5,6 @@ use sqlx::sqlite::{SqliteConnectOptions, SqlitePoolOptions};
 use sqlx::{Pool, Sqlite};
 
 mod controllers;
-pub mod errors;
 mod junction_relay_schedule;
 mod junction_tag;
 mod model_utils;

emgauwa-lib/src/db/relays.rs

@@ -4,8 +4,8 @@ use serde_derive::{Deserialize, Serialize};
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
 
-use crate::db::errors::DatabaseError;
 use crate::db::{DbController, DbJunctionTag, DbTag};
+use crate::errors::DatabaseError;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct DbRelay {

emgauwa-lib/src/db/schedules.rs

@@ -5,9 +5,9 @@ use serde_derive::{Deserialize, Serialize};
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
 
-use crate::db::errors::DatabaseError;
 use crate::db::model_utils::Period;
 use crate::db::{DbJunctionTag, DbTag};
+use crate::errors::DatabaseError;
 use crate::types::ScheduleUid;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

emgauwa-lib/src/db/tag.rs

@@ -4,7 +4,7 @@ use serde_derive::Serialize;
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
 
-use crate::db::errors::DatabaseError;
+use crate::errors::DatabaseError;
 
 #[derive(Debug, Serialize, Clone)]
 pub struct DbTag {

emgauwa-lib/src/errors/api_error.rs

@@ -0,0 +1,25 @@
+use actix_web::http::StatusCode;
+
+#[derive(Debug)]
+pub enum ApiError {
+	ProtectedSchedule,
+	InternalError(String),
+}
+
+impl ApiError {
+	pub fn get_code(&self) -> StatusCode {
+		match self {
+			ApiError::ProtectedSchedule => StatusCode::FORBIDDEN,
+			ApiError::InternalError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+		}
+	}
+}
+
+impl From<&ApiError> for String {
+	fn from(err: &ApiError) -> Self {
+		match err {
+			ApiError::ProtectedSchedule => String::from("the targeted schedule is protected"),
+			ApiError::InternalError(msg) => msg.clone(),
+		}
+	}
+}

emgauwa-lib/src/errors/emgauwa_error.rs

@@ -0,0 +1,107 @@
+use std::fmt::{Debug, Display, Formatter};
+
+use actix_web::http::StatusCode;
+use actix_web::HttpResponse;
+use serde::ser::SerializeStruct;
+use serde::{Serialize, Serializer};
+
+use crate::errors::{ApiError, DatabaseError};
+
+pub enum EmgauwaError {
+	Api(ApiError),
+	Uid(uuid::Error),
+	Serialization(serde_json::Error),
+	Database(DatabaseError),
+}
+
+impl EmgauwaError {
+	fn get_code(&self) -> StatusCode {
+		match self {
+			EmgauwaError::Api(err) => err.get_code(),
+			EmgauwaError::Serialization(_) => StatusCode::INTERNAL_SERVER_ERROR,
+			EmgauwaError::Database(err) => err.get_code(),
+			EmgauwaError::Uid(_) => StatusCode::BAD_REQUEST,
+		}
+	}
+}
+
+impl From<&EmgauwaError> for String {
+	fn from(err: &EmgauwaError) -> Self {
+		match err {
+			EmgauwaError::Api(err) => String::from(err),
+			EmgauwaError::Serialization(_) => String::from("error during (de-)serialization"),
+			EmgauwaError::Database(err) => String::from(err),
+			EmgauwaError::Uid(_) => String::from("the uid is in a bad format"),
+		}
+	}
+}
+
+impl From<ApiError> for EmgauwaError {
+	fn from(value: ApiError) -> Self {
+		EmgauwaError::Api(value)
+	}
+}
+
+impl From<DatabaseError> for EmgauwaError {
+	fn from(value: DatabaseError) -> Self {
+		EmgauwaError::Database(value)
+	}
+}
+
+impl From<serde_json::Error> for EmgauwaError {
+	fn from(value: serde_json::Error) -> Self {
+		EmgauwaError::Serialization(value)
+	}
+}
+
+impl From<sqlx::Error> for EmgauwaError {
+	fn from(value: sqlx::Error) -> Self {
+		EmgauwaError::Database(DatabaseError::from(value))
+	}
+}
+
+impl From<uuid::Error> for EmgauwaError {
+	fn from(value: uuid::Error) -> Self {
+		EmgauwaError::Uid(value)
+	}
+}
+
+impl From<&EmgauwaError> for HttpResponse {
+	fn from(err: &EmgauwaError) -> Self {
+		HttpResponse::build(err.get_code()).json(err)
+	}
+}
+
+impl Serialize for EmgauwaError {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: Serializer,
+	{
+		let mut s = serializer.serialize_struct("error", 2)?;
+		s.serialize_field("code", &self.get_code().as_u16())?;
+		s.serialize_field("description", &String::from(self))?;
+		s.end()
+	}
+}
+
+impl Display for EmgauwaError {
+	fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+		write!(f, "{}: {}", self.get_code(), String::from(self))
+	}
+}
+
+impl Debug for EmgauwaError {
+	fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+		write!(f, "{}", String::from(self))
+	}
+}
+
+impl actix_web::error::ResponseError for EmgauwaError {
+	fn status_code(&self) -> StatusCode {
+		self.get_code()
+	}
+
+	fn error_response(&self) -> HttpResponse {
+		HttpResponse::from(self)
+	}
+}

emgauwa-lib/src/errors/mod.rs

@@ -0,0 +1,7 @@
+mod api_error;
+mod database_error;
+mod emgauwa_error;
+
+pub use api_error::ApiError;
+pub use database_error::DatabaseError;
+pub use emgauwa_error::EmgauwaError;

emgauwa-lib/src/lib.rs

@@ -1,5 +1,6 @@
 pub mod constants;
 pub mod db;
+pub mod errors;
 pub mod models;
 pub mod types;
 pub mod utils;

emgauwa-lib/src/models/mod.rs

@@ -3,8 +3,8 @@ use serde_derive::{Deserialize, Serialize};
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
 
-use crate::db::errors::DatabaseError;
 use crate::db::{DbController, DbJunctionRelaySchedule, DbRelay, DbSchedule};
+use crate::errors::DatabaseError;
 use crate::types::{ControllerUid, Weekday};
 use crate::utils;
 

emgauwa-lib/src/types/mod.rs

@@ -1,19 +1,18 @@
 mod controller_uid;
 mod schedule_uid;
 
-use std::collections::HashMap;
-use std::sync::{Arc, Mutex};
-
+use actix::Message;
 pub use controller_uid::ControllerUid;
 pub use schedule_uid::ScheduleUid;
 use serde_derive::{Deserialize, Serialize};
 
+use crate::errors::EmgauwaError;
 use crate::models::Controller;
 
-pub type ConnectedControllersType = Arc<Mutex<HashMap<ControllerUid, Controller>>>;
 pub type Weekday = i64;
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Message)]
+#[rtype(result = "Result<(), EmgauwaError>")]
 pub enum ControllerWsAction {
 	Register(Controller),
 }