Notify Matrix manager directly if sync thread is terminated

matrixgw_backend/src/matrix_connection/matrix_client.rs

@@ -10,12 +10,14 @@ use matrix_sdk::authentication::oauth::{
 };
 use matrix_sdk::config::SyncSettings;
 use matrix_sdk::encryption::recovery::RecoveryState;
+use matrix_sdk::event_handler::{EventHandler, EventHandlerHandle, SyncEvent};
 use matrix_sdk::ruma::presence::PresenceState;
 use matrix_sdk::ruma::serde::Raw;
 use matrix_sdk::ruma::{DeviceId, UserId};
 use matrix_sdk::sync::SyncResponse;
-use matrix_sdk::{Client, ClientBuildError};
+use matrix_sdk::{Client, ClientBuildError, SendOutsideWasm};
 use ractor::ActorRef;
+use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use std::pin::Pin;
 use url::Url;
@@ -255,23 +257,32 @@ impl MatrixClient {
     pub async fn setup_background_session_save(&self) {
         let this = self.clone();
         tokio::spawn(async move {
-            while let Ok(update) = this.client.subscribe_to_session_changes().recv().await {
-                match update {
-                    matrix_sdk::SessionChange::UnknownToken { soft_logout } => {
-                        log::warn!("Received an unknown token error; soft logout? {soft_logout:?}");
-                        if let Err(e) = this
-                            .manager
-                            .cast(MatrixManagerMsg::DisconnectClient(this.email))
-                        {
-                            log::warn!("Failed to propagate invalid token error: {e}");
+            loop {
+                match this.client.subscribe_to_session_changes().recv().await {
+                    Ok(update) => match update {
+                        matrix_sdk::SessionChange::UnknownToken { soft_logout } => {
+                            log::warn!(
+                                "Received an unknown token error; soft logout? {soft_logout:?}"
+                            );
+                            if let Err(e) = this
+                                .manager
+                                .cast(MatrixManagerMsg::DisconnectClient(this.email))
+                            {
+                                log::warn!("Failed to propagate invalid token error: {e}");
+                            }
+                            break;
                         }
-                        break;
-                    }
-                    matrix_sdk::SessionChange::TokensRefreshed => {
-                        // The tokens have been refreshed, persist them to disk.
-                        if let Err(err) = this.save_stored_session().await {
-                            log::error!("Unable to store a session in the background: {err}");
+                        matrix_sdk::SessionChange::TokensRefreshed => {
+                            // The tokens have been refreshed, persist them to disk.
+                            if let Err(err) = this.save_stored_session().await {
+                                log::error!("Unable to store a session in the background: {err}");
+                            }
                         }
+                    },
+                    Err(e) => {
+                        log::error!("[!] Session change error: {e}");
+                        log::error!("Session change background service INTERRUPTED!");
+                        return;
                     }
                 }
             }
@@ -369,4 +380,19 @@ impl MatrixClient {
     ) -> Pin<Box<impl Stream<Item = matrix_sdk::Result<SyncResponse>>>> {
         Box::pin(self.client.sync_stream(Self::sync_settings()).await)
     }
+
+    /// Add new Matrix event handler
+    #[must_use]
+    pub fn add_event_handler<Ev, Ctx, H>(&self, handler: H) -> EventHandlerHandle
+    where
+        Ev: SyncEvent + DeserializeOwned + SendOutsideWasm + 'static,
+        H: EventHandler<Ev, Ctx>,
+    {
+        self.client.add_event_handler(handler)
+    }
+
+    /// Remove Matrix event handler
+    pub fn remove_event_handler(&self, handle: EventHandlerHandle) {
+        self.client.remove_event_handler(handle)
+    }
 }