From 7108d5f3abf96b3b4df933449a5926aa8a76390e Mon Sep 17 00:00:00 2001
From: GyDi <segydi@foxmail.com>
Date: Sun, 6 Mar 2022 15:40:16 +0800
Subject: [PATCH] fix: enhanced profile consistency
---
src-tauri/src/cmds.rs | 28 +++++-------
src-tauri/src/core/clash.rs | 83 ++++++++++++++++++++--------------
src-tauri/src/utils/resolve.rs | 7 +--
3 files changed, 61 insertions(+), 57 deletions(-)
diff --git a/src-tauri/src/cmds.rs b/src-tauri/src/cmds.rs
index d4929ac..912ed6b 100644
--- a/src-tauri/src/cmds.rs
+++ b/src-tauri/src/cmds.rs
@@ -1,10 +1,9 @@
use crate::{
core::{ClashInfo, PrfItem, Profiles, VergeConfig},
- ret_err,
states::{ClashState, ProfilesState, VergeState},
utils::{dirs, sysopt::SysProxyConfig},
- wrap_err,
};
+use crate::{ret_err, wrap_err};
use anyhow::Result;
use serde_yaml::Mapping;
use std::{path::PathBuf, process::Command};
@@ -80,7 +79,7 @@ pub async fn update_profile(
// reactivate the profile
if Some(index) == profiles.get_current() {
let clash = clash_state.0.lock().unwrap();
- wrap_err!(clash.activate(&profiles))?;
+ wrap_err!(clash.activate(&profiles, false))?;
}
Ok(())
@@ -97,7 +96,7 @@ pub fn select_profile(
wrap_err!(profiles.put_current(index))?;
let clash = clash_state.0.lock().unwrap();
- wrap_err!(clash.activate(&profiles))
+ wrap_err!(clash.activate(&profiles, false))
}
/// change the profile chain
@@ -108,16 +107,13 @@ pub fn change_profile_chain(
clash_state: State<'_, ClashState>,
profiles_state: State<'_, ProfilesState>,
) -> Result<(), String> {
- let clash = clash_state.0.lock().unwrap();
+ let mut clash = clash_state.0.lock().unwrap();
let mut profiles = profiles_state.0.lock().unwrap();
profiles.put_chain(chain);
+ clash.set_window(app_handle.get_window("main"));
- app_handle
- .get_window("main")
- .map(|win| wrap_err!(clash.activate_enhanced(&profiles, win, false)));
-
- Ok(())
+ wrap_err!(clash.activate_enhanced(&profiles, false))
}
/// manually exec enhanced profile
@@ -127,14 +123,12 @@ pub fn enhance_profiles(
clash_state: State<'_, ClashState>,
profiles_state: State<'_, ProfilesState>,
) -> Result<(), String> {
- let clash = clash_state.0.lock().unwrap();
+ let mut clash = clash_state.0.lock().unwrap();
let profiles = profiles_state.0.lock().unwrap();
- app_handle
- .get_window("main")
- .map(|win| wrap_err!(clash.activate_enhanced(&profiles, win, false)));
+ clash.set_window(app_handle.get_window("main"));
- Ok(())
+ wrap_err!(clash.activate_enhanced(&profiles, false))
}
/// delete profile item
@@ -148,7 +142,7 @@ pub fn delete_profile(
if wrap_err!(profiles.delete_item(index))? {
let clash = clash_state.0.lock().unwrap();
- wrap_err!(clash.activate(&profiles))?;
+ wrap_err!(clash.activate(&profiles, false))?;
}
Ok(())
@@ -291,7 +285,7 @@ pub fn patch_verge_config(
wrap_err!(clash.tun_mode(tun_mode.unwrap()))?;
clash.update_config();
- wrap_err!(clash.activate(&profiles))?;
+ wrap_err!(clash.activate(&profiles, false))?;
}
Ok(())
diff --git a/src-tauri/src/core/clash.rs b/src-tauri/src/core/clash.rs
index 8df5daa..dad2ab7 100644
--- a/src-tauri/src/core/clash.rs
+++ b/src-tauri/src/core/clash.rs
@@ -6,6 +6,7 @@ use serde::{Deserialize, Serialize};
use serde_yaml::{Mapping, Value};
use std::{collections::HashMap, time::Duration};
use tauri::api::process::{Command, CommandChild, CommandEvent};
+use tauri::Window;
use tokio::time::sleep;
#[derive(Default, Debug, Clone, Deserialize, Serialize)]
@@ -23,7 +24,6 @@ pub struct ClashInfo {
pub secret: Option<String>,
}
-#[derive(Debug)]
pub struct Clash {
/// maintain the clash config
pub config: Mapping,
@@ -33,6 +33,9 @@ pub struct Clash {
/// clash sidecar
pub sidecar: Option<CommandChild>,
+
+ /// save the main window
+ pub window: Option<Window>,
}
impl Clash {
@@ -44,6 +47,7 @@ impl Clash {
config,
info,
sidecar: None,
+ window: None,
}
}
@@ -114,6 +118,11 @@ impl Clash {
}
}
+ /// save the main window
+ pub fn set_window(&mut self, win: Option<Window>) {
+ self.window = win;
+ }
+
/// run clash sidecar
pub fn run_sidecar(&mut self) -> Result<()> {
let app_dir = dirs::app_home_dir();
@@ -156,7 +165,7 @@ impl Clash {
self.update_config();
self.drop_sidecar()?;
self.run_sidecar()?;
- self.activate(profiles)
+ self.activate(profiles, false)
}
/// update the clash info
@@ -241,12 +250,15 @@ impl Clash {
self.save_config()
}
+ /// activate the profile
+ /// generate a new profile to the temp_dir
+ /// then put the path to the clash core
fn _activate(info: ClashInfo, config: Mapping) -> Result<()> {
let temp_path = dirs::profiles_temp_path();
config::save_yaml(temp_path.clone(), &config, Some("# Clash Verge Temp File"))?;
tauri::async_runtime::spawn(async move {
- let server = info.server.clone().unwrap();
+ let server = info.server.unwrap();
let server = format!("http://{server}/configs");
let mut headers = HeaderMap::new();
@@ -263,22 +275,20 @@ impl Clash {
// retry 5 times
for _ in 0..5 {
match reqwest::ClientBuilder::new().no_proxy().build() {
- Ok(client) => match client
- .put(&server)
- .headers(headers.clone())
- .json(&data)
- .send()
- .await
- {
- Ok(resp) => {
- if resp.status() != 204 {
- log::error!("failed to activate clash for status \"{}\"", resp.status());
+ Ok(client) => {
+ let builder = client.put(&server).headers(headers.clone()).json(&data);
+
+ match builder.send().await {
+ Ok(resp) => {
+ if resp.status() != 204 {
+ log::error!("failed to activate clash for status \"{}\"", resp.status());
+ }
+ // do not retry
+ break;
}
- // do not retry
- break;
+ Err(err) => log::error!("failed to activate for `{err}`"),
}
- Err(err) => log::error!("failed to activate for `{err}`"),
- },
+ }
Err(err) => log::error!("failed to activate for `{err}`"),
}
sleep(Duration::from_millis(500)).await;
@@ -288,26 +298,14 @@ impl Clash {
Ok(())
}
- /// activate the profile
- pub fn activate(&self, profiles: &Profiles) -> Result<()> {
- let info = self.info.clone();
- let mut config = self.config.clone();
- let gen_map = profiles.gen_activate()?;
-
- for (key, value) in gen_map.into_iter() {
- config.insert(key, value);
+ /// enhanced profiles mode
+ /// only change the enhanced profiles
+ pub fn activate_enhanced(&self, profiles: &Profiles, delay: bool) -> Result<()> {
+ if self.window.is_none() {
+ bail!("failed to get the main window");
}
- Self::_activate(info, config)
- }
-
- /// enhanced profiles mode
- pub fn activate_enhanced(
- &self,
- profiles: &Profiles,
- win: tauri::Window,
- delay: bool,
- ) -> Result<()> {
+ let win = self.window.clone().unwrap();
let event_name = help::get_uid("e");
let event_name = format!("enhanced-cb-{event_name}");
@@ -344,6 +342,21 @@ impl Clash {
Ok(())
}
+
+ /// activate the profile
+ /// auto activate enhanced profile
+ pub fn activate(&self, profiles: &Profiles, delay: bool) -> Result<()> {
+ let gen_map = profiles.gen_activate()?;
+ let info = self.info.clone();
+ let mut config = self.config.clone();
+
+ for (key, value) in gen_map.into_iter() {
+ config.insert(key, value);
+ }
+
+ Self::_activate(info, config)?;
+ self.activate_enhanced(profiles, delay)
+ }
}
impl Default for Clash {
diff --git a/src-tauri/src/utils/resolve.rs b/src-tauri/src/utils/resolve.rs
index 1dbb263..a569656 100644
--- a/src-tauri/src/utils/resolve.rs
+++ b/src-tauri/src/utils/resolve.rs
@@ -24,12 +24,9 @@ pub fn resolve_setup(app: &App) {
log_if_err!(clash.run_sidecar());
*profiles = Profiles::read_file();
- log_if_err!(clash.activate(&profiles));
- match app.get_window("main") {
- Some(win) => log_if_err!(clash.activate_enhanced(&profiles, win, true)),
- None => log::error!("failed to get window for enhanced profiles"),
- };
+ clash.set_window(app.get_window("main"));
+ log_if_err!(clash.activate(&profiles, true));
verge.init_sysproxy(clash.info.port.clone());
// enable tun mode
--
GitLab