refactor(core): use webview's URI schemes for IPC

.github/workflows/lint-core.yml

@@ -50,7 +50,7 @@ jobs:
         clippy:
           - { args: '', key: 'empty' }
           - {
-              args: '--features compression,wry,linux-protocol-headers,isolation,custom-protocol,system-tray,test',
+              args: '--features compression,wry,isolation,custom-protocol,system-tray,test',
               key: 'all'
             }
           - { args: '--features custom-protocol', key: 'custom-protocol' }

.github/workflows/test-core.yml

@@ -72,7 +72,7 @@ jobs:
               key: no-default
             }
           - {
-              args: --features compression,wry,linux-protocol-headers,isolation,custom-protocol,system-tray,test,
+              args: --features compression,wry,isolation,custom-protocol,system-tray,test,
               key: all
             }
 

core/tauri-macros/src/command/wrapper.rs

@@ -211,7 +211,7 @@ pub fn wrapper(attributes: TokenStream, item: TokenStream) -> TokenStream {
           use #root::command::private::*;
           // prevent warnings when the body is a `compile_error!` or if the command has no arguments
           #[allow(unused_variables)]
-          let #root::Invoke { message: #message, resolver: #resolver } = $invoke;
+          let #root::ipc::Invoke { message: #message, resolver: #resolver } = $invoke;
 
           #body
       }};

core/tauri-runtime-wry/Cargo.toml

@@ -15,23 +15,23 @@ edition = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
-wry = { version = "0.28.3", default-features = false, features = [ "file-drop", "protocol" ] }
+wry = { version = "0.29", default-features = false, features = [ "file-drop", "protocol" ] }
 tauri-runtime = { version = "0.13.0-alpha.5", path = "../tauri-runtime" }
 tauri-utils = { version = "2.0.0-alpha.5", path = "../tauri-utils" }
 uuid = { version = "1", features = [ "v4" ] }
 rand = "0.8"
 raw-window-handle = "0.5"
 
 [target."cfg(windows)".dependencies]
-webview2-com = "0.22"
+webview2-com = "0.25"
 
   [target."cfg(windows)".dependencies.windows]
-  version = "0.44"
+  version = "0.48"
   features = [ "Win32_Foundation" ]
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 gtk = { version = "0.16", features = [ "v3_24" ] }
-webkit2gtk = { version = "0.19.1", features = [ "v2_38" ] }
+webkit2gtk = { version = "1.1", features = [ "v2_38" ] }
 percent-encoding = "2.1"
 
 [target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies]
@@ -50,4 +50,4 @@ macos-private-api = [
   "tauri-runtime/macos-private-api"
 ]
 objc-exception = [ "wry/objc-exception" ]
-linux-headers = [ "wry/linux-headers", "webkit2gtk/v2_36" ]
+linux-protocol-body = [ "wry/linux-body", "webkit2gtk/v2_40" ]

core/tauri-runtime-wry/src/lib.rs

@@ -3001,17 +3001,14 @@ fn create_webview<T: UserEvent>(
     webview_attributes,
     uri_scheme_protocols,
     mut window_builder,
-    ipc_handler,
     label,
+    ipc_handler,
     url,
     menu_ids,
     #[cfg(target_os = "android")]
     on_webview_created,
     ..
   } = pending;
-  let webview_id_map = context.webview_id_map.clone();
-  #[cfg(windows)]
-  let proxy = context.proxy.clone();
 
   let window_event_listeners = WindowEventListeners::default();
 
