Rework the WASM code

.github/workflows/generate_schemas.yml

@@ -40,7 +40,7 @@ jobs:
         uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: schemas.ts
-          path: ${{ github.workspace }}/languages/js_webassembly/bitwarden_client/schemas.ts
+          path: ${{ github.workspace }}/languages/js/sdk-client/src/schemas.ts
           if-no-files-found: error
 
       - name: Upload c# schemas artifact

.gitignore

@@ -13,6 +13,7 @@ build/
 bld/
 [Bb]in/
 [Oo]bj/
+*.wasm
 
 # Editor directories and files
 .idea
@@ -34,6 +35,7 @@ crates/bitwarden-napi/sdk-napi.*.node
 
 # Complied TypeScript client
 crates/bitwarden-napi/dist
+languages/js/sdk-client/dist/
 
 # Uniffi
 languages/swift/BitwardenFFI.xcframework
@@ -48,4 +50,5 @@ support/schemas
 crates/bitwarden-napi/src-ts/bitwarden_client/schemas.ts
 languages/csharp/Bitwarden.Sdk/schemas.cs
 languages/js_webassembly/bitwarden_client/schemas.ts
+languages/js/sdk-client/src/schemas.ts
 languages/python/BitwardenClient/schemas.py

README.md

@@ -97,3 +97,39 @@ generation. In that case we excluded the file from being generated and manually
 
 The hope going forward is that we can continue to use the generator with minimal manual
 intervention.
+
+### WASM - WebAssembly
+
+Requirements:
+
+- `wasm32-unknown-unknown` rust target.
+- `wasm-bindgen-cli` installed.
+- `binaryen` installed for `wasm-opt` and `wasm2js`.
+
+```bash
+rustup target add wasm32-unknown-unknown
+cargo install -f wasm-bindgen-cli
+brew install binaryen
+```
+
+#### Build
+
+```bash
+# dev
+cargo build -p bitwarden-wasm -p bitwarden --target wasm32-unknown-unknown --features wasm-bindgen
+wasm-bindgen --target bundler --out-dir languages/js/wasm ./target/wasm32-unknown-unknown/debug/bitwarden_wasm.wasm
+wasm-bindgen --target nodejs --out-dir languages/js/wasm/node ./target/wasm32-unknown-unknown/debug/bitwarden_wasm.wasm
+
+# release
+cargo build -p bitwarden -p bitwarden-wasm --target wasm32-unknown-unknown --features wasm-bindgen --release
+wasm-bindgen --target bundler --out-dir languages/js/wasm ./target/wasm32-unknown-unknown/release/bitwarden_wasm.wasm
+wasm-bindgen --target nodejs --out-dir languages/js/wasm/node ./target/wasm32-unknown-unknown/release/bitwarden_wasm.wasm
+
+# 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
+
+# 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
+```

crates/bitwarden-wasm/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 rust-version = "1.57"
 
 [lib]
-crate-type = ["cdylib", "rlib"]
+crate-type = ["cdylib"]
 
 [dependencies]
 console_error_panic_hook = "0.1.7"
@@ -16,7 +16,10 @@ serde = { version = "1.0.163", features = ["derive"] }
 wasm-bindgen = { version = "=0.2.87", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.36"
 
-bitwarden-json = { path = "../bitwarden-json", features = ["secrets"] }
+bitwarden-json = { path = "../bitwarden-json", features = [
+    "secrets",
+    "internal",
+] }
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.36"

crates/bitwarden/Cargo.toml

@@ -19,6 +19,8 @@ secrets = []                    # Secrets manager API
 internal = []                   # Internal testing methods
 mobile = ["uniffi", "internal"] # Mobile-specific features
 
+wasm-bindgen = ["instant/wasm-bindgen"]
+
 [dependencies]
 aes = ">=0.8.2, <0.9"
 argon2 = { version = ">=0.5.0, <0.6", features = [
@@ -37,6 +39,7 @@ chrono = { version = ">=0.4.26, <0.5", features = [
 getrandom = { version = ">=0.2.9", features = ["js"] }
 hkdf = ">=0.12.3, <0.13"
 hmac = ">=0.12.1, <0.13"
+instant = ">=0.1.12, <0.2"
 lazy_static = ">=1.4.0, <2.0"
 log = ">=0.4.18, <0.5"
 num-bigint = ">=0.4, <0.5"
@@ -45,7 +48,7 @@ pbkdf2 = { version = ">=0.12.1, <0.13", default-features = false }
 rand = ">=0.8.5, <0.9"
 reqwest = { version = ">=0.11, <0.12", features = ["json"] }
 rsa = ">=0.9.2, <0.10"
-schemars = { version = ">=0.8, <0.9", features = ["uuid1", "chrono"] }
+schemars = { version = ">=0.8.9, <0.9", features = ["uuid1", "chrono"] }
 serde = { version = ">=1.0, <2.0", features = ["derive"] }
 serde_json = ">=1.0.96, <2.0"
 serde_qs = ">=0.12.0, <0.13"

crates/bitwarden/src/auth/renew.rs

@@ -1,4 +1,6 @@
-use std::time::{Duration, Instant};
+use std::time::Duration;
+
+use instant::Instant;
 
 #[cfg(feature = "internal")]
 use crate::{auth::api::request::ApiTokenRequest, client::UserLoginMethod};

crates/bitwarden/src/client/client.rs

@@ -1,5 +1,6 @@
-use std::time::{Duration, Instant};
+use std::time::Duration;
 
+use instant::Instant;
 use reqwest::header::{self};
 use uuid::Uuid;