refactor: upgrade tauri 2.0

Cargo.toml

@@ -13,22 +13,22 @@ license = "GPL-3.0"
 
 [workspace.dependencies]
 anyhow = "1.0"
-base64 = "0.21"
+base64 = "0.22"
-clap = { version = "4.4.2", features = ["derive"] }
+clap = { version = "4", features = ["derive"] }
 ctrlc = "3.4"
 directories = "5.0"
 dns-lookup = "2.0.4"
-env_logger = "0.10"
+env_logger = "0.11"
 is_executable = "1.0"
 log = "0.4"
 regex = "1"
-reqwest = { version = "0.11", features = ["native-tls-vendored", "json"] }
+reqwest = { version = "0.12", features = ["native-tls-vendored", "json"] }
 openssl = "0.10"
 pem = "3"
-roxmltree = "0.18"
+roxmltree = "0.20"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-sysinfo = "0.29"
+sysinfo = "0.33"
 tempfile = "3.8"
 tokio = { version = "1", features = ["full"] }
 tokio-util = "0.7"
@@ -38,21 +38,19 @@ axum = "0.7"
 futures = "0.3"
 futures-util = "0.3"
 tokio-tungstenite = "0.20.1"
-uzers = "0.11"
+uzers = "0.12"
 whoami = "1"
-thiserror = "1"
+thiserror = "2"
 redact-engine = "0.1"
 compile-time = "0.2"
 serde_urlencoded = "0.7"
 md5="0.7"
 sha256="1"
-which="6"
+which="7"
 
 # Tauri dependencies
 tauri = { version = "2" }
 specta = "=2.0.0-rc.20"
-specta-macros = "=2.0.0-rc.17"
-#rspc = { version = "1.0.0-rc.5", features = ["tauri"] }
 
 [profile.release]
 opt-level = 'z'   # Optimize for size

apps/gpauth/src/cli.rs

@@ -6,7 +6,7 @@ use gpapi::{
   clap::args::Os,
   gp_params::{ClientOs, GpParams},
   process::browser_authenticator::BrowserAuthenticator,
-  utils::{normalize_server, openssl},
+  utils::{env_utils, normalize_server, openssl},
   GP_USER_AGENT,
 };
 use log::{info, LevelFilter};
