Allow supplying a logger for store open operations

Author: richvdh

src/store.rs

@@ -2,17 +2,21 @@
 
 use std::sync::Arc;
 
+use js_sys::Promise;
 use matrix_sdk_crypto::{
     store::{DynCryptoStore, IntoCryptoStore, MemoryStore},
     types::BackupSecrets,
 };
+use tracing::{dispatcher, instrument::WithSubscriber};
 use wasm_bindgen::prelude::*;
 use zeroize::{Zeroize, Zeroizing};
 
 use crate::{
     encryption::EncryptionAlgorithm,
+    future::future_to_promise,
     identifiers::{RoomId, UserId},
     impl_from_to_inner,
+    tracing::{logger_to_dispatcher, JsLogger},
     vodozemac::Curve25519PublicKey,
 };
 
@@ -44,12 +48,19 @@ impl StoreHandle {
     ///
     /// * `store_passphrase` - The passphrase that should be used to encrypt the
     ///   store, for IndexedDB-based stores
-    #[wasm_bindgen(js_name = "open")]
-    pub async fn open_for_js(
+    ///
+    /// * `logger` - An optional logger instance to use for writing log messages
+    ///   during the open operation. An instance of `JsLogger`.
+    #[wasm_bindgen(js_name = "open", unchecked_return_type = "Promise<StoreHandle>")]
+    pub fn open_for_js(
         store_name: Option<String>,
         store_passphrase: Option<String>,
-    ) -> Result<StoreHandle, JsError> {
-        StoreHandle::open(store_name, store_passphrase).await
+        logger: Option<JsLogger>,
+    ) -> Promise {
+        let _guard = dispatcher::set_default(&logger_to_dispatcher(logger));
+        future_to_promise(async move {
+            StoreHandle::open(store_name, store_passphrase).with_current_subscriber().await
+        })
     }
 
     pub(crate) async fn open(
@@ -108,26 +119,33 @@ impl StoreHandle {
     ///
     /// * `store_key` - The key that should be used to encrypt the store, for
     ///   IndexedDB-based stores. Must be a 32-byte array.
-    #[wasm_bindgen(js_name = "openWithKey")]
-    pub async fn open_with_key(
+    ///
+    /// * `logger` - An optional logger instance to use for writing log messages
+    ///   during the open operation. An instance of `JsLogger`.
+    #[wasm_bindgen(js_name = "openWithKey", unchecked_return_type = "Promise<StoreHandle>")]
+    pub fn open_with_key(
         store_name: String,
         mut store_key: Vec<u8>,
-    ) -> Result<StoreHandle, JsError> {
-        let store_key_array: Zeroizing<[u8; 32]> = Zeroizing::new(
-            store_key
-                .as_slice()
-                .try_into()
-                .map_err(|_| JsError::new("Expected a key of length 32"))?,
-        );
-        store_key.zeroize();
-
-        let store = matrix_sdk_indexeddb::IndexeddbCryptoStore::open_with_key(
-            &store_name,
-            &store_key_array,
-        )
-        .await?;
-
-        Ok(Self { store: store.into_crypto_store() })
+        logger: Option<JsLogger>,
+    ) -> Promise {
+        let _guard = dispatcher::set_default(&logger_to_dispatcher(logger));
+        future_to_promise(async move {
+            let store_key_array: Zeroizing<[u8; 32]> = Zeroizing::new(
+                store_key
+                    .as_slice()
+                    .try_into()
+                    .map_err(|_| JsError::new("Expected a key of length 32"))?,
+            );
+            store_key.zeroize();
+
+            let store = matrix_sdk_indexeddb::IndexeddbCryptoStore::open_with_key(
+                &store_name,
+                &store_key_array,
+            )
+            .await?;
+
+            Ok(Self { store: store.into_crypto_store() })
+        })
     }
 }