pierre/MatrixGW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start sync client manager implementation

Browse Source
This commit is contained in:
Pierre HUBERT
2025-02-12 21:01:34 +01:00
parent 17e086b43c
commit 3822c209d3
6 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/api/ws.rs
View File

@ -1,3 +1,4 @@
use crate::broadcast_messages::BroadcastMessage;
use crate::constants::{WS_CLIENT_TIMEOUT, WS_HEARTBEAT_INTERVAL};
use crate::extractors::client_auth::APIClientAuth;
use crate::server::HttpResult;
@ -10,9 +11,6 @@ use tokio::select;
use tokio::sync::broadcast;
use tokio::sync::broadcast::Receiver;
use tokio::time::interval;
use crate::broadcast_messages::BroadcastMessage;
/// Main WS route
pub async fn ws(
@ -25,6 +23,13 @@ pub async fn ws(
let (res, session, msg_stream) = actix_ws::handle(&req, stream)?;
// Ask for sync client to be started
if let Err(e) = tx.send(BroadcastMessage::StartSyncTaskForUser(
auth.user.user_id.clone(),
)) {
log::error!("Failed to send StartSyncTaskForUser: {}", e);
}
let rx = tx.subscribe();
// spawn websocket handler (and don't await it) so that the response is returned immediately

7
src/server/web_ui.rs
View File

@ -1,4 +1,5 @@
use crate::app_config::AppConfig;
use crate::broadcast_messages::BroadcastMessage;
use crate::constants::{STATE_KEY, USER_SESSION_KEY};
use crate::server::{HttpFailure, HttpResult};
use crate::user::{APIClient, APIClientID, User, UserConfig, UserID};
@ -10,7 +11,6 @@ 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)]
@ -103,7 +103,10 @@ pub async fn home(
config.save().await?;
success_message = Some("Matrix token was successfully updated!".to_string());
// TODO : stop user sync thread
// Close sync task
if let Err(e) = tx.send(BroadcastMessage::StopSyncTaskForUser(user.id.clone())) {
log::error!("Failed to send StopSyncClientForUser: {}", e);
}
// Invalidate all Ws connections
if let Err(e) = tx.send(BroadcastMessage::CloseAllUserSessions(user.id.clone())) {