Upgrade dependencies and fix issues from deprecated and new functions

448-engineering · Apr 1, 2024 · 8defd5f · 8defd5f
1 parent a6d8c42
commit 8defd5f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/Lib/Cargo.toml b/Lib/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "puppeteer"
 authors = ["448 Engineering Developers <superuser@448.africa>"]
-version = "2.7.3"
+version = "2.7.4"
 edition = "2021"
 description = "A Minimal Dependency Easy to Use GUI Builder in Rust using Async Channels"
 categories = ["graphics", "gui"]
@@ -20,7 +20,7 @@ base64ct = { version = "1.6.0", features = ["std"] }
 blake3 = "1.5.0"
 bytes = { version = "1.5.0", default-features = false }
 camino = "1.1.6"
-file-format = { version = "0.23.0", features = [
+file-format = { version = "0.24.0", features = [
     "reader",
     "reader-asf",
     "reader-cfb",
@@ -35,10 +35,10 @@ file-format = { version = "0.23.0", features = [
 ] }
 once_cell = "1.18.0"
 smol = "2.0.0"
-tao = "0.24.0"
+tao = "0.27.0"
 thiserror = "1.0.50"
 tracing = "0.1.40"
-wry = "0.35.1"
+wry = "0.39.0"
 
 [dev-dependencies]
 html-to-string-macro = "0.2.5"

diff --git a/Lib/examples/load_resource.rs b/Lib/examples/load_resource.rs
@@ -22,7 +22,7 @@ fn main() {
             .unwrap();
 
         assert_eq!(FileFormat::PlainText, resource.format());
-        assert_eq!(file_format::Kind::Text, resource.format().kind());
+        assert_eq!(file_format::Kind::Other, resource.format().kind());
         assert_eq!("text/plain", resource.format().media_type());
         assert_eq!(Some("TXT"), resource.format().short_name());
         assert_eq!("frow.min.css", resource.name());

diff --git a/Lib/src/app.rs b/Lib/src/app.rs
@@ -13,7 +13,7 @@ use tao::{
     window::{Window, WindowBuilder},
 };
 use tracing::Level;
-use wry::{WebView, WebViewBuilder};
+use wry::{http::Request, WebView, WebViewBuilder};
 
 /// Environment variables set when the app is initialized
 #[derive(Debug, Clone)]
@@ -284,8 +284,15 @@ where
             WebViewBuilder::new_gtk(vbox)
         };
 
+        let current_html = shell.to_html();
+
+        #[cfg(target_os = "windows")]
+        if current_html.as_ref().len() * 2 > 2 * 1024 * 1024 {
+            return Err(PuppeteerError::StringTooLarge);
+        }
+
         let webview = webview_builder
-            .with_html(shell.to_html())?
+            .with_html(current_html)
             .with_devtools(devtools_enabled)
             .with_ipc_handler(handler)
             .build()?;
@@ -296,8 +303,8 @@ where
     fn handler(
         proxy: EventLoopProxy<UiEvent<T>>,
         app_env: ActiveAppEnv,
-    ) -> Box<dyn Fn(String) + 'static> {
-        let outcome = move |req: String| match req.as_str() {
+    ) -> Box<dyn Fn(Request<String>) + 'static> {
+        let outcome = move |req: Request<String>| match req.body().as_str() {
             "minimize" => PuppeteerApp::<T>::proxy_error_handler(
                 proxy.send_event(UiEvent::Minimize),
                 app_env.app_name,
@@ -316,7 +323,7 @@ where
                 app_env.app_name,
             ),
             _ => {
-                let req_parse = T::parse(&req);
+                let req_parse = T::parse(&req.body());
 
                 PuppeteerApp::<T>::proxy_error_handler(
                     proxy.send_event(UiEvent::Custom(req_parse)),

diff --git a/Lib/src/assets.rs b/Lib/src/assets.rs
@@ -218,7 +218,7 @@ mod asset_checks {
                     .unwrap();
 
                 assert_eq!(&FileFormat::PlainText, &resource.format());
-                assert_eq!(&file_format::Kind::Text, &resource.format().kind());
+                assert_eq!(&file_format::Kind::Other, &resource.format().kind());
                 assert_eq!(&"text/plain", &resource.format().media_type());
                 assert_eq!(&Some("TXT",), &resource.format().short_name());
                 assert_eq!("frow.min.css", &resource.name());

diff --git a/Lib/src/errors.rs b/Lib/src/errors.rs
@@ -55,6 +55,9 @@ pub enum PuppeteerError {
     /// Encountered a GTK error on Linux
     #[error("Encountered a GTK error on Linux")]
     GtkError,
+    /// String must be less than 2MiB on Windows OS
+    #[error("String must be less than 2MiB on Windows OS")]
+    StringTooLarge,
 }
 
 impl From<std::io::Error> for PuppeteerError {