v0.0.20

feat: edit profile item
fix: cover profile extra
2022-03-02 01:59:53 +08:00 · 2022-03-02 01:58:16 +08:00 · 2022-03-02 01:45:00 +08:00 · 2022-03-02 01:13:31 +08:00 · 2022-03-02 00:58:07 +08:00 · 2022-03-02 00:56:05 +08:00
46 changed files with 1899 additions and 1158 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Release CI
 on: [push]
@@ -53,7 +53,7 @@ jobs:
          yarn run check
      - name: Tauri build
-        uses: tauri-apps/tauri-action@v0
+        uses: tauri-apps/tauri-action@b9ce5d7dc68082d21d30a60103b0ab8c5ddae3a1
        # enable cache even though failed
        continue-on-error: true
        env:
@@ -63,7 +63,7 @@ jobs:
        with:
          tagName: v__VERSION__
          releaseName: "Clash Verge v__VERSION__"
-          releaseBody: "Clash Verge now supports Windows and macos(intel)."
+          releaseBody: "Clash Verge now supports Windows and macos."
          releaseDraft: false
          prerelease: true
@@ -95,6 +95,5 @@ jobs:
      - name: Release update.json
        run: yarn run release
        continue-on-error: true
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/README.md
+++ b/README.md
@@ -11,19 +11,17 @@ A <a href="https://github.com/Dreamacro/clash">Clash</a> GUI based on <a href="h
 ## Features
-Now it's no different from the others, even fewer. (WIP)
+Now it's no different from the others, maybe fewer. (WIP)
 ## Development
