Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 73 additions & 62 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crates/bridge/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ neon = "1"
lazy_static = "1"
serde_json = "1"
serde = "1"

eyre = "0.6"

[dependencies.tokio]
version = "1"
Expand All @@ -32,4 +32,4 @@ version = "1"
features = ["serde", "v4"]

[dependencies.kurrentdb]
version = "1.0.0-alpha.3"
version = "1.0.0-alpha.4"
17 changes: 16 additions & 1 deletion crates/bridge/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use kurrentdb::Endpoint;
use neon::{object::Object, prelude::Context, prelude::JsError, result::JsResult};
use eyre::Report;

#[derive(Debug)]
pub enum ErrorKind {
Expand Down Expand Up @@ -31,6 +32,20 @@ impl From<kurrentdb::ClientSettingsParseError> for ErrorKind {
}
}

impl From<Report> for ErrorKind {
fn from(err: Report) -> Self {
if let Some(kdb_err) = err.downcast_ref::<kurrentdb::Error>() {
return ErrorKind::from(kdb_err.clone());
}

if let Some(parse_err) = err.downcast_ref::<kurrentdb::ClientSettingsParseError>() {
return ErrorKind::from(parse_err.clone());
}

ErrorKind::UnknownError(err.to_string())
}
}

pub fn create_js_error<'a, C, E>(cx: &mut C, error: E) -> JsResult<'a, JsError>
where
C: Context<'a>,
Expand All @@ -45,7 +60,7 @@ where
ErrorKind::ParseError(msg) => ("ParseError", msg.clone()),
ErrorKind::AccessDeniedError => ("AccessDeniedError", format!("{:?}", kind)),
ErrorKind::NotLeaderError(_) => ("NotLeaderError", format!("{:?}", kind)),
ErrorKind::UnknownError(msg) => ("UnknownError", msg.clone())
ErrorKind::UnknownError(msg) => ("UnknownError", msg.clone()),
};

let error = JsError::error(cx, &error_message)?;
Expand Down
Loading