Add custom asynchronous asset handlers

This commit is contained in:
Will Crichton committed 2023-12-15 11:16:25 -08:00
1 parent 5fdff4b7ed
commit d5ec22a26f
4 files changed
+194 -19

No files matched your search

+26 -16
View File
@@ -1,5 +1,7 @@
use std::sync::Arc;
use crate::desktop_context::EventData;
use crate::protocol;
use crate::protocol::{self, AssetHandlerRegistry};
use crate::{desktop_context::UserWindowEvent, Config};
use tao::event_loop::{EventLoopProxy, EventLoopWindowTarget};
pub use wry;
@@ -12,7 +14,7 @@ pub fn build(
cfg: &mut Config,
event_loop: &EventLoopWindowTarget<UserWindowEvent>,
proxy: EventLoopProxy<UserWindowEvent>,
) -> (WebView, WebContext) {
) -> (WebView, WebContext, AssetHandlerRegistry) {
let builder = cfg.window.clone();
let window = builder.with_visible(false).build(event_loop).unwrap();
let file_handler = cfg.file_drop_handler.take();
@@ -33,6 +35,8 @@ pub fn build(
}
let mut web_context = WebContext::new(cfg.data_dir.clone());
let asset_handlers = AssetHandlerRegistry::new();
let asset_handlers_ref = asset_handlers.clone();
let mut webview = WebViewBuilder::new(window)
.unwrap()
@@ -45,24 +49,30 @@ pub fn build(
_ = proxy.send_event(UserWindowEvent(EventData::Ipc(message), window.id()));
}
})
.with_custom_protocol(
String::from("dioxus"),
move |r| match protocol::desktop_handler(
&r,
custom_head.clone(),
index_file.clone(),
&root_name,
) {
Ok(response) => response,
Err(err) => {
.with_asynchronous_custom_protocol(String::from("dioxus"), move |request, responder| {
let custom_head = custom_head.clone();
let index_file = index_file.clone();
let root_name = root_name.clone();
let asset_handlers_ref = asset_handlers_ref.clone();
tokio::spawn(async move {
let response_res = protocol::desktop_handler(
&request,
custom_head.clone(),
index_file.clone(),
&root_name,
&asset_handlers_ref,
)
.await;
let response = response_res.unwrap_or_else(|err| {
tracing::error!("Error: {}", err);
Response::builder()
.status(500)
.body(err.to_string().into_bytes().into())
.unwrap()
}
},
)
});
responder.respond(response);
});
})
.with_file_drop_handler(move |window, evet| {
file_handler
.as_ref()
@@ -119,5 +129,5 @@ pub fn build(
webview = webview.with_devtools(true);
}
(webview.build().unwrap(), web_context)
(webview.build().unwrap(), web_context, asset_handlers)
}