-You should install Rust and Nodejs. Then install tauri cli and packages.
+You should install Rust and Nodejs, see [here](https://tauri.studio/docs/getting-started/prerequisites) for more details. Then install Nodejs packages.
 ```shell
 cargo install tauri-cli --git https://github.com/tauri-apps/tauri
 yarn install
 ```
-Then download the clash binary... Or you can download it from [clash premium release](https://github.com/Dreamacro/clash/releases/tag/premium) and rename it according to [tauri config](https://tauri.studio/en/docs/api/config#tauri.bundle.externalBin).
+Then download the clash binary... Or you can download it from [clash premium release](https://github.com/Dreamacro/clash/releases/tag/premium) and rename it according to [tauri config](https://tauri.studio/docs/api/config/#tauri.bundle.externalBin).
 ```shell
 yarn run check
@@ -56,7 +54,7 @@ This is a learning project for Rust practice.
 ## Contributions
-PR welcome!
+Issue and PR welcome!
 ## Acknowledgement
--- a/docs/demo1.png
+++ b/docs/demo1.png
--- a/docs/demo2.png
+++ b/docs/demo2.png
--- a/docs/demo3.png
+++ b/docs/demo3.png
--- a/docs/demo4.png
+++ b/docs/demo4.png
--- a/docs/demo5.png
+++ b/docs/demo5.png
--- a/docs/demo6.png
+++ b/docs/demo6.png
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
  "name": "clash-verge",
-  "version": "0.0.16",
+  "version": "0.0.20",
  "license": "GPL-3.0",
  "scripts": {
-    "dev": "cargo tauri dev",
+    "dev": "tauri dev",
-    "build": "cargo tauri build",
+    "build": "tauri build",
    "tauri": "tauri",
    "web:dev": "vite",
    "web:build": "tsc && vite build",
--- a/scripts/release.mjs
+++ b/scripts/release.mjs
@@ -1,7 +1,8 @@
-import { createRequire } from "module";
+import fetch from "node-fetch";
 import { getOctokit, context } from "@actions/github";
-const require = createRequire(import.meta.url);
+const UPDATE_TAG_NAME = "updater";
 const UPDATE_JSON_FILE = "update.json";
 /// generate update.json
 /// upload to update tag's release asset
@@ -10,46 +11,85 @@ async function resolveRelease() {
    throw new Error("GITHUB_TOKEN is required");
  }
-  const packageJson = require("../package.json");
+  const options = { owner: context.repo.owner, repo: context.repo.repo };
  const github = getOctokit(process.env.GITHUB_TOKEN);
  const { data: tags } = await github.rest.repos.listTags({
    ...options,
    per_page: 10,
    page: 1,
  });
  // get the latest publish tag
  const tag = tags.find((t) => t.name.startsWith("v"));
  console.log(tag);
  console.log();
  const { data: latestRelease } = await github.rest.repos.getReleaseByTag({
    ...options,
    tag: tag.name,
  });
  const { version } = packageJson;
  const urlPrefix = "https://github.com/zzzgydi/clash-verge/releases/download";
  const updateData = {
-    name: `v${version}`,
+    name: tag.name,
-    notes: `Version ${version} is available now!!!`,
+    notes: latestRelease.body, // use the release body directly
    pub_date: new Date().toISOString(),
    platforms: {
-      win64: {
+      win64: { signature: "", url: "" },
-        signature: "",
+      darwin: { signature: "", url: "" },
        url: `${urlPrefix}/v${version}/clash-verge_${version}_x64.msi.zip`,
      },
      darwin: {
        signature: "",
        url: `${urlPrefix}/v${version}/clash-verge.app.tar.gz`,
      },
    },
  };
-  console.log(`Generating Version "${version}" update.json`);
+  const promises = latestRelease.assets.map(async (asset) => {
    const { name, browser_download_url } = asset;
-  const github = getOctokit(process.env.GITHUB_TOKEN);
+    // win64 url
-
+    if (/\.msi\.zip$/.test(name)) {
-  const { data: release } = await github.rest.repos.getReleaseByTag({
+      updateData.platforms.win64.url = browser_download_url;
-    owner: context.repo.owner,
+    }
-    repo: context.repo.repo,
+    // darwin url
-    tag: "updater",
+    if (/\.app\.tar\.gz$/.test(name)) {
-  });
+      updateData.platforms.darwin.url = browser_download_url;
-  const { data: assets } = await github.rest.repos.listReleaseAssets({
+    }
-    owner: context.repo.owner,
+    // win64 signature
-    repo: context.repo.repo,
+    if (/\.msi\.zip\.sig$/.test(name)) {
-    release_id: release.id,
+      updateData.platforms.win64.signature = await getSignature(
        browser_download_url
      );
    }
    // darwin signature
    if (/\.app\.tar\.gz\.sig$/.test(name)) {
      updateData.platforms.darwin.signature = await getSignature(
        browser_download_url
      );
    }
  });
-  for (let asset of assets) {
+  await Promise.allSettled(promises);
-    if (asset.name === "update.json") {
+  console.log(updateData);
  // maybe should test the signature as well
  const { darwin, win64 } = updateData.platforms;
  if (!darwin.url) {
    console.log(`[Error]: failed to parse release for darwin`);
    delete updateData.platforms.darwin;
  }
  if (!win64.url) {
    console.log(`[Error]: failed to parse release for win64`);
    delete updateData.platforms.win64;
  }
  // update the update.json
  const { data: updateRelease } = await github.rest.repos.getReleaseByTag({
    ...options,
    tag: UPDATE_TAG_NAME,
  });
  for (let asset of updateRelease.assets) {
    if (asset.name === UPDATE_JSON_FILE) {
      await github.rest.repos.deleteReleaseAsset({
-        owner: context.repo.owner,
+        ...options,
        repo: context.repo.repo,
        asset_id: asset.id,
      });
      break;
@@ -57,12 +97,21 @@ async function resolveRelease() {
  }
  await github.rest.repos.uploadReleaseAsset({
-    owner: context.repo.owner,
+    ...options,
-    repo: context.repo.repo,
+    release_id: updateRelease.id,
-    release_id: release.id,
+    name: UPDATE_JSON_FILE,
    name: "update.json",
    data: JSON.stringify(updateData, null, 2),
  });
 }
-resolveRelease();
+// get the signature file content
 async function getSignature(url) {
  const response = await fetch(url, {
    method: "GET",
    headers: { "Content-Type": "application/octet-stream" },
  });
  return response.text();
 }
 resolveRelease().catch(console.error);
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -34,9 +34,9 @@ dependencies = [
 [[package]]
 name = "anyhow"
-version = "1.0.53"
+version = "1.0.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
+checksum = "159bb86af3a200e19a068f4224eae4c8bb2d0fa054c7e5d1cacd5cef95e684cd"
 [[package]]
 name = "arc-swap"
@@ -64,7 +64,7 @@ checksum = "7915e26e0786f91768d23de32afafa4ee5e2ea76be21c0ecd8e14441543c1655"
 dependencies = [
 "enumflags2",
 "futures",
- "rand 0.8.4",
+ "rand 0.8.5",
 "serde",
 "serde_repr",
 "zbus",
@@ -127,9 +127,9 @@ dependencies = [
 [[package]]
 name = "async-lock"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b"
+checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6"
 dependencies = [
 "event-listener",
 ]
@@ -180,10 +180,10 @@ version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6"
 dependencies = [
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "gobject-sys 0.15.5",
 "libc",
- "system-deps 6.0.1",
+ "system-deps 6.0.2",
 ]
 [[package]]
@@ -252,7 +252,7 @@ dependencies = [
 "cc",
 "cfg-if",
 "constant_time_eq",
- "digest 0.10.2",
+ "digest 0.10.3",
 "rayon",
 ]
@@ -346,9 +346,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
 [[package]]
 name = "cairo-rs"
-version = "0.15.1"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b869e97a87170f96762f9f178eae8c461147e722ba21dd8814105bf5716bf14a"
+checksum = "e8b14c80d8d1a02fa6d914b9d1afeeca9bc34257f8300d9696e1e331ae114223"
 dependencies = [
 "bitflags",
 "cairo-sys-rs",
@@ -363,9 +363,9 @@ version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
 dependencies = [
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "libc",
- "system-deps 6.0.1",
+ "system-deps 6.0.2",
 ]
 [[package]]
@@ -381,9 +381,9 @@ dependencies = [
 [[package]]
 name = "cc"
-version = "1.0.72"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 dependencies = [
 "jobserver",
 ]
@@ -416,6 +416,15 @@ dependencies = [
 "smallvec",
 ]
 [[package]]
 name = "cfg-expr"
 version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e068cb2806bbc15b439846dc16c5f89f8599f2c3e4d73d4449d38f9b2f0b6c5"
 dependencies = [
 "smallvec",
 ]
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -445,11 +454,14 @@ dependencies = [
 name = "clash-verge"
 version = "0.1.0"
 dependencies = [
 "anyhow",
 "auto-launch",
 "chrono",
 "dirs",
 "dunce",
 "log",
 "log4rs",
 "nanoid",
 "port_scanner",
 "reqwest",
 "serde",
@@ -622,11 +634,12 @@ dependencies = [
 [[package]]
 name = "crypto-common"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4600d695eb3f6ce1cd44e6e291adceb2cc3ab12f20a33777ecd0bf6eba34e06"
+checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
 dependencies = [
 "generic-array",
 "typenum",
 ]
 [[package]]
@@ -797,9 +810,9 @@ dependencies = [
 [[package]]
 name = "digest"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cb780dce4f9a8f5c087362b3a4595936b2019e7c8b30f2c3e9a7e94e6ae9837"
+checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
 dependencies = [
 "block-buffer 0.10.2",
 "crypto-common",
@@ -868,6 +881,12 @@ dependencies = [
 "dtoa",
 ]
 [[package]]
 name = "dunce"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541"
 [[package]]
 name = "easy-parallel"
 version = "3.2.0"
@@ -1121,9 +1140,9 @@ dependencies = [
 [[package]]
 name = "gdk"
-version = "0.15.2"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614258e81ec35ed8770e64a0838f3a47f95b398bc51e724d3b3fa09c1ee0f8d5"
+checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8"
 dependencies = [
 "bitflags",
 "cairo-rs",
@@ -1137,9 +1156,9 @@ dependencies = [
 [[package]]
 name = "gdk-pixbuf"
-version = "0.15.4"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73aa2f5de1b45710da90a55863276667dc3a3264aaf6a2aeace62bb015244d49"
+checksum = "d8750501d75f318c2ec0314701bc8403901303210def80bafd13f6b6059a3f45"
 dependencies = [
 "bitflags",
 "gdk-pixbuf-sys",
@@ -1154,11 +1173,11 @@ version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "413424d9818621fa3cfc8a3a915cdb89a7c3c507d56761b4ec83a9a98e587171"
 dependencies = [
- "gio-sys 0.15.5",
+ "gio-sys 0.15.6",
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "gobject-sys 0.15.5",
 "libc",
- "system-deps 6.0.1",
+ "system-deps 6.0.2",
 ]
 [[package]]
@@ -1169,13 +1188,13 @@ checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88"
 dependencies = [
 "cairo-sys-rs",
 "gdk-pixbuf-sys",
- "gio-sys 0.15.5",
+ "gio-sys 0.15.6",
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "gobject-sys 0.15.5",
 "libc",
 "pango-sys",
 "pkg-config",
- "system-deps 6.0.1",
+ "system-deps 6.0.2",
 ]
 [[package]]
@@ -1185,9 +1204,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178"
 dependencies = [
 "gdk-sys",
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "libc",
- "system-deps 6.0.1",
+ "system-deps 6.0.2",
 "x11",
 ]
@@ -1227,9 +1246,9 @@ dependencies = [
 [[package]]
 name = "getrandom"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
+checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77"
 dependencies = [
 "cfg-if",
 "libc",
@@ -1238,15 +1257,15 @@ dependencies = [
 [[package]]
 name = "gio"
-version = "0.15.5"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59105fa464928adf56b159c8d980cc11fbfbe414befb904caac5163d383049bf"
+checksum = "96efd8a1c00d890f6b45671916e165b5e43ccec61957d443aff6d7e44f62d348"
 dependencies = [
 "bitflags",
 "futures-channel",
 "futures-core",
 "futures-io",
- "gio-sys 0.15.5",
+ "gio-sys 0.15.6",
 "glib",
 "libc",
 "once_cell",
@@ -1268,22 +1287,22 @@ dependencies = [
 [[package]]
 name = "gio-sys"
-version = "0.15.5"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f0bc4cfc9ebcdd05cc5057bc51b99c32f8f9bf246274f6a556ffd27279f8fe3"
+checksum = "1d0fa5052773f5a56b8ae47dab09d040f5d9ce1311f4f99006e16e9a08269296"
 dependencies = [
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "gobject-sys 0.15.5",
 "libc",
- "system-deps 6.0.1",
+ "system-deps 6.0.2",
 "winapi",
 ]
 [[package]]
 name = "glib"
-version = "0.15.5"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41dcfbdb6cc6c02aee163339465d8a40d6f3f64c3a43f729a4195f0e153338b7"
+checksum = "aa570813c504bdf7539a9400180c2dd4b789a819556fb86da7226d7d1b037b49"
 dependencies = [
 "bitflags",
 "futures-channel",
@@ -1291,7 +1310,7 @@ dependencies = [
 "futures-executor",
 "futures-task",
 "glib-macros",
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "gobject-sys 0.15.5",
 "libc",
 "once_cell",
@@ -1301,13 +1320,13 @@ dependencies = [
 [[package]]
 name = "glib-macros"
-version = "0.15.3"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e58b262ff65ef771003873cea8c10e0fe854f1c508d48d62a4111a1ff163f7d1"
+checksum = "41bfd8d227dead0829ac142454e97531b93f576d0805d779c42bfd799c65c572"
 dependencies = [
 "anyhow",
 "heck 0.4.0",
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
 "proc-macro-error",
 "proc-macro2",
 "quote",
@@ -1326,12 +1345,12 @@ dependencies = [
 [[package]]
 name = "glib-sys"
-version = "0.15.5"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa1d4e1a63d8574541e5b92931e4e669ddc87ffa85d58e84e631dba13ad2e10c"
+checksum = "f4366377bd56697de8aaee24e673c575d2694d72e7756324ded2b0428829a7b8"
 dependencies = [
 "libc",
- "system-deps 6.0.1",
+ "system-deps 6.0.2",
 ]
 [[package]]
@@ -1370,16 +1389,16 @@ version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df6859463843c20cf3837e3a9069b6ab2051aeeadf4c899d33344f4aea83189a"
 dependencies = [
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "libc",
- "system-deps 6.0.1",
+ "system-deps 6.0.2",
 ]
 [[package]]
 name = "gtk"
-version = "0.15.3"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7978eaec05bea63947c801d29a21372f2ed39aec0bf56bf7725d3599094675e"
+checksum = "5f2d1326b36af927fe46ae2f89a8fec38c6f0d279ebc5ef07ffeeabb70300bfc"
 dependencies = [
 "atk",
 "bitflags",
@@ -1408,22 +1427,22 @@ dependencies = [
 "cairo-sys-rs",
 "gdk-pixbuf-sys",
 "gdk-sys",
- "gio-sys 0.15.5",
+ "gio-sys 0.15.6",
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "gobject-sys 0.15.5",
 "libc",
 "pango-sys",
- "system-deps 6.0.1",
+ "system-deps 6.0.2",
 ]
 [[package]]
 name = "gtk3-macros"
-version = "0.15.1"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c891188af69e77a1e8a0b1746fbd03b9b396e7d34d518c5331b15950259f541"
+checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9"
 dependencies = [
 "anyhow",
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
 "proc-macro-error",
 "proc-macro2",
 "quote",
@@ -1548,9 +1567,9 @@ dependencies = [
 [[package]]
 name = "http-range"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee9694f83d9b7c09682fdb32213682939507884e5bcf227be9aff5d644b90dc"
+checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
 [[package]]
 name = "httparse"
@@ -1733,7 +1752,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c"
 dependencies = [
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "gobject-sys 0.15.5",
 "libc",
 "system-deps 5.0.0",
@@ -1817,9 +1836,9 @@ dependencies = [
 [[package]]
 name = "libc"
-version = "0.2.117"
+version = "0.2.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c"
+checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4"
 [[package]]
 name = "linked-hash-map"
@@ -1867,7 +1886,7 @@ dependencies = [
 "libc",
 "log",
 "log-mdc",
- "parking_lot",
+ "parking_lot 0.11.2",
 "regex",
 "serde",
 "serde-value",
@@ -1961,9 +1980,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 [[package]]
 name = "mime_guess"
-version = "2.0.3"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
 dependencies = [
 "mime",
 "unicase",
@@ -1996,9 +2015,9 @@ dependencies = [
 [[package]]
 name = "mio"
-version = "0.7.14"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
+checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2"
 dependencies = [
 "libc",
 "log",
@@ -2028,12 +2047,21 @@ dependencies = [
 "mime",
 "mime_guess",
 "quick-error",
- "rand 0.8.4",
+ "rand 0.8.5",
 "safemem",
 "tempfile",
 "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"
@@ -2066,15 +2094,22 @@ dependencies = [
 ]
 [[package]]
-name = "ndk-glue"
+name = "ndk-context"
-version = "0.4.0"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3e9e94628f24e7a3cb5b96a2dc5683acd9230bf11991c2a1677b87695138420"
+checksum = "4e3c5cc68637e21fe8f077f6a1c9e0b9ca495bb74895226b476310f613325884"
 [[package]]
 name = "ndk-glue"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b1454575120e3265d2442222299c711ace58ba417532ee4f0fc71b860016b93"
 dependencies = [
 "lazy_static",
 "libc",
 "log",
 "ndk",
 "ndk-context",
 "ndk-macro",
 "ndk-sys",
 ]
@@ -2187,7 +2222,7 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d992b768490d7fe0d8586d9b5745f6c49f557da6d81dc982b1d167ad4edbb21"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
 "proc-macro2",
 "quote",
 "syn",
@@ -2246,9 +2281,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 [[package]]
 name = "open"
-version = "2.0.3"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b1e014096a08da72e3287119e0c69a8f6fce61a031a55b1ce2607fe9c2b5a67"
+checksum = "5a82915836ef43159bb6a3c64d884c42329ccd0b8afdca737cf1e3dd701709dc"
 dependencies = [
 "pathdiff",
 "winapi",
@@ -2308,9 +2343,9 @@ dependencies = [
 [[package]]
 name = "os_pipe"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e3492ebca331b895fe23ed427dce2013d9b2e00c45964f12040b0db38b8ab27"
+checksum = "2c92f2b54f081d635c77e7120862d48db8e91f7f21cef23ab1b4fe9971c59f55"
 dependencies = [
 "libc",
 "winapi",
@@ -2318,9 +2353,9 @@ dependencies = [
 [[package]]
 name = "pango"
-version = "0.15.2"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79211eff430c29cc38c69e0ab54bc78fa1568121ca9737707eee7f92a8417a94"
+checksum = "78c7420fc01a390ec200da7395b64d705f5d82fe03e5d0708aee422c46538be7"
 dependencies = [
 "bitflags",
 "glib",
@@ -2335,10 +2370,10 @@ version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7022c2fb88cd2d9d55e1a708a8c53a3ae8678234c4a54bf623400aeb7f31fac2"
 dependencies = [
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "gobject-sys 0.15.5",
 "libc",
- "system-deps 6.0.1",
+ "system-deps 6.0.2",
 ]
 [[package]]
@@ -2355,7 +2390,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
 "instant",
 "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.8.5",
 ]
 [[package]]
 name = "parking_lot"
 version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
 dependencies = [
 "lock_api",
 "parking_lot_core 0.9.1",
 ]
 [[package]]
@@ -2372,6 +2417,19 @@ dependencies = [
 "winapi",
 ]
 [[package]]
 name = "parking_lot_core"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
 dependencies = [
 "cfg-if",
 "libc",
 "redox_syscall 0.2.10",
 "smallvec",
 "windows-sys",
 ]
 [[package]]
 name = "pathdiff"
 version = "0.2.1"
@@ -2442,7 +2500,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
 dependencies = [
 "phf_shared 0.10.0",
- "rand 0.8.4",
+ "rand 0.8.5",
 ]
 [[package]]
@@ -2601,9 +2659,9 @@ dependencies = [
 [[package]]
 name = "proc-macro-crate"
-version = "1.1.0"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83"
+checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
 dependencies = [
 "thiserror",
 "toml",
@@ -2673,20 +2731,19 @@ dependencies = [
 "libc",
 "rand_chacha 0.2.2",
 "rand_core 0.5.1",
- "rand_hc 0.2.0",
+ "rand_hc",
 "rand_pcg",
 ]
 [[package]]
 name = "rand"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
 "libc",
 "rand_chacha 0.3.1",
 "rand_core 0.6.3",
 "rand_hc 0.3.1",
 ]
 [[package]]
@@ -2724,7 +2781,7 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.4",
+ "getrandom 0.2.5",
 ]
 [[package]]
@@ -2736,15 +2793,6 @@ dependencies = [
 "rand_core 0.5.1",
 ]
 [[package]]
 name = "rand_hc"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
 dependencies = [
 "rand_core 0.6.3",
 ]
 [[package]]
 name = "rand_pcg"
 version = "0.2.1"
@@ -2809,7 +2857,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
- "getrandom 0.2.4",
+ "getrandom 0.2.5",
 "redox_syscall 0.2.10",
 ]
@@ -2893,7 +2941,7 @@ dependencies = [
 "ashpd",
 "block",
 "dispatch",
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "gobject-sys 0.15.5",
 "gtk-sys",
 "js-sys",
@@ -2925,7 +2973,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.5",
+ "semver 1.0.6",
 ]
 [[package]]
@@ -3031,9 +3079,9 @@ dependencies = [
 [[package]]
 name = "semver"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0486718e92ec9a68fbed73bb5ef687d71103b142595b406835649bebd33f72c7"
+checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d"
 [[package]]
 name = "semver-parser"
@@ -3196,7 +3244,7 @@ checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
 dependencies = [
 "cfg-if",
 "cpufeatures",
- "digest 0.10.2",
+ "digest 0.10.3",
 ]
 [[package]]
@@ -3216,13 +3264,13 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
 [[package]]
 name = "sha2"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec"
+checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
 dependencies = [
 "cfg-if",
 "cpufeatures",
- "digest 0.10.2",
+ "digest 0.10.3",
 ]
 [[package]]
@@ -3324,7 +3372,7 @@ checksum = "33994d0838dc2d152d17a62adf608a869b5e846b65b389af7f3dbc1de45c5b26"
 dependencies = [
 "lazy_static",
 "new_debug_unreachable",
- "parking_lot",
+ "parking_lot 0.11.2",
 "phf_shared 0.10.0",
 "precomputed-hash",
 "serde",
@@ -3432,11 +3480,11 @@ dependencies = [
 [[package]]
 name = "system-deps"
-version = "6.0.1"
+version = "6.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad3a97fdef3daf935d929b3e97e5a6a680cd4622e40c2941ca0875d6566416f8"
+checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709"
 dependencies = [
- "cfg-expr 0.9.1",
+ "cfg-expr 0.10.2",
 "heck 0.4.0",
 "pkg-config",
 "toml",
@@ -3445,9 +3493,9 @@ dependencies = [
 [[package]]
 name = "tao"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402f170c4da28cc3108d854c7567d6904c82fc0e30e5b69f2a6b3e48f8a4f705"
+checksum = "7b3b3bbc9151bce45db3cf9ccb808730c8df8786d0223f34591f6e5890503939"
 dependencies = [
 "bitflags",
 "cairo-rs",
@@ -3463,7 +3511,7 @@ dependencies = [
 "gdkx11-sys",
 "gio",
 "glib",
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "gtk",
 "instant",
 "lazy_static",
@@ -3474,7 +3522,7 @@ dependencies = [
 "ndk-glue",
 "ndk-sys",
 "objc",
- "parking_lot",
+ "parking_lot 0.11.2",
 "raw-window-handle",
 "scopeguard",
 "serde",
@@ -3535,11 +3583,11 @@ dependencies = [
 "open",
 "os_pipe",
 "percent-encoding",
- "rand 0.8.4",
+ "rand 0.8.5",
 "raw-window-handle",
 "regex",
 "rfd",
- "semver 1.0.5",
+ "semver 1.0.6",
 "serde",
 "serde_json",
 "serde_repr",
@@ -3610,7 +3658,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-shadows"
 version = "0.0.0"
-source = "git+https://github.com/tauri-apps/tauri-plugin-shadows#5ef6560af0c55ab5543f60eb9bfcb5f1de49a69e"
+source = "git+https://github.com/tauri-apps/tauri-plugin-shadows#fac6f42f1cf43329f398871f5564448359458462"
 dependencies = [
 "cocoa",
 "objc",
@@ -3621,7 +3669,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-vibrancy"
 version = "0.0.0"
-source = "git+https://github.com/tauri-apps/tauri-plugin-vibrancy#b5cc16221d89a1cfc6dad9e36c4788e0459aaaf1"
+source = "git+https://github.com/tauri-apps/tauri-plugin-vibrancy#561c4fa22c42073239ad37b4b406c303aa91e678"
 dependencies = [
 "cocoa",
 "objc",
@@ -3790,9 +3838,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 [[package]]
 name = "tokio"
-version = "1.16.1"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a"
+checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
 dependencies = [
 "bytes",
 "libc",
@@ -3800,9 +3848,10 @@ dependencies = [
 "mio",
 "num_cpus",
 "once_cell",
- "parking_lot",
+ "parking_lot 0.12.0",
 "pin-project-lite",
 "signal-hook-registry",
 "socket2",
 "tokio-macros",
 "winapi",
 ]
@@ -3883,9 +3932,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 [[package]]
 name = "tracing"
-version = "0.1.30"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9"
+checksum = "f6c650a8ef0cd2dd93736f033d21cbd1224c5a967aa0c258d00fcf7dafef9b9f"
 dependencies = [
 "cfg-if",
 "log",
@@ -3928,9 +3977,9 @@ dependencies = [
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74786ce43333fcf51efe947aed9718fbe46d5c7328ec3f1029e818083966d9aa"
+checksum = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce"
 dependencies = [
 "ansi_term",
 "lazy_static",
@@ -3977,7 +4026,7 @@ dependencies = [
 "http",
 "httparse",
 "log",
- "rand 0.8.4",
+ "rand 0.8.5",
 "sha-1 0.9.8",
 "thiserror",
 "url",
@@ -4084,7 +4133,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.4",
+ "getrandom 0.2.5",
 ]
 [[package]]
@@ -4273,9 +4322,9 @@ dependencies = [
 "gdk",
 "gdk-sys",
 "gio",
- "gio-sys 0.15.5",
+ "gio-sys 0.15.6",
 "glib",
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "gobject-sys 0.15.5",
 "gtk",
 "gtk-sys",
@@ -4296,8 +4345,8 @@ dependencies = [
 "cairo-sys-rs",
 "gdk-pixbuf-sys",
 "gdk-sys",
- "gio-sys 0.15.5",
+ "gio-sys 0.15.6",
- "glib-sys 0.15.5",
+ "glib-sys 0.15.6",
 "gobject-sys 0.15.5",
 "gtk-sys",
 "javascriptcore-rs-sys",
@@ -4438,6 +4487,19 @@ dependencies = [
 "windows_reader",
 ]
 [[package]]
 name = "windows-sys"
 version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6"
 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_aarch64_msvc"
 version = "0.30.0"
@@ -4655,7 +4717,7 @@ dependencies = [
 "nix",
 "once_cell",
 "ordered-stream",
- "rand 0.8.4",
+ "rand 0.8.5",
 "serde",
 "serde_repr",
 "sha1",
@@ -4672,7 +4734,7 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36823cc10fddc3c6b19f048903262dacaf8274170e9a255784bdd8b4570a8040"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
 "proc-macro2",
 "quote",
 "regex",
@@ -4753,7 +4815,7 @@ version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c2cecc5a61c2a053f7f653a24cd15b3b0195d7f7ddb5042c837fb32e161fb7a"
 dependencies = [
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate 1.1.3",
 "proc-macro2",
 "quote",
 "syn",
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -13,7 +13,10 @@ build = "build.rs"
 tauri-build = { version = "1.0.0-rc.3", features = [] }
 [dependencies]
 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"
--- a/src-tauri/src/cmds.rs
+++ b/src-tauri/src/cmds.rs
@@ -1,29 +1,27 @@
 use crate::{
-  core::{ClashInfo, ProfileItem, Profiles, VergeConfig},
+  core::{ClashInfo, PrfItem, Profiles, VergeConfig},
  ret_err,
  states::{ClashState, ProfilesState, VergeState},
-  utils::{dirs::app_home_dir, fetch::fetch_profile, sysopt::SysProxyConfig},
+  utils::{dirs, sysopt::SysProxyConfig},
  wrap_err,
 };
 use anyhow::Result;
 use serde_yaml::Mapping;
-use std::process::Command;
+use std::{path::PathBuf, process::Command};
 use tauri::{api, State};
 /// get all profiles from `profiles.yaml`
 /// do not acquire the lock of ProfileLock
 #[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> {
-  match profiles_state.0.lock() {
+  let profiles = profiles_state.0.lock().unwrap();
-    Ok(profiles) => Ok(profiles.clone()),
+  Ok(profiles.clone())
    Err(_) => Err("failed to get profiles lock".into()),
  }
 }
 /// synchronize data irregularly
 #[tauri::command]
 pub fn sync_profiles(profiles_state: State<'_, ProfilesState>) -> Result<(), String> {
-  match profiles_state.0.lock() {
+  let mut profiles = profiles_state.0.lock().unwrap();
-    Ok(mut profiles) => profiles.sync_file(),
+  wrap_err!(profiles.sync_file())
    Err(_) => Err("failed to get profiles lock".into()),
  }
 }
 /// import the profile from url
@@ -34,9 +32,10 @@ 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, with_proxy).await)?;
  let mut profiles = profiles_state.0.lock().unwrap();
-  profiles.import_from_url(url, result)
+  wrap_err!(profiles.append_item(item))
 }
 /// new a profile
@@ -48,137 +47,128 @@ pub async fn new_profile(
  desc: String,
  profiles_state: State<'_, ProfilesState>,
 ) -> Result<(), String> {
  let item = wrap_err!(PrfItem::from_local(name, desc))?;
  let mut profiles = profiles_state.0.lock().unwrap();
-  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() {
+
-        return Err("the index out of bound".into());
+    if item.url.is_none() {
-      }
+      ret_err!("failed to get the item url");
      let url = match &items[index].url {
        Some(u) => u.clone(),
        None => return Err("failed to update profile for `invalid url`".into()),
      };
      profile.items = Some(items);
      url
    }
-    Err(_) => return Err("failed to get profiles lock".into()),
+
    item.url.clone().unwrap()
  };
-  let result = fetch_profile(&url, with_proxy).await?;
+  let item = wrap_err!(PrfItem::from_url(&url, 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))?;
      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))?;
        profiles.activate(&clash)
      } else {
        Ok(())
      }
    }
    Err(_) => Err("failed to get profiles lock".into()),
  }
  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> {
  let mut profiles = profiles_state.0.lock().unwrap();
  wrap_err!(profiles.put_current(index))?;
-  match profiles.put_current(index) {
+  let clash = clash_state.0.lock().unwrap();
-    Ok(()) => {
+  wrap_err!(clash.activate(&profiles))
      let clash = clash_state.0.lock().unwrap();
      profiles.activate(&clash)
    }
    Err(err) => Err(err),
  }
 }
 /// delete profile item
 #[tauri::command]
 pub fn delete_profile(
-  index: usize,
+  index: String,
  clash_state: State<'_, ClashState>,
  profiles_state: State<'_, ProfilesState>,
 ) -> Result<(), String> {
  let mut profiles = profiles_state.0.lock().unwrap();
-  match profiles.delete_item(index) {
+
-    Ok(change) => match change {
+  if wrap_err!(profiles.delete_item(index))? {
-      true => {
+    let clash = clash_state.0.lock().unwrap();
-        let clash = clash_state.0.lock().unwrap();
+    wrap_err!(clash.activate(&profiles))?;
        profiles.activate(&clash)
      }
      false => Ok(()),
    },
    Err(err) => Err(err),
  }
  Ok(())
 }
 /// patch the profile config
 #[tauri::command]
 pub fn patch_profile(
-  index: usize,
+  index: String,
-  profile: ProfileItem,
+  profile: PrfItem,
  profiles_state: State<'_, ProfilesState>,
 ) -> Result<(), String> {
-  match profiles_state.0.lock() {
+  let mut profiles = profiles_state.0.lock().unwrap();
-    Ok(mut profiles) => profiles.patch_item(index, profile),
+  wrap_err!(profiles.patch_item(index, profile))
    Err(_) => Err("can not get profiles lock".into()),
  }
 }
 /// 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() {
-    return Err("the index out of bound".into());
+    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 = app_home_dir().join("profiles").join(file);
  if !path.exists() {
-    return Err("the file not found".into());
+    ret_err!("the file not found");
  }
  // use vscode first
  if let Ok(code) = which::which("code") {
    #[cfg(target_os = "windows")]
    {
      use std::os::windows::process::CommandExt;
      return match Command::new(code)
        .creation_flags(0x08000000)
        .arg(path)
        .spawn()
      {
        Ok(_) => Ok(()),
        Err(_) => Err("failed to open file by VScode".into()),
      };
    }
    #[cfg(not(target_os = "windows"))]
    return match Command::new(code).arg(path).spawn() {
      Ok(_) => Ok(()),
      Err(_) => Err("failed to open file by VScode".into()),
    };
  }
-  match open_command().arg(path).spawn() {
+  open_path_cmd(path, "failed to open file by `open`")
    Ok(_) => Ok(()),
    Err(_) => Err("failed to open file by `open`".into()),
  }
 }
 /// restart the sidecar
@@ -190,23 +180,15 @@ pub fn restart_sidecar(
  let mut clash = clash_state.0.lock().unwrap();
  let mut profiles = profiles_state.0.lock().unwrap();
-  match clash.restart_sidecar(&mut profiles) {
+  wrap_err!(clash.restart_sidecar(&mut profiles))
    Ok(_) => Ok(()),
    Err(err) => {
      log::error!("{}", err);
      Err(err)
    }
  }
 }
 /// get the clash core info from the state
 /// the caller can also get the infomation by clash's api
 #[tauri::command]
 pub fn get_clash_info(clash_state: State<'_, ClashState>) -> Result<ClashInfo, String> {
-  match clash_state.0.lock() {
+  let clash = clash_state.0.lock().unwrap();
-    Ok(clash) => Ok(clash.info.clone()),
+  Ok(clash.info.clone())
    Err(_) => Err("failed to get clash lock".into()),
  }
 }
 /// update the clash core config
@@ -222,26 +204,21 @@ pub fn patch_clash_config(
  let mut clash = clash_state.0.lock().unwrap();
  let mut verge = verge_state.0.lock().unwrap();
  let mut profiles = profiles_state.0.lock().unwrap();
-  clash.patch_config(payload, &mut verge, &mut profiles)
+  wrap_err!(clash.patch_config(payload, &mut verge, &mut profiles))
 }
 /// get the system proxy
 #[tauri::command]
 pub fn get_sys_proxy() -> Result<SysProxyConfig, String> {
-  match SysProxyConfig::get_sys() {
+  wrap_err!(SysProxyConfig::get_sys())
    Ok(value) => Ok(value),
    Err(err) => Err(err.to_string()),
  }
 }
 /// get the current proxy config
 /// which may not the same as system proxy
 #[tauri::command]
 pub fn get_cur_proxy(verge_state: State<'_, VergeState>) -> Result<Option<SysProxyConfig>, String> {
-  match verge_state.0.lock() {
+  let verge = verge_state.0.lock().unwrap();
-    Ok(verge) => Ok(verge.cur_sysproxy.clone()),
+  Ok(verge.cur_sysproxy.clone())
    Err(_) => Err("failed to get verge lock".into()),
  }
 }
 /// get the verge config
@@ -262,10 +239,26 @@ pub fn get_verge_config(verge_state: State<'_, VergeState>) -> Result<VergeConfi
 #[tauri::command]
 pub fn patch_verge_config(
  payload: VergeConfig,
  clash_state: State<'_, ClashState>,
  verge_state: State<'_, VergeState>,
  profiles_state: State<'_, ProfilesState>,
 ) -> Result<(), String> {
  let tun_mode = payload.enable_tun_mode.clone();
  let mut verge = verge_state.0.lock().unwrap();
-  verge.patch_config(payload)
+  wrap_err!(verge.patch_config(payload))?;
  // change tun mode
  if tun_mode.is_some() {
    let mut clash = clash_state.0.lock().unwrap();
    let profiles = profiles_state.0.lock().unwrap();
    wrap_err!(clash.tun_mode(tun_mode.unwrap()))?;
    clash.update_config();
    wrap_err!(clash.activate(&profiles))?;
  }
  Ok(())
 }
 /// kill all sidecars when update app
@@ -277,31 +270,36 @@ pub fn kill_sidecars() {
 /// open app config dir
 #[tauri::command]
 pub fn open_app_dir() -> Result<(), String> {
-  let app_dir = app_home_dir();
+  let app_dir = dirs::app_home_dir();
-
+  open_path_cmd(app_dir, "failed to open app dir")
  match open_command().arg(app_dir).spawn() {
    Ok(_) => Ok(()),
    Err(_) => Err("failed to open logs dir".into()),
  }
 }
 /// open logs dir
 #[tauri::command]
 pub fn open_logs_dir() -> Result<(), String> {
-  let log_dir = app_home_dir().join("logs");
+  let log_dir = dirs::app_logs_dir();
-
+  open_path_cmd(log_dir, "failed to open logs dir")
  match open_command().arg(log_dir).spawn() {
    Ok(_) => Ok(()),
    Err(_) => Err("failed to open logs dir".into()),
  }
 }
 /// get open/explorer command
-fn open_command() -> Command {
+fn open_path_cmd(dir: PathBuf, err_str: &str) -> Result<(), String> {
-  let open = if cfg!(target_os = "windows") {
+  #[cfg(target_os = "windows")]
-    "explorer"
+  {
-  } else {
+    use std::os::windows::process::CommandExt;
-    "open"
+
-  };
+    match Command::new("explorer")
-  Command::new(open)
+      .creation_flags(0x08000000)
      .arg(dir)
      .spawn()
    {
      Ok(_) => Ok(()),
      Err(_) => Err(err_str.into()),
    }
  }
  #[cfg(not(target_os = "windows"))]
  match Command::new("open").arg(dir).spawn() {
    Ok(_) => Ok(()),
    Err(_) => Err(err_str.into()),
  }
 }
--- a/src-tauri/src/core/clash.rs
+++ b/src-tauri/src/core/clash.rs
@@ -1,5 +1,9 @@
 use std::collections::HashMap;
 use super::{Profiles, Verge};
 use crate::utils::{config, dirs};
 use anyhow::{bail, Result};
 use reqwest::header::HeaderMap;
 use serde::{Deserialize, Serialize};
 use serde_yaml::{Mapping, Value};
 use tauri::api::process::{Command, CommandChild, CommandEvent};
@@ -31,12 +35,9 @@ pub struct Clash {
  pub sidecar: Option<CommandChild>,
 }
 static CLASH_CONFIG: &str = "config.yaml";
 // todo: be able to change config field
 impl Clash {
  pub fn new() -> Clash {
-    let config = Clash::get_config();
+    let config = Clash::read_config();
    let info = Clash::get_info(&config);
    Clash {
@@ -46,6 +47,20 @@ impl Clash {
    }
  }
  /// get clash config
  fn read_config() -> Mapping {
    config::read_yaml::<Mapping>(dirs::clash_path())
  }
  /// save the clash config
  fn save_config(&self) -> Result<()> {
    config::save_yaml(
      dirs::clash_path(),
      &self.config,
      Some("# Default Config For Clash Core\n\n"),
    )
  }
  /// parse the clash's config.yaml
  /// get some information
  fn get_info(clash_config: &Mapping) -> ClashInfo {
@@ -100,7 +115,7 @@ impl Clash {
  }
  /// run clash sidecar
-  pub fn run_sidecar(&mut self) -> Result<(), String> {
+  pub fn run_sidecar(&mut self) -> Result<()> {
    let app_dir = dirs::app_home_dir();
    let app_dir = app_dir.as_os_str().to_str().unwrap();
@@ -113,66 +128,50 @@ 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),
                _ => {}
              }
            }
          });
          Ok(())
        }
-        Err(err) => Err(err.to_string()),
+        Err(err) => bail!(err.to_string()),
      },
-      Err(err) => Err(err.to_string()),
+      Err(err) => bail!(err.to_string()),
    }
  }
  /// drop clash sidecar
-  pub fn drop_sidecar(&mut self) -> Result<(), String> {
+  pub fn drop_sidecar(&mut self) -> Result<()> {
    if let Some(sidecar) = self.sidecar.take() {
-      if let Err(err) = sidecar.kill() {
+      sidecar.kill()?;
        return Err(format!("failed to drop clash for \"{}\"", err));
      }
    }
    Ok(())
  }
  /// restart clash sidecar
  /// should reactivate profile after restart
-  pub fn restart_sidecar(&mut self, profiles: &mut Profiles) -> Result<(), String> {
+  pub fn restart_sidecar(&mut self, profiles: &mut Profiles) -> Result<()> {
    self.update_config();
    self.drop_sidecar()?;
    self.run_sidecar()?;
-    profiles.activate(&self)
+    self.activate(profiles)
  }
  /// update the clash info
  pub fn update_config(&mut self) {
-    self.config = Clash::get_config();
+    self.config = Clash::read_config();
    self.info = Clash::get_info(&self.config);
  }
  /// get clash config
  fn get_config() -> Mapping {
    config::read_yaml::<Mapping>(dirs::app_home_dir().join(CLASH_CONFIG))
  }
  /// save the clash config
  fn save_config(&self) -> Result<(), String> {
    config::save_yaml(
      dirs::app_home_dir().join(CLASH_CONFIG),
      &self.config,
      Some("# Default Config For Clash Core\n\n"),
    )
  }
  /// patch update the clash config
  pub fn patch_config(
    &mut self,
    patch: Mapping,
    verge: &mut Verge,
    profiles: &mut Profiles,
-  ) -> Result<(), String> {
+  ) -> Result<()> {
    for (key, value) in patch.iter() {
      let value = value.clone();
      let key_str = key.as_str().clone().unwrap_or("");
@@ -195,14 +194,100 @@ 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()
  }
  /// enable tun mode
  /// only revise the config and restart the
  pub fn tun_mode(&mut self, enable: bool) -> Result<()> {
    let tun_key = Value::String("tun".into());
    let tun_val = self.config.get(&tun_key);
    let mut new_val = Mapping::new();
    if tun_val.is_some() && tun_val.as_ref().unwrap().is_mapping() {
      new_val = tun_val.as_ref().unwrap().as_mapping().unwrap().clone();
    }
    macro_rules! revise {
      ($map: expr, $key: expr, $val: expr) => {
        let ret_key = Value::String($key.into());
        if $map.contains_key(&ret_key) {
          $map[&ret_key] = $val;
        } else {
          $map.insert(ret_key, $val);
        }
      };
    }
    macro_rules! append {
      ($map: expr, $key: expr, $val: expr) => {
        let ret_key = Value::String($key.into());
        if !$map.contains_key(&ret_key) {
          $map.insert(ret_key, $val);
        }
      };
    }
    revise!(new_val, "enable", Value::from(enable));
    append!(new_val, "stack", Value::from("gvisor"));
    append!(new_val, "auto-route", Value::from(true));
    append!(new_val, "auto-detect-interface", Value::from(true));
    revise!(self.config, "tun", Value::from(new_val));
    self.save_config()
  }
  /// activate the profile
  pub fn activate(&self, profiles: &Profiles) -> Result<()> {
    let temp_path = dirs::profiles_temp_path();
    let info = self.info.clone();
    let mut config = self.config.clone();
    let gen_config = profiles.gen_activate()?;
    for (key, value) in gen_config.into_iter() {
      config.insert(key, value);
    }
    config::save_yaml(temp_path.clone(), &config, Some("# Clash Verge Temp File"))?;
    tauri::async_runtime::spawn(async move {
      let server = info.server.clone().unwrap();
      let server = 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());
      for _ in 0..5 {
        match reqwest::ClientBuilder::new().no_proxy().build() {
          Ok(client) => match client
            .put(&server)
            .headers(headers.clone())
            .json(&data)
            .send()
            .await
          {
            Ok(_) => break,
            Err(err) => log::error!("failed to activate for `{err}`"),
          },
          Err(err) => log::error!("failed to activate for `{err}`"),
        }
      }
    });
    Ok(())
  }
 }
 impl Default for Clash {
@@ -214,7 +299,7 @@ impl Default for Clash {
 impl Drop for Clash {
  fn drop(&mut self) {
    if let Err(err) = self.drop_sidecar() {
-      log::error!("{}", err);
+      log::error!("{err}");
    }
  }
 }
--- a/src-tauri/src/core/profiles.rs
+++ b/src-tauri/src/core/profiles.rs
@@ -1,399 +1,439 @@
-use super::{Clash, ClashInfo};
+use crate::utils::{config, dirs, help, tmpl};
-use crate::utils::{config, dirs, tmpl};
+use anyhow::{bail, Context, 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::env::temp_dir;
 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>,
  /// profile description
  #[serde(skip_serializing_if = "Option::is_none")]
  pub desc: Option<String>,
  /// profile file
  pub file: Option<String>,
-  /// current mode
+
  pub mode: Option<String>,
  /// source url
  #[serde(skip_serializing_if = "Option::is_none")]
  pub url: Option<String>,
  /// selected infomation
-  pub selected: Option<Vec<ProfileSelected>>,
+  #[serde(skip_serializing_if = "Option::is_none")]
  pub selected: Option<Vec<PrfSelected>>,
  /// user info
-  pub extra: Option<ProfileExtra>,
+  #[serde(skip_serializing_if = "Option::is_none")]
  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,
 }
-#[derive(Default, Debug, Clone, Deserialize, Serialize)]
+impl Default for PrfItem {
-/// the result from url
+  fn default() -> Self {
-pub struct ProfileResponse {
+    PrfItem {
-  pub name: String,
+      uid: None,
-  pub file: String,
+      itype: None,
-  pub data: String,
+      name: None,
-  pub extra: Option<ProfileExtra>,
+      desc: None,
      file: None,
      url: None,
      selected: None,
      extra: None,
      updated: None,
      file_data: None,
    }
  }
 }
-static PROFILE_YAML: &str = "profiles.yaml";
+impl PrfItem {
-static PROFILE_TEMP: &str = "clash-verge-runtime.yaml";
+  /// ## 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_CONFIG.into()),
    })
  }
  /// ## Remote type
  /// create a new item from url
  pub async fn from_url(url: &str, 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 = uid.clone();
    let data = resp.text_with_charset("utf-8").await?;
    Ok(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(help::get_now()),
      file_data: Some(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>>,
 }
 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::app_home_dir().join(PROFILE_YAML))
+    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
-  pub fn save_file(&self) -> Result<(), String> {
+  pub fn save_file(&self) -> Result<()> {
    config::save_yaml(
-      dirs::app_home_dir().join(PROFILE_YAML),
+      dirs::profiles_path(),
      self,
      Some("# Profiles Config for Clash Verge\n\n"),
    )
  }
  /// sync the config between file and memory
-  pub fn sync_file(&mut self) -> Result<(), String> {
+  pub fn sync_file(&mut self) -> Result<()> {
-    let data = config::read_yaml::<Self>(dirs::app_home_dir().join(PROFILE_YAML));
+    let data = Self::read_file();
-    if data.current.is_none() {
+    if data.current.is_none() && data.items.is_none() {
-      Err("failed to read profiles.yaml".into())
+      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<(), String> {
+    self.current.clone()
    // save the profile file
    let path = dirs::app_home_dir().join("profiles").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<(), String> {
+  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() {
      return Err("the index out of bound".into());
    }
-    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}\"");
  }
  /// 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), String> {
+  /// 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_home_dir().join("profiles").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(_) => Err("failed to create file".into()),
    }
  }
  /// 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<(), String> {
    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_home_dir().join("profiles").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<(), String> {
    let mut items = self.items.take().unwrap_or(vec![]);
    if index >= items.len() {
      return Err("index out of bound".into());
    }
    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, String> {
    let mut current = self.current.clone().unwrap_or(0);
    let mut items = self.items.clone().unwrap_or(vec![]);
    if index >= items.len() {
      return Err("index out of bound".into());
    }
    let mut rm_item = items.remove(index);
    // delete the file
    if let Some(file) = rm_item.file.take() {
      let file_path = dirs::app_home_dir().join("profiles").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<(), String> {
+  /// 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() {
+    }
          return Err("the index out of bound".into());
        }
-        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 = String::from("");
+
-          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 = 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();
          }
          break;
        }
      }
    });
    self.save_file()
  }
  /// delete item
  /// 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 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> {
    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);
          }
          log::error!("failed to activate for `{}`", err);
        });
-        Ok(())
+        return Ok(new_config);
      }
      None => Err("empty profiles".into()),
    }
  }
 }
 /// put the profile to clash
 pub async fn activate_profile(
  profile_item: &ProfileItem,
  clash_config: &Mapping,
  clash_info: &ClashInfo,
 ) -> Result<(), String> {
  // temp profile's path
  let temp_path = temp_dir().join(PROFILE_TEMP);
  // generate temp profile
  {
    let file_name = match profile_item.file.clone() {
      Some(file_name) => file_name,
      None => return Err("profile item should have `file` field".into()),
    };
    let file_path = dirs::app_home_dir().join("profiles").join(file_name);
    if !file_path.exists() {
      return Err(format!(
        "profile `{}` not exists",
        file_path.as_os_str().to_str().unwrap()
      ));
    }
-    // begin to generate the new profile config
+    bail!("failed to found the uid \"{current}\"");
    let def_config = config::read_yaml::<Mapping>(file_path.clone());
    let mut new_config = Mapping::new();
    // 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);
      }
    });
    // add some of the clash `config.yaml` config to it
    let valid_keys = vec![
      "mixed-port",
      "log-level",
      "allow-lan",
      "external-controller",
      "secret",
      "mode",
      "ipv6",
    ];
    valid_keys.iter().for_each(|key| {
      let key = Value::String(key.to_string());
      if clash_config.contains_key(&key) {
        let value = clash_config[&key].clone();
        new_config.insert(key, value);
      }
    });
    config::save_yaml(
      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();
  data.insert("path", temp_path.as_os_str().to_str().unwrap());
  let client = match reqwest::ClientBuilder::new().no_proxy().build() {
    Ok(c) => c,
    Err(_) => return Err("failed to create http::put".into()),
  };
  match client.put(server).headers(headers).json(&data).send().await {
    Ok(_) => Ok(()),
    Err(err) => Err(format!("request failed `{}`", err.to_string())),
  }
 }
--- a/src-tauri/src/core/verge.rs
+++ b/src-tauri/src/core/verge.rs
@@ -1,11 +1,13 @@
 use crate::{
  core::Clash,
  log_if_err,
  utils::{config, dirs, sysopt::SysProxyConfig},
 };
 use anyhow::{bail, Result};
 use auto_launch::{AutoLaunch, AutoLaunchBuilder};
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
-use tauri::{api::path::resource_dir, async_runtime::Mutex};
+use tauri::{async_runtime::Mutex, utils::platform::current_exe};
 /// ### `verge.yaml` schema
 #[derive(Default, Debug, Clone, Deserialize, Serialize)]
@@ -20,6 +22,9 @@ pub struct VergeConfig {
  /// enable traffic graph default is true
  pub traffic_graph: Option<bool>,
  /// clash tun mode
  pub enable_tun_mode: Option<bool>,
  /// can the app auto startup
  pub enable_auto_launch: Option<bool>,
@@ -36,17 +41,15 @@ pub struct VergeConfig {
  pub proxy_guard_duration: Option<u64>,
 }
 static VERGE_CONFIG: &str = "verge.yaml";
 impl VergeConfig {
  pub fn new() -> Self {
-    config::read_yaml::<VergeConfig>(dirs::app_home_dir().join(VERGE_CONFIG))
+    config::read_yaml::<VergeConfig>(dirs::verge_path())
  }
  /// Save Verge App Config
-  pub fn save_file(&self) -> Result<(), String> {
+  pub fn save_file(&self) -> Result<()> {
    config::save_yaml(
-      dirs::app_home_dir().join(VERGE_CONFIG),
+      dirs::verge_path(),
      self,
      Some("# The Config for Clash Verge App\n\n"),
    )
@@ -56,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>>,
@@ -122,13 +130,11 @@ impl Verge {
  }
  /// init the auto launch
-  pub fn init_launch(&mut self, package_info: &tauri::PackageInfo) {
+  pub fn init_launch(&mut self) {
-    let app_name = "clash-verge";
+    let app_exe = current_exe().unwrap();
-    let app_path = get_app_path(app_name);
+    let app_exe = dunce::canonicalize(app_exe).unwrap();
-    let app_path = resource_dir(package_info, &tauri::Env::default())
+    let app_name = app_exe.file_stem().unwrap().to_str().unwrap();
-      .unwrap()
+    let app_path = app_exe.as_os_str().to_str().unwrap();
      .join(app_path);
    let app_path = app_path.as_os_str().to_str().unwrap();
    let auto = AutoLaunchBuilder::new()
      .set_app_name(app_name)
@@ -139,30 +145,28 @@ impl Verge {
  }
  /// sync the startup when run the app
-  pub fn sync_launch(&self) -> Result<(), String> {
+  pub fn sync_launch(&self) -> Result<()> {
    let enable = self.config.enable_auto_launch.clone().unwrap_or(false);
    if !enable {
      return Ok(());
    }
    if self.auto_launch.is_none() {
-      return Err("should init the auto launch first".into());
+      bail!("should init the auto launch first");
    }
    let auto_launch = self.auto_launch.clone().unwrap();
    let is_enabled = auto_launch.is_enabled().unwrap_or(false);
    if !is_enabled {
-      if let Err(_) = auto_launch.enable() {
+      auto_launch.enable()?;
        return Err("failed to enable auto-launch".into());
      }
    }
    Ok(())
  }
  /// update the startup
-  fn update_launch(&mut self, enable: bool) -> Result<(), String> {
+  fn update_launch(&mut self, enable: bool) -> Result<()> {
    let conf_enable = self.config.enable_auto_launch.clone().unwrap_or(false);
    if enable == conf_enable {
@@ -171,24 +175,18 @@ impl Verge {
    let auto_launch = self.auto_launch.clone().unwrap();
-    let result = match enable {
+    match enable {
-      true => auto_launch.enable(),
+      true => auto_launch.enable()?,
-      false => auto_launch.disable(),
+      false => auto_launch.disable()?,
    };
-    match result {
+    Ok(())
      Ok(_) => Ok(()),
      Err(err) => {
        log::error!("{err}");
        Err("failed to set system startup info".into())
      }
    }
  }
  /// patch verge config
  /// There should be only one update at a time here
  /// so call the save_file at the end is savely
-  pub fn patch_config(&mut self, patch: VergeConfig) -> Result<(), String> {
+  pub fn patch_config(&mut self, patch: VergeConfig) -> Result<()> {
    // only change it
    if patch.theme_mode.is_some() {
      self.config.theme_mode = patch.theme_mode;
@@ -217,7 +215,7 @@ impl Verge {
          self.cur_sysproxy = Some(sysproxy);
          log::error!("failed to set system proxy");
-          return Err("failed to set system proxy".into());
+          bail!("failed to set system proxy");
        }
        self.cur_sysproxy = Some(sysproxy);
      }
@@ -236,7 +234,7 @@ impl Verge {
            self.cur_sysproxy = Some(sysproxy);
            log::error!("failed to set system proxy");
-            return Err("failed to set system proxy".into());
+            bail!("failed to set system proxy");
          }
        }
@@ -260,6 +258,11 @@ impl Verge {
      Verge::guard_proxy(self.guard_state.clone());
    }
    // handle the tun mode
    if patch.enable_tun_mode.is_some() {
      self.config.enable_tun_mode = patch.enable_tun_mode;
    }
    self.config.save_file()
  }
 }
@@ -285,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();
@@ -301,7 +304,7 @@ impl Verge {
          break;
        }
-        log::info!("[Guard]: try to guard proxy");
+        log::info!("try to guard proxy");
        let clash = Clash::new();
@@ -310,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"),
        }
      }
@@ -324,14 +324,3 @@ impl Verge {
    });
  }
 }
 // Get the target app_path
 fn get_app_path(app_name: &str) -> String {
  #[cfg(target_os = "linux")]
  let ext = "";
  #[cfg(target_os = "macos")]
  let ext = "";
  #[cfg(target_os = "windows")]
  let ext = ".exe";
  String::from(app_name) + ext
 }
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -19,18 +19,19 @@ fn main() -> std::io::Result<()> {
    return Ok(());
  }
-  let menu = SystemTrayMenu::new()
+  let tray_menu = SystemTrayMenu::new()
    .add_item(CustomMenuItem::new("open_window", "Show"))
    .add_item(CustomMenuItem::new("restart_clash", "Restart Clash"))
    .add_native_item(SystemTrayMenuItem::Separator)
    .add_item(CustomMenuItem::new("quit", "Quit").accelerator("CmdOrControl+Q"));
-  tauri::Builder::default()
+  #[allow(unused_mut)]
  let mut builder = tauri::Builder::default()
    .manage(states::VergeState::default())
    .manage(states::ClashState::default())
    .manage(states::ProfilesState::default())
    .setup(|app| Ok(resolve::resolve_setup(app)))
-    .system_tray(SystemTray::new().with_menu(menu))
+    .system_tray(SystemTray::new().with_menu(tray_menu))
    .on_system_tray_event(move |app_handle, event| match event {
      SystemTrayEvent::MenuItemClick { id, .. } => match id.as_str() {
        "open_window" => {
@@ -93,7 +94,26 @@ fn main() -> std::io::Result<()> {
      cmds::select_profile,
      cmds::get_profiles,
      cmds::sync_profiles,
-    ])
+    ]);
  #[cfg(target_os = "macos")]
  {
    use tauri::{Menu, MenuItem, Submenu};
    let submenu_file = Submenu::new(
      "File",
      Menu::new()
        .add_native_item(MenuItem::Undo)
        .add_native_item(MenuItem::Redo)
        .add_native_item(MenuItem::Copy)
        .add_native_item(MenuItem::Paste)
        .add_native_item(MenuItem::Cut)
        .add_native_item(MenuItem::SelectAll),
    );
    builder = builder.menu(Menu::new().add_submenu(submenu_file));
  }
  builder
    .build(tauri::generate_context!())
    .expect("error while running tauri application")
    .run(|app_handle, e| match e {
--- a/src-tauri/src/utils/config.rs
+++ b/src-tauri/src/utils/config.rs
@@ -1,3 +1,4 @@
 use anyhow::{Context, Result};
 use serde::{de::DeserializeOwned, Serialize};
 use std::{fs, path::PathBuf};
@@ -7,26 +8,16 @@ pub fn read_yaml<T: DeserializeOwned + Default>(path: PathBuf) -> T {
  serde_yaml::from_str::<T>(&yaml_str).unwrap_or(T::default())
 }
-/// - save the data to the file
+/// save the data to the file
-/// - can set `prefix` string to add some comments
+/// can set `prefix` string to add some comments
-pub fn save_yaml<T: Serialize>(
+pub fn save_yaml<T: Serialize>(path: PathBuf, data: &T, prefix: Option<&str>) -> Result<()> {
-  path: PathBuf,
+  let data_str = serde_yaml::to_string(data)?;
  data: &T,
  prefix: Option<&str>,
 ) -> Result<(), String> {
  match serde_yaml::to_string(data) {
    Ok(data_str) => {
      let yaml_str = match prefix {
        Some(prefix) => format!("{}{}", prefix, data_str),
        None => data_str,
      };
-      let path_str = path.as_os_str().to_string_lossy().to_string();
+  let yaml_str = match prefix {
-      match fs::write(path, yaml_str.as_bytes()) {
+    Some(prefix) => format!("{prefix}{data_str}"),
-        Ok(_) => Ok(()),
+    None => data_str,
-        Err(_) => Err(format!("can not save file `{}`", path_str)),
+  };
-      }
+
-    }
+  let path_str = path.as_os_str().to_string_lossy().to_string();
-    Err(_) => Err("can not convert the data to yaml".into()),
+  fs::write(path, yaml_str.as_bytes()).context(format!("failed to save file \"{path_str}\""))
  }
 }
--- a/src-tauri/src/utils/dirs.rs
+++ b/src-tauri/src/utils/dirs.rs
@@ -1,3 +1,4 @@
 use std::env::temp_dir;
 use std::path::{Path, PathBuf};
 use tauri::{
  api::path::{home_dir, resource_dir},
@@ -18,3 +19,34 @@ pub fn app_resources_dir(package_info: &PackageInfo) -> PathBuf {
    .unwrap()
    .join("resources")
 }
 /// profiles dir
 pub fn app_profiles_dir() -> PathBuf {
  app_home_dir().join("profiles")
 }
 /// logs dir
 pub fn app_logs_dir() -> PathBuf {
  app_home_dir().join("logs")
 }
 static CLASH_CONFIG: &str = "config.yaml";
 static VERGE_CONFIG: &str = "verge.yaml";
 static PROFILE_YAML: &str = "profiles.yaml";
 static PROFILE_TEMP: &str = "clash-verge-runtime.yaml";
 pub fn clash_path() -> PathBuf {
  app_home_dir().join(CLASH_CONFIG)
 }
 pub fn verge_path() -> PathBuf {
  app_home_dir().join(VERGE_CONFIG)
 }
 pub fn profiles_path() -> PathBuf {
  app_home_dir().join(PROFILE_YAML)
 }
 pub fn profiles_temp_path() -> PathBuf {
  temp_dir().join(PROFILE_TEMP)
 }
--- a/src-tauri/src/utils/fetch.rs
+++ b/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);
 }
--- a/src-tauri/src/utils/help.rs
+++ b/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);
 }
--- a/src-tauri/src/utils/init.rs
+++ b/src-tauri/src/utils/init.rs
@@ -1,13 +1,11 @@
 extern crate serde_yaml;
 use crate::utils::{dirs, tmpl};
 use chrono::Local;
 use log::LevelFilter;
 use log4rs::append::console::ConsoleAppender;
 use log4rs::append::file::FileAppender;
-use log4rs::config::{Appender, Config, Root};
+use log4rs::config::{Appender, Config, Logger, Root};
 use log4rs::encode::pattern::PatternEncoder;
-use std::fs::{self, File};
+use std::fs;
 use std::io::Write;
 use std::path::PathBuf;
 use tauri::PackageInfo;
@@ -30,11 +28,13 @@ fn init_log(log_dir: &PathBuf) {
  let config = Config::builder()
    .appender(Appender::builder().build("stdout", Box::new(stdout)))
    .appender(Appender::builder().build("file", Box::new(tofile)))
-    .build(
+    .logger(
-      Root::builder()
+      Logger::builder()
-        .appenders(["stdout", "file"])
+        .appender("file")
-        .build(LevelFilter::Debug),
+        .additive(false)
        .build("app", LevelFilter::Info),
    )
    .build(Root::builder().appender("stdout").build(LevelFilter::Info))
    .unwrap();
  log4rs::init_config(config).unwrap();
@@ -48,13 +48,13 @@ fn init_config(app_dir: &PathBuf) -> std::io::Result<()> {
  let profile_path = app_dir.join("profiles.yaml");
  if !clash_path.exists() {
-    File::create(clash_path)?.write(tmpl::CLASH_CONFIG)?;
+    fs::File::create(clash_path)?.write(tmpl::CLASH_CONFIG)?;
  }
  if !verge_path.exists() {
-    File::create(verge_path)?.write(tmpl::VERGE_CONFIG)?;
+    fs::File::create(verge_path)?.write(tmpl::VERGE_CONFIG)?;
  }
  if !profile_path.exists() {
-    File::create(profile_path)?.write(tmpl::PROFILES_CONFIG)?;
+    fs::File::create(profile_path)?.write(tmpl::PROFILES_CONFIG)?;
  }
  Ok(())
 }
@@ -63,8 +63,8 @@ fn init_config(app_dir: &PathBuf) -> std::io::Result<()> {
 pub fn init_app(package_info: &PackageInfo) {
  // create app dir
  let app_dir = dirs::app_home_dir();
-  let log_dir = app_dir.join("logs");
+  let log_dir = dirs::app_logs_dir();
-  let profiles_dir = app_dir.join("profiles");
+  let profiles_dir = dirs::app_profiles_dir();
  let res_dir = dirs::app_resources_dir(package_info);
--- a/src-tauri/src/utils/mod.rs
+++ b/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;
--- a/src-tauri/src/utils/resolve.rs
+++ b/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,20 +21,23 @@ 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_if_err!(clash.activate(&profiles));
    log::error!("{}", err);
  }
  verge.init_sysproxy(clash.info.port.clone());
-  verge.init_launch(app.package_info());
+  // enable tun mode
-  if let Err(err) = verge.sync_launch() {
+  if verge.config.enable_tun_mode.clone().unwrap_or(false)
-    log::error!("{}", err);
+    && verge.cur_sysproxy.is_some()
    && verge.cur_sysproxy.as_ref().unwrap().enable
  {
    log::info!("enable tun mode");
    clash.tun_mode(true).unwrap();
  }
  verge.init_launch();
  log_if_err!(verge.sync_launch());
 }
 /// reset system proxy
--- a/src-tauri/src/utils/tmpl.rs
+++ b/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,7 +32,7 @@ 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_CONFIG: &str = "# Profile Template for clash verge\n\n
 # proxies defination (optional, the same as clash)
 proxies:\n
 # proxy-groups (optional, the same as clash)
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
  "package": {
    "productName": "clash-verge",
-    "version": "0.0.16"
+    "version": "0.0.20"
  },
  "build": {
    "distDir": "../dist",
--- a/src/components/layout/layout-traffic.tsx
+++ b/src/components/layout/layout-traffic.tsx
@@ -3,22 +3,37 @@ import { useEffect, useState } from "react";
 import { useRecoilValue } from "recoil";
 import { Box, Typography } from "@mui/material";
 import { ArrowDownward, ArrowUpward } from "@mui/icons-material";
 import { listen } from "@tauri-apps/api/event";
 import { ApiType } from "../../services/types";
 import { getInfomation } from "../../services/api";
 import { getVergeConfig } from "../../services/cmds";
-import { atomClashPort } from "../../states/setting";
+import { atomClashPort } from "../../services/states";
-import parseTraffic from "../../utils/parse-traffic";
+import useLogSetup from "./use-log-setup";
 import useTrafficGraph from "./use-traffic-graph";
 import parseTraffic from "../../utils/parse-traffic";
 const LayoutTraffic = () => {
  const portValue = useRecoilValue(atomClashPort);
  const [traffic, setTraffic] = useState({ up: 0, down: 0 });
  const { canvasRef, appendData, toggleStyle } = useTrafficGraph();
  const [refresh, setRefresh] = useState({});
  // whether hide traffic graph
  const { data } = useSWR("getVergeConfig", getVergeConfig);
  const trafficGraph = data?.traffic_graph ?? true;
  // setup log ws during layout
  useLogSetup();
  useEffect(() => {
    let unlisten: () => void = null!;
    // should reconnect the traffic ws
    listen("restart_clash", () => setRefresh({})).then((fn) => (unlisten = fn));
    return () => unlisten?.();
  }, []);
  useEffect(() => {
    let ws: WebSocket | null = null;
@@ -34,7 +49,7 @@ const LayoutTraffic = () => {
    });
    return () => ws?.close();
-  }, [portValue]);
+  }, [portValue, refresh]);
  const [up, upUnit] = parseTraffic(traffic.up);
  const [down, downUnit] = parseTraffic(traffic.down);
--- a/src/components/layout/use-log-setup.ts
+++ b/src/components/layout/use-log-setup.ts
@@ -0,0 +1,49 @@
 import dayjs from "dayjs";
 import { useEffect } from "react";
 import { useSetRecoilState } from "recoil";
 import { listen } from "@tauri-apps/api/event";
 import { ApiType } from "../../services/types";
 import { getInfomation } from "../../services/api";
 import { atomLogData } from "../../services/states";
 const MAX_LOG_NUM = 1000;
 // setup the log websocket
 export default function useLogSetup() {
  const setLogData = useSetRecoilState(atomLogData);
  useEffect(() => {
    let ws: WebSocket = null!;
    let unlisten: () => void = null!;
    const handler = (event: MessageEvent<any>) => {
      const data = JSON.parse(event.data) as ApiType.LogItem;
      const time = dayjs().format("MM-DD HH:mm:ss");
      setLogData((l) => {
        if (l.length >= MAX_LOG_NUM) l.shift();
        return [...l, { ...data, time }];
      });
    };
    (async () => {
      const { server = "", secret = "" } = await getInfomation();
      ws = new WebSocket(`ws://${server}/logs?token=${secret}`);
      ws.addEventListener("message", handler);
      // reconnect the websocket
      unlisten = await listen("restart_clash", async () => {
        const { server = "", secret = "" } = await getInfomation();
        ws?.close();
        ws = new WebSocket(`ws://${server}/logs?token=${secret}`);
        ws.addEventListener("message", handler);
      });
    })();
    return () => {
      ws?.close();
      unlisten?.();
    };
  }, []);
 }
