[PM-11794] Use wasm-bindgen directly

crates/bitwarden-core/Cargo.toml

@@ -51,6 +51,7 @@ thiserror = ">=1.0.40, <2.0"
 uniffi = { version = "=0.28.1", optional = true, features = ["tokio"] }
 uuid = { version = ">=1.3.3, <2.0", features = ["serde"] }
 validator = { version = "0.18.1", features = ["derive"] }
+wasm-bindgen = "0.2.93"
 zeroize = { version = ">=1.7.0, <2.0", features = ["derive", "aarch64"] }
 zxcvbn = { version = ">=3.0.1, <4.0", optional = true }
 

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

@@ -1,4 +1,5 @@
 use std::sync::{Arc, RwLock};
+use wasm_bindgen::prelude::*;
 
 use reqwest::header::{self, HeaderValue};
 
@@ -12,8 +13,10 @@
 
 /// The main struct to interact with the Bitwarden SDK.
 #[derive(Debug)]
+#[wasm_bindgen]
 pub struct Client {
     #[doc(hidden)]
+    #[wasm_bindgen(skip)]
     pub internal: InternalClient,
 }
 

crates/bitwarden-vault/Cargo.toml

@@ -19,6 +19,7 @@ uniffi = [
     "bitwarden-crypto/uniffi",
     "dep:uniffi",
 ] # Uniffi bindings
+wasm = [] # Typescript and WASM bindings
 
 [dependencies]
 base64 = ">=0.22.1, <0.23"
@@ -42,6 +43,11 @@ thiserror = ">=1.0.40, <2.0"
 uniffi = { version = "=0.28.1", optional = true }
 uuid = { version = ">=1.3.3, <2.0", features = ["serde"] }
 
+# [target.'cfg(feature = "wasm")'.dependencies]
+serde-wasm-bindgen = "0.6.5"
+tsify-next = { version = "0.5.4", features = ["js"], default-features = false }
+wasm-bindgen = { version = "0.2.91", features = ["serde-serialize"] }
+
 [dev-dependencies]
 tokio = { version = "1.36.0", features = ["rt", "macros"] }
 

crates/bitwarden-vault/src/totp.rs

@@ -8,6 +8,10 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
+// #[cfg(feature = "wasm")]
+use tsify_next::Tsify;
+// #[cfg(feature = "wasm")]
+use wasm_bindgen::prelude::*;
 
 use crate::CipherListView;
 
@@ -38,6 +42,7 @@
 #[derive(Serialize, Deserialize, Debug, JsonSchema)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 #[cfg_attr(feature = "uniffi", derive(uniffi::Record))]
