fix double serialize on invoke (#5639)

LucasJavaudin · LucasJavaudin · lucasfernog · web-flow · commit 677838ccfadf · 2022-11-20T10:20:09.000-03:00
Co-authored-by: LucasJavaudin &lt;lucas.javaudin@cyu.fr&gt;
Co-authored-by: Lucas Nogueira &lt;lucas@tauri.studio&gt;
diff --git a/.changes/fix-invoke-double-serialize.md b/.changes/fix-invoke-double-serialize.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Fixes a double serialization on the IPC.
diff --git a/core/tauri/src/hooks.rs b/core/tauri/src/hooks.rs
@@ -193,7 +193,11 @@ impl<R: Runtime> InvokeResolver<R> {
     F: Future<Output = Result<JsonValue, InvokeError>> + Send + 'static,
   {
     crate::async_runtime::spawn(async move {
-      Self::return_result(self.window, task.await.into(), self.callback, self.error)
+      let response = match task.await {
+        Ok(ok) => InvokeResponse::Ok(ok),
+        Err(err) => InvokeResponse::Err(err),
+      };
+      Self::return_result(self.window, response, self.callback, self.error)
     });
   }
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"tauri": patch
 +---
++
 +Fixes a double serialization on the IPC.
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,11 @@ impl<R: Runtime> InvokeResolver<R> {`
`193`	`193`	`F: Future<Output = Result<JsonValue, InvokeError>> + Send + 'static,`
`194`	`194`	`{`
`195`	`195`	`crate::async_runtime::spawn(async move {`
`196`		`- Self::return_result(self.window, task.await.into(), self.callback, self.error)`
	`196`	`+ let response = match task.await {`
	`197`	`+ Ok(ok) => InvokeResponse::Ok(ok),`
	`198`	`+ Err(err) => InvokeResponse::Err(err),`
	`199`	`+ };`
	`200`	`+ Self::return_result(self.window, response, self.callback, self.error)`
`197`	`201`	`});`
`198`	`202`	`}`
`199`	`203`