Update indexed_db crate to fe645fae2a91a48a0af6126611c2031d59db0ad1 (i.e. to-be-merged PR Ekleog/indexed-db#12)

Author: touilleMan

Cargo.lock

@@ -144,8 +144,8 @@ glob = { version = "0.3.2", default-features = false }
 gloo-timers = { version = "0.3.0", default-features = false }
 hex = { version = "0.4.3", default-features = false }
 hex-literal = { version = "0.4.1", default-features = false }
-# Base on https://github.com/Ekleog/indexed-db/pull/9
-indexed-db = { git = "https://github.com/Ekleog/indexed-db.git", rev = "d92f17e0e2cd48abc4b2d2adf62ccef9a9924080", default-features = false }
+# Based on https://github.com/Ekleog/indexed-db/pull/12
+indexed-db = { git = "https://github.com/Ekleog/indexed-db.git", rev = "fe645fae2a91a48a0af6126611c2031d59db0ad1", default-features = false }
 # indexed-db = { path = "../indexed-db/",  version = "0.4.2", default-features = false }
 itertools = { version = "0.12.1", default-features = false }
 jni = { version = "0.21.1", default-features = false }

Cargo.toml

@@ -44,7 +44,7 @@ mod drop_existing_web_indexed_db {
     use super::*;
 
     async fn drop_db(name: &str) {
-        indexed_db::Factory::<()>::get()
+        indexed_db::Factory::get()
             .unwrap()
             .delete_database(name)
             .await

libparsec/crates/platform_storage/src/testbed.rs

@@ -1,7 +1,7 @@
 // Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
 
-use std::collections::HashMap;
 use std::path::Path;
+use std::{collections::HashMap, convert::Infallible};
 use wasm_bindgen::{JsCast, JsValue};
 
 use indexed_db::{Database, Factory, Transaction};
@@ -48,9 +48,9 @@ const INDEX_FILTER2: &'static str = "_idx_filter2";
 const INDEX_FILTERS: &'static str = "_idx_filters";
 
 async fn initialize_database(
-    db: &Database<CustomErrMarker>,
-) -> indexed_db::Result<(), CustomErrMarker> {
-    let store = db.build_object_store(STORE).auto_increment().create()?;
+    evt: &indexed_db::VersionChangeEvent<Infallible>,
+) -> indexed_db::Result<(), Infallible> {
+    let store = evt.build_object_store(STORE).auto_increment().create()?;
 
     store
         .build_compound_index(
@@ -745,7 +745,7 @@ async fn debug_dump(transaction: &Transaction<CustomErrMarker>) -> anyhow::Resul
 
 #[derive(Debug)]
 pub(crate) struct PlatformCertificatesStorage {
-    conn: Database<CustomErrMarker>,
+    conn: Database,
 }
 
 // SAFETY: see `pretend_future_is_send_on_web`'s documentation for the full explanation.
@@ -772,18 +772,13 @@ impl PlatformCertificatesStorage {
 
         let name = get_certificates_storage_db_name(data_base_dir, device.device_id);
 
-        let factory = Factory::<CustomErrMarker>::get()?;
+        let factory = Factory::get()?;
         let conn = factory
-            .open(
-                &name,
-                DB_VERSION,
-                |evt: indexed_db::VersionChangeEvent<CustomErrMarker>| async move {
-                    // 2) Initialize the database (if needed)
-
-                    let db = evt.database();
-                    initialize_database(&db).await
-                },
-            )
+            .open(&name, DB_VERSION, async |evt| {
+                // 2) Initialize the database (if needed)
+
+                initialize_database(&evt).await
+            })
             .await?;
 
         // 3) All done !

libparsec/crates/platform_storage/src/web/certificates.rs

@@ -4,13 +4,10 @@ use std::path::Path;
 
 use libparsec_types::{anyhow, DeviceID};
 
-use super::{
-    certificates::get_certificates_storage_db_name, user::get_user_storage_db_name,
-    utils::CustomErrMarker,
-};
+use super::{certificates::get_certificates_storage_db_name, user::get_user_storage_db_name};
 
 async fn drop_db(name: &str) -> anyhow::Result<()> {
-    indexed_db::Factory::<CustomErrMarker>::get()
+    indexed_db::Factory::get()
         .map_err(anyhow::Error::from)?
         .delete_database(name)
         .await

libparsec/crates/platform_storage/src/web/cleanup.rs

@@ -1,6 +1,6 @@
 // Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
 
-use std::path::Path;
+use std::{convert::Infallible, path::Path};
 
 use indexed_db::{Database, Factory, ObjectStore, Transaction};
 use libparsec_types::prelude::*;
@@ -30,16 +30,16 @@ const SINGLETON_NEED_SYNC_FIELD: &str = "need_sync";
 const SINGLETON_BLOB_FIELD: &str = "blob";
 
 async fn initialize_database(
-    db: &Database<CustomErrMarker>,
-) -> indexed_db::Result<(), CustomErrMarker> {
-    db.build_object_store(STORE).create()?;
+    evt: &indexed_db::VersionChangeEvent<Infallible>,
+) -> indexed_db::Result<(), Infallible> {
+    evt.build_object_store(STORE).create()?;
 
     Ok(())
 }
 
 #[derive(Debug)]
 pub struct PlatformUserStorage {
-    conn: Database<CustomErrMarker>,
+    conn: Database,
     #[cfg(any(test, feature = "expose-test-methods"))]
     realm_id: VlobID,
 }
@@ -68,18 +68,13 @@ impl PlatformUserStorage {
 
         let name = get_user_storage_db_name(data_base_dir, device.device_id);
 
-        let factory = Factory::<CustomErrMarker>::get().map_err(|e| anyhow::anyhow!("{e:?}"))?;
+        let factory = Factory::get().map_err(|e| anyhow::anyhow!("{e:?}"))?;
         let conn = factory
-            .open(
-                &name,
-                DB_VERSION,
-                |evt: indexed_db::VersionChangeEvent<CustomErrMarker>| async move {
-                    // 2) Initialize the database (if needed)
-
-                    let db = evt.database();
-                    initialize_database(&db).await
-                },
-            )
+            .open(&name, DB_VERSION, async |evt| {
+                // 2) Initialize the database (if needed)
+
+                initialize_database(&evt).await
+            })
             .await?;
 
         // 3) All done !

libparsec/crates/platform_storage/src/web/user.rs

@@ -186,7 +186,7 @@ pub(super) use with_transaction;
 // However this is not yet possible since for the moment `indexed_db` API requires
 // a single error type for all operations (see https://github.com/Ekleog/indexed-db/issues/4).
 pub(super) async fn with_transaction_internal<R, E>(
-    conn: &Database<CustomErrMarker>,
+    conn: &Database,
     stores: &[&str],
     rw: bool,
     cb: impl AsyncFnOnce(Transaction<CustomErrMarker>) -> Result<R, E>,

libparsec/crates/platform_storage/src/web/utils.rs

@@ -1,5 +1,6 @@
 // Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
 
+use std::convert::Infallible;
 use std::path::Path;
 
 use indexed_db::{Database, Factory, ObjectStore, Transaction};
@@ -82,16 +83,15 @@ const BLOCKS_ACCESSED_ON_FIELD: &str = "accessed_on";
 const BLOCKS_DATA_FIELD: &str = "data";
 
 async fn initialize_database(
-    evt: &indexed_db::VersionChangeEvent<CustomErrMarker>,
-) -> indexed_db::Result<(), CustomErrMarker> {
-    let db = evt.database();
-
+    evt: &indexed_db::VersionChangeEvent<Infallible>,
+) -> indexed_db::Result<(), Infallible> {
     // 1) Create the stores
 
-    db.build_object_store(PREVENT_SYNC_PATTERN_STORE).create()?;
-    db.build_object_store(CHECKPOINT_STORE).create()?;
+    evt.build_object_store(PREVENT_SYNC_PATTERN_STORE)
+        .create()?;
+    evt.build_object_store(CHECKPOINT_STORE).create()?;
 
-    let vlob_store = db.build_object_store(VLOBS_STORE).create()?;
+    let vlob_store = evt.build_object_store(VLOBS_STORE).create()?;
     vlob_store
         .build_index(VLOBS_INDEX_INBOUND_NEED_SYNC, VLOBS_INBOUND_NEED_SYNC_FIELD)
         .create()?;
@@ -102,9 +102,9 @@ async fn initialize_database(
         )
         .create()?;
 
-    db.build_object_store(CHUNKS_STORE).create()?;
+    evt.build_object_store(CHUNKS_STORE).create()?;
 
-    let block_store = db.build_object_store(BLOCKS_STORE).create()?;
+    let block_store = evt.build_object_store(BLOCKS_STORE).create()?;
     block_store
         .build_index(BLOCKS_INDEX_ACCESSED_ON, BLOCKS_ACCESSED_ON_FIELD)
         .create()?;
@@ -140,7 +140,7 @@ async fn initialize_database(
 
 #[derive(Debug)]
 pub struct PlatformWorkspaceStorage {
-    conn: Database<CustomErrMarker>,
+    conn: Database,
     max_blocks: u64,
 }
 
@@ -171,17 +171,13 @@ impl PlatformWorkspaceStorage {
 
         let name = get_workspace_storage_db_name(data_base_dir, device.device_id, realm_id);
 
-        let factory = Factory::<CustomErrMarker>::get().map_err(|e| anyhow::anyhow!("{e:?}"))?;
+        let factory = Factory::get().map_err(|e| anyhow::anyhow!("{e:?}"))?;
         let conn = factory
-            .open(
-                &name,
-                DB_VERSION,
-                |evt: indexed_db::VersionChangeEvent<CustomErrMarker>| async move {
-                    // 2) Initialize the database (if needed)
-
-                    initialize_database(&evt).await
-                },
-            )
+            .open(&name, DB_VERSION, async |evt| {
+                // 2) Initialize the database (if needed)
+
+                initialize_database(&evt).await
+            })
             .await?;
 
         // 3) All done !