cherrypick 38e49bd to v0.21.1 (#925)

* feat: add `WebView::url()` to access the current url (#732) * feat: add `.url()`to access the current url * fmt * add url import * fix linux and windows * add stub to android webview * Update src/webview/webview2/mod.rs Co-authored-by: Amr Bashir <[email protected]> * Add android * change file and doc Co-authored-by: Amr Bashir <[email protected]> * Changed wry to patch --------- Co-authored-by: Jonas Kruckenberg <[email protected]> Co-authored-by: Amr Bashir <[email protected]>
tauri-apps · Apr 12, 2023 · 52dce1d · 52dce1d
1 parent 271dbb1
commit 52dce1d
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 5 deletions.
diff --git a/.changes/url.md b/.changes/url.md
@@ -0,0 +1,5 @@
+---
+"wry": patch
+---
+
+Add `WebView::url` to get the current url. 
diff --git a/src/webview/android/main_pipe.rs b/src/webview/android/main_pipe.rs
@@ -161,6 +161,18 @@ impl MainPipe<'_> {
             Err(e) => tx.send(Err(e.into())).unwrap(),
           }
         }
+        WebViewMessage::GetUrl(tx) => {
+          if let Some(webview) = &self.webview {
+            let url = env
+              .call_method(webview.as_obj(), "getUrl", "()Ljava/lang/String", &[])
+              .and_then(|v| v.l())
+              .and_then(|s| env.get_string(s.into()))
+              .map(|u| u.to_string_lossy().into())
+              .unwrap_or_default();
+
+            tx.send(url).unwrap()
+          }
+        }
         WebViewMessage::Jni(f) => {
           if let Some(webview) = &self.webview {
             f(env, activity, webview.as_obj());
@@ -198,6 +210,7 @@ pub enum WebViewMessage {
   Eval(String),
   SetBackgroundColor(RGBA),
   GetWebViewVersion(Sender<Result<String, Error>>),
+  GetUrl(Sender<String>),
   Jni(Box<dyn FnOnce(JNIEnv, JObject, JObject) + Send>),
 }
 

diff --git a/src/webview/android/mod.rs b/src/webview/android/mod.rs
@@ -23,6 +23,7 @@ use tao::platform::android::ndk_glue::{
   ndk::looper::{FdEvent, ForeignLooper},
   PACKAGE,
 };
+use url::Url;
 
 pub(crate) mod binding;
 mod main_pipe;
@@ -218,6 +219,13 @@ impl InnerWebView {
 
   pub fn print(&self) {}
 
+  pub fn url(&self) -> Url {
+    let (tx, rx) = bounded(1);
+    MainPipe::send(WebViewMessage::GetUrl(tx));
+    let uri = rx.recv().unwrap();
+    Url::parse(uri.as_str()).unwrap()
+  }
+
   pub fn eval(&self, js: &str) -> Result<()> {
     MainPipe::send(WebViewMessage::Eval(js.into()));
     Ok(())

diff --git a/src/webview/mod.rs b/src/webview/mod.rs
@@ -513,6 +513,11 @@ impl WebView {
     &self.window
   }
 
+  /// Get the current url of the webview
+  pub fn url(&self) -> Url {
+    self.webview.url()
+  }
+
   /// Evaluate and run javascript code. Must be called on the same thread who created the
   /// [`WebView`]. Use [`EventLoopProxy`] and a custom event to send scripts from other threads.
   ///

diff --git a/src/webview/webkitgtk/mod.rs b/src/webview/webkitgtk/mod.rs
@@ -2,6 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
+use gdk::{Cursor, EventMask, WindowEdge};
+use gio::Cancellable;
+use glib::signal::Inhibit;
+use gtk::prelude::*;
 #[cfg(any(debug_assertions, feature = "devtools"))]
 use std::sync::{
   atomic::{AtomicBool, Ordering},
@@ -12,11 +16,7 @@ use std::{
   hash::{Hash, Hasher},
   rc::Rc,
 };
-
-use gdk::{Cursor, EventMask, WindowEdge};
-use gio::Cancellable;
-use glib::signal::Inhibit;
-use gtk::prelude::*;
+use url::Url;
 use webkit2gtk::{
   traits::*, NavigationPolicyDecision, PolicyDecisionType, UserContentInjectedFrames, UserScript,
   UserScriptInjectionTime, WebView, WebViewBuilder,
@@ -353,6 +353,12 @@ impl InnerWebView {
     let _ = self.eval("window.print()");
   }
 
+  pub fn url(&self) -> Url {
+    let uri = self.webview.uri().unwrap();
+
+    Url::parse(uri.as_str()).unwrap()
+  }
+
   pub fn eval(&self, js: &str) -> Result<()> {
     let cancellable: Option<&Cancellable> = None;
     self.webview.run_javascript(js, cancellable, |_| ());

diff --git a/src/webview/webview2/mod.rs b/src/webview/webview2/mod.rs
@@ -10,6 +10,7 @@ use crate::{
 };
 
 use file_drop::FileDropController;
+use url::Url;
 
 use std::{
   collections::HashSet, fmt::Write, iter::once, mem::MaybeUninit, os::windows::prelude::OsStrExt,
@@ -678,6 +679,16 @@ window.addEventListener('mousemove', (e) => window.chrome.webview.postMessage('_
     let _ = self.eval("window.print()");
   }
 
+  pub fn url(&self) -> Url {
+    let mut pwstr = PWSTR::null();
+
+    unsafe { self.webview.Source(&mut pwstr).unwrap() };
+
+    let uri = take_pwstr(pwstr);
+
+    Url::parse(&uri.to_string()).unwrap()
+  }
+
   pub fn eval(&self, js: &str) -> Result<()> {
     Self::execute_script(&self.webview, js.to_string())
       .map_err(|err| Error::WebView2Error(webview2_com::Error::WindowsError(err)))

diff --git a/src/webview/wkwebview/mod.rs b/src/webview/wkwebview/mod.rs
@@ -6,6 +6,7 @@
 mod file_drop;
 mod web_context;
 
+use url::Url;
 pub use web_context::WebContextImpl;
 
 #[cfg(target_os = "macos")]
@@ -536,6 +537,22 @@ r#"Object.defineProperty(window, 'ipc', {
     }
   }
 
+  pub fn url(&self) -> Url {
+    let url_obj: *mut Object = unsafe { msg_send![self.webview, URL] };
+    let absolute_url: *mut Object = unsafe { msg_send![url_obj, absoluteString] };
+
+    let bytes = {
+      let bytes: *const c_char = unsafe { msg_send![absolute_url, UTF8String] };
+      bytes as *const u8
+    };
+
+    // 4 represents utf8 encoding
+    let len = unsafe { msg_send![absolute_url, lengthOfBytesUsingEncoding: 4] };
+    let bytes = unsafe { std::slice::from_raw_parts(bytes, len) };
+
+    Url::parse(std::str::from_utf8(bytes).unwrap()).unwrap()
+  }
+
   pub fn eval(&self, js: &str) -> Result<()> {
     // Safety: objc runtime calls are unsafe
     unsafe {