v0.0.21

.github/workflows/ci.yml

@@ -63,7 +63,7 @@ jobs:
         with:
           tagName: v__VERSION__
           releaseName: "Clash Verge v__VERSION__"
-          releaseBody: "Clash Verge now supports Windows and macos."
+          releaseBody: "More new features are now supported."
           releaseDraft: false
           prerelease: true
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "clash-verge",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "license": "GPL-3.0",
   "scripts": {
     "dev": "tauri dev",
@@ -15,17 +15,17 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@emotion/react": "^11.7.0",
+    "@emotion/react": "^11.8.1",
-    "@emotion/styled": "^11.6.0",
+    "@emotion/styled": "^11.8.1",
-    "@mui/icons-material": "^5.4.1",
+    "@mui/icons-material": "^5.4.4",
-    "@mui/material": "^5.4.1",
+    "@mui/material": "^5.4.4",
     "@tauri-apps/api": "^1.0.0-rc.1",
-    "ahooks": "^3.1.9",
+    "ahooks": "^3.1.13",
     "axios": "^0.26.0",
-    "dayjs": "^1.10.7",
+    "dayjs": "^1.10.8",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router-dom": "^6.2.1",
+    "react-router-dom": "^6.2.2",
     "react-virtuoso": "^2.7.0",
     "recoil": "^0.6.1",
     "swr": "^1.2.1"
@@ -45,7 +45,7 @@
     "pretty-quick": "^3.1.3",
     "sass": "^1.49.7",
     "typescript": "^4.5.5",
-    "vite": "^2.8.0"
+    "vite": "^2.8.6"
   },
   "prettier": {
     "tabWidth": 2,

src-tauri/Cargo.lock

@@ -58,9 +58,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
 
 [[package]]
 name = "ashpd"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7915e26e0786f91768d23de32afafa4ee5e2ea76be21c0ecd8e14441543c1655"
+checksum = "084a8df12135f75ec7501c7c593b14621d1da962d222127fe72fb6de116aa9eb"
 dependencies = [
  "enumflags2",
  "futures",
@@ -461,6 +461,7 @@ dependencies = [
  "dunce",
  "log",
  "log4rs",
+ "nanoid",
  "port_scanner",
  "reqwest",
  "serde",
@@ -468,11 +469,11 @@ dependencies = [
  "serde_yaml",
  "tauri",
  "tauri-build",
- "tauri-plugin-shadows",
- "tauri-plugin-vibrancy",
  "tokio",
  "warp",
  "which",
+ "window-shadows",
+ "window-vibrancy",
  "winreg 0.10.1",
 ]
 
@@ -967,7 +968,7 @@ checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.2.10",
+ "redox_syscall 0.2.11",
  "winapi",
 ]
 
@@ -2052,6 +2053,15 @@ dependencies = [
  "twoway",
 ]
 
+[[package]]
+name = "nanoid"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
+dependencies = [
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.8"
@@ -2225,7 +2235,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
 dependencies = [
  "malloc_buf",
- "objc_exception",
 ]
 
 [[package]]
@@ -2239,15 +2248,6 @@ dependencies = [
  "objc_id",
 ]
 
-[[package]]
-name = "objc_exception"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "objc_id"
 version = "0.1.1"
@@ -2402,7 +2402,7 @@ dependencies = [
  "cfg-if",
  "instant",
  "libc",
- "redox_syscall 0.2.10",
+ "redox_syscall 0.2.11",
  "smallvec",
  "winapi",
 ]
@@ -2415,9 +2415,9 @@ checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.2.10",
+ "redox_syscall 0.2.11",
  "smallvec",
- "windows-sys",
+ "windows-sys 0.32.0",
 ]
 
 [[package]]
@@ -2834,9 +2834,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c"
 dependencies = [
  "bitflags",
 ]
@@ -2848,7 +2848,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
  "getrandom 0.2.5",
- "redox_syscall 0.2.10",
+ "redox_syscall 0.2.11",
 ]
 
 [[package]]
@@ -2945,7 +2945,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows 0.30.0",
+ "windows",
 ]
 
 [[package]]
@@ -3427,16 +3427,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "sys-info"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "system-deps"
 version = "3.2.0"
@@ -3483,9 +3473,9 @@ dependencies = [
 
 [[package]]
 name = "tao"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b3b3bbc9151bce45db3cf9ccb808730c8df8786d0223f34591f6e5890503939"
+checksum = "6c4c62fc16d698750c5c918088c8134c63e8661e65efc608fe614236c59462f4"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -3518,7 +3508,7 @@ dependencies = [
  "serde",
  "tao-core-video-sys",
  "unicode-segmentation",
- "windows 0.30.0",
+ "windows",
  "windows_macros",
  "x11-dl",
 ]
@@ -3645,28 +3635,6 @@ dependencies = [
  "tauri-utils",
 ]
 
-[[package]]
-name = "tauri-plugin-shadows"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/tauri-plugin-shadows#fac6f42f1cf43329f398871f5564448359458462"
-dependencies = [
- "cocoa",
- "objc",
- "tauri",
- "windows 0.32.0",
-]
-
-[[package]]
-name = "tauri-plugin-vibrancy"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/tauri-plugin-vibrancy#561c4fa22c42073239ad37b4b406c303aa91e678"
-dependencies = [
- "cocoa",
- "objc",
- "tauri",
- "windows 0.32.0",
-]
-
 [[package]]
 name = "tauri-runtime"
 version = "0.3.2"
@@ -3683,7 +3651,7 @@ dependencies = [
  "thiserror",
  "uuid",
  "webview2-com",
- "windows 0.30.0",
+ "windows",
 ]
 
 [[package]]
@@ -3700,7 +3668,7 @@ dependencies = [
  "tauri-utils",
  "uuid",
  "webview2-com",
- "windows 0.30.0",
+ "windows",
  "wry",
 ]
 
@@ -3738,7 +3706,7 @@ dependencies = [
  "cfg-if",
  "fastrand",
  "libc",
- "redox_syscall 0.2.10",
+ "redox_syscall 0.2.11",
  "remove_dir_all",
  "winapi",
 ]
@@ -4355,7 +4323,7 @@ checksum = "bb8e90ac2d9ce39cdb70017aaec641be09fbdd702b7b332b9896d053eb469524"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows 0.30.0",
+ "windows",
  "windows_macros",
 ]
 
@@ -4380,7 +4348,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
- "windows 0.30.0",
+ "windows",
  "windows-bindgen",
 ]
 
@@ -4441,6 +4409,28 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "window-shadows"
+version = "0.0.0"
+source = "git+https://github.com/tauri-apps/window-shadows#72de826498573de6bed48038bbc74a3dbde7460e"
+dependencies = [
+ "cocoa",
+ "objc",
+ "raw-window-handle",
+ "windows-sys 0.33.0",
+]
+
+[[package]]
+name = "window-vibrancy"
+version = "0.1.0"
+source = "git+https://github.com/tauri-apps/window-vibrancy#3fd5be20535ec9b595e893b75dc74b6725664852"
+dependencies = [
+ "cocoa",
+ "objc",
+ "raw-window-handle",
+ "windows-sys 0.33.0",
+]
+
 [[package]]
 name = "windows"
 version = "0.30.0"
@@ -4454,19 +4444,6 @@ dependencies = [
  "windows_x86_64_msvc 0.30.0",
 ]
 
-[[package]]
-name = "windows"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec"
-dependencies = [
- "windows_aarch64_msvc 0.32.0",
- "windows_i686_gnu 0.32.0",
- "windows_i686_msvc 0.32.0",
- "windows_x86_64_gnu 0.32.0",
- "windows_x86_64_msvc 0.32.0",
-]
-
 [[package]]
 name = "windows-bindgen"
 version = "0.30.0"