+#[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
 pub struct TotpResponse {
     /// Generated TOTP code
     pub code: String,

crates/bitwarden-wasm/Cargo.toml

@@ -19,15 +19,22 @@ argon2 = { version = ">=0.5.0, <0.6", features = [
     "alloc",
     "zeroize",
 ], default-features = false }
+bitwarden = { workspace = true }
+bitwarden-vault = { workspace = true, features = ["wasm"] }
 bitwarden-json = { path = "../bitwarden-json", features = [
     "secrets",
     "internal",
 ] }
+chrono = { version = ">=0.4.26, <0.5", default-features = true, features = [
+    "serde",
+] }
 console_error_panic_hook = "0.1.7"
 console_log = { version = "1.0.0", features = ["color"] }
 js-sys = "0.3.68"
 log = "0.4.20"
 serde = { version = "1.0.196", features = ["derive"] }
+serde-wasm-bindgen = "0.6.5"
+tsify-next = { version = "0.5.4", features = ["js"], default-features = false }
 wasm-bindgen = { version = "0.2.91", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.41"
 

crates/bitwarden-wasm/build.sh

@@ -15,9 +15,9 @@ else
 fi
 
 # Optimize size
-wasm-opt -Os ./languages/js/wasm/bitwarden_wasm_bg.wasm -o ./languages/js/wasm/bitwarden_wasm_bg.wasm
-wasm-opt -Os ./languages/js/wasm/node/bitwarden_wasm_bg.wasm -o ./languages/js/wasm/node/bitwarden_wasm_bg.wasm
+# wasm-opt -Os ./languages/js/wasm/bitwarden_wasm_bg.wasm -o ./languages/js/wasm/bitwarden_wasm_bg.wasm
+# wasm-opt -Os ./languages/js/wasm/node/bitwarden_wasm_bg.wasm -o ./languages/js/wasm/node/bitwarden_wasm_bg.wasm
 
 # Transpile to JS
-wasm2js ./languages/js/wasm/bitwarden_wasm_bg.wasm -o ./languages/js/wasm/bitwarden_wasm_bg.wasm.js
-npx terser ./languages/js/wasm/bitwarden_wasm_bg.wasm.js -o ./languages/js/wasm/bitwarden_wasm_bg.wasm.js
+# wasm2js ./languages/js/wasm/bitwarden_wasm_bg.wasm -o ./languages/js/wasm/bitwarden_wasm_bg.wasm.js
+# npx terser ./languages/js/wasm/bitwarden_wasm_bg.wasm.js -o ./languages/js/wasm/bitwarden_wasm_bg.wasm.js

crates/bitwarden-wasm/src/client.rs

@@ -8,24 +8,7 @@ use log::{set_max_level, Level};
 use wasm_bindgen::prelude::*;
 use wasm_bindgen_futures::future_to_promise;
 
-#[wasm_bindgen]
-pub enum LogLevel {
-    Trace,
-    Debug,
-    Info,
-    Warn,
-    Error,
-}
-
-fn convert_level(level: LogLevel) -> Level {
-    match level {
-        LogLevel::Trace => Level::Trace,
-        LogLevel::Debug => Level::Debug,
-        LogLevel::Info => Level::Info,
-        LogLevel::Warn => Level::Warn,
-        LogLevel::Error => Level::Error,
-    }
-}
+use crate::log_level::{convert_level, LogLevel};
 
 // Rc<...> is to avoid needing to take ownership of the Client during our async run_command
 // function https://github.com/rustwasm/wasm-bindgen/issues/2195#issuecomment-799588401

crates/bitwarden-wasm/src/error.rs

@@ -0,0 +1,38 @@
+use std::fmt::{Display, Formatter};
+
+// Name is converted from *Error to *Exception, so we can't just name the enum Error because
+// Exception already exists
+#[derive(Debug)]
+pub enum BitwardenError {
+    E(bitwarden::error::Error),
+}
+
+impl From<bitwarden::Error> for BitwardenError {
+    fn from(e: bitwarden::Error) -> Self {
+        Self::E(e.into())
+    }
+}
+
+impl From<bitwarden::error::Error> for BitwardenError {
+    fn from(e: bitwarden::error::Error) -> Self {
+        Self::E(e)
+    }
+}
+
+impl Display for BitwardenError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::E(e) => Display::fmt(e, f),
+        }
+    }
+}
+
+impl std::error::Error for BitwardenError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        match self {
+            BitwardenError::E(e) => Some(e),
+        }
+    }
+}
+
+pub type Result<T, E = BitwardenError> = std::result::Result<T, E>;

crates/bitwarden-wasm/src/lib.rs

@@ -1 +1,6 @@
 mod client;
+mod log_level;
+mod raw_client;
+
+mod error;
+mod vault;

crates/bitwarden-wasm/src/log_level.rs

@@ -0,0 +1,21 @@
+use log::Level;
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen]
+pub enum LogLevel {
+    Trace,
+    Debug,
+    Info,
+    Warn,
+    Error,
+}
+
+pub fn convert_level(level: LogLevel) -> Level {
+    match level {
+        LogLevel::Trace => Level::Trace,
+        LogLevel::Debug => Level::Debug,
+        LogLevel::Info => Level::Info,
+        LogLevel::Warn => Level::Warn,
+        LogLevel::Error => Level::Error,
+    }
+}

crates/bitwarden-wasm/src/raw_client.rs

@@ -0,0 +1,38 @@
+use std::sync::Arc;
+use wasm_bindgen::prelude::*;
+
+use crate::{
+    log_level::{convert_level, LogLevel},
+    vault::ClientVault,
+};
+
+// Rc<...> is to avoid needing to take ownership of the Client during our async run_command
+// function https://github.com/rustwasm/wasm-bindgen/issues/2195#issuecomment-799588401
+#[wasm_bindgen]
+pub struct RawBitwardenClient(Arc<bitwarden::Client>);
+
+#[wasm_bindgen]
+impl RawBitwardenClient {
+    #[wasm_bindgen(constructor)]
+    pub fn new(_settings_input: Option<String>, log_level: Option<LogLevel>) -> Self {
+        // let settings = Self::parse_settings(settings_input);
+        console_error_panic_hook::set_once();
+        if let Err(e) =
+            console_log::init_with_level(convert_level(log_level.unwrap_or(LogLevel::Info)))
+        {
+            panic!("failed to initialize logger: {:?}", e);
+        }
+        Self(Arc::new(bitwarden::Client::new(None)))
+    }
+
+    #[wasm_bindgen]
+    pub fn vault(&self) -> ClientVault {
+        ClientVault(self.0.clone())
+    }
+
+    #[wasm_bindgen]
+    pub fn hello(&self) -> String {
+        println!("Hello from Rust!");
+        "Hello from Rust!".to_string()
+    }
+}