Peter/tauri-sys
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify error handling

Browse source
This commit is contained in:
Jonas Kruckenberg 2022-11-13 21:19:00 +01:00
parent e431dc89a8
commit bd652c956f
8 changed files with 94 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/event.rs
View file

@ -1,10 +1,7 @@
use std::fmt::Debug;
use serde::{de::DeserializeOwned, Deserialize, Serialize};
use wasm_bindgen::{prelude::Closure, JsValue};
use crate::Error;
#[derive(Deserialize)]
pub struct Event<T> {
/// Event name
@ -49,8 +46,9 @@ impl<T: Debug> Debug for Event<T> {
#[inline(always)]
pub async fn emit<T: Serialize>(event: &str, payload: &T) -> crate::Result<()> {
inner::emit(event, serde_wasm_bindgen::to_value(payload)?)
.await
.map_err(Error::Other)
.await?;
Ok(())
}
/// Listen to an event from the backend.
@ -83,7 +81,7 @@ where
(handler)(serde_wasm_bindgen::from_value(raw).unwrap())
});
let unlisten = inner::listen(event, &closure).await.map_err(Error::Other)?;
let unlisten = inner::listen(event, &closure).await?;
closure.forget();
@ -128,7 +126,7 @@ where
(handler)(serde_wasm_bindgen::from_value(raw).unwrap())
});
let unlisten = inner::once(event, &closure).await.map_err(Error::Other)?;
let unlisten = inner::once(event, &closure).await?;
closure.forget();