Fix responsor (#56)

* fix: fixed responsor

Fixed an issue where responses were not returned correctly when multiple resources (such as icons) were requested on the same page.

* fmt

---------

Co-authored-by: not-elm <elmgameinfo@gmail.com>

Author: not-elm

crates/bevy_webview_wry/src/webview/load_webview.rs

@@ -6,7 +6,7 @@ use crate::webview::WryWebViews;
 use crate::webview::handlers::{HandlerQueries, WryEventParams};
 use crate::webview::load_webview::ipc::IpcHandlerParams;
 use crate::webview::load_webview::protocol::feed_uri;
-use crate::webview::protocol::WryRequestSender;
+use crate::webview::protocol::{WryRequestSender, WryResponseHandles};
 use bevy::prelude::*;
 use bevy::winit::WinitWindows;
 use bevy_webview_core::bundle::embedding::{Bounds, EmbedWithin};
@@ -120,7 +120,7 @@ fn load_web_views(
         }
         commands
             .entity(webview_entity)
-            .insert(WebviewInitialized(()));
+            .insert((WebviewInitialized(()), WryResponseHandles::default()));
         web_views.0.insert(webview_entity, webview);
     }
 }

crates/bevy_webview_wry/src/webview/protocol.rs

@@ -34,6 +34,9 @@ impl Plugin for CustomProtocolPlugin {
     }
 }
 
+#[derive(Default, Component, Deref, DerefMut)]
+pub(crate) struct WryResponseHandles(HashMap<AssetId<WryResponseBody>, WryResponseHandle>);
+
 pub struct WryRequest {
     pub webview: Entity,
     pub path: PathBuf,
@@ -51,6 +54,7 @@ pub struct WryResponseMap(pub HashMap<WryRequestArgs, RequestAsyncResponder>);
 fn start_load(
     mut commands: Commands,
     mut map: NonSendMut<WryResponseMap>,
+    mut response_handles: Query<&mut WryResponseHandles>,
     rx: NonSend<WryRequestReceiver>,
     asset_server: Res<AssetServer>,
 ) {
@@ -59,53 +63,66 @@ fn start_load(
             csp: request.csp,
             path: request.path.clone(),
         };
-        commands.entity(request.webview).try_insert((
-            args.clone(),
-            WryResponseHandle(asset_server.load(request.path.clone())),
-        ));
+        let Ok(mut handles) = response_handles.get_mut(request.webview) else {
+            continue;
+        };
+        let response_handle = WryResponseHandle(asset_server.load(request.path.clone()));
+        handles.insert(response_handle.0.id(), response_handle.clone());
+        commands
+            .entity(request.webview)
+            .with_child((response_handle, args.clone()));
         map.0.insert(args, request.responder);
     }
 }
 
 fn response(
     mut commands: Commands,
-    responses: ResMut<Assets<WryResponseBody>>,
-    mut handles: Query<(Entity, &WryRequestArgs, &WryResponseHandle)>,
     mut map: NonSendMut<WryResponseMap>,
+    responses: ResMut<Assets<WryResponseBody>>,
+    requests: Query<(Entity, &WryRequestArgs, &WryResponseHandle)>,
 ) {
-    for (webview_entity, args, handle) in handles.iter_mut() {
+    for (request_entity, args, handle) in requests.iter() {
         let Some(response_body) = responses.get(handle.0.id()) else {
             continue;
         };
         let Some(responder) = map.0.remove(args) else {
             continue;
         };
         responder.respond(convert_to_response(response_body.0.clone(), args));
-        commands
-            .entity(webview_entity)
-            .try_remove::<WryRequestArgs>();
+        commands.entity(request_entity).despawn();
     }
 }
 
 #[cfg(feature = "hot-reload")]
 fn hot_reload(
     mut er: EventReader<AssetEvent<WryResponseBody>>,
     wry_webviews: NonSend<crate::prelude::WryWebViews>,
-    webviews: Query<(Entity, &WryResponseHandle), With<Webview>>,
+    webviews: Query<(Entity, &WryResponseHandles), With<Webview>>,
     asset_server: Res<AssetServer>,
 ) {
-    for event in er.read() {
-        if let AssetEvent::Modified { id } = event
-            && let Some(webview_entity) = webviews
-                .iter()
-                .find_map(|(entity, handle)| (id == &handle.0.id()).then_some(entity))
-            && let Some(webview) = wry_webviews.get(&webview_entity)
-        {
-            if let Some(path) = asset_server.get_path(*id) {
+    let modified_ids = er
+        .read()
+        .filter_map(|event| {
+            if let AssetEvent::Modified { id } = event {
+                Some(id)
+            } else {
+                None
+            }
+        })
+        .collect::<Vec<_>>();
+    for (webview_entity, id) in webviews.iter().filter_map(|(entity, handles)| {
+        handles
+            .keys()
+            .find_map(|id| modified_ids.contains(&id).then_some((entity, id)))
+    }) {
+        if let Some(webview) = wry_webviews.get(&webview_entity) {
+            if let Some(path) = asset_server.get_path(id.untyped()) {
                 info!("Reloading webview {webview_entity}: {path:?}");
             }
             if let Err(e) = webview.reload() {
                 warn!("Failed to reload webview {webview_entity}: {e}");
+            } else {
+                info!("Reloaded webview {webview_entity}");
             }
         }
     }

crates/bevy_webview_wry/src/webview/protocol/asset.rs

@@ -9,7 +9,7 @@ use std::sync::LazyLock;
 use wry::http::Response;
 use wry::http::header::{CONTENT_SECURITY_POLICY, CONTENT_TYPE};
 
-#[derive(Debug, Component)]
+#[derive(Debug, Component, Clone)]
 pub struct WryResponseHandle(pub Handle<WryResponseBody>);
 
 #[derive(Debug, Asset, TypePath)]
@@ -156,6 +156,17 @@ const EXTENSION_MAP: &[(&[&str], &str)] = &[
     (&["wav"], "audio/wav"),
     (&["weba"], "audio/webm"),
     (&["webm"], "video/web"),
+    (&["woff"], "font/woff"),
+    (&["woff2"], "font/woff2"),
+    (&["xhtml"], "application/xhtml+xml"),
+    (&["xls"], "application/vnd.ms-excel"),
+    (
+        &["xlsx"],
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+    ),
+    (&["xml"], "application/xml"),
+    (&["xul"], "application/vnd.mozilla.xul+xml"),
+    (&["7z"], "application/x-7z-compressed"),
 ];
 
 static EXTENSIONS: LazyLock<Vec<&str>> = LazyLock::new(|| {