fix: use webview2-com-bridge to solve ra crash issue

wen1701 · May 13, 2024 · d583276 · d583276
1 parent 9678d20
commit d583276
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 9 deletions.
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["tauri", "sysproxy-rs"]
+members = ["tauri", "sysproxy-rs", "webview2-com-bridge"]
 
 [workspace.package]
 repository = "https://github.com/keiko233/clash-nyanpasu.git"

diff --git a/backend/tauri/Cargo.toml b/backend/tauri/Cargo.toml
@@ -99,8 +99,7 @@ windows-sys = { version = "0.52", features = [
   "Win32_System_LibraryLoader",
   "Win32_System_SystemInformation",
 ] }
-webview2-com = "0.19"
-windows = "0.39"
+webview2-com-bridge = { path = "../webview2-com-bridge" }
 
 [target.'cfg(windows)'.dependencies.tauri]
 version = "1.5.4"

diff --git a/backend/tauri/src/utils/resolve.rs b/backend/tauri/src/utils/resolve.rs
@@ -16,11 +16,8 @@ use semver::Version;
 use serde_yaml::Mapping;
 use std::net::TcpListener;
 use tauri::{api::process::Command, App, AppHandle, Manager, PhysicalPosition, PhysicalSize};
-
-#[cfg(target_os = "windows")]
-use webview2_com::Microsoft::Web::WebView2::Win32::ICoreWebView2Settings6;
 #[cfg(target_os = "windows")]
-use windows::core::Interface;
+use webview2_com_bridge::windows::core::Interface;
 
 pub fn find_unused_port() -> Result<u16> {
     match TcpListener::bind("127.0.0.1:0") {
@@ -274,6 +271,8 @@ pub fn create_window(app_handle: &AppHandle) {
         .get_window("main")
         .unwrap()
         .with_webview(|webview| unsafe {
+            #[cfg(target_os = "windows")]
+            use webview2_com_bridge::webview2_com::Microsoft::Web::WebView2::Win32::ICoreWebView2Settings6;
             let settings = webview
                 .controller()
                 .CoreWebView2()

diff --git a/backend/webview2-com-bridge/Cargo.toml b/backend/webview2-com-bridge/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "webview2-com-bridge"
+version = "0.1.0"
+repository.workspace = true
+edition.workspace = true
+license.workspace = true
+authors.workspace = true
+
+[dependencies]
+webview2-com = "0.19"
+windows = "0.39"
diff --git a/backend/webview2-com-bridge/src/lib.rs b/backend/webview2-com-bridge/src/lib.rs
@@ -0,0 +1,2 @@
+pub use webview2_com;
+pub use windows;