From 6113898b69aeca1d6abbee3ffbd08ccfa2aa8f97 Mon Sep 17 00:00:00 2001 From: GyDi Date: Tue, 11 Jan 2022 02:24:43 +0800 Subject: [PATCH] feat: windows support startup --- src-tauri/src/cmds.rs | 38 +----------- src-tauri/src/core/verge.rs | 99 +++++++++++++++++++++++++++++++- src-tauri/src/main.rs | 1 - src-tauri/src/utils/resolve.rs | 4 ++ src/components/setting-verge.tsx | 21 ++----- src/services/cmds.ts | 4 -- 6 files changed, 111 insertions(+), 56 deletions(-) diff --git a/src-tauri/src/cmds.rs b/src-tauri/src/cmds.rs index 2b07b58..efa3818 100644 --- a/src-tauri/src/cmds.rs +++ b/src-tauri/src/cmds.rs @@ -193,24 +193,7 @@ pub fn patch_clash_config(payload: Mapping) -> Result<(), String> { save_clash(&config) } -/// set the system proxy -/// Tips: only support windows now -#[tauri::command] -pub fn set_sys_proxy(enable: bool, verge_state: State<'_, VergeState>) -> Result<(), String> { - let mut verge = verge_state.0.lock().unwrap(); - - if let Some(mut sysproxy) = verge.cur_sysproxy.take() { - sysproxy.enable = enable; - if sysproxy.set_sys().is_err() { - log::error!("failed to set system proxy"); - } - verge.cur_sysproxy = Some(sysproxy); - } - Ok(()) -} - /// get the system proxy -/// Tips: only support windows now #[tauri::command] pub fn get_sys_proxy() -> Result { match SysProxyConfig::get_sys() { @@ -219,6 +202,8 @@ pub fn get_sys_proxy() -> Result { } } +/// get the current proxy config +/// which may not the same as system proxy #[tauri::command] pub fn get_cur_proxy(verge_state: State<'_, VergeState>) -> Result, String> { match verge_state.0.lock() { @@ -244,24 +229,7 @@ pub async fn patch_verge_config( verge_state: State<'_, VergeState>, ) -> Result<(), String> { let mut verge = verge_state.0.lock().unwrap(); - - if payload.theme_mode.is_some() { - verge.config.theme_mode = payload.theme_mode; - } - - if payload.enable_self_startup.is_some() { - verge.config.enable_self_startup = payload.enable_self_startup; - } - - if payload.enable_system_proxy.is_some() { - verge.config.enable_system_proxy = payload.enable_system_proxy; - } - - if payload.system_proxy_bypass.is_some() { - verge.config.system_proxy_bypass = payload.system_proxy_bypass; - } - - verge.config.save_file() + verge.patch_config(payload) } /// start dragging window diff --git a/src-tauri/src/core/verge.rs b/src-tauri/src/core/verge.rs index 751d05b..9a7ecea 100644 --- a/src-tauri/src/core/verge.rs +++ b/src-tauri/src/core/verge.rs @@ -1,5 +1,7 @@ -use crate::utils::{config, dirs, sysopt::SysProxyConfig}; +use crate::utils::{config, dirs, startup, sysopt::SysProxyConfig}; use serde::{Deserialize, Serialize}; +use std::path::PathBuf; +use tauri::api::path::resource_dir; /// ### `verge.yaml` schema #[derive(Default, Debug, Clone, Deserialize, Serialize)] @@ -34,6 +36,7 @@ impl VergeConfig { } } +/// Verge App abilities #[derive(Debug)] pub struct Verge { pub config: VergeConfig, @@ -41,6 +44,8 @@ pub struct Verge { pub old_sysproxy: Option, pub cur_sysproxy: Option, + + pub exe_path: Option, } impl Default for Verge { @@ -55,6 +60,7 @@ impl Verge { config: VergeConfig::new(), old_sysproxy: None, cur_sysproxy: None, + exe_path: None, } } @@ -90,4 +96,95 @@ impl Verge { } } } + + /// set the exe_path + pub fn set_exe_path(&mut self, package_info: &tauri::PackageInfo) { + let exe = if cfg!(target_os = "windows") { + "clash-verge.exe" + } else { + "clash-verge" + }; + let path = resource_dir(package_info).unwrap().join(exe); + self.exe_path = Some(path); + } + + /// sync the startup when run the app + pub fn sync_startup(&self) -> Result<(), String> { + let enable = self.config.enable_self_startup.clone().unwrap_or(false); + + if !enable { + return Ok(()); + } + if self.exe_path.is_none() { + return Err("should init the exe_path first".into()); + } + + let exe_path = self.exe_path.clone().unwrap(); + match startup::get_startup(&exe_path) { + Ok(sys_enable) => { + if sys_enable || (!sys_enable && startup::set_startup(true, &exe_path).is_ok()) { + Ok(()) + } else { + Err("failed to sync startup".into()) + } + } + Err(_) => Err("failed to get system startup info".into()), + } + } + + /// update the startup + fn update_startup(&mut self, enable: bool) -> Result<(), String> { + let conf_enable = self.config.enable_self_startup.clone().unwrap_or(false); + + if enable == conf_enable { + return Ok(()); + } + if self.exe_path.is_none() { + return Err("should init the exe_path first".into()); + } + let exe_path = self.exe_path.clone().unwrap(); + match startup::set_startup(enable, &exe_path) { + Ok(_) => Ok(()), + Err(_) => Err("failed to set system startup info".into()), + } + } + + /// patch verge config + /// There should be only one update at a time here + /// so call the save_file at the end is savely + pub fn patch_config(&mut self, patch: VergeConfig) -> Result<(), String> { + // only change it + if patch.theme_mode.is_some() { + self.config.theme_mode = patch.theme_mode; + } + + // should update system startup + if patch.enable_self_startup.is_some() { + let enable = patch.enable_self_startup.unwrap(); + self.update_startup(enable)?; + self.config.enable_self_startup = Some(enable); + } + + // should update system proxy + if patch.enable_system_proxy.is_some() { + let enable = patch.enable_system_proxy.unwrap(); + if let Some(mut sysproxy) = self.cur_sysproxy.take() { + sysproxy.enable = enable; + if sysproxy.set_sys().is_err() { + log::error!("failed to set system proxy"); + return Err("failed to set system proxy".into()); + } + self.cur_sysproxy = Some(sysproxy); + } + self.config.enable_system_proxy = Some(enable); + } + + // todo + // should update system proxt too + if patch.system_proxy_bypass.is_some() { + self.config.system_proxy_bypass = patch.system_proxy_bypass; + } + + self.config.save_file() + } } diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 0b63178..efeb61c 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -71,7 +71,6 @@ fn main() -> std::io::Result<()> { .invoke_handler(tauri::generate_handler![ // common cmds::restart_sidecar, - cmds::set_sys_proxy, cmds::get_sys_proxy, cmds::get_cur_proxy, cmds::win_drag, diff --git a/src-tauri/src/utils/resolve.rs b/src-tauri/src/utils/resolve.rs index c2dda38..1266f64 100644 --- a/src-tauri/src/utils/resolve.rs +++ b/src-tauri/src/utils/resolve.rs @@ -33,7 +33,11 @@ pub fn resolve_setup(app: &App) { log::error!("{}", err); } + verge.set_exe_path(app.package_info()); verge.init_sysproxy(clash.info.port.clone()); + if let Err(err) = verge.sync_startup() { + log::error!("{}", err); + } } /// reset system proxy diff --git a/src/components/setting-verge.tsx b/src/components/setting-verge.tsx index 760639a..288fc8a 100644 --- a/src/components/setting-verge.tsx +++ b/src/components/setting-verge.tsx @@ -6,11 +6,7 @@ import { Switch, Typography, } from "@mui/material"; -import { - setSysProxy, - getVergeConfig, - patchVergeConfig, -} from "../services/cmds"; +import { getVergeConfig, patchVergeConfig } from "../services/cmds"; import { CmdType } from "../services/types"; import { version } from "../../package.json"; import GuardState from "./guard-state"; @@ -50,9 +46,9 @@ const SettingVerge = ({ onError }: Props) => { onCatch={onError} onFormat={onSwitchFormat} onChange={(e) => onChangeData({ theme_mode: e ? "dark" : "light" })} - onGuard={async (c) => { - await patchVergeConfig({ theme_mode: c ? "dark" : "light" }); - }} + onGuard={(c) => + patchVergeConfig({ theme_mode: c ? "dark" : "light" }) + } > @@ -66,9 +62,7 @@ const SettingVerge = ({ onError }: Props) => { onCatch={onError} onFormat={onSwitchFormat} onChange={(e) => onChangeData({ enable_self_startup: e })} - onGuard={async (e) => { - await patchVergeConfig({ enable_self_startup: e }); - }} + onGuard={(e) => patchVergeConfig({ enable_self_startup: e })} > @@ -82,10 +76,7 @@ const SettingVerge = ({ onError }: Props) => { onCatch={onError} onFormat={onSwitchFormat} onChange={(e) => onChangeData({ enable_system_proxy: e })} - onGuard={async (e) => { - await setSysProxy(e); - await patchVergeConfig({ enable_system_proxy: e }); - }} + onGuard={(e) => patchVergeConfig({ enable_system_proxy: e })} > diff --git a/src/services/cmds.ts b/src/services/cmds.ts index 8d3b9b3..1fc1608 100644 --- a/src/services/cmds.ts +++ b/src/services/cmds.ts @@ -56,10 +56,6 @@ export async function patchClashConfig(payload: Partial) { return invoke("patch_clash_config", { payload }); } -export async function setSysProxy(enable: boolean) { - return invoke("set_sys_proxy", { enable }); -} - export async function getVergeConfig() { return invoke("get_verge_config"); }