tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-10-05 20:48:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): fix InvokeBody::Raw deserialization (#10138)

Browse Source 
closes #9948
This commit is contained in:
Amr Bashir 2024-06-27 12:55:49 +03:00 committed by GitHub
parent 27838365a6
commit e93ca1df3b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/invoke-body-raw-deserialization.md Normal file
View File

@ -0,0 +1,5 @@
---
"tauri": "patch:bug"
---
Fix `InvokeBody::deserialize` method deserialization for `InvokeBody::Raw` variant

32
core/tauri/src/ipc/mod.rs
View File

@ -10,7 +10,10 @@ use std::sync::{Arc, Mutex};
use futures_util::Future;
use http::HeaderMap;
use serde::{de::DeserializeOwned, Deserialize, Serialize};
use serde::{
de::{DeserializeOwned, IntoDeserializer},
Deserialize, Serialize,
};
use serde_json::Value as JsonValue;
pub use serialize_to_javascript::Options as SerializeOptions;
use tauri_macros::default_runtime;
@ -89,7 +92,7 @@ impl InvokeBody {
pub fn deserialize<T: DeserializeOwned>(self) -> serde_json::Result<T> {
match self {
InvokeBody::Json(v) => serde_json::from_value(v),
InvokeBody::Raw(v) => serde_json::from_slice(&v),
InvokeBody::Raw(v) => T::deserialize(v.into_deserializer()),
}
}
}
@ -518,3 +521,28 @@ impl<R: Runtime> InvokeMessage<R> {
/// The `Callback` type is the return value of the `transformCallback` JavaScript function.
#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, Serialize, Deserialize)]
pub struct CallbackFn(pub u32);
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn deserialize_invoke_body() {
let json = InvokeBody::Json(serde_json::Value::Array(vec![
serde_json::Value::Number(1.into()),
serde_json::Value::Number(123.into()),
serde_json::Value::Number(1231.into()),
]));
assert_eq!(json.deserialize::<Vec<u16>>().unwrap(), vec![1, 123, 1231]);
let json = InvokeBody::Json(serde_json::Value::String("string value".into()));
assert_eq!(json.deserialize::<String>().unwrap(), "string value");
let json = InvokeBody::Json(serde_json::Value::String("string value".into()));
assert!(json.deserialize::<Vec<u16>>().is_err());
let values = vec![1, 2, 3, 4, 5, 6, 1];
let raw = InvokeBody::Raw(values.clone());
assert_eq!(raw.deserialize::<Vec<u8>>().unwrap(), values);
}
}