Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2024-11-10 06:34:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix websocket error reporting

Browse source
This commit is contained in:
Evan Almloff 2022-06-09 09:36:28 -05:00
parent b480579169
commit 017d269ca8
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -49,7 +49,7 @@ desktop = ["dioxus-desktop"]
router = ["dioxus-router"]
tui = ["dioxus-tui"]
liveview = ["dioxus-liveview"]
hot_reload = ["dioxus-core-macro/hot_reload", "dioxus-rsx-interpreter", "dioxus-desktop?/hot_reload"]
hot_reload = ["dioxus-core-macro/hot_reload", "dioxus-rsx-interpreter", "dioxus-desktop?/hot_reload", "dioxus-web?/hot_reload"]
native-core = ["dioxus-native-core", "dioxus-native-core-macro"]

22
packages/web/src/lib.rs
View file

@ -237,7 +237,7 @@ pub async fn run_with_props<T: 'static + Send>(root: Component<T>, root_props: T
};
let url = format!(
"{protocol} //{}/_dioxus/hot_reload",
"{protocol}//{}/_dioxus/hot_reload",
window.location().host().unwrap()
);
@ -252,8 +252,9 @@ pub async fn run_with_props<T: 'static + Send>(root: Component<T>, root_props: T
}) as Box<dyn FnMut(MessageEvent)>);
ws.set_onmessage(Some(cl.as_ref().unchecked_ref()));
cl.forget();
let (error_channel_sender, error_channel_receiver) = unbounded();
let (error_channel_sender, mut error_channel_receiver) = unbounded();
struct WebErrorHandler {
sender: UnboundedSender<Error>,
@ -269,17 +270,16 @@ pub async fn run_with_props<T: 'static + Send>(root: Component<T>, root_props: T
sender: error_channel_sender,
});
RSX_CONTEXT.provide_scheduler_channel(dom.get_scheduler_channel());
// forward stream to the websocket
dom.base_scope().spawn_forever(async move {
error_channel_receiver
.for_each(|err| {
if let Error::RecompileRequiredError(err) = err {
ws.send_with_str(serde_json::to_string(&err).unwrap().as_str())
.unwrap();
}
futures_util::future::ready(())
})
.await;
while let Some(err) = error_channel_receiver.next().await {
if let Error::RecompileRequiredError(err) = err {
ws.send_with_str(serde_json::to_string(&err).unwrap().as_str())
.unwrap();
}
}
});
}