@@ -138,14 +138,7 @@ impl Cli {
   }
 
   fn prepare_env(&self) -> anyhow::Result<Option<NamedTempFile>> {
-    std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1");
+    env_utils::patch_gui_runtime_env(self.hidpi);
-
-    if self.hidpi {
-      info!("Setting GDK_SCALE=2 and GDK_DPI_SCALE=0.5");
-
-      std::env::set_var("GDK_SCALE", "2");
-      std::env::set_var("GDK_DPI_SCALE", "0.5");
-    }
 
     if self.fix_openssl {
       info!("Fixing OpenSSL environment");

apps/gpclient/src/launch_gui.rs

@@ -4,7 +4,7 @@ use clap::Args;
 use directories::ProjectDirs;
 use gpapi::{
   process::service_launcher::ServiceLauncher,
-  utils::{endpoint::http_endpoint, env_file, shutdown_signal},
+  utils::{endpoint::http_endpoint, env_utils, shutdown_signal},
 };
 use log::info;
 use tokio::io::AsyncWriteExt;
@@ -62,7 +62,7 @@ impl<'a> LaunchGuiHandler<'a> {
     extra_envs.insert("GP_LOG_FILE".into(), log_file_path.clone());
 
     // Persist the environment variables to a file
-    let env_file = env_file::persist_env_vars(Some(extra_envs))?;
+    let env_file = env_utils::persist_env_vars(Some(extra_envs))?;
     let env_file = env_file.into_temp_path();
     let env_file_path = env_file.to_string_lossy().to_string();
 

apps/gpservice/src/cli.rs

@@ -6,7 +6,7 @@ use clap::Parser;
 use gpapi::{
   process::gui_launcher::GuiLauncher,
   service::{request::WsRequest, vpn_state::VpnState},
-  utils::{crypto::generate_key, env_file, lock_file::LockFile, redact::Redaction, shutdown_signal},
+  utils::{crypto::generate_key, env_utils, lock_file::LockFile, redact::Redaction, shutdown_signal},
   GP_SERVICE_LOCK_FILE,
 };
 use log::{info, warn, LevelFilter};
@@ -63,7 +63,7 @@ impl Cli {
     if no_gui {
       info!("GUI is disabled");
     } else {
-      let envs = self.env_file.as_ref().map(env_file::load_env_vars).transpose()?;
+      let envs = self.env_file.as_ref().map(env_utils::load_env_vars).transpose()?;
 
       let minimized = self.minimized;
 

crates/gpapi/Cargo.toml

@@ -14,8 +14,7 @@ openssl.workspace = true
 pem.workspace = true
 roxmltree.workspace = true
 serde.workspace = true
-specta.workspace = true
+specta = { workspace = true, features = ["derive"] }
-specta-macros.workspace = true
 urlencoding.workspace = true
 tokio.workspace = true
 serde_json.workspace = true

crates/gpapi/src/credential.rs

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

crates/gpapi/src/gateway/mod.rs

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

crates/gpapi/src/gp_params.rs

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

crates/gpapi/src/portal/config.rs

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

crates/gpapi/src/portal/prelogin.rs

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

crates/gpapi/src/service/request.rs

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

crates/gpapi/src/service/vpn_state.rs

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

crates/gpapi/src/utils/env_utils.rs

@@ -3,6 +3,7 @@ use std::env;
 use std::io::Write;
 use std::path::Path;
 
+use log::info;
 use tempfile::NamedTempFile;
 
 pub fn persist_env_vars(extra: Option<HashMap<String, String>>) -> anyhow::Result<NamedTempFile> {
@@ -35,3 +36,20 @@ pub fn load_env_vars<T: AsRef<Path>>(env_file: T) -> anyhow::Result<HashMap<Stri
 
   Ok(env_vars)
 }
+
+pub fn patch_gui_runtime_env(hidpi: bool) {
+  // This is to avoid blank screen on some systems
+  std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1");
+
+  // Workaround for https://github.com/tauri-apps/tao/issues/929
+  let desktop = env::var("XDG_CURRENT_DESKTOP").unwrap_or_default().to_lowercase();
+  if desktop.contains("gnome") {
+    env::set_var("GDK_BACKEND", "x11");
+  }
+
+  if hidpi {
+    info!("Setting GDK_SCALE=2 and GDK_DPI_SCALE=0.5");
+    std::env::set_var("GDK_SCALE", "2");
+    std::env::set_var("GDK_DPI_SCALE", "0.5");
+  }
+}

crates/gpapi/src/utils/mod.rs

@@ -4,7 +4,7 @@ pub mod base64;
 pub mod checksum;
 pub mod crypto;
 pub mod endpoint;
-pub mod env_file;
+pub mod env_utils;
 pub mod lock_file;
 pub mod openssl;
 pub mod redact;

crates/gpapi/src/utils/window.rs

@@ -2,7 +2,7 @@ use std::{process::ExitStatus, time::Duration};
 
 use anyhow::bail;
 use log::info;
-use tauri::Window;
+use tauri::WebviewWindow;
 use tokio::process::Command;
 
 pub trait WindowExt {
@@ -10,7 +10,7 @@ pub trait WindowExt {
   fn hide_menu(&self);
 }
 
-impl WindowExt for Window {
+impl WindowExt for WebviewWindow {
   fn raise(&self) -> anyhow::Result<()> {
     raise_window(self)
   }
@@ -20,7 +20,7 @@ impl WindowExt for Window {
   }
 }
 
-pub fn raise_window(win: &Window) -> anyhow::Result<()> {
+pub fn raise_window(win: &WebviewWindow) -> anyhow::Result<()> {
   let is_wayland = std::env::var("XDG_SESSION_TYPE").unwrap_or_default() == "wayland";
 
   if is_wayland {
@@ -77,7 +77,7 @@ async fn wmctrl_try_raise_window(title: &str) -> anyhow::Result<ExitStatus> {
   Ok(exit_status)
 }
 
-fn hide_menu(win: &Window) {
+fn hide_menu(win: &WebviewWindow) {
   // let menu_handle = win.menu_handle();
 
   // tokio::spawn(async move {