Ready to implement sync client manager

src/server/api/ws.rs

@@ -1,7 +1,6 @@
 use crate::constants::{WS_CLIENT_TIMEOUT, WS_HEARTBEAT_INTERVAL};
 use crate::extractors::client_auth::APIClientAuth;
 use crate::server::HttpResult;
-use crate::user::{APIClientID, UserID};
 use actix_web::dev::Payload;
 use actix_web::{web, FromRequest, HttpRequest};
 use actix_ws::Message;
@@ -11,21 +10,15 @@ use tokio::select;
 use tokio::sync::broadcast;
 use tokio::sync::broadcast::Receiver;
 use tokio::time::interval;
+use crate::broadcast_messages::BroadcastMessage;
+
 
-/// WebSocket message
-#[derive(Debug, Clone)]
-pub enum WsMessage {
-    /// Request to close the session of a specific client
-    CloseClientSession(APIClientID),
-    /// Close all the sessions of a given user
-    CloseAllUserSessions(UserID),
-}
 
 /// Main WS route
 pub async fn ws(
     req: HttpRequest,
     stream: web::Payload,
-    tx: web::Data<broadcast::Sender<WsMessage>>,
+    tx: web::Data<broadcast::Sender<BroadcastMessage>>,
 ) -> HttpResult {
     // Forcefully ignore request payload by manually extracting authentication information
     let auth = APIClientAuth::from_request(&req, &mut Payload::None).await?;
@@ -44,7 +37,7 @@ pub async fn ws_handler(
     mut session: actix_ws::Session,
     mut msg_stream: actix_ws::MessageStream,
     auth: APIClientAuth,
-    mut rx: Receiver<WsMessage>,
+    mut rx: Receiver<BroadcastMessage>,
 ) {
     log::info!("WS connected");
 
@@ -64,7 +57,7 @@ pub async fn ws_handler(
                 };
 
                 match msg {
-                    WsMessage::CloseClientSession(id)  => {
+                    BroadcastMessage::CloseClientSession(id)  => {
                         if let Some(client) = &auth.client {
                             if client.id == id {
                                 log::info!(
@@ -74,7 +67,7 @@ pub async fn ws_handler(
                             }
                         }
                     },
-                    WsMessage::CloseAllUserSessions(userid) => {
+                    BroadcastMessage::CloseAllUserSessions(userid) => {
                         if userid == auth.user.user_id {
                             log::info!(
                                 "closing WS session of user {userid:?} as requested"
@@ -82,7 +75,7 @@ pub async fn ws_handler(
                             break None;
                         }
                     }
-                };
+                _ => {}};
 
             }
 

src/server/web_ui.rs

@@ -1,6 +1,5 @@
 use crate::app_config::AppConfig;
 use crate::constants::{STATE_KEY, USER_SESSION_KEY};
-use crate::server::api::ws::WsMessage;
 use crate::server::{HttpFailure, HttpResult};
 use crate::user::{APIClient, APIClientID, User, UserConfig, UserID};
 use crate::utils;
@@ -11,6 +10,7 @@ use ipnet::IpNet;
 use light_openid::primitives::OpenIDConfig;
 use std::str::FromStr;
 use tokio::sync::broadcast;
+use crate::broadcast_messages::BroadcastMessage;
 
 /// Static assets
 #[derive(rust_embed::Embed)]
@@ -65,7 +65,7 @@ pub struct FormRequest {
 pub async fn home(
     session: Session,
     form_req: Option<web::Form<FormRequest>>,
-    tx: web::Data<broadcast::Sender<WsMessage>>,
+    tx: web::Data<broadcast::Sender<BroadcastMessage>>,
 ) -> HttpResult {
     // Get user information, requesting authentication if information is missing
     let Some(user): Option<User> = session.get(USER_SESSION_KEY)? else {
@@ -103,8 +103,10 @@ pub async fn home(
                 config.save().await?;
                 success_message = Some("Matrix token was successfully updated!".to_string());
 
+                // TODO : stop user sync thread
+
                 // Invalidate all Ws connections
-                if let Err(e) = tx.send(WsMessage::CloseAllUserSessions(user.id.clone())) {
+                if let Err(e) = tx.send(BroadcastMessage::CloseAllUserSessions(user.id.clone())) {
                     log::error!("Failed to send CloseAllUserSessions: {}", e);
                 }
             }
@@ -139,7 +141,7 @@ pub async fn home(
             config.save().await?;
             success_message = Some("The client was successfully deleted!".to_string());
 
-            if let Err(e) = tx.send(WsMessage::CloseClientSession(delete_client_id)) {
+            if let Err(e) = tx.send(BroadcastMessage::CloseClientSession(delete_client_id)) {
                 log::error!("Failed to send CloseClientSession: {}", e);
             }
         }