Handle unicode in webview events.

DioxusLabs · Dec 18, 2024 · 8ac3fc5 · 8ac3fc5
1 parent c2952a7
commit 8ac3fc5
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/desktop/Cargo.toml b/packages/desktop/Cargo.toml
@@ -55,6 +55,7 @@ async-trait = "0.1.68"
 tao = { workspace = true, features = ["rwh_05"] }
 once_cell = { workspace = true }
 dioxus-history.workspace = true
+base64.workspace = true
 
 
 [target.'cfg(unix)'.dependencies]

diff --git a/packages/desktop/src/webview.rs b/packages/desktop/src/webview.rs
@@ -12,6 +12,7 @@ use crate::{
     waker::tao_waker,
     Config, DesktopContext, DesktopService,
 };
+use base64::prelude::BASE64_STANDARD;
 use dioxus_core::{Runtime, ScopeId, VirtualDom};
 use dioxus_document::Document;
 use dioxus_history::{History, MemoryHistory};
@@ -59,10 +60,15 @@ impl WebviewEdits {
         let data_from_header = request
             .headers()
             .get("dioxus-data")
-            .map(|f| f.as_bytes())
-            .expect("dioxus-data header is not a string");
+            .map(|f| {
+                std::str::from_utf8(f.as_bytes())
+                    .expect("dioxus-data header is not a valid (utf-8) string")
+            })
+            .expect("dioxus-data header not set");
+        let data_from_header = base64::Engine::decode(&BASE64_STANDARD, data_from_header)
+            .expect("dioxus-data header is not a base64 string");
 
-        let response = match serde_json::from_slice(data_from_header) {
+        let response = match serde_json::from_slice(&data_from_header) {
             Ok(event) => {
                 // we need to wait for the mutex lock to let us munge the main thread..
                 let _lock = crate::android_sync_lock::android_runtime_lock();

diff --git a/packages/interpreter/src/js/common.js b/packages/interpreter/src/js/common.js
diff --git a/packages/interpreter/src/js/core.js b/packages/interpreter/src/js/core.js
diff --git a/packages/interpreter/src/js/hash.txt b/packages/interpreter/src/js/hash.txt
@@ -1 +1 @@
-[6449103750905854967, 3846442265490457921, 13069001215487072322, 8716623267269178440, 5336385715226370016, 14456089431355876478, 12156139214887111728, 5052021921702764563, 12925655762638175824, 5638004933879392817]
+[22183138833260907, 6449103750905854967, 3940453019586793214, 3846442265490457921, 13478645935057287689, 13069001215487072322, 9804649440181677258, 8716623267269178440, 7790983660500237797, 5336385715226370016, 12929160883278153301, 14456089431355876478, 3587738331530929625, 17849315463685614672, 7823221600277385649, 5052021921702764563, 5026625984394339997, 12925655762638175824, 5957263916133708360, 5638004933879392817]
diff --git a/packages/interpreter/src/js/hydrate.js b/packages/interpreter/src/js/hydrate.js
diff --git a/packages/interpreter/src/js/initialize_streaming.js b/packages/interpreter/src/js/initialize_streaming.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[6449103750905854967, 3846442265490457921, 13069001215487072322, 8716623267269178440, 5336385715226370016, 14456089431355876478, 12156139214887111728, 5052021921702764563, 12925655762638175824, 5638004933879392817]
		[22183138833260907, 6449103750905854967, 3940453019586793214, 3846442265490457921, 13478645935057287689, 13069001215487072322, 9804649440181677258, 8716623267269178440, 7790983660500237797, 5336385715226370016, 12929160883278153301, 14456089431355876478, 3587738331530929625, 17849315463685614672, 7823221600277385649, 5052021921702764563, 5026625984394339997, 12925655762638175824, 5957263916133708360, 5638004933879392817]