Add mimetype to return type of custom protocol (#296)

* Add mimetype to return type of custom protocol

* Fix macOS

.changes/mime.md

@@ -0,0 +1,5 @@
+---
+"wry": minor
+---
+
+Update signature of custom protocol closure. It should return a mime type string now.

Cargo.toml

@@ -42,7 +42,6 @@ serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 thiserror = "1.0"
 url = "2.2"
-infer = "0.4"
 tao = { version = "0.2.6", default-features = false, features = [ "serde" ] }
 
 [dev-dependencies]

examples/custom_protocol.rs

@@ -64,12 +64,12 @@ fn main() -> wry::Result<()> {
 
       match requested_asset_path.as_str() {
         // if our path match /hello.html
-        "/hello.html" => Ok(hello_html.as_bytes().into()),
+        "/hello.html" => Ok((hello_html.as_bytes().into(), "text/html".into())),
         // if our path match /hello.js
-        "/hello.js" => Ok(hello_js.as_bytes().into()),
+        "/hello.js" => Ok((hello_js.as_bytes().into(), "text/javascript".into())),
         // other paths should resolve index
         // more logic can be applied here
-        _ => Ok(index_html.as_bytes().into()),
+        _ => Ok((index_html.as_bytes().into(), "text/html".into())),
       }
     })
     // tell the webview to load the custom protocol

src/webview/mod.rs

@@ -4,7 +4,6 @@
 
 //! [`WebView`] struct and associated types.
 
-mod mimetype;
 mod web_context;
 
 pub use web_context::WebContext;
@@ -47,8 +46,15 @@ pub struct WebViewAttributes {
   /// initialization code will be executed. It is guaranteed that code is executed before
   /// `window.onload`.
   pub initialization_scripts: Vec<String>,
-  /// Register custom file loading protocol
-  pub custom_protocols: Vec<(String, Box<dyn Fn(&Window, &str) -> Result<Vec<u8>>>)>,
+  /// Register custom file loading protocols with pairs of scheme uri string and a handling
+  /// closure.
+  ///
+  /// The closure takes the `Window` and a url string slice as parameters, and returns a tuple of a
+  /// vector of bytes which is the content and a mimetype string of the conten.
+  pub custom_protocols: Vec<(
+    String,
+    Box<dyn Fn(&Window, &str) -> Result<(Vec<u8>, String)>>,
+  )>,
   /// Set the RPC handler to Communicate between the host Rust code and Javascript on webview.
   ///
   /// The communication is done via [JSON-RPC](https://www.jsonrpc.org). Users can use this to register an incoming
@@ -129,11 +135,15 @@ impl WebViewBuilder {
     self
   }
 
-  /// Register custom file loading protocol
+  /// Register custom file loading protocols with pairs of scheme uri string and a handling
+  /// closure.
+  ///
+  /// The closure takes the `Window` and a url string slice as parameters, and returns a tuple of a
+  /// vector of bytes which is the content and a mimetype string of the conten.
   #[cfg(feature = "protocol")]
   pub fn with_custom_protocol<F>(mut self, name: String, handler: F) -> Self
   where
-    F: Fn(&Window, &str) -> Result<Vec<u8>> + 'static,
+    F: Fn(&Window, &str) -> Result<(Vec<u8>, String)> + 'static,
   {
     self
       .webview

src/webview/webkitgtk/mod.rs

@@ -21,7 +21,6 @@ use webkit2gtk_sys::{
 use crate::{
   application::{platform::unix::*, window::Window},
   webview::{
-    mimetype::MimeType,
     web_context::{unix::WebContextExt, WebContext},
     WebViewAttributes,
   },
@@ -175,8 +174,7 @@ impl InnerWebView {
           let uri = uri.as_str();
 
           match handler(&w, uri) {
-            Ok(buffer) => {
-              let mime = MimeType::parse(&buffer, uri);
+            Ok((buffer, mime)) => {
               let input = gio::MemoryInputStream::from_bytes(&Bytes::from(&buffer));
               request.finish(&input, buffer.len() as i64, Some(&mime))
             }

src/webview/webview2/win32/mod.rs

@@ -5,7 +5,7 @@
 mod file_drop;
 
 use crate::{
-  webview::{mimetype::MimeType, WebContext, WebViewAttributes},
+  webview::{WebContext, WebViewAttributes},
   Result,
 };
 
@@ -148,8 +148,7 @@ impl InnerWebView {
             );
 
             match function(&window_, path) {
-              Ok(content) => {
-                let mime = MimeType::parse(&content, &uri);
+              Ok((content, mime)) => {
                 let stream = webview2::Stream::from_bytes(&content);
                 let response = env_clone.create_web_resource_response(
                   stream,

src/webview/webview2/winrt/mod.rs

@@ -17,7 +17,7 @@ use windows_webview2::{
 };
 
 use crate::{
-  webview::{mimetype::MimeType, FileDropEvent, RpcRequest, RpcResponse},
+  webview::{FileDropEvent, RpcRequest, RpcResponse},
   Result,
 };
 
@@ -166,8 +166,7 @@ impl InnerWebView {
               &format!("{}://", name),
             );
 
-            if let Ok(content) = function(&window_, &path) {
-              let mime = MimeType::parse(&content, &uri);
+            if let Ok((content, mime)) = function(&window_, &path) {
               let stream = InMemoryRandomAccessStream::new()?;
               let writer = DataWriter::CreateDataWriter(stream.clone())?;
               writer.WriteBytes(&content)?;

src/webview/wkwebview/mod.rs

@@ -34,9 +34,7 @@ use crate::application::platform::ios::WindowExtIOS;
 
 use crate::{
   application::window::Window,
-  webview::{
-    mimetype::MimeType, FileDropEvent, RpcRequest, RpcResponse, WebContext, WebViewAttributes,
-  },
+  webview::{FileDropEvent, RpcRequest, RpcResponse, WebContext, WebViewAttributes},
   Result,
 };
 
@@ -54,7 +52,10 @@ pub struct InnerWebView {
   ),
   #[cfg(target_os = "macos")]
   file_drop_ptr: *mut (Box<dyn Fn(&Window, FileDropEvent) -> bool>, Rc<Window>),
-  protocol_ptrs: Vec<*mut (Box<dyn Fn(&Window, &str) -> Result<Vec<u8>>>, Rc<Window>)>,
+  protocol_ptrs: Vec<*mut (
+    Box<dyn Fn(&Window, &str) -> Result<(Vec<u8>, String)>>,
+    Rc<Window>,
+  )>,
 }
 
 impl InnerWebView {
@@ -99,7 +100,7 @@ impl InnerWebView {
         let function = this.get_ivar::<*mut c_void>("function");
         let function = &mut *(*function
           as *mut (
-            Box<dyn for<'r, 's> Fn(&'r Window, &'s str) -> Result<Vec<u8>>>,
+            Box<dyn for<'r, 's> Fn(&'r Window, &'s str) -> Result<(Vec<u8>, String)>>,
             Rc<Window>,
           ));
 
@@ -113,8 +114,7 @@ impl InnerWebView {
         let uri = nsstring.to_str();
 
         // Send response
-        if let Ok(content) = function.0(&function.1, uri) {
-          let mime = MimeType::parse(&content, uri);
+        if let Ok((content, mime)) = function.0(&function.1, uri) {
           let dictionary: id = msg_send![class!(NSMutableDictionary), alloc];
           let headers: id = msg_send![dictionary, initWithCapacity:1];
           let () = msg_send![headers, setObject:NSString::new(&mime) forKey: NSString::new("content-type")];