v0.0.11

.github/workflows/ci.yml

@@ -1,26 +1,24 @@
-name: Release Project
+name: CI
 
-on:
+on: [push]
-  push:
+
-    tags:
+env:
-      - v*
+  CARGO_INCREMENTAL: 0
+  RUST_BACKTRACE: short
 
 jobs:
-  build-tauri:
+  release:
     strategy:
-      fail-fast: false
       matrix:
-        platform: [windows-latest]
+        os: [windows-latest, macos-11]
-    runs-on: ${{ matrix.platform }}
+    runs-on: ${{ matrix.os }}
+    if: |
+      startsWith(github.repository, 'zzzgydi') &&
+      startsWith(github.ref, 'refs/tags/v')
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Install Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: 14
-
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
@@ -28,6 +26,14 @@ jobs:
           profile: minimal
           override: true
 
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@ce325b60658c1b38465c06cc965b79baf32c1e72
+
+      - name: Install Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14
+
       - name: Get yarn cache dir path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -41,19 +47,18 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@ce325b60658c1b38465c06cc965b79baf32c1e72
-
       - name: Yarn install and check
         run: yarn && yarn run check
 
       - name: Tauri build
         uses: tauri-apps/tauri-action@v0
+        # enable cache even though failed
+        continue-on-error: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tagName: v__VERSION__
           releaseName: "Clash Verge v__VERSION__"
-          releaseBody: "This is a release."
+          releaseBody: "Clash Verge now supports Windows and macos(intel)."
-          releaseDraft: true
+          releaseDraft: false
-          prerelease: false
+          prerelease: true

.gitignore

@@ -3,3 +3,4 @@ node_modules
 dist
 dist-ssr
 *.local
+update.json

README.md

