CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-01 10:01:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): loading remote URLs on mobile, closes #13461 (#13782)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira
2025-07-09 17:08:38 -03:00
committed by GitHub
parent f94af90359
commit 4ba871c5d2
2 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/mobile-external-urls.md Normal file
View File

@@ -0,0 +1,5 @@
---
"tauri": patch:bug
---
Fixes loading external URLs in mobile development mode.

41
crates/tauri/src/manager/webview.rs
View File

@@ -413,10 +413,11 @@ impl<R: Runtime> WebviewManager<R> {
#[allow(unused_mut)] // mut url only for the data-url parsing
let mut url = match &pending.webview_attributes.url {
WebviewUrl::App(path) => {
let url = if PROXY_DEV_SERVER {
let app_url = app_manager.get_url(pending.webview_attributes.use_https_scheme);
let url = if PROXY_DEV_SERVER && is_local_network_url(&app_url) {
Cow::Owned(Url::parse("tauri://localhost").unwrap())
} else {
app_manager.get_url(pending.webview_attributes.use_https_scheme)
app_url
};
// ignore "index.html" just to simplify the url
if path.to_str() != Some("index.html") {
@@ -431,13 +432,13 @@ impl<R: Runtime> WebviewManager<R> {
}
WebviewUrl::External(url) => {
let config_url = app_manager.get_url(pending.webview_attributes.use_https_scheme);
let is_local = config_url.make_relative(url).is_some();
let is_app_url = config_url.make_relative(url).is_some();
let mut url = url.clone();
if is_local && PROXY_DEV_SERVER {
url.set_scheme("tauri").unwrap();
url.set_host(Some("localhost")).unwrap();
if is_app_url && PROXY_DEV_SERVER && is_local_network_url(&url) {
Url::parse("tauri://localhost").unwrap()
} else {
url
}
url
}
WebviewUrl::CustomProtocol(url) => url.clone(),
@@ -710,3 +711,29 @@ fn on_webview_event<R: Runtime>(webview: &Webview<R>, event: &WebviewEvent) -> c
Ok(())
}
fn is_local_network_url(url: &url::Url) -> bool {
match url.host() {
Some(url::Host::Domain(s)) => s == "localhost",
Some(url::Host::Ipv4(_)) | Some(url::Host::Ipv6(_)) => true,
None => false,
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn local_network_url() {
assert!(is_local_network_url(&"http://localhost".parse().unwrap()));
assert!(is_local_network_url(
&"http://127.0.0.1:8080".parse().unwrap()
));
assert!(is_local_network_url(
&"https://192.168.3.17".parse().unwrap()
));
assert!(!is_local_network_url(&"https://tauri.app".parse().unwrap()));
}
}