--- a/src/components/profile/profile-edit.tsx
+++ b/src/components/profile/profile-edit.tsx
@@ -0,0 +1,93 @@
 import { useEffect, useState } from "react";
 import { useLockFn } from "ahooks";
 import { mutate } from "swr";
 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;
  // todo: more type
  const [name, setName] = useState(itemData.name);
  const [desc, setDesc] = useState(itemData.desc);
  const [url, setUrl] = useState(itemData.url);
  useEffect(() => {
    if (itemData) {
      setName(itemData.name);
      setDesc(itemData.desc);
      setUrl(itemData.url);
    }
  }, [itemData]);
  const onUpdate = useLockFn(async () => {
    try {
      const { uid } = itemData;
      await patchProfile(uid, { uid, name, desc, url });
      mutate("getProfiles");
      onClose();
    } catch (err: any) {
      Notice.error(err?.message || err?.toString());
    }
  });
  return (
    <Dialog open={open} onClose={onClose}>
      <DialogTitle>Edit Profile</DialogTitle>
      <DialogContent sx={{ width: 360, pb: 0.5 }}>
        <TextField
          autoFocus
          fullWidth
          label="Name"
          margin="dense"
          variant="outlined"
          value={name}
          onChange={(e) => setName(e.target.value)}
        />
        <TextField
          fullWidth
          label="Descriptions"
          margin="normal"
          variant="outlined"
          value={desc}
          onChange={(e) => setDesc(e.target.value)}
        />
        <TextField
          fullWidth
          label="Remote URL"
          margin="normal"
          variant="outlined"
          value={url}
          onChange={(e) => setUrl(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;
--- a/src/components/profile/profile-item.tsx
+++ b/src/components/profile/profile-item.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import dayjs from "dayjs";
 import {
  alpha,
@@ -11,13 +11,15 @@ 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);
@@ -37,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 { 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 });
@@ -65,10 +69,20 @@ 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());
    }
