Refactor websocket

src/handlers/v1/macros.rs

@@ -1,17 +1,15 @@
-use actix::Addr;
 use actix_web::{delete, get, post, put, web, HttpResponse};
 use emgauwa_common::db::{DbController, DbMacro};
 use emgauwa_common::errors::{DatabaseError, EmgauwaError};
 use emgauwa_common::models::{convert_db_list, FromDbModel, Macro, MacroAction, Relay};
 use emgauwa_common::types::{
-	ControllerWsAction, EmgauwaUid, RequestMacroCreate, RequestMacroExecute, RequestMacroUpdate,
+    ControllersWsAction, EmgauwaUid, RequestMacroCreate, RequestMacroExecute, RequestMacroUpdate,
 };
 use sqlx::pool::PoolConnection;
 use sqlx::{Pool, Sqlite};
-
-use crate::app_state;
-use crate::app_state::AppState;
+use tokio::sync::mpsc;
 use crate::handlers::EmgauwaMessage;
+use crate::server::WsServerAction;
 
 #[get("/macros")]
 pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, EmgauwaError> {
@@ -19,7 +17,7 @@ pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, Emgauw
 
 	let db_macros = DbMacro::get_all(&mut pool_conn).await?;
 	let macros: Vec<Macro> = convert_db_list(&mut pool_conn, db_macros)?;
-
+	pool_conn.close().await?;
 	Ok(HttpResponse::Ok().json(macros))
 }
 
@@ -38,6 +36,7 @@ pub async fn show(
 		.ok_or(DatabaseError::NotFound)?;
 
 	let return_macro = Macro::from_db_model(&mut pool_conn, db_macro)?;
+	pool_conn.close().await?;
 	Ok(HttpResponse::Ok().json(return_macro))
 }
 
@@ -55,6 +54,7 @@ pub async fn add(
 		.await?;
 
 	let return_macro = Macro::from_db_model(&mut pool_conn, new_macro)?;
+	pool_conn.close().await?;
 	Ok(HttpResponse::Created().json(return_macro))
 }
 
@@ -84,6 +84,7 @@ pub async fn update(
 	}
 
 	let return_macro = Macro::from_db_model(&mut pool_conn, db_macro)?;
+	pool_conn.close().await?;
 	Ok(HttpResponse::Ok().json(return_macro))
 }
 
@@ -98,14 +99,15 @@ pub async fn delete(
 	let uid = EmgauwaUid::try_from(macro_uid.as_str())?;
 
 	DbMacro::delete_by_uid(&mut pool_conn, uid).await?;
+	pool_conn.close().await?;
 	Ok(HttpResponse::Ok().emgauwa_message("macro got deleted"))
 }
 
 #[put("/macros/{macro_id}/execute")]
 pub async fn execute(
 	pool: web::Data<Pool<Sqlite>>,
-	app_state: web::Data<Addr<AppState>>,
 	path: web::Path<(String,)>,
+	ws_server_tx: web::Data<mpsc::UnboundedSender<WsServerAction>>,
 	query: web::Query<RequestMacroExecute>,
 ) -> Result<HttpResponse, EmgauwaError> {
 	let mut pool_conn = pool.acquire().await?;
@@ -137,14 +139,10 @@ pub async fn execute(
 		let affected_relays =
 			collect_affected_relays(&mut pool_conn, &mut actions, &controller).await?;
 
-		app_state
-			.send(app_state::Action {
-				controller_uid: controller.uid,
-				action: ControllerWsAction::Relays(affected_relays.clone()),
-			})
-			.await??;
+		ws_server_tx.send(WsServerAction::ForwardToController(uid.clone(), ControllersWsAction::Relays(affected_relays.clone())))?;
 	}
 
+	pool_conn.close().await?;
 	Ok(HttpResponse::Ok().emgauwa_message("macro got executed"))
 }