Implement select

Cargo.toml

@@ -23,6 +23,7 @@ bitwarden-api-identity = { path = "crates/bitwarden-api-identity", version = "=0
 bitwarden-cli = { path = "crates/bitwarden-cli", version = "=0.5.0" }
 bitwarden-core = { path = "crates/bitwarden-core", version = "=0.5.0" }
 bitwarden-crypto = { path = "crates/bitwarden-crypto", version = "=0.5.0" }
+bitwarden-db = { path = "crates/bitwarden-db", version = "=0.5.0" }
 bitwarden-exporters = { path = "crates/bitwarden-exporters", version = "=0.5.0" }
 bitwarden-fido = { path = "crates/bitwarden-fido", version = "=0.5.0" }
 bitwarden-generators = { path = "crates/bitwarden-generators", version = "=0.5.0" }

crates/bitwarden-core/Cargo.toml

@@ -37,6 +37,7 @@ base64 = ">=0.22.1, <0.23"
 bitwarden-api-api = { workspace = true }
 bitwarden-api-identity = { workspace = true }
 bitwarden-crypto = { workspace = true }
+bitwarden-db = { workspace = true }
 chrono = { version = ">=0.4.26, <0.5", features = [
     "clock",
     "serde",
@@ -72,7 +73,6 @@ wasm-bindgen = { version = "0.2.91", features = [
     "serde-serialize",
 ], optional = true }
 wasm-bindgen-futures = "0.4.41"
-js-sys = "0.3.69"
 
 
 [target.'cfg(all(not(target_os = "android"), not(target_arch="wasm32")))'.dependencies]

crates/bitwarden-core/src/client/client.rs

@@ -1,16 +1,14 @@
 use std::sync::{Arc, Mutex, RwLock};
 
+use bitwarden_db::Database;
 use reqwest::header::{self, HeaderValue};
 
 use super::internal::InternalClient;
 #[cfg(feature = "internal")]
 use crate::client::flags::Flags;
-use crate::{
-    client::{
-        client_settings::ClientSettings,
-        internal::{ApiConfigurations, Tokens},
-    },
-    Database,
+use crate::client::{
+    client_settings::ClientSettings,
+    internal::{ApiConfigurations, Tokens},
 };
 
 /// The main struct to interact with the Bitwarden SDK.

crates/bitwarden-core/src/client/internal.rs

@@ -4,6 +4,7 @@ use std::sync::{Arc, Mutex, RwLock};
 use bitwarden_crypto::SymmetricCryptoKey;
 #[cfg(feature = "internal")]
 use bitwarden_crypto::{AsymmetricEncString, EncString, Kdf, MasterKey};
+use bitwarden_db::Database;
 use chrono::Utc;
 use uuid::Uuid;
 
@@ -17,7 +18,7 @@ use crate::error::Error;
 use crate::{
     auth::renew::renew_token,
     error::{Result, VaultLocked},
-    Database, DeviceType,
+    DeviceType,
 };
 
 #[derive(Debug, Clone)]

crates/bitwarden-core/src/lib.rs

@@ -12,8 +12,6 @@ pub use error::Error;
 #[cfg(feature = "internal")]
 pub mod mobile;
 pub use error::{MissingFieldError, VaultLocked};
-mod database;
-pub use database::{Database, DatabaseError, DatabaseTrait, Params, ToSql};
 #[cfg(feature = "internal")]
 pub mod platform;
 #[cfg(feature = "secrets")]

crates/bitwarden-db-tests/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "bitwarden-db-tests"
+version = "0.1.0"
+publish = false
+
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license-file.workspace = true
+
+[[bin]]
+name = "bitwarden_db_tests"
+path = "bin/main.rs"
+
+[lib]
+name = "bitwarden_db_tests"
+crate-type = ["cdylib", "lib"]
+
+[dependencies]
+bitwarden-db = { workspace = true }
+tokio = { version = "1.36.0", features = ["rt", "macros"] }
+wasm-bindgen = "0.2.92"
+wasm-bindgen-futures = "0.4.41"

crates/bitwarden-db-tests/bin/main.rs

@@ -0,0 +1,6 @@
+use bitwarden_db_tests::run_tests;
+
+#[tokio::main(flavor = "current_thread")]
+async fn main() {
+    run_tests().await;
+}

crates/bitwarden-db-tests/index.js

@@ -0,0 +1,75 @@
+import { runTests } from "./pkg";
+
+import * as SQLite from "wa-sqlite";
+import SQLiteESMFactory from "wa-sqlite/dist/wa-sqlite-async.mjs";
+import { IDBMirrorVFS } from "wa-sqlite/src/examples/IDBMirrorVFS";
+import { IDBBatchAtomicVFS } from "wa-sqlite/src/examples/IDBBatchAtomicVFS";
+
+const sqliteModule = await SQLiteESMFactory();
+const sqlite3 = SQLite.Factory(sqliteModule);
+
+// Register a custom file system.
+// const vfs = await IDBBatchAtomicVFS.create("hello", sqliteModule);
+// const vfs = await IDBMirrorVFS.create("hello", sqliteModule);
+// sqlite3.vfs_register(vfs, true);
+
+class SqliteDatabase {
+  constructor(db) {
+    this.db = db;
+  }
+
+  static async factory(name) {
+    console.debug("OPENED DATABASE: ", name);
+
+    // Open the database.
+    const db = await sqlite3.open_v2(name);
+
+    window.sqlite = sqlite3;
+    window.test = db;
+
+    return new SqliteDatabase(db);
+  }
+
+  async get_version() {
+    console.log("GET");
+  }
+
+  async set_version(version) {
+    console.log("Version", version);
+  }
+
+  async execute_batch(sql) {
+    console.log(sql);
+    // localStorage.setItem("sql", sql);
+    await sqlite3.exec(this.db, sql);
+  }
+
+  async execute(sql, params) {
+    console.log(sql, params);
+    for await (const stmt of sqlite3.statements(this.db, sql)) {
+      let rc = sqlite3.bind_collection(stmt, params);
+
+      while ((rc = await sqlite3.step(stmt)) !== SQLite.SQLITE_DONE) {
+        console.log(rc);
+      }
+    }
+
+    // localStorage.setItem("sql", sql);
+    // await sqlite3.exec(this.db, sql);
+  }
+
+  async query_map(sql) {
+    let rows = [];
+    for await (const stmt of sqlite3.statements(this.db, sql)) {
+      while ((await sqlite3.step(stmt)) === SQLite.SQLITE_ROW) {
+        const row = sqlite3.row(stmt);
+        rows.push(row);
+      }
+    }
+    return rows;
+  }
+}
+
+window.SqliteDatabase = SqliteDatabase;
+
+runTests();