@@ -84,29 +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 deleteRef = useRef(false);
+  const onDelete = useLockFn(async () => {
  const onDelete = async () => {
    setAnchorEl(null);
-    if (deleteRef.current) return;
+
    deleteRef.current = true;
    try {
-      await deleteProfile(index);
+      await deleteProfile(itemData.uid);
      mutate("getProfiles");
    } catch (err: any) {
-      Notice.error(err.toString());
+      Notice.error(err?.message || err.toString());
    } finally {
      deleteRef.current = false;
    }
-  };
+  });
  const handleContextMenu = (
    event: React.MouseEvent<HTMLDivElement, MouseEvent>
@@ -126,6 +136,7 @@ const ProfileItem: React.FC<Props> = (props) => {
  const urlModeMenu = [
    { label: "Select", handler: onForceSelect },
    { label: "Edit", handler: onEdit },
    { label: "View", handler: onView },
    { label: "Update", handler: onUpdateWrapper(false) },
    { label: "Update(Proxy)", handler: onUpdateWrapper(true) },
@@ -133,7 +144,8 @@ const ProfileItem: React.FC<Props> = (props) => {
  ];
  const fileModeMenu = [
    { label: "Select", handler: onForceSelect },
-    { label: "Edit", handler: onView },
+    { label: "Edit", handler: onEdit },
    { label: "View", handler: onView },
    { label: "Delete", handler: onDelete },
  ];
@@ -264,6 +276,12 @@ const ProfileItem: React.FC<Props> = (props) => {
          </MenuItem>
        ))}
      </Menu>
      <ProfileEdit
        open={editOpen}
        itemData={itemData}
        onClose={() => setEditOpen(false)}
      />
    </>
  );
 };
