cassidy/GlobalProtect-openconnect
1
0
Fork 0
mirror of https://github.com/yuezk/GlobalProtect-openconnect.git synced 2025-05-20 07:26:58 -04:00
Code Issues Projects Releases Wiki Activity

refactor: upgrade tauri 2.0

Browse Source
This commit is contained in:
Kevin Yue
2024-11-18 13:27:34 +08:00
parent 0f67be465b
commit e41342631c
10 changed files with 1110 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1931
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

10
Cargo.toml
View File

@@ -1,7 +1,7 @@
[workspace] [workspace]
resolver = "2" resolver = "2"
members = ["crates/*", "apps/gpclient", "apps/gpservice", "apps/gpauth", "apps/gpgui-helper/src-tauri"] members = ["crates/*", "apps/gpclient", "apps/gpservice"]
[workspace.package] [workspace.package]
rust-version = "1.70" rust-version = "1.70"
@@ -49,10 +49,10 @@ sha256="1"
which="6" which="6"
# Tauri dependencies # Tauri dependencies
tauri = { version = "1.5" } tauri = { version = "2" }
specta = "=2.0.0-rc.1" specta = "=2.0.0-rc.20"
specta-macros = "=2.0.0-rc.1" specta-macros = "=2.0.0-rc.17"
rspc = { version = "1.0.0-rc.5", features = ["tauri"] } #rspc = { version = "1.0.0-rc.5", features = ["tauri"] }
[profile.release] [profile.release]
opt-level = 'z' # Optimize for size opt-level = 'z' # Optimize for size

2
crates/gpapi/src/credential.rs
View File

@@ -2,7 +2,7 @@ use std::collections::HashMap;
use anyhow::bail; use anyhow::bail;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use specta::Type; use specta_macros::Type;
use crate::auth::{SamlAuthData, SamlAuthResult}; use crate::auth::{SamlAuthData, SamlAuthResult};

2
crates/gpapi/src/gateway/mod.rs
View File

@@ -6,7 +6,7 @@ pub use login::*;
pub(crate) use parse_gateways::*; pub(crate) use parse_gateways::*;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use specta::Type; use specta_macros::Type;
use std::fmt::Display; use std::fmt::Display;

2
crates/gpapi/src/gp_params.rs
View File

@@ -3,7 +3,7 @@ use std::collections::HashMap;
use log::info; use log::info;
use reqwest::Client; use reqwest::Client;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use specta::Type; use specta_macros::Type;
use crate::{utils::request::create_identity, GP_USER_AGENT}; use crate::{utils::request::create_identity, GP_USER_AGENT};

2
crates/gpapi/src/portal/config.rs
View File

@@ -4,7 +4,7 @@ use log::{debug, info, warn};
use reqwest::{Client, StatusCode}; use reqwest::{Client, StatusCode};
use roxmltree::{Document, Node}; use roxmltree::{Document, Node};
use serde::Serialize; use serde::Serialize;
use specta::Type; use specta_macros::Type;
use crate::{ use crate::{
credential::{AuthCookieCredential, Credential}, credential::{AuthCookieCredential, Credential},

2
crates/gpapi/src/portal/prelogin.rs
View File

@@ -3,7 +3,7 @@ use log::{info, warn};
use reqwest::{Client, StatusCode}; use reqwest::{Client, StatusCode};
use roxmltree::Document; use roxmltree::Document;
use serde::Serialize; use serde::Serialize;
use specta::Type; use specta_macros::Type;
use crate::{ use crate::{
error::PortalError, error::PortalError,

2
crates/gpapi/src/service/request.rs
View File

@@ -1,7 +1,7 @@
use std::collections::HashMap; use std::collections::HashMap;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use specta::Type; use specta_macros::Type;
use crate::{gateway::Gateway, gp_params::ClientOs}; use crate::{gateway::Gateway, gp_params::ClientOs};

2
crates/gpapi/src/service/vpn_state.rs
View File

@@ -1,5 +1,5 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use specta::Type; use specta_macros::Type;
use crate::gateway::Gateway; use crate::gateway::Gateway;

26
crates/gpapi/src/utils/window.rs
View File

@@ -78,20 +78,20 @@ async fn wmctrl_try_raise_window(title: &str) -> anyhow::Result<ExitStatus> {
} }
fn hide_menu(win: &Window) { fn hide_menu(win: &Window) {
let menu_handle = win.menu_handle(); // let menu_handle = win.menu_handle();
tokio::spawn(async move { // tokio::spawn(async move {
loop { // loop {
let menu_visible = menu_handle.is_visible().unwrap_or(false); // let menu_visible = menu_handle.is_visible().unwrap_or(false);
if !menu_visible { // if !menu_visible {
break; // break;
} // }
if menu_visible { // if menu_visible {
let _ = menu_handle.hide(); // let _ = menu_handle.hide();
tokio::time::sleep(Duration::from_millis(10)).await; // tokio::time::sleep(Duration::from_millis(10)).await;
} // }
} // }
}); // });
} }