wasm fixes and made 'run_until_shutdown' take reference instead of ownership

Author: jstuczyn

common/task/src/cancellation/manager.rs

@@ -480,7 +480,7 @@ impl ShutdownManager {
     /// - all tracked tasks have terminated
     /// - timeout has been reached
     /// - shutdown has been forced (by sending SIGINT)
-    async fn finish_shutdown(mut self) {
+    async fn finish_shutdown(&mut self) {
         let mut wait_futures = FuturesUnordered::<Pin<Box<dyn Future<Output = ()> + Send>>>::new();
 
         // force shutdown via ctrl-c
@@ -496,14 +496,16 @@ impl ShutdownManager {
         }));
 
         // timeout
+        let max_shutdown = self.max_shutdown_duration;
         wait_futures.push(Box::pin(async move {
-            sleep(self.max_shutdown_duration).await;
+            sleep(max_shutdown).await;
             info!("timeout reached - forcing shutdown");
         }));
 
         // graceful
+        let tracker = self.tracker.clone();
         wait_futures.push(Box::pin(async move {
-            self.wait_for_tracker().await;
+            tracker.wait_for_tracker().await;
             info!("all tracked tasks successfully shutdown");
             if let Some(legacy) = self.legacy_task_manager.as_mut() {
                 legacy.wait_for_graceful_shutdown().await;
@@ -555,15 +557,15 @@ impl ShutdownManager {
     /// - all tracked tasks have terminated
     /// - timeout has been reached
     /// - shutdown has been forced (by sending SIGINT)
-    pub async fn perform_shutdown(self) {
+    pub async fn perform_shutdown(&mut self) {
         self.send_cancellation();
 
         info!("waiting for tasks to finish... (press ctrl-c to force)");
         self.finish_shutdown().await;
     }
 
     /// Wait until a shutdown signal has been received and trigger system shutdown.
-    pub async fn run_until_shutdown(mut self) {
+    pub async fn run_until_shutdown(&mut self) {
         self.close_tracker();
         self.wait_for_shutdown_signal().await;
 
@@ -580,11 +582,11 @@ mod tests {
 
     #[tokio::test]
     async fn shutdown_with_no_tracked_tasks_and_signals() -> anyhow::Result<()> {
-        let manager = ShutdownManager::new_without_signals();
+        let mut manager = ShutdownManager::new_without_signals();
         let res = manager.run_until_shutdown().timeboxed().await;
         assert!(res.has_elapsed());
 
-        let manager = ShutdownManager::new_without_signals();
+        let mut manager = ShutdownManager::new_without_signals();
         let shutdown = manager.clone_shutdown_token();
         shutdown.cancel();
         let res = manager.run_until_shutdown().timeboxed().await;
@@ -596,7 +598,7 @@ mod tests {
     #[tokio::test]
     async fn shutdown_signal() -> anyhow::Result<()> {
         let timeout_shutdown = sleep(Duration::from_millis(100));
-        let manager = ShutdownManager::new_without_signals().with_shutdown(timeout_shutdown);
+        let mut manager = ShutdownManager::new_without_signals().with_shutdown(timeout_shutdown);
 
         // execution finishes after the sleep gets finishes
         let res = manager
@@ -610,7 +612,7 @@ mod tests {
 
     #[tokio::test]
     async fn panic_hook() -> anyhow::Result<()> {
-        let manager = ShutdownManager::new_without_signals().with_cancel_on_panic();
+        let mut manager = ShutdownManager::new_without_signals().with_cancel_on_panic();
         manager.spawn_with_shutdown(async move {
             sleep(Duration::from_millis(10000)).await;
         });
@@ -632,7 +634,7 @@ mod tests {
     #[tokio::test]
     async fn task_cancellation() -> anyhow::Result<()> {
         let timeout_shutdown = sleep(Duration::from_millis(100));
-        let manager = ShutdownManager::new_without_signals().with_shutdown(timeout_shutdown);
+        let mut manager = ShutdownManager::new_without_signals().with_shutdown(timeout_shutdown);
 
         let cancelled1 = Arc::new(AtomicBool::new(false));
         let cancelled1_clone = cancelled1.clone();
@@ -664,7 +666,7 @@ mod tests {
 
     #[tokio::test]
     async fn cancellation_within_task() -> anyhow::Result<()> {
-        let manager = ShutdownManager::new_without_signals();
+        let mut manager = ShutdownManager::new_without_signals();
 
         let cancelled1 = Arc::new(AtomicBool::new(false));
         let cancelled1_clone = cancelled1.clone();
@@ -694,7 +696,7 @@ mod tests {
     #[tokio::test]
     async fn shutdown_timeout() -> anyhow::Result<()> {
         let timeout_shutdown = sleep(Duration::from_millis(50));
-        let manager = ShutdownManager::new_without_signals()
+        let mut manager = ShutdownManager::new_without_signals()
             .with_shutdown(timeout_shutdown)
             .with_shutdown_duration(Duration::from_millis(1000));
 
@@ -711,7 +713,7 @@ mod tests {
         assert!(res.has_elapsed());
 
         let timeout_shutdown = sleep(Duration::from_millis(50));
-        let manager = ShutdownManager::new_without_signals()
+        let mut manager = ShutdownManager::new_without_signals()
             .with_shutdown(timeout_shutdown)
             .with_shutdown_duration(Duration::from_millis(100));
 

wasm/client/src/client.rs

@@ -17,7 +17,7 @@ use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use tsify::Tsify;
 use wasm_bindgen::prelude::*;
-use wasm_bindgen_futures::{future_to_promise, spawn_local};
+use wasm_bindgen_futures::future_to_promise;
 use wasm_client_core::client::base_client::storage::GatewaysDetailsStore;
 use wasm_client_core::client::{
     base_client::{BaseClientBuilder, ClientInput, ClientOutput, ClientState},

wasm/mix-fetch/src/client.rs

@@ -20,7 +20,7 @@ use wasm_client_core::client::base_client::{BaseClientBuilder, ClientInput, Clie
 use wasm_client_core::client::inbound_messages::InputMessage;
 use wasm_client_core::helpers::{add_gateway, generate_new_client_keys};
 use wasm_client_core::nym_task::connections::TransmissionLane;
-use wasm_client_core::nym_task::TaskManager;
+use wasm_client_core::nym_task::ShutdownManager;
 use wasm_client_core::storage::core_client_traits::FullWasmClientStorage;
 use wasm_client_core::storage::wasm_client_traits::WasmClientStorage;
 use wasm_client_core::storage::ClientStorage;
@@ -41,7 +41,7 @@ pub struct MixFetchClient {
     requests: ActiveRequests,
 
     // this has to be guarded by a mutex to be able to disconnect with an immutable reference
-    _task_manager: Mutex<TaskManager>,
+    _shutdown_manager: Mutex<ShutdownManager>,
 }
 
 #[wasm_bindgen]
@@ -187,12 +187,11 @@ impl MixFetchClientBuilder {
             self_address,
             client_input,
             requests: active_requests,
-            // this cannot failed as we haven't passed an external task manager
-            _task_manager: Mutex::new(
+            // this cannot fail as we haven't passed an external task manager
+            _shutdown_manager: Mutex::new(
                 started_client
                     .shutdown_handle
-                    .try_into_task_manager()
-                    .unwrap(),
+                    .expect("shutdown manager missing"),
             ),
         })
     }
@@ -234,11 +233,11 @@ impl MixFetchClient {
         self.invalidated.store(true, Ordering::Relaxed);
 
         console_log!("sending shutdown signal");
-        let mut shutdown_guard = self._task_manager.lock().await;
-        shutdown_guard.signal_shutdown().ok();
+        let mut shutdown_guard = self._shutdown_manager.lock().await;
+        shutdown_guard.send_cancellation();
 
         console_log!("waiting for shutdown to complete");
-        shutdown_guard.wait_for_shutdown().await;
+        shutdown_guard.run_until_shutdown().await;
 
         self.requests.invalidate_all().await;