Merge branch 'main' into ps/state-traits

Author: dani-garcia

Cargo.lock

@@ -21,11 +21,15 @@ wasm = [
 bitwarden-error = { workspace = true }
 js-sys = { workspace = true, optional = true }
 serde = { workspace = true }
+serde_json = { workspace = true }
 thiserror = { workspace = true }
-tokio = { features = ["sync"], workspace = true }
+tokio = { features = ["sync", "time"], workspace = true }
 tsify-next = { workspace = true, optional = true }
 wasm-bindgen = { workspace = true, optional = true }
 wasm-bindgen-futures = { workspace = true, optional = true }
 
+[dev-dependencies]
+tokio = { workspace = true, features = ["rt"] }
+
 [lints]
 workspace = true

crates/bitwarden-ipc/Cargo.toml

@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 #[cfg(feature = "wasm")]
 use {tsify_next::Tsify, wasm_bindgen::prelude::*};
 
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
 pub enum Endpoint {
     Web { id: i32 },

crates/bitwarden-ipc/src/endpoint.rs

@@ -3,17 +3,47 @@ use thiserror::Error;
 #[derive(Clone, Debug, Error, PartialEq, Eq)]
 pub enum SendError<Crypto, Com> {
     #[error("Crypto error: {0}")]
-    CryptoError(Crypto),
+    Crypto(Crypto),
 
     #[error("Communication error: {0}")]
-    CommunicationError(Com),
+    Communication(Com),
 }
 
 #[derive(Clone, Debug, Error, PartialEq, Eq)]
 pub enum ReceiveError<Crypto, Com> {
+    #[error("The receive operation timed out")]
+    Timeout,
+
     #[error("Crypto error: {0}")]
-    CryptoError(Crypto),
+    Crypto(Crypto),
 
     #[error("Communication error: {0}")]
-    CommunicationError(Com),
+    Communication(Com),
+}
+
+#[derive(Clone, Debug, Error, PartialEq, Eq)]
+pub enum TypedReceiveError<Typing, Crypto, Com> {
+    #[error("Typing error: {0}")]
+    Typing(Typing),
+
+    #[error("The receive operation timed out")]
+    Timeout,
+
+    #[error("Crypto error: {0}")]
+    Crypto(Crypto),
+
+    #[error("Communication error: {0}")]
+    Communication(Com),
+}
+
+impl<Typing, Crypto, Com> From<ReceiveError<Crypto, Com>>
+    for TypedReceiveError<Typing, Crypto, Com>
+{
+    fn from(value: ReceiveError<Crypto, Com>) -> Self {
+        match value {
+            ReceiveError::Timeout => TypedReceiveError::Timeout,
+            ReceiveError::Crypto(crypto) => TypedReceiveError::Crypto(crypto),
+            ReceiveError::Communication(com) => TypedReceiveError::Communication(com),
+        }
+    }
 }