feat: hacky implemenation of tsify-next

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 reqwest::Url;
 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 @@ pub enum TotpError {
 #[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

@@ -20,6 +20,7 @@ argon2 = { version = ">=0.5.0, <0.6", features = [
     "zeroize",
 ], default-features = false }
 bitwarden = { workspace = true }
+bitwarden-vault = { workspace = true, features = ["wasm"] }
 bitwarden-json = { path = "../bitwarden-json", features = [
     "secrets",
     "internal",
@@ -33,6 +34,7 @@ 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/src/vault/mod.rs

@@ -1,5 +1,7 @@
+use serde::{Deserialize, Serialize};
 use serde_wasm_bindgen::to_value;
 use std::sync::Arc;
+use tsify_next::Tsify;
 use wasm_bindgen::prelude::*;
 
 use bitwarden::{
@@ -10,23 +12,24 @@ use chrono::prelude::*;
 
 use crate::error::Result;
 
-#[wasm_bindgen(typescript_custom_section)]
-const TOTP_RESPONSE: &'static str = r#"
-export interface TotpResponse {
-  code: string;
-  period_foo: number;
-}
+// #[wasm_bindgen(typescript_custom_section)]
+// const TOTP_RESPONSE: &'static str = r#"
+// export interface TotpResponse {
+//   code: string;
+//   period_foo: number;
+// }
 
-export interface ClientVault {
-  generate_totp(key: string, time?: string): Promise<TotpResponse>;
-}
-"#;
+// export interface ClientVault {
+//   generate_totp(key: string, time?: string): Promise<TotpResponse>;
+// }
+// "#;
 
-#[wasm_bindgen]
-pub struct JsTotpResult {
-    code: String,
-    period: u64,
-}
+// #[derive(Tsify, Serialize, Deserialize)]
+// #[tsify(into_wasm_abi, from_wasm_abi)]
+// pub struct JsTotpResult {
+//     code: String,
+//     period: u64,
+// }
 
 // #[derive(uniffi::Object)]
 #[wasm_bindgen]
@@ -66,8 +69,8 @@ impl ClientVault {
     /// - A base32 encoded string
     /// - OTP Auth URI
     /// - Steam URI
-    #[wasm_bindgen(skip_typescript)]
-    pub async fn generate_totp(&self, key: String, time: Option<String>) -> JsValue {
+    #[wasm_bindgen]
+    pub async fn generate_totp(&self, key: String, time: Option<String>) -> TotpResponse {
         // TODO: Fix time
         // let time = time.map(|time| {
         //     // TODO: fix error
@@ -80,7 +83,9 @@ impl ClientVault {
             .map_err(Error::Totp)
             .unwrap();
 
-        to_value(&result).unwrap()
+        result
+
+        // to_value(&result).unwrap()
 
         // JsTotpResult {
         //     code: result.code,