@@ -26,7 +26,7 @@ yarn install
 Then download the clash binary... Or you can download it from [clash premium release](https://github.com/Dreamacro/clash/releases/tag/premium) and rename it according to [tauri config](https://tauri.studio/en/docs/api/config#tauri.bundle.externalBin).
 
 ```shell
-yarn run predev
+yarn run check
 ```
 
 Then run
@@ -42,8 +42,12 @@ yarn dev
 ## Screenshots
 
 <div align="center">
-  <img src="./docs/demo1.png" alt="demo1" width="42%" />
+  <img src="./docs/demo1.png" alt="demo1" width="32%" />
-  <img src="./docs/demo2.png" alt="demo2" width="42%" />
+  <img src="./docs/demo2.png" alt="demo2" width="32%" />
+  <img src="./docs/demo3.png" alt="demo3" width="32%" />
+  <img src="./docs/demo4.png" alt="demo4" width="32%" />
+  <img src="./docs/demo5.png" alt="demo5" width="32%" />
+  <img src="./docs/demo6.png" alt="demo6" width="32%" />
 </div>
 
 ## Disclaimer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "clash-verge",
-  "version": "0.0.5",
+  "version": "0.0.11",
   "license": "GPL-3.0",
   "scripts": {
     "dev": "cargo tauri dev",

scripts/publish.mjs

@@ -11,10 +11,16 @@ async function resolvePublish() {
 
   let [a, b, c] = packageJson.version.split(".").map(Number);
 
-  if (flag === "major") a += 1;
+  if (flag === "major") {
-  else if (flag === "minor") b += 1;
+    a += 1;
-  else if (flag === "patch") c += 1;
+    b = 0;
-  else throw new Error(`invalid flag "${flag}"`);
+    c = 0;
+  } else if (flag === "minor") {
+    b += 1;
+    c = 0;
+  } else if (flag === "patch") {
+    c += 1;
+  } else throw new Error(`invalid flag "${flag}"`);
 
   const nextVersion = `${a}.${b}.${c}`;
   packageJson.version = nextVersion;

src-tauri/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 description = "clash verge"
 authors = ["zzzgydi"]
 license = "GPL-3.0"
-repository = ""
+repository = "https://github.com/zzzgydi/clash-verge.git"
 default-run = "app"
 edition = "2021"
 build = "build.rs"
@@ -19,13 +19,18 @@ serde_json = "1.0"
 serde_yaml = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 # tauri = { version = "1.0.0-beta.8", features = ["api-all", "system-tray"] }
-tauri = { git = "https://github.com/tauri-apps/tauri", rev = "5e0d59ec", features = ["api-all", "system-tray"] }
+# tauri = { git = "https://github.com/tauri-apps/tauri", rev = "5e0d59ec", features = ["api-all", "system-tray"] }
+tauri = { git = "https://github.com/tauri-apps/tauri", branch = "next",  features = ["api-all", "system-tray", "updater"] }
+tauri-plugin-shadows = { git = "https://github.com/tauri-apps/tauri-plugin-shadows", features = ["tauri-impl"] }
+tauri-plugin-vibrancy = { git = "https://github.com/tauri-apps/tauri-plugin-vibrancy", features = ["tauri-impl"] }
 
 reqwest = { version = "0.11", features = ["json"] }
 tokio = { version = "1", features = ["full"] }
 log = "0.4.14"
 log4rs = "1.0.0"
 warp = "0.3"
+which = "4.2.2"
+auto-launch = "0.2"
 port_scanner = "0.1.5"
 
 [target.'cfg(windows)'.dependencies]

src-tauri/src/cmds.rs

@@ -3,11 +3,13 @@ use crate::{
   states::{ClashState, ProfilesState, VergeState},
   utils::{
     config::{read_clash, save_clash},
+    dirs::app_home_dir,
     fetch::fetch_profile,
     sysopt::SysProxyConfig,
   },
 };
 use serde_yaml::Mapping;
+use std::process::Command;
 use tauri::State;
 
 /// get all profiles from `profiles.yaml`
@@ -29,11 +31,15 @@ pub fn sync_profiles(profiles: State<'_, ProfilesState>) -> Result<(), String> {
   }
 }
 
-/// Import the profile from url
+/// import the profile from url
 /// and save to `profiles.yaml`
 #[tauri::command]
-pub async fn import_profile(url: String, profiles: State<'_, ProfilesState>) -> Result<(), String> {
+pub async fn import_profile(
-  match fetch_profile(&url).await {
+  url: String,
+  with_proxy: bool,
+  profiles: State<'_, ProfilesState>,
+) -> Result<(), String> {
+  match fetch_profile(&url, with_proxy).await {
     Some(result) => {
       let mut profiles = profiles.0.lock().unwrap();
       profiles.import_from_url(url, result)
@@ -43,12 +49,10 @@ pub async fn import_profile(url: String, profiles: State<'_, ProfilesState>) ->
 }
 
 /// Update the profile
-/// and save to `profiles.yaml`
-/// http request firstly
-/// then acquire the lock of `profiles.yaml`
 #[tauri::command]
 pub async fn update_profile(
   index: usize,
+  with_proxy: bool,
   clash: State<'_, ClashState>,
   profiles: State<'_, ProfilesState>,
 ) -> Result<(), String> {
@@ -69,7 +73,7 @@ pub async fn update_profile(
     Err(_) => return Err("failed to get profiles lock".into()),
   };
 
-  match fetch_profile(&url).await {
+  match fetch_profile(&url, with_proxy).await {
     Some(result) => match profiles.0.lock() {
       Ok(mut profiles) => {
         profiles.update_item(index, result)?;
@@ -107,13 +111,23 @@ pub fn select_profile(
   }
 }
 
-/// todo: need to check
 /// delete profile item
 #[tauri::command]
-pub fn delete_profile(index: usize, profiles: State<'_, ProfilesState>) -> Result<(), String> {
+pub fn delete_profile(
-  match profiles.0.lock() {
+  index: usize,
-    Ok(mut profiles) => profiles.delete_item(index),
+  clash_state: State<'_, ClashState>,
-    Err(_) => Err("can not get profiles lock".into()),
+  profiles_state: State<'_, ProfilesState>,
+) -> Result<(), String> {
+  let mut profiles = profiles_state.0.lock().unwrap();
+  match profiles.delete_item(index) {
+    Ok(change) => match change {
+      true => {
+        let clash = clash_state.0.lock().unwrap();
+        profiles.activate(clash.info.clone())
+      }
+      false => Ok(()),
+    },
+    Err(err) => Err(err),
   }
 }
 
@@ -130,12 +144,57 @@ pub fn patch_profile(
   }
 }
 
+/// run vscode command to edit the profile
+#[tauri::command]
+pub fn edit_profile(index: usize, profiles_state: State<'_, ProfilesState>) -> Result<(), String> {
+  let mut profiles = profiles_state.0.lock().unwrap();
+  let items = profiles.items.take().unwrap_or(vec![]);
+
+  if index >= items.len() {
+    profiles.items = Some(items);
+    return Err("the index out of bound".into());
+  }
+
+  let file = items[index].file.clone().unwrap_or("".into());
+  profiles.items = Some(items);
+
+  let path = app_home_dir().join("profiles").join(file);
+  if !path.exists() {
+    return Err("failed to open the file".into());
+  }
+
+  match which::which("code") {
+    Ok(code) => match Command::new(code).arg(path).status() {
+      Ok(_) => Ok(()),
+      Err(_) => Err("failed to open file by VScode".into()),
+    },
+    Err(_) => Err("please install VScode for edit".into()),
+  }
+}
+
 /// restart the sidecar
 #[tauri::command]
-pub fn restart_sidecar(clash_state: State<'_, ClashState>) {
+pub fn restart_sidecar(
-  let mut clash_arc = clash_state.0.lock().unwrap();
+  clash_state: State<'_, ClashState>,
-  if let Err(err) = clash_arc.restart_sidecar() {
+  profiles_state: State<'_, ProfilesState>,
-    log::error!("{}", err);
+) -> Result<(), String> {
+  let mut clash = clash_state.0.lock().unwrap();
+
+  match clash.restart_sidecar() {
+    Ok(_) => {
+      let profiles = profiles_state.0.lock().unwrap();
+      match profiles.activate(clash.info.clone()) {
+        Ok(()) => Ok(()),
+        Err(err) => {
+          log::error!("{}", err);
+          Err(err)
+        }
+      }
+    }
+    Err(err) => {
+      log::error!("{}", err);
+      Err(err)
+    }
   }
 }
 
@@ -166,24 +225,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<SysProxyConfig, String> {
   match SysProxyConfig::get_sys() {
@@ -192,6 +234,8 @@ pub fn get_sys_proxy() -> Result<SysProxyConfig, String> {
   }
 }
 
+/// 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<Option<SysProxyConfig>, String> {
   match verge_state.0.lock() {
@@ -217,22 +261,5 @@ pub async fn patch_verge_config(
   verge_state: State<'_, VergeState>,
 ) -> Result<(), String> {
   let mut verge = verge_state.0.lock().unwrap();
-
+  verge.patch_config(payload)
-  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()
 }

src-tauri/src/core/profiles.rs

@@ -195,7 +195,7 @@ impl ProfilesConfig {
   }
 
   /// delete the item
-  pub fn delete_item(&mut self, index: usize) -> Result<(), String> {
+  pub fn delete_item(&mut self, index: usize) -> Result<bool, String> {
     let mut current = self.current.clone().unwrap_or(0);
     let mut items = self.items.clone().unwrap_or(vec![]);
 
@@ -205,13 +205,22 @@ impl ProfilesConfig {
 
     items.remove(index);
 
+    let mut should_change = false;
+
     if current == index {
       current = 0;
+      should_change = true;
     } else if current > index {
       current = current - 1;
     }
+
     self.current = Some(current);
-    self.save_file()
+    self.items = Some(items);
+
+    match self.save_file() {
+      Ok(_) => Ok(should_change),
+      Err(err) => Err(err),
+    }
   }
 
   /// activate current profile
@@ -303,7 +312,10 @@ pub async fn activate_profile(profile_item: &ProfileItem, info: &ClashInfo) -> R
   let mut data = HashMap::new();
   data.insert("path", temp_path.as_os_str().to_str().unwrap());
 
-  let client = reqwest::Client::new();
+  let client = match reqwest::ClientBuilder::new().no_proxy().build() {
+    Ok(c) => c,
+    Err(_) => return Err("failed to create http::put".into()),
+  };
   match client.put(server).headers(headers).json(&data).send().await {
     Ok(_) => Ok(()),
     Err(err) => Err(format!("request failed `{}`", err.to_string())),

src-tauri/src/core/verge.rs

@@ -1,5 +1,7 @@
 use crate::utils::{config, dirs, sysopt::SysProxyConfig};
+use auto_launch::{AutoLaunch, AutoLaunchBuilder};
 use serde::{Deserialize, Serialize};
+use tauri::api::path::resource_dir;
 
 /// ### `verge.yaml` schema
 #[derive(Default, Debug, Clone, Deserialize, Serialize)]
@@ -7,8 +9,12 @@ pub struct VergeConfig {
   /// `light` or `dark`
   pub theme_mode: Option<String>,
 
+  /// enable blur mode
+  /// maybe be able to set the alpha
+  pub theme_blur: Option<bool>,
+
   /// can the app auto startup
-  pub enable_self_startup: Option<bool>,
+  pub enable_auto_launch: Option<bool>,
 
   /// set system proxy
   pub enable_system_proxy: Option<bool>,
@@ -34,6 +40,7 @@ impl VergeConfig {
   }
 }
 
+/// Verge App abilities
 #[derive(Debug)]
 pub struct Verge {
   pub config: VergeConfig,
@@ -41,6 +48,8 @@ pub struct Verge {
   pub old_sysproxy: Option<SysProxyConfig>,
 
   pub cur_sysproxy: Option<SysProxyConfig>,
+
+  pub auto_launch: Option<AutoLaunch>,
 }
 
 impl Default for Verge {
@@ -55,6 +64,7 @@ impl Verge {
       config: VergeConfig::new(),
       old_sysproxy: None,
       cur_sysproxy: None,
+      auto_launch: None,
     }
   }
 
@@ -90,4 +100,117 @@ impl Verge {
       }
     }
   }
+
+  /// init the auto launch
+  pub fn init_launch(&mut self, package_info: &tauri::PackageInfo) {
+    let app_name = "clash-verge";
+    let app_path = get_app_path(app_name);
+    let app_path = resource_dir(package_info).unwrap().join(app_path);
+    let app_path = app_path.as_os_str().to_str().unwrap();
+
+    let auto = AutoLaunchBuilder::new()
+      .set_app_name(app_name)
+      .set_app_path(app_path)
+      .build();
+
+    self.auto_launch = Some(auto);
+  }
+
+  /// sync the startup when run the app
+  pub fn sync_launch(&self) -> Result<(), String> {
+    let enable = self.config.enable_auto_launch.clone().unwrap_or(false);
+    if !enable {
+      return Ok(());
+    }
+
+    if self.auto_launch.is_none() {
+      return Err("should init the auto launch first".into());
+    }
+
+    let auto_launch = self.auto_launch.clone().unwrap();
+
+    let is_enabled = auto_launch.is_enabled().unwrap_or(false);
+    if !is_enabled {
+      if let Err(_) = auto_launch.enable() {
+        return Err("failed to enable auto-launch".into());
+      }
+    }
+
+    Ok(())
+  }
+
+  /// update the startup
+  fn update_launch(&mut self, enable: bool) -> Result<(), String> {
+    let conf_enable = self.config.enable_auto_launch.clone().unwrap_or(false);
+
+    if enable == conf_enable {
+      return Ok(());
+    }
+
+    let auto_launch = self.auto_launch.clone().unwrap();
+
+    let result = if enable {
+      auto_launch.enable()
+    } else {
+      auto_launch.disable()
+    };
+
+    match result {
+      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;
+    }
+    if patch.theme_blur.is_some() {
+      self.config.theme_blur = patch.theme_blur;
+    }
+
+    // should update system startup
+    if patch.enable_auto_launch.is_some() {
+      let enable = patch.enable_auto_launch.unwrap();
+      self.update_launch(enable)?;
+      self.config.enable_auto_launch = 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 proxy too
+    if patch.system_proxy_bypass.is_some() {
+      self.config.system_proxy_bypass = patch.system_proxy_bypass;
+    }
+
+    self.config.save_file()
+  }
+}
+
+// Get the target app_path
+fn get_app_path(app_name: &str) -> String {
+  #[cfg(target_os = "linux")]
+  let ext = "";
+  #[cfg(target_os = "macos")]
+  let ext = ".app";
+  #[cfg(target_os = "windows")]
+  let ext = ".exe";
+  String::from(app_name) + ext
 }

src-tauri/src/main.rs

@@ -3,8 +3,6 @@
   windows_subsystem = "windows"
 )]
 
-extern crate tauri;
-
 mod cmds;
 mod core;
 mod states;
@@ -22,10 +20,10 @@ fn main() -> std::io::Result<()> {
   }
 
   let menu = SystemTrayMenu::new()
-    .add_item(CustomMenuItem::new("open_window", "显示应用"))
+    .add_item(CustomMenuItem::new("open_window", "Show"))
-    .add_item(CustomMenuItem::new("restart_clash", "重启clash"))
+    .add_item(CustomMenuItem::new("restart_clash", "Restart Clash"))
     .add_native_item(SystemTrayMenuItem::Separator)
-    .add_item(CustomMenuItem::new("quit", "退出").accelerator("CmdOrControl+Q"));
+    .add_item(CustomMenuItem::new("quit", "Quit").accelerator("CmdOrControl+Q"));
 
   tauri::Builder::default()
     .manage(states::VergeState::default())
@@ -37,14 +35,22 @@ fn main() -> std::io::Result<()> {
       SystemTrayEvent::MenuItemClick { id, .. } => match id.as_str() {
         "open_window" => {
           let window = app_handle.get_window("main").unwrap();
+          window.unminimize().unwrap();
           window.show().unwrap();
           window.set_focus().unwrap();
         }
         "restart_clash" => {
           let clash_state = app_handle.state::<states::ClashState>();
-          let mut clash_arc = clash_state.0.lock().unwrap();
+          let mut clash = clash_state.0.lock().unwrap();
-          if let Err(err) = clash_arc.restart_sidecar() {
+          match clash.restart_sidecar() {
-            log::error!("{}", err);
+            Ok(_) => {
+              let profiles = app_handle.state::<states::ProfilesState>();
+              let profiles = profiles.0.lock().unwrap();
+              if let Err(err) = profiles.activate(clash.info.clone()) {
+                log::error!("{}", err);
+              }
+            }
+            Err(err) => log::error!("{}", err),
           }
         }
         "quit" => {
@@ -56,27 +62,32 @@ fn main() -> std::io::Result<()> {
       },
       SystemTrayEvent::LeftClick { .. } => {
         let window = app_handle.get_window("main").unwrap();
+        window.unminimize().unwrap();
         window.show().unwrap();
         window.set_focus().unwrap();
       }
       _ => {}
     })
     .invoke_handler(tauri::generate_handler![
+      // common
       cmds::restart_sidecar,
-      cmds::set_sys_proxy,
       cmds::get_sys_proxy,
       cmds::get_cur_proxy,
+      // clash
       cmds::get_clash_info,
       cmds::patch_clash_config,
+      // verge
       cmds::get_verge_config,
       cmds::patch_verge_config,
+      // profile
+      cmds::edit_profile,
+      cmds::patch_profile,
       cmds::import_profile,
       cmds::update_profile,
       cmds::delete_profile,
       cmds::select_profile,
-      cmds::patch_profile,
-      cmds::sync_profiles,
       cmds::get_profiles,
+      cmds::sync_profiles,
     ])
     .build(tauri::generate_context!())
     .expect("error while running tauri application")
@@ -86,10 +97,7 @@ fn main() -> std::io::Result<()> {
         api.prevent_close();
         app_handle.get_window(&label).unwrap().hide().unwrap();
       }
-      tauri::Event::ExitRequested { api, .. } => {
+      tauri::Event::ExitRequested { .. } => {
-        api.prevent_exit();
-      }
-      tauri::Event::Exit => {
         resolve::resolve_reset(app_handle);
         api::process::kill_children();
       }

src-tauri/src/utils/fetch.rs

@@ -23,11 +23,20 @@ fn parse_string<T: FromStr>(target: &str, key: &str) -> Option<T> {
 }
 
 /// fetch and parse the profile
-pub async fn fetch_profile(url: &str) -> Option<ProfileResponse> {
+pub async fn fetch_profile(url: &str, with_proxy: bool) -> Option<ProfileResponse> {
-  let resp = match reqwest::get(url).await {
+  let builder = reqwest::ClientBuilder::new();
-    Ok(res) => res,
+  let client = match with_proxy {
+    true => builder.build(),
+    false => builder.no_proxy().build(),
+  };
+  let resp = match client {
+    Ok(client) => match client.get(url).send().await {
+      Ok(res) => res,
+      Err(_) => return None,
+    },
     Err(_) => return None,
   };
+
   let header = resp.headers();
 
   // parse the Subscription Userinfo

src-tauri/src/utils/resolve.rs

@@ -1,9 +1,24 @@
 use super::{init, server};
 use crate::{core::ProfilesConfig, states};
 use tauri::{App, AppHandle, Manager};
+use tauri_plugin_shadows::Shadows;
 
 /// handle something when start app
 pub fn resolve_setup(app: &App) {
+  // set shadow when window decorations
+  let window = app.get_window("main").unwrap();
+  window.set_shadow(true);
+
+  // enable system blur
+  use tauri_plugin_vibrancy::Vibrancy;
+  #[cfg(target_os = "windows")]
+  window.apply_blur();
+  #[cfg(target_os = "macos")]
+  {
+    use tauri_plugin_vibrancy::MacOSVibrancy;
+    window.apply_vibrancy(MacOSVibrancy::AppearanceBased);
+  }
+
   // setup a simple http server for singleton
   server::embed_server(&app.handle());
 
@@ -29,12 +44,16 @@ pub fn resolve_setup(app: &App) {
   }
 
   verge.init_sysproxy(clash.info.port.clone());
+  verge.init_launch(app.package_info());
+  if let Err(err) = verge.sync_launch() {
+    log::error!("{}", err);
+  }
 }
 
 /// reset system proxy
 pub fn resolve_reset(app_handle: &AppHandle) {
   let verge_state = app_handle.state::<states::VergeState>();
-  let mut verge_arc = verge_state.0.lock().unwrap();
+  let mut verge = verge_state.0.lock().unwrap();
 
-  verge_arc.reset_sysproxy();
+  verge.reset_sysproxy();
 }

src-tauri/src/utils/sysopt.rs

@@ -1,7 +1,13 @@
 use serde::{Deserialize, Serialize};
 use std::io;
 
+#[cfg(target_os = "windows")]
 static DEFAULT_BYPASS: &str = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*;<local>";
+#[cfg(target_os = "macos")]
+static DEFAULT_BYPASS: &str =
+  "192.168.0.0/16\n10.0.0.0/8\n172.16.0.0/12\n127.0.0.1\nlocalhost\n*.local\ntimestamp.apple.com\n";
+#[cfg(target_os = "macos")]
+static MACOS_SERVICE: &str = "Wi-Fi";
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct SysProxyConfig {
@@ -29,8 +35,8 @@ impl SysProxyConfig {
     }
   }
 
-  /// Get the windows system proxy config
   #[cfg(target_os = "windows")]
+  /// Get the windows system proxy config
   pub fn get_sys() -> io::Result<Self> {
     use winreg::enums::*;
     use winreg::RegKey;
@@ -48,6 +54,43 @@ impl SysProxyConfig {
     })
   }
 
+  #[cfg(target_os = "macos")]
+  /// Get the macos system proxy config
+  pub fn get_sys() -> io::Result<Self> {
+    use std::process::Command;
+
+    let http = macproxy::get_proxy(&["-getwebproxy", MACOS_SERVICE])?;
+    let https = macproxy::get_proxy(&["-getsecurewebproxy", MACOS_SERVICE])?;
+    let sock = macproxy::get_proxy(&["-getsocksfirewallproxy", MACOS_SERVICE])?;
+
+    let mut enable = false;
+    let mut server = "".into();
+
+    if sock.0 == "Yes" {
+      enable = true;
+      server = sock.1;
+    }
+    if https.0 == "Yes" {
+      enable = true;
+      server = https.1;
+    }
+    if http.0 == "Yes" || !enable {
+      enable = http.0 == "Yes";
+      server = http.1;
+    }
+
+    let bypass_output = Command::new("networksetup")
+      .args(["-getproxybypassdomains", MACOS_SERVICE])
+      .output()?;
+    let bypass = std::str::from_utf8(&bypass_output.stdout).unwrap_or(DEFAULT_BYPASS);
+
+    Ok(SysProxyConfig {
+      enable,
+      server,
+      bypass: bypass.into(),
+    })
+  }
+
   #[cfg(target_os = "windows")]
   /// Set the windows system proxy config
   pub fn set_sys(&self) -> io::Result<()> {
@@ -65,21 +108,104 @@ impl SysProxyConfig {
     cur_var.set_value("ProxyServer", &self.server)?;
     cur_var.set_value("ProxyOverride", &self.bypass)
   }
+
+  #[cfg(target_os = "macos")]
+  /// Set the macos system proxy config
+  pub fn set_sys(&self) -> io::Result<()> {
+    let enable = self.enable;
+    let server = self.server.as_str();
+    macproxy::set_proxy("-setwebproxy", MACOS_SERVICE, enable, server)?;
+    macproxy::set_proxy("-setsecurewebproxy", MACOS_SERVICE, enable, server)?;
+    macproxy::set_proxy("-setsocksfirewallproxy", MACOS_SERVICE, enable, server)
+  }
 }
 
-// #[cfg(target_os = "macos")]
+#[cfg(target_os = "macos")]
-// mod macos {
+mod macproxy {
-//   use super::*;
+  use super::*;
+  use std::process::Command;
 
-//   pub fn get_proxy_config() -> io::Result<SysProxyConfig> {
+  /// use networksetup
-//     Ok(SysProxyConfig {
+  /// get the target proxy config
-//       enable: false,
+  pub(super) fn get_proxy(args: &[&str; 2]) -> io::Result<(String, String)> {
-//       server: "server".into(),
+    let output = Command::new("networksetup").args(args).output()?;
-//       bypass: "bypass".into(),
+    match std::str::from_utf8(&output.stdout) {
-//     })
+      Ok(stdout) => {
-//   }
+        let enable = parse(stdout, "Enabled:");
+        let server = parse(stdout, "Server:");
+        let port = parse(stdout, "Port:");
+        let server = format!("{}:{}", server, port);
+        Ok((enable.into(), server))
+      }
+      Err(_) => Err(io::Error::from_raw_os_error(1)),
+    }
+  }
 
-//   pub fn set_proxy_config(config: &SysProxyConfig) -> io::Result<()> {
+  /// use networksetup
-//     Ok(())
+  /// set the target proxy config
-//   }
+  pub(super) fn set_proxy(
-// }
+    target: &str, // like: -setwebproxy
+    device: &str,
+    enable: bool,
+    server: &str,
+  ) -> io::Result<()> {
+    let mut split = server.split(":");
+    let domain = split.next();
+    let port = split.next();
+
+    // can not parse the field
+    if domain.is_none() || port.is_none() {
+      return Err(io::Error::from_raw_os_error(1));
+    }
+
+    let args = vec![target, device, domain.unwrap(), port.unwrap()];
+    Command::new("networksetup").args(&args).status()?;
+
+    let target_state = String::from(target) + "state";
+    let enable = if enable { "on" } else { "off" };
+    let args = vec![target_state.as_str(), device, enable];
+    Command::new("networksetup").args(&args).status()?;
+    Ok(())
+  }
+
+  /// parse the networksetup output
+  pub(super) fn parse<'a>(target: &'a str, key: &'a str) -> &'a str {
+    match target.find(key) {
+      Some(idx) => {
+        let idx = idx + key.len();
+        let value = &target[idx..];
+        let value = match value.find("\n") {
+          Some(end) => &value[..end],
+          None => value,
+        };
+        value.trim()
+      }
+      None => "",
+    }
+  }
+
+  #[test]
+  fn test_get() {
+    use std::process::Command;
+
+    let output = Command::new("networksetup")
+      .args(["-getwebproxy", "Wi-Fi"])
+      .output();
+
+    let output = output.unwrap();
+    let stdout = std::str::from_utf8(&output.stdout).unwrap();
+    let enable = parse(stdout, "Enabled:");
+    let server = parse(stdout, "Server:");
+    let port = parse(stdout, "Port:");
+
+    println!("enable: {}, server: {}, port: {}", enable, server, port);
+
+    dbg!(SysProxyConfig::get_sys().unwrap());
+  }
+
+  #[test]
+  fn test_set() {
+    let sysproxy = SysProxyConfig::new(true, "7890".into(), None);
+    dbg!(sysproxy.set_sys().unwrap());
+  }
+}

src-tauri/tauri.conf.json

@@ -1,11 +1,11 @@
 {
   "package": {
     "productName": "clash-verge",
-    "version": "0.0.5"
+    "version": "0.0.11"
   },
   "build": {
     "distDir": "../dist",
-    "devPath": "http://localhost:3000/proxy",
+    "devPath": "http://localhost:3000/",
     "beforeDevCommand": "yarn run web:dev",
     "beforeBuildCommand": "yarn run web:build"
   },
@@ -50,7 +50,11 @@
       }
     },
     "updater": {
-      "active": false
+      "active": true,
+      "endpoints": [
+        "https://github.com/zzzgydi/clash-verge/releases/download/updater/update.json"
+      ],
+      "dialog": false
     },
     "allowlist": {
       "all": true
@@ -62,8 +66,8 @@
         "height": 600,
         "resizable": true,
         "fullscreen": false,
-        "decorations": true,
+        "decorations": false,
-        "transparent": false,
+        "transparent": true,
         "minWidth": 600,
         "minHeight": 520
       }

src/assets/styles/index.scss

@@ -28,3 +28,4 @@ body {
 }
 
 @import "./layout.scss";
+@import "./page.scss";

src/assets/styles/layout.scss

@@ -1,46 +1,81 @@
 .layout {
   width: 100%;
+  height: 100vh;
   display: flex;
   overflow: hidden;
 
-  &__sidebar {
+  &__left {
-    position: relative;
     flex: 1 0 25%;
-    height: 100vh;
+    display: flex;
+    height: 100%;
     max-width: 225px;
     min-width: 125px;
-    overflow: hidden auto;
+    padding: 8px 0;
+    flex-direction: column;
+    box-sizing: border-box;
+    user-select: none;
+    overflow: hidden;
+
+    .the-logo {
+      position: relative;
+      flex: 0 1 180px;
+      width: 100%;
+      max-width: 180px;
+      max-height: 180px;
+      margin: 0 auto;
+      padding: 0 8px;
+      text-align: center;
+      box-sizing: border-box;
+
+      img {
+        width: 100%;
+      }
+
+      .the-newbtn {
+        position: absolute;
+        right: 20px;
+        bottom: 12px;
+        transform: scale(0.8);
+      }
+    }
+
+    .the-menu {
+      flex: 1 1 75%;
+      overflow-y: auto;
+      margin-bottom: 8px;
+    }
+
+    .the-traffic {
+      flex: 0 0 60px;
+
+      > div {
+        margin: 0 auto;
+      }
+    }
   }
 
-  &__content {
+  &__right {
     position: relative;
     flex: 1 1 75%;
-    height: 100vh;
+    height: 100%;
-    overflow: auto;
-    box-sizing: border-box;
-    scrollbar-gutter: "stable";
-  }
 
-  &__logo {
+    .the-bar {
-    width: 100%;
+      position: absolute;
-    height: auto;
+      top: 2px;
-    max-width: 180px;
+      right: 8px;
-    max-height: 180px;
+      height: 36px;
-    margin: 0 auto;
+      display: flex;
-    padding: 8px 8px 0;
+      align-items: center;
-    user-select: none;
+      box-sizing: border-box;
-    text-align: center;
+      z-index: 2;
-    box-sizing: border-box;
+    }
-  }
 
-  &__traffic {
+    .the-content {
-    position: absolute;
+      position: absolute;
-    left: 0;
+      left: 0;
-    right: 0;
+      right: 0;
-    bottom: 8px;
+      top: 30px;
-
+      bottom: 10px;
-    > div {
-      margin: 0 auto;
     }
   }
 }

src/assets/styles/page.scss

@@ -0,0 +1,33 @@
+.base-page {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  > header {
+    flex: 0 0 58px;
+    width: 90%;
+    max-width: 850px;
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  > section {
+    position: relative;
+    flex: 1 1 100%;
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    padding: 8px 0;
+    box-sizing: border-box;
+    scrollbar-gutter: stable;
+
+    .base-content {
+      width: 90%;
+      max-width: 850px;
+      margin: 0 auto;
+    }
+  }
+}

src/components/base-page.tsx

@@ -0,0 +1,32 @@
+import { Typography } from "@mui/material";
+import React from "react";
+
+interface Props {
+  title?: React.ReactNode; // the page title
+  header?: React.ReactNode; // something behind title
+  contentStyle?: React.CSSProperties;
+}
+
+const BasePage: React.FC<Props> = (props) => {
+  const { title, header, contentStyle, children } = props;
+
+  return (
+    <div className="base-page" data-windrag>
+      <header data-windrag>
+        <Typography variant="h4" component="h1">
+          {title}
+        </Typography>
+
+        {header}
+      </header>
+
+      <section data-windrag>
+        <div className="base-content" style={contentStyle} data-windrag>
+          {children}
+        </div>
+      </section>
+    </div>
+  );
+};
+
+export default BasePage;

src/components/layout-control.tsx

@@ -0,0 +1,41 @@
+import { Button } from "@mui/material";
+import { appWindow } from "@tauri-apps/api/window";
+import {
+  CloseRounded,
+  CropSquareRounded,
+  HorizontalRuleRounded,
+} from "@mui/icons-material";
+
+const LayoutControl = () => {
+  const minWidth = 40;
+
+  return (
+    <>
+      <Button
+        size="small"
+        sx={{ minWidth, svg: { transform: "scale(0.9)" } }}
+        onClick={() => appWindow.minimize()}
+      >
+        <HorizontalRuleRounded fontSize="small" />
+      </Button>
+
+      <Button
+        size="small"
+        sx={{ minWidth, svg: { transform: "scale(0.9)" } }}
+        onClick={() => appWindow.toggleMaximize()}
+      >
+        <CropSquareRounded fontSize="small" />
+      </Button>
+
+      <Button
+        size="small"
+        sx={{ minWidth, svg: { transform: "scale(1.05)" } }}
+        onClick={() => appWindow.hide()}
+      >
+        <CloseRounded fontSize="small" />
+      </Button>
+    </>
+  );
+};
+
+export default LayoutControl;

src/components/notice.tsx

@@ -0,0 +1,92 @@
+import ReactDOM from "react-dom";
+import { ReactNode, useState } from "react";
+import { Box, IconButton, Slide, Snackbar, Typography } from "@mui/material";
+import { Close, CheckCircleRounded, ErrorRounded } from "@mui/icons-material";
+
+interface InnerProps {
+  type: string;
+  duration?: number;
+  message: ReactNode;
+  onClose: () => void;
+}
+
+const NoticeInner = (props: InnerProps) => {
+  const { type, message, duration = 2000, onClose } = props;
+  const [visible, setVisible] = useState(true);
+
+  const onBtnClose = () => {
+    setVisible(false);
+    onClose();
+  };
+  const onAutoClose = (_e: any, reason: string) => {
+    if (reason !== "clickaway") onBtnClose();
+  };
+
+  const msgElement =
+    type === "info" ? (
+      message
+    ) : (
+      <Box sx={{ display: "flex", alignItems: "center" }}>
+        {type === "error" && <ErrorRounded color="error" />}
+        {type === "success" && <CheckCircleRounded color="success" />}
+
+        <Typography
+          sx={{ ml: 1, wordWrap: "break-word", wordBreak: "break-all" }}
+        >
+          {message}
+        </Typography>
+      </Box>
+    );
+
+  return (
+    <Snackbar
+      open={visible}
+      anchorOrigin={{ vertical: "top", horizontal: "right" }}
+      autoHideDuration={duration}
+      onClose={onAutoClose}
+      message={msgElement}
+      sx={{ maxWidth: 360 }}
+      TransitionComponent={(p) => <Slide {...p} direction="left" />}
+      transitionDuration={200}
+      action={
+        <IconButton size="small" color="inherit" onClick={onBtnClose}>
+          <Close fontSize="inherit" />
+        </IconButton>
+      }
+    />
+  );
+};
+
+interface NoticeInstance {
+  (props: Omit<InnerProps, "onClose">): void;
+
+  info(message: ReactNode, duration?: number): void;
+  error(message: ReactNode, duration?: number): void;
+  success(message: ReactNode, duration?: number): void;
+}
+
+let parent: HTMLDivElement = null!;
+
+// @ts-ignore
+const Notice: NoticeInstance = (props) => {
+  if (!parent) {
+    parent = document.createElement("div");
+    document.body.appendChild(parent);
+  }
+
+  const container = document.createElement("div");
+  parent.appendChild(container);
+
+  const onUnmount = () => {
+    const result = ReactDOM.unmountComponentAtNode(container);
+    if (result && parent) parent.removeChild(container);
+  };
+
+  ReactDOM.render(<NoticeInner {...props} onClose={onUnmount} />, container);
+};
+
+(["info", "error", "success"] as const).forEach((type) => {
+  Notice[type] = (message, duration) => Notice({ type, message, duration });
+});
+
+export default Notice;

src/components/profile-item.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useRef, useState } from "react";
 import dayjs from "dayjs";
 import {
   alpha,
@@ -8,13 +8,16 @@ import {
   LinearProgress,
   IconButton,
   keyframes,
+  MenuItem,
+  Menu,
 } from "@mui/material";
 import { useSWRConfig } from "swr";
 import { RefreshRounded } from "@mui/icons-material";
 import { CmdType } from "../services/types";
+import { updateProfile, deleteProfile, editProfile } from "../services/cmds";
+import Notice from "./notice";
 import parseTraffic from "../utils/parse-traffic";
 import relativeTime from "dayjs/plugin/relativeTime";
-import { updateProfile } from "../services/cmds";
 
 dayjs.extend(relativeTime);
 
@@ -30,22 +33,24 @@ const Wrapper = styled(Box)(({ theme }) => ({
 }));
 
 const round = keyframes`
-from { transform: rotate(0deg); }
+  from { transform: rotate(0deg); }
-to { transform: rotate(360deg); }
+  to { transform: rotate(360deg); }
 `;
 
 interface Props {
   index: number;
   selected: boolean;
   itemData: CmdType.ProfileItem;
-  onClick: () => void;
+  onSelect: (force: boolean) => void;
 }
 
-const ProfileItemComp: React.FC<Props> = (props) => {
+const ProfileItem: React.FC<Props> = (props) => {
-  const { index, selected, itemData, onClick } = props;
+  const { index, selected, itemData, onSelect } = props;
 
   const { mutate } = useSWRConfig();
   const [loading, setLoading] = useState(false);
+  const [anchorEl, setAnchorEl] = useState<any>(null);
+  const [position, setPosition] = useState({ left: 0, top: 0 });
 
   const { name = "Profile", extra, updated = 0 } = itemData;
   const { upload = 0, download = 0, total = 0 } = extra ?? {};
@@ -54,111 +59,170 @@ const ProfileItemComp: React.FC<Props> = (props) => {
   const progress = Math.round(((download + upload) * 100) / (total + 0.1));
   const fromnow = updated > 0 ? dayjs(updated * 1000).fromNow() : "";
 
-  const onUpdate = async () => {
+  const onEdit = async () => {
+    setAnchorEl(null);
+    try {
+      await editProfile(index);
+    } catch (err: any) {
+      Notice.error(err.toString());
+    }
+  };
+
+  const onForceSelect = () => {
+    setAnchorEl(null);
+    onSelect(true);
+  };
+
+  const onUpdateWrapper = (withProxy: boolean) => async () => {
+    setAnchorEl(null);
     if (loading) return;
     setLoading(true);
     try {
-      await updateProfile(index);
+      await updateProfile(index, withProxy);
       mutate("getProfiles");
-    } catch (err) {
+    } catch (err: any) {
-      console.error(err);
+      Notice.error(err.toString());
     } finally {
       setLoading(false);
     }
   };
 
+  const deleteRef = useRef(false);
+  const onDelete = async () => {
+    setAnchorEl(null);
+    if (deleteRef.current) return;
+    deleteRef.current = true;
+    try {
+      await deleteProfile(index);
+      mutate("getProfiles");
+    } catch (err: any) {
+      Notice.error(err.toString());
+    } finally {
+      deleteRef.current = false;
+    }
+  };
+
+  const handleContextMenu = (
+    event: React.MouseEvent<HTMLDivElement, MouseEvent>
+  ) => {
+    const { clientX, clientY } = event;
+    setPosition({ top: clientY, left: clientX });
+    setAnchorEl(event.currentTarget);
+    event.preventDefault();
+  };
+
   return (
-    <Wrapper
+    <>
-      sx={({ palette }) => {
+      <Wrapper
-        const { mode, primary, text, grey } = palette;
+        sx={({ palette }) => {
-        const isDark = mode === "dark";
+          const { mode, primary, text, grey } = palette;
+          const key = `${mode}-${selected}`;
 
-        if (selected) {
+          const bgcolor = {
-          const bgcolor = isDark
+            "light-true": alpha(primary.main, 0.15),
-            ? alpha(primary.main, 0.35)
+            "light-false": palette.background.paper,
-            : alpha(primary.main, 0.15);
+            "dark-true": alpha(primary.main, 0.35),
+            "dark-false": alpha(grey[700], 0.35),
+          }[key]!;
 
-          return {
+          const color = {
-            bgcolor,
+            "light-true": text.secondary,
-            color: isDark ? alpha(text.secondary, 0.6) : text.secondary,
+            "light-false": text.secondary,
-            "& h2": {
+            "dark-true": alpha(text.secondary, 0.6),
-              color: isDark ? primary.light : primary.main,
+            "dark-false": alpha(text.secondary, 0.6),
-            },
+          }[key]!;
-          };
-        }
-        const bgcolor = isDark
-          ? alpha(grey[700], 0.35)
-          : palette.background.paper;
-        return {
-          bgcolor,
-          color: isDark ? alpha(text.secondary, 0.6) : text.secondary,
-          "& h2": {
-            color: isDark ? text.primary : text.primary,
-          },
-        };
-      }}
-      onClick={onClick}
-    >
-      <Box display="flex" justifyContent="space-between">
-        <Typography
-          width="calc(100% - 40px)"
-          variant="h6"
-          component="h2"
-          noWrap
-          title={name}
-        >
-          {name}
-        </Typography>
 
-        <IconButton
+          const h2color = {
-          sx={{
+            "light-true": primary.main,
-            width: 30,
+            "light-false": text.primary,
-            height: 30,
+            "dark-true": primary.light,
-            animation: loading ? `1s linear infinite ${round}` : "none",
+            "dark-false": text.primary,
-          }}
+          }[key]!;
-          color="inherit"
-          disabled={loading}
-          onClick={(e) => {
-            e.stopPropagation();
-            onUpdate();
-          }}
-        >
-          <RefreshRounded />
-        </IconButton>
-      </Box>
 
-      <Box display="flex" justifyContent="space-between" alignItems="center">
+          return { bgcolor, color, "& h2": { color: h2color } };
-        <Typography noWrap title={`From: ${from}`}>
-          {from}
-        </Typography>
-
-        <Typography
-          noWrap
-          flex="1 0 auto"
-          fontSize={14}
-          textAlign="right"
-          title="updated time"
-        >
-          {fromnow}
-        </Typography>
-      </Box>
-
-      <Box
-        sx={{
-          my: 0.5,
-          fontSize: 14,
-          display: "flex",
-          justifyContent: "space-between",
         }}
+        onClick={() => onSelect(false)}
+        onContextMenu={handleContextMenu}
       >
-        <span title="used / total">
+        <Box display="flex" justifyContent="space-between">
-          {parseTraffic(upload + download)} / {parseTraffic(total)}
+          <Typography
-        </span>
+            width="calc(100% - 40px)"
-        <span title="expire time">{expire}</span>
+            variant="h6"
-      </Box>
+            component="h2"
+            noWrap
+            title={name}
+          >
+            {name}
+          </Typography>
 
-      <LinearProgress variant="determinate" value={progress} color="inherit" />
+          <IconButton
-    </Wrapper>
+            sx={{
+              width: 30,
+              height: 30,
+              animation: loading ? `1s linear infinite ${round}` : "none",
+            }}
+            color="inherit"
+            disabled={loading}
+            onClick={(e) => {
+              e.stopPropagation();
+              onUpdateWrapper(false)();
+            }}
+          >
+            <RefreshRounded />
+          </IconButton>
+        </Box>
+
+        <Box display="flex" justifyContent="space-between" alignItems="center">
+          <Typography noWrap title={`From: ${from}`}>
+            {from}
+          </Typography>
+
+          <Typography
+            noWrap
+            flex="1 0 auto"
+            fontSize={14}
+            textAlign="right"
+            title="updated time"
+          >
+            {fromnow}
+          </Typography>
+        </Box>
+
+        <Box
+          sx={{
+            my: 0.5,
+            fontSize: 14,
+            display: "flex",
+            justifyContent: "space-between",
+          }}
+        >
+          <span title="used / total">
+            {parseTraffic(upload + download)} / {parseTraffic(total)}
+          </span>
+          <span title="expire time">{expire}</span>
+        </Box>
+
+        <LinearProgress
+          variant="determinate"
+          value={progress}
+          color="inherit"
+        />
+      </Wrapper>
+
+      <Menu
+        open={!!anchorEl}
+        anchorEl={anchorEl}
+        onClose={() => setAnchorEl(null)}
+        anchorPosition={position}
+        anchorReference="anchorPosition"
+      >
+        <MenuItem onClick={onForceSelect}>Select</MenuItem>
+        <MenuItem onClick={onEdit}>Edit(VScode)</MenuItem>
+        <MenuItem onClick={onUpdateWrapper(false)}>Update</MenuItem>
+        <MenuItem onClick={onUpdateWrapper(true)}>Update(Proxy)</MenuItem>
+        <MenuItem onClick={onDelete}>Delete</MenuItem>
+      </Menu>
+    </>
   );
 };
 
@@ -174,4 +238,4 @@ function parseExpire(expire?: number) {
   return dayjs(expire * 1000).format("YYYY-MM-DD");
 }
 
-export default ProfileItemComp;
+export default ProfileItem;

src/components/proxy-group.tsx

@@ -1,15 +1,12 @@
 import { useState } from "react";
 import { Virtuoso } from "react-virtuoso";
 import {
-  alpha,
   Box,
   Collapse,
   Divider,
   IconButton,
   List,
   ListItem,
-  ListItemButton,
-  ListItemIcon,
   ListItemText,
 } from "@mui/material";
 import {
@@ -18,53 +15,11 @@ import {
   ExpandMoreRounded,
   MyLocationRounded,
   NetworkCheckRounded,
-  CheckCircleOutlineRounded,
 } from "@mui/icons-material";
 import { updateProxy } from "../services/api";
 import { ApiType } from "../services/types";
 import { getProfiles, patchProfile } from "../services/cmds";
-
+import ProxyItem from "./proxy-item";
-interface ItemProps {
-  proxy: ApiType.ProxyItem;
-  selected: boolean;
-  onClick?: (name: string) => void;
-}
-
-const Item = ({ proxy, selected, onClick }: ItemProps) => {
-  return (
-    <ListItem sx={{ py: 0, pl: 4 }}>
-      <ListItemButton
-        dense
-        selected={selected}
-        onClick={() => onClick?.(proxy.name)}
-        sx={[
-          {
-            borderRadius: 1,
-          },
-          ({ palette: { mode, primary } }) => {
-            const bgcolor =
-              mode === "light"
-                ? alpha(primary.main, 0.15)
-                : alpha(primary.main, 0.35);
-            const color = mode === "light" ? primary.main : primary.light;
-
-            return {
-              "&.Mui-selected": { bgcolor },
-              "&.Mui-selected .MuiListItemText-secondary": { color },
-            };
-          },
-        ]}
-      >
-        <ListItemText title={proxy.name} secondary={proxy.name} />
-        <ListItemIcon
-          sx={{ justifyContent: "flex-end", color: "primary.main" }}
-        >
-          {selected && <CheckCircleOutlineRounded sx={{ fontSize: 16 }} />}
-        </ListItemIcon>
-      </ListItemButton>
-    </ListItem>
-  );
-};
 
 interface Props {
   group: ApiType.ProxyGroupItem;
@@ -143,12 +98,13 @@ const ProxyGroup = ({ group }: Props) => {
 
         {proxies.length >= 10 ? (
           <Virtuoso
-            style={{ height: "400px", marginBottom: "4px" }}
+            style={{ height: "320px", marginBottom: "4px" }}
             totalCount={proxies.length}
             itemContent={(index) => (
-              <Item
+              <ProxyItem
                 proxy={proxies[index]}
                 selected={proxies[index].name === now}
+                sx={{ py: 0, pl: 4 }}
                 onClick={onUpdate}
               />
             )}
@@ -157,13 +113,14 @@ const ProxyGroup = ({ group }: Props) => {
           <List
             component="div"
             disablePadding
-            sx={{ maxHeight: "400px", overflow: "auto", mb: "4px" }}
+            sx={{ maxHeight: "320px", overflow: "auto", mb: "4px" }}
           >
             {proxies.map((proxy) => (
-              <Item
+              <ProxyItem
                 key={proxy.name}
                 proxy={proxy}
                 selected={proxy.name === now}
+                sx={{ py: 0, pl: 4 }}
                 onClick={onUpdate}
               />
             ))}

src/components/proxy-item.tsx

@@ -0,0 +1,58 @@
+import { CheckCircleOutlineRounded } from "@mui/icons-material";
+import {
+  alpha,
+  ListItem,
+  ListItemButton,
+  ListItemIcon,
+  ListItemText,
+  SxProps,
+  Theme,
+} from "@mui/material";
+import { ApiType } from "../services/types";
+
+interface Props {
+  proxy: ApiType.ProxyItem;
+  selected: boolean;
+  sx?: SxProps<Theme>;
+  onClick?: (name: string) => void;
+}
+
+const ProxyItem = (props: Props) => {
+  const { proxy, selected, sx, onClick } = props;
+
+  return (
+    <ListItem sx={sx}>
+      <ListItemButton
+        dense
+        selected={selected}
+        onClick={() => onClick?.(proxy.name)}
+        sx={[
+          {
+            borderRadius: 1,
+          },
+          ({ palette: { mode, primary } }) => {
+            const bgcolor =
+              mode === "light"
+                ? alpha(primary.main, 0.15)
+                : alpha(primary.main, 0.35);
+            const color = mode === "light" ? primary.main : primary.light;
+
+            return {
+              "&.Mui-selected": { bgcolor },
+              "&.Mui-selected .MuiListItemText-secondary": { color },
+            };
+          },
+        ]}
+      >
+        <ListItemText title={proxy.name} secondary={proxy.name} />
+        <ListItemIcon
+          sx={{ justifyContent: "flex-end", color: "primary.main" }}
+        >
+          {selected && <CheckCircleOutlineRounded sx={{ fontSize: 16 }} />}
+        </ListItemIcon>
+      </ListItemButton>
+    </ListItem>
+  );
+};
+
+export default ProxyItem;

src/components/setting-item.tsx

@@ -1,8 +0,0 @@
-import { ListItem, styled } from "@mui/material";
-
-const SettingItem = styled(ListItem)(() => ({
-  paddingTop: 5,
-  paddingBottom: 5,
-}));
-
-export default SettingItem;

src/components/setting-verge.tsx

@@ -1,101 +0,0 @@
-import useSWR, { useSWRConfig } from "swr";
-import {
-  List,
-  ListItemText,
-  ListSubheader,
-  Switch,
-  Typography,
-} from "@mui/material";
-import {
-  getVergeConfig,
-  patchVergeConfig,
-  setSysProxy,
-} from "../services/cmds";
-import { CmdType } from "../services/types";
-import GuardState from "./guard-state";
-import SettingItem from "./setting-item";
-import PaletteSwitch from "./palette-switch";
-import { version } from "../../package.json";
-
-interface Props {
-  onError?: (err: Error) => void;
-}
-
-const SettingVerge = ({ onError }: Props) => {
-  const { mutate } = useSWRConfig();
-  const { data: vergeConfig } = useSWR("getVergeConfig", getVergeConfig);
-
-  const {
-    theme_mode: mode = "light",
-    enable_self_startup: startup = false,
-    enable_system_proxy: proxy = false,
-  } = vergeConfig ?? {};
-
-  const onSwitchFormat = (_e: any, value: boolean) => value;
-
-  const onChangeData = (patch: Partial<CmdType.VergeConfig>) => {
-    mutate("getVergeConfig", { ...vergeConfig, ...patch }, false);
-  };
-
-  return (
-    <List>
-      <ListSubheader sx={{ background: "transparent" }}>通用设置</ListSubheader>
-
-      <SettingItem>
-        <ListItemText primary="外观主题" />
-        <GuardState
-          value={mode === "dark"}
-          valueProps="checked"
-          onCatch={onError}
-          onFormat={onSwitchFormat}
-          onChange={(e) => onChangeData({ theme_mode: e ? "dark" : "light" })}
-          onGuard={async (c) => {
-            await patchVergeConfig({ theme_mode: c ? "dark" : "light" });
-          }}
-        >
-          <PaletteSwitch edge="end" />
-        </GuardState>
-      </SettingItem>
-
-      <SettingItem>
-        <ListItemText primary="开机自启" />
-        <GuardState
-          value={startup}
-          valueProps="checked"
-          onCatch={onError}
-          onFormat={onSwitchFormat}
-          onChange={(e) => onChangeData({ enable_self_startup: e })}
-          onGuard={async (e) => {
-            await patchVergeConfig({ enable_self_startup: e });
-          }}
-        >
-          <Switch edge="end" />
-        </GuardState>
-      </SettingItem>
-
-      <SettingItem>
-        <ListItemText primary="设置系统代理" />
-        <GuardState
-          value={proxy}
-          valueProps="checked"
-          onCatch={onError}
-          onFormat={onSwitchFormat}
-          onChange={(e) => onChangeData({ enable_system_proxy: e })}
-          onGuard={async (e) => {
-            await setSysProxy(e);
-            await patchVergeConfig({ enable_system_proxy: e });
-          }}
-        >
-          <Switch edge="end" />
-        </GuardState>
-      </SettingItem>
-
-      <SettingItem>
-        <ListItemText primary="Version" />
-        <Typography sx={{ py: "6px" }}>v{version}</Typography>
-      </SettingItem>
-    </List>
-  );
-};
-
-export default SettingVerge;

src/components/setting/guard-state.tsx

@@ -1,5 +1,5 @@
 import { cloneElement, isValidElement, ReactNode, useRef } from "react";
-import noop from "../utils/noop";
+import noop from "../../utils/noop";
 
 interface Props<Value> {
   value?: Value;

src/components/setting/setting-clash.tsx

@@ -1,18 +1,16 @@
 import useSWR, { useSWRConfig } from "swr";
 import {
-  List,
   ListItemText,
-  ListSubheader,
   TextField,
   Switch,
   Select,
   MenuItem,
 } from "@mui/material";
-import { getClashConfig, updateConfigs } from "../services/api";
+import { getClashConfig, updateConfigs } from "../../services/api";
-import { patchClashConfig } from "../services/cmds";
+import { SettingList, SettingItem } from "./setting";
-import { ApiType } from "../services/types";
+import { patchClashConfig } from "../../services/cmds";
+import { ApiType } from "../../services/types";
 import GuardState from "./guard-state";
-import SettingItem from "./setting-item";
 
 interface Props {
   onError?: (err: Error) => void;
@@ -30,24 +28,18 @@ const SettingClash = ({ onError }: Props) => {
   } = clashConfig ?? {};
 
   const onSwitchFormat = (_e: any, value: boolean) => value;
-
   const onChangeData = (patch: Partial<ApiType.ConfigData>) => {
     mutate("getClashConfig", { ...clashConfig, ...patch }, false);
   };
-
   const onUpdateData = async (patch: Partial<ApiType.ConfigData>) => {
     await updateConfigs(patch);
     await patchClashConfig(patch);
   };
 
   return (
-    <List>
+    <SettingList title="Clash Setting">
-      <ListSubheader sx={{ background: "transparent" }}>
-        Clash设置
-      </ListSubheader>
-
       <SettingItem>
-        <ListItemText primary="局域网连接" />
+        <ListItemText primary="Allow Lan" />
         <GuardState
           value={allowLan}
           valueProps="checked"
@@ -75,7 +67,7 @@ const SettingClash = ({ onError }: Props) => {
       </SettingItem>
 
       <SettingItem>
-        <ListItemText primary="日志等级" />
+        <ListItemText primary="Log Level" />
         <GuardState
           value={logLevel}
           onCatch={onError}
@@ -94,7 +86,7 @@ const SettingClash = ({ onError }: Props) => {
       </SettingItem>
 
       <SettingItem>
-        <ListItemText primary="混合代理端口" />
+        <ListItemText primary="Mixed Port" />
         <TextField
           size="small"
           value={mixedPort!}
@@ -102,7 +94,7 @@ const SettingClash = ({ onError }: Props) => {
           disabled
         />
       </SettingItem>
-    </List>
+    </SettingList>
   );
 };
 

src/components/setting/setting-system.tsx

@@ -0,0 +1,67 @@
+import useSWR, { useSWRConfig } from "swr";
+import { Box, ListItemText, Switch } from "@mui/material";
+import { getVergeConfig, patchVergeConfig } from "../../services/cmds";
+import { SettingList, SettingItem } from "./setting";
+import { CmdType } from "../../services/types";
+import GuardState from "./guard-state";
+import SysproxyTooltip from "./sysproxy-tooltip";
+
+interface Props {
+  onError?: (err: Error) => void;
+}
+
+const SettingSystem = ({ onError }: Props) => {
+  const { mutate } = useSWRConfig();
+  const { data: vergeConfig } = useSWR("getVergeConfig", getVergeConfig);
+
+  const {
+    enable_auto_launch: startup = false,
+    enable_system_proxy: proxy = false,
+  } = vergeConfig ?? {};
+
+  const onSwitchFormat = (_e: any, value: boolean) => value;
+  const onChangeData = (patch: Partial<CmdType.VergeConfig>) => {
+    mutate("getVergeConfig", { ...vergeConfig, ...patch }, false);
+  };
+
+  return (
+    <SettingList title="System Setting">
+      <SettingItem>
+        <ListItemText primary="Auto Launch" />
+        <GuardState
+          value={startup}
+          valueProps="checked"
+          onCatch={onError}
+          onFormat={onSwitchFormat}
+          onChange={(e) => onChangeData({ enable_auto_launch: e })}
+          onGuard={(e) => patchVergeConfig({ enable_auto_launch: e })}
+        >
+          <Switch edge="end" />
+        </GuardState>
+      </SettingItem>
+
+      <SettingItem>
+        <ListItemText
+          primary={
+            <Box sx={{ display: "flex", alignItems: "center" }}>
+              System Proxy
+              <SysproxyTooltip />
+            </Box>
+          }
+        />
+        <GuardState
+          value={proxy}
+          valueProps="checked"
+          onCatch={onError}
+          onFormat={onSwitchFormat}
+          onChange={(e) => onChangeData({ enable_system_proxy: e })}
+          onGuard={(e) => patchVergeConfig({ enable_system_proxy: e })}
+        >
+          <Switch edge="end" />
+        </GuardState>
+      </SettingItem>
+    </SettingList>
+  );
+};
+
+export default SettingSystem;

src/components/setting/setting-verge.tsx

@@ -0,0 +1,66 @@
+import useSWR, { useSWRConfig } from "swr";
+import { ListItemText, Switch, Typography } from "@mui/material";
+import { getVergeConfig, patchVergeConfig } from "../../services/cmds";
+import { SettingList, SettingItem } from "./setting";
+import { CmdType } from "../../services/types";
+import { version } from "../../../package.json";
+import GuardState from "./guard-state";
+import PaletteSwitch from "./palette-switch";
+
+interface Props {
+  onError?: (err: Error) => void;
+}
+
+const SettingVerge = ({ onError }: Props) => {
+  const { mutate } = useSWRConfig();
+  const { data: vergeConfig } = useSWR("getVergeConfig", getVergeConfig);
+
+  const { theme_mode: mode = "light", theme_blur: blur = false } =
+    vergeConfig ?? {};
+
+  const onSwitchFormat = (_e: any, value: boolean) => value;
+  const onChangeData = (patch: Partial<CmdType.VergeConfig>) => {
+    mutate("getVergeConfig", { ...vergeConfig, ...patch }, false);
+  };
+
+  return (
+    <SettingList title="Verge Setting">
+      <SettingItem>
+        <ListItemText primary="Theme Mode" />
+        <GuardState
+          value={mode === "dark"}
+          valueProps="checked"
+          onCatch={onError}
+          onFormat={onSwitchFormat}
+          onChange={(e) => onChangeData({ theme_mode: e ? "dark" : "light" })}
+          onGuard={(c) =>
+            patchVergeConfig({ theme_mode: c ? "dark" : "light" })
+          }
+        >
+          <PaletteSwitch edge="end" />
+        </GuardState>
+      </SettingItem>
+
+      <SettingItem>
+        <ListItemText primary="Theme Blur" />
+        <GuardState
+          value={blur}
+          valueProps="checked"
+          onCatch={onError}
+          onFormat={onSwitchFormat}
+          onChange={(e) => onChangeData({ theme_blur: e })}
+          onGuard={(e) => patchVergeConfig({ theme_blur: e })}
+        >
+          <Switch edge="end" />
+        </GuardState>
+      </SettingItem>
+
+      <SettingItem>
+        <ListItemText primary="Version" />
+        <Typography sx={{ py: "6px" }}>v{version}</Typography>
+      </SettingItem>
+    </SettingList>
+  );
+};
+
+export default SettingVerge;

src/components/setting/setting.tsx

@@ -0,0 +1,17 @@
+import React from "react";
+import { List, ListItem, ListSubheader, styled } from "@mui/material";
+
+export const SettingItem = styled(ListItem)(() => ({
+  paddingTop: 5,
+  paddingBottom: 5,
+}));
+
+export const SettingList: React.FC<{ title: string }> = (props) => (
+  <List>
+    <ListSubheader sx={{ background: "transparent" }} disableSticky>
+      {props.title}
+    </ListSubheader>
+
+    {props.children}
+  </List>
+);

src/components/setting/sysproxy-tooltip.tsx

@@ -0,0 +1,52 @@
+import { useEffect, useState } from "react";
+import { InfoRounded } from "@mui/icons-material";
+import { ClickAwayListener, Tooltip } from "@mui/material";
+import { getSystemProxy } from "../../services/cmds";
+
+const SysproxyTooltip = () => {
+  const [open, setOpen] = useState(false);
+  const [info, setInfo] = useState<any>({});
+
+  const onShow = async () => {
+    const data = await getSystemProxy();
+    setInfo(data ?? {});
+    setOpen(true);
+  };
+
+  useEffect(() => {
+    if (!open) return;
+    const timer = setTimeout(() => setOpen(false), 2000);
+    return () => clearTimeout(timer);
+  }, [open]);
+
+  // todo: add error info
+  const showTitle = (
+    <div>
+      <div>Enable: {(!!info.enable).toString()}</div>
+      <div>Server: {info.server}</div>
+      <div>Bypass: {info.bypass}</div>
+    </div>
+  );
+
+  return (
+    <ClickAwayListener onClickAway={() => setOpen(false)}>
+      <Tooltip
+        PopperProps={{
+          disablePortal: true,
+        }}
+        onClose={() => setOpen(false)}
+        open={open}
+        disableFocusListener
+        disableHoverListener
+        disableTouchListener
+        placement="top"
+        title={showTitle}
+        arrow
+      >
+        <InfoRounded fontSize="small" onClick={onShow} />
+      </Tooltip>
+    </ClickAwayListener>
+  );
+};
+
+export default SysproxyTooltip;

src/components/update-button.tsx

@@ -0,0 +1,40 @@
+import useSWR from "swr";
+import { useState } from "react";
+import { Button } from "@mui/material";
+import { checkUpdate } from "@tauri-apps/api/updater";
+import UpdateDialog from "./update-dialog";
+
+interface Props {
+  className?: string;
+}
+
+const UpdateButton = (props: Props) => {
+  const { className } = props;
+
+  const [dialogOpen, setDialogOpen] = useState(false);
+  const { data: updateInfo } = useSWR("checkUpdate", checkUpdate, {
+    errorRetryCount: 2,
+    revalidateIfStale: false,
+    focusThrottleInterval: 36e5, // 1 hour
+  });
+
+  if (!updateInfo?.shouldUpdate) return null;
+
+  return (
+    <>
+      <Button
+        color="error"
+        variant="contained"
+        size="small"
+        className={className}
+        onClick={() => setDialogOpen(true)}
+      >
+        New
+      </Button>
+
+      <UpdateDialog open={dialogOpen} onClose={() => setDialogOpen(false)} />
+    </>
+  );
+};
+
+export default UpdateButton;

src/components/update-dialog.tsx

@@ -0,0 +1,66 @@
+import useSWR from "swr";
+import { useState } from "react";
+import { checkUpdate, installUpdate } from "@tauri-apps/api/updater";
+import { relaunch } from "@tauri-apps/api/process";
+import {
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
+} from "@mui/material";
+
+interface Props {
+  open: boolean;
+  onClose: () => void;
+}
+
+let uploadingState = false;
+
+const UpdateDialog = (props: Props) => {
+  const { open, onClose } = props;
+  const { data: updateInfo } = useSWR("checkUpdate", checkUpdate, {
+    errorRetryCount: 2,
+    revalidateIfStale: false,
+    focusThrottleInterval: 36e5, // 1 hour
+  });
+  const [uploading, setUploading] = useState(uploadingState);
+
+  const onUpdate = async () => {
+    try {
+      setUploading(true);
+      uploadingState = true;
+      await installUpdate();
+      await relaunch();
+    } catch (error) {
+      console.log(error);
+      window.alert("Failed to upload, please try again.");
+    } finally {
+      setUploading(true);
+      uploadingState = true;
+    }
+  };
+
+  return (
+    <Dialog open={open} onClose={onClose}>
+      <DialogTitle>New Version v{updateInfo?.manifest?.version}</DialogTitle>
+      <DialogContent sx={{ minWidth: 360, maxWidth: 400, maxHeight: "50vh" }}>
+        <DialogContentText>{updateInfo?.manifest?.body}</DialogContentText>
+      </DialogContent>
+      <DialogActions>
+        <Button onClick={onClose}>Cancel</Button>
+        <Button
+          variant="contained"
+          autoFocus
+          onClick={onUpdate}
+          disabled={uploading}
+        >
+          Update
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+};
+
+export default UpdateDialog;

src/pages/_layout.tsx

@@ -1,99 +1,83 @@
-import { useEffect, useMemo } from "react";
 import useSWR, { SWRConfig } from "swr";
+import { useEffect, useMemo } from "react";
 import { Route, Routes } from "react-router-dom";
 import { useRecoilState } from "recoil";
-import { createTheme, List, Paper, ThemeProvider } from "@mui/material";
+import { alpha, createTheme, List, Paper, ThemeProvider } from "@mui/material";
-import { atomPaletteMode } from "../states/setting";
+import { appWindow } from "@tauri-apps/api/window";
+import { atomPaletteMode, atomThemeBlur } from "../states/setting";
 import { getVergeConfig } from "../services/cmds";
+import { routers } from "./_routers";
 import LogoSvg from "../assets/image/logo.svg";
-import LogPage from "./log";
-import HomePage from "./home";
-import ProfilePage from "./profile";
-import ProxyPage from "./proxy";
-import SettingPage from "./setting";
-import ConnectionsPage from "./connections";
-import LayoutItem from "../components/layout-item";
 import Traffic from "../components/traffic";
-
+import LayoutItem from "../components/layout-item";
-const routers = [
+import UpdateButton from "../components/update-button";
-  {
+import LayoutControl from "../components/layout-control";
-    label: "代理",
-    link: "/proxy",
-  },
-  {
-    label: "配置",
-    link: "/profile",
-  },
-  {
-    label: "连接",
-    link: "/connections",
-  },
-  {
-    label: "日志",
-    link: "/log",
-  },
-  {
-    label: "设置",
-    link: "/setting",
-  },
-];
 
 const Layout = () => {
   const [mode, setMode] = useRecoilState(atomPaletteMode);
+  const [blur, setBlur] = useRecoilState(atomThemeBlur);
   const { data: vergeConfig } = useSWR("getVergeConfig", getVergeConfig);
 
   useEffect(() => {
-    setMode(vergeConfig?.theme_mode ?? "light");
+    window.addEventListener("keydown", (e) => {
-  }, [vergeConfig?.theme_mode]);
+      if (e.key === "Escape") appWindow.hide();
+    });
+  }, []);
+
+  useEffect(() => {
+    if (!vergeConfig) return;
+    setBlur(!!vergeConfig.theme_blur);
+    setMode(vergeConfig.theme_mode ?? "light");
+  }, [vergeConfig]);
 
   const theme = useMemo(() => {
-    if (mode === "light") {
+    // const background = mode === "light" ? "#f5f5f5" : "#000";
-      document.documentElement.style.background = "#f5f5f5";
+    const selectColor = mode === "light" ? "#f5f5f5" : "#d5d5d5";
-      document.documentElement.style.setProperty(
+
-        "--selection-color",
+    const rootEle = document.documentElement;
-        "#f5f5f5"
+    rootEle.style.background = "transparent";
-      );
+    rootEle.style.setProperty("--selection-color", selectColor);
-    } else {
-      document.documentElement.style.background = "#000";
-      document.documentElement.style.setProperty(
-        "--selection-color",
-        "#d5d5d5"
-      );
-    }
 
     return createTheme({
       breakpoints: {
-        values: {
+        values: { xs: 0, sm: 650, md: 900, lg: 1200, xl: 1536 },
-          xs: 0,
-          sm: 650,
-          md: 900,
-          lg: 1200,
-          xl: 1536,
-        },
       },
       palette: {
         mode,
-        primary: {
+        primary: { main: "#5b5c9d" },
-          main: "#5b5c9d",
+        text: { primary: "#637381", secondary: "#909399" },
-        },
-        text: {
-          primary: "#637381",
-          secondary: "#909399",
-        },
       },
     });
   }, [mode]);
 
+  const onDragging = (e: any) => {
+    if (e?.target?.dataset?.windrag) {
+      appWindow.startDragging();
+    }
+  };
+
   return (
     <SWRConfig value={{}}>
       <ThemeProvider theme={theme}>
-        <Paper square elevation={0} className="layout">
+        <Paper
-          <div className="layout__sidebar">
+          square
-            <div className="layout__logo">
+          elevation={0}
-              <img src={LogoSvg} width="100%" alt="" />
+          className="layout"
+          onPointerDown={onDragging}
+          sx={[
+            (theme) => ({
+              bgcolor: alpha(theme.palette.background.paper, blur ? 0.85 : 1),
+            }),
+          ]}
+        >
+          <div className="layout__left" data-windrag>
+            <div className="the-logo" data-windrag>
+              <img src={LogoSvg} alt="" data-windrag />
+
+              <UpdateButton className="the-newbtn" />
             </div>
 
-            <List sx={{ userSelect: "none" }}>
+            <List className="the-menu" data-windrag>
               {routers.map((router) => (
                 <LayoutItem key={router.label} to={router.link}>
                   {router.label}
@@ -101,20 +85,23 @@ const Layout = () => {
               ))}
             </List>
 
-            <div className="layout__traffic">
+            <div className="the-traffic" data-windrag>
               <Traffic />
             </div>
           </div>
 
-          <div className="layout__content">
+          <div className="layout__right" data-windrag>
-            <Routes>
+            <div className="the-bar">
-              <Route path="/" element={<HomePage />} />
+              <LayoutControl />
-              <Route path="/proxy" element={<ProxyPage />} />
+            </div>
-              <Route path="/profile" element={<ProfilePage />} />
+
-              <Route path="/log" element={<LogPage />} />
+            <div className="the-content" data-windrag>
-              <Route path="/connections" element={<ConnectionsPage />} />
+              <Routes>
-              <Route path="/setting" element={<SettingPage />} />
+                {routers.map(({ label, link, ele: Ele }) => (
-            </Routes>
+                  <Route key={label} path={link} element={<Ele />} />
+                ))}
+              </Routes>
+            </div>
           </div>
         </Paper>
       </ThemeProvider>

src/pages/_routers.tsx

@@ -0,0 +1,33 @@
+import LogsPage from "./logs";
+import ProxiesPage from "./proxies";
+import ProfilesPage from "./profiles";
+import SettingsPage from "./settings";
+import ConnectionsPage from "./connections";
+
+export const routers = [
+  {
+    label: "Proxies",
+    link: "/",
+    ele: ProxiesPage,
+  },
+  {
+    label: "Profiles",
+    link: "/profile",
+    ele: ProfilesPage,
+  },
+  {
+    label: "Connections",
+    link: "/connections",
+    ele: ConnectionsPage,
+  },
+  {
+    label: "Logs",
+    link: "/logs",
+    ele: LogsPage,
+  },
+  {
+    label: "Settings",
+    link: "/settings",
+    ele: SettingsPage,
+  },
+];

src/pages/connections.tsx

@@ -1,8 +1,9 @@
 import { useEffect, useState } from "react";
-import { Box, Paper, Typography } from "@mui/material";
+import { Paper } from "@mui/material";
 import { Virtuoso } from "react-virtuoso";
-import { getInfomation } from "../services/api";
 import { ApiType } from "../services/types";
+import { getInfomation } from "../services/api";
+import BasePage from "../components/base-page";
 import ConnectionItem from "../components/connection-item";
 
 const ConnectionsPage = () => {
@@ -26,25 +27,14 @@ const ConnectionsPage = () => {
   }, []);
 
   return (
-    <Box
+    <BasePage title="Connections" contentStyle={{ height: "100%" }}>
-      sx={{
+      <Paper sx={{ boxShadow: 2, height: "100%" }}>
-        width: 0.9,
-        maxWidth: "850px",
-        height: "100%",
-        mx: "auto",
-      }}
-    >
-      <Typography variant="h4" component="h1" sx={{ py: 2 }}>
-        Connections
-      </Typography>
-
-      <Paper sx={{ boxShadow: 2, height: "calc(100% - 100px)" }}>
         <Virtuoso
           data={conn.connections}
           itemContent={(index, item) => <ConnectionItem value={item} />}
         />
       </Paper>
-    </Box>
+    </BasePage>
   );
 };
 

src/pages/home.tsx

@@ -1,11 +0,0 @@
-import { Typography } from "@mui/material";
-
-const HomePage = () => {
-  return (
-    <Typography variant="h1" textAlign="center" mt={10}>
-      Hello Clash!
-    </Typography>
-  );
-};
-
-export default HomePage;

src/pages/logs.tsx

@@ -1,9 +1,10 @@
 import dayjs from "dayjs";
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useState } from "react";
-import { Box, Button, Paper, Typography } from "@mui/material";
+import { Button, Paper } from "@mui/material";
 import { Virtuoso } from "react-virtuoso";
 import { ApiType } from "../services/types";
 import { getInfomation } from "../services/api";
+import BasePage from "../components/base-page";
 import LogItem from "../components/log-item";
 
 let logCache: ApiType.LogItem[] = [];
@@ -28,33 +29,27 @@ const LogPage = () => {
     return () => ws?.close();
   }, []);
 
+  const onClear = () => {
+    setLogData([]);
+    logCache = [];
+  };
+
   return (
-    <Box
+    <BasePage
-      sx={{
+      title="Logs"
-        position: "relative",
+      contentStyle={{ height: "100%" }}
-        width: 0.9,
+      header={
-        maxWidth: "850px",
+        <Button
-        height: "100%",
+          size="small"
-        mx: "auto",
+          sx={{ mt: 1 }}
-      }}
+          variant="contained"
+          onClick={onClear}
+        >
+          Clear
+        </Button>
+      }
     >
-      <Typography variant="h4" component="h1" sx={{ py: 2 }}>
+      <Paper sx={{ boxShadow: 2, height: "100%" }}>
-        Logs
-      </Typography>
-
-      <Button
-        size="small"
-        variant="contained"
-        sx={{ position: "absolute", top: 22, right: 0 }}
-        onClick={() => {
-          setLogData([]);
-          logCache = [];
-        }}
-      >
-        Clear
-      </Button>
-
-      <Paper sx={{ boxShadow: 2, height: "calc(100% - 100px)" }}>
         <Virtuoso
           initialTopMostItemIndex={999}
           data={logData}
@@ -62,7 +57,7 @@ const LogPage = () => {
           followOutput={"smooth"}
         />
       </Paper>
-    </Box>
+    </BasePage>
   );
 };
 

src/pages/profiles.tsx

@@ -1,6 +1,6 @@
-import { useEffect, useRef, useState } from "react";
 import useSWR, { useSWRConfig } from "swr";
-import { Box, Button, Grid, TextField, Typography } from "@mui/material";
+import { useEffect, useRef, useState } from "react";
+import { Box, Button, Grid, TextField } from "@mui/material";
 import {
   getProfiles,
   selectProfile,
@@ -8,14 +8,14 @@ import {
   importProfile,
 } from "../services/cmds";
 import { getProxies, updateProxy } from "../services/api";
-import ProfileItemComp from "../components/profile-item";
-import useNotice from "../utils/use-notice";
 import noop from "../utils/noop";
+import Notice from "../components/notice";
+import BasePage from "../components/base-page";
+import ProfileItem from "../components/profile-item";
 
 const ProfilePage = () => {
   const [url, setUrl] = useState("");
   const [disabled, setDisabled] = useState(false);
-  const [notice, noticeElement] = useNotice();
 
   const { mutate } = useSWRConfig();
   const { data: profiles = {} } = useSWR("getProfiles", getProfiles);
@@ -24,16 +24,20 @@ const ProfilePage = () => {
     if (profiles.current == null) return;
     if (!profiles.items) profiles.items = [];
 
-    const profile = profiles.items![profiles.current];
+    const current = profiles.current;
+    const profile = profiles.items![current];
     if (!profile) return;
 
-    getProxies().then((proxiesData) => {
+    setTimeout(async () => {
+      const proxiesData = await getProxies();
       mutate("getProxies", proxiesData);
+
       // init selected array
       const { selected = [] } = profile;
       const selectedMap = Object.fromEntries(
         selected.map((each) => [each.name!, each.now!])
       );
+
       // todo: enhance error handle
       let hasChange = false;
       proxiesData.groups.forEach((group) => {
@@ -52,10 +56,10 @@ const ProfilePage = () => {
         name,
         now,
       }));
-      patchProfile(profiles.current!, profile).catch(console.error);
+      patchProfile(current!, profile).catch(console.error);
       // update proxies cache
       if (hasChange) mutate("getProxies", getProxies());
-    });
+    }, 100);
   }, [profiles]);
 
   const onImport = async () => {
@@ -67,37 +71,31 @@ const ProfilePage = () => {
       await importProfile(url);
       mutate("getProfiles", getProfiles());
       if (!profiles.items?.length) selectProfile(0).catch(noop);
-      notice.success("Successfully import profile.");
+      Notice.success("Successfully import profile.");
     } catch {
-      notice.error("Failed to import profile.");
+      Notice.error("Failed to import profile.");
     } finally {
       setDisabled(false);
     }
   };
 
   const lockRef = useRef(false);
-  const onProfileChange = (index: number) => {
+  const onSelect = async (index: number, force: boolean) => {
-    if (index === profiles.current || lockRef.current) return;
     if (lockRef.current) return;
+    if (!force && index === profiles.current) return;
     lockRef.current = true;
-    selectProfile(index)
+    try {
-      .then(() => {
+      await selectProfile(index);
-        mutate("getProfiles", { ...profiles, current: index }, true);
+      mutate("getProfiles", { ...profiles, current: index }, true);
-      })
+    } catch (err: any) {
-      .catch((err) => {
+      err && Notice.error(err.toString());
-        console.error(err);
+    } finally {
-      })
+      lockRef.current = false;
-      .finally(() => {
+    }
-        lockRef.current = false;
-      });
   };
 
   return (
-    <Box sx={{ width: 0.9, maxWidth: "850px", mx: "auto", mb: 2 }}>
+    <BasePage title="Profiles">
-      <Typography variant="h4" component="h1" sx={{ py: 2, mb: 1 }}>
-        Profiles
-      </Typography>
-
       <Box sx={{ display: "flex", mb: 3 }}>
         <TextField
           id="profile_url"
@@ -107,7 +105,7 @@ const ProfilePage = () => {
           fullWidth
           value={url}
           onChange={(e) => setUrl(e.target.value)}
-          sx={{ mr: 4 }}
+          sx={{ mr: 2 }}
         />
         <Button
           disabled={!url || disabled}
@@ -121,18 +119,16 @@ const ProfilePage = () => {
       <Grid container spacing={3}>
         {profiles?.items?.map((item, idx) => (
           <Grid item xs={12} sm={6} key={item.file}>
-            <ProfileItemComp
+            <ProfileItem
               index={idx}
               selected={profiles.current === idx}
               itemData={item}
-              onClick={() => onProfileChange(idx)}
+              onSelect={(f) => onSelect(idx, f)}
             />
           </Grid>
         ))}
       </Grid>
-
+    </BasePage>
-      {noticeElement}
-    </Box>
   );
 };
 

src/pages/proxies.tsx

@@ -0,0 +1,50 @@
+import useSWR, { useSWRConfig } from "swr";
+import { useEffect } from "react";
+import { List, Paper } from "@mui/material";
+import { getProxies } from "../services/api";
+import BasePage from "../components/base-page";
+import ProxyItem from "../components/proxy-item";
+import ProxyGroup from "../components/proxy-group";
+
+const ProxyPage = () => {
+  const { mutate } = useSWRConfig();
+  const { data: proxiesData } = useSWR("getProxies", getProxies);
+  const { groups = [], proxies = [] } = proxiesData ?? {};
+
+  useEffect(() => {
+    // fix the empty proxies on the first sight
+    // this bud only show on the build version
+    // call twice to avoid something unknown or the delay of the clash startup
+    setTimeout(() => mutate("getProxies"), 250);
+    setTimeout(() => mutate("getProxies"), 1000);
+  }, []);
+
+  return (
+    <BasePage title={groups.length ? "Proxy Groups" : "Proxies"}>
+      <Paper sx={{ borderRadius: 1, boxShadow: 2, mb: 1 }}>
+        {groups.length > 0 && (
+          <List>
+            {groups.map((group) => (
+              <ProxyGroup key={group.name} group={group} />
+            ))}
+          </List>
+        )}
+
+        {!groups.length && (
+          <List>
+            {Object.values(proxies).map((proxy) => (
+              <ProxyItem
+                key={proxy.name}
+                proxy={proxy}
+                selected={false}
+                sx={{ py: 0, px: 2 }}
+              />
+            ))}
+          </List>
+        )}
+      </Paper>
+    </BasePage>
+  );
+};
+
+export default ProxyPage;

src/pages/proxy.tsx

@@ -1,29 +0,0 @@
-import useSWR from "swr";
-import { Box, List, Paper, Typography } from "@mui/material";
-import { getProxies } from "../services/api";
-import ProxyGroup from "../components/proxy-group";
-
-const ProxyPage = () => {
-  const { data: proxiesData } = useSWR("getProxies", getProxies);
-  const { groups = [] } = proxiesData ?? {};
-
-  return (
-    <Box sx={{ width: 0.9, maxWidth: "850px", mx: "auto", mb: 2 }}>
-      <Typography variant="h4" component="h1" sx={{ py: 2 }}>
-        Proxy Groups
-      </Typography>
-
-      {groups.length > 0 && (
-        <Paper sx={{ borderRadius: 1, boxShadow: 2 }}>
-          <List>
-            {groups.map((group) => (
-              <ProxyGroup key={group.name} group={group} />
-            ))}
-          </List>
-        </Paper>
-      )}
-    </Box>
-  );
-};
-
-export default ProxyPage;

src/pages/setting.tsx

@@ -1,23 +0,0 @@
-import { Box, Paper, Typography } from "@mui/material";
-import SettingVerge from "../components/setting-verge";
-import SettingClash from "../components/setting-clash";
-
-const SettingPage = () => {
-  return (
-    <Box sx={{ width: 0.9, maxWidth: 850, mx: "auto", mb: 2 }}>
-      <Typography variant="h4" component="h1" sx={{ py: 2 }}>
-        Setting
-      </Typography>
-
-      <Paper sx={{ borderRadius: 1, boxShadow: 2 }}>
-        <SettingVerge />
-      </Paper>
-
-      <Paper sx={{ borderRadius: 1, boxShadow: 2, mt: 3 }}>
-        <SettingClash />
-      </Paper>
-    </Box>
-  );
-};
-
-export default SettingPage;

src/pages/settings.tsx

@@ -0,0 +1,30 @@
+import { Paper } from "@mui/material";
+import BasePage from "../components/base-page";
+import SettingVerge from "../components/setting/setting-verge";
+import SettingClash from "../components/setting/setting-clash";
+import SettingSystem from "../components/setting/setting-system";
+import Notice from "../components/notice";
+
+const SettingPage = () => {
+  const onError = (error: any) => {
+    error && Notice.error(error.toString());
+  };
+
+  return (
+    <BasePage title="Settings">
+      <Paper sx={{ borderRadius: 1, boxShadow: 2, mb: 3 }}>
+        <SettingClash onError={onError} />
+      </Paper>
+
+      <Paper sx={{ borderRadius: 1, boxShadow: 2, mb: 3 }}>
+        <SettingSystem onError={onError} />
+      </Paper>
+
+      <Paper sx={{ borderRadius: 1, boxShadow: 2 }}>
+        <SettingVerge onError={onError} />
+      </Paper>
+    </BasePage>
+  );
+};
+
+export default SettingPage;

src/services/cmds.ts

@@ -9,12 +9,16 @@ export async function syncProfiles() {
   return invoke<void>("sync_profiles");
 }
 
-export async function importProfile(url: string) {
+export async function editProfile(index: number) {
-  return invoke<void>("import_profile", { url });
+  return invoke<void>("edit_profile", { index });
 }
 
-export async function updateProfile(index: number) {
+export async function importProfile(url: string) {
-  return invoke<void>("update_profile", { index });
+  return invoke<void>("import_profile", { url, withProxy: true });
+}
+
+export async function updateProfile(index: number, withProxy: boolean) {
+  return invoke<void>("update_profile", { index, withProxy });
 }
 
 export async function deleteProfile(index: number) {
@@ -44,10 +48,6 @@ export async function patchClashConfig(payload: Partial<ApiType.ConfigData>) {
   return invoke<void>("patch_clash_config", { payload });
 }
 
-export async function setSysProxy(enable: boolean) {
-  return invoke<void>("set_sys_proxy", { enable });
-}
-
 export async function getVergeConfig() {
   return invoke<CmdType.VergeConfig>("get_verge_config");
 }
@@ -55,3 +55,7 @@ export async function getVergeConfig() {
 export async function patchVergeConfig(payload: CmdType.VergeConfig) {
   return invoke<void>("patch_verge_config", { payload });
 }
+
+export async function getSystemProxy() {
+  return invoke<any>("get_sys_proxy");
+}

src/services/types.ts

@@ -110,7 +110,8 @@ export namespace CmdType {
 
   export interface VergeConfig {
     theme_mode?: "light" | "dark";
-    enable_self_startup?: boolean;
+    theme_blur?: boolean;
+    enable_auto_launch?: boolean;
     enable_system_proxy?: boolean;
   }
 }

src/states/setting.ts

@@ -4,3 +4,8 @@ export const atomPaletteMode = atom<"light" | "dark">({
   key: "atomPaletteMode",
   default: "light",
 });
+
+export const atomThemeBlur = atom<boolean>({
+  key: "atomThemeBlur",
+  default: false,
+});

src/utils/use-notice.tsx

@@ -1,68 +0,0 @@
-import { useMemo, useState } from "react";
-import { Box, IconButton, Slide, Snackbar } from "@mui/material";
-import { Close, CheckCircleRounded, ErrorRounded } from "@mui/icons-material";
-
-interface NoticeInstance {
-  info: (msg: string) => void;
-  error: (msg: string) => void;
-  success: (msg: string) => void;
-}
-
-const useNotice = () => {
-  const [message, setMessage] = useState("");
-  const [level, setLevel] = useState<"info" | "error" | "success">("info");
-
-  const handleClose = (_e: any, reason: string) => {
-    if (reason !== "clickaway") setMessage("");
-  };
-
-  const msgElement =
-    level === "info" ? (
-      message
-    ) : (
-      <Box sx={{ display: "flex", alignItems: "center" }}>
-        {level === "error" && <ErrorRounded color="error" />}
-        {level === "success" && <CheckCircleRounded color="success" />}
-        <span style={{ marginLeft: 4 }}>{message}</span>
-      </Box>
-    );
-
-  const element = useMemo(
-    () => (
-      <Snackbar
-        open={!!message}
-        anchorOrigin={{ vertical: "top", horizontal: "right" }}
-        autoHideDuration={3000}
-        onClose={handleClose}
-        message={msgElement}
-        sx={{ maxWidth: 360 }}
-        TransitionComponent={(p) => <Slide {...p} direction="left" />}
-        transitionDuration={200}
-        action={
-          <IconButton
-            size="small"
-            color="inherit"
-            onClick={() => setMessage("")}
-          >
-            <Close fontSize="small" />
-          </IconButton>
-        }
-      />
-    ),
-    [message]
-  );
-
-  const instance = (Object.fromEntries(
-    (["info", "error", "success"] as const).map((item) => [
-      item,
-      (msg: string) => {
-        setLevel(item);
-        setMessage(msg);
-      },
-    ])
-  ) as unknown) as NoticeInstance;
-
-  return [instance, element] as const;
-};
-
-export default useNotice;