@@ -4490,6 +4467,19 @@ dependencies = [
  "windows_x86_64_msvc 0.32.0",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43dbb096663629518eb1dfa72d80243ca5a6aca764cae62a2df70af760a9be75"
+dependencies = [
+ "windows_aarch64_msvc 0.33.0",
+ "windows_i686_gnu 0.33.0",
+ "windows_i686_msvc 0.33.0",
+ "windows_x86_64_gnu 0.33.0",
+ "windows_x86_64_msvc 0.33.0",
+]
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.30.0"
@@ -4502,6 +4492,12 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807"
+
 [[package]]
 name = "windows_gen"
 version = "0.30.0"
@@ -4524,6 +4520,12 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.30.0"
@@ -4536,6 +4538,12 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0"
+
 [[package]]
 name = "windows_macros"
 version = "0.30.0"
@@ -4572,6 +4580,12 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.30.0"
@@ -4584,6 +4598,12 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa"
+
 [[package]]
 name = "winreg"
 version = "0.7.0"
@@ -4613,9 +4633,9 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "620bfe8ed3cde9310f32a69ffc654dfd8dae4ac5a0e08d6fbf0205a996fc7f0f"
+checksum = "9514586e5c964d30cc7123c9aea9880ff7b3cb1c43f6a1dc8703941eb72ac89f"
 dependencies = [
  "cocoa",
  "core-graphics",
@@ -4631,14 +4651,13 @@ dependencies = [
  "once_cell",
  "serde",
  "serde_json",
- "sys-info",
  "tao",
  "thiserror",
  "url",
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows 0.30.0",
+ "windows",
  "windows_macros",
 ]
 

src-tauri/Cargo.toml

@@ -16,13 +16,14 @@ tauri-build = { version = "1.0.0-rc.3", features = [] }
 anyhow = "1.0"
 dirs = "4.0.0"
 dunce = "1.0.2"
+nanoid = "0.4.0"
 chrono = "0.4.19"
 serde_json = "1.0"
 serde_yaml = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 tauri = { version = "1.0.0-rc.3", features = ["shell-all", "system-tray", "updater", "window-all"] }
-tauri-plugin-shadows = { git = "https://github.com/tauri-apps/tauri-plugin-shadows", features = ["tauri-impl"] }
+window-shadows = { git = "https://github.com/tauri-apps/window-shadows" }
-tauri-plugin-vibrancy = { git = "https://github.com/tauri-apps/tauri-plugin-vibrancy", features = ["tauri-impl"] }
+window-vibrancy = { git = "https://github.com/tauri-apps/window-vibrancy" }
 
 reqwest = { version = "0.11", features = ["json"] }
 tokio = { version = "1", features = ["full"] }

src-tauri/src/cmds.rs

@@ -1,37 +1,17 @@
 use crate::{
-  core::{ClashInfo, ProfileItem, Profiles, VergeConfig},
+  core::{ClashInfo, PrfItem, Profiles, VergeConfig},
   states::{ClashState, ProfilesState, VergeState},
-  utils::{dirs, fetch::fetch_profile, sysopt::SysProxyConfig},
+  utils::{dirs, sysopt::SysProxyConfig},
 };
+use crate::{ret_err, wrap_err};
 use anyhow::Result;
 use serde_yaml::Mapping;
 use std::{path::PathBuf, process::Command};
-use tauri::{api, State};
+use tauri::{api, Manager, State};
-
-/// wrap the anyhow error
-/// transform the error to String
-macro_rules! wrap_err {
-  ($stat: expr) => {
-    match $stat {
-      Ok(a) => Ok(a),
-      Err(err) => {
-        log::error!("{}", err.to_string());
-        Err(format!("{}", err.to_string()))
-      }
-    }
-  };
-}
-
-/// return the string literal error
-macro_rules! ret_err {
-  ($str: literal) => {
-    return Err($str.into())
-  };
-}
 
 /// get all profiles from `profiles.yaml`
 #[tauri::command]
-pub fn get_profiles(profiles_state: State<'_, ProfilesState>) -> Result<Profiles, String> {
+pub fn get_profiles<'a>(profiles_state: State<'_, ProfilesState>) -> Result<Profiles, String> {
   let profiles = profiles_state.0.lock().unwrap();
   Ok(profiles.clone())
 }
@@ -51,73 +31,64 @@ pub async fn import_profile(
   with_proxy: bool,
   profiles_state: State<'_, ProfilesState>,
 ) -> Result<(), String> {
-  let result = fetch_profile(&url, with_proxy).await?;
+  let item = wrap_err!(PrfItem::from_url(&url, None, None, with_proxy).await)?;
+
   let mut profiles = profiles_state.0.lock().unwrap();
-  wrap_err!(profiles.import_from_url(url, result))
+  wrap_err!(profiles.append_item(item))
 }
 
 /// new a profile
 /// append a temp profile item file to the `profiles` dir
 /// view the temp profile file by using vscode or other editor
 #[tauri::command]
-pub async fn new_profile(
+pub async fn create_profile(
-  name: String,
+  item: PrfItem, // partial
-  desc: String,
   profiles_state: State<'_, ProfilesState>,
 ) -> Result<(), String> {
+  let item = wrap_err!(PrfItem::from(item).await)?;
   let mut profiles = profiles_state.0.lock().unwrap();
-  wrap_err!(profiles.append_item(name, desc))?;
+
-  Ok(())
+  wrap_err!(profiles.append_item(item))
 }
 
 /// Update the profile
 #[tauri::command]
 pub async fn update_profile(
-  index: usize,
+  index: String,
   with_proxy: bool,
   clash_state: State<'_, ClashState>,
   profiles_state: State<'_, ProfilesState>,
 ) -> Result<(), String> {
-  // maybe we can get the url from the web app directly
+  let url = {
-  let url = match profiles_state.0.lock() {
+    // must release the lock here
-    Ok(mut profile) => {
+    let profiles = profiles_state.0.lock().unwrap();
-      let items = profile.items.take().unwrap_or(vec![]);
+    let item = wrap_err!(profiles.get_item(&index))?;
-      if index >= items.len() {
+
-        ret_err!("the index out of bound");
+    if item.url.is_none() {
-      }
+      ret_err!("failed to get the item url");
-      let url = match &items[index].url {
-        Some(u) => u.clone(),
-        None => ret_err!("failed to update profile for `invalid url`"),
-      };
-      profile.items = Some(items);
-      url
     }
-    Err(_) => ret_err!("failed to get profiles lock"),
+
+    item.url.clone().unwrap()
   };
 
-  let result = fetch_profile(&url, with_proxy).await?;
+  let item = wrap_err!(PrfItem::from_url(&url, None, None, with_proxy).await)?;
 
-  match profiles_state.0.lock() {
+  let mut profiles = profiles_state.0.lock().unwrap();
-    Ok(mut profiles) => {
+  wrap_err!(profiles.update_item(index.clone(), item))?;
-      wrap_err!(profiles.update_item(index, result))?;
 
-      // reactivate the profile
+  // reactivate the profile
-      let current = profiles.current.clone().unwrap_or(0);
+  if Some(index) == profiles.get_current() {
-      if current == index {
+    let clash = clash_state.0.lock().unwrap();
-        let clash = clash_state.0.lock().unwrap();
+    wrap_err!(clash.activate(&profiles, false))?;
-        wrap_err!(profiles.activate(&clash))
-      } else {
-        Ok(())
-      }
-    }
-    Err(_) => ret_err!("failed to get profiles lock"),
   }
+
+  Ok(())
 }
 
 /// change the current profile
 #[tauri::command]
 pub fn select_profile(
-  index: usize,
+  index: String,
   clash_state: State<'_, ClashState>,
   profiles_state: State<'_, ProfilesState>,
 ) -> Result<(), String> {
@@ -125,13 +96,45 @@ pub fn select_profile(
   wrap_err!(profiles.put_current(index))?;
 
   let clash = clash_state.0.lock().unwrap();
-  wrap_err!(profiles.activate(&clash))
+  wrap_err!(clash.activate(&profiles, false))
+}
+
+/// change the profile chain
+#[tauri::command]
+pub fn change_profile_chain(
+  chain: Option<Vec<String>>,
+  app_handle: tauri::AppHandle,
+  clash_state: State<'_, ClashState>,
+  profiles_state: State<'_, ProfilesState>,
+) -> Result<(), String> {
+  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"));
+
+  wrap_err!(clash.activate_enhanced(&profiles, false))
+}
+
+/// manually exec enhanced profile
+#[tauri::command]
+pub fn enhance_profiles(
+  app_handle: tauri::AppHandle,
+  clash_state: State<'_, ClashState>,
+  profiles_state: State<'_, ProfilesState>,
+) -> Result<(), String> {
+  let mut clash = clash_state.0.lock().unwrap();
+  let profiles = profiles_state.0.lock().unwrap();
+
+  clash.set_window(app_handle.get_window("main"));
+
+  wrap_err!(clash.activate_enhanced(&profiles, false))
 }
 
 /// delete profile item
 #[tauri::command]
 pub fn delete_profile(
-  index: usize,
+  index: String,
   clash_state: State<'_, ClashState>,
   profiles_state: State<'_, ProfilesState>,
 ) -> Result<(), String> {
@@ -139,7 +142,7 @@ pub fn delete_profile(
 
   if wrap_err!(profiles.delete_item(index))? {
     let clash = clash_state.0.lock().unwrap();
-    wrap_err!(profiles.activate(&clash))?;
+    wrap_err!(clash.activate(&profiles, false))?;
   }
 
   Ok(())
@@ -148,8 +151,8 @@ pub fn delete_profile(
 /// patch the profile config
 #[tauri::command]
 pub fn patch_profile(
-  index: usize,
+  index: String,
-  profile: ProfileItem,
+  profile: PrfItem,
   profiles_state: State<'_, ProfilesState>,
 ) -> Result<(), String> {
   let mut profiles = profiles_state.0.lock().unwrap();
@@ -158,19 +161,16 @@ pub fn patch_profile(
 
 /// run vscode command to edit the profile
 #[tauri::command]
-pub fn view_profile(index: usize, profiles_state: State<'_, ProfilesState>) -> Result<(), String> {
+pub fn view_profile(index: String, profiles_state: State<'_, ProfilesState>) -> Result<(), String> {
-  let mut profiles = profiles_state.0.lock().unwrap();
+  let profiles = profiles_state.0.lock().unwrap();
-  let items = profiles.items.take().unwrap_or(vec![]);
+  let item = wrap_err!(profiles.get_item(&index))?;
 
-  if index >= items.len() {
+  let file = item.file.clone();
-    profiles.items = Some(items);
+  if file.is_none() {
-    ret_err!("the index out of bound");
+    ret_err!("the file is null");
   }
 
-  let file = items[index].file.clone().unwrap_or("".into());
+  let path = dirs::app_profiles_dir().join(file.unwrap());
-  profiles.items = Some(items);
-
-  let path = dirs::app_profiles_dir().join(file);
   if !path.exists() {
     ret_err!("the file not found");
   }
@@ -285,7 +285,7 @@ pub fn patch_verge_config(
 
     wrap_err!(clash.tun_mode(tun_mode.unwrap()))?;
     clash.update_config();
-    wrap_err!(profiles.activate(&clash))?;
+    wrap_err!(clash.activate(&profiles, false))?;
   }
 
   Ok(())

src-tauri/src/core/clash.rs

@@ -1,9 +1,13 @@
-use super::{Profiles, Verge};
+use super::{PrfEnhancedResult, Profiles, Verge};
-use crate::utils::{config, dirs};
+use crate::utils::{config, dirs, help};
 use anyhow::{bail, Result};
+use reqwest::header::HeaderMap;
 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)]
 pub struct ClashInfo {
@@ -20,7 +24,6 @@ pub struct ClashInfo {
   pub secret: Option<String>,
 }
 
-#[derive(Debug)]
 pub struct Clash {
   /// maintain the clash config
   pub config: Mapping,
@@ -30,6 +33,9 @@ pub struct Clash {
 
   /// clash sidecar
   pub sidecar: Option<CommandChild>,
+
+  /// save the main window
+  pub window: Option<Window>,
 }
 
 impl Clash {
@@ -41,6 +47,7 @@ impl Clash {
       config,
       info,
       sidecar: None,
+      window: None,
     }
   }
 
@@ -111,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();
@@ -125,8 +137,8 @@ impl Clash {
           tauri::async_runtime::spawn(async move {
             while let Some(event) = rx.recv().await {
               match event {
-                CommandEvent::Stdout(line) => log::info!("[stdout]: {}", line),
+                CommandEvent::Stdout(line) => log::info!("[clash]: {}", line),
-                CommandEvent::Stderr(err) => log::error!("[stderr]: {}", err),
+                CommandEvent::Stderr(err) => log::error!("[clash]: {}", err),
                 _ => {}
               }
             }
@@ -153,7 +165,7 @@ impl Clash {
     self.update_config();
     self.drop_sidecar()?;
     self.run_sidecar()?;
-    profiles.activate(&self)
+    self.activate(profiles, false)
   }
 
   /// update the clash info
@@ -191,11 +203,7 @@ impl Clash {
         verge.init_sysproxy(port);
       }
 
-      if self.config.contains_key(key) {
+      self.config.insert(key.clone(), value);
-        self.config[key] = value;
-      } else {
-        self.config.insert(key.clone(), value);
-      }
     }
     self.save_config()
   }
@@ -241,6 +249,114 @@ 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.unwrap();
+      let server = format!("http://{server}/configs");
+
+      let mut headers = HeaderMap::new();
+      headers.insert("Content-Type", "application/json".parse().unwrap());
+
+      if let Some(secret) = info.secret.as_ref() {
+        let secret = format!("Bearer {}", secret.clone()).parse().unwrap();
+        headers.insert("Authorization", secret);
+      }
+
+      let mut data = HashMap::new();
+      data.insert("path", temp_path.as_os_str().to_str().unwrap());
+
+      // retry 5 times
+      for _ in 0..5 {
+        match reqwest::ClientBuilder::new().no_proxy().build() {
+          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;
+              }
+              Err(err) => log::error!("failed to activate for `{err}`"),
+            }
+          }
+          Err(err) => log::error!("failed to activate for `{err}`"),
+        }
+        sleep(Duration::from_millis(500)).await;
+      }
+    });
+
+    Ok(())
+  }
+
+  /// 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");
+    }
+
+    let win = self.window.clone().unwrap();
+    let event_name = help::get_uid("e");
+    let event_name = format!("enhanced-cb-{event_name}");
+
+    let info = self.info.clone();
+    let mut config = self.config.clone();
+
+    // generate the payload
+    let payload = profiles.gen_enhanced(event_name.clone())?;
+
+    win.once(&event_name, move |event| {
+      if let Some(result) = event.payload() {
+        let result: PrfEnhancedResult = serde_json::from_str(result).unwrap();
+
+        if let Some(data) = result.data {
+          for (key, value) in data.into_iter() {
+            config.insert(key, value);
+          }
+          Self::_activate(info, config).unwrap();
+        }
+
+        log::info!("profile enhanced status {}", result.status);
+
+        result.error.map(|error| log::error!("{error}"));
+      }
+    });
+
+    tauri::async_runtime::spawn(async move {
+      // wait the window setup during resolve app
+      if delay {
+        sleep(Duration::from_secs(2)).await;
+      }
+      win.emit("script-handler", payload).unwrap();
+    });
+
+    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 {

src-tauri/src/core/mod.rs

@@ -1,5 +1,4 @@
 mod clash;
-mod prfitem;
 mod profiles;
 mod verge;
 

src-tauri/src/core/prfitem.rs

@@ -1,332 +0,0 @@
-//! Todos
-//! refactor the profiles
-
-use crate::utils::{config, dirs};
-use anyhow::{bail, Result};
-use serde::{Deserialize, Serialize};
-use serde_yaml::{Mapping, Value};
-use std::{fs, str::FromStr};
-
-#[derive(Default, Debug, Clone, Deserialize, Serialize)]
-pub struct PrfItem {
-  pub uid: Option<String>,
-
-  /// profile item type
-  /// enum value: remote | local | script | merge
-  #[serde(rename = "type")]
-  pub itype: Option<String>,
-
-  /// profile name
-  pub name: Option<String>,
-
-  /// profile description
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub desc: Option<String>,
-
-  /// profile file
-  pub file: Option<String>,
-
-  /// source url
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub url: Option<String>,
-
-  /// selected infomation
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub selected: Option<Vec<PrfSelected>>,
-
-  /// user info
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub extra: Option<PrfExtra>,
-
-  /// updated time
-  pub updated: Option<usize>,
-}
-
-#[derive(Default, Debug, Clone, Deserialize, Serialize)]
-pub struct PrfSelected {
-  pub name: Option<String>,
-  pub now: Option<String>,
-}
-
-#[derive(Default, Debug, Clone, Copy, Deserialize, Serialize)]
-pub struct PrfExtra {
-  pub upload: usize,
-  pub download: usize,
-  pub total: usize,
-  pub expire: usize,
-}
-
-type FileData = String;
-
-impl PrfItem {
-  pub fn gen_now() -> usize {
-    use std::time::{SystemTime, UNIX_EPOCH};
-
-    SystemTime::now()
-      .duration_since(UNIX_EPOCH)
-      .unwrap()
-      .as_secs() as _
-  }
-
-  /// generate the uid
-  pub fn gen_uid(prefix: &str) -> String {
-    let now = Self::gen_now();
-    format!("{prefix}{now}")
-  }
-
-  /// parse the string
-  fn parse_str<T: FromStr>(target: &str, key: &str) -> Option<T> {
-    match target.find(key) {
-      Some(idx) => {
-        let idx = idx + key.len();
-        let value = &target[idx..];
-        match match value.split(';').nth(0) {
-          Some(value) => value.trim().parse(),
-          None => value.trim().parse(),
-        } {
-          Ok(r) => Some(r),
-          Err(_) => None,
-        }
-      }
-      None => None,
-    }
-  }
-
-  pub async fn from_url(url: &str, with_proxy: bool) -> Result<(Self, FileData)> {
-    let mut builder = reqwest::ClientBuilder::new();
-
-    if !with_proxy {
-      builder = builder.no_proxy();
-    }
-
-    let resp = builder.build()?.get(url).send().await?;
-    let header = resp.headers();
-
-    // parse the Subscription Userinfo
-    let extra = match header.get("Subscription-Userinfo") {
-      Some(value) => {
-        let sub_info = value.to_str().unwrap_or("");
-
-        Some(PrfExtra {
-          upload: PrfItem::parse_str(sub_info, "upload=").unwrap_or(0),
-          download: PrfItem::parse_str(sub_info, "download=").unwrap_or(0),
-          total: PrfItem::parse_str(sub_info, "total=").unwrap_or(0),
-          expire: PrfItem::parse_str(sub_info, "expire=").unwrap_or(0),
-        })
-      }
-      None => None,
-    };
-
-    let uid = PrfItem::gen_uid("r");
-    let file = format!("{uid}.yaml");
-    let name = uid.clone();
-    let data = resp.text_with_charset("utf-8").await?;
-
-    let item = PrfItem {
-      uid: Some(uid),
-      itype: Some("remote".into()),
-      name: Some(name),
-      desc: None,
-      file: Some(file),
-      url: Some(url.into()),
-      selected: None,
-      extra,
-      updated: Some(PrfItem::gen_now()),
-    };
-
-    Ok((item, data))
-  }
-}
-
-///
-/// ## Profiles Config
-///
-/// Define the `profiles.yaml` schema
-///
-#[derive(Default, Debug, Clone, Deserialize, Serialize)]
-pub struct Profiles {
-  /// same as PrfConfig.current
-  current: Option<String>,
-
-  /// same as PrfConfig.chain
-  chain: Option<Vec<String>>,
-
-  /// profile list
-  items: Option<Vec<PrfItem>>,
-}
-
-impl Profiles {
-  pub fn new() -> Profiles {
-    Profiles::read_file()
-  }
-
-  /// read the config from the file
-  pub fn read_file() -> Self {
-    config::read_yaml::<Self>(dirs::profiles_path())
-  }
-
-  /// save the config to the file
-  pub fn save_file(&self) -> Result<()> {
-    config::save_yaml(
-      dirs::profiles_path(),
-      self,
-      Some("# Profiles Config for Clash Verge\n\n"),
-    )
-  }
-
-  /// get the current uid
-  pub fn get_current(&self) -> Option<String> {
-    self.current.clone()
-  }
-
-  /// only change the main to the target id
-  pub fn put_current(&mut self, uid: String) -> Result<()> {
-    if self.items.is_none() {
-      self.items = Some(vec![]);
-    }
-
-    let items = self.items.as_ref().unwrap();
-    let some_uid = Some(uid.clone());
-
-    for each in items.iter() {
-      if each.uid == some_uid {
-        self.current = some_uid;
-        return self.save_file();
-      }
-    }
-
-    bail!("invalid uid \"{uid}\"");
-  }
-
-  /// append new item
-  /// return the new item's uid
-  pub fn append_item(&mut self, item: PrfItem) -> Result<()> {
-    if item.uid.is_none() {
-      bail!("the uid should not be null");
-    }
-
-    let mut items = self.items.take().unwrap_or(vec![]);
-    items.push(item);
-    self.items = Some(items);
-    self.save_file()
-  }
-
-  /// update the item's value
-  pub fn patch_item(&mut self, uid: String, item: PrfItem) -> Result<()> {
-    let mut items = self.items.take().unwrap_or(vec![]);
-
-    macro_rules! patch {
-      ($lv: expr, $rv: expr, $key: tt) => {
-        if ($rv.$key).is_some() {
-          $lv.$key = $rv.$key;
-        }
-      };
-    }
-
-    for mut each in items.iter_mut() {
-      if each.uid == Some(uid.clone()) {
-        patch!(each, item, itype);
-        patch!(each, item, name);
-        patch!(each, item, desc);
-        patch!(each, item, file);
-        patch!(each, item, url);
-        patch!(each, item, selected);
-        patch!(each, item, extra);
-
-        each.updated = Some(PrfItem::gen_now());
-
-        self.items = Some(items);
-        return self.save_file();
-      }
-    }
-
-    self.items = Some(items);
-    bail!("failed to found the uid \"{uid}\"")
-  }
-
-  /// delete item
-  /// if delete the main then return true
-  pub fn delete_item(&mut self, uid: String) -> Result<bool> {
-    let current = self.current.as_ref().unwrap_or(&uid);
-    let current = current.clone();
-
-    let mut items = self.items.take().unwrap_or(vec![]);
-    let mut index = None;
-
-    // get the index
-    for i in 0..items.len() {
-      if items[i].uid == Some(uid.clone()) {
-        index = Some(i);
-        break;
-      }
-    }
-
-    if let Some(index) = index {
-      items.remove(index).file.map(|file| {
-        let path = dirs::app_profiles_dir().join(file);
-        if path.exists() {
-          let _ = fs::remove_file(path);
-        }
-      });
-    }
-
-    // delete the original uid
-    if current == uid {
-      self.current = match items.len() > 0 {
-        true => items[0].uid.clone(),
-        false => None,
-      };
-    }
-
-    self.items = Some(items);
-    self.save_file()?;
-    Ok(current == uid)
-  }
-
-  /// only generate config mapping
-  pub fn gen_activate(&self) -> Result<Mapping> {
-    if self.current.is_none() {
-      bail!("invalid main uid on profiles");
-    }
-
-    let current = self.current.clone().unwrap();
-
-    for item in self.items.as_ref().unwrap().iter() {
-      if item.uid == Some(current.clone()) {
-        let file_path = match item.file.clone() {
-          Some(file) => dirs::app_profiles_dir().join(file),
-          None => bail!("failed to get the file field"),
-        };
-
-        if !file_path.exists() {
-          bail!("failed to read the file \"{}\"", file_path.display());
-        }
-
-        let mut new_config = Mapping::new();
-        let def_config = config::read_yaml::<Mapping>(file_path.clone());
-
-        // Only the following fields are allowed:
-        // proxies/proxy-providers/proxy-groups/rule-providers/rules
-        let valid_keys = vec![
-          "proxies",
-          "proxy-providers",
-          "proxy-groups",
-          "rule-providers",
-          "rules",
-        ];
-
-        valid_keys.iter().for_each(|key| {
-          let key = Value::String(key.to_string());
-          if def_config.contains_key(&key) {
-            let value = def_config[&key].clone();
-            new_config.insert(key, value);
-          }
-        });
-
-        return Ok(new_config);
-      }
-    }
-
-    bail!("failed to found the uid \"{current}\"");
-  }
-}

src-tauri/src/core/profiles.rs

@@ -1,27 +1,18 @@
-use super::{Clash, ClashInfo};
+use crate::utils::{config, dirs, help, tmpl};
-use crate::utils::{config, dirs, tmpl};
+use anyhow::{bail, Context, Result};
-use anyhow::{bail, Result};
-use reqwest::header::HeaderMap;
 use serde::{Deserialize, Serialize};
 use serde_yaml::{Mapping, Value};
-use std::collections::HashMap;
+use std::{fs, io::Write};
-use std::fs::{remove_file, File};
-use std::io::Write;
-use std::path::PathBuf;
-use std::time::{SystemTime, UNIX_EPOCH};
 
-/// Define the `profiles.yaml` schema
+#[derive(Debug, Clone, Deserialize, Serialize)]
-#[derive(Default, Debug, Clone, Deserialize, Serialize)]
+pub struct PrfItem {
-pub struct Profiles {
+  pub uid: Option<String>,
-  /// current profile's name
-  pub current: Option<usize>,
 
-  /// profile list
+  /// profile item type
-  pub items: Option<Vec<ProfileItem>>,
+  /// enum value: remote | local | script | merge
-}
+  #[serde(rename = "type")]
+  pub itype: Option<String>,
 
-#[derive(Default, Debug, Clone, Deserialize, Serialize)]
-pub struct ProfileItem {
   /// profile name
   pub name: Option<String>,
 
@@ -32,53 +23,249 @@ pub struct ProfileItem {
   /// profile file
   pub file: Option<String>,
 
-  /// current mode
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub mode: Option<String>,
-
   /// source url
   #[serde(skip_serializing_if = "Option::is_none")]
   pub url: Option<String>,
 
   /// selected infomation
   #[serde(skip_serializing_if = "Option::is_none")]
-  pub selected: Option<Vec<ProfileSelected>>,
+  pub selected: Option<Vec<PrfSelected>>,
 
   /// user info
   #[serde(skip_serializing_if = "Option::is_none")]
-  pub extra: Option<ProfileExtra>,
+  pub extra: Option<PrfExtra>,
 
   /// updated time
   pub updated: Option<usize>,
+
+  /// the file data
+  #[serde(skip)]
+  pub file_data: Option<String>,
 }
 
 #[derive(Default, Debug, Clone, Deserialize, Serialize)]
-pub struct ProfileSelected {
+pub struct PrfSelected {
   pub name: Option<String>,
   pub now: Option<String>,
 }
 
 #[derive(Default, Debug, Clone, Copy, Deserialize, Serialize)]
-pub struct ProfileExtra {
+pub struct PrfExtra {
   pub upload: usize,
   pub download: usize,
   pub total: usize,
   pub expire: usize,
 }
 
+impl Default for PrfItem {
+  fn default() -> Self {
+    PrfItem {
+      uid: None,
+      itype: None,
+      name: None,
+      desc: None,
+      file: None,
+      url: None,
+      selected: None,
+      extra: None,
+      updated: None,
+      file_data: None,
+    }
+  }
+}
+
+impl PrfItem {
+  /// From partial item
+  /// must contain `itype`
+  pub async fn from(item: PrfItem) -> Result<PrfItem> {
+    if item.itype.is_none() {
+      bail!("type should not be null");
+    }
+
+    match item.itype.unwrap().as_str() {
+      "remote" => {
+        if item.url.is_none() {
+          bail!("url should not be null");
+        }
+        let url = item.url.as_ref().unwrap().as_str();
+        let name = item.name;
+        let desc = item.desc;
+        PrfItem::from_url(url, name, desc, false).await
+      }
+      "local" => {
+        let name = item.name.unwrap_or("Local File".into());
+        let desc = item.desc.unwrap_or("".into());
+        PrfItem::from_local(name, desc)
+      }
+      "merge" => {
+        let name = item.name.unwrap_or("Merge".into());
+        let desc = item.desc.unwrap_or("".into());
+        PrfItem::from_merge(name, desc)
+      }
+      "script" => {
+        let name = item.name.unwrap_or("Script".into());
+        let desc = item.desc.unwrap_or("".into());
+        PrfItem::from_script(name, desc)
+      }
+      typ @ _ => bail!("invalid type \"{typ}\""),
+    }
+  }
+
+  /// ## Local type
+  /// create a new item from name/desc
+  pub fn from_local(name: String, desc: String) -> Result<PrfItem> {
+    let uid = help::get_uid("l");
+    let file = format!("{uid}.yaml");
+
+    Ok(PrfItem {
+      uid: Some(uid),
+      itype: Some("local".into()),
+      name: Some(name),
+      desc: Some(desc),
+      file: Some(file),
+      url: None,
+      selected: None,
+      extra: None,
+      updated: Some(help::get_now()),
+      file_data: Some(tmpl::ITEM_LOCAL.into()),
+    })
+  }
+
+  /// ## Remote type
+  /// create a new item from url
+  pub async fn from_url(
+    url: &str,
+    name: Option<String>,
+    desc: Option<String>,
+    with_proxy: bool,
+  ) -> Result<PrfItem> {
+    let mut builder = reqwest::ClientBuilder::new();
+
+    if !with_proxy {
+      builder = builder.no_proxy();
+    }
+
+    let resp = builder.build()?.get(url).send().await?;
+    let header = resp.headers();
+
+    // parse the Subscription Userinfo
+    let extra = match header.get("Subscription-Userinfo") {
+      Some(value) => {
+        let sub_info = value.to_str().unwrap_or("");
+
+        Some(PrfExtra {
+          upload: help::parse_str(sub_info, "upload=").unwrap_or(0),
+          download: help::parse_str(sub_info, "download=").unwrap_or(0),
+          total: help::parse_str(sub_info, "total=").unwrap_or(0),
+          expire: help::parse_str(sub_info, "expire=").unwrap_or(0),
+        })
+      }
+      None => None,
+    };
+
+    let uid = help::get_uid("r");
+    let file = format!("{uid}.yaml");
+    let name = name.unwrap_or(uid.clone());
+    let data = resp.text_with_charset("utf-8").await?;
+
+    Ok(PrfItem {
+      uid: Some(uid),
+      itype: Some("remote".into()),
+      name: Some(name),
+      desc,
+      file: Some(file),
+      url: Some(url.into()),
+      selected: None,
+      extra,
+      updated: Some(help::get_now()),
+      file_data: Some(data),
+    })
+  }
+
+  /// ## Merge type (enhance)
+  /// create the enhanced item by using `merge` rule
+  pub fn from_merge(name: String, desc: String) -> Result<PrfItem> {
+    let uid = help::get_uid("m");
+    let file = format!("{uid}.yaml");
+
+    Ok(PrfItem {
+      uid: Some(uid),
+      itype: Some("merge".into()),
+      name: Some(name),
+      desc: Some(desc),
+      file: Some(file),
+      url: None,
+      selected: None,
+      extra: None,
+      updated: Some(help::get_now()),
+      file_data: Some(tmpl::ITEM_MERGE.into()),
+    })
+  }
+
+  /// ## Script type (enhance)
+  /// create the enhanced item by using javascript(browserjs)
+  pub fn from_script(name: String, desc: String) -> Result<PrfItem> {
+    let uid = help::get_uid("s");
+    let file = format!("{uid}.js"); // js ext
+
+    Ok(PrfItem {
+      uid: Some(uid),
+      itype: Some("script".into()),
+      name: Some(name),
+      desc: Some(desc),
+      file: Some(file),
+      url: None,
+      selected: None,
+      extra: None,
+      updated: Some(help::get_now()),
+      file_data: Some(tmpl::ITEM_SCRIPT.into()),
+    })
+  }
+}
+
+///
+/// ## Profiles Config
+///
+/// Define the `profiles.yaml` schema
+///
 #[derive(Default, Debug, Clone, Deserialize, Serialize)]
-/// the result from url
+pub struct Profiles {
-pub struct ProfileResponse {
+  /// same as PrfConfig.current
-  pub name: String,
+  current: Option<String>,
-  pub file: String,
+
-  pub data: String,
+  /// same as PrfConfig.chain
-  pub extra: Option<ProfileExtra>,
+  chain: Option<Vec<String>>,
+
+  /// profile list
+  items: Option<Vec<PrfItem>>,
+}
+
+macro_rules! patch {
+  ($lv: expr, $rv: expr, $key: tt) => {
+    if ($rv.$key).is_some() {
+      $lv.$key = $rv.$key;
+    }
+  };
 }
 
 impl Profiles {
   /// read the config from the file
   pub fn read_file() -> Self {
-    config::read_yaml::<Profiles>(dirs::profiles_path())
+    let mut profiles = config::read_yaml::<Self>(dirs::profiles_path());
+
+    if profiles.items.is_none() {
+      profiles.items = Some(vec![]);
+    }
+
+    profiles.items.as_mut().map(|items| {
+      for mut item in items.iter_mut() {
+        if item.uid.is_none() {
+          item.uid = Some(help::get_uid("d"));
+        }
+      }
+    });
+
+    profiles
   }
 
   /// save the config to the file
@@ -92,303 +279,330 @@ impl Profiles {
 
   /// sync the config between file and memory
   pub fn sync_file(&mut self) -> Result<()> {
-    let data = config::read_yaml::<Self>(dirs::profiles_path());
+    let data = Self::read_file();
-    if data.current.is_none() {
+    if data.current.is_none() && data.items.is_none() {
-      bail!("failed to read profiles.yaml")
+      bail!("failed to read profiles.yaml");
-    } else {
-      self.current = data.current;
-      self.items = data.items;
-      Ok(())
     }
+
+    self.current = data.current;
+    self.chain = data.chain;
+    self.items = data.items;
+    Ok(())
   }
 
-  /// import the new profile from the url
+  /// get the current uid
-  /// and update the config file
+  pub fn get_current(&self) -> Option<String> {
-  pub fn import_from_url(&mut self, url: String, result: ProfileResponse) -> Result<()> {
+    self.current.clone()
-    // save the profile file
-    let path = dirs::app_profiles_dir().join(&result.file);
-    let file_data = result.data.as_bytes();
-    File::create(path).unwrap().write(file_data).unwrap();
-
-    // update `profiles.yaml`
-    let data = Profiles::read_file();
-    let mut items = data.items.unwrap_or(vec![]);
-
-    let now = SystemTime::now()
-      .duration_since(UNIX_EPOCH)
-      .unwrap()
-      .as_secs();
-
-    items.push(ProfileItem {
-      name: Some(result.name),
-      desc: Some("imported url".into()),
-      file: Some(result.file),
-      mode: Some(format!("rule")),
-      url: Some(url),
-      selected: Some(vec![]),
-      extra: result.extra,
-      updated: Some(now as usize),
-    });
-
-    self.items = Some(items);
-    if data.current.is_none() {
-      self.current = Some(0);
-    }
-
-    self.save_file()
   }
 
-  /// set the current and save to file
+  /// only change the main to the target id
-  pub fn put_current(&mut self, index: usize) -> Result<()> {
+  pub fn put_current(&mut self, uid: String) -> Result<()> {
-    let items = self.items.take().unwrap_or(vec![]);
+    if self.items.is_none() {
-
+      self.items = Some(vec![]);
-    if index >= items.len() {
-      bail!("the index out of bound");
     }
 
-    self.items = Some(items);
+    let items = self.items.as_ref().unwrap();
-    self.current = Some(index);
+    let some_uid = Some(uid.clone());
-    self.save_file()
+
+    for each in items.iter() {
+      if each.uid == some_uid {
+        self.current = some_uid;
+        return self.save_file();
+      }
+    }
+
+    bail!("invalid uid \"{uid}\"");
+  }
+
+  /// just change the `chain`
+  pub fn put_chain(&mut self, chain: Option<Vec<String>>) {
+    self.chain = chain;
+  }
+
+  /// find the item by the uid
+  pub fn get_item(&self, uid: &String) -> Result<&PrfItem> {
+    if self.items.is_some() {
+      let items = self.items.as_ref().unwrap();
+      let some_uid = Some(uid.clone());
+
+      for each in items.iter() {
+        if each.uid == some_uid {
+          return Ok(each);
+        }
+      }
+    }
+
+    bail!("failed to get the item by \"{}\"", uid);
   }
 
   /// append new item
-  /// return the new item's index
+  /// if the file_data is some
-  pub fn append_item(&mut self, name: String, desc: String) -> Result<(usize, PathBuf)> {
+  /// then should save the data to file
+  pub fn append_item(&mut self, mut item: PrfItem) -> Result<()> {
+    if item.uid.is_none() {
+      bail!("the uid should not be null");
+    }
+
+    // save the file data
+    // move the field value after save
+    if let Some(file_data) = item.file_data.take() {
+      if item.file.is_none() {
+        bail!("the file should not be null");
+      }
+
+      let file = item.file.clone().unwrap();
+      let path = dirs::app_profiles_dir().join(&file);
+
+      fs::File::create(path)
+        .context(format!("failed to create file \"{}\"", file))?
+        .write(file_data.as_bytes())
+        .context(format!("failed to write to file \"{}\"", file))?;
+    }
+
+    if self.items.is_none() {
+      self.items = Some(vec![]);
+    }
+
+    self.items.as_mut().map(|items| items.push(item));
+    self.save_file()
+  }
+
+  /// update the item's value
+  pub fn patch_item(&mut self, uid: String, item: PrfItem) -> Result<()> {
     let mut items = self.items.take().unwrap_or(vec![]);
 
-    // create a new profile file
+    for mut each in items.iter_mut() {
-    let now = SystemTime::now()
+      if each.uid == Some(uid.clone()) {
-      .duration_since(UNIX_EPOCH)
+        patch!(each, item, itype);
-      .unwrap()
+        patch!(each, item, name);
-      .as_secs();
+        patch!(each, item, desc);
-    let file = format!("{}.yaml", now);
+        patch!(each, item, file);
-    let path = dirs::app_profiles_dir().join(&file);
+        patch!(each, item, url);
+        patch!(each, item, selected);
+        patch!(each, item, extra);
 
-    match File::create(&path).unwrap().write(tmpl::ITEM_CONFIG) {
+        each.updated = Some(help::get_now());
-      Ok(_) => {
-        items.push(ProfileItem {
-          name: Some(name),
-          desc: Some(desc),
-          file: Some(file),
-          mode: None,
-          url: None,
-          selected: Some(vec![]),
-          extra: None,
-          updated: Some(now as usize),
-        });
 
-        let index = items.len();
         self.items = Some(items);
-        Ok((index, path))
+        return self.save_file();
-      }
-      Err(_) => bail!("failed to create file"),
-    }
-  }
-
-  /// update the target profile
-  /// and save to config file
-  /// only support the url item
-  pub fn update_item(&mut self, index: usize, result: ProfileResponse) -> Result<()> {
-    let mut items = self.items.take().unwrap_or(vec![]);
-
-    let now = SystemTime::now()
-      .duration_since(UNIX_EPOCH)
-      .unwrap()
-      .as_secs() as usize;
-
-    // update file
-    let file_path = &items[index].file.as_ref().unwrap();
-    let file_path = dirs::app_profiles_dir().join(file_path);
-    let file_data = result.data.as_bytes();
-    File::create(file_path).unwrap().write(file_data).unwrap();
-
-    items[index].name = Some(result.name);
-    items[index].extra = result.extra;
-    items[index].updated = Some(now);
-
-    self.items = Some(items);
-    self.save_file()
-  }
-
-  /// patch item
-  pub fn patch_item(&mut self, index: usize, profile: ProfileItem) -> Result<()> {
-    let mut items = self.items.take().unwrap_or(vec![]);
-    if index >= items.len() {
-      bail!("index out of range");
-    }
-
-    if profile.name.is_some() {
-      items[index].name = profile.name;
-    }
-    if profile.file.is_some() {
-      items[index].file = profile.file;
-    }
-    if profile.mode.is_some() {
-      items[index].mode = profile.mode;
-    }
-    if profile.url.is_some() {
-      items[index].url = profile.url;
-    }
-    if profile.selected.is_some() {
-      items[index].selected = profile.selected;
-    }
-    if profile.extra.is_some() {
-      items[index].extra = profile.extra;
-    }
-
-    self.items = Some(items);
-    self.save_file()
-  }
-
-  /// delete the item
-  pub fn delete_item(&mut self, index: usize) -> Result<bool> {
-    let mut current = self.current.clone().unwrap_or(0);
-    let mut items = self.items.clone().unwrap_or(vec![]);
-
-    if index >= items.len() {
-      bail!("index out of range");
-    }
-
-    let mut rm_item = items.remove(index);
-
-    // delete the file
-    if let Some(file) = rm_item.file.take() {
-      let file_path = dirs::app_profiles_dir().join(file);
-
-      if file_path.exists() {
-        if let Err(err) = remove_file(file_path) {
-          log::error!("{err}");
-        }
       }
     }
 
-    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.items = Some(items);
-
+    bail!("failed to found the uid \"{uid}\"")
-    match self.save_file() {
-      Ok(_) => Ok(should_change),
-      Err(err) => Err(err),
-    }
   }
 
-  /// activate current profile
+  /// be used to update the remote item
-  pub fn activate(&self, clash: &Clash) -> Result<()> {
+  /// only patch `updated` `extra` `file_data`
-    let current = self.current.unwrap_or(0);
+  pub fn update_item(&mut self, uid: String, mut item: PrfItem) -> Result<()> {
-    match self.items.clone() {
+    if self.items.is_none() {
-      Some(items) => {
+      self.items = Some(vec![]);
-        if current >= items.len() {
+    }
-          bail!("the index out of bound");
-        }
 
-        let profile = items[current].clone();
+    // find the item
-        let clash_config = clash.config.clone();
+    let _ = self.get_item(&uid)?;
-        let clash_info = clash.info.clone();
 
-        tauri::async_runtime::spawn(async move {
+    self.items.as_mut().map(|items| {
-          let mut count = 5; // retry times
+      let some_uid = Some(uid.clone());
-          let mut err = None;
+
-          while count > 0 {
+      for mut each in items.iter_mut() {
-            match activate_profile(&profile, &clash_config, &clash_info).await {
+        if each.uid == some_uid {
-              Ok(_) => return,
+          each.extra = item.extra;
-              Err(e) => err = Some(e),
+          each.updated = item.updated;
-            }
+
-            count -= 1;
+          // save the file data
+          // move the field value after save
+          if let Some(file_data) = item.file_data.take() {
+            let file = each.file.take();
+            let file = file.unwrap_or(item.file.take().unwrap_or(format!("{}.yaml", &uid)));
+
+            // the file must exists
+            each.file = Some(file.clone());
+
+            let path = dirs::app_profiles_dir().join(&file);
+
+            fs::File::create(path)
+              .unwrap()
+              .write(file_data.as_bytes())
+              .unwrap();
           }
-          log::error!("failed to activate for `{}`", err.unwrap());
-        });
 
-        Ok(())
+          break;
-      }
+        }
-      None => bail!("empty profiles"),
-    }
-  }
-}
-
-/// put the profile to clash
-pub async fn activate_profile(
-  profile_item: &ProfileItem,
-  clash_config: &Mapping,
-  clash_info: &ClashInfo,
-) -> Result<()> {
-  // temp profile's path
-  let temp_path = dirs::profiles_temp_path();
-
-  // generate temp profile
-  {
-    let file_name = match profile_item.file.clone() {
-      Some(file_name) => file_name,
-      None => bail!("profile item should have `file` field"),
-    };
-
-    let file_path = dirs::app_profiles_dir().join(file_name);
-    if !file_path.exists() {
-      bail!(
-        "profile `{}` not exists",
-        file_path.as_os_str().to_str().unwrap()
-      );
-    }
-
-    // begin to generate the new profile config
-    let def_config = config::read_yaml::<Mapping>(file_path.clone());
-
-    // use the clash config except 5 keys below
-    let mut new_config = clash_config.clone();
-
-    // Only the following fields are allowed:
-    // proxies/proxy-providers/proxy-groups/rule-providers/rules
-    let valid_keys = vec![
-      "proxies",
-      "proxy-providers",
-      "proxy-groups",
-      "rule-providers",
-      "rules",
-    ];
-    valid_keys.iter().for_each(|key| {
-      let key = Value::String(key.to_string());
-      if def_config.contains_key(&key) {
-        let value = def_config[&key].clone();
-        new_config.insert(key, value);
       }
     });
 
-    config::save_yaml(
+    self.save_file()
-      temp_path.clone(),
-      &new_config,
-      Some("# Clash Verge Temp File"),
-    )?
-  };
-
-  let server = format!("http://{}/configs", clash_info.server.clone().unwrap());
-
-  let mut headers = HeaderMap::new();
-  headers.insert("Content-Type", "application/json".parse().unwrap());
-
-  if let Some(secret) = clash_info.secret.clone() {
-    headers.insert(
-      "Authorization",
-      format!("Bearer {}", secret).parse().unwrap(),
-    );
   }
 
-  let mut data = HashMap::new();
+  /// delete item
-  data.insert("path", temp_path.as_os_str().to_str().unwrap());
+  /// if delete the current then return true
+  pub fn delete_item(&mut self, uid: String) -> Result<bool> {
+    let current = self.current.as_ref().unwrap_or(&uid);
+    let current = current.clone();
 
-  let client = reqwest::ClientBuilder::new().no_proxy().build()?;
+    let mut items = self.items.take().unwrap_or(vec![]);
+    let mut index = None;
 
-  client
+    // get the index
-    .put(server)
+    for i in 0..items.len() {
-    .headers(headers)
+      if items[i].uid == Some(uid.clone()) {
-    .json(&data)
+        index = Some(i);
-    .send()
+        break;
-    .await?;
+      }
-  Ok(())
+    }
+
+    if let Some(index) = index {
+      items.remove(index).file.map(|file| {
+        let path = dirs::app_profiles_dir().join(file);
+        if path.exists() {
+          let _ = fs::remove_file(path);
+        }
+      });
+    }
+
+    // delete the original uid
+    if current == uid {
+      self.current = match items.len() > 0 {
+        true => items[0].uid.clone(),
+        false => None,
+      };
+    }
+
+    self.items = Some(items);
+    self.save_file()?;
+    Ok(current == uid)
+  }
+
+  /// only generate config mapping
+  pub fn gen_activate(&self) -> Result<Mapping> {
+    let config = Mapping::new();
+
+    if self.current.is_none() || self.items.is_none() {
+      return Ok(config);
+    }
+
+    let current = self.current.clone().unwrap();
+
+    for item in self.items.as_ref().unwrap().iter() {
+      if item.uid == Some(current.clone()) {
+        let file_path = match item.file.clone() {
+          Some(file) => dirs::app_profiles_dir().join(file),
+          None => bail!("failed to get the file field"),
+        };
+
+        if !file_path.exists() {
+          bail!("failed to read the file \"{}\"", file_path.display());
+        }
+
+        let mut new_config = Mapping::new();
+        let def_config = config::read_yaml::<Mapping>(file_path.clone());
+
+        // Only the following fields are allowed:
+        // proxies/proxy-providers/proxy-groups/rule-providers/rules
+        let valid_keys = vec![
+          "proxies",
+          "proxy-providers",
+          "proxy-groups",
+          "rule-providers",
+          "rules",
+        ];
+
+        valid_keys.iter().for_each(|key| {
+          let key = Value::String(key.to_string());
+          if def_config.contains_key(&key) {
+            let value = def_config[&key].clone();
+            new_config.insert(key, value);
+          }
+        });
+
+        return Ok(new_config);
+      }
+    }
+
+    bail!("failed to found the uid \"{current}\"");
+  }
+
+  /// gen the enhanced profiles
+  pub fn gen_enhanced(&self, callback: String) -> Result<PrfEnhanced> {
+    let current = self.gen_activate()?;
+
+    let chain = match self.chain.as_ref() {
+      Some(chain) => chain
+        .iter()
+        .map(|uid| self.get_item(uid))
+        .filter(|item| item.is_ok())
+        .map(|item| item.unwrap())
+        .map(|item| PrfData::from_item(item))
+        .filter(|o| o.is_some())
+        .map(|o| o.unwrap())
+        .collect::<Vec<PrfData>>(),
+      None => vec![],
+    };
+
+    Ok(PrfEnhanced {
+      current,
+      chain,
+      callback,
+    })
+  }
+}
+
+#[derive(Default, Debug, Clone, Serialize, Deserialize)]
+pub struct PrfEnhanced {
+  current: Mapping,
+
+  chain: Vec<PrfData>,
+
+  callback: String,
+}
+
+#[derive(Default, Debug, Clone, Serialize, Deserialize)]
+pub struct PrfEnhancedResult {
+  pub data: Option<Mapping>,
+
+  pub status: String,
+
+  pub error: Option<String>,
+}
+
+#[derive(Default, Debug, Clone, Serialize, Deserialize)]
+pub struct PrfData {
+  item: PrfItem,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  merge: Option<Mapping>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  script: Option<String>,
+}
+
+impl PrfData {
+  pub fn from_item(item: &PrfItem) -> Option<PrfData> {
+    match item.itype.as_ref() {
+      Some(itype) => {
+        let file = item.file.clone()?;
+        let path = dirs::app_profiles_dir().join(file);
+
+        if !path.exists() {
+          return None;
+        }
+
+        match itype.as_str() {
+          "script" => Some(PrfData {
+            item: item.clone(),
+            script: Some(fs::read_to_string(path).unwrap_or("".into())),
+            merge: None,
+          }),
+          "merge" => Some(PrfData {
+            item: item.clone(),
+            merge: Some(config::read_yaml::<Mapping>(path)),
+            script: None,
+          }),
+          _ => None,
+        }
+      }
+      None => None,
+    }
+  }
 }

src-tauri/src/core/verge.rs

@@ -1,5 +1,6 @@
 use crate::{
   core::Clash,
+  log_if_err,
   utils::{config, dirs, sysopt::SysProxyConfig},
 };
 use anyhow::{bail, Result};
@@ -58,13 +59,18 @@ impl VergeConfig {
 /// Verge App abilities
 #[derive(Debug)]
 pub struct Verge {
+  /// manage the verge config
   pub config: VergeConfig,
 
-  pub old_sysproxy: Option<SysProxyConfig>,
+  /// current system proxy setting
-
   pub cur_sysproxy: Option<SysProxyConfig>,
 
-  pub auto_launch: Option<AutoLaunch>,
+  /// record the original system proxy
+  /// recover it when exit
+  old_sysproxy: Option<SysProxyConfig>,
+
+  /// helps to auto launch the app
+  auto_launch: Option<AutoLaunch>,
 
   /// record whether the guard async is running or not
   guard_state: Arc<Mutex<bool>>,
@@ -282,7 +288,7 @@ impl Verge {
       loop {
         sleep(Duration::from_secs(wait_secs)).await;
 
-        log::debug!("[Guard]: heartbeat detection");
+        log::debug!("guard heartbeat detection");
 
         let verge = Verge::new();
 
@@ -298,7 +304,7 @@ impl Verge {
           break;
         }
 
-        log::info!("[Guard]: try to guard proxy");
+        log::info!("try to guard proxy");
 
         let clash = Clash::new();
 
@@ -307,12 +313,9 @@ impl Verge {
             let bypass = verge.config.system_proxy_bypass.clone();
             let sysproxy = SysProxyConfig::new(true, port.clone(), bypass);
 
-            if let Err(err) = sysproxy.set_sys() {
+            log_if_err!(sysproxy.set_sys());
-              log::error!("[Guard]: {err}");
-              log::error!("[Guard]: fail to set system proxy");
-            }
           }
-          None => log::error!("[Guard]: fail to parse clash port"),
+          None => log::error!("fail to parse clash port"),
         }
       }
 

src-tauri/src/main.rs

@@ -85,15 +85,17 @@ fn main() -> std::io::Result<()> {
       cmds::get_verge_config,
       cmds::patch_verge_config,
       // profile
-      cmds::new_profile,
       cmds::view_profile,
       cmds::patch_profile,
+      cmds::create_profile,
       cmds::import_profile,
       cmds::update_profile,
       cmds::delete_profile,
       cmds::select_profile,
       cmds::get_profiles,
       cmds::sync_profiles,
+      cmds::enhance_profiles,
+      cmds::change_profile_chain
     ]);
 
   #[cfg(target_os = "macos")]

src-tauri/src/utils/fetch.rs

@@ -1,102 +0,0 @@
-use crate::core::{ProfileExtra, ProfileResponse};
-use std::{
-  str::FromStr,
-  time::{SystemTime, UNIX_EPOCH},
-};
-
-/// parse the string
-fn parse_string<T: FromStr>(target: &str, key: &str) -> Option<T> {
-  match target.find(key) {
-    Some(idx) => {
-      let idx = idx + key.len();
-      let value = &target[idx..];
-      match match value.split(';').nth(0) {
-        Some(value) => value.trim().parse(),
-        None => value.trim().parse(),
-      } {
-        Ok(r) => Some(r),
-        Err(_) => None,
-      }
-    }
-    None => None,
-  }
-}
-
-/// fetch and parse the profile url
-/// maybe it contains some Subscription infomations, maybe not
-pub async fn fetch_profile(url: &str, with_proxy: bool) -> Result<ProfileResponse, String> {
-  let builder = reqwest::ClientBuilder::new();
-  let client = match with_proxy {
-    true => builder.build(),
-    false => builder.no_proxy().build(),
-  };
-
-  let resp = match client.unwrap().get(url).send().await {
-    Ok(res) => res,
-    Err(_) => return Err("failed to create https client".into()),
-  };
-
-  let header = resp.headers();
-
-  // parse the Subscription Userinfo
-  let extra = match header.get("Subscription-Userinfo") {
-    Some(value) => {
-      let sub_info = value.to_str().unwrap_or("");
-
-      Some(ProfileExtra {
-        upload: parse_string(sub_info, "upload=").unwrap_or(0),
-        download: parse_string(sub_info, "download=").unwrap_or(0),
-        total: parse_string(sub_info, "total=").unwrap_or(0),
-        expire: parse_string(sub_info, "expire=").unwrap_or(0),
-      })
-    }
-    None => None,
-  };
-
-  let file = {
-    let now = SystemTime::now()
-      .duration_since(UNIX_EPOCH)
-      .unwrap()
-      .as_secs();
-    format!("{}.yaml", now)
-  };
-
-  let name = match header.get("Content-Disposition") {
-    Some(name) => {
-      let name = name.to_str().unwrap();
-      parse_string::<String>(name, "filename=").unwrap_or(file.clone())
-    }
-    None => file.clone(),
-  };
-
-  // get the data
-  match resp.text_with_charset("utf-8").await {
-    Ok(data) => Ok(ProfileResponse {
-      file,
-      name,
-      data,
-      extra,
-    }),
-    Err(_) => Err("failed to parse the response data".into()),
-  }
-}
-
-#[test]
-fn test_parse_value() {
-  let test_1 = "upload=111; download=2222; total=3333; expire=444";
-  let test_2 = "attachment; filename=Clash.yaml";
-
-  assert_eq!(parse_string::<usize>(test_1, "upload=").unwrap(), 111);
-  assert_eq!(parse_string::<usize>(test_1, "download=").unwrap(), 2222);
-  assert_eq!(parse_string::<usize>(test_1, "total=").unwrap(), 3333);
-  assert_eq!(parse_string::<usize>(test_1, "expire=").unwrap(), 444);
-  assert_eq!(
-    parse_string::<String>(test_2, "filename=").unwrap(),
-    format!("Clash.yaml")
-  );
-
-  assert_eq!(parse_string::<usize>(test_1, "aaa="), None);
-  assert_eq!(parse_string::<usize>(test_1, "upload1="), None);
-  assert_eq!(parse_string::<usize>(test_1, "expire1="), None);
-  assert_eq!(parse_string::<usize>(test_2, "attachment="), None);
-}

src-tauri/src/utils/help.rs

@@ -0,0 +1,94 @@
+use nanoid::nanoid;
+use std::str::FromStr;
+use std::time::{SystemTime, UNIX_EPOCH};
+
+pub fn get_now() -> usize {
+  SystemTime::now()
+    .duration_since(UNIX_EPOCH)
+    .unwrap()
+    .as_secs() as _
+}
+
+const ALPHABET: [char; 62] = [
+  '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+  'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B',
+  'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
+  'V', 'W', 'X', 'Y', 'Z',
+];
+
+/// generate the uid
+pub fn get_uid(prefix: &str) -> String {
+  let id = nanoid!(11, &ALPHABET);
+  format!("{prefix}{id}")
+}
+
+/// parse the string
+/// xxx=123123; => 123123
+pub fn parse_str<T: FromStr>(target: &str, key: &str) -> Option<T> {
+  match target.find(key) {
+    Some(idx) => {
+      let idx = idx + key.len();
+      let value = &target[idx..];
+      match match value.split(';').nth(0) {
+        Some(value) => value.trim().parse(),
+        None => value.trim().parse(),
+      } {
+        Ok(r) => Some(r),
+        Err(_) => None,
+      }
+    }
+    None => None,
+  }
+}
+
+#[macro_export]
+macro_rules! log_if_err {
+  ($result: expr) => {
+    if let Err(err) = $result {
+      log::error!("{err}");
+    }
+  };
+}
+
+/// wrap the anyhow error
+/// transform the error to String
+#[macro_export]
+macro_rules! wrap_err {
+  ($stat: expr) => {
+    match $stat {
+      Ok(a) => Ok(a),
+      Err(err) => {
+        log::error!("{}", err.to_string());
+        Err(format!("{}", err.to_string()))
+      }
+    }
+  };
+}
+
+/// return the string literal error
+#[macro_export]
+macro_rules! ret_err {
+  ($str: literal) => {
+    return Err($str.into())
+  };
+}
+
+#[test]
+fn test_parse_value() {
+  let test_1 = "upload=111; download=2222; total=3333; expire=444";
+  let test_2 = "attachment; filename=Clash.yaml";
+
+  assert_eq!(parse_str::<usize>(test_1, "upload=").unwrap(), 111);
+  assert_eq!(parse_str::<usize>(test_1, "download=").unwrap(), 2222);
+  assert_eq!(parse_str::<usize>(test_1, "total=").unwrap(), 3333);
+  assert_eq!(parse_str::<usize>(test_1, "expire=").unwrap(), 444);
+  assert_eq!(
+    parse_str::<String>(test_2, "filename=").unwrap(),
+    format!("Clash.yaml")
+  );
+
+  assert_eq!(parse_str::<usize>(test_1, "aaa="), None);
+  assert_eq!(parse_str::<usize>(test_1, "upload1="), None);
+  assert_eq!(parse_str::<usize>(test_1, "expire1="), None);
+  assert_eq!(parse_str::<usize>(test_2, "attachment="), None);
+}

src-tauri/src/utils/init.rs

@@ -31,7 +31,7 @@ fn init_log(log_dir: &PathBuf) {
     .build(
       Root::builder()
         .appenders(["stdout", "file"])
-        .build(LevelFilter::Debug),
+        .build(LevelFilter::Info),
     )
     .unwrap();
 

src-tauri/src/utils/mod.rs

@@ -1,6 +1,6 @@
 pub mod config;
 pub mod dirs;
-pub mod fetch;
+pub mod help;
 pub mod init;
 pub mod resolve;
 pub mod server;

src-tauri/src/utils/resolve.rs

@@ -1,5 +1,5 @@
 use super::{init, server};
-use crate::{core::Profiles, states};
+use crate::{core::Profiles, log_if_err, states};
 use tauri::{App, AppHandle, Manager};
 
 /// handle something when start app
@@ -21,14 +21,12 @@ pub fn resolve_setup(app: &App) {
   let mut verge = verge_state.0.lock().unwrap();
   let mut profiles = profiles_state.0.lock().unwrap();
 
-  if let Err(err) = clash.run_sidecar() {
+  log_if_err!(clash.run_sidecar());
-    log::error!("{err}");
-  }
 
   *profiles = Profiles::read_file();
-  if let Err(err) = profiles.activate(&clash) {
+
-    log::error!("{err}");
+  clash.set_window(app.get_window("main"));
-  }
+  log_if_err!(clash.activate(&profiles, true));
 
   verge.init_sysproxy(clash.info.port.clone());
   // enable tun mode
@@ -41,9 +39,7 @@ pub fn resolve_setup(app: &App) {
   }
 
   verge.init_launch();
-  if let Err(err) = verge.sync_launch() {
+  log_if_err!(verge.sync_launch());
-    log::error!("{err}");
-  }
 }
 
 /// reset system proxy
@@ -60,12 +56,12 @@ fn resolve_window(app: &App) {
 
   #[cfg(target_os = "windows")]
   {
-    use tauri_plugin_shadows::Shadows;
+    use window_shadows::set_shadow;
-    use tauri_plugin_vibrancy::Vibrancy;
+    use window_vibrancy::apply_blur;
 
     window.set_decorations(false).unwrap();
-    window.set_shadow(true);
+    set_shadow(&window, true).unwrap();
-    window.apply_blur();
+    apply_blur(&window).unwrap();
   }
 
   #[cfg(target_os = "macos")]

src-tauri/src/utils/tmpl.rs

@@ -14,7 +14,7 @@ secret: ""
 /// template for `profiles.yaml`
 pub const PROFILES_CONFIG: &[u8] = b"# Profiles Config for Clash Verge
 
-current: 0
+current: ~
 items: ~
 ";
 
@@ -32,11 +32,38 @@ system_proxy_bypass: localhost;127.*;10.*;192.168.*;<local>
 ";
 
 /// template for new a profile item
-pub const ITEM_CONFIG: &[u8] = b"# Profile Template for clash verge\n\n
+pub const ITEM_LOCAL: &str = "# Profile Template for clash verge
-# proxies defination (optional, the same as clash)
+
-proxies:\n
+proxies:
-# proxy-groups (optional, the same as clash)
+
-proxy-groups:\n
+proxy-groups:
-# rules (optional, the same as clash)
+
-rules:\n\n
+rules:
+";
+
+/// enhanced profile
+pub const ITEM_MERGE: &str = "# Merge Template for clash verge
+# The `Merge` format used to enhance profile
+
+prepend-rules:
+
+prepend-proxies:
+
+prepend-proxy-groups:
+
+append-rules:
+
+append-proxies:
+
+append-proxy-groups:
+";
+
+/// enhanced profile
+pub const ITEM_SCRIPT: &str = "// Should define the `main` function
+// The argument to this function is the clash config 
+// or the result of the previous handler
+// so you should return the config after processing
+function main(params) {
+  return params;
+}
 ";

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "clash-verge",
-    "version": "0.0.19"
+    "version": "0.0.21"
   },
   "build": {
     "distDir": "../dist",
@@ -27,7 +27,7 @@
       ],
       "resources": ["resources"],
       "externalBin": ["sidecar/clash"],
-      "copyright": "© 2021 zzzgydi All Rights Reserved",
+      "copyright": "© 2022 zzzgydi All Rights Reserved",
       "category": "DeveloperTool",
       "shortDescription": "A Clash GUI based on tauri.",
       "longDescription": "A Clash GUI based on tauri.",

src/components/layout/update-dialog.tsx

@@ -1,7 +1,5 @@
 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,
@@ -10,7 +8,10 @@ import {
   DialogContentText,
   DialogTitle,
 } from "@mui/material";
-import { killSidecars } from "../../services/cmds";
+import { relaunch } from "@tauri-apps/api/process";
+import { checkUpdate, installUpdate } from "@tauri-apps/api/updater";
+import { killSidecars, restartSidecar } from "../../services/cmds";
+import Notice from "../base/base-notice";
 
 interface Props {
   open: boolean;
@@ -29,18 +30,19 @@ const UpdateDialog = (props: Props) => {
   const [uploading, setUploading] = useState(uploadingState);
 
   const onUpdate = async () => {
+    setUploading(true);
+    uploadingState = true;
+
     try {
-      setUploading(true);
-      uploadingState = true;
       await killSidecars();
       await installUpdate();
       await relaunch();
-    } catch (error) {
+    } catch (err: any) {
-      console.log(error);
+      await restartSidecar();
-      window.alert("Failed to upload, please try again.");
+      Notice.error(err?.message || err.toString());
     } finally {
-      setUploading(true);
+      setUploading(false);
-      uploadingState = true;
+      uploadingState = false;
     }
   };
 

src/components/profile/profile-edit.tsx

@@ -0,0 +1,104 @@
+import { mutate } from "swr";
+import { useEffect } from "react";
+import { useLockFn, useSetState } from "ahooks";
+import {
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  TextField,
+} from "@mui/material";
+import { CmdType } from "../../services/types";
+import { patchProfile } from "../../services/cmds";
+import Notice from "../base/base-notice";
+
+interface Props {
+  open: boolean;
+  itemData: CmdType.ProfileItem;
+  onClose: () => void;
+}
+
+// edit the profile item
+const ProfileEdit = (props: Props) => {
+  const { open, itemData, onClose } = props;
+  const [form, setForm] = useSetState({ ...itemData });
+
+  useEffect(() => {
+    if (itemData) {
+      setForm({ ...itemData });
+    }
+  }, [itemData]);
+
+  const onUpdate = useLockFn(async () => {
+    try {
+      const { uid } = itemData;
+      const { name, desc, url } = form;
+      await patchProfile(uid, { uid, name, desc, url });
+      mutate("getProfiles");
+      onClose();
+    } catch (err: any) {
+      Notice.error(err?.message || err.toString());
+    }
+  });
+
+  const textFieldProps = {
+    fullWidth: true,
+    size: "small",
+    margin: "normal",
+    variant: "outlined",
+  } as const;
+
+  const type =
+    form.type ||
+    (form.url ? "remote" : form.file?.endsWith("js") ? "script" : "local");
+
+  return (
+    <Dialog open={open} onClose={onClose}>
+      <DialogTitle sx={{ pb: 0.5 }}>Edit Profile</DialogTitle>
+
+      <DialogContent sx={{ width: 336, pb: 1 }}>
+        <TextField
+          {...textFieldProps}
+          disabled
+          label="Type"
+          value={type}
+          sx={{ input: { textTransform: "capitalize" } }}
+        />
+
+        <TextField
+          {...textFieldProps}
+          autoFocus
+          label="Name"
+          value={form.name}
+          onChange={(e) => setForm({ name: e.target.value })}
+        />
+
+        <TextField
+          {...textFieldProps}
+          label="Descriptions"
+          value={form.desc}
+          onChange={(e) => setForm({ desc: e.target.value })}
+        />
+
+        {type === "remote" && (
+          <TextField
+            {...textFieldProps}
+            label="Subscription Url"
+            value={form.url}
+            onChange={(e) => setForm({ url: e.target.value })}
+          />
+        )}
+      </DialogContent>
+
+      <DialogActions sx={{ px: 2, pb: 2 }}>
+        <Button onClick={onClose}>Cancel</Button>
+        <Button onClick={onUpdate} variant="contained">
+          Update
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+};
+
+export default ProfileEdit;

src/components/profile/profile-item.tsx

@@ -1,5 +1,7 @@
-import React, { useState } from "react";
 import dayjs from "dayjs";
+import { useLockFn } from "ahooks";
+import { useSWRConfig } from "swr";
+import { useEffect, useState } from "react";
 import {
   alpha,
   Box,
@@ -11,14 +13,13 @@ import {
   MenuItem,
   Menu,
 } from "@mui/material";
-import { useLockFn } from "ahooks";
-import { useSWRConfig } from "swr";
 import { RefreshRounded } from "@mui/icons-material";
 import { CmdType } from "../../services/types";
 import { updateProfile, deleteProfile, viewProfile } from "../../services/cmds";
-import Notice from "../base/base-notice";
-import parseTraffic from "../../utils/parse-traffic";
 import relativeTime from "dayjs/plugin/relativeTime";
+import parseTraffic from "../../utils/parse-traffic";
+import ProfileEdit from "./profile-edit";
+import Notice from "../base/base-notice";
 
 dayjs.extend(relativeTime);
 
@@ -38,18 +39,20 @@ const round = keyframes`
   to { transform: rotate(360deg); }
 `;
 
+// save the state of each item loading
+const loadingCache: Record<string, boolean> = {};
+
 interface Props {
-  index: number;
   selected: boolean;
   itemData: CmdType.ProfileItem;
   onSelect: (force: boolean) => void;
 }
 
-const ProfileItem: React.FC<Props> = (props) => {
+const ProfileItem = (props: Props) => {
-  const { index, selected, itemData, onSelect } = props;
+  const { selected, itemData, onSelect } = props;
 
   const { mutate } = useSWRConfig();
-  const [loading, setLoading] = useState(false);
+  const [loading, setLoading] = useState(loadingCache[itemData.uid] ?? false);
   const [anchorEl, setAnchorEl] = useState<any>(null);
   const [position, setPosition] = useState({ left: 0, top: 0 });
 
@@ -66,12 +69,22 @@ const ProfileItem: React.FC<Props> = (props) => {
   const hasUrl = !!itemData.url;
   const hasExtra = !!extra; // only subscription url has extra info
 
+  useEffect(() => {
+    loadingCache[itemData.uid] = loading;
+  }, [itemData, loading]);
+
+  const [editOpen, setEditOpen] = useState(false);
+  const onEdit = () => {
+    setAnchorEl(null);
+    setEditOpen(true);
+  };
+
   const onView = async () => {
     setAnchorEl(null);
     try {
-      await viewProfile(index);
+      await viewProfile(itemData.uid);
     } catch (err: any) {
-      Notice.error(err.toString());
+      Notice.error(err?.message || err.toString());
     }
   };
 
@@ -85,35 +98,25 @@ const ProfileItem: React.FC<Props> = (props) => {
     if (loading) return;
     setLoading(true);
     try {
-      await updateProfile(index, withProxy);
+      await updateProfile(itemData.uid, withProxy);
+      setLoading(false);
       mutate("getProfiles");
     } catch (err: any) {
-      Notice.error(err.toString());
-    } finally {
       setLoading(false);
+      Notice.error(err?.message || err.toString());
     }
   };
 
   const onDelete = useLockFn(async () => {
     setAnchorEl(null);
-
     try {
-      await deleteProfile(index);
+      await deleteProfile(itemData.uid);
       mutate("getProfiles");
     } catch (err: any) {
-      Notice.error(err.toString());
+      Notice.error(err?.message || err.toString());
     }
   });
 
-  const handleContextMenu = (
-    event: React.MouseEvent<HTMLDivElement, MouseEvent>
-  ) => {
-    const { clientX, clientY } = event;
-    setPosition({ top: clientY, left: clientX });
-    setAnchorEl(event.currentTarget);
-    event.preventDefault();
-  };
-
   const boxStyle = {
     height: 26,
     display: "flex",
@@ -123,14 +126,16 @@ const ProfileItem: React.FC<Props> = (props) => {
 
   const urlModeMenu = [
     { label: "Select", handler: onForceSelect },
-    { label: "View", handler: onView },
+    { label: "Edit", handler: onEdit },
+    { label: "File", handler: onView },
     { label: "Update", handler: onUpdateWrapper(false) },
     { label: "Update(Proxy)", handler: onUpdateWrapper(true) },
     { label: "Delete", handler: onDelete },
   ];
   const fileModeMenu = [
     { label: "Select", handler: onForceSelect },
-    { label: "Edit", handler: onView },
+    { label: "Edit", handler: onEdit },
+    { label: "File", handler: onView },
     { label: "Delete", handler: onDelete },
   ];
 
@@ -165,7 +170,12 @@ const ProfileItem: React.FC<Props> = (props) => {
           return { bgcolor, color, "& h2": { color: h2color } };
         }}
         onClick={() => onSelect(false)}
-        onContextMenu={handleContextMenu}
+        onContextMenu={(event) => {
+          const { clientX, clientY } = event;
+          setPosition({ top: clientY, left: clientX });
+          setAnchorEl(event.currentTarget);
+          event.preventDefault();
+        }}
       >
         <Box display="flex" justifyContent="space-between">
           <Typography
@@ -250,6 +260,10 @@ const ProfileItem: React.FC<Props> = (props) => {
         onClose={() => setAnchorEl(null)}
         anchorPosition={position}
         anchorReference="anchorPosition"
+        onContextMenu={(e) => {
+          setAnchorEl(null);
+          e.preventDefault();
+        }}
       >
         {(hasUrl ? urlModeMenu : fileModeMenu).map((item) => (
           <MenuItem
@@ -261,6 +275,14 @@ const ProfileItem: React.FC<Props> = (props) => {
           </MenuItem>
         ))}
       </Menu>
+
+      {editOpen && (
+        <ProfileEdit
+          open={editOpen}
+          itemData={itemData}
+          onClose={() => setEditOpen(false)}
+        />
+      )}
     </>
   );
 };

src/components/profile/profile-more.tsx

@@ -0,0 +1,245 @@
+import dayjs from "dayjs";
+import { useEffect, useState } from "react";
+import {
+  alpha,
+  Box,
+  Chip,
+  styled,
+  Typography,
+  MenuItem,
+  Menu,
+} from "@mui/material";
+import { CmdType } from "../../services/types";
+import { viewProfile } from "../../services/cmds";
+import relativeTime from "dayjs/plugin/relativeTime";
+import ProfileEdit from "./profile-edit";
+import Notice from "../base/base-notice";
+import enhance from "../../services/enhance";
+
+dayjs.extend(relativeTime);
+
+const Wrapper = styled(Box)(({ theme }) => ({
+  width: "100%",
+  display: "block",
+  cursor: "pointer",
+  textAlign: "left",
+  borderRadius: theme.shape.borderRadius,
+  boxShadow: theme.shadows[2],
+  padding: "8px 16px",
+  boxSizing: "border-box",
+}));
+
+interface Props {
+  selected: boolean;
+  itemData: CmdType.ProfileItem;
+  onEnable: () => void;
+  onDisable: () => void;
+  onMoveTop: () => void;
+  onMoveEnd: () => void;
+  onDelete: () => void;
+  onEnhance: () => void;
+}
+
+// profile enhanced item
+const ProfileMore = (props: Props) => {
+  const {
+    selected,
+    itemData,
+    onEnable,
+    onDisable,
+    onMoveTop,
+    onMoveEnd,
+    onDelete,
+    onEnhance,
+  } = props;
+
+  const { uid, type } = itemData;
+  const [anchorEl, setAnchorEl] = useState<any>(null);
+  const [position, setPosition] = useState({ left: 0, top: 0 });
+  const [editOpen, setEditOpen] = useState(false);
+  const [status, setStatus] = useState(enhance.status(uid));
+
+  // unlisten when unmount
+  useEffect(() => enhance.listen(uid, setStatus), [uid]);
+
+  // error during enhanced mode
+  const hasError = selected && status?.status === "error";
+
+  const onEdit = () => {
+    setAnchorEl(null);
+    setEditOpen(true);
+  };
+
+  const onView = async () => {
+    setAnchorEl(null);
+    try {
+      await viewProfile(itemData.uid);
+    } catch (err: any) {
+      Notice.error(err?.message || err.toString());
+    }
+  };
+
+  const closeWrapper = (fn: () => void) => () => {
+    setAnchorEl(null);
+    return fn();
+  };
+
+  const enableMenu = [
+    { label: "Disable", handler: closeWrapper(onDisable) },
+    { label: "Refresh", handler: closeWrapper(onEnhance) },
+    { label: "Edit", handler: onEdit },
+    { label: "File", handler: onView },
+    { label: "To Top", show: !hasError, handler: closeWrapper(onMoveTop) },
+    { label: "To End", show: !hasError, handler: closeWrapper(onMoveEnd) },
+    { label: "Delete", handler: closeWrapper(onDelete) },
+  ];
+
+  const disableMenu = [
+    { label: "Enable", handler: closeWrapper(onEnable) },
+    { label: "Edit", handler: onEdit },
+    { label: "File", handler: onView },
+    { label: "Delete", handler: closeWrapper(onDelete) },
+  ];
+
+  const boxStyle = {
+    height: 26,
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "space-between",
+    lineHeight: 1,
+  };
+
+  return (
+    <>
+      <Wrapper
+        sx={({ palette }) => {
+          // todo
+          // 区分 selected 和 error 和 mode 下各种颜色的排列组合
+          const { mode, primary, text, grey, error } = palette;
+          const key = `${mode}-${selected}`;
+          const bgkey = hasError ? `${mode}-err` : key;
+
+          const bgcolor = {
+            "light-true": alpha(primary.main, 0.15),
+            "light-false": palette.background.paper,
+            "dark-true": alpha(primary.main, 0.35),
+            "dark-false": alpha(grey[700], 0.35),
+            "light-err": alpha(error.main, 0.12),
+            "dark-err": alpha(error.main, 0.3),
+          }[bgkey]!;
+
+          const color = {
+            "light-true": text.secondary,
+            "light-false": text.secondary,
+            "dark-true": alpha(text.secondary, 0.6),
+            "dark-false": alpha(text.secondary, 0.6),
+          }[key]!;
+
+          const h2color = {
+            "light-true": primary.main,
+            "light-false": text.primary,
+            "dark-true": primary.light,
+            "dark-false": text.primary,
+          }[key]!;
+
+          return { bgcolor, color, "& h2": { color: h2color } };
+        }}
+        // onClick={() => onSelect(false)}
+        onContextMenu={(event) => {
+          const { clientX, clientY } = event;
+          setPosition({ top: clientY, left: clientX });
+          setAnchorEl(event.currentTarget);
+          event.preventDefault();
+        }}
+      >
+        <Box display="flex" justifyContent="space-between" alignItems="center">
+          <Typography
+            width="calc(100% - 52px)"
+            variant="h6"
+            component="h2"
+            noWrap
+            title={itemData.name}
+          >
+            {itemData.name}
+          </Typography>
+
+          <Chip
+            label={type}
+            color="primary"
+            size="small"
+            variant="outlined"
+            sx={{ textTransform: "capitalize" }}
+          />
+        </Box>
+
+        <Box sx={boxStyle}>
+          {hasError ? (
+            <Typography
+              noWrap
+              color="error"
+              sx={{ width: "calc(100% - 75px)" }}
+              title={status.message}
+            >
+              {status.message}
+            </Typography>
+          ) : (
+            <Typography
+              noWrap
+              title={itemData.desc}
+              sx={{ width: "calc(100% - 75px)" }}
+            >
+              {itemData.desc}
+            </Typography>
+          )}
+
+          <Typography
+            component="span"
+            title="updated time"
+            style={{ fontSize: 14 }}
+          >
+            {parseExpire(itemData.updated)}
+          </Typography>
+        </Box>
+      </Wrapper>
+
+      <Menu
+        open={!!anchorEl}
+        anchorEl={anchorEl}
+        onClose={() => setAnchorEl(null)}
+        anchorPosition={position}
+        anchorReference="anchorPosition"
+        onContextMenu={(e) => {
+          setAnchorEl(null);
+          e.preventDefault();
+        }}
+      >
+        {(selected ? enableMenu : disableMenu)
+          .filter((item: any) => item.show !== false)
+          .map((item) => (
+            <MenuItem
+              key={item.label}
+              onClick={item.handler}
+              sx={{ minWidth: 133 }}
+            >
+              {item.label}
+            </MenuItem>
+          ))}
+      </Menu>
+
+      {editOpen && (
+        <ProfileEdit
+          open={editOpen}
+          itemData={itemData}
+          onClose={() => setEditOpen(false)}
+        />
+      )}
+    </>
+  );
+};
+
+function parseExpire(expire?: number) {
+  if (!expire) return "-";
+  return dayjs(expire * 1000).format("YYYY-MM-DD");
+}
+
+export default ProfileMore;

src/components/profile/profile-new.tsx

@@ -1,63 +1,105 @@
-import { useEffect, useState } from "react";
+import { useSWRConfig } from "swr";
+import { useLockFn, useSetState } from "ahooks";
 import {
   Button,
   Dialog,
   DialogActions,
   DialogContent,
   DialogTitle,
+  FormControl,
+  InputLabel,
+  MenuItem,
+  Select,
   TextField,
 } from "@mui/material";
+import { createProfile } from "../../services/cmds";
 import Notice from "../base/base-notice";
 
 interface Props {
   open: boolean;
   onClose: () => void;
-  onSubmit: (name: string, desc: string) => void;
 }
 
+// create a new profile
+// remote / local file / merge / script
 const ProfileNew = (props: Props) => {
-  const { open, onClose, onSubmit } = props;
+  const { open, onClose } = props;
-  const [name, setName] = useState("");
-  const [desc, setDesc] = useState("");
 
-  const onCreate = () => {
+  const { mutate } = useSWRConfig();
-    if (!name.trim()) {
+  const [form, setForm] = useSetState({
-      Notice.error("`Name` should not be null");
+    name: "",
+    desc: "",
+    type: "remote",
+    url: "",
+  });
+
+  const onCreate = useLockFn(async () => {
+    if (!form.type) {
+      Notice.error("`Type` should not be null");
       return;
     }
-    onSubmit(name, desc);
-  };
 
-  useEffect(() => {
+    try {
-    if (!open) {
+      await createProfile({ ...form });
-      setName("");
+      setForm({ name: "", desc: "", type: "remote", url: "" });
-      setDesc("");
+      mutate("getProfiles");
+      onClose();
+    } catch (err: any) {
+      Notice.error(err.message || err.toString());
     }
-  }, [open]);
+  });
+
+  const textFieldProps = {
+    fullWidth: true,
+    size: "small",
+    margin: "normal",
+    variant: "outlined",
+  } as const;
 
   return (
     <Dialog open={open} onClose={onClose}>
-      <DialogTitle>Create Profile</DialogTitle>
+      <DialogTitle sx={{ pb: 0.5 }}>Create Profile</DialogTitle>
-      <DialogContent sx={{ width: 320, pb: 0.5 }}>
+
+      <DialogContent sx={{ width: 336, pb: 1 }}>
         <TextField
+          {...textFieldProps}
           autoFocus
-          fullWidth
           label="Name"
-          margin="dense"
+          value={form.name}
-          variant="outlined"
+          onChange={(e) => setForm({ name: e.target.value })}
-          value={name}
-          onChange={(e) => setName(e.target.value)}
         />
 
+        <FormControl size="small" fullWidth sx={{ mt: 2, mb: 1 }}>
+          <InputLabel>Type</InputLabel>
+          <Select
+            label="Type"
+            value={form.type}
+            onChange={(e) => setForm({ type: e.target.value })}
+          >
+            <MenuItem value="remote">Remote</MenuItem>
+            <MenuItem value="local">Local</MenuItem>
+            <MenuItem value="script">Script</MenuItem>
+            <MenuItem value="merge">Merge</MenuItem>
+          </Select>
+        </FormControl>
+
         <TextField
-          fullWidth
+          {...textFieldProps}
           label="Descriptions"
-          margin="normal"
+          value={form.desc}
-          variant="outlined"
+          onChange={(e) => setForm({ desc: e.target.value })}
-          value={desc}
-          onChange={(e) => setDesc(e.target.value)}
         />
+
+        {form.type === "remote" && (
+          <TextField
+            {...textFieldProps}
+            label="Subscription Url"
+            value={form.url}
+            onChange={(e) => setForm({ url: e.target.value })}
+          />
+        )}
       </DialogContent>
+
       <DialogActions sx={{ px: 2, pb: 2 }}>
         <Button onClick={onClose}>Cancel</Button>
         <Button onClick={onCreate} variant="contained">

src/components/proxy/proxy-group.tsx

@@ -1,5 +1,5 @@
+import useSWR, { useSWRConfig } from "swr";
 import { useEffect, useRef, useState } from "react";
-import { useSWRConfig } from "swr";
 import { useLockFn } from "ahooks";
 import { Virtuoso } from "react-virtuoso";
 import {
@@ -46,6 +46,8 @@ const ProxyGroup = ({ group }: Props) => {
   const virtuosoRef = useRef<any>();
   const filterProxies = useFilterProxy(proxies, group.name, filterText);
 
+  const { data: profiles } = useSWR("getProfiles", getProfiles);
+
   const onChangeProxy = useLockFn(async (name: string) => {
     // Todo: support another proxy group type
     if (group.type !== "Selector") return;
@@ -60,8 +62,7 @@ const ProxyGroup = ({ group }: Props) => {
     }
 
     try {
-      const profiles = await getProfiles();
+      const profile = profiles?.items?.find((p) => p.uid === profiles.current);
-      const profile = profiles.items![profiles.current!]!;
       if (!profile) return;
       if (!profile.selected) profile.selected = [];
 
@@ -74,7 +75,7 @@ const ProxyGroup = ({ group }: Props) => {
       } else {
         profile.selected[index] = { name: group.name, now: name };
       }
-      await patchProfile(profiles.current!, profile);
+      await patchProfile(profiles!.current!, profile);
     } catch (err) {
       console.error(err);
     }

src/components/proxy/proxy-item.tsx

@@ -102,8 +102,8 @@ const ProxyItem = (props: Props) => {
             <>
               {proxy.name}
 
-              {showType && <TypeBox>{proxy.type}</TypeBox>}
+              {showType && <TypeBox component="span">{proxy.type}</TypeBox>}
-              {showType && proxy.udp && <TypeBox>UDP</TypeBox>}
+              {showType && proxy.udp && <TypeBox component="span">UDP</TypeBox>}
             </>
           }
         />

src/main.tsx

@@ -6,6 +6,9 @@ import ReactDOM from "react-dom";
 import { RecoilRoot } from "recoil";
 import { BrowserRouter } from "react-router-dom";
 import Layout from "./pages/_layout";
+import enhance from "./services/enhance";
+
+enhance.setup();
 
 ReactDOM.render(
   <React.StrictMode>

src/pages/profiles.tsx

@@ -1,34 +1,56 @@
 import useSWR, { useSWRConfig } from "swr";
-import { useEffect, useState } from "react";
 import { useLockFn } from "ahooks";
+import { useEffect, useMemo, useState } from "react";
 import { Box, Button, Grid, TextField } from "@mui/material";
 import {
   getProfiles,
-  selectProfile,
   patchProfile,
+  deleteProfile,
+  selectProfile,
   importProfile,
-  newProfile,
+  enhanceProfiles,
+  changeProfileChain,
 } from "../services/cmds";
 import { getProxies, updateProxy } from "../services/api";
-import noop from "../utils/noop";
 import Notice from "../components/base/base-notice";
 import BasePage from "../components/base/base-page";
-import ProfileItem from "../components/profile/profile-item";
 import ProfileNew from "../components/profile/profile-new";
+import ProfileItem from "../components/profile/profile-item";
+import ProfileMore from "../components/profile/profile-more";
 
 const ProfilePage = () => {
+  const { mutate } = useSWRConfig();
+
   const [url, setUrl] = useState("");
   const [disabled, setDisabled] = useState(false);
+  const [dialogOpen, setDialogOpen] = useState(false);
 
-  const { mutate } = useSWRConfig();
   const { data: profiles = {} } = useSWR("getProfiles", getProfiles);
 
+  const { regularItems, enhanceItems } = useMemo(() => {
+    const items = profiles.items || [];
+    const chain = profiles.chain || [];
+
+    const type1 = ["local", "remote"];
+    const type2 = ["merge", "script"];
+
+    const regularItems = items.filter((i) => type1.includes(i.type!));
+    const restItems = items.filter((i) => type2.includes(i.type!));
+
+    const restMap = Object.fromEntries(restItems.map((i) => [i.uid, i]));
+
+    const enhanceItems = chain
+      .map((i) => restMap[i]!)
+      .concat(restItems.filter((i) => !chain.includes(i.uid)));
+
+    return { regularItems, enhanceItems };
+  }, [profiles]);
+
   useEffect(() => {
     if (profiles.current == null) return;
-    if (!profiles.items) profiles.items = [];
 
     const current = profiles.current;
-    const profile = profiles.items![current];
+    const profile = regularItems.find((p) => p.uid === current);
     if (!profile) return;
 
     setTimeout(async () => {
@@ -63,7 +85,7 @@ const ProfilePage = () => {
       // update proxies cache
       if (hasChange) mutate("getProxies", getProxies());
     }, 100);
-  }, [profiles]);
+  }, [profiles, regularItems]);
 
   const onImport = async () => {
     if (!url) return;
@@ -72,9 +94,17 @@ const ProfilePage = () => {
 
     try {
       await importProfile(url);
-      mutate("getProfiles", getProfiles());
-      if (!profiles.items?.length) selectProfile(0).catch(noop);
       Notice.success("Successfully import profile.");
+
+      getProfiles().then((newProfiles) => {
+        mutate("getProfiles", newProfiles);
+
+        if (!newProfiles.current && newProfiles.items?.length) {
+          const current = newProfiles.items[0].uid;
+          selectProfile(current);
+          mutate("getProfiles", { ...newProfiles, current }, true);
+        }
+      });
     } catch {
       Notice.error("Failed to import profile.");
     } finally {
@@ -82,33 +112,70 @@ const ProfilePage = () => {
     }
   };
 
-  const onSelect = useLockFn(async (index: number, force: boolean) => {
+  const onSelect = useLockFn(async (uid: string, force: boolean) => {
-    if (!force && index === profiles.current) return;
+    if (!force && uid === profiles.current) return;
 
     try {
-      await selectProfile(index);
+      await selectProfile(uid);
-      mutate("getProfiles", { ...profiles, current: index }, true);
+      mutate("getProfiles", { ...profiles, current: uid }, true);
     } catch (err: any) {
-      err && Notice.error(err.toString());
+      Notice.error(err?.message || err.toString());
     }
   });
 
-  const [dialogOpen, setDialogOpen] = useState(false);
+  /** enhanced profile mode */
-  const onNew = useLockFn(async (name: string, desc: string) => {
+
+  const chain = profiles.chain || [];
+
+  const onEnhance = useLockFn(enhanceProfiles);
+
+  const onEnhanceEnable = useLockFn(async (uid: string) => {
+    if (chain.includes(uid)) return;
+
+    const newChain = [...chain, uid];
+    await changeProfileChain(newChain);
+    mutate("getProfiles", { ...profiles, chain: newChain }, true);
+  });
+
+  const onEnhanceDisable = useLockFn(async (uid: string) => {
+    if (!chain.includes(uid)) return;
+
+    const newChain = chain.filter((i) => i !== uid);
+    await changeProfileChain(newChain);
+    mutate("getProfiles", { ...profiles, chain: newChain }, true);
+  });
+
+  const onEnhanceDelete = useLockFn(async (uid: string) => {
     try {
-      await newProfile(name, desc);
+      await onEnhanceDisable(uid);
-      setDialogOpen(false);
+      await deleteProfile(uid);
       mutate("getProfiles");
     } catch (err: any) {
-      err && Notice.error(err.toString());
+      Notice.error(err?.message || err.toString());
     }
   });
 
+  const onMoveTop = useLockFn(async (uid: string) => {
+    if (!chain.includes(uid)) return;
+
+    const newChain = [uid].concat(chain.filter((i) => i !== uid));
+    await changeProfileChain(newChain);
+    mutate("getProfiles", { ...profiles, chain: newChain }, true);
+  });
+
+  const onMoveEnd = useLockFn(async (uid: string) => {
+    if (!chain.includes(uid)) return;
+
+    const newChain = chain.filter((i) => i !== uid).concat([uid]);
+    await changeProfileChain(newChain);
+    mutate("getProfiles", { ...profiles, chain: newChain }, true);
+  });
+
   return (
     <BasePage title="Profiles">
-      <Box sx={{ display: "flex", mb: 3 }}>
+      <Box sx={{ display: "flex", mb: 2.5 }}>
         <TextField
-          id="profile_url"
+          id="clas_verge_profile_url"
           name="profile_url"
           label="Profile URL"
           size="small"
@@ -130,24 +197,36 @@ const ProfilePage = () => {
         </Button>
       </Box>
 
-      <Grid container spacing={3}>
+      <Grid container spacing={2}>
-        {profiles?.items?.map((item, idx) => (
+        {regularItems.map((item) => (
           <Grid item xs={12} sm={6} key={item.file}>
             <ProfileItem
-              index={idx}
+              selected={profiles.current === item.uid}
-              selected={profiles.current === idx}
               itemData={item}
-              onSelect={(f) => onSelect(idx, f)}
+              onSelect={(f) => onSelect(item.uid, f)}
             />
           </Grid>
         ))}
       </Grid>
 
-      <ProfileNew
+      <Grid container spacing={2} sx={{ mt: 3 }}>
-        open={dialogOpen}
+        {enhanceItems.map((item) => (
-        onClose={() => setDialogOpen(false)}
+          <Grid item xs={12} sm={6} key={item.file}>
-        onSubmit={onNew}
+            <ProfileMore
-      />
+              selected={!!profiles.chain?.includes(item.uid)}
+              itemData={item}
+              onEnable={() => onEnhanceEnable(item.uid)}
+              onDisable={() => onEnhanceDisable(item.uid)}
+              onDelete={() => onEnhanceDelete(item.uid)}
+              onMoveTop={() => onMoveTop(item.uid)}
+              onMoveEnd={() => onMoveEnd(item.uid)}
+              onEnhance={onEnhance}
+            />
+          </Grid>
+        ))}
+      </Grid>
+
+      <ProfileNew open={dialogOpen} onClose={() => setDialogOpen(false)} />
     </BasePage>
   );
 };

src/services/api.ts

@@ -96,20 +96,26 @@ export async function getProxies() {
 
   let groups: ApiType.ProxyGroupItem[] = [];
 
+  // compatible with proxy-providers
+  const generateItem = (name: string) => {
+    if (records[name]) return records[name];
+    return { name, type: "unknown", udp: false, history: [] };
+  };
+
   if (order) {
     groups = order
       .filter((name) => records[name]?.all)
       .map((name) => records[name])
       .map((each) => ({
         ...each,
-        all: each.all!.map((item) => records[item]),
+        all: each.all!.map((item) => generateItem(item)),
       }));
   } else {
     groups = Object.values(records)
       .filter((each) => each.name !== "GLOBAL" && each.all)
       .map((each) => ({
         ...each,
-        all: each.all!.map((item) => records[item]),
+        all: each.all!.map((item) => generateItem(item)),
       }));
     groups.sort((a, b) => b.name.localeCompare(a.name));
   }
@@ -122,3 +128,10 @@ export async function getProxies() {
 
   return { global, direct, groups, records, proxies };
 }
+
+// todo: get proxy providers
+export async function getProviders() {
+  const instance = await getAxios();
+  const response = await instance.get<any, any>("/providers/proxies");
+  return response.providers as any;
+}

src/services/cmds.ts

@@ -9,11 +9,15 @@ export async function syncProfiles() {
   return invoke<void>("sync_profiles");
 }
 
-export async function newProfile(name: string, desc: string) {
+export async function enhanceProfiles() {
-  return invoke<void>("new_profile", { name, desc });
+  return invoke<void>("enhance_profiles");
 }
 
-export async function viewProfile(index: number) {
+export async function createProfile(item: Partial<CmdType.ProfileItem>) {
+  return invoke<void>("create_profile", { item });
+}
+
+export async function viewProfile(index: string) {
   return invoke<void>("view_profile", { index });
 }
 
@@ -21,27 +25,27 @@ export async function importProfile(url: string) {
   return invoke<void>("import_profile", { url, withProxy: true });
 }
 
-export async function updateProfile(index: number, withProxy: boolean) {
+export async function updateProfile(index: string, withProxy: boolean) {
   return invoke<void>("update_profile", { index, withProxy });
 }
 
-export async function deleteProfile(index: number) {
+export async function deleteProfile(index: string) {
   return invoke<void>("delete_profile", { index });
 }
 
 export async function patchProfile(
-  index: number,
+  index: string,
   profile: CmdType.ProfileItem
 ) {
   return invoke<void>("patch_profile", { index, profile });
 }
 
-export async function selectProfile(index: number) {
+export async function selectProfile(index: string) {
   return invoke<void>("select_profile", { index });
 }
 
-export async function restartSidecar() {
+export async function changeProfileChain(chain?: string[]) {
-  return invoke<void>("restart_sidecar");
+  return invoke<void>("change_profile_chain", { chain });
 }
 
 export async function getClashInfo() {
@@ -64,6 +68,10 @@ export async function getSystemProxy() {
   return invoke<any>("get_sys_proxy");
 }
 
+export async function restartSidecar() {
+  return invoke<void>("restart_sidecar");
+}
+
 export async function killSidecars() {
   return invoke<any>("kill_sidecars");
 }

src/services/enhance.ts

@@ -0,0 +1,147 @@
+import { emit, listen } from "@tauri-apps/api/event";
+import { CmdType } from "./types";
+
+/**
+ * process the merge mode
+ */
+function toMerge(
+  merge: CmdType.ProfileMerge,
+  data: CmdType.ProfileData
+): CmdType.ProfileData {
+  if (!merge) return data;
+
+  const newData = { ...data };
+
+  // rules
+  if (Array.isArray(merge["prepend-rules"])) {
+    if (!newData.rules) newData.rules = [];
+    newData.rules.unshift(...merge["prepend-rules"]);
+  }
+  if (Array.isArray(merge["append-rules"])) {
+    if (!newData.rules) newData.rules = [];
+    newData.rules.push(...merge["append-rules"]);
+  }
+
+  // proxies
+  if (Array.isArray(merge["prepend-proxies"])) {
+    if (!newData.proxies) newData.proxies = [];
+    newData.proxies.unshift(...merge["prepend-proxies"]);
+  }
+  if (Array.isArray(merge["append-proxies"])) {
+    if (!newData.proxies) newData.proxies = [];
+    newData.proxies.push(...merge["append-proxies"]);
+  }
+
+  // proxy-groups
+  if (Array.isArray(merge["prepend-proxy-groups"])) {
+    if (!newData["proxy-groups"]) newData["proxy-groups"] = [];
+    newData["proxy-groups"].unshift(...merge["prepend-proxy-groups"]);
+  }
+  if (Array.isArray(merge["append-proxy-groups"])) {
+    if (!newData["proxy-groups"]) newData["proxy-groups"] = [];
+    newData["proxy-groups"].push(...merge["append-proxy-groups"]);
+  }
+
+  return newData;
+}
+
+/**
+ * process the script mode
+ */
+function toScript(
+  script: string,
+  data: CmdType.ProfileData
+): Promise<CmdType.ProfileData> {
+  if (!script) {
+    throw new Error("miss the main function");
+  }
+
+  const paramsName = `__verge${Math.floor(Math.random() * 1000)}`;
+  const code = `'use strict';${script};return main(${paramsName});`;
+  const func = new Function(paramsName, code);
+  return func(data);
+}
+
+export type EStatus = { status: "ok" | "error"; message?: string };
+export type EListener = (status: EStatus) => void;
+export type EUnlistener = () => void;
+
+/**
+ * The service helps to
+ * implement enhanced profiles
+ */
+class Enhance {
+  private isSetup = false;
+  private listenMap: Map<string, EListener>;
+  private resultMap: Map<string, EStatus>;
+
+  constructor() {
+    this.listenMap = new Map();
+    this.resultMap = new Map();
+  }
+
+  // setup some listener
+  // for the enhanced running status
+  listen(uid: string, cb: EListener): EUnlistener {
+    this.listenMap.set(uid, cb);
+    return () => this.listenMap.delete(uid);
+  }
+
+  // get the running status
+  status(uid: string): EStatus | undefined {
+    return this.resultMap.get(uid);
+  }
+
+  // setup the handler
+  setup() {
+    if (this.isSetup) return;
+    this.isSetup = true;
+
+    listen("script-handler", async (event) => {
+      const payload = event.payload as CmdType.EnhancedPayload;
+      let pdata = payload.current || {};
+
+      for (const each of payload.chain) {
+        const { uid, type = "" } = each.item;
+
+        try {
+          // process script
+          if (type === "script") {
+            // support async main function
+            pdata = await toScript(each.script!, { ...pdata });
+          }
+
+          // process merge
+          else if (type === "merge") {
+            pdata = toMerge(each.merge!, { ...pdata });
+          }
+
+          // invalid type
+          else {
+            throw new Error(`invalid enhanced profile type "${type}"`);
+          }
+
+          this.exec(uid, { status: "ok" });
+        } catch (err: any) {
+          this.exec(uid, {
+            status: "error",
+            message: err.message || err.toString(),
+          });
+
+          console.error(err);
+        }
+      }
+
+      const result = { data: pdata, status: "ok" };
+      emit(payload.callback, JSON.stringify(result)).catch(console.error);
+    });
+  }
+
+  // exec the listener
+  private exec(uid: string, status: EStatus) {
+    this.resultMap.set(uid, status);
+    this.listenMap.get(uid)?.(status);
+  }
+}
+
+export default new Enhance();

src/services/types.ts

@@ -78,6 +78,8 @@ export namespace ApiType {
  * Some interface for command
  */
 export namespace CmdType {
+  export type ProfileType = "local" | "remote" | "merge" | "script";
+
   export interface ClashInfo {
     status: string;
     port?: string;
@@ -86,10 +88,11 @@ export namespace CmdType {
   }
 
   export interface ProfileItem {
+    uid: string;
+    type?: ProfileType | string;
     name?: string;
     desc?: string;
     file?: string;
-    mode?: string;
     url?: string;
     updated?: number;
     selected?: {
@@ -105,7 +108,8 @@ export namespace CmdType {
   }
 
   export interface ProfilesConfig {
-    current?: number;
+    current?: string;
+    chain?: string[];
     items?: ProfileItem[];
   }
 
@@ -119,4 +123,33 @@ export namespace CmdType {
     enable_proxy_guard?: boolean;
     system_proxy_bypass?: string;
   }
+
+  export type ProfileMerge = Record<string, any>;
+
+  // partial of the clash config
+  export type ProfileData = Partial<{
+    rules: any[];
+    proxies: any[];
+    "proxy-groups": any[];
+    "proxy-providers": any[];
+    "rule-providers": any[];
+  }>;
+
+  export interface ChainItem {
+    item: ProfileItem;
+    merge?: ProfileMerge;
+    script?: string;
+  }
+
+  export interface EnhancedPayload {
+    chain: ChainItem[];
+    current: ProfileData;
+    callback: string;
+  }
+
+  export interface EnhancedResult {
+    data: ProfileData;
+    status: string;
+    error?: string;
+  }
 }

yarn.lock

@@ -123,9 +123,9 @@
     "@babel/types" "^7.16.7"
 
 "@babel/helper-module-transforms@^7.16.7":
-  version "7.16.7"
+  version "7.17.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz#3c3b03cc6617e33d68ef5a27a67419ac5199ccd0"
-  integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==
+  integrity sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==
   dependencies:
     "@babel/helper-environment-visitor" "^7.16.7"
     "@babel/helper-module-imports" "^7.16.7"
@@ -133,8 +133,8 @@
     "@babel/helper-split-export-declaration" "^7.16.7"
     "@babel/helper-validator-identifier" "^7.16.7"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
+    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.17.0"
 
 "@babel/helper-plugin-utils@^7.16.7":
   version "7.16.7"
@@ -227,7 +227,7 @@
     "@babel/plugin-syntax-jsx" "^7.16.7"
     "@babel/types" "^7.17.0"
 
-"@babel/runtime@^7.13.10", "@babel/runtime@^7.17.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.7":
+"@babel/runtime@^7.13.10", "@babel/runtime@^7.17.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.7":
   version "7.17.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941"
   integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==
@@ -243,7 +243,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.16.7", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3":
+"@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
   integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
@@ -267,7 +267,7 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
-"@emotion/babel-plugin@^11.3.0":
+"@emotion/babel-plugin@^11.7.1":
   version "11.7.2"
   resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.7.2.tgz#fec75f38a6ab5b304b0601c74e2a5e77c95e5fa0"
   integrity sha512-6mGSCWi9UzXut/ZAN6lGFu33wGR3SJisNl3c0tvlmb8XChH1b2SUvxvnOh7hvLpqyRdHHU9AiazV3Cwbk5SXKQ==
@@ -301,10 +301,10 @@
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@emotion/is-prop-valid@^1.1.1":
+"@emotion/is-prop-valid@^1.1.2":
-  version "1.1.1"
+  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.1.tgz#cbd843d409dfaad90f9404e7c0404c55eae8c134"
+  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95"
-  integrity sha512-bW1Tos67CZkOURLc0OalnfxtSXQJMrAMV0jZTVGJUPSOd4qgjF3+tTD5CwJM13PHA8cltGW1WGbbvV9NpvUZPw==
+  integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ==
   dependencies:
     "@emotion/memoize" "^0.7.4"
 
@@ -313,16 +313,17 @@
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
   integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
 
-"@emotion/react@^11.7.0":
+"@emotion/react@^11.8.1":
-  version "11.7.1"
+  version "11.8.1"
-  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.7.1.tgz#3f800ce9b20317c13e77b8489ac4a0b922b2fe07"
+  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.8.1.tgz#5358b8c78367063881e26423057c030c57ce52eb"
-  integrity sha512-DV2Xe3yhkF1yT4uAUoJcYL1AmrnO5SVsdfvu+fBuS7IbByDeTVx9+wFmvx9Idzv7/78+9Mgx2Hcmr7Fex3tIyw==
+  integrity sha512-XGaie4nRxmtP1BZYBXqC5JGqMYF2KRKKI7vjqNvQxyRpekVAZhb6QqrElmZCAYXH1L90lAelADSVZC4PFsrJ8Q==
   dependencies:
     "@babel/runtime" "^7.13.10"
+    "@emotion/babel-plugin" "^11.7.1"
     "@emotion/cache" "^11.7.1"
     "@emotion/serialize" "^1.0.2"
     "@emotion/sheet" "^1.1.0"
-    "@emotion/utils" "^1.0.0"
+    "@emotion/utils" "^1.1.0"
     "@emotion/weak-memoize" "^0.2.5"
     hoist-non-react-statics "^3.3.1"
 
@@ -342,26 +343,26 @@
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2"
   integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==
 
-"@emotion/styled@^11.6.0":
+"@emotion/styled@^11.8.1":
-  version "11.6.0"
+  version "11.8.1"
-  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.6.0.tgz#9230d1a7bcb2ebf83c6a579f4c80e0664132d81d"
+  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.8.1.tgz#856f6f63aceef0eb783985fa2322e2bf66d04e17"
-  integrity sha512-mxVtVyIOTmCAkFbwIp+nCjTXJNgcz4VWkOYQro87jE2QBTydnkiYusMrRGFtzuruiGK4dDaNORk4gH049iiQuw==
+  integrity sha512-OghEVAYBZMpEquHZwuelXcRjRJQOVayvbmNR0zr174NHdmMgrNkLC6TljKC5h9lZLkN5WGrdUcrKlOJ4phhoTQ==
   dependencies:
     "@babel/runtime" "^7.13.10"
-    "@emotion/babel-plugin" "^11.3.0"
+    "@emotion/babel-plugin" "^11.7.1"
-    "@emotion/is-prop-valid" "^1.1.1"
+    "@emotion/is-prop-valid" "^1.1.2"
     "@emotion/serialize" "^1.0.2"
-    "@emotion/utils" "^1.0.0"
+    "@emotion/utils" "^1.1.0"
 
 "@emotion/unitless@^0.7.5":
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
   integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
-"@emotion/utils@^1.0.0":
+"@emotion/utils@^1.0.0", "@emotion/utils@^1.1.0":
-  version "1.0.0"
+  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.1.0.tgz#86b0b297f3f1a0f2bdb08eeac9a2f49afd40d0cf"
-  integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==
+  integrity sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ==
 
 "@emotion/weak-memoize@^0.2.5":
   version "0.2.5"
@@ -386,36 +387,36 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@mui/base@5.0.0-alpha.69":
+"@mui/base@5.0.0-alpha.70":
-  version "5.0.0-alpha.69"
+  version "5.0.0-alpha.70"
-  resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.69.tgz#8511198d760de0795870f5ec63e53db73ba801ec"
+  resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.70.tgz#e280ee3b69d86034f2cff445161747940129d576"
-  integrity sha512-IxUUj/lkilCTNBIybQxyQGW/zpxFp490G0QBQJgRp9TJkW2PWSTLvAH7gcH0YHd0L2TAf1TRgfdemoRseMzqQA==
+  integrity sha512-8UZWhz1JYuQnPkAbC37cl4aL1JyNWZ08wDXlp57W7fYQp5xFpBP/7p56AcWg2qG9CNJP0IlFg2Wp4md1v2l4iA==
   dependencies:
-    "@babel/runtime" "^7.17.0"
+    "@babel/runtime" "^7.17.2"
-    "@emotion/is-prop-valid" "^1.1.1"
+    "@emotion/is-prop-valid" "^1.1.2"
-    "@mui/utils" "^5.4.2"
+    "@mui/utils" "^5.4.4"
     "@popperjs/core" "^2.4.4"
     clsx "^1.1.1"
     prop-types "^15.7.2"
     react-is "^17.0.2"
 
-"@mui/icons-material@^5.4.1":
+"@mui/icons-material@^5.4.4":
-  version "5.4.2"
+  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.4.2.tgz#b2fd2c6c81d2d275e17ce40bd50c63cb197d324b"
+  resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.4.4.tgz#0dc7b4e68cbbdfc675f09f0763be1100aad910af"
-  integrity sha512-7c+G3jBT+e+pN0a9DJ0Bd8Kr1Vy6os5Q1yd2aXcwuhlRI3uzJBLJ8sX6FSWoh5DSEBchb7Bsk1uHz6U0YN9l+Q==
+  integrity sha512-7zoRpjO8vsd+bPvXq6rtXu0V8Saj70X09dtTQogZmxQKabrYW3g7+Yym7SCRA7IYVF3ysz2AvdQrGD1P/sGepg==
   dependencies:
-    "@babel/runtime" "^7.17.0"
+    "@babel/runtime" "^7.17.2"
 
-"@mui/material@^5.4.1":
+"@mui/material@^5.4.4":
-  version "5.4.2"
+  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.4.2.tgz#04ea6632d7ca600a2ae528f6f140ef0af9c01434"
+  resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.4.4.tgz#2652a07085bf107da590007286336640f605055e"
-  integrity sha512-jmeLWEO6AA6g7HErhI3MXVGaMZtqDZjDwcHCg24WY954wO38Xn0zJ53VfpFc44ZTJLV9Ejd7ci9fLlG/HmJCeg==
+  integrity sha512-VDJC7GzO1HTFqfMe2zwvaW/sRhABBJXFkKEv5gO3uXx7x9fdwJHQr4udU7NWZCUdOcx9Y0h3BsAILLefYq+WPw==
   dependencies:
-    "@babel/runtime" "^7.17.0"
+    "@babel/runtime" "^7.17.2"
-    "@mui/base" "5.0.0-alpha.69"
+    "@mui/base" "5.0.0-alpha.70"
-    "@mui/system" "^5.4.2"
+    "@mui/system" "^5.4.4"
     "@mui/types" "^7.1.2"
-    "@mui/utils" "^5.4.2"
+    "@mui/utils" "^5.4.4"
     "@types/react-transition-group" "^4.4.4"
     clsx "^1.1.1"
     csstype "^3.0.10"
@@ -424,34 +425,34 @@
     react-is "^17.0.2"
     react-transition-group "^4.4.2"
 
-"@mui/private-theming@^5.4.2":
+"@mui/private-theming@^5.4.4":
-  version "5.4.2"
+  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.4.2.tgz#f0a05f908456a2f7b87ccb6fc3b6e1faae9d89e6"
+  resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.4.4.tgz#cc2b2d897888ce5d1c319adfa2c50c0063a649ab"
-  integrity sha512-mlPDYYko4wIcwXjCPEmOWbNTT4DZ6h9YHdnRtQPnWM28+TRUHEo7SbydnnmVDQLRXUfaH4Y6XtEHIfBNPE/SLg==
+  integrity sha512-V/gxttr6736yJoU9q+4xxXsa0K/w9Hn9pg99zsOHt7i/O904w2CX5NHh5WqDXtoUzVcayLF0RB17yr6l79CE+A==
   dependencies:
-    "@babel/runtime" "^7.17.0"
+    "@babel/runtime" "^7.17.2"
-    "@mui/utils" "^5.4.2"
+    "@mui/utils" "^5.4.4"
     prop-types "^15.7.2"
 
-"@mui/styled-engine@^5.4.2":
+"@mui/styled-engine@^5.4.4":
-  version "5.4.2"
+  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.4.2.tgz#e04903e06bd49fd10072a44ff38e13f5481bb64d"
+  resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.4.4.tgz#8991b2e2dd47ae60071e7f042a5fab8e6e092e82"
-  integrity sha512-tz9p3aRtzXHKAg7x3BgP0hVQEoGKaxNCFxsJ+d/iqEHYvywWFSs6oxqYAvDHIRpvMlUZyPNoTrkcNnbdMmH/ng==
+  integrity sha512-AKx3rSgB6dmt5f7iP4K18mLFlE5/9EfJe/5EH9Pyqez8J/CPkTgYhJ/Va6qtlrcunzpui+uG/vfuf04yAZekSg==
   dependencies:
-    "@babel/runtime" "^7.17.0"
+    "@babel/runtime" "^7.17.2"
     "@emotion/cache" "^11.7.1"
     prop-types "^15.7.2"
 
-"@mui/system@^5.4.2":
+"@mui/system@^5.4.4":
-  version "5.4.2"
+  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.4.2.tgz#8166e406ba4628950bd79cec8159de25d5aef162"
+  resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.4.4.tgz#cd5d3d35c75594abd88708e715b5e39a8874ff51"
-  integrity sha512-QegBVu6fxUNov1X9bWc1MZUTeV3A5g9PIpli7d0kzkGfq6JzrJWuPlhSPZ+6hlWmWky+bbAXhU65Qz8atWxDGw==
+  integrity sha512-Zjbztq2o/VRuRRCWjG44juRrPKYLQMqtQpMHmMttGu5BnvK6PAPW3WOY0r1JCAwLhbd8Kug9nyhGQYKETjo+tQ==
   dependencies:
-    "@babel/runtime" "^7.17.0"
+    "@babel/runtime" "^7.17.2"
-    "@mui/private-theming" "^5.4.2"
+    "@mui/private-theming" "^5.4.4"
-    "@mui/styled-engine" "^5.4.2"
+    "@mui/styled-engine" "^5.4.4"
     "@mui/types" "^7.1.2"
-    "@mui/utils" "^5.4.2"
+    "@mui/utils" "^5.4.4"
     clsx "^1.1.1"
     csstype "^3.0.10"
     prop-types "^15.7.2"
@@ -461,12 +462,12 @@
   resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.2.tgz#4f3678ae77a7a3efab73b6e040469cc6df2144ac"
   integrity sha512-SD7O1nVzqG+ckQpFjDhXPZjRceB8HQFHEvdLLrPhlJy4lLbwEBbxK74Tj4t6Jgk0fTvLJisuwOutrtYe9P/xBQ==
 
-"@mui/utils@^5.4.2":
+"@mui/utils@^5.4.4":
-  version "5.4.2"
+  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.4.2.tgz#3edda8f80de235418fff0424ee66e2a49793ec01"
+  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.4.4.tgz#bd7dde4f48f60c02b6debf976bd74f3505b188fe"
-  integrity sha512-646dBCC57MXTo/Gf3AnZSHRHznaTETQq5x7AWp5FRQ4jPeyT4WSs18cpJVwkV01cAHKh06pNQTIufIALIWCL5g==
+  integrity sha512-hfYIXEuhc2mXMGN5nUPis8beH6uE/zl3uMWJcyHX0/LN/+QxO9zhYuV6l8AsAaphHFyS/fBv0SW3Nid7jw5hKQ==
   dependencies:
-    "@babel/runtime" "^7.17.0"
+    "@babel/runtime" "^7.17.2"
     "@types/prop-types" "^15.7.4"
     "@types/react-is" "^16.7.1 || ^17.0.0"
     prop-types "^15.7.2"
@@ -655,9 +656,9 @@
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
 "@types/node@*":
-  version "17.0.18"
+  version "17.0.21"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.18.tgz#3b4fed5cfb58010e3a2be4b6e74615e4847f1074"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644"
-  integrity sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==
+  integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -670,9 +671,9 @@
   integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
 
 "@types/react-dom@^17.0.0":
-  version "17.0.11"
+  version "17.0.13"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.11.tgz#e1eadc3c5e86bdb5f7684e00274ae228e7bcc466"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.13.tgz#a3323b974ee4280070982b3112351bb1952a7809"
-  integrity sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==
+  integrity sha512-wEP+B8hzvy6ORDv1QBhcQia4j6ea4SFIBttHYpXKPFZRviBvknq0FRh3VrIxeXUmsPkwuXVZrVGG7KUVONmXCQ==
   dependencies:
     "@types/react" "*"
 
@@ -740,10 +741,10 @@ ahooks-v3-count@^1.0.0:
   resolved "https://registry.yarnpkg.com/ahooks-v3-count/-/ahooks-v3-count-1.0.0.tgz#ddeb392e009ad6e748905b3cbf63a9fd8262ca80"
   integrity sha512-V7uUvAwnimu6eh/PED4mCDjE7tokeZQLKlxg9lCTMPhN+NjsSbtdacByVlR1oluXQzD3MOw55wylDmQo4+S9ZQ==
 
-ahooks@^3.1.9:
+ahooks@^3.1.13:
-  version "3.1.9"
+  version "3.1.13"
-  resolved "https://registry.yarnpkg.com/ahooks/-/ahooks-3.1.9.tgz#7b04672c9fc2e26e551cb57bd46cfa043e680511"
+  resolved "https://registry.yarnpkg.com/ahooks/-/ahooks-3.1.13.tgz#23492e2a24f9d7951a52d9359b877e010a0a56e0"
-  integrity sha512-+ei+s0f+K2UKs6PGOUoJzMNKlj74qySO3lLd2xTJsvRUOoLhcLeFMledyJ2dRAvcFL8YFm+2T5Nidrlb8wl2tQ==
+  integrity sha512-ZWwWRhikXCWuR+X+LxXK8sWu2KPU7nh7UfaTTB93NhmoeytzN8VODRfVjq8LbT2ow5Q7PuG13143OcW9nN1vBg==
   dependencies:
     "@types/js-cookie" "^2.x.x"
     ahooks-v3-count "^1.0.0"
@@ -838,9 +839,9 @@ braces@~3.0.2:
     fill-range "^7.0.1"
 
 browserslist@^4.17.5:
-  version "4.19.2"
+  version "4.19.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.2.tgz#9ba98791192a39e1242f0670bb265ceee1baf0a4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.3.tgz#29b7caad327ecf2859485f696f9604214bedd383"
-  integrity sha512-97XU1CTZ5TwU9Qy/Taj+RtiI6SQM1WIhZ9osT7EY0oO2aWXGABZT2OZeRL+6PfaQsiiMIjjwIoYFPq4APgspgQ==
+  integrity sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==
   dependencies:
     caniuse-lite "^1.0.30001312"
     electron-to-chromium "^1.4.71"
@@ -961,10 +962,10 @@ data-uri-to-buffer@^4.0.0:
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b"
   integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==
 
-dayjs@^1.10.7, dayjs@^1.9.1:
+dayjs@^1.10.8, dayjs@^1.9.1:
-  version "1.10.7"
+  version "1.10.8"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.8.tgz#267df4bc6276fcb33c04a6735287e3f429abec41"
-  integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==
+  integrity sha512-wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow==
 
 debug@^4.1.0:
   version "4.3.3"
@@ -987,9 +988,9 @@ dom-helpers@^5.0.1:
     csstype "^3.0.2"
 
 electron-to-chromium@^1.4.71:
-  version "1.4.71"
+  version "1.4.75"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz#17056914465da0890ce00351a3b946fd4cd51ff6"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.75.tgz#d1ad9bb46f2f1bf432118c2be21d27ffeae82fdd"
-  integrity sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw==
+  integrity sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q==
 
 end-of-stream@^1.1.0:
   version "1.4.4"
@@ -1005,125 +1006,125 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-esbuild-android-arm64@0.14.22:
+esbuild-android-arm64@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.22.tgz#fb051169a63307d958aec85ad596cfc7d7770303"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.23.tgz#c89b3c50b4f47668dcbeb0b34ee4615258818e71"
-  integrity sha512-k1Uu4uC4UOFgrnTj2zuj75EswFSEBK+H6lT70/DdS4mTAOfs2ECv2I9ZYvr3w0WL0T4YItzJdK7fPNxcPw6YmQ==
+  integrity sha512-k9sXem++mINrZty1v4FVt6nC5BQCFG4K2geCIUUqHNlTdFnuvcqsY7prcKZLFhqVC1rbcJAr9VSUGFL/vD4vsw==
 
-esbuild-darwin-64@0.14.22:
+esbuild-darwin-64@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.22.tgz#615ea0a9de67b57a293a7128d7ac83ee307a856d"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.23.tgz#1c131e8cb133ed935ca32f824349a117c896a15b"
-  integrity sha512-d8Ceuo6Vw6HM3fW218FB6jTY6O3r2WNcTAU0SGsBkXZ3k8SDoRLd3Nrc//EqzdgYnzDNMNtrWegK2Qsss4THhw==
+  integrity sha512-lB0XRbtOYYL1tLcYw8BoBaYsFYiR48RPrA0KfA/7RFTr4MV7Bwy/J4+7nLsVnv9FGuQummM3uJ93J3ptaTqFug==
 
-esbuild-darwin-arm64@0.14.22:
+esbuild-darwin-arm64@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.22.tgz#82054dcfcecb15ccfd237093b8008e7745a99ad9"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.23.tgz#3c6245a50109dd84953f53d7833bd3b4f0e8c6fa"
-  integrity sha512-YAt9Tj3SkIUkswuzHxkaNlT9+sg0xvzDvE75LlBo4DI++ogSgSmKNR6B4eUhU5EUUepVXcXdRIdqMq9ppeRqfw==
+  integrity sha512-yat73Z/uJ5tRcfRiI4CCTv0FSnwErm3BJQeZAh+1tIP0TUNh6o+mXg338Zl5EKChD+YGp6PN+Dbhs7qa34RxSw==
 
-esbuild-freebsd-64@0.14.22:
+esbuild-freebsd-64@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.22.tgz#778a818c5b078d5cdd6bb6c0e0797217d196999b"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.23.tgz#0cdc54e72d3dd9cd992f9c2960055e68a7f8650c"
-  integrity sha512-ek1HUv7fkXMy87Qm2G4IRohN+Qux4IcnrDBPZGXNN33KAL0pEJJzdTv0hB/42+DCYWylSrSKxk3KUXfqXOoH4A==
+  integrity sha512-/1xiTjoLuQ+LlbfjJdKkX45qK/M7ARrbLmyf7x3JhyQGMjcxRYVR6Dw81uH3qlMHwT4cfLW4aEVBhP1aNV7VsA==
 
-esbuild-freebsd-arm64@0.14.22:
+esbuild-freebsd-arm64@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.22.tgz#18da93b9f3db2e036f72383bfe73b28b73bb332c"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.23.tgz#1d11faed3a0c429e99b7dddef84103eb509788b2"
-  integrity sha512-zPh9SzjRvr9FwsouNYTqgqFlsMIW07O8mNXulGeQx6O5ApgGUBZBgtzSlBQXkHi18WjrosYfsvp5nzOKiWzkjQ==
+  integrity sha512-uyPqBU/Zcp6yEAZS4LKj5jEE0q2s4HmlMBIPzbW6cTunZ8cyvjG6YWpIZXb1KK3KTJDe62ltCrk3VzmWHp+iLg==
 
-esbuild-linux-32@0.14.22:
+esbuild-linux-32@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.22.tgz#d0d5d9f5bb3536e17ac097e9512019c65b7c0234"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.23.tgz#fd9f033fc27dcab61100cb1eb1c936893a68c841"
-  integrity sha512-SnpveoE4nzjb9t2hqCIzzTWBM0RzcCINDMBB67H6OXIuDa4KqFqaIgmTchNA9pJKOVLVIKd5FYxNiJStli21qg==
+  integrity sha512-37R/WMkQyUfNhbH7aJrr1uCjDVdnPeTHGeDhZPUNhfoHV0lQuZNCKuNnDvlH/u/nwIYZNdVvz1Igv5rY/zfrzQ==
 
-esbuild-linux-64@0.14.22:
+esbuild-linux-64@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.22.tgz#2773d540971999ea7f38107ef92fca753f6a8c30"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.23.tgz#c04c438514f1359ecb1529205d0c836d4165f198"
-  integrity sha512-Zcl9Wg7gKhOWWNqAjygyqzB+fJa19glgl2JG7GtuxHyL1uEnWlpSMytTLMqtfbmRykIHdab797IOZeKwk5g0zg==
+  integrity sha512-H0gztDP60qqr8zoFhAO64waoN5yBXkmYCElFklpd6LPoobtNGNnDe99xOQm28+fuD75YJ7GKHzp/MLCLhw2+vQ==
 
-esbuild-linux-arm64@0.14.22:
+esbuild-linux-arm64@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.22.tgz#5d4480ce6d6bffab1dd76a23158f5a5ab33e7ba4"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.23.tgz#d1b3ab2988ab0734886eb9e811726f7db099ab96"
-  integrity sha512-8q/FRBJtV5IHnQChO3LHh/Jf7KLrxJ/RCTGdBvlVZhBde+dk3/qS9fFsUy+rs3dEi49aAsyVitTwlKw1SUFm+A==
+  integrity sha512-c4MLOIByNHR55n3KoYf9hYDfBRghMjOiHLaoYLhkQkIabb452RWi+HsNgB41sUpSlOAqfpqKPFNg7VrxL3UX9g==
 
-esbuild-linux-arm@0.14.22:
+esbuild-linux-arm@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.22.tgz#c6391b3f7c8fa6d3b99a7e893ce0f45f3a921eef"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.23.tgz#df7558b6a5076f5eb9fd387c8704f768b61d97fb"
-  integrity sha512-soPDdbpt/C0XvOOK45p4EFt8HbH5g+0uHs5nUKjHVExfgR7du734kEkXR/mE5zmjrlymk5AA79I0VIvj90WZ4g==
+  integrity sha512-x64CEUxi8+EzOAIpCUeuni0bZfzPw/65r8tC5cy5zOq9dY7ysOi5EVQHnzaxS+1NmV+/RVRpmrzGw1QgY2Xpmw==
 
-esbuild-linux-mips64le@0.14.22:
+esbuild-linux-mips64le@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.22.tgz#2c8dabac355c502e86c38f9f292b3517d8e181f3"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.23.tgz#bb4c47fccc9493d460ffeb1f88e8a97a98a14f8b"
-  integrity sha512-SiNDfuRXhGh1JQLLA9JPprBgPVFOsGuQ0yDfSPTNxztmVJd8W2mX++c4FfLpAwxuJe183mLuKf7qKCHQs5ZnBQ==
+  integrity sha512-kHKyKRIAedYhKug2EJpyJxOUj3VYuamOVA1pY7EimoFPzaF3NeY7e4cFBAISC/Av0/tiV0xlFCt9q0HJ68IBIw==
 
-esbuild-linux-ppc64le@0.14.22:
+esbuild-linux-ppc64le@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.22.tgz#69d71b2820d5c94306072dac6094bae38e77d1c0"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.23.tgz#a332dbc8a1b4e30cfe1261bfaa5cef57c9c8c02a"
-  integrity sha512-6t/GI9I+3o1EFm2AyN9+TsjdgWCpg2nwniEhjm2qJWtJyJ5VzTXGUU3alCO3evopu8G0hN2Bu1Jhz2YmZD0kng==
+  integrity sha512-7ilAiJEPuJJnJp/LiDO0oJm5ygbBPzhchJJh9HsHZzeqO+3PUzItXi+8PuicY08r0AaaOe25LA7sGJ0MzbfBag==
 
-esbuild-linux-riscv64@0.14.22:
+esbuild-linux-riscv64@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.22.tgz#c0ec0fc3a23624deebf657781550d2329cec4213"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.23.tgz#85675f3f931f5cd7cfb238fd82f77a62ffcb6d86"
-  integrity sha512-AyJHipZKe88sc+tp5layovquw5cvz45QXw5SaDgAq2M911wLHiCvDtf/07oDx8eweCyzYzG5Y39Ih568amMTCQ==
+  integrity sha512-fbL3ggK2wY0D8I5raPIMPhpCvODFE+Bhb5QGtNP3r5aUsRR6TQV+ZBXIaw84iyvKC8vlXiA4fWLGhghAd/h/Zg==
 
-esbuild-linux-s390x@0.14.22:
+esbuild-linux-s390x@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.22.tgz#ec2af4572d63336cfb27f5a5c851fb1b6617dd91"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.23.tgz#a526282a696e6d846f4c628f5315475518c0c0f0"
-  integrity sha512-Sz1NjZewTIXSblQDZWEFZYjOK6p8tV6hrshYdXZ0NHTjWE+lwxpOpWeElUGtEmiPcMT71FiuA9ODplqzzSxkzw==
+  integrity sha512-GHMDCyfy7+FaNSO8RJ8KCFsnax8fLUsOrj9q5Gi2JmZMY0Zhp75keb5abTFCq2/Oy6KVcT0Dcbyo/bFb4rIFJA==
 
-esbuild-netbsd-64@0.14.22:
+esbuild-netbsd-64@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.22.tgz#0e283278e9fdbaa7f0930f93ee113d7759cd865e"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.23.tgz#8e456605694719aa1be4be266d6cd569c06dfaf5"
-  integrity sha512-TBbCtx+k32xydImsHxvFgsOCuFqCTGIxhzRNbgSL1Z2CKhzxwT92kQMhxort9N/fZM2CkRCPPs5wzQSamtzEHA==
+  integrity sha512-ovk2EX+3rrO1M2lowJfgMb/JPN1VwVYrx0QPUyudxkxLYrWeBxDKQvc6ffO+kB4QlDyTfdtAURrVzu3JeNdA2g==
 
-esbuild-openbsd-64@0.14.22:
+esbuild-openbsd-64@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.22.tgz#2a73bba04e16d8ef278fbe2be85248e12a2f2cc2"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.23.tgz#f2fc51714b4ddabc86e4eb30ca101dd325db2f7d"
-  integrity sha512-vK912As725haT313ANZZZN+0EysEEQXWC/+YE4rQvOQzLuxAQc2tjbzlAFREx3C8+uMuZj/q7E5gyVB7TzpcTA==
+  integrity sha512-uYYNqbVR+i7k8ojP/oIROAHO9lATLN7H2QeXKt2H310Fc8FJj4y3Wce6hx0VgnJ4k1JDrgbbiXM8rbEgQyg8KA==
 
-esbuild-sunos-64@0.14.22:
+esbuild-sunos-64@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.22.tgz#8fe03513b8b2e682a6d79d5e3ca5849651a3c1d8"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.23.tgz#a408f33ea20e215909e20173a0fd78b1aaad1f8e"
-  integrity sha512-/mbJdXTW7MTcsPhtfDsDyPEOju9EOABvCjeUU2OJ7fWpX/Em/H3WYDa86tzLUbcVg++BScQDzqV/7RYw5XNY0g==
+  integrity sha512-hAzeBeET0+SbScknPzS2LBY6FVDpgE+CsHSpe6CEoR51PApdn2IB0SyJX7vGelXzlyrnorM4CAsRyb9Qev4h9g==
 
-esbuild-windows-32@0.14.22:
+esbuild-windows-32@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.22.tgz#a75df61e3e49df292a1842be8e877a3153ee644f"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.23.tgz#b9005bbff54dac3975ff355d5de2b5e37165d128"
-  integrity sha512-1vRIkuvPTjeSVK3diVrnMLSbkuE36jxA+8zGLUOrT4bb7E/JZvDRhvtbWXWaveUc/7LbhaNFhHNvfPuSw2QOQg==
+  integrity sha512-Kttmi3JnohdaREbk6o9e25kieJR379TsEWF0l39PQVHXq3FR6sFKtVPgY8wk055o6IB+rllrzLnbqOw/UV60EA==
 
-esbuild-windows-64@0.14.22:
+esbuild-windows-64@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.22.tgz#d06cf8bbe4945b8bf95a730d871e54a22f635941"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.23.tgz#2b5a99befeaca6aefdad32d738b945730a60a060"
-  integrity sha512-AxjIDcOmx17vr31C5hp20HIwz1MymtMjKqX4qL6whPj0dT9lwxPexmLj6G1CpR3vFhui6m75EnBEe4QL82SYqw==
+  integrity sha512-JtIT0t8ymkpl6YlmOl6zoSWL5cnCgyLaBdf/SiU/Eg3C13r0NbHZWNT/RDEMKK91Y6t79kTs3vyRcNZbfu5a8g==
 
-esbuild-windows-arm64@0.14.22:
+esbuild-windows-arm64@0.14.23:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.22.tgz#f8b1b05c548073be8413a5ecb12d7c2f6e717227"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.23.tgz#edc560bbadb097eb45fc235aeacb942cb94a38c0"
-  integrity sha512-5wvQ+39tHmRhNpu2Fx04l7QfeK3mQ9tKzDqqGR8n/4WUxsFxnVLfDRBGirIfk4AfWlxk60kqirlODPoT5LqMUg==
+  integrity sha512-cTFaQqT2+ik9e4hePvYtRZQ3pqOvKDVNarzql0VFIzhc0tru/ZgdLoXd6epLiKT+SzoSce6V9YJ+nn6RCn6SHw==
 
 esbuild@^0.14.14:
-  version "0.14.22"
+  version "0.14.23"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.22.tgz#2b55fde89d7aa5aaaad791816d58ff9dfc5ed085"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.23.tgz#95e842cb22bc0c7d82c140adc16788aac91469fe"
-  integrity sha512-CjFCFGgYtbFOPrwZNJf7wsuzesx8kqwAffOlbYcFDLFuUtP8xloK1GH+Ai13Qr0RZQf9tE7LMTHJ2iVGJ1SKZA==
+  integrity sha512-XjnIcZ9KB6lfonCa+jRguXyRYcldmkyZ99ieDksqW/C8bnyEX299yA4QH2XcgijCgaddEZePPTgvx/2imsq7Ig==
   optionalDependencies:
-    esbuild-android-arm64 "0.14.22"
+    esbuild-android-arm64 "0.14.23"
-    esbuild-darwin-64 "0.14.22"
+    esbuild-darwin-64 "0.14.23"
-    esbuild-darwin-arm64 "0.14.22"
+    esbuild-darwin-arm64 "0.14.23"
-    esbuild-freebsd-64 "0.14.22"
+    esbuild-freebsd-64 "0.14.23"
-    esbuild-freebsd-arm64 "0.14.22"
+    esbuild-freebsd-arm64 "0.14.23"
-    esbuild-linux-32 "0.14.22"
+    esbuild-linux-32 "0.14.23"
-    esbuild-linux-64 "0.14.22"
+    esbuild-linux-64 "0.14.23"
-    esbuild-linux-arm "0.14.22"
+    esbuild-linux-arm "0.14.23"
-    esbuild-linux-arm64 "0.14.22"
+    esbuild-linux-arm64 "0.14.23"
-    esbuild-linux-mips64le "0.14.22"
+    esbuild-linux-mips64le "0.14.23"
-    esbuild-linux-ppc64le "0.14.22"
+    esbuild-linux-ppc64le "0.14.23"
-    esbuild-linux-riscv64 "0.14.22"
+    esbuild-linux-riscv64 "0.14.23"
-    esbuild-linux-s390x "0.14.22"
+    esbuild-linux-s390x "0.14.23"
-    esbuild-netbsd-64 "0.14.22"
+    esbuild-netbsd-64 "0.14.23"
-    esbuild-openbsd-64 "0.14.22"
+    esbuild-openbsd-64 "0.14.23"
-    esbuild-sunos-64 "0.14.22"
+    esbuild-sunos-64 "0.14.23"
-    esbuild-windows-32 "0.14.22"
+    esbuild-windows-32 "0.14.23"
-    esbuild-windows-64 "0.14.22"
+    esbuild-windows-64 "0.14.23"
-    esbuild-windows-arm64 "0.14.22"
+    esbuild-windows-arm64 "0.14.23"
 
 escalade@^3.1.1:
   version "3.1.1"
@@ -1201,9 +1202,9 @@ formdata-polyfill@^4.0.10:
     fetch-blob "^3.1.2"
 
 fs-extra@^10.0.0:
-  version "10.0.0"
+  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8"
-  integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
+  integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==
   dependencies:
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
@@ -1271,9 +1272,9 @@ has@^1.0.3:
     function-bind "^1.1.1"
 
 history@^5.2.0:
-  version "5.2.0"
+  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/history/-/history-5.2.0.tgz#7cdd31cf9bac3c5d31f09c231c9928fad0007b7c"
+  resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
-  integrity sha512-uPSF6lAJb3nSePJ43hN3eKj1dTWpN9gMod0ZssbFTIsen+WehTmEadgL+kg78xLJFdRfrrC//SavDzmRVdE+Ig==
+  integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==
   dependencies:
     "@babel/runtime" "^7.7.6"
 
@@ -1471,7 +1472,7 @@ multimatch@^4.0.0:
     arrify "^2.0.1"
     minimatch "^3.0.4"
 
-nanoid@^3.2.0:
+nanoid@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
   integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
@@ -1489,9 +1490,9 @@ node-fetch@^2.6.7:
     whatwg-url "^5.0.0"
 
 node-fetch@^3.2.0:
-  version "3.2.0"
+  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.0.tgz#59390db4e489184fa35d4b74caf5510e8dfbaf3b"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.1.tgz#002177382810cfb77858857f69a3621a86c45f26"
-  integrity sha512-8xeimMwMItMw8hRrOl3C9/xzU49HV/yE6ORew/l+dxWimO5A4Ra8ld2rerlJvc/O7et5Z1zrWsPX43v1QBjCxw==
+  integrity sha512-Ef3SPFtRWFCDyhvcwCSvacLpkwmYZcD57mmZzAsMiks9TpHpIghe32U9H06tMICnr+X7YCpzH7WvUlUoml2urA==
   dependencies:
     data-uri-to-buffer "^4.0.0"
     fetch-blob "^3.1.4"
@@ -1600,11 +1601,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2:
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
 postcss@^8.4.6:
-  version "8.4.6"
+  version "8.4.7"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.7.tgz#f99862069ec4541de386bf57f5660a6c7a0875a8"
-  integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==
+  integrity sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==
   dependencies:
-    nanoid "^3.2.0"
+    nanoid "^3.3.1"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
@@ -1661,18 +1662,18 @@ react-refresh@^0.11.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
   integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==
 
-react-router-dom@^6.2.1:
+react-router-dom@^6.2.2:
-  version "6.2.1"
+  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.2.1.tgz#32ec81829152fbb8a7b045bf593a22eadf019bec"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.2.2.tgz#f1a2c88365593c76b9612ae80154a13fcb72e442"
-  integrity sha512-I6Zax+/TH/cZMDpj3/4Fl2eaNdcvoxxHoH1tYOREsQ22OKDYofGebrNm6CTPUcvLvZm63NL/vzCYdjf9CUhqmA==
+  integrity sha512-AtYEsAST7bDD4dLSQHDnk/qxWLJdad5t1HFa1qJyUrCeGgEuCSw0VB/27ARbF9Fi/W5598ujvJOm3ujUCVzuYQ==
   dependencies:
     history "^5.2.0"
-    react-router "6.2.1"
+    react-router "6.2.2"
 
-react-router@6.2.1:
+react-router@6.2.2:
-  version "6.2.1"
+  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.2.1.tgz#be2a97a6006ce1d9123c28934e604faef51448a3"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.2.2.tgz#495e683a0c04461eeb3d705fe445d6cf42f0c249"
-  integrity sha512-2fG0udBtxou9lXtK97eJeET2ki5//UWfQSl1rlJ7quwe6jrktK9FCCc8dQb5QY6jAv3jua8bBQRhhDOM/kVRsg==
+  integrity sha512-/MbxyLzd7Q7amp4gDOGaYvXwhEojkJD5BtExkuKmj39VEE0m3l/zipf6h2WIB2jyAO0lI6NGETh4RDcktRm4AQ==
   dependencies:
     history "^5.2.0"
 
@@ -1687,9 +1688,9 @@ react-transition-group@^4.4.2:
     prop-types "^15.6.2"
 
 react-virtuoso@^2.7.0:
-  version "2.7.1"
+  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-2.7.1.tgz#62408c9eeb9e7747be1c070fd635846891b7622a"
+  resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-2.7.2.tgz#b2935ce182d47846c26277da4d5b576b2faeb481"
-  integrity sha512-isl04/UARFv75IQelKRLCLDIsS5a5V4tiU3kYXpTxXwGXZLwK7tFDimR3OYzkBamJ2dK3rT+DvfBb8C2Jteggg==
+  integrity sha512-EJm0e1hTpMK8xXzgtfbvr2dr2l2gek8p8dCJleJ6EJoQjr9sf+XCYkODThN1vTxhksvAT8uQxmxR5ASPDoS/uA==
   dependencies:
     "@virtuoso.dev/react-urx" "^0.2.12"
     "@virtuoso.dev/urx" "^0.2.12"
@@ -1741,9 +1742,9 @@ resolve@^1.12.0, resolve@^1.22.0:
     supports-preserve-symlinks-flag "^1.0.0"
 
 rollup@^2.59.0:
-  version "2.67.3"
+  version "2.69.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.67.3.tgz#3f04391fc296f807d067c9081d173e0a33dbd37e"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.69.0.tgz#82aa86682a45e9760146b736c1643bf435506156"
-  integrity sha512-G/x1vUwbGtP6O5ZM8/sWr8+p7YfZhI18pPqMRtMYMWSbHjKZ/ajHGiM+GWNTlWyOR0EHIdT8LHU+Z4ciIZ1oBw==
+  integrity sha512-kjER91tHyek8gAkuz7+558vSnTQ+pITEok1P0aNOS45ZXyngaqPsXJmSel4QPQnJo7EJMjXUU1/GErWkWiKORg==
   optionalDependencies:
     fsevents "~2.3.2"
 
@@ -1753,9 +1754,9 @@ safe-buffer@~5.1.1:
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 sass@^1.49.7:
-  version "1.49.8"
+  version "1.49.9"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.8.tgz#9bbbc5d43d14862db07f1c04b786c9da9b641828"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.9.tgz#b15a189ecb0ca9e24634bae5d1ebc191809712f9"
-  integrity sha512-NoGOjvDDOU9og9oAxhRnap71QaTjjlzrvLnKecUJ3GxhaQBrV6e7gPuSPF28u1OcVAArVojPAe4ZhOXwwC4tGw==
+  integrity sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -1836,9 +1837,9 @@ supports-preserve-symlinks-flag@^1.0.0:
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
 swr@^1.2.1:
-  version "1.2.1"
+  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/swr/-/swr-1.2.1.tgz#c21a4fe2139cb1c4630450589b5b5add947a9d41"
+  resolved "https://registry.yarnpkg.com/swr/-/swr-1.2.2.tgz#6cae09928d30593a7980d80f85823e57468fac5d"
-  integrity sha512-1cuWXqJqXcFwbgONGCY4PHZ8v05009JdHsC3CIC6u7d00kgbMswNr1sHnnhseOBxtzVqcCNpOHEgVDciRer45w==
+  integrity sha512-ky0BskS/V47GpW8d6RU7CPsr6J8cr7mQD6+do5eky3bM0IyJaoi3vO8UhvrzJaObuTlGhPl2szodeB2dUd76Xw==
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
@@ -1868,9 +1869,9 @@ type-fest@2.11.2:
   integrity sha512-reW2Y2Mpn0QNA/5fvtm5doROLwDPu2zOm5RtY7xQQS05Q7xgC8MOZ3yPNaP9m/s/sNjjFQtHo7VCNqYW2iI+Ig==
 
 typescript@^4.5.5:
-  version "4.5.5"
+  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
-  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
+  integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
 
 universal-user-agent@^6.0.0:
   version "6.0.0"
@@ -1882,10 +1883,10 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
-vite@^2.8.0:
+vite@^2.8.6:
-  version "2.8.4"
+  version "2.8.6"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.8.4.tgz#4e52a534289b7b4e94e646df2fc5556ceaa7336b"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.8.6.tgz#32d50e23c99ca31b26b8ccdc78b1d72d4d7323d3"
-  integrity sha512-GwtOkkaT2LDI82uWZKcrpRQxP5tymLnC7hVHHqNkhFNknYr0hJUlDLfhVRgngJvAy3RwypkDCWtTKn1BjO96Dw==
+  integrity sha512-e4H0QpludOVKkmOsRyqQ7LTcMUDF3mcgyNU4lmi0B5JUbe0ZxeBBl8VoZ8Y6Rfn9eFKYtdXNPcYK97ZwH+K2ug==
   dependencies:
     esbuild "^0.14.14"
     postcss "^8.4.6"