refactor(core): remove async from app hooks, add InvokeMessage type (#1392)

Author: lucasfernog

.changes/plugin-mutable.md

@@ -2,4 +2,4 @@
 "tauri": minor
 ---
 
-The plugin instance is now mutable and must be `Send + Sync`.
+The plugin instance is now mutable and must be `Send`.

examples/api/src-tauri/src/main.rs

@@ -14,7 +14,7 @@ struct Reply {
 
 fn main() {
   tauri::AppBuilder::default()
-    .setup(|webview_manager| async move {
+    .setup(move |webview_manager| {
       let dispatcher = webview_manager.current_webview().unwrap();
       let dispatcher_ = dispatcher.clone();
       dispatcher.listen("js-event", move |event| {

examples/multiwindow/src-tauri/src/main.rs

@@ -7,7 +7,7 @@ use tauri::WebviewBuilderExt;
 
 fn main() {
   tauri::AppBuilder::default()
-    .setup(|webview_manager| async move {
+    .setup(move |webview_manager| {
       if webview_manager.current_window_label() == "Main" {
         webview_manager.listen("clicked", move |_| {
           println!("got 'clicked' event on global channel");

tauri-api/src/cli.rs

@@ -1,4 +1,4 @@
-use crate::config::{CliArg, CliConfig, Config};
+use crate::config::{CliArg, CliConfig};
 
 use clap::{App, Arg, ArgMatches, ErrorKind};
 use serde::Serialize;
@@ -53,13 +53,7 @@ impl Matches {
 }
 
 /// Gets the arg matches of the CLI definition.
-pub fn get_matches(config: &Config) -> crate::Result<Matches> {
-  let cli = config
-    .tauri
-    .cli
-    .as_ref()
-    .ok_or(crate::Error::CliNotConfigured)?;
-
+pub fn get_matches(cli: &CliConfig) -> crate::Result<Matches> {
   let about = cli
     .description()
     .unwrap_or(&crate_description!().to_string())

tauri-api/src/error.rs

@@ -16,9 +16,6 @@ pub enum Error {
   /// The dialog operation was cancelled by the user.
   #[error("user cancelled the dialog")]
   DialogCancelled,
-  /// CLI config not set.
-  #[error("CLI configuration not set on tauri.conf.json")]
-  CliNotConfigured,
   /// The network error.
   #[error("Network Error: {0}")]
   Network(#[from] reqwest::Error),

tauri-macros/src/command.rs

@@ -62,13 +62,10 @@ pub fn generate_command(attrs: Vec<NestedMeta>, function: ItemFn) -> TokenStream
   // If function doesn't take the webview manager, wrapper just takes webview manager generically and ignores it
   // Otherwise the wrapper uses the specific type from the original function declaration
   let mut manager_arg_type = quote!(::tauri::WebviewManager<A>);
-  let mut application_ext_generic = quote!(<A: ::tauri::ApplicationExt>);
   let manager_arg_maybe = match types.first() {
     Some(first_type) if uses_manager => {
       // Give wrapper specific type
       manager_arg_type = quote!(#first_type);
-      // Generic is no longer needed
-      application_ext_generic = quote!();
       // Remove webview manager arg from list so it isn't expected as arg from JS
       types.drain(0..1);
       names.drain(0..1);
@@ -91,24 +88,28 @@ pub fn generate_command(attrs: Vec<NestedMeta>, function: ItemFn) -> TokenStream
   let return_value = if returns_result {
     quote! {
       match #fn_name(#manager_arg_maybe #(parsed_args.#names),*)#await_maybe {
-        Ok(value) => ::core::result::Result::Ok(value.into()),
-        Err(e) => ::core::result::Result::Err(tauri::Error::Command(::serde_json::to_value(e)?)),
+        Ok(value) => ::core::result::Result::Ok(value),
+        Err(e) => ::core::result::Result::Err(e),
       }
     }
   } else {
-    quote! { ::core::result::Result::Ok(#fn_name(#manager_arg_maybe #(parsed_args.#names),*)#await_maybe.into()) }
+    quote! { ::core::result::Result::<_, ()>::Ok(#fn_name(#manager_arg_maybe #(parsed_args.#names),*)#await_maybe) }
   };
 
   quote! {
     #function
-    pub async fn #fn_wrapper #application_ext_generic(_manager: #manager_arg_type, arg: ::serde_json::Value) -> ::tauri::Result<::tauri::InvokeResponse> {
+    pub fn #fn_wrapper<A: ::tauri::ApplicationExt + 'static>(_manager: #manager_arg_type, message: ::tauri::InvokeMessage<A>) {
       #[derive(::serde::Deserialize)]
       #[serde(rename_all = "camelCase")]
       struct ParsedArgs {
         #(#names: #types),*
       }
-      let parsed_args: ParsedArgs = ::serde_json::from_value(arg).map_err(|e| ::tauri::Error::InvalidArgs(#fn_name_str, e))?;
-      #return_value
+      match ::serde_json::from_value::<ParsedArgs>(message.payload()) {
+        Ok(parsed_args) => message.respond_async(async move {
+          #return_value
+        }),
+        Err(e) => message.reject(::core::result::Result::<(), String>::Err(::tauri::Error::InvalidArgs(#fn_name_str, e).to_string())),
+      }
     }
   }
 }
@@ -133,10 +134,10 @@ pub fn generate_handler(item: proc_macro::TokenStream) -> TokenStream {
   });
 
   quote! {
-    |webview_manager, command, arg| async move {
-      match command.as_str() {
-        #(stringify!(#fn_names) => #fn_wrappers(webview_manager, arg).await,)*
-        _ => Err(tauri::Error::UnknownApi(None)),
+    move |webview_manager, message| {
+      match message.command() {
+        #(stringify!(#fn_names) => #fn_wrappers(webview_manager, message),)*
+        _ => {},
       }
     }
   }

tauri-utils/src/config.rs

@@ -156,7 +156,7 @@ impl Default for WindowConfig {
 }
 
 /// A CLI argument definition
-#[derive(PartialEq, Deserialize, Debug, Default)]
+#[derive(PartialEq, Deserialize, Debug, Default, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct CliArg {
   /// The short version of the argument, without the preceding -.
@@ -243,7 +243,7 @@ pub struct CliArg {
 }
 
 /// The CLI root command definition.
-#[derive(PartialEq, Deserialize, Debug)]
+#[derive(PartialEq, Deserialize, Debug, Clone)]
 #[serde(tag = "cli", rename_all = "camelCase")]
 #[allow(missing_docs)] // TODO
 pub struct CliConfig {