Release 1.5.9

fix: drag error
#643
2024-03-17 11:25:25 +08:00 · 2024-03-16 20:37:39 +08:00 · 2024-03-16 17:06:59 +08:00 · 2024-03-16 10:54:19 +08:00 · 2024-03-16 00:03:34 +08:00 · 2024-03-15 21:52:56 +08:00
24 changed files with 1000 additions and 409 deletions
--- a/.github/build-for-linux/entrypoint.sh
+++ b/.github/build-for-linux/entrypoint.sh
@@ -14,7 +14,7 @@ elif [ "$INPUT_TARGET" = "aarch64-unknown-linux-gnu" ]; then
    dpkg --add-architecture arm64
    apt-get update
    apt-get install -y libncurses6:arm64 libtinfo6:arm64 linux-libc-dev:arm64 libncursesw6:arm64 libssl3:arm64 libcups2:arm64
-    apt-get install -y --no-install-recommends g++-aarch64-linux-gnu libc6-dev-arm64-cross libssl-dev:arm64 libwebkit2gtk-4.0-dev:arm64 libgtk-3-dev:arm64 patchelf:arm64 librsvg2-dev:arm64 libayatana-appindicator3-dev:arm64
+    apt-get install -y --no-install-recommends g++-aarch64-linux-gnu libc6-dev-arm64-cross libwebkit2gtk-4.0-dev:arm64 libgtk-3-dev:arm64 patchelf:arm64 librsvg2-dev:arm64 libayatana-appindicator3-dev:arm64
    export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
    export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
    export CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++
@@ -24,12 +24,22 @@ elif [ "$INPUT_TARGET" = "armv7-unknown-linux-gnueabihf" ]; then
    dpkg --add-architecture armhf
    apt-get update
    apt-get install -y libncurses6:armhf libtinfo6:armhf linux-libc-dev:armhf libncursesw6:armhf libssl3:armhf libcups2:armhf
-    apt-get install -y --no-install-recommends g++-arm-linux-gnueabihf libc6-dev-armhf-cross libssl-dev:armhf libwebkit2gtk-4.0-dev:armhf libgtk-3-dev:armhf patchelf:armhf librsvg2-dev:armhf libayatana-appindicator3-dev:armhf
+    apt-get install -y --no-install-recommends g++-arm-linux-gnueabihf libc6-dev-armhf-cross libwebkit2gtk-4.0-dev:armhf libgtk-3-dev:armhf patchelf:armhf librsvg2-dev:armhf libayatana-appindicator3-dev:armhf
    export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
    export CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc
    export CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++
    export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig
    export PKG_CONFIG_ALLOW_CROSS=1
+elif [ "$INPUT_TARGET" = "riscv64gc-unknown-linux-gnu" ]; then
+    dpkg --add-architecture riscv64
+    apt-get update
+    apt-get install -y libncurses6:riscv64 libtinfo6:riscv64 linux-libc-dev:riscv64 libncursesw6:riscv64 libssl3:riscv64 libcups2:riscv64
+    apt-get install -y --no-install-recommends g++-riscv64-linux-gnu libc6-dev-riscv64-cross libwebkit2gtk-4.0-dev:riscv64 libgtk-3-dev:riscv64 patchelf:riscv64 librsvg2-dev:riscv64 libayatana-appindicator3-dev:riscv64
+    export CARGO_TARGET_RISCV64_UNKNOWN_LINUX_GNU_LINKER=riscv64-linux-gnu-gcc
+    export CC_riscv64_unknown_linux_gnu=riscv64-linux-gnu-gcc
+    export CXX_riscv64_unknown_linux_gnu=riscv64-linux-gnu-g++
+    export PKG_CONFIG_PATH=/usr/lib/riscv64-linux-gnu/pkgconfig
+    export PKG_CONFIG_ALLOW_CROSS=1
 else
    echo "Unknown target: $INPUT_TARGET" && exit 1
 fi
--- a/.github/workflows/alpha.yml
+++ b/.github/workflows/alpha.yml
@@ -30,17 +30,6 @@ jobs:
      - name: Checkout Repository
        uses: actions/checkout@v4

-      - name: Apply Patch
-        if: matrix.target == 'aarch64-pc-windows-msvc'
-        run: |
-          git config --global user.email "clash-verge-rev@github.io"
-          git config --global user.name "clash-verge-rev"
-          git am patches/support-windows-aarch64.patch
-
-      - name: Init Submodule
-        if: matrix.target == 'aarch64-pc-windows-msvc'
-        run: git submodule update --init --recursive
-
      - name: Install Rust Stable
        uses: dtolnay/rust-toolchain@stable

@@ -57,7 +46,7 @@ jobs:
        with:
          node-version: "20"

-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v3
        name: Install pnpm
        with:
          version: 8