--- a/src/components/proxy/proxy-global.tsx
+++ b/src/components/proxy/proxy-global.tsx
@@ -0,0 +1,150 @@
 import { useEffect, useRef, useState } from "react";
 import { useSWRConfig } from "swr";
 import { useLockFn } from "ahooks";
 import { Virtuoso } from "react-virtuoso";
 import { Box, IconButton, TextField } from "@mui/material";
 import {
  MyLocationRounded,
  NetworkCheckRounded,
  FilterAltRounded,
  FilterAltOffRounded,
  VisibilityRounded,
  VisibilityOffRounded,
 } from "@mui/icons-material";
 import { ApiType } from "../../services/types";
 import { updateProxy } from "../../services/api";
 import delayManager from "../../services/delay";
 import useFilterProxy from "./use-filter-proxy";
 import ProxyItem from "./proxy-item";
 interface Props {
  groupName: string;
  curProxy?: string;
  proxies: ApiType.ProxyItem[];
 }
 const ProxyGlobal = (props: Props) => {
  const { groupName, curProxy, proxies } = props;
  const { mutate } = useSWRConfig();
  const [now, setNow] = useState(curProxy || "DIRECT");
  const [showType, setShowType] = useState(true);
  const [showFilter, setShowFilter] = useState(false);
  const [filterText, setFilterText] = useState("");
  const virtuosoRef = useRef<any>();
  const filterProxies = useFilterProxy(proxies, groupName, filterText);
  const onChangeProxy = useLockFn(async (name: string) => {
    await updateProxy("GLOBAL", name);
    mutate("getProxies");
    setNow(name);
  });
  const onLocation = (smooth = true) => {
    const index = filterProxies.findIndex((p) => p.name === now);
    if (index >= 0) {
      virtuosoRef.current?.scrollToIndex?.({
        index,
        align: "center",
        behavior: smooth ? "smooth" : "auto",
      });
    }
  };
  const onCheckAll = useLockFn(async () => {
    const names = filterProxies.map((p) => p.name);
    await delayManager.checkListDelay(
      { names, groupName, skipNum: 8, maxTimeout: 600 },
      () => mutate("getProxies")
    );
    mutate("getProxies");
  });
  useEffect(() => onLocation(false), [groupName]);
  useEffect(() => {
    if (!showFilter) setFilterText("");
  }, [showFilter]);
  useEffect(() => {
    if (groupName === "DIRECT") setNow("DIRECT");
    if (groupName === "GLOBAL") setNow(curProxy || "DIRECT");
  }, [groupName, curProxy]);
  return (
    <>
      <Box
        sx={{
          px: 3,
          my: 0.5,
          display: "flex",
          alignItems: "center",
          button: { mr: 0.5 },
        }}
      >
        <IconButton
          size="small"
          title="location"
          onClick={() => onLocation(true)}
        >
          <MyLocationRounded />
        </IconButton>
        <IconButton size="small" title="check" onClick={onCheckAll}>
          <NetworkCheckRounded />
        </IconButton>
        <IconButton
          size="small"
          title="check"
          onClick={() => setShowType(!showType)}
        >
          {showType ? <VisibilityRounded /> : <VisibilityOffRounded />}
        </IconButton>
        <IconButton
          size="small"
          title="check"
          onClick={() => setShowFilter(!showFilter)}
        >
          {showFilter ? <FilterAltRounded /> : <FilterAltOffRounded />}
        </IconButton>
        {showFilter && (
          <TextField
            autoFocus
            hiddenLabel
            value={filterText}
            size="small"
            variant="outlined"
            placeholder="Filter conditions"
            onChange={(e) => setFilterText(e.target.value)}
            sx={{ ml: 0.5, flex: "1 1 auto", input: { py: 0.65, px: 1 } }}
          />
        )}
      </Box>
      <Virtuoso
        ref={virtuosoRef}
        style={{ height: "calc(100% - 40px)" }}
        totalCount={filterProxies.length}
        itemContent={(index) => (
          <ProxyItem
            groupName={groupName}
            proxy={filterProxies[index]}
            selected={filterProxies[index].name === now}
            showType={showType}
            onClick={onChangeProxy}
            sx={{ py: 0, px: 2 }}
          />
        )}
      />
    </>
  );
 };
 export default ProxyGlobal;
