Notify Matrix manager directly if sync thread is terminated

matrixgw_backend/src/matrix_connection/sync_thread.rs

@@ -4,7 +4,9 @@
 
 use crate::broadcast_messages::{BroadcastMessage, BroadcastSender};
 use crate::matrix_connection::matrix_client::MatrixClient;
+use crate::matrix_connection::matrix_manager::MatrixManagerMsg;
 use futures_util::StreamExt;
+use ractor::ActorRef;
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct MatrixSyncTaskID(uuid::Uuid);
@@ -13,19 +15,25 @@ pub struct MatrixSyncTaskID(uuid::Uuid);
 pub async fn start_sync_thread(
     client: MatrixClient,
     tx: BroadcastSender,
+    manager: ActorRef<MatrixManagerMsg>,
 ) -> anyhow::Result<MatrixSyncTaskID> {
     let task_id = MatrixSyncTaskID(uuid::Uuid::new_v4());
     let task_id_clone = task_id.clone();
 
     tokio::task::spawn(async move {
-        sync_thread_task(task_id_clone, client, tx).await;
+        sync_thread_task(task_id_clone, client, tx, manager).await;
     });
 
     Ok(task_id)
 }
 
 /// Sync thread function for a single function
-async fn sync_thread_task(id: MatrixSyncTaskID, client: MatrixClient, tx: BroadcastSender) {
+async fn sync_thread_task(
+    id: MatrixSyncTaskID,
+    client: MatrixClient,
+    tx: BroadcastSender,
+    manager: ActorRef<MatrixManagerMsg>,
+) {
     let mut rx = tx.subscribe();
 
     log::info!("Sync thread {id:?} started for user {:?}", client.email);
@@ -38,6 +46,8 @@ async fn sync_thread_task(id: MatrixSyncTaskID, client: MatrixClient, tx: Broadc
 
     let mut sync_stream = client.sync_stream().await;
 
+    //let room_message_handle = client.add_event_handler();
+
     loop {
         tokio::select! {
             // Message from tokio broadcast
@@ -66,7 +76,16 @@ async fn sync_thread_task(id: MatrixSyncTaskID, client: MatrixClient, tx: Broadc
         }
     }
 
+    //client.remove_event_handler(room_message_handle);
+
+    // Notify manager about termination, so this thread can be removed from the list
     log::info!("Sync thread {id:?} terminated!");
+    if let Err(e) = ractor::cast!(
+        manager,
+        MatrixManagerMsg::SyncThreadTerminated(client.email.clone(), id.clone())
+    ) {
+        log::error!("Failed to notify Matrix manager about thread termination! {e}");
+    }
     if let Err(e) = tx.send(BroadcastMessage::SyncThreadStopped(id)) {
         log::warn!("Failed to notify that synchronization thread has been interrupted! {e}")
     }