@@ -3024,6 +3021,8 @@ fn create_webview<T: UserEvent>(
 
   #[cfg(windows)]
   let window_theme = window_builder.inner.window.preferred_theme;
+  #[cfg(windows)]
+  let proxy = context.proxy.clone();
 
   #[cfg(target_os = "macos")]
   {
@@ -3046,7 +3045,7 @@ fn create_webview<T: UserEvent>(
   };
   let window = window_builder.inner.build(event_loop).unwrap();
 
-  webview_id_map.insert(window.id(), window_id);
+  context.webview_id_map.insert(window.id(), window_id);
 
   if window_builder.center {
     let _ = center_window(&window, window.inner_size());
@@ -3071,17 +3070,18 @@ fn create_webview<T: UserEvent>(
   }
 
   #[cfg(windows)]
-  if let Some(additional_browser_args) = webview_attributes.additional_browser_args {
-    webview_builder = webview_builder.with_additional_browser_args(&additional_browser_args);
-  }
+  {
+    if let Some(additional_browser_args) = webview_attributes.additional_browser_args {
+      webview_builder = webview_builder.with_additional_browser_args(&additional_browser_args);
+    }
 
-  #[cfg(windows)]
-  if let Some(theme) = window_theme {
-    webview_builder = webview_builder.with_theme(match theme {
-      WryTheme::Dark => wry::webview::Theme::Dark,
-      WryTheme::Light => wry::webview::Theme::Light,
-      _ => wry::webview::Theme::Light,
-    });
+    if let Some(theme) = window_theme {
+      webview_builder = webview_builder.with_theme(match theme {
+        WryTheme::Dark => wry::webview::Theme::Dark,
+        WryTheme::Light => wry::webview::Theme::Light,
+        _ => wry::webview::Theme::Light,
+      });
+    }
   }
 
   if let Some(handler) = ipc_handler {
@@ -3092,6 +3092,7 @@ fn create_webview<T: UserEvent>(
       handler,
     ));
   }
+
   for (scheme, protocol) in uri_scheme_protocols {
     webview_builder = webview_builder.with_custom_protocol(scheme, move |wry_request| {
       protocol(&HttpRequestWrapper::from(wry_request).0)
@@ -3168,7 +3169,7 @@ fn create_webview<T: UserEvent>(
     unsafe {
       controller.add_GotFocus(
         &FocusChangedEventHandler::create(Box::new(move |_, _| {
-          let _ = proxy_.send_event(Message::Webview(
+          let _ = proxy.send_event(Message::Webview(
             window_id,
             WebviewMessage::WebviewEvent(WebviewEvent::Focused(true)),
           ));
@@ -3181,7 +3182,7 @@ fn create_webview<T: UserEvent>(
     unsafe {
       controller.add_LostFocus(
         &FocusChangedEventHandler::create(Box::new(move |_, _| {
-          let _ = proxy.send_event(Message::Webview(
+          let _ = proxy_.send_event(Message::Webview(
             window_id,
             WebviewMessage::WebviewEvent(WebviewEvent::Focused(false)),
           ));

core/tauri-runtime/Cargo.toml

@@ -37,7 +37,7 @@ rand = "0.8"
 url = { version = "2" }
 
 [target."cfg(windows)".dependencies.windows]
-version = "0.44"
+version = "0.48"
 features = [ "Win32_Foundation" ]
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]

core/tauri-utils/Cargo.toml

@@ -45,7 +45,7 @@ dunce = "1"
 heck = "0.4"
 
 [target."cfg(windows)".dependencies.windows]
-version = "0.44.0"
+version = "0.48.0"
 features = [
   "implement",
   "Win32_Foundation",

core/tauri-utils/src/pattern/isolation.js

@@ -38,34 +38,52 @@
    * @return {Promise<{nonce: number[], payload: number[]}>}
    */
   async function encrypt(data) {
-    let algorithm = Object.create(null)
+    const algorithm = Object.create(null)
     algorithm.name = 'AES-GCM'
     algorithm.iv = window.crypto.getRandomValues(new Uint8Array(12))
 
-    let encoder = new TextEncoder()
-    let payloadRaw = encoder.encode(__RAW_stringify_ipc_message_fn__(data))
+    const encoder = new TextEncoder()
+    const encoded = encoder.encode(__RAW_process_ipc_message_fn__(data).data)
 
     return window.crypto.subtle
-      .encrypt(algorithm, aesGcmKey, payloadRaw)
+      .encrypt(algorithm, aesGcmKey, encoded)
       .then((payload) => {
-        let result = Object.create(null)
+        const result = Object.create(null)
         result.nonce = Array.from(new Uint8Array(algorithm.iv))
         result.payload = Array.from(new Uint8Array(payload))
         return result
       })
   }
 
+  /**
+   * Detects if a message event is a valid isolation message.
+   *
+   * @param {MessageEvent<object>} event - a message event that is expected to be an isolation message
+   * @return {boolean} - if the event was a valid isolation message
+   */
+  function isIsolationMessage(data) {
+    if (typeof data === 'object' && typeof data.payload === 'object') {
+      const keys = Object.keys(data.payload)
+      return (
+        keys.length > 0 &&
+        keys.every((key) => key === 'nonce' || key === 'payload')
+      )
+    }
+    return false
+  }
+
   /**
    * Detect if a message event is a valid isolation payload.
    *
    * @param {MessageEvent<object>} event - a message event that is expected to be an isolation payload
    * @return boolean
    */
-  function isIsolationPayload(event) {
+  function isIsolationPayload(data) {
     return (
-      typeof event.data === 'object' &&
-      'callback' in event.data &&
-      'error' in event.data
+      typeof data === 'object' &&
+      'callback' in data &&
+      'error' in data &&
+      !isIsolationMessage(data)
     )
   }
 
@@ -74,7 +92,7 @@
    * @param {MessageEvent<any>} event
    */
   async function payloadHandler(event) {
-    if (!isIsolationPayload(event)) {
+    if (!isIsolationPayload(event.data)) {
       return
     }
 
@@ -85,8 +103,8 @@
       data = await window.__TAURI_ISOLATION_HOOK__(data)
     }
 
-    const encrypted = await encrypt(data)
-    sendMessage(encrypted)
+    const { cmd, callback, error, payload } = data
+    sendMessage({ cmd, callback, error, payload: await encrypt(payload) })
   }
 
   window.addEventListener('message', payloadHandler, false)

core/tauri-utils/src/pattern/isolation.rs

@@ -96,16 +96,14 @@ impl Keys {
   }
 
   /// Decrypts a message using the generated keys.
-  pub fn decrypt(&self, raw: RawIsolationPayload<'_>) -> Result<String, Error> {
+  pub fn decrypt(&self, raw: RawIsolationPayload<'_>) -> Result<Vec<u8>, Error> {
     let RawIsolationPayload { nonce, payload } = raw;
     let nonce: [u8; 12] = nonce.as_ref().try_into()?;
-    let bytes = self
+    self
       .aes_gcm
       .key
       .decrypt(Nonce::from_slice(&nonce), payload.as_ref())
-      .map_err(|_| self::Error::Aes)?;
-
-    String::from_utf8(bytes).map_err(Into::into)
+      .map_err(|_| self::Error::Aes)
   }
 }
 
@@ -116,11 +114,11 @@ pub struct RawIsolationPayload<'a> {
   payload: Cow<'a, [u8]>,
 }
 
-impl<'a> TryFrom<&'a str> for RawIsolationPayload<'a> {
+impl<'a> TryFrom<&'a Vec<u8>> for RawIsolationPayload<'a> {
   type Error = Error;
 
-  fn try_from(value: &'a str) -> Result<Self, Self::Error> {
-    serde_json::from_str(value).map_err(Into::into)
+  fn try_from(value: &'a Vec<u8>) -> Result<Self, Self::Error> {
+    serde_json::from_slice(value).map_err(Into::into)
   }
 }
 
@@ -141,9 +139,9 @@ pub struct IsolationJavascriptCodegen {
 pub struct IsolationJavascriptRuntime<'a> {
   /// The key used on the Rust backend and the Isolation Javascript
   pub runtime_aes_gcm_key: &'a [u8; 32],
-  /// The function that stringifies a IPC message.
+  /// The function that processes the IPC message.
   #[raw]
-  pub stringify_ipc_message_fn: &'a str,
+  pub process_ipc_message_fn: &'a str,
 }
 
 #[cfg(test)]

core/tauri/Cargo.toml

@@ -74,18 +74,18 @@ ico = { version = "0.2.0", optional = true }
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 gtk = { version = "0.16", features = [ "v3_24" ] }
 glib = "0.16"
-webkit2gtk = { version = "0.19.1", features = [ "v2_38" ] }
+webkit2gtk = { version = "1.1", features = [ "v2_38" ] }
 
 [target."cfg(target_os = \"macos\")".dependencies]
 embed_plist = "1.2"
 cocoa = "0.24"
 objc = "0.2"
 
 [target."cfg(windows)".dependencies]
-webview2-com = "0.22"
+webview2-com = "0.25"
 
   [target."cfg(windows)".dependencies.windows]
-  version = "0.44"
+  version = "0.48"
   features = [ "Win32_Foundation" ]
 
 [target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies]
@@ -122,7 +122,7 @@ test = [ ]
 compression = [ "tauri-macros/compression", "tauri-utils/compression" ]
 wry = [ "tauri-runtime-wry" ]
 objc-exception = [ "tauri-runtime-wry/objc-exception" ]
-linux-protocol-headers = [ "tauri-runtime-wry/linux-headers", "webkit2gtk/v2_36" ]
+linux-ipc-protocol = [ "tauri-runtime-wry/linux-protocol-body", "webkit2gtk/v2_40" ]
 isolation = [ "tauri-utils/isolation", "tauri-macros/isolation" ]
 custom-protocol = [ "tauri-macros/custom-protocol" ]
 native-tls = [ "reqwest/native-tls" ]

core/tauri/build.rs

@@ -50,6 +50,11 @@ fn main() {
   alias("desktop", !mobile);
   alias("mobile", mobile);
 
+  alias(
+    "ipc_custom_protocol",
+    target_os != "android" && (target_os != "linux" || has_feature("linux-ipc-protocol")),
+  );
+
   let checked_features_out_path = Path::new(&var("OUT_DIR").unwrap()).join("checked_features");
   std::fs::write(
     checked_features_out_path,

core/tauri/mobile/android/src/main/java/app/tauri/plugin/PluginManager.kt

@@ -85,15 +85,6 @@ class PluginManager(val activity: AppCompatActivity) {
     }
   }
 
-  @JniMethod
-  fun postIpcMessage(webView: WebView, pluginId: String, command: String, data: JSObject, callback: Long, error: Long) {
-    val invoke = Invoke(callback, command, callback, error, { fn, result ->
-      webView.evaluateJavascript("window['_$fn']($result)", null)
-    }, data)
-
-    dispatchPluginMessage(invoke, pluginId)
-  }
-
   @JniMethod
   fun runCommand(id: Int, pluginId: String, command: String, data: JSObject) {
     val successId = 0L

core/tauri/mobile/ios-api/Sources/Tauri/Tauri.swift

@@ -108,21 +108,7 @@ func onWebviewCreated(webview: WKWebView, viewController: UIViewController) {
 	PluginManager.shared.onWebviewCreated(webview)
 }
 
-@_cdecl("post_ipc_message")
-func postIpcMessage(webview: WKWebView, name: SRString, command: SRString, data: NSDictionary, callback: UInt64, error: UInt64) {
-	let invoke = Invoke(command: command.toString(), callback: callback, error: error, sendResponse: { (fn: UInt64, payload: JsonValue?) -> Void in
-		var payloadJson: String
-		do {
-			try payloadJson = payload == nil ? "null" : payload!.jsonRepresentation() ?? "`Failed to serialize payload`"
-		} catch {
-			payloadJson = "`\(error)`"
-		}
-		webview.evaluateJavaScript("window['_\(fn)'](\(payloadJson))")
-	}, data: JSTypes.coerceDictionaryToJSObject(data, formattingDatesAsStrings: true))
-	PluginManager.shared.invoke(name: name.toString(), invoke: invoke)
-}
-
-@_cdecl("run_plugin_method")
+@_cdecl("run_plugin_command")
 func runCommand(
 	id: Int,
 	name: SRString,