@@ -100,6 +89,8 @@ jobs:
            target: x86_64-unknown-linux-gnu
          - os: ubuntu-latest
            target: aarch64-unknown-linux-gnu
+          - os: ubuntu-latest
+            target: armv7-unknown-linux-gnueabihf
    runs-on: ${{ matrix.os }}
    steps:
      - name: Checkout Repository
@@ -112,30 +103,56 @@ jobs:
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
        with:
          target: ${{ matrix.target }}
+
      - name: Get Version
        run: |
          sudo apt-get update
          sudo apt-get install jq
          echo "VERSION=$(cat package.json | jq '.version' | tr -d '"')" >> $GITHUB_ENV
+          echo "BUILDTIME=$(TZ=Asia/Shanghai date)" >> $GITHUB_ENV
+
+      - run: |
+          cat > release.txt << 'EOF'
+          ### 我应该下载哪个版本？
+
+          - Windows x86_64架构: x64-setup.exe (不支持win7)
+          - Windows arm64架构: arm64-setup.exe
+          - MacOS intel芯片: x64.dmg
+          - MacOS apple M芯片: aarch64.dmg (提示文件损坏看下面FAQ)
+          - Linux x64架构: amd64.AppImage/amd64.deb
+          - Linux arm64架构: arm64.deb
+          - Linux armv7架构: armhf.deb
+          - Windows 便携板 x86_64架构: x64_portable.zip (不推荐使用，无法自动更新)
+          - Windows 便携板 arm64架构: arm64_portable.zip (不推荐使用，无法自动更新)
+
+          ### FAQ
+
+          - [https://clash-verge-rev.github.io/faq.html](https://clash-verge-rev.github.io/faq.html)
+
+          Created at  ${{ env.BUILDTIME }}.
+          EOF
+
      - name: Upload Release
        if: startsWith(matrix.target, 'x86_64')
        uses: softprops/action-gh-release@v1
        with:
          tag_name: alpha
          name: "Clash Verge Rev Alpha"
-          body: "More new features are now supported."
+          body_path: release.txt
          prerelease: true
          token: ${{ secrets.GITHUB_TOKEN }}
          files: src-tauri/target/${{ matrix.target }}/release/bundle/appimage/*.AppImage*
+
      - name: Upload Release
        uses: softprops/action-gh-release@v1
        with:
          tag_name: alpha
          name: "Clash Verge Rev Alpha"
-          body: "More new features are now supported."
+          body_path: release.txt
          prerelease: true
          token: ${{ secrets.GITHUB_TOKEN }}
          files: src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb
+
  update_tag:
    name: Update tag
    runs-on: ubuntu-latest
@@ -143,21 +160,40 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
+
      - name: Set Env
        run: |
          echo "BUILDTIME=$(TZ=Asia/Shanghai date)" >> $GITHUB_ENV
        shell: bash
+
      - name: Update Tag
        uses: richardsimko/update-tag@v1
        with:
          tag_name: alpha
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
      - run: |
          cat > release.txt << 'EOF'
-          ## Clash Verge Rev Alpha
+          ### 我应该下载哪个版本？
+
+          - Windows x86_64架构: x64-setup.exe (不支持win7)
+          - Windows arm64架构: arm64-setup.exe
+          - MacOS intel芯片: x64.dmg
+          - MacOS apple M芯片: aarch64.dmg (提示文件损坏看下面FAQ)
+          - Linux x64架构: amd64.AppImage/amd64.deb
+          - Linux arm64架构: arm64.deb
+          - Linux armv7架构: armhf.deb
+          - Windows 便携板 x86_64架构: x64_portable.zip (不推荐使用，无法自动更新)
+          - Windows 便携板 arm64架构: arm64_portable.zip (不推荐使用，无法自动更新)
+
+          ### FAQ
+
+          - [https://clash-verge-rev.github.io/faq.html](https://clash-verge-rev.github.io/faq.html)
+
          Created at  ${{ env.BUILDTIME }}.
          EOF
+
      - name: Upload Release
        uses: softprops/action-gh-release@v1
        with:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,17 +27,6 @@ jobs:
      - name: Checkout Repository
        uses: actions/checkout@v4

-      - name: Apply Patch
-        if: matrix.target == 'aarch64-pc-windows-msvc'
-        run: |
-          git config --global user.email "clash-verge-rev@github.io"
-          git config --global user.name "clash-verge-rev"
-          git am patches/support-windows-aarch64.patch
-
-      - name: Init Submodule
-        if: matrix.target == 'aarch64-pc-windows-msvc'
-        run: git submodule update --init --recursive
-
      - name: Install Rust Stable
        uses: dtolnay/rust-toolchain@stable

@@ -54,7 +43,7 @@ jobs:
        with:
          node-version: "20"

-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v3
        name: Install pnpm
        with:
          version: 8
@@ -97,6 +86,8 @@ jobs:
            target: x86_64-unknown-linux-gnu
          - os: ubuntu-latest
            target: aarch64-unknown-linux-gnu
+          - os: ubuntu-latest
+            target: armv7-unknown-linux-gnueabihf
    runs-on: ${{ matrix.os }}
    steps:
      - name: Checkout Repository
@@ -109,11 +100,13 @@ jobs:
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
        with:
          target: ${{ matrix.target }}
+
      - name: Get Version
        run: |
          sudo apt-get update
          sudo apt-get install jq
          echo "VERSION=$(cat package.json | jq '.version' | tr -d '"')" >> $GITHUB_ENV
+
      - name: Upload Release
        if: startsWith(matrix.target, 'x86_64')
        uses: softprops/action-gh-release@v1
@@ -123,6 +116,7 @@ jobs:
          body: "More new features are now supported."
          token: ${{ secrets.GITHUB_TOKEN }}
          files: src-tauri/target/${{ matrix.target }}/release/bundle/appimage/*.AppImage*
+
      - name: Upload Release
        uses: softprops/action-gh-release@v1
        with:
--- a/UPDATELOG.md
+++ b/UPDATELOG.md
@@ -1,3 +1,22 @@
+## v1.5.9
+
+### Features
+
+- 缓存代理组图标
+- 使用`boa_engine` 代替 `rquickjs`
+- 支持 Linux armv7
+
+### Bugs Fixes
+
+- Windows 首次安装无法点击
+- Windows 触摸屏无法拖动
+- 规则列表 `REJECT-DROP` 颜色
+- MacOS Dock 栏不显示图标
+- MacOS 自定义字体无效
+- 避免使用空 UA 拉取订阅
+
+---
+
 ## v1.5.8

 ### Features
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "clash-verge",
-  "version": "1.5.8",
+  "version": "1.5.9",
  "license": "GPL-3.0-only",
  "scripts": {
    "dev": "tauri dev",
--- a/patches/support-windows-aarch64.patch
+++ b/patches/support-windows-aarch64.patch
@@ -1,195 +0,0 @@
-From 871c9a6d1ed014c93da2436a437df03734e9f76c Mon Sep 17 00:00:00 2001
-From: MystiPanda <mystipanda@proton.me>
-Date: Sun, 10 Dec 2023 19:47:45 +0800
-Subject: [PATCH] feat: Support windows aarch64
-
---
- .gitmodules                     |   3 +
- src-tauri/Cargo.toml            |   2 +-
- src-tauri/quick-rs              |   1 +
- src-tauri/src/enhance/script.rs | 130 +++++++++++++++++++-------------
- 4 files changed, 81 insertions(+), 55 deletions(-)
- create mode 100644 .gitmodules
- create mode 160000 src-tauri/quick-rs
-
-diff --git a/.gitmodules b/.gitmodules
-new file mode 100644
-index 0000000..2eda7e4
--- /dev/null
-+++ b/.gitmodules
-@@ -0,0 +1,3 @@
-+[submodule "src-tauri/quick-rs"]
-+	path = src-tauri/quick-rs
-+	url = https://github.com/clash-verge-rev/quick-rs.git
-diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
-index 2f1a3be..d67f6ed 100644
--- a/src-tauri/Cargo.toml
-+++ b/src-tauri/Cargo.toml
-@@ -25,7 +25,6 @@ log4rs = "1"
- nanoid = "0.4"
- chrono = "0.4"
- sysinfo = "0.30"
-rquickjs = "0.3" # 高版本不支持 Linux aarch64
- serde_json = "1.0"
- serde_yaml = "0.9"
- once_cell = "1.18"
-@@ -33,6 +32,7 @@ port_scanner = "0.1.5"
- delay_timer = "0.11.5"
- parking_lot = "0.12"
- percent-encoding = "2.3.1"
-+quick-rs = { path = "quick-rs" }
- window-shadows = { version = "0.2" }
- tokio = { version = "1", features = ["full"] }
- serde = { version = "1.0", features = ["derive"] }
-diff --git a/src-tauri/quick-rs b/src-tauri/quick-rs
-new file mode 160000
-index 0000000..78277c4
--- /dev/null
-+++ b/src-tauri/quick-rs
-@@ -0,0 +1 @@
-+Subproject commit 78277c4509c64f18c0fc5c9f2b84671de7c83343
-diff --git a/src-tauri/src/enhance/script.rs b/src-tauri/src/enhance/script.rs
-index 30a922f..d47dc33 100644
--- a/src-tauri/src/enhance/script.rs
-+++ b/src-tauri/src/enhance/script.rs
-@@ -3,61 +3,83 @@ use anyhow::Result;
- use serde_yaml::Mapping;
- 
- pub fn use_script(script: String, config: Mapping) -> Result<(Mapping, Vec<(String, String)>)> {
-    use rquickjs::{function::Func, Context, Runtime};
-    use std::sync::{Arc, Mutex};
-
-    let runtime = Runtime::new().unwrap();
-    let context = Context::full(&runtime).unwrap();
-    let outputs = Arc::new(Mutex::new(vec![]));
-
-    let copy_outputs = outputs.clone();
-    let result = context.with(|ctx| -> Result<Mapping> {
-        ctx.globals().set(
-            "__verge_log__",
-            Func::from(move |level: String, data: String| {
-                let mut out = copy_outputs.lock().unwrap();
-                out.push((level, data));
-            }),
-        )?;
-
-        ctx.eval(
-            r#"var console = Object.freeze({
-        log(data){__verge_log__("log",JSON.stringify(data))}, 
-        info(data){__verge_log__("info",JSON.stringify(data))}, 
-        error(data){__verge_log__("error",JSON.stringify(data))},
-        debug(data){__verge_log__("debug",JSON.stringify(data))},
-      });"#,
-        )?;
-
-        let config = use_lowercase(config.clone());
-        let config_str = serde_json::to_string(&config)?;
-
-        let code = format!(
-            r#"try{{
-+    use quick_rs::{context::Context, function::Function, module::Module, runtime::Runtime};
-+
-+    let config = use_lowercase(config.clone());
-+    let config_str = serde_json::to_string(&config)?;
-+
-+    let runtime = Runtime::new();
-+    let context = Context::from(&runtime);
-+
-+    let code = format!(
-+        r#"
-+        let output = [];
-+
-+        function __verge_log__(type, data) {{
-+          output.push([type, data]);
-+        }}
-+
-+        var console = Object.freeze({{
-+          log(data) {{ __verge_log__("log", JSON.stringify(data)) }},
-+          info(data) {{ __verge_log__("info", JSON.stringify(data)) }},
-+          error(data) {{ __verge_log__("error", JSON.stringify(data)) }},
-+          debug(data) {{ __verge_log__("debug", JSON.stringify(data)) }},
-+        }});
-+
-         {script};
-        JSON.stringify(main({config_str})||'')
-      }} catch(err) {{
-        `__error_flag__ ${{err.toString()}}`
-      }}"#
-        );
-        let result: String = ctx.eval(code.as_str())?;
-        if result.starts_with("__error_flag__") {
-            anyhow::bail!(result[15..].to_owned());
-        }
-        if result == "\"\"" {
-            anyhow::bail!("main function should return object");
-        }
-        Ok(serde_json::from_str::<Mapping>(result.as_str())?)
-    });
-
-    let mut out = outputs.lock().unwrap();
-    match result {
-        Ok(config) => Ok((use_lowercase(config), out.to_vec())),
-        Err(err) => {
-            out.push(("exception".into(), err.to_string()));
-            Ok((config, out.to_vec()))
-        }
-    }
-+
-+        export function _main(){{
-+          try{{
-+            let result = JSON.stringify(main({config_str})||"");
-+            return JSON.stringify({{result, output}});
-+          }} catch(err) {{
-+            output.push(["exception", err.toString()]);
-+            return JSON.stringify({{result: "__error__", output}});
-+          }}
-+        }}
-+        "#
-+    );
-+    let value = context.eval_module(&code, "_main")?;
-+    let module = Module::new(value)?;
-+    let value = module.get("_main")?;
-+    let function = Function::new(value)?;
-+    let value = function.call(vec![])?;
-+    let result = serde_json::from_str::<serde_json::Value>(&value.to_string()?)?;
-+    result
-+        .as_object()
-+        .map(|obj| {
-+            let result = obj.get("result").unwrap().as_str().unwrap();
-+            let output = obj.get("output").unwrap();
-+
-+            let mut out = output
-+                .as_array()
-+                .unwrap()
-+                .iter()
-+                .map(|item| {
-+                    let item = item.as_array().unwrap();
-+                    (
-+                        item[0].as_str().unwrap().into(),
-+                        item[1].as_str().unwrap().into(),
-+                    )
-+                })
-+                .collect::<Vec<_>>();
-+            if result.is_empty() {
-+                anyhow::bail!("main function should return object");
-+            }
-+            if result == "__error__" {
-+                return Ok((config, out.to_vec()));
-+            }
-+            let result = serde_json::from_str::<Mapping>(result);
-+
-+            match result {
-+                Ok(config) => Ok((use_lowercase(config), out.to_vec())),
-+                Err(err) => {
-+                    out.push(("exception".into(), err.to_string()));
-+                    Ok((config, out.to_vec()))
-+                }
-+            }
-+        })
-+        .unwrap_or_else(|| anyhow::bail!("Unknown result"))
- }
- 
- #[test]
-- 
-2.43.0.windows.1
-
--- a/scripts/check.mjs
+++ b/scripts/check.mjs
@@ -21,6 +21,7 @@ const PLATFORM_MAP = {
  "i686-unknown-linux-gnu": "linux",
  "aarch64-unknown-linux-gnu": "linux",
  "armv7-unknown-linux-gnueabihf": "linux",
+  "riscv64gc-unknown-linux-gnu": "linux",
  "loongarch64-unknown-linux-gnu": "linux",
 };
 const ARCH_MAP = {
@@ -33,6 +34,7 @@ const ARCH_MAP = {
  "i686-unknown-linux-gnu": "ia32",
  "aarch64-unknown-linux-gnu": "arm64",
  "armv7-unknown-linux-gnueabihf": "arm",
+  "riscv64gc-unknown-linux-gnu": "riscv64",
  "loongarch64-unknown-linux-gnu": "loong64",
 };

@@ -65,6 +67,7 @@ const META_ALPHA_MAP = {
  "linux-ia32": "mihomo-linux-386",
  "linux-arm64": "mihomo-linux-arm64",
  "linux-arm": "mihomo-linux-armv7",
+  "linux-riscv64": "mihomo-linux-riscv64",
  "linux-loong64": "mihomo-linux-loong64",
 };

@@ -111,6 +114,7 @@ const META_MAP = {
  "linux-ia32": "mihomo-linux-386",
  "linux-arm64": "mihomo-linux-arm64",
  "linux-arm": "mihomo-linux-armv7",
+  "linux-riscv64": "mihomo-linux-riscv64",
  "linux-loong64": "mihomo-linux-loong64",
 };

--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "clash-verge"
-version = "1.5.8"
+version = "1.5.9"
 description = "clash verge"
 authors = ["zzzgydi", "wonfen", "MystiPanda"]
 license = "GPL-3.0-only"
@@ -14,18 +14,16 @@ tauri-build = { version = "1", features = [] }

 [dependencies]
 warp = "0.3"
-which = "6.0.0"
 anyhow = "1.0"
 dirs = "5.0"
 open = "5.0"
 log = "0.4"
-ctrlc = "3.4"
 dunce = "1.0"
 log4rs = "1"
 nanoid = "0.4"
 chrono = "0.4"
 sysinfo = "0.30"
-rquickjs = "0.3" # 高版本不支持 Linux aarch64
+boa_engine = "0.18"
 serde_json = "1.0"
 serde_yaml = "0.9"
 once_cell = "1.18"
@@ -39,10 +37,10 @@ serde = { version = "1.0", features = ["derive"] }
 reqwest = { version = "0.11", features = ["json", "rustls-tls"] }
 sysproxy = { git="https://github.com/zzzgydi/sysproxy-rs", branch = "main" }
 auto-launch = { git="https://github.com/zzzgydi/auto-launch", branch = "main" }
-tauri = { version = "1.5", features = [ "path-all", "protocol-asset", "dialog-open", "notification-all", "icon-png", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all", "devtools"] }
+tauri = { version = "1.6", features = [ "path-all", "protocol-asset", "dialog-open", "notification-all", "icon-png", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all", "devtools"] }

 [target.'cfg(windows)'.dependencies]
-runas = "=1.0.0" # 高版本会返回错误 Status
+runas = "=1.2.0"
 deelevate = "0.2.0"
 winreg = "0.52.0"

--- a/src-tauri/src/cmds.rs
+++ b/src-tauri/src/cmds.rs
@@ -275,6 +275,23 @@ pub fn get_app_dir() -> CmdResult<String> {
    Ok(app_home_dir)
 }

+#[tauri::command]
+pub async fn download_icon_cache(url: String, name: String) -> CmdResult<String> {
+    let icon_cache_dir = wrap_err!(dirs::app_home_dir())?.join("icons").join("cache");
+    let icon_path = icon_cache_dir.join(name);
+    if !icon_cache_dir.exists() {
+        let _ = std::fs::create_dir_all(&icon_cache_dir);
+    }
+    if !icon_path.exists() {
+        let response = wrap_err!(reqwest::get(url).await)?;
+
+        let mut file = wrap_err!(std::fs::File::create(&icon_path))?;
+
+        let content = wrap_err!(response.bytes().await)?;
+        wrap_err!(std::io::copy(&mut content.as_ref(), &mut file))?;
+    }
+    Ok(icon_path.to_string_lossy().to_string())
+}
 #[tauri::command]
 pub fn copy_icon_file(path: String, name: String) -> CmdResult<String> {
    let file_path = std::path::Path::new(&path);
--- a/src-tauri/src/enhance/script.rs
+++ b/src-tauri/src/enhance/script.rs
@@ -1,62 +1,75 @@
 use super::use_lowercase;
-use anyhow::Result;
+use anyhow::{Error, Result};
 use serde_yaml::Mapping;

 pub fn use_script(script: String, config: Mapping) -> Result<(Mapping, Vec<(String, String)>)> {
-    use rquickjs::{function::Func, Context, Runtime};
+    use boa_engine::{native_function::NativeFunction, Context, JsValue, Source};
    use std::sync::{Arc, Mutex};
+    let mut context = Context::default();

-    let runtime = Runtime::new().unwrap();
-    let context = Context::full(&runtime).unwrap();
    let outputs = Arc::new(Mutex::new(vec![]));

    let copy_outputs = outputs.clone();
-    let result = context.with(|ctx| -> Result<Mapping> {
-        ctx.globals().set(
-            "__verge_log__",
-            Func::from(move |level: String, data: String| {
-                let mut out = copy_outputs.lock().unwrap();
-                out.push((level, data));
-            }),
-        )?;
-
-        ctx.eval(
-            r#"var console = Object.freeze({
+    unsafe {
+        let _ = context.register_global_builtin_callable(
+            "__verge_log__".into(),
+            2,
+            NativeFunction::from_closure(
+                move |_: &JsValue, args: &[JsValue], context: &mut Context| {
+                    let level = args.get(0).unwrap().to_string(context)?;
+                    let level = level.to_std_string().unwrap();
+                    let data = args.get(1).unwrap().to_string(context)?;
+                    let data = data.to_std_string().unwrap();
+                    let mut out = copy_outputs.lock().unwrap();
+                    out.push((level, data));
+                    Ok(JsValue::undefined())
+                },
+            ),
+        );
+    }
+    let _ = context.eval(Source::from_bytes(
+        r#"var console = Object.freeze({
        log(data){__verge_log__("log",JSON.stringify(data))}, 
        info(data){__verge_log__("info",JSON.stringify(data))}, 
        error(data){__verge_log__("error",JSON.stringify(data))},
        debug(data){__verge_log__("debug",JSON.stringify(data))},
      });"#,
-        )?;
+    ));

-        let config = use_lowercase(config.clone());
-        let config_str = serde_json::to_string(&config)?;
+    let config = use_lowercase(config.clone());
+    let config_str = serde_json::to_string(&config)?;

-        let code = format!(
-            r#"try{{
+    let code = format!(
+        r#"try{{
        {script};
        JSON.stringify(main({config_str})||'')
      }} catch(err) {{
        `__error_flag__ ${{err.toString()}}`
      }}"#
-        );
-        let result: String = ctx.eval(code.as_str())?;
+    );
+    if let Ok(result) = context.eval(Source::from_bytes(code.as_str())) {
+        if !result.is_string() {
+            anyhow::bail!("main function should return object");
+        }
+        let result = result.to_string(&mut context).unwrap();
+        let result = result.to_std_string().unwrap();
        if result.starts_with("__error_flag__") {
            anyhow::bail!(result[15..].to_owned());
        }
        if result == "\"\"" {
            anyhow::bail!("main function should return object");
        }
-        Ok(serde_json::from_str::<Mapping>(result.as_str())?)
-    });
-
-    let mut out = outputs.lock().unwrap();
-    match result {
-        Ok(config) => Ok((use_lowercase(config), out.to_vec())),
-        Err(err) => {
-            out.push(("exception".into(), err.to_string()));
-            Ok((config, out.to_vec()))
+        let res: Result<Mapping, Error> = Ok(serde_json::from_str::<Mapping>(result.as_str())?);
+        let mut out = outputs.lock().unwrap();
+        match res {
+            Ok(config) => Ok((use_lowercase(config), out.to_vec())),
+            Err(err) => {
+                out.push(("exception".into(), err.to_string()));
+                Ok((config, out.to_vec()))
+            }
        }
+    } else {
+        anyhow::bail!("main function should return object");
    }
 }

--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -57,6 +57,7 @@ fn main() -> std::io::Result<()> {
            cmds::test_delay,
            cmds::get_app_dir,
            cmds::copy_icon_file,
+            cmds::download_icon_cache,
            cmds::open_devtools,
            cmds::exit_app,
            // cmds::update_hotkeys,
--- a/src-tauri/src/utils/resolve.rs
+++ b/src-tauri/src/utils/resolve.rs
@@ -35,8 +35,6 @@ pub fn find_unused_port() -> Result<u16> {

 /// handle something when start app
 pub fn resolve_setup(app: &mut App) {
-    #[cfg(target_os = "macos")]
-    app.set_activation_policy(tauri::ActivationPolicy::Accessory);
    let version = app.package_info().version.to_string();
    handle::Handle::global().init(app.app_handle());
    VERSION.get_or_init(|| version.clone());
@@ -141,10 +139,7 @@ pub fn create_window(app_handle: &AppHandle) {
        _ => {
            #[cfg(target_os = "windows")]
            {
-                builder = builder
-                    .additional_browser_args("--enable-features=msWebView2EnableDraggableRegions")
-                    .inner_size(800.0, 636.0)
-                    .center();
+                builder = builder.inner_size(800.0, 636.0).center();
            }

            #[cfg(target_os = "macos")]
@@ -161,6 +156,7 @@ pub fn create_window(app_handle: &AppHandle) {
    #[cfg(target_os = "windows")]
    let window = builder
        .decorations(false)
+        .additional_browser_args("--enable-features=msWebView2EnableDraggableRegions --disable-features=OverscrollHistoryNavigation,msExperimentalScrolling")
        .transparent(true)
        .visible(false)
        .build();
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
  "package": {
    "productName": "Clash Verge",
-    "version": "1.5.8"
+    "version": "1.5.9"
  },
  "build": {
    "distDir": "../dist",
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -59,7 +59,3 @@ body {
  -moz-user-select: none;
  -ms-user-select: none;
 }
-
-[data-tauri-drag-region] {
-  app-region: drag;
-}
--- a/src/assets/styles/layout.scss
+++ b/src/assets/styles/layout.scss
@@ -11,7 +11,8 @@
    width: 100%;
    // max-width: 225px;
    // min-width: 225px;
-    padding: 16px 0 8px;
+    // padding: 16px 0 8px;
+    padding: 0px 0px 8px;
    // position: relative;
    flex-direction: column;
    align-self: stretch;
@@ -27,6 +28,7 @@
    // $maxLogo: 100px;

    .the-logo {
+      app-region: drag;
      position: relative;
      flex: 1 0 58px;
      // width: 100%;
@@ -100,6 +102,9 @@
      justify-content: end;
      box-sizing: border-box;
      z-index: 2;
+      .the-dragbar {
+        app-region: drag;
+      }
    }

    .the-content {
@@ -117,11 +122,13 @@
 .unknown {
  &.layout {
    .layout__left {
-      padding-top: 24px;
+      // padding-top: 24px;
    }

    .layout__left .the-logo {
      flex: 1 0 58px;
+      padding-top: 40px;
+      padding-bottom: 16px;
    }

    .layout__right .the-content {
--- a/src/components/profile/profile-viewer.tsx
+++ b/src/components/profile/profile-viewer.tsx
@@ -51,7 +51,6 @@ export const ProfileViewer = forwardRef<ProfileViewerRef, Props>(
        desc: "",
        url: "",
        option: {
-          // user_agent: "",
          with_proxy: false,
          self_proxy: false,
        },
@@ -99,6 +98,9 @@ export const ProfileViewer = forwardRef<ProfileViewerRef, Props>(
          if (form.option?.update_interval) {
            form.option.update_interval = +form.option.update_interval;
          }
+          if (form.option?.user_agent === "") {
+            delete form.option.user_agent;
+          }
          const name = form.name || `${form.type} file`;
          const item = { ...form, name };

--- a/src/components/proxy/proxy-render.tsx
+++ b/src/components/proxy/proxy-render.tsx
@@ -19,6 +19,9 @@ import type { IRenderItem } from "./use-render-list";
 import { useVerge } from "@/hooks/use-verge";
 import { useRecoilState } from "recoil";
 import { atomThemeMode } from "@/services/states";
+import { useEffect, useState } from "react";
+import { convertFileSrc } from "@tauri-apps/api/tauri";
+import { downloadIconCache } from "@/services/cmds";

 interface RenderProps {
  item: IRenderItem;
@@ -38,6 +41,23 @@ export const ProxyRender = (props: RenderProps) => {
  const [mode] = useRecoilState(atomThemeMode);
  const isDark = mode === "light" ? false : true;
  const itembackgroundcolor = isDark ? "#282A36" : "#ffffff";
+  const [iconCachePath, setIconCachePath] = useState("");
+
+  useEffect(() => {
+    initIconCachePath();
+  }, [group]);
+
+  async function initIconCachePath() {
+    if (group.icon && group.icon.trim().startsWith("http")) {
+      const fileName = getFileName(group.icon);
+      const iconPath = await downloadIconCache(group.icon, fileName);
+      setIconCachePath(convertFileSrc(iconPath));
+    }
+  }
+
+  function getFileName(url: string) {
+    return url.substring(url.lastIndexOf("/") + 1);
+  }

  if (type === 0 && !group.hidden) {
    return (
@@ -55,7 +75,7 @@ export const ProxyRender = (props: RenderProps) => {
          group.icon &&
          group.icon.trim().startsWith("http") && (
            <img
-              src={group.icon}
+              src={iconCachePath === "" ? group.icon : iconCachePath}
              height="32px"
              style={{ marginRight: "12px", borderRadius: "6px" }}
            />
--- a/src/components/rule/rule-item.tsx
+++ b/src/components/rule/rule-item.tsx
@@ -20,7 +20,7 @@ interface Props {
 }

 const parseColor = (text: string) => {
-  if (text === "REJECT") return "error.main";
+  if (text === "REJECT" || text === "REJECT-DROP") return "error.main";
  if (text === "DIRECT") return "text.primary";

  let sum = 0;
--- a/src/components/setting/mods/layout-viewer.tsx
+++ b/src/components/setting/mods/layout-viewer.tsx
@@ -19,7 +19,6 @@ export const LayoutViewer = forwardRef<DialogRef>((props, ref) => {
  const [sysproxyIcon, setSysproxyIcon] = useState("");
  const [tunIcon, setTunIcon] = useState("");

-  // const { menu_icon } = verge ?? {};
  useEffect(() => {
    initIconPath();
  }, []);
--- a/src/components/test/test-item.tsx
+++ b/src/components/test/test-item.tsx
@@ -17,8 +17,9 @@ import { LanguageTwoTone } from "@mui/icons-material";
 import { Notice } from "@/components/base";
 import { TestBox } from "./test-box";
 import delayManager from "@/services/delay";
-import { cmdTestDelay } from "@/services/cmds";
+import { cmdTestDelay, downloadIconCache } from "@/services/cmds";
 import { listen, Event, UnlistenFn } from "@tauri-apps/api/event";
+import { convertFileSrc } from "@tauri-apps/api/tauri";

 interface Props {
  id: string;
@@ -39,6 +40,23 @@ export const TestItem = (props: Props) => {
  const [position, setPosition] = useState({ left: 0, top: 0 });
  const [delay, setDelay] = useState(-1);
  const { uid, name, icon, url } = itemData;
+  const [iconCachePath, setIconCachePath] = useState("");
+
+  useEffect(() => {
+    initIconCachePath();
+  }, [icon]);
+
+  async function initIconCachePath() {
+    if (icon && icon.trim().startsWith("http")) {
+      const fileName = getFileName(icon);
+      const iconPath = await downloadIconCache(icon, fileName);
+      setIconCachePath(convertFileSrc(iconPath));
+    }
+  }
+
+  function getFileName(url: string) {
+    return url.substring(url.lastIndexOf("/") + 1);
+  }

  const onDelay = async () => {
    setDelay(-2);
@@ -104,7 +122,10 @@ export const TestItem = (props: Props) => {
          {icon && icon.trim() !== "" ? (
            <Box sx={{ display: "flex", justifyContent: "center" }}>
              {icon.trim().startsWith("http") && (
-                <img src={icon} height="40px" />
+                <img
+                  src={iconCachePath === "" ? icon : iconCachePath}
+                  height="40px"
+                />
              )}
              {icon.trim().startsWith("data") && (
                <img src={icon} height="40px" />
--- a/src/pages/_layout.tsx
+++ b/src/pages/_layout.tsx
@@ -132,7 +132,7 @@ const Layout = () => {
              : {},
          ]}
        >
-          <div className="layout__left" data-tauri-drag-region="true">
+          <div className="layout__left">
            <div className="the-logo" data-tauri-drag-region="true">
              {!isDark ? <LogoSvg /> : <LogoSvg_dark />}
              {<UpdateButton className="the-newbtn" />}
@@ -157,7 +157,12 @@ const Layout = () => {

          <div className="layout__right">
            {
-              <div className="the-bar" data-tauri-drag-region="true">
+              <div className="the-bar">
+                <div
+                  className="the-dragbar"
+                  data-tauri-drag-region="true"
+                  style={{ width: "100%" }}
+                ></div>
                {OS !== "macos" && <LayoutControl />}
              </div>
            }
--- a/src/pages/_theme.tsx
+++ b/src/pages/_theme.tsx
@@ -12,8 +12,8 @@ export const defaultTheme = {
  warning_color: "#FF9500",
  success_color: "#06943D",
  background_color: "#f5f5f5",
-  font_family: `-apple-system, BlinkMacSystemFont,"Microsoft YaHei UI", "Microsoft YaHei", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", ${
-    OS === "windows" ? "twemoji mozilla" : ""
+  font_family: `-apple-system, BlinkMacSystemFont,"Microsoft YaHei UI", "Microsoft YaHei", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji"${
+    OS === "windows" ? ", twemoji mozilla" : ""
  }`,
 };

--- a/src/services/cmds.ts
+++ b/src/services/cmds.ts
@@ -227,3 +227,7 @@ export async function copyIconFile(
 ) {
  return invoke<void>("copy_icon_file", { path, name });
 }
+
+export async function downloadIconCache(url: string, name: string) {
+  return invoke<string>("download_icon_cache", { url, name });
+}