Fix remaining wasm platform issues

Author: Daniel Salinas

bindings/matrix-sdk-ffi/Cargo.toml

@@ -24,7 +24,6 @@ js = []
 [dependencies]
 anyhow.workspace = true
 as_variant.workspace = true
-async-compat.workspace = true
 extension-trait = "1.0.1"
 eyeball-im.workspace = true
 futures-util.workspace = true
@@ -44,7 +43,6 @@ tracing.workspace = true
 tracing-appender = { version = "0.2.2" }
 tracing-core.workspace = true
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
-uniffi = { workspace = true, features = ["tokio"] }
 url.workspace = true
 uuid = { version = "1.4.1", features = ["v4"] }
 zeroize.workspace = true
@@ -68,9 +66,10 @@ paranoid-android = "0.2.1"
 [target.'cfg(target_family = "wasm")'.dependencies]
 console_error_panic_hook = "0.1.7"
 tokio = { workspace = true, features = ["sync", "macros"] }
-uniffi = { workspace = true, features = ["tokio", "wasm-unstable-single-threaded"] }
+uniffi = { workspace = true, features = ["wasm-unstable-single-threaded"] }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
+async-compat.workspace = true
 sentry-tracing = "0.36.0"
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 uniffi = { workspace = true, features = ["tokio"] }

bindings/matrix-sdk-ffi/src/client_builder.rs

@@ -2,7 +2,10 @@ use std::{fs, num::NonZeroUsize, path::Path, sync::Arc, time::Duration};
 
 use futures_util::StreamExt;
 #[cfg(not(target_family = "wasm"))]
-use matrix_sdk::reqwest::{Certificate, Proxy};
+use matrix_sdk::{
+  reqwest::{Certificate, Proxy},
+  SqliteStoreConfig
+};
 use matrix_sdk::{
     authentication::oauth::qrcode::{self, DeviceCodeErrorResponseType, LoginFailureReason}, crypto::{
         types::qr_login::{LoginQrCodeDecodeError, QrCodeModeData},

bindings/matrix-sdk-ffi/src/platform.rs

@@ -562,40 +562,31 @@ fn setup_multithreaded_tokio_runtime() {
     }));
 }
 
+#[cfg(not(target_family = "wasm"))]
 fn setup_lightweight_tokio_runtime() {
     async_compat::set_runtime_builder(Box::new(|| {
         eprintln!("spawning a lightweight tokio runtime");
 
-        #[cfg(not(target_family = "wasm"))]
-        {
-            // Get the number of available cores through the system, if possible.
-            let num_available_cores =
-                std::thread::available_parallelism().map(|n| n.get()).unwrap_or(1);
-
-            // The number of worker threads will be either that or 4, whichever is smaller.
-            let num_worker_threads = num_available_cores.min(4);
-
-            // Chosen by a fair dice roll.
-            let num_blocking_threads = 2;
-
-            // 1 MiB of memory per worker thread. Should be enough for everyone™.
-            let max_memory_bytes = 1024 * 1024;
-
-            let mut builder = tokio::runtime::Builder::new_multi_thread();
-            builder
-                .enable_all()
-                .worker_threads(num_worker_threads)
-                .thread_stack_size(max_memory_bytes)
-                .max_blocking_threads(num_blocking_threads);
-            builder
-        }
+          // Get the number of available cores through the system, if possible.
+          let num_available_cores =
+              std::thread::available_parallelism().map(|n| n.get()).unwrap_or(1);
 
-        #[cfg(target_family = "wasm")]
-        {
-            let mut builder = tokio::runtime::Builder::new_current_thread();
-            builder.enable_all();
-            builder
-        }
+          // The number of worker threads will be either that or 4, whichever is smaller.
+          let num_worker_threads = num_available_cores.min(4);
+
+          // Chosen by a fair dice roll.
+          let num_blocking_threads = 2;
+
+          // 1 MiB of memory per worker thread. Should be enough for everyone™.
+          let max_memory_bytes = 1024 * 1024;
+
+          let mut builder = tokio::runtime::Builder::new_multi_thread();
+          builder
+              .enable_all()
+              .worker_threads(num_worker_threads)
+              .thread_stack_size(max_memory_bytes)
+              .max_blocking_threads(num_blocking_threads);
+          builder
     }));
 }