fix: remove dependency on broken wasm_timer crate

`wasm_timer` doesn't work outside the browser, which prevents it being used in
tests.

We can replace it with `gloo-timers` wich uses the standard Javascript
`setTimeout`.

Fixes: #896, #1443.

Author: richvdh

Cargo.lock

@@ -29,7 +29,7 @@ serde_json = { workspace = true }
 async-lock = "2.5.0"
 futures-util = { version = "0.3.21", default-features = false, features = ["channel"] }
 wasm-bindgen-futures = { version = "0.4.33", optional = true }
-wasm-timer = "0.2.5"
+gloo-timers = { version = "0.2.6", features = ["futures"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 tokio = { version = "1.24.2", default-features = false, features = ["rt", "sync", "time"] }

crates/matrix-sdk-common/Cargo.toml

@@ -1,10 +1,16 @@
 use std::{error::Error, fmt, time::Duration};
 
 use futures_core::Future;
+
 #[cfg(not(target_arch = "wasm32"))]
 use tokio::time::timeout as tokio_timeout;
+
+#[cfg(target_arch = "wasm32")]
+use gloo_timers::future::TimeoutFuture;
+
 #[cfg(target_arch = "wasm32")]
-use wasm_timer::ext::TryFutureExt;
+use futures_util::future::{select, Either};
+
 
 /// Error type notifying that a timeout has elapsed.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -25,21 +31,23 @@ impl Error for ElapsedError {}
 /// an error.
 pub async fn timeout<F, T>(future: F, duration: Duration) -> Result<T, ElapsedError>
 where
-    F: Future<Output = T>,
+    F: Future<Output = T> + Unpin,
 {
     #[cfg(not(target_arch = "wasm32"))]
     return tokio_timeout(duration, future).await.map_err(|_| ElapsedError(()));
 
     #[cfg(target_arch = "wasm32")]
     {
-        let try_future = async { Ok::<T, std::io::Error>(future.await) };
-        try_future.timeout(duration).await.map_err(|_| ElapsedError(()))
+        let timeout_future = TimeoutFuture::new(u32::try_from(duration.as_millis()).expect("Overlong duration"));
+
+        match select(future, timeout_future).await {
+            Either::Left((res, _)) => Ok(res),
+            Either::Right((_, _)) => Err(ElapsedError(())),
+        }
     }
 }
 
-// TODO: Enable tests for wasm32 and debug why
-// `with_timeout` test fails https://github.com/matrix-org/matrix-rust-sdk/issues/896
-#[cfg(all(test, not(target_arch = "wasm32")))]
+#[cfg(all(test))]
 pub(crate) mod tests {
     use std::{future, time::Duration};
 

crates/matrix-sdk-common/src/timeout.rs

@@ -118,7 +118,6 @@ optional = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 async-once-cell = "0.4.2"
-wasm-timer = "0.2.5"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 backoff = { version = "0.4.0", features = ["tokio"] }

crates/matrix-sdk/Cargo.toml

@@ -184,7 +184,7 @@ impl Client {
 
     async fn sleep() {
         #[cfg(target_arch = "wasm32")]
-        let _ = wasm_timer::Delay::new(Duration::from_secs(1)).await;
+        let _ = gloo_timers::future::TimeoutFuture::new(1_000).await;
 
         #[cfg(not(target_arch = "wasm32"))]
         tokio::time::sleep(Duration::from_secs(1)).await;