feature!: export core Error to WASM and update browser Client creatio…

…n API (#451)

core/src/channels/default.rs

@@ -4,8 +4,8 @@ use async_channel::Receiver;
 use async_channel::Sender;
 use async_trait::async_trait;
 
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 use crate::types::channel::Channel;
 
 /// Channel combine with async_channel::Sender and async_channel::Receiver.

core/src/channels/wasm.rs

@@ -6,8 +6,8 @@ use async_trait::async_trait;
 use futures::channel::mpsc;
 use futures::lock::Mutex;
 
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 use crate::types::channel::Channel;
 
 type Sender<T> = Arc<mpsc::UnboundedSender<T>>;

core/src/chunk.rs

@@ -16,8 +16,8 @@ use uuid::Uuid;
 use crate::consts::DEFAULT_TTL_MS;
 use crate::consts::MAX_TTL_MS;
 use crate::consts::TS_OFFSET_TOLERANCE_MS;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 use crate::utils::get_epoch_ms;
 
 /// A data structure to presenting Chunks

core/src/dht/chord.rs

@@ -23,8 +23,8 @@ use crate::dht::Did;
 use crate::dht::LiveDid;
 use crate::dht::SuccessorReader;
 use crate::dht::SuccessorWriter;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 use crate::storage::MemStorage;
 use crate::storage::PersistenceStorage;
 use crate::storage::PersistenceStorageReadAndWrite;

core/src/dht/did.rs

@@ -13,8 +13,8 @@ use web3::contract::tokens::Tokenizable;
 use web3::types::H160;
 
 use crate::ecc::HashStr;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 
 /// Did is a finate Ring R(P) where P = 2^160, wrap H160.
 #[derive(Copy, Clone, Eq, Ord, PartialEq, PartialOrd, Debug, Serialize, Deserialize, Hash)]

core/src/dht/stabilization.rs

@@ -8,7 +8,7 @@ use crate::dht::Chord;
 use crate::dht::PeerRing;
 use crate::dht::PeerRingAction;
 use crate::dht::PeerRingRemoteAction;
-use crate::err::Result;
+use crate::error::Result;
 use crate::message::FindSuccessorReportHandler;
 use crate::message::FindSuccessorSend;
 use crate::message::FindSuccessorThen;

core/src/dht/subring.rs

@@ -7,8 +7,8 @@ use super::vnode::VNodeType;
 use super::vnode::VirtualNode;
 use super::FingerTable;
 use crate::dht::Did;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 
 /// A Subring is like a [super::PeerRing] without storage functional.
 /// Subring also have two extra fields: `name` and `creator`.

core/src/dht/successor.rs

@@ -7,8 +7,8 @@ use std::sync::RwLockReadGuard;
 use crate::dht::did::BiasId;
 use crate::dht::did::SortRing;
 use crate::dht::Did;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 
 /// A sequence of successors for a node on the ring.
 /// It's necessary to have multiple successors to prevent a single point of failure.

core/src/dht/types.rs

@@ -6,7 +6,7 @@ use super::chord::TopoInfo;
 use super::did::Did;
 use super::vnode::VNodeOperation;
 use super::vnode::VirtualNode;
-use crate::err::Result;
+use crate::error::Result;
 
 /// Chord is a distributed hash table (DHT) algorithm that is designed to efficiently
 /// distribute data across peer-to-peer network nodes. You may want to browse its

core/src/dht/vnode.rs

@@ -11,8 +11,8 @@ use super::subring::Subring;
 use crate::consts::VNODE_DATA_MAX_LEN;
 use crate::dht::Did;
 use crate::ecc::HashStr;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 use crate::message::Encoded;
 use crate::message::Encoder;
 use crate::message::MessagePayload;

core/src/ecc/elgamal.rs

@@ -33,8 +33,8 @@ use libsecp256k1::curve::Scalar;
 use crate::ecc::CurveEle;
 use crate::ecc::PublicKey;
 use crate::ecc::SecretKey;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 
 pub fn str_to_field(s: &str) -> Vec<Field> {
     s.as_bytes()

core/src/ecc/mod.rs

@@ -14,8 +14,8 @@ use sha1::Sha1;
 use web3::signing::keccak256;
 use web3::types::Address;
 
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 pub mod elgamal;
 pub mod signers;
 mod types;

core/src/ecc/signers/bip137.rs

@@ -6,7 +6,7 @@ use sha2::Sha256;
 
 use crate::ecc::Address;
 use crate::ecc::PublicKey;
-use crate::err::Result;
+use crate::error::Result;
 
 /// recover pubkey according to signature.
 pub fn recover(msg: &str, sig: impl AsRef<[u8]>) -> Result<PublicKey> {

core/src/ecc/signers/eip191.rs

@@ -6,7 +6,7 @@ use web3::signing::keccak256;
 use crate::ecc::Address;
 use crate::ecc::PublicKey;
 use crate::ecc::SecretKey;
-use crate::err::Result;
+use crate::error::Result;
 
 /// sign function passing raw message parameter.
 pub fn sign_raw(sec: SecretKey, msg: &str) -> [u8; 65] {

core/src/ecc/signers/secp256k1.rs

@@ -4,7 +4,7 @@ use web3::signing::keccak256;
 use crate::ecc::Address;
 use crate::ecc::PublicKey;
 use crate::ecc::SecretKey;
-use crate::err::Result;
+use crate::error::Result;
 
 /// sign function passing raw message parameter.
 pub fn sign_raw(sec: SecretKey, msg: &str) -> [u8; 65] {

core/src/ecc/types.rs

@@ -3,8 +3,8 @@
 use serde::Deserialize;
 use serde::Serialize;
 
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 
 /// PublicKey for ECDSA and EdDSA.
 #[derive(PartialEq, Eq, Debug, Clone, Copy)]

core/src/err.rs → core/src/error.rs

@@ -1,5 +1,8 @@
 //! Error of rings_core
 
+/// A wrap `Result` contains custom errors.
+pub type Result<T> = std::result::Result<T, Error>;
+
 /// Errors collections in ring-core.
 #[derive(thiserror::Error, Debug)]
 #[non_exhaustive]
@@ -301,7 +304,7 @@ pub enum Error {
     #[error("Invalid capacity value")]
     InvalidCapacity,
 
-    #[cfg(feature = "default")]
+    #[cfg(not(feature = "wasm"))]
     #[error("Sled error, {0}")]
     SledError(sled::Error),
 
@@ -349,5 +352,9 @@ pub enum Error {
     SessionExpired,
 }
 
-/// A Result wrapper contain custom Errors.
-pub type Result<T> = std::result::Result<T, Error>;
+#[cfg(feature = "wasm")]
+impl From<Error> for wasm_bindgen::JsValue {
+    fn from(err: Error) -> Self {
+        wasm_bindgen::JsValue::from_str(&err.to_string())
+    }
+}

core/src/lib.rs

@@ -62,7 +62,7 @@
 pub mod channels;
 pub mod dht;
 pub mod ecc;
-pub mod err;
+pub mod error;
 pub mod macros;
 pub mod message;
 pub mod prelude;

core/src/message/encoder.rs

@@ -5,8 +5,8 @@ use bytes::Bytes;
 use serde::Deserialize;
 use serde::Serialize;
 
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 
 pub trait Encoder {
     fn encode(&self) -> Result<Encoded>;

core/src/message/handlers/connection.rs

@@ -5,8 +5,8 @@ use crate::dht::Chord;
 use crate::dht::ChordStorageSync;
 use crate::dht::PeerRingAction;
 use crate::dht::PeerRingRemoteAction;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 use crate::message::types::ConnectNodeReport;
 use crate::message::types::ConnectNodeSend;
 use crate::message::types::FindSuccessorReport;

core/src/message/handlers/custom.rs

@@ -1,6 +1,6 @@
 use async_trait::async_trait;
 
-use crate::err::Result;
+use crate::error::Result;
 use crate::message::types::CustomMessage;
 use crate::message::types::Message;
 use crate::message::HandleMsg;

core/src/message/handlers/mod.rs

@@ -18,8 +18,8 @@ use super::MessagePayload;
 use crate::dht::vnode::VirtualNode;
 use crate::dht::Did;
 use crate::dht::PeerRing;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 use crate::message::ConnectNodeReport;
 use crate::message::ConnectNodeSend;
 

core/src/message/handlers/stabilization.rs

@@ -4,7 +4,7 @@ use crate::dht::Chord;
 use crate::dht::ChordStorageSync;
 use crate::dht::PeerRingAction;
 use crate::dht::PeerRingRemoteAction;
-use crate::err::Result;
+use crate::error::Result;
 use crate::message::types::Message;
 use crate::message::types::NotifyPredecessorReport;
 use crate::message::types::NotifyPredecessorSend;

core/src/message/handlers/storage.rs

@@ -9,8 +9,8 @@ use crate::dht::Did;
 use crate::dht::PeerRing;
 use crate::dht::PeerRingAction;
 use crate::dht::PeerRingRemoteAction;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 use crate::message::types::FoundVNode;
 use crate::message::types::Message;
 use crate::message::types::SearchVNode;

core/src/message/handlers/subring.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use super::storage::handle_storage_store_act;
 use crate::dht::ChordStorage;
 use crate::dht::PeerRing;
-use crate::err::Result;
+use crate::error::Result;
 use crate::prelude::vnode::VNodeOperation;
 use crate::swarm::Swarm;
 

core/src/message/payload.rs

@@ -23,8 +23,8 @@ use crate::dht::Chord;
 use crate::dht::Did;
 use crate::dht::PeerRing;
 use crate::dht::PeerRingAction;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 use crate::session::SessionManager;
 use crate::utils::get_epoch_ms;
 

core/src/message/protocols/relay.rs

@@ -5,8 +5,8 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use crate::dht::Did;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 
 /// MessageRelay guide message passing on rings network by relay.
 ///

core/src/message/protocols/verify.rs

@@ -8,8 +8,8 @@ use serde::Serialize;
 
 use crate::ecc::signers;
 use crate::ecc::PublicKey;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 use crate::session::Session;
 
 /// Message Verification is based on session, and sig.
@@ -26,7 +26,10 @@ impl MessageVerification {
     /// Verify a MessageVerification
     pub fn verify<T>(&self, data: &T) -> bool
     where T: Serialize {
-        let Ok(msg) = self.msg(data) else {tracing::warn!("MessageVerification pack_msg failed"); return false};
+        let Ok(msg) = self.msg(data) else {
+            tracing::warn!("MessageVerification pack_msg failed");
+            return false;
+        };
 
         self.session
             .verify(&msg, &self.sig)

core/src/message/types.rs

@@ -4,7 +4,7 @@ use serde::Serialize;
 use crate::dht::vnode::VNodeOperation;
 use crate::dht::vnode::VirtualNode;
 use crate::dht::Did;
-use crate::err::Result;
+use crate::error::Result;
 use crate::types::ice_transport::HandshakeInfo;
 
 /// MessageType use to ask for connection, send to remote with transport_uuid and handshake_info.

core/src/session.rs

@@ -21,8 +21,8 @@ use crate::dht::Did;
 use crate::ecc::signers;
 use crate::ecc::PublicKey;
 use crate::ecc::SecretKey;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 use crate::utils;
 
 fn pack_session(session_id: Did, ts_ms: u128, ttl_ms: usize) -> String {
@@ -59,6 +59,7 @@ pub struct SessionManagerBuilder {
 ///
 /// To verify the session, use `verify_self()` method of [Session].
 /// To verify a message, use `verify(msg, sig)` method of [Session].
+#[wasm_export]
 #[derive(Debug)]
 pub struct SessionManager {
     /// Session
@@ -160,9 +161,7 @@ impl SessionManagerBuilder {
         self.ttl_ms = ttl_ms.unwrap_or(DEFAULT_SESSION_TTL_MS);
         self
     }
-}
 
-impl SessionManagerBuilder {
     /// Build the [SessionManager].
     pub fn build(self) -> Result<SessionManager> {
         let authorizer = Authorizer::try_from((self.authorizer_entity, self.authorizer_type))?;

core/src/storage/persistence/idb.rs

@@ -19,8 +19,8 @@ use wasm_bindgen::JsValue;
 use super::PersistenceStorageOperation;
 use super::PersistenceStorageReadAndWrite;
 use super::PersistenceStorageRemove;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 use crate::utils::js_value;
 
 /// Default IndexedDB database and storage name

core/src/storage/persistence/kv.rs

@@ -11,8 +11,8 @@ use sled;
 use super::PersistenceStorageOperation;
 use super::PersistenceStorageReadAndWrite;
 use super::PersistenceStorageRemove;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 
 trait KvStorageBasic {
     fn get_db(&self) -> &sled::Db;

core/src/storage/persistence/mod.rs

@@ -8,7 +8,7 @@ use async_trait::async_trait;
 pub use self::idb::IDBStorage;
 #[cfg(not(feature = "wasm"))]
 pub use self::kv::KvStorage;
-use crate::err::Result;
+use crate::error::Result;
 
 /// Persistence Storage read and write functions
 #[cfg_attr(feature = "wasm", async_trait(?Send))]

core/src/swarm.rs

@@ -12,8 +12,8 @@ use crate::channels::Channel;
 use crate::dht::Chord;
 use crate::dht::Did;
 use crate::dht::PeerRing;
-use crate::err::Error;
-use crate::err::Result;
+use crate::error::Error;
+use crate::error::Result;
 use crate::inspect::SwarmInspect;
 use crate::measure::Measure;
 use crate::measure::MeasureCounter;