--- a/src/components/proxy/proxy-group.tsx
+++ b/src/components/proxy/proxy-group.tsx
@@ -1,5 +1,6 @@
-import { useRef, useState } from "react";
+import useSWR, { useSWRConfig } from "swr";
-import { useSWRConfig } from "swr";
+import { useEffect, useRef, useState } from "react";
 import { useLockFn } from "ahooks";
 import { Virtuoso } from "react-virtuoso";
 import {
  Box,
@@ -9,6 +10,7 @@ import {
  List,
  ListItem,
  ListItemText,
  TextField,
 } from "@mui/material";
 import {
  SendRounded,
@@ -16,11 +18,16 @@ import {
  ExpandMoreRounded,
  MyLocationRounded,
  NetworkCheckRounded,
  FilterAltRounded,
  FilterAltOffRounded,
  VisibilityRounded,
  VisibilityOffRounded,
 } from "@mui/icons-material";
 import { ApiType } from "../../services/types";
 import { updateProxy } from "../../services/api";
 import { getProfiles, patchProfile } from "../../services/cmds";
 import delayManager from "../../services/delay";
 import useFilterProxy from "./use-filter-proxy";
 import ProxyItem from "./proxy-item";
 interface Props {
@@ -31,18 +38,20 @@ const ProxyGroup = ({ group }: Props) => {
  const { mutate } = useSWRConfig();
  const [open, setOpen] = useState(false);
  const [now, setNow] = useState(group.now);
  const [showType, setShowType] = useState(false);
  const [showFilter, setShowFilter] = useState(false);
  const [filterText, setFilterText] = useState("");
  const virtuosoRef = useRef<any>();
  const proxies = group.all ?? [];
  const virtuosoRef = useRef<any>();
  const filterProxies = useFilterProxy(proxies, group.name, filterText);
-  const selectLockRef = useRef(false);
+  const { data: profiles } = useSWR("getProfiles", getProfiles);
-  const onSelect = async (name: string) => {
+
  const onChangeProxy = useLockFn(async (name: string) => {
    // Todo: support another proxy group type
    if (group.type !== "Selector") return;
    if (selectLockRef.current) return;
    selectLockRef.current = true;
    const oldValue = now;
    try {
      setNow(name);
@@ -50,13 +59,10 @@ const ProxyGroup = ({ group }: Props) => {
    } catch {
      setNow(oldValue);
      return; // do not update profile
    } finally {
      selectLockRef.current = false;
    }
    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 = [];
@@ -69,46 +75,46 @@ 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);
    }
-  };
+  });
-  const onLocation = () => {
+  const onLocation = (smooth = true) => {
-    const index = proxies.findIndex((p) => p.name === now);
+    const index = filterProxies.findIndex((p) => p.name === now);
    if (index >= 0) {
      virtuosoRef.current?.scrollToIndex?.({
        index,
        align: "center",
-        behavior: "smooth",
+        behavior: smooth ? "smooth" : "auto",
      });
    }
  };
-  const checkLockRef = useRef(false);
+  const onCheckAll = useLockFn(async () => {
-  const onCheckAll = async () => {
+    const names = filterProxies.map((p) => p.name);
-    if (checkLockRef.current) return;
+    const groupName = group.name;
    checkLockRef.current = true;
-    // rerender quickly
+    await delayManager.checkListDelay(
-    if (proxies.length) setTimeout(() => mutate("getProxies"), 500);
+      { names, groupName, skipNum: 8, maxTimeout: 600 },
      () => mutate("getProxies")
    );
-    let names = proxies.map((p) => p.name);
+    mutate("getProxies");
-    while (names.length) {
+  });
      const list = names.slice(0, 8);
      names = names.slice(8);
-      await Promise.all(
+  useEffect(() => {
-        list.map((n) => delayManager.checkDelay(n, group.name))
+    if (!showFilter) setFilterText("");
-      );
+  }, [showFilter]);
-      mutate("getProxies");
+  // auto scroll to current index
  useEffect(() => {
    if (open) {
      setTimeout(() => onLocation(false), 5);
    }
-
+  }, [open]);
    checkLockRef.current = false;
  };
  return (
    <>
@@ -130,27 +136,84 @@ const ProxyGroup = ({ group }: Props) => {
      </ListItem>
      <Collapse in={open} timeout="auto" unmountOnExit>
-        <Box sx={{ pl: 4, pr: 3, my: 0.5 }}>
+        <Box
-          <IconButton size="small" title="location" onClick={onLocation}>
+          sx={{
            pl: 4,
            pr: 3,
            my: 0.5,
            display: "flex",
            alignItems: "center",
            button: { mr: 0.5 },
          }}
        >
          <IconButton
            size="small"
            title="location"
            onClick={() => onLocation(true)}
          >
            <MyLocationRounded />
          </IconButton>
          <IconButton size="small" title="check" onClick={onCheckAll}>
            <NetworkCheckRounded />
          </IconButton>
          <IconButton
            size="small"
            title="check"
            onClick={() => setShowType(!showType)}
          >
            {showType ? <VisibilityRounded /> : <VisibilityOffRounded />}
          </IconButton>
          <IconButton
            size="small"
            title="check"
            onClick={() => setShowFilter(!showFilter)}
          >
            {showFilter ? <FilterAltRounded /> : <FilterAltOffRounded />}
          </IconButton>
          {showFilter && (
            <TextField
              autoFocus
              hiddenLabel
              value={filterText}
              size="small"
              variant="outlined"
              placeholder="Filter conditions"
              onChange={(e) => setFilterText(e.target.value)}
              sx={{ ml: 0.5, flex: "1 1 auto", input: { py: 0.65, px: 1 } }}
            />
          )}
        </Box>
-        {proxies.length >= 10 ? (
+        {!filterProxies.length && (
          <Box
            sx={{
              py: 3,
              fontSize: 18,
              textAlign: "center",
              color: "text.secondary",
            }}
          >
            Empty
          </Box>
        )}
        {filterProxies.length >= 10 ? (
          <Virtuoso
            ref={virtuosoRef}
            style={{ height: "320px", marginBottom: "4px" }}
-            totalCount={proxies.length}
+            totalCount={filterProxies.length}
            itemContent={(index) => (
              <ProxyItem
                groupName={group.name}
-                proxy={proxies[index]}
+                proxy={filterProxies[index]}
-                selected={proxies[index].name === now}
+                selected={filterProxies[index].name === now}
                showType={showType}
                sx={{ py: 0, pl: 4 }}
-                onClick={onSelect}
+                onClick={onChangeProxy}
              />
            )}
          />
@@ -160,14 +223,15 @@ const ProxyGroup = ({ group }: Props) => {
            disablePadding
            sx={{ maxHeight: "320px", overflow: "auto", mb: "4px" }}
          >
-            {proxies.map((proxy) => (
+            {filterProxies.map((proxy) => (
              <ProxyItem
                key={proxy.name}
                groupName={group.name}
                proxy={proxy}
                selected={proxy.name === now}
                showType={showType}
                sx={{ py: 0, pl: 4 }}
-                onClick={onSelect}
+                onClick={onChangeProxy}
              />
            ))}
          </List>
--- a/src/components/proxy/proxy-item.tsx
+++ b/src/components/proxy/proxy-item.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { CheckCircleOutlineRounded } from "@mui/icons-material";
 import {
  alpha,
@@ -18,6 +18,7 @@ interface Props {
  groupName: string;
  proxy: ApiType.ProxyItem;
  selected: boolean;
  showType?: boolean;
  sx?: SxProps<Theme>;
  onClick?: (name: string) => void;
 }
@@ -27,8 +28,20 @@ const Widget = styled(Box)(() => ({
  fontSize: 14,
 }));
 const TypeBox = styled(Box)(({ theme }) => ({
  display: "inline-block",
  border: "1px solid #ccc",
  borderColor: alpha(theme.palette.text.secondary, 0.36),
  color: alpha(theme.palette.text.secondary, 0.42),
  borderRadius: 4,
  fontSize: 10,
  marginLeft: 4,
  padding: "0 2px",
  lineHeight: 1.25,
 }));
 const ProxyItem = (props: Props) => {
-  const { groupName, proxy, selected, sx, onClick } = props;
+  const { groupName, proxy, selected, showType = true, sx, onClick } = props;
  const [delay, setDelay] = useState(-1);
  useEffect(() => {
@@ -37,14 +50,19 @@ const ProxyItem = (props: Props) => {
    }
  }, [proxy]);
  const delayRef = useRef(false);
  const onDelay = (e: any) => {
    e.preventDefault();
    e.stopPropagation();
    if (delayRef.current) return;
    delayRef.current = true;
    delayManager
      .checkDelay(proxy.name, groupName)
      .then((result) => setDelay(result))
-      .catch(() => setDelay(1e6));
+      .catch(() => setDelay(1e6))
      .finally(() => (delayRef.current = false));
  };
  return (
@@ -78,7 +96,17 @@ const ProxyItem = (props: Props) => {
          },
        ]}
      >
-        <ListItemText title={proxy.name} secondary={proxy.name} />
+        <ListItemText
          title={proxy.name}
          secondary={
            <>
              {proxy.name}
              {showType && <TypeBox>{proxy.type}</TypeBox>}
              {showType && proxy.udp && <TypeBox>UDP</TypeBox>}
            </>
          }
        />
        <ListItemIcon
          sx={{ justifyContent: "flex-end", color: "primary.main" }}
--- a/src/components/proxy/use-filter-proxy.ts
+++ b/src/components/proxy/use-filter-proxy.ts
@@ -0,0 +1,49 @@
 import { useMemo } from "react";
 import { ApiType } from "../../services/types";
 import delayManager from "../../services/delay";
 const regex1 = /delay([=<>])(\d+|timeout|error)/i;
 const regex2 = /type=(.*)/i;
 /**
 * filter the proxy
 * according to the regular conditions
 */
 export default function useFilterProxy(
  proxies: ApiType.ProxyItem[],
  groupName: string,
  filterText: string
 ) {
  return useMemo(() => {
    if (!filterText) return proxies;
    const res1 = regex1.exec(filterText);
    if (res1) {
      const symbol = res1[1];
      const symbol2 = res1[2].toLowerCase();
      const value =
        symbol2 === "error" ? 1e5 : symbol2 === "timeout" ? 3000 : +symbol2;
      return proxies.filter((p) => {
        const delay = delayManager.getDelay(p.name, groupName);
        if (delay < 0) return false;
        if (symbol === "=" && symbol2 === "error") return delay >= 1e5;
        if (symbol === "=" && symbol2 === "timeout")
          return delay < 1e5 && delay >= 3000;
        if (symbol === "=") return delay == value;
        if (symbol === "<") return delay <= value;
        if (symbol === ">") return delay >= value;
        return false;
      });
    }
    const res2 = regex2.exec(filterText);
    if (res2) {
      const type = res2[1].toLowerCase();
      return proxies.filter((p) => p.type.toLowerCase().includes(type));
    }
    return proxies.filter((p) => p.name.includes(filterText.trim()));
  }, [proxies, groupName, filterText]);
 }
--- a/src/components/setting/guard-state.tsx
+++ b/src/components/setting/guard-state.tsx
@@ -5,6 +5,7 @@ interface Props<Value> {
  value?: Value;
  valueProps?: string;
  onChangeProps?: string;
  waitTime?: number;
  onChange?: (value: Value) => void;
  onFormat?: (...args: any[]) => Value;
  onGuard?: (value: Value, oldValue: Value) => Promise<void>;
@@ -18,6 +19,7 @@ function GuardState<T>(props: Props<T>) {
    children,
    valueProps = "value",
    onChangeProps = "onChange",
    waitTime = 0, // debounce wait time default 0
    onGuard = noop,
    onCatch = noop,
    onChange = noop,
@@ -25,34 +27,61 @@ function GuardState<T>(props: Props<T>) {
  } = props;
  const lockRef = useRef(false);
  const saveRef = useRef(value);
  const lastRef = useRef(0);
  const timeRef = useRef<any>();
-  if (isValidElement(children)) {
+  if (!isValidElement(children)) {
-    const childProps = { ...children.props };
+    return children as any;
    childProps[valueProps] = value;
    childProps[onChangeProps] = async (...args: any[]) => {
      // 多次操作无效
      if (lockRef.current) return;
      lockRef.current = true;
      const oldValue = value;
      try {
        const newValue = (onFormat as any)(...args);
        // 先在ui上响应操作
        onChange(newValue);
        await onGuard(newValue, oldValue!);
      } catch (err: any) {
        // 状态回退
        onChange(oldValue!);
        onCatch(err);
      }
      lockRef.current = false;
    };
    return cloneElement(children, childProps);
  }
-  return children as any;
+  const childProps = { ...children.props };
  childProps[valueProps] = value;
  childProps[onChangeProps] = async (...args: any[]) => {
    // 多次操作无效
    if (lockRef.current) return;
    lockRef.current = true;
    try {
      const newValue = (onFormat as any)(...args);
      // 先在ui上响应操作
      onChange(newValue);
      const now = Date.now();
      // save the old value
      if (waitTime <= 0 || now - lastRef.current >= waitTime) {
        saveRef.current = value;
      }
      lastRef.current = now;
      if (waitTime <= 0) {
        await onGuard(newValue, value!);
      } else {
        // debounce guard
        clearTimeout(timeRef.current);
        timeRef.current = setTimeout(async () => {
          try {
            await onGuard(newValue, saveRef.current!);
          } catch (err: any) {
            // 状态回退
            onChange(saveRef.current!);
            onCatch(err);
          }
        }, waitTime);
      }
    } catch (err: any) {
      // 状态回退
      onChange(saveRef.current!);
      onCatch(err);
    }
    lockRef.current = false;
  };
  return cloneElement(children, childProps);
 }
 export default GuardState;
--- a/src/components/setting/setting-clash.tsx
+++ b/src/components/setting/setting-clash.tsx
@@ -1,7 +1,5 @@
 import { useEffect, useState } from "react";
 import { useDebounceFn } from "ahooks";
 import { useSetRecoilState } from "recoil";
 import useSWR, { useSWRConfig } from "swr";
 import { useSetRecoilState } from "recoil";
 import {
  ListItemText,
  TextField,
@@ -11,7 +9,7 @@ import {
  Typography,
 } from "@mui/material";
 import { ApiType } from "../../services/types";
-import { atomClashPort } from "../../states/setting";
+import { atomClashPort } from "../../services/states";
 import { patchClashConfig } from "../../services/cmds";
 import { SettingList, SettingItem } from "./setting";
 import { getClashConfig, getVersion, updateConfigs } from "../../services/api";
@@ -25,18 +23,16 @@ interface Props {
 const SettingClash = ({ onError }: Props) => {
  const { mutate } = useSWRConfig();
  const { data: clashConfig } = useSWR("getClashConfig", getClashConfig);
  const { data: versionData } = useSWR("getVersion", getVersion);
  const {
    ipv6 = false,
    "allow-lan": allowLan = false,
    "log-level": logLevel = "silent",
-    "mixed-port": thePort = 0,
+    "mixed-port": mixedPort = 0,
  } = clashConfig ?? {};
-  const setPort = useSetRecoilState(atomClashPort);
+  const setGlobalClashPort = useSetRecoilState(atomClashPort);
  const [mixedPort, setMixedPort] = useState(thePort);
  useEffect(() => setMixedPort(thePort), [thePort]);
  const onSwitchFormat = (_e: any, value: boolean) => value;
  const onChangeData = (patch: Partial<ApiType.ConfigData>) => {
@@ -47,35 +43,25 @@ const SettingClash = ({ onError }: Props) => {
    await patchClashConfig(patch);
  };
-  // restart clash when port is changed
+  const onUpdatePort = async (port: number) => {
-  const { run: onUpdatePort } = useDebounceFn(
+    if (port < 1000) {
-    async (port: number) => {
+      throw new Error("The port should not < 1000");
-      try {
+    }
-        if (port < 1000) {
+    if (port > 65536) {
-          throw new Error("The port should not < 1000");
+      throw new Error("The port should not > 65536");
-        }
+    }
-        if (port > 65536) {
+    await patchClashConfig({ "mixed-port": port });
-          throw new Error("The port should not > 65536");
+    setGlobalClashPort(port);
-        }
+    Notice.success("Change Clash port successfully!");
-        await patchClashConfig({ "mixed-port": port });
+
-        onChangeData({ "mixed-port": port });
+    // update the config
-        setPort(port);
+    mutate("getClashConfig");
-        Notice.success("Change Clash port successfully!");
+  };
      } catch (err: any) {
        setMixedPort(thePort); // back to old port value
        Notice.error(err.message ?? err.toString());
      }
    },
    { wait: 1000 }
  );
  // get clash core version
-  const [clashVer, setClashVer] = useState("");
+  const clashVer = versionData?.premium
-  useEffect(() => {
+    ? `${versionData.version} Premium`
-    getVersion().then(({ premium, version }) => {
+    : versionData?.version || "-";
      setClashVer(premium ? `${version} Premium` : version);
    });
  }, []);
  return (
    <SettingList title="Clash Setting">
@@ -130,9 +116,11 @@ const SettingClash = ({ onError }: Props) => {
        <ListItemText primary="Mixed Port" />
        <GuardState
          value={mixedPort!}
          onCatch={onError}
          onFormat={(e: any) => +e.target.value?.replace(/\D+/, "")}
-          onChange={setMixedPort}
+          onChange={(e) => onChangeData({ "mixed-port": e })}
          onGuard={onUpdatePort}
          waitTime={800}
        >
          <TextField autoComplete="off" size="small" sx={{ width: 120 }} />
        </GuardState>
--- a/src/components/setting/setting-system.tsx
+++ b/src/components/setting/setting-system.tsx
@@ -15,6 +15,7 @@ const SettingSystem = ({ onError }: Props) => {
  const { data: vergeConfig } = useSWR("getVergeConfig", getVergeConfig);
  const {
    enable_tun_mode = false,
    enable_auto_launch = false,
    enable_system_proxy = false,
    system_proxy_bypass = "",
@@ -28,6 +29,20 @@ const SettingSystem = ({ onError }: Props) => {
  return (
    <SettingList title="System Setting">
      <SettingItem>
        <ListItemText primary="Tun Mode" />
        <GuardState
          value={enable_tun_mode}
          valueProps="checked"
          onCatch={onError}
          onFormat={onSwitchFormat}
          onChange={(e) => onChangeData({ enable_tun_mode: e })}
          onGuard={(e) => patchVergeConfig({ enable_tun_mode: e })}
        >
          <Switch edge="end" />
        </GuardState>
      </SettingItem>
      <SettingItem>
        <ListItemText primary="Auto Launch" />
        <GuardState
@@ -91,6 +106,7 @@ const SettingSystem = ({ onError }: Props) => {
            onFormat={(e: any) => e.target.value}
            onChange={(e) => onChangeData({ system_proxy_bypass: e })}
            onGuard={(e) => patchVergeConfig({ system_proxy_bypass: e })}
            waitTime={1000}
          >
            <TextField autoComplete="off" size="small" sx={{ width: 120 }} />
          </GuardState>
--- a/src/pages/logs.tsx
+++ b/src/pages/logs.tsx
@@ -1,38 +1,12 @@
-import dayjs from "dayjs";
+import { useRecoilState } from "recoil";
 import { useEffect, useState } from "react";
 import { Button, Paper } from "@mui/material";
 import { Virtuoso } from "react-virtuoso";
-import { ApiType } from "../services/types";
+import { atomLogData } from "../services/states";
 import { getInfomation } from "../services/api";
 import BasePage from "../components/base/base-page";
 import LogItem from "../components/log/log-item";
 let logCache: ApiType.LogItem[] = [];
 const LogPage = () => {
-  const [logData, setLogData] = useState(logCache);
+  const [logData, setLogData] = useRecoilState(atomLogData);
  useEffect(() => {
    let ws: WebSocket | null = null;
    getInfomation().then((result) => {
      const { server = "", secret = "" } = result;
      ws = new WebSocket(`ws://${server}/logs?token=${secret}`);
      ws.addEventListener("message", (event) => {
        const data = JSON.parse(event.data) as ApiType.LogItem;
        const time = dayjs().format("MM-DD HH:mm:ss");
        setLogData((l) => (logCache = [...l, { ...data, time }]));
      });
    });
    return () => ws?.close();
  }, []);
  const onClear = () => {
    setLogData([]);
    logCache = [];
  };
  return (
    <BasePage
@@ -43,7 +17,7 @@ const LogPage = () => {
          size="small"
          sx={{ mt: 1 }}
          variant="contained"
-          onClick={onClear}
+          onClick={() => setLogData([])}
        >
          Clear
        </Button>
--- a/src/pages/profiles.tsx
+++ b/src/pages/profiles.tsx
@@ -1,5 +1,6 @@
 import useSWR, { useSWRConfig } from "swr";
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useState } from "react";
 import { useLockFn } from "ahooks";
 import { Box, Button, Grid, TextField } from "@mui/material";
 import {
  getProfiles,
@@ -9,7 +10,6 @@ import {
  newProfile,
 } 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";
@@ -27,7 +27,7 @@ const ProfilePage = () => {
    if (!profiles.items) profiles.items = [];
    const current = profiles.current;
-    const profile = profiles.items![current];
+    const profile = profiles.items.find((p) => p.uid === current);
    if (!profile) return;
    setTimeout(async () => {
@@ -71,9 +71,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 {
@@ -81,37 +89,27 @@ const ProfilePage = () => {
    }
  };
-  const lockRef = useRef(false);
+  const onSelect = useLockFn(async (current: string, force: boolean) => {
-  const onSelect = async (index: number, force: boolean) => {
+    if (!force && current === profiles.current) return;
-    if (lockRef.current) return;
+
    if (!force && index === profiles.current) return;
    lockRef.current = true;
    try {
-      await selectProfile(index);
+      await selectProfile(current);
-      mutate("getProfiles", { ...profiles, current: index }, true);
+      mutate("getProfiles", { ...profiles, current: current }, true);
    } catch (err: any) {
      err && Notice.error(err.toString());
    } finally {
      lockRef.current = false;
    }
-  };
+  });
  const lockNewRef = useRef(false);
  const [dialogOpen, setDialogOpen] = useState(false);
-  const onNew = async (name: string, desc: string) => {
+  const onNew = useLockFn(async (name: string, desc: string) => {
    if (lockNewRef.current) return;
    lockNewRef.current = true;
    try {
      await newProfile(name, desc);
      setDialogOpen(false);
      mutate("getProfiles");
    } catch (err: any) {
      err && Notice.error(err.toString());
    } finally {
      lockNewRef.current = false;
    }
-  };
+  });
  return (
    <BasePage title="Profiles">
@@ -140,13 +138,12 @@ const ProfilePage = () => {
      </Box>
      <Grid container spacing={3}>
-        {profiles?.items?.map((item, idx) => (
+        {profiles?.items?.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>
        ))}
--- a/src/pages/proxies.tsx
+++ b/src/pages/proxies.tsx
@@ -1,90 +1,51 @@
 import useSWR, { useSWRConfig } from "swr";
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useEffect } from "react";
-import { Virtuoso } from "react-virtuoso";
+import { useLockFn } from "ahooks";
 import { Button, ButtonGroup, List, Paper } from "@mui/material";
-import { getClashConfig, updateConfigs, updateProxy } from "../services/api";
+import { getClashConfig, updateConfigs } from "../services/api";
 import { patchClashConfig } from "../services/cmds";
 import { getProxies } from "../services/api";
 import BasePage from "../components/base/base-page";
 import ProxyItem from "../components/proxy/proxy-item";
 import ProxyGroup from "../components/proxy/proxy-group";
 import ProxyGlobal from "../components/proxy/proxy-global";
 const ProxyPage = () => {
  const { mutate } = useSWRConfig();
  const { data: proxiesData } = useSWR("getProxies", getProxies);
  const { data: clashConfig } = useSWR("getClashConfig", getClashConfig);
  const [curProxy, setCurProxy] = useState<string>("DIRECT");
  const curMode = clashConfig?.mode.toLowerCase();
  // proxy groups
  const { groups = [] } = proxiesData ?? {};
  // proxies and sorted
  const filterProxies = useMemo(() => {
    if (!proxiesData?.proxies) return [];
    const list = Object.values(proxiesData.proxies);
    const retList = list.filter(
      (p) => !p.all?.length && p.name !== "DIRECT" && p.name !== "REJECT"
    );
    const direct = list.filter((p) => p.name === "DIRECT");
    const reject = list.filter((p) => p.name === "REJECT");
    return direct.concat(retList).concat(reject);
  }, [proxiesData]);
  const modeList = ["rule", "global", "direct"];
-  const asGroup = curMode === "rule" && groups.length;
+  const curMode = clashConfig?.mode.toLowerCase() ?? "direct";
  const { groups = [], proxies = [] } = proxiesData ?? {};
  // make sure that fetch the proxies successfully
  useEffect(() => {
    if (
      (curMode === "rule" && !groups.length) ||
-      (curMode === "global" && filterProxies.length < 4)
+      (curMode === "global" && proxies.length < 2)
    ) {
      setTimeout(() => mutate("getProxies"), 500);
    }
-  }, [groups, filterProxies, curMode]);
+  }, [groups, proxies, curMode]);
-  // update the current proxy
+  const onChangeMode = useLockFn(async (mode: string) => {
-  useEffect(() => {
+    // switch rapidly
-    if (curMode === "direct") setCurProxy("DIRECT");
+    await updateConfigs({ mode });
-    if (curMode === "global") {
+    await patchClashConfig({ mode });
-      const globalNow = proxiesData?.proxies?.GLOBAL?.now;
+    mutate("getClashConfig");
-      setCurProxy(globalNow || "DIRECT");
+  });
    }
  }, [curMode, proxiesData]);
  const changeLockRef = useRef(false);
  const onChangeMode = async (mode: string) => {
    if (changeLockRef.current) return;
    changeLockRef.current = true;
    try {
      // switch rapidly
      await updateConfigs({ mode });
      await patchClashConfig({ mode });
      mutate("getClashConfig");
    } finally {
      changeLockRef.current = false;
    }
  };
  const onChangeProxy = async (name: string) => {
    if (curMode !== "global") return;
    await updateProxy("GLOBAL", name);
    setCurProxy(name);
  };
  // difference style
-  const pageStyle = asGroup ? {} : { height: "100%" };
+  const showGroup = curMode === "rule" && !!groups.length;
-  const paperStyle: any = asGroup
+  const pageStyle = showGroup ? {} : { height: "100%" };
  const paperStyle: any = showGroup
    ? { mb: 0.5 }
    : { py: 1, height: "100%", boxSizing: "border-box" };
  return (
    <BasePage
      contentStyle={pageStyle}
-      title={asGroup ? "Proxy Groups" : "Proxies"}
+      title={showGroup ? "Proxy Groups" : "Proxies"}
      header={
        <ButtonGroup size="small">
          {modeList.map((mode) => (
@@ -101,26 +62,25 @@ const ProxyPage = () => {
      }
    >
      <Paper sx={{ borderRadius: 1, boxShadow: 2, ...paperStyle }}>
-        {asGroup ? (
+        {curMode === "rule" && !!groups.length && (
          <List>
            {groups.map((group) => (
              <ProxyGroup key={group.name} group={group} />
            ))}
          </List>
-        ) : (
+        )}
-          // virtual list
+        {((curMode === "rule" && !groups.length) || curMode === "global") && (
-          <Virtuoso
+          <ProxyGlobal
-            style={{ height: "100%" }}
+            groupName="GLOBAL"
-            totalCount={filterProxies.length}
+            curProxy={proxiesData?.global?.now}
-            itemContent={(index) => (
+            proxies={proxies}
-              <ProxyItem
+          />
-                groupName="GLOBAL"
+        )}
-                proxy={filterProxies[index]}
+        {curMode === "direct" && (
-                selected={filterProxies[index].name === curProxy}
+          <ProxyGlobal
-                onClick={onChangeProxy}
+            groupName="DIRECT"
-                sx={{ py: 0, px: 2 }}
+            curProxy="DIRECT"
-              />
+            proxies={[proxiesData?.direct!].filter(Boolean)}
            )}
          />
        )}
      </Paper>
--- a/src/services/api.ts
+++ b/src/services/api.ts
@@ -84,33 +84,41 @@ export async function updateProxy(group: string, proxy: string) {
 export async function getProxies() {
  const instance = await getAxios();
  const response = await instance.get<any, any>("/proxies");
-  const proxies = (response?.proxies ?? {}) as Record<
+  const records = (response?.proxies ?? {}) as Record<
    string,
    ApiType.ProxyItem
  >;
-  const global = proxies["GLOBAL"];
+  const global = records["GLOBAL"];
  const direct = records["DIRECT"];
  const reject = records["REJECT"];
  const order = global?.all;
  let groups: ApiType.ProxyGroupItem[] = [];
  if (order) {
    groups = order
-      .filter((name) => proxies[name]?.all)
+      .filter((name) => records[name]?.all)
-      .map((name) => proxies[name])
+      .map((name) => records[name])
      .map((each) => ({
        ...each,
-        all: each.all!.map((item) => proxies[item]),
+        all: each.all!.map((item) => records[item]),
      }));
  } else {
-    groups = Object.values(proxies)
+    groups = Object.values(records)
      .filter((each) => each.name !== "GLOBAL" && each.all)
      .map((each) => ({
        ...each,
-        all: each.all!.map((item) => proxies[item]),
+        all: each.all!.map((item) => records[item]),
      }));
    groups.sort((a, b) => b.name.localeCompare(a.name));
  }
-  return { global, groups, proxies };
+  const proxies = [direct, reject].concat(
    Object.values(records).filter(
      (p) => !p.all?.length && p.name !== "DIRECT" && p.name !== "REJECT"
    )
  );
  return { global, direct, groups, records, proxies };
 }
--- a/src/services/cmds.ts
+++ b/src/services/cmds.ts
@@ -13,7 +13,7 @@ export async function newProfile(name: string, desc: string) {
  return invoke<void>("new_profile", { name, desc });
 }
-export async function viewProfile(index: number) {
+export async function viewProfile(index: string) {
  return invoke<void>("view_profile", { index });
 }
@@ -21,22 +21,22 @@ 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 });
 }
--- a/src/services/delay.ts
+++ b/src/services/delay.ts
@@ -32,6 +32,39 @@ class DelayManager {
    this.setDelay(name, group, delay);
    return delay;
  }
  async checkListDelay(
    options: {
      names: readonly string[];
      groupName: string;
      skipNum: number;
      maxTimeout: number;
    },
    callback: Function
  ) {
    let names = [...options.names];
    const { groupName, skipNum, maxTimeout } = options;
    while (names.length) {
      const list = names.slice(0, skipNum);
      names = names.slice(skipNum);
      let called = false;
      setTimeout(() => {
        if (!called) {
          called = true;
          callback();
        }
      }, maxTimeout);
      await Promise.all(list.map((n) => this.checkDelay(n, groupName)));
      if (!called) {
        called = true;
        callback();
      }
    }
  }
 }
 export default new DelayManager();
--- a/src/services/states.ts
+++ b/src/services/states.ts
@@ -0,0 +1,12 @@
 import { atom } from "recoil";
 import { ApiType } from "./types";
 export const atomClashPort = atom<number>({
  key: "atomClashPort",
  default: 0,
 });
 export const atomLogData = atom<ApiType.LogItem[]>({
  key: "atomLogData",
  default: [],
 });
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -86,10 +86,11 @@ export namespace CmdType {
  }
  export interface ProfileItem {
    uid: string;
    type?: string;
    name?: string;
    desc?: string;
    file?: string;
    mode?: string;
    url?: string;
    updated?: number;
    selected?: {
@@ -105,7 +106,8 @@ export namespace CmdType {
  }
  export interface ProfilesConfig {
-    current?: number;
+    current?: string;
    chain?: string[];
    items?: ProfileItem[];
  }
@@ -113,6 +115,7 @@ export namespace CmdType {
    theme_mode?: "light" | "dark";
    theme_blur?: boolean;
    traffic_graph?: boolean;
    enable_tun_mode?: boolean;
    enable_auto_launch?: boolean;
    enable_system_proxy?: boolean;
    enable_proxy_guard?: boolean;
--- a/src/states/setting.ts
+++ b/src/states/setting.ts
@@ -1,6 +0,0 @@
 import { atom } from "recoil";
 export const atomClashPort = atom<number>({
  key: "atomClashPort",
  default: 0,
 });
Author	SHA1	Message	Date
GyDi	808b861dd1	v0.0.20	2022-03-02 01:59:53 +08:00
GyDi	17f1c487a8	feat: edit profile item	2022-03-02 01:58:16 +08:00
GyDi	8dc2c1a38f	fix: cover profile extra	2022-03-02 01:45:00 +08:00
GyDi	220a494692	chore: adjust log field	2022-03-02 01:13:31 +08:00
GyDi	db6bc10196	chore: rm file	2022-03-02 00:58:07 +08:00
GyDi	1880363aeb	feat: use nanoid	2022-03-02 00:56:05 +08:00
GyDi	19c7b59883	feat: compatible profile config	2022-03-01 11:05:33 +08:00
GyDi	749df89229	refactor: profile config	2022-03-01 08:58:47 +08:00
GyDi	444f2172fa	v0.0.19	2022-02-28 01:59:53 +08:00
GyDi	77a77c0ea7	wip: refactor profile	2022-02-28 01:59:13 +08:00
GyDi	dbf380a0d1	refactor: use anyhow to handle error	2022-02-28 01:34:25 +08:00
GyDi	ade34f5217	fix: display menu only on macos	2022-02-27 01:47:56 +08:00
GyDi	e89607799a	fix: proxy global showType	2022-02-27 01:33:22 +08:00
GyDi	d05d8d6a9e	feat: native menu supports	2022-02-27 01:29:57 +08:00
GyDi	b6aa50d3dc	chore: update deps	2022-02-27 01:16:43 +08:00
GyDi	9df361935f	feat: filter proxy and display type	2022-02-27 00:58:14 +08:00
GyDi	98b8a122b6	feat: use lock fn	2022-02-26 17:39:36 +08:00
GyDi	c7232522ee	feat: refactor proxy page	2022-02-26 17:39:08 +08:00
GyDi	5280f1d745	feat: proxy group auto scroll to current	2022-02-26 01:21:39 +08:00
GyDi	b52a081e7b	v0.0.18	2022-02-25 02:13:41 +08:00
GyDi	f981a44861	chore: ci	2022-02-25 02:12:55 +08:00
GyDi	d7c5ce0750	feat: clash tun mode supports	2022-02-25 02:09:39 +08:00
GyDi	9ccc66ca1e	feat: use enhanced guard-state	2022-02-25 01:22:33 +08:00
GyDi	8606af3616	feat: guard state supports debounce guard	2022-02-25 01:21:13 +08:00
GyDi	f6e821ba6b	feat: adjust clash version display	2022-02-24 23:04:18 +08:00
GyDi	e8dbcf819b	feat: hide command window	2022-02-24 22:46:12 +08:00
GyDi	bbe2ef4e8e	fix: use full clash config	2022-02-23 23:23:07 +08:00
GyDi	dd15455031	feat: enhance log data	2022-02-23 02:00:45 +08:00
GyDi	12ac7bb338	chore: update readme	2022-02-22 21:54:33 +08:00
GyDi	46ef348f0d	v0.0.17	2022-02-22 02:08:31 +08:00
GyDi	1a55cca8af	fix: reconnect websocket when restart clash	2022-02-22 02:05:22 +08:00
GyDi	81ee989f1f	chore: enhance publish ci	2022-02-22 01:56:06 +08:00
GyDi	c9c06f8a3d	fix: wrong exe path	2022-02-21 22:33:37 +08:00
GyDi	72127979c3	chore: use tauri cli	2022-02-21 22:31:00 +08:00