up 7.20.4

Add RiscV64 RPM build && Update (#9114 )
* Create package-rhel-riscv.sh * Update build-linux.yml * Update UpdateService.cs * Update CoreInfo.cs * Add RiscV64 download URLs for various platforms * Update build-linux.yml * Update ResUI.fr.resx * Update ResUI.fr.resx * Update ResUI.fr.resx * Update proxy_set_linux_sh --------- Co-authored-by: xujie86 <167618598+xujie86@users.noreply.github.com>
2026-05-18 08:34:35 +03:00 · 2026-04-16 13:39:52 +08:00 · 2026-04-15 20:50:27 +08:00 · 2026-04-15 19:06:26 +08:00 · 2026-04-15 19:06:03 +08:00 · 2026-04-14 14:29:52 +08:00
374 changed files with 49356 additions and 53529 deletions
@@ -3,6 +3,26 @@ description: 在提出问题前请先自行排除服务器端问题和升级到
 title: "[Bug]: "
 labels: ["bug"]
 body:
+  - type: markdown
+    attributes:
+      value: |
+        ### 报告 Bug 前请务必确认以下事项：
+        > ** **
+        > **✓ 已自行排除服务器端问题。**
+        > **✓ 已升级到最新客户端版本。**
+        > **✓ 已通过搜索确认没有人提出过相同问题。**
+        > **✓ 已确认自己的电脑系统环境是受支持的。**
+
+        ---
+
+  - type: input
+    id: "os-version"
+    attributes:
+      label: "操作系统和版本"
+      description: "操作系统和版本"
+    validations:
+      required: true
+
  - type: input
    id: "expectation"
    attributes:
@@ -10,6 +30,7 @@ body:
      description: "描述你认为应该发生什么"
    validations:
      required: true
+
  - type: textarea
    id: "describe-the-bug"
    attributes:
@@ -17,22 +38,34 @@ body:
      description: "描述实际发生了什么"
    validations:
      required: true
+
  - type: textarea
    id: "reproduction-method"
    attributes:
      label: "复现方法"
      description: "在BUG出现前执行了哪些操作"
-      placeholder: 标序号
+      placeholder: "标序号"
    validations:
      required: true
+
  - type: textarea
-    id: "log"
+    id: "gui-log"
    attributes:
-      label: "日志信息"
+      label: "软件日志"
      description: "位置在软件当前目录下的guiLogs"
-      placeholder: 在日志开始和结束位置粘贴冒号后的内容：```
+      placeholder: "在日志开始和结束位置粘贴冒号后的内容到这："
    validations:
      required: true
+
+  - type: textarea
+    id: "core-log"
+    attributes:
+      label: "内核日志"
+      description: "位置在软件主界面的信息框内"
+      placeholder: "在信息框内鼠标右键复制全部信息粘贴在这："
+    validations:
+      required: true
+
  - type: textarea
    id: "more"
    attributes:
@@ -40,6 +73,7 @@ body:
      description: "可选"
    validations:
      required: false
+
  - type: checkboxes
    id: "latest-version"
    attributes:
@@ -48,6 +82,7 @@ body:
      options:
        - label: 是
          required: true
+
  - type: checkboxes
    id: "issues"
    attributes:
@@ -56,3 +91,12 @@ body:
      options:
        - label: 是
          required: true
+
+  - type: checkboxes
+    id: "system-version"
+    attributes:
+      label: "我确认系统版本是受支持的"
+      description: "否则请切换后尝试"
+      options:
+        - label: 是
+          required: true
@@ -0,0 +1,9 @@
+blank_issues_enabled: false
+
+contact_links:
+  - name: Discussions / 讨论区
+    url: https://github.com/2dust/v2rayN/discussions
+    about: 使用问题或需要帮助请前往 Discussions。
+  - name: Wiki / 使用说明
+    url: https://github.com/2dust/v2rayN/wiki
+    about: 查看常见问题和使用文档。
@@ -0,0 +1,69 @@
+name: release all platforms
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        required: false
+        type: string
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Trigger build windows
+        if: inputs.release_tag != ''
+        run: |
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-windows.yml/dispatches \
+            -d "{
+              \"ref\": \"master\",
+              \"inputs\": {
+                \"release_tag\": \"${{ inputs.release_tag }}\"
+              }
+            }"
+
+      - name: Trigger build linux
+        if: inputs.release_tag != ''
+        run: |
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-linux.yml/dispatches \
+            -d "{
+              \"ref\": \"master\",
+              \"inputs\": {
+                \"release_tag\": \"${{ inputs.release_tag }}\"
+              }
+            }"
+
+      - name: Trigger build osx
+        if: inputs.release_tag != ''
+        run: |
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-osx.yml/dispatches \
+            -d "{
+              \"ref\": \"master\",
+              \"inputs\": {
+                \"release_tag\": \"${{ inputs.release_tag }}\"
+              }
+            }"
+
+      - name: Trigger build windows desktop
+        if: inputs.release_tag != ''
+        run: |
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-windows-desktop.yml/dispatches \
+            -d "{
+              \"ref\": \"master\",
+              \"inputs\": {
+                \"release_tag\": \"${{ inputs.release_tag }}\"
+              }
+            }"
@@ -10,90 +10,244 @@ on:
    branches:
      - master

-env:
-  OutputArch: "linux-64"
-  OutputArchArm: "linux-arm64"
-  OutputPath64:  "${{ github.workspace }}/v2rayN/Release/linux-64"
-  OutputPathArm64:  "${{ github.workspace }}/v2rayN/Release/linux-arm64"
+permissions:
+  contents: write

 jobs:
  build:
-    strategy:
-      matrix:
-        configuration: [Release]
+    uses: ./.github/workflows/build.yml
+    with:
+      target: linux

-    runs-on: ubuntu-22.04
+  release-zip:
+    if: inputs.release_tag != ''
+    needs: build
+    uses: ./.github/workflows/package-zip.yml
+    with:
+      target: linux
+      release_tag: ${{ inputs.release_tag }}
+
+  deb:
+    name: build and release deb x64 & arm64
+    if: |
+      (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') ||
+      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
+    runs-on: ubuntu-24.04
+    container: debian:13
+    env:
+      RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}

    steps:
-    - name: Checkout
-      uses: actions/checkout@v4.2.2
-
-    - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
-      with:
-        dotnet-version: '8.0.x'
-
-    - name: Build
+    - name: Prepare tools (Debian)
+      shell: bash
      run: |
-        cd v2rayN 
-        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-x64   --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPath64
-        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPathArm64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r linux-x64   --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -o $OutputPath64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r linux-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -o $OutputPathArm64
+        set -euo pipefail
+        export DEBIAN_FRONTEND=noninteractive
+        apt-get update
+        apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file \
+                           ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev \
+                           libc6 libgcc-s1 libstdc++6 zlib1g libicu-dev libssl-dev

-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v4.6.0
+    - name: Checkout repo (for scripts)
+      uses: actions/checkout@v6.0.2
      with:
-        name: v2rayN-linux
-        path: |
-          ${{ github.workspace }}/v2rayN/Release/linux*
+        submodules: 'recursive'
+        fetch-depth: '0'

-    # release debian package
-    - name: Package debian
-      if: github.event.inputs.release_tag != ''
+    - name: Ensure script permissions
+      run: chmod 755 package-debian.sh
+
+    - name: Package DEB (Debian-family)
+      run: ./package-debian.sh "${RELEASE_TAG}" --arch all
+
+    - name: Collect DEBs into workspace
      run: |
-        chmod 755 package-debian.sh
-        ./package-debian.sh $OutputArch $OutputPath64 ${{ github.event.inputs.release_tag }}
-        ./package-debian.sh $OutputArchArm $OutputPathArm64 ${{ github.event.inputs.release_tag }}
+        mkdir -p "$GITHUB_WORKSPACE/dist/deb"
+        rsync -av "$HOME/debbuild/" "$GITHUB_WORKSPACE/dist/deb/" || true
+        find "$GITHUB_WORKSPACE/dist/deb" -name "v2rayn_*_amd64.deb" \
+          -exec mv {} "$GITHUB_WORKSPACE/dist/deb/v2rayN-linux-64.deb" \; || true
+        find "$GITHUB_WORKSPACE/dist/deb" -name "v2rayn_*_arm64.deb" \
+          -exec mv {} "$GITHUB_WORKSPACE/dist/deb/v2rayN-linux-arm64.deb" \; || true
+        echo "==== Dist tree ===="
+        ls -R "$GITHUB_WORKSPACE/dist/deb" || true

-    - name: Upload deb to release
+    - name: Upload DEBs to release
      uses: svenstaro/upload-release-action@v2
-      if: github.event.inputs.release_tag != ''
      with:
-        file: ${{ github.workspace }}/v2rayN*.deb
-        tag: ${{ github.event.inputs.release_tag }}
+        file: dist/deb/**/*.deb
+        tag: ${{ env.RELEASE_TAG }}
        file_glob: true
        prerelease: true

-    - name: Package AppImage
-      if: github.event.inputs.release_tag != ''
-      run: |
-        chmod 755 package-appimage.sh
-        ./package-appimage.sh $OutputArch $OutputPath64 ${{ github.event.inputs.release_tag }}
-        ./package-appimage.sh $OutputArchArm $OutputPathArm64 ${{ github.event.inputs.release_tag }}
+  rpm:
+    name: build and release rpm x64 & arm64
+    if: |
+      (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') ||
+      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
+    runs-on: ubuntu-24.04
+    container: registry.access.redhat.com/ubi10/ubi
+    env:
+      RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}

-    - name: Upload AppImage to release
-      uses: svenstaro/upload-release-action@v2
-      if: github.event.inputs.release_tag != ''
+    steps:
+    - name: Prepare tools (Red Hat)
+      shell: bash
+      run: |
+        set -euo pipefail
+
+        . /etc/os-release
+        EL_MAJOR="${VERSION_ID%%.*}"
+        echo "EL_MAJOR=${EL_MAJOR}"
+
+        dnf -y makecache || true
+        command -v curl >/dev/null || dnf -y install curl ca-certificates
+
+        ARCH="$(uname -m)"
+        case "$ARCH" in x86_64|aarch64) ;; *) echo "Unsupported arch: $ARCH"; exit 1 ;; esac
+
+        install_epel_from_dir() {
+          local base="$1" rpm
+          echo "Try: $base"
+
+          rpm="$(
+            {
+              curl -fsSL "$base/Packages/"   2>/dev/null
+              curl -fsSL "$base/Packages/e/" 2>/dev/null | sed 's|href="|href="e/|'
+            } |
+            sed -n 's/.*href="\([^"]*epel-release-[^"]*\.noarch\.rpm\)".*/\1/p' |
+            sort -V | tail -n1
+          )" || true
+
+          if [[ -n "$rpm" ]]; then
+            dnf -y install "$base/Packages/$rpm"
+            return 0
+          fi
+          return 1
+        }
+
+        FEDORA="https://dl.fedoraproject.org/pub/epel/epel-release-latest-${EL_MAJOR}.noarch.rpm"
+        echo "Try Fedora: $FEDORA"
+
+        if curl -fsSLI "$FEDORA" >/dev/null; then
+          dnf -y install "$FEDORA"
+        else
+          ROCKY="https://dl.rockylinux.org/pub/rocky/${EL_MAJOR}/extras/${ARCH}/os"
+          if install_epel_from_dir "$ROCKY"; then
+            :
+          else
+            ALMA="https://repo.almalinux.org/almalinux/${EL_MAJOR}/extras/${ARCH}/os"
+            if install_epel_from_dir "$ALMA"; then
+              :
+            else
+              echo "EPEL bootstrap failed (Fedora/Rocky/Alma)"
+              exit 1
+            fi
+          fi
+        fi
+
+        dnf -y install sudo git rpm-build rpmdevtools dnf-plugins-core \
+                       rsync findutils tar gzip unzip which
+
+        dnf repolist | grep -i epel || true
+
+    - name: Checkout repo (for scripts)
+      uses: actions/checkout@v6.0.2
      with:
-        file: ${{ github.workspace }}/v2rayN*.AppImage
-        tag: ${{ github.event.inputs.release_tag }}
+        submodules: 'recursive'
+        fetch-depth: '0'
+
+    - name: Ensure script permissions
+      run: chmod 755 package-rhel.sh
+
+    - name: Package RPM (RHEL-family)
+      run: ./package-rhel.sh "${RELEASE_TAG}" --arch all
+
+    - name: Collect RPMs into workspace
+      run: |
+        mkdir -p "$GITHUB_WORKSPACE/dist/rpm"
+        rsync -av "$HOME/rpmbuild/RPMS/" "$GITHUB_WORKSPACE/dist/rpm/" || true
+        find "$GITHUB_WORKSPACE/dist/rpm" -name "v2rayN-*-1*.x86_64.rpm"  -exec mv {} "$GITHUB_WORKSPACE/dist/rpm/v2rayN-linux-rhel-64.rpm" \;  || true
+        find "$GITHUB_WORKSPACE/dist/rpm" -name "v2rayN-*-1*.aarch64.rpm" -exec mv {} "$GITHUB_WORKSPACE/dist/rpm/v2rayN-linux-rhel-arm64.rpm" \; || true
+        echo "==== Dist tree ===="
+        ls -R "$GITHUB_WORKSPACE/dist/rpm" || true
+
+    - name: Upload RPMs to release
+      uses: svenstaro/upload-release-action@v2
+      with:
+        file: dist/rpm/**/*.rpm
+        tag: ${{ env.RELEASE_TAG }}
        file_glob: true
        prerelease: true

-    # release zip archive
-    - name: Package release zip archive
-      if: github.event.inputs.release_tag != ''
+  rpm-riscv64:
+    name: build and release rpm riscv64
+    if: |
+      (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') ||
+      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
+    runs-on: ubuntu-24.04-riscv
+    container: ghcr.io/xujiegb/fedora-riscv:43-latest
+    env:
+      RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}
+
+    steps:
+    - name: Prepare tools (Red Hat)
+      shell: bash
      run: |
-        chmod 755 package-release-zip.sh
-        ./package-release-zip.sh $OutputArch $OutputPath64
-        ./package-release-zip.sh $OutputArchArm $OutputPathArm64
-    
-    - name: Upload zip archive to release
-      uses: svenstaro/upload-release-action@v2
-      if: github.event.inputs.release_tag != ''
-      with:
-        file: ${{ github.workspace }}/v2rayN*.zip
-        tag: ${{ github.event.inputs.release_tag }}
-        file_glob: true
-        prerelease: true
+        set -euo pipefail
+        dnf -y makecache
+        dnf -y install \
+          sudo git rpm-build rpmdevtools dnf-plugins-core rsync findutils tar gzip unzip which curl jq wget file \
+          ca-certificates desktop-file-utils xdg-utils python3 gcc make glibc-devel kernel-headers libatomic libstdc++
+
+    - name: Checkout repo (for scripts)
+      shell: bash
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        set -euo pipefail
+        rm -rf ./*
+        git init .
+        git config --global --add safe.directory "$PWD"
+        git remote add origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
+        git fetch --depth=1 origin "${GITHUB_SHA}"
+        git checkout FETCH_HEAD
+        git submodule update --init --recursive
+
+    - name: Ensure script permissions
+      run: chmod 755 package-rhel-riscv.sh
+
+    - name: Package RPM (RHEL-family)
+      run: ./package-rhel-riscv.sh "${RELEASE_TAG}"
+
+    - name: Collect RPMs into workspace
+      run: |
+        mkdir -p "$GITHUB_WORKSPACE/dist/rpm-riscv64"
+        rsync -av "$HOME/rpmbuild/RPMS/" "$GITHUB_WORKSPACE/dist/rpm-riscv64/" || true
+        find "$GITHUB_WORKSPACE/dist/rpm-riscv64" -name "*.riscv64.rpm" \
+          -exec mv {} "$GITHUB_WORKSPACE/dist/rpm-riscv64/v2rayN-linux-rhel-riscv64.rpm" \; || true
+        echo "==== Dist tree ===="
+        ls -R "$GITHUB_WORKSPACE/dist/rpm-riscv64" || true
+
+    - name: Upload RPMs to release
+      shell: bash
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: |
+        set -euo pipefail
+        shopt -s globstar nullglob
+
+        files=(dist/rpm-riscv64/**/*.rpm)
+        (( ${#files[@]} )) || { echo "No RPMs found."; exit 1; }
+
+        api="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/tags/${RELEASE_TAG}"
+        upload_url="$(curl -fsSL -H "Authorization: Bearer ${GITHUB_TOKEN}" "$api" | jq -r '.upload_url // empty' | sed 's/{?name,label}//')"
+        [[ "$upload_url" ]] || { echo "Release upload URL not found: ${RELEASE_TAG}"; exit 1; }
+
+        for f in "${files[@]}"; do
+          echo "Uploading ${f##*/}"
+          curl -fsSL -X POST \
+            -H "Authorization: Bearer ${GITHUB_TOKEN}" \
+            -H "Content-Type: application/x-rpm" \
+            --data-binary @"$f" \
+            "${upload_url}?name=${f##*/}"
+        done
@@ -10,75 +10,62 @@ on:
    branches:
      - master

-env:
-  OutputArch: "macos-64"
-  OutputArchArm: "macos-arm64"
-  OutputPath64:  "${{ github.workspace }}/v2rayN/Release/macos-64"
-  OutputPathArm64:  "${{ github.workspace }}/v2rayN/Release/macos-arm64"
+permissions:
+  contents: write

 jobs:
  build:
+    uses: ./.github/workflows/build.yml
+    with:
+      target: macos
+
+  release-zip:
+    if: inputs.release_tag != ''
+    needs: build
+    uses: ./.github/workflows/package-zip.yml
+    with:
+      target: macos
+      release_tag: ${{ inputs.release_tag }}
+    
+  dmg:
+    name: package and release macOS dmg
+    if: inputs.release_tag != ''
+    needs: build
    strategy:
      matrix:
-        configuration: [Release]
-
+        arch: [ x64, arm64 ]
    runs-on: macos-latest
-
+    env:
+      Arch: |-
+        ${{
+          case(
+            matrix.arch == 'x64', '64',
+            matrix.arch
+          ) 
+        }} 
    steps:
    - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v6.0.2

-    - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
+    - name: Restore build artifacts
+      uses: actions/download-artifact@v8
      with:
-        dotnet-version: '8.0.x'
-
-    - name: Build
-      run: |
-        cd v2rayN 
-        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-x64   --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPath64
-        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPathArm64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r osx-x64   --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true	-o $OutputPath64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r osx-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true	-o $OutputPathArm64
-
-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v4.6.0
-      with:
-        name: v2rayN-macos
-        path: |
-          ${{ github.workspace }}/v2rayN/Release/macos*
+        name: ${{ matrix.arch }}
+        path: v2rayN-macos-${{ env.Arch }}
    
-    # release osx package
-    - name: Package osx
-      if: github.event.inputs.release_tag != ''
-      run: |
-        brew install create-dmg
-        chmod 755 package-osx.sh
-        ./package-osx.sh $OutputArch $OutputPath64 ${{ github.event.inputs.release_tag }}
-        ./package-osx.sh $OutputArchArm $OutputPathArm64 ${{ github.event.inputs.release_tag }}
+    - name: Setup create-dmg
+      run: brew install create-dmg
+
+    - name: Ensure script permissions
+      run: chmod 755 package-osx.sh
+
+    - name: Package dmg
+      run: ./package-osx.sh macos-$Arch v2rayN-macos-$Arch ${{ inputs.release_tag }}
    
    - name: Upload dmg to release
      uses: svenstaro/upload-release-action@v2
-      if: github.event.inputs.release_tag != ''
      with:
        file: ${{ github.workspace }}/v2rayN*.dmg
-        tag: ${{ github.event.inputs.release_tag }}
+        tag: ${{ inputs.release_tag }}
        file_glob: true
        prerelease: true
-
-    # release zip archive
-    - name: Package release zip archive
-      if: github.event.inputs.release_tag != ''
-      run: |
-        chmod 755 package-release-zip.sh
-        ./package-release-zip.sh $OutputArch $OutputPath64
-        ./package-release-zip.sh $OutputArchArm $OutputPathArm64
-    
-    - name: Upload zip archive to release
-      uses: svenstaro/upload-release-action@v2
-      if: github.event.inputs.release_tag != ''
-      with:
-        file: ${{ github.workspace }}/v2rayN*.zip
-        tag: ${{ github.event.inputs.release_tag }}
-        file_glob: true
-        prerelease: true
@@ -10,41 +10,19 @@ on:
    branches:
      - master

-env:
-  OutputArch: "windows-64"
-  OutputArchArm: "windows-arm64"
-  OutputPath64:  "${{ github.workspace }}/v2rayN/Release/windows-64"
-  OutputPathArm64:  "${{ github.workspace }}/v2rayN/Release/windows-arm64"
+permissions:
+  contents: write

 jobs:
  build:
-    strategy:
-      matrix:
-        configuration: [Release]
+    uses: ./.github/workflows/build.yml
+    with:
+      target: windows

-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4.2.2
-
-    - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
-      with:
-        dotnet-version: '8.0.x'
-
-    - name: Build
-      run: |
-        cd v2rayN 
-        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r win-x64   --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64
-        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r win-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPathArm64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64   --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -p:EnableWindowsTargeting=true -o $OutputPath64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 --self-contained=true -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true -p:EnableWindowsTargeting=true -o $OutputPathArm64
-
-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v4.6.0
-      with:
-        name: v2rayN-windows-desktop
-        path: |
-          ${{ github.workspace }}/v2rayN/Release/windows*
-    
+  release-zip:
+    if: inputs.release_tag != ''
+    needs: build
+    uses: ./.github/workflows/package-zip.yml
+    with:
+      target: windows-desktop
+      release_tag: ${{ inputs.release_tag }}
@@ -10,62 +10,20 @@ on:
    branches:
      - master

-env:
-  OutputArch: "windows-64"
-  OutputArchArm: "windows-arm64"
-  OutputPath64:  "${{ github.workspace }}/v2rayN/Release/windows-64"
-  OutputPathArm64:  "${{ github.workspace }}/v2rayN/Release/windows-arm64"
-  OutputPath64Sc:  "${{ github.workspace }}/v2rayN/Release/windows-64-SelfContained"
+permissions:
+  contents: write

 jobs:
  build:
-    strategy:
-      matrix:
-        configuration: [Release]
+    uses: ./.github/workflows/build.yml
+    with:
+      target: windows
+      project: ./v2rayN/v2rayN.csproj

-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4.2.2
-
-    - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
-      with:
-        dotnet-version: '8.0.x'
-
-    - name: Build
-      run: |
-        cd v2rayN 
-        dotnet publish ./v2rayN/v2rayN.csproj -c Release -r win-x64   --self-contained=false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64
-        dotnet publish ./v2rayN/v2rayN.csproj -c Release -r win-arm64 --self-contained=false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPathArm64
-        dotnet publish ./v2rayN/v2rayN.csproj -c Release -r win-x64   --self-contained=true  -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64Sc
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64   --self-contained=false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPath64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 --self-contained=false -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:EnableWindowsTargeting=true -o $OutputPathArm64
-        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64   --self-contained=true  -p:PublishReadyToRun=false -p:PublishSingleFile=true -p:PublishTrimmed=true  -p:EnableWindowsTargeting=true -o $OutputPath64Sc
-
-  
-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v4.6.0
-      with:
-        name: v2rayN-windows
-        path: |
-          ${{ github.workspace }}/v2rayN/Release/windows*
-    
-    # release zip archive
-    - name: Package release zip archive
-      if: github.event.inputs.release_tag != ''
-      run: |
-        chmod 755 package-release-zip.sh
-        ./package-release-zip.sh $OutputArch $OutputPath64
-        ./package-release-zip.sh $OutputArchArm $OutputPathArm64
-        ./package-release-zip.sh "windows-64-SelfContained" $OutputPath64Sc
-    
-    - name: Upload zip archive to release
-      uses: svenstaro/upload-release-action@v2
-      if: github.event.inputs.release_tag != ''
-      with:
-        file: ${{ github.workspace }}/v2rayN*.zip
-        tag: ${{ github.event.inputs.release_tag }}
-        file_glob: true
-        prerelease: true
+  release-zip:
+    if: inputs.release_tag != ''
+    needs: build
+    uses: ./.github/workflows/package-zip.yml
+    with:
+      target: windows
+      release_tag: ${{ inputs.release_tag }}
@@ -0,0 +1,71 @@
+name: build
+
+on:
+  workflow_call:
+    inputs:
+      target: # windows linux macos
+        required: true
+        type: string
+      project:
+        required: false
+        type: string
+        default: './v2rayN.Desktop/v2rayN.Desktop.csproj'
+
+jobs:
+  build:
+    name: build x64 arm64
+    strategy:
+      matrix:
+        arch: [ x64, arm64 ]
+    runs-on: |-
+      ${{
+        case(
+          inputs.target == 'macos', 'macos-latest',
+          inputs.target == 'linux', 'ubuntu-24.04',
+          'ubuntu-latest'
+        )
+      }}
+    env:
+      Output: "${{ github.workspace }}/${{ matrix.arch }}"
+      RID: |-
+        ${{
+          case(
+            inputs.target == 'macos', format('osx-{0}', matrix.arch),
+            inputs.target == 'windows', format('win-{0}', matrix.arch),
+            format('{0}-{1}', inputs.target, matrix.arch)
+          )
+        }}
+      Project: ${{ inputs.project }}
+      ExtOpt: |-
+        ${{
+          case(
+            inputs.target == 'windows', '-p:EnableWindowsTargeting=true',
+            ''
+          )
+        }}
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6.0.2
+      with:
+        submodules: 'recursive'
+        fetch-depth: '0'
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v5.2.0
+      with:
+        dotnet-version: '8.0.x'
+
+    - name: Build v2rayN
+      working-directory: ./v2rayN
+      run: dotnet publish $Project -c Release -r $RID -p:SelfContained=true $ExtOpt -o $Output
+
+    - name: Build AmazTool
+      working-directory: ./v2rayN
+      run: dotnet publish ./AmazTool/AmazTool.csproj -c Release -r $RID -p:SelfContained=true -p:PublishTrimmed=true $ExtOpt -o $Output
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v7.0.1
+      with:
+        name: ${{ matrix.arch }}
+        path: ${{ matrix.arch }}
@@ -0,0 +1,64 @@
+name: package and release Zip
+
+on:
+  workflow_call:
+    inputs:
+      release_tag:
+        required: true
+        type: string
+      target: # windows linux macos windows-desktop
+        required: true
+        type: string
+
+permissions:
+  contents: write
+
+jobs:
+  package:
+    name: package x64 arm64
+    strategy:
+      matrix:
+        arch: [ x64, arm64 ]
+    runs-on: ubuntu-latest
+    env:
+      Target: |- 
+        ${{
+          case(
+            inputs.target == 'windows-desktop', 'windows',
+            inputs.target
+          )
+        }}
+      Arch: |-
+        ${{
+          case(
+            matrix.arch == 'x64', '64',
+            matrix.arch
+          ) 
+        }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6.0.2
+
+    - name: Restore build artifacts
+      uses: actions/download-artifact@v8
+      with:
+        name: ${{ matrix.arch }}
+        path: v2rayN-${{ env.Target }}-${{ env.Arch }}
+    
+    - name: Get v2rayN-core-bin
+      run: wget -nv -O v2rayN-$Target-$Arch.zip "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/v2rayN-$Target-$Arch.zip"
+    
+    - name: Package zip archive
+      run: 7z a -tZip v2rayN-$Target-$Arch.zip v2rayN-$Target-$Arch -mx1
+
+    - name: Rename windows-desktop 
+      if: inputs.target == 'windows-desktop'
+      run: mv "v2rayN-$Target-$Arch.zip" "v2rayN-$Target-$Arch-desktop.zip"
+    
+    - name: Upload zip archive to release
+      uses: svenstaro/upload-release-action@v2
+      with:
+        file: ${{ github.workspace }}/v2rayN*.zip
+        tag: ${{ inputs.release_tag }}
+        file_glob: true
+        prerelease: true
@@ -22,10 +22,18 @@ jobs:
          $github = Invoke-RestMethod -uri "https://api.github.com/repos/2dust/v2rayN/releases" 

          $targetRelease = $github | Where-Object -Property prerelease -match 'False' | Select -First 1
-          $installerUrl  = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'v2rayN-windows-64\.zip*' | Select -ExpandProperty browser_download_url
-
+          
+          $x64InstallerUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'v2rayN-windows-64\.zip' | Select -ExpandProperty browser_download_url
+          $arm64InstallerUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'v2rayN-windows-arm64\.zip' | Select -ExpandProperty browser_download_url
+          
          $ver = $targetRelease.tag_name

          # getting latest wingetcreate file
          iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
-          .\wingetcreate.exe update $wingetPackage -s -v $ver -u "$installerUrl|x64" -t $gitToken
+          
+          Write-Host "Updating with both x64 and arm64 installers"
+          Write-Host "Version: $ver"
+          Write-Host "x64 URL: $x64InstallerUrl"
+          Write-Host "arm64 URL: $arm64InstallerUrl"
+          
+          .\wingetcreate.exe update $wingetPackage -s -v $ver -u "$x64InstallerUrl|x64" "$arm64InstallerUrl|arm64" -t $gitToken
@@ -397,4 +397,5 @@ FodyWeavers.xsd
 *.msp

 # JetBrains Rider
-*.sln.iml
+.idea/
+*.sln.iml
@@ -0,0 +1,3 @@
+[submodule "v2rayN/GlobalHotKeys"]
+	path = v2rayN/GlobalHotKeys
+	url = https://github.com/2dust/GlobalHotKeys
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    Copyright (C) 2019-Present  2dust

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:

-    <program>  Copyright (C) <year>  <name of author>
+    v2rayN  Copyright (C) 2019-Present  2dust
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
@@ -1,16 +1,18 @@
 # v2rayN
-A GUI client for Windows, Linux and macOS, support [Xray](https://github.com/XTLS/Xray-core) and [sing-box](https://github.com/SagerNet/sing-box/releases) and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)

+A GUI client for Windows, Linux and macOS, support [Xray](https://github.com/XTLS/Xray-core)
+and [sing-box](https://github.com/SagerNet/sing-box)
+and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)

 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayN)](https://github.com/2dust/v2rayN/commits/master)
 [![CodeFactor](https://www.codefactor.io/repository/github/2dust/v2rayn/badge)](https://www.codefactor.io/repository/github/2dust/v2rayn)
 [![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayN/latest/total?logo=github)](https://github.com/2dust/v2rayN/releases)
 [![Chat on Telegram](https://img.shields.io/badge/Chat%20on-Telegram-brightgreen.svg)](https://t.me/v2rayn)

-
 ## How to use

 Read the [Wiki](https://github.com/2dust/v2rayN/wiki) for details.

 ## Telegram Channel
+
 [github_2dust](https://t.me/github_2dust)
@@ -1,112 +0,0 @@
-#!/bin/bash
-
-Arch="$1"
-OutputPath="$2"
-Version="$3"
-
-FileName="v2rayN-${Arch}.zip"
-wget -nv -O $FileName "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/$FileName"
-7z x $FileName -aoa
-cp -rf v2rayN-${Arch}/* $OutputPath
-
-PackagePath="v2rayN-Package-${Arch}"
-mkdir -p "${PackagePath}/AppDir/opt"
-cp -rf $OutputPath "${PackagePath}/AppDir/opt/v2rayN"
-echo "When this file exists, app will not store configs under this folder" >"${PackagePath}/AppDir/opt/v2rayN/NotStoreConfigHere.txt"
-
-if [ $Arch = "linux-64" ]; then
-    Arch2="x86_64"
-    Arch3="amd64"
-    Interpreter="ld-linux-x86-64.so.2"
-else
-    Arch2="aarch64"
-    Arch3="arm64"
-    Interpreter="ld-linux-aarch64.so.1"
-fi
-echo $Arch2
-
-# basic
-cat >"${PackagePath}/AppDir/AppRun" <<-EOF
-#!/bin/sh
-HERE="\$(dirname "\$(readlink -f "\${0}")")"
-export PATH="\${HERE}"/opt/v2rayN/:"\${PATH}"
-export LD_LIBRARY_PATH="\${HERE}"/opt/v2rayN/:"\${LD_LIBRARY_PATH}"
-cd "\${HERE}/opt/v2rayN"
-exec "\${HERE}/opt/v2rayN/v2rayN" \$@
-EOF
-
-cat >"${PackagePath}/AppDir/v2rayN.desktop" <<-EOF
-[Desktop Entry]
-Name=v2rayN
-Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
-Exec=v2rayN
-Icon=v2rayN
-Terminal=false
-Type=Application
-Categories=Network;
-EOF
-
-sudo cp "${PackagePath}/AppDir/opt/v2rayN/v2rayN.png" "${PackagePath}/AppDir/v2rayN.png"
-sudo dpkg --add-architecture ${Arch3}
-sudo apt update
-mkdir deb_folder
-cd deb_folder
-apt download libstdc++6:${Arch3}
-apt download libc6:${Arch3}
-apt download libcrypt1:${Arch3}
-apt download libgcc-s1:${Arch3}
-apt download libidn2-0:${Arch3}
-apt download gcc-12-base:${Arch3}
-apt download zlib1g:${Arch3}
-apt download libfreetype6:${Arch3}
-apt download libexpat1:${Arch3}
-apt download libbrotli1:${Arch3}
-apt download libx11-6:${Arch3}
-apt download libx11-xcb1:${Arch3}
-apt download libxcb1:${Arch3}
-apt download libxau6:${Arch3}
-apt download libxdmcp6:${Arch3}
-apt download libbsd0:${Arch3}
-apt download libmd0:${Arch3}
-apt download libice6:${Arch3}
-apt download libsm6:${Arch3}
-apt download libuuid1:${Arch3}
-apt download libxrandr2:${Arch3}
-apt download libxext6:${Arch3}
-apt download libxrender1:${Arch3}
-apt download libxi6:${Arch3}
-apt download libsm6:${Arch3}
-apt download libxcursor1:${Arch3}
-apt download libxfixes3:${Arch3}
-apt download libpng16-16:${Arch3} || true
-apt download libpng16-16t64:${Arch3} || true
-apt download libicu66:${Arch3} || true
-apt download libicu70:${Arch3} || true
-apt download libicu74:${Arch3} || true
-apt download libfontconfig1:${Arch3} || true
-apt download libfontconfig:${Arch3} || true
-mkdir ../output_folder
-for deb in *.deb; do
-    dpkg-deb -x "$deb" ../output_folder/
-done
-cd ..
-find output_folder -type f -name "*.so*" -exec cp {} ${PackagePath}/AppDir/opt/v2rayN/ \;
-find output_folder -type l -name "*.so*" -exec cp {} ${PackagePath}/AppDir/opt/v2rayN/ \;
-rm -rf deb_folder output_folder
-
-sudo chmod 0755 "${PackagePath}/AppDir/opt/v2rayN/v2rayN"
-sudo chmod 0755 "${PackagePath}/AppDir/AppRun"
-
-sudo apt install -y patchelf
-
-pushd "${PackagePath}/AppDir/opt/v2rayN"
-patchelf --set-interpreter ${Interpreter} v2rayN
-popd
-
-# desktop && PATH
-
-wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-chmod a+x appimagetool-x86_64.AppImage
-sudo apt install -y libfuse2
-sudo ./appimagetool-x86_64.AppImage "${PackagePath}/AppDir"
-sudo mv "v2rayN-${Arch2}.AppImage" "v2rayN-${Arch}.AppImage"
@@ -1,58 +1,612 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -euo pipefail

-Arch="$1"
-OutputPath="$2"
-Version="$3"
+# Require Debian base branch
+. /etc/os-release

-FileName="v2rayN-${Arch}.zip"
-wget -nv -O $FileName "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/$FileName"
-7z x $FileName
-cp -rf v2rayN-${Arch}/* $OutputPath
+case "${ID:-}" in
+  debian)
+    echo "Detected supported system: ${NAME:-$ID} ${VERSION_ID:-}"
+    ;;
+  *)
+    echo "Unsupported system: ${NAME:-unknown} (${ID:-unknown})."
+    echo "This script only supports: Debian."
+    exit 1
+    ;;
+esac

-PackagePath="v2rayN-Package-${Arch}"
-mkdir -p "${PackagePath}/DEBIAN"
-mkdir -p "${PackagePath}/opt"
-cp -rf $OutputPath "${PackagePath}/opt/v2rayN"
-echo "When this file exists, app will not store configs under this folder" > "${PackagePath}/opt/v2rayN/NotStoreConfigHere.txt"
+# Kernel version
+MIN_KERNEL="6.11"
+CURRENT_KERNEL="$(uname -r)"

-if [ $Arch = "linux-64" ]; then
-    Arch2="amd64" 
+lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$CURRENT_KERNEL" | sort -V | head -n1)"
+
+if [[ "$lowest" != "$MIN_KERNEL" ]]; then
+    echo "Kernel $CURRENT_KERNEL is below $MIN_KERNEL"
+    exit 1
+fi
+
+echo "[OK] Kernel $CURRENT_KERNEL verified."
+
+# Config & Parse arguments
+VERSION_ARG="${1:-}"     # Pass version number like 7.13.8, or leave empty
+WITH_CORE="both"         # Default: bundle both xray+sing-box
+FORCE_NETCORE=0          # --netcore => skip archive bundle, use separate downloads
+ARCH_OVERRIDE=""         # --arch x64|arm64|all (optional compile target)
+BUILD_FROM=""            # --buildfrom 1|2|3 to select channel non-interactively
+
+# If the first argument starts with --, do not treat it as a version number
+if [[ "${VERSION_ARG:-}" == --* ]]; then
+  VERSION_ARG=""
+fi
+# Take the first non --* argument as version, discard it
+if [[ -n "${VERSION_ARG:-}" ]]; then shift || true; fi
+
+# Parse remaining optional arguments
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --with-core)     WITH_CORE="${2:-both}"; shift 2;;
+    --xray-ver)      XRAY_VER="${2:-}"; shift 2;;
+    --singbox-ver)   SING_VER="${2:-}"; shift 2;;
+    --netcore)       FORCE_NETCORE=1; shift;;
+    --arch)          ARCH_OVERRIDE="${2:-}"; shift 2;;
+    --buildfrom)     BUILD_FROM="${2:-}"; shift 2;;
+    *)
+      if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
+      shift;;
+  esac
+done
+
+# Conflict: version number AND --buildfrom cannot be used together
+if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
+  echo "You cannot specify both an explicit version and --buildfrom at the same time."
+  echo "        Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
+  exit 1
+fi
+
+# Check and install dependencies
+host_arch="$(uname -m)"
+[[ "$host_arch" == "aarch64" || "$host_arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
+
+install_ok=0
+
+if command -v apt-get >/dev/null 2>&1; then
+  sudo apt-get update
+  sudo apt-get -y install \
+    curl unzip tar jq rsync ca-certificates git dpkg-dev fakeroot file \
+    desktop-file-utils xdg-utils wget
+
+  if [[ "$host_arch" == "aarch64" ]]; then
+    sudo dpkg --add-architecture amd64 || true
+    sudo apt-get update
+    sudo apt-get -y install \
+      libc6:amd64 libgcc-s1:amd64 libstdc++6:amd64 zlib1g:amd64 libfontconfig1:amd64
+  elif [[ "$host_arch" == "x86_64" ]]; then
+    sudo dpkg --add-architecture arm64 || true
+    sudo apt-get update
+    sudo apt-get -y install \
+      libc6:arm64 libgcc-s1:arm64 libstdc++6:arm64 zlib1g:arm64 libfontconfig1:arm64
+  fi
+
+  # Install .NET SDK 8 via official script
+  wget -q https://dot.net/v1/dotnet-install.sh
+  chmod +x dotnet-install.sh
+  ./dotnet-install.sh --channel 8.0 --install-dir "$HOME/.dotnet"
+
+  export PATH="$HOME/.dotnet:$PATH"
+  export DOTNET_ROOT="$HOME/.dotnet"
+
+  dotnet --info >/dev/null 2>&1 && install_ok=1
+fi
+
+if [[ "$install_ok" -ne 1 ]]; then
+  echo "Could not auto-install dependencies for '$ID'. Make sure these are available:"
+  echo "dotnet-sdk 8.x, curl, unzip, tar, rsync, git, dpkg-deb, desktop-file-utils, xdg-utils"
+  exit 1
+fi
+
+# Root directory
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+# Git submodules (best effort)
+if [[ -f .gitmodules ]]; then
+  git submodule sync --recursive || true
+  git submodule update --init --recursive || true
+fi
+
+# Locate project
+PROJECT="v2rayN.Desktop/v2rayN.Desktop.csproj"
+if [[ ! -f "$PROJECT" ]]; then
+  PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
+fi
+[[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; }
+
+choose_channel() {
+  # If --buildfrom provided, map it directly and skip interaction.
+  if [[ -n "${BUILD_FROM:-}" ]]; then
+    case "$BUILD_FROM" in
+      1) echo "latest"; return 0;;
+      2) echo "prerelease"; return 0;;
+      3) echo "keep"; return 0;;
+      *) echo "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." >&2; exit 1;;
+    esac
+  fi
+
+  # Print menu to stderr and read from /dev/tty so stdout only carries the token.
+  local ch="latest" sel=""
+
+  if [[ -t 0 ]]; then
+    echo "[?] Choose v2rayN release channel:" >&2
+    echo "    1) Latest (stable)  [default]" >&2
+    echo "    2) Pre-release (preview)" >&2
+    echo "    3) Keep current (do nothing)" >&2
+    printf "Enter 1, 2 or 3 [default 1]: " >&2
+
+    if read -r sel </dev/tty; then
+      case "${sel:-}" in
+        2) ch="prerelease" ;;
+        3) ch="keep" ;;
+      esac
+    fi
+  fi
+
+  echo "$ch"
+}
+
+get_latest_tag_latest() {
+  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
+    | jq -re '.tag_name' \
+    | sed 's/^v//'
+}
+
+get_latest_tag_prerelease() {
+  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20" \
+    | jq -re 'first(.[] | select(.prerelease == true) | .tag_name)' \
+    | sed 's/^v//'
+}
+
+git_try_checkout() {
+  local want="$1" ref=""
+  if git rev-parse --git-dir >/dev/null 2>&1; then
+    git fetch --tags --force --prune --depth=1 || true
+    if git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then
+      ref="${want}"
+    fi
+    if [[ -n "$ref" ]]; then
+      echo "[OK] Found ref '${ref}', checking out..."
+      git checkout -f "${ref}"
+      if [[ -f .gitmodules ]]; then
+        git submodule sync --recursive || true
+        git submodule update --init --recursive || true
+      fi
+      return 0
+    fi
+  fi
+  return 1
+}
+
+apply_channel_or_keep() {
+  local ch="$1" tag
+
+  if [[ "$ch" == "keep" ]]; then
+    echo "[*] Keep current repository state (no checkout)."
+    VERSION="$(git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0+git')"
+    VERSION="${VERSION#v}"
+    return 0
+  fi
+
+  echo "[*] Resolving ${ch} tag from GitHub releases..."
+  if [[ "$ch" == "prerelease" ]]; then
+    tag="$(get_latest_tag_prerelease || true)"
+  else
+    tag="$(get_latest_tag_latest || true)"
+  fi
+
+  [[ -n "$tag" ]] || { echo "Failed to resolve latest tag for channel '${ch}'."; exit 1; }
+  echo "[*] Latest tag for '${ch}': ${tag}"
+  git_try_checkout "$tag" || { echo "Failed to checkout '${tag}'."; exit 1; }
+  VERSION="${tag#v}"
+}
+
+if git rev-parse --git-dir >/dev/null 2>&1; then
+  if [[ -n "${VERSION_ARG:-}" ]]; then
+    clean_ver="${VERSION_ARG#v}"
+    if git_try_checkout "$clean_ver"; then
+      VERSION="$clean_ver"
+    else
+      echo "[WARN] Tag '${VERSION_ARG}' not found."
+      ch="$(choose_channel)"
+      apply_channel_or_keep "$ch"
+    fi
+  else
+    ch="$(choose_channel)"
+    apply_channel_or_keep "$ch"
+  fi
 else
-    Arch2="arm64"
+  echo "Current directory is not a git repo; proceeding on current tree."
+  VERSION="${VERSION_ARG:-0.0.0}"
 fi
-echo $Arch2

-# basic
-cat >"${PackagePath}/DEBIAN/control" <<-EOF
-Package: v2rayN
-Version: $Version
-Architecture: $Arch2
-Maintainer: https://github.com/2dust/v2rayN
-Description: A GUI client for Windows and Linux, support Xray core and sing-box-core and others
+VERSION="${VERSION#v}"
+echo "[*] GUI version resolved as: ${VERSION}"
+
+download_xray() {
+  local outdir="$1" rid="$2" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
+  mkdir -p "$outdir"
+  if [[ -z "$ver" ]]; then
+    ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
+        | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
+  fi
+  [[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
+  if [[ "$rid" == "linux-arm64" ]]; then
+    url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip"
+  else
+    url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip"
+  fi
+  echo "[+] Download xray: $url"
+  tmp="$(mktemp -d)"
+  curl -fL "$url" -o "$tmp/$zipname"
+  unzip -q "$tmp/$zipname" -d "$tmp"
+  install -m 755 "$tmp/xray" "$outdir/xray"
+  rm -rf "$tmp"
+}
+
+download_singbox() {
+  # Download sing-box
+  local outdir="$1" rid="$2" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin cronet
+  mkdir -p "$outdir"
+  if [[ -z "$ver" ]]; then
+    ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
+      | grep -Eo '"tag_name":\s*"v[^"]+"' \
+      | sed -E 's/.*"v([^"]+)".*/\1/' \
+      | head -n1)" || true
+  fi
+  [[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
+  if [[ "$rid" == "linux-arm64" ]]; then
+    url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz"
+  else
+    url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz"
+  fi
+  echo "[+] Download sing-box: $url"
+  tmp="$(mktemp -d)"
+  curl -fL "$url" -o "$tmp/$tarname"
+  tar -C "$tmp" -xzf "$tmp/$tarname"
+  bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
+  [[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
+  install -m 755 "$bin" "$outdir/sing-box"
+  cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
+  [[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so"
+  rm -rf "$tmp"
+}
+
+unify_geo_layout() {
+  local outroot="$1"
+  mkdir -p "$outroot/bin"
+  local names=(
+    "geosite.dat"
+    "geoip.dat"
+    "geoip-only-cn-private.dat"
+    "Country.mmdb"
+    "geoip.metadb"
+  )
+  for n in "${names[@]}"; do
+    if [[ -f "$outroot/bin/xray/$n" ]]; then
+      mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
+    fi
+  done
+}
+
+download_geo_assets() {
+  local outroot="$1"
+  local bin_dir="$outroot/bin"
+  local srss_dir="$bin_dir/srss"
+  mkdir -p "$bin_dir" "$srss_dir"
+
+  echo "[+] Download Xray Geo to ${bin_dir}"
+  curl -fsSL -o "$bin_dir/geosite.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
+  curl -fsSL -o "$bin_dir/geoip.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
+  curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
+  curl -fsSL -o "$bin_dir/Country.mmdb" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
+
+  echo "[+] Download sing-box rule DB & rule-sets"
+  curl -fsSL -o "$bin_dir/geoip.metadb" \
+    "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" || true
+
+  for f in \
+    geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs \
+    geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
+    curl -fsSL -o "$srss_dir/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
+  done
+
+  for f in \
+    geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs \
+    geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
+    curl -fsSL -o "$srss_dir/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
+  done
+
+  unify_geo_layout "$outroot"
+}
+
+download_v2rayn_bundle() {
+  local outroot="$1" rid="$2"
+  local url=""
+  if [[ "$rid" == "linux-arm64" ]]; then
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip"
+  else
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip"
+  fi
+  echo "[+] Try v2rayN bundle archive: $url"
+  local tmp zipname
+  tmp="$(mktemp -d)"; zipname="$tmp/v2rayn.zip"
+  curl -fL "$url" -o "$zipname" || { echo "[!] Bundle download failed"; return 1; }
+  unzip -q "$zipname" -d "$tmp" || { echo "[!] Bundle unzip failed"; return 1; }
+
+  if [[ -d "$tmp/bin" ]]; then
+    mkdir -p "$outroot/bin"
+    rsync -a "$tmp/bin/" "$outroot/bin/"
+  else
+    rsync -a "$tmp/" "$outroot/"
+  fi
+
+  rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
+  find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
+
+  local nested_dir
+  nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
+  if [[ -n "$nested_dir" && -d "$nested_dir/bin" ]]; then
+    mkdir -p "$outroot/bin"
+    rsync -a "$nested_dir/bin/" "$outroot/bin/"
+    rm -rf "$nested_dir"
+  fi
+
+  # Unify to bin/
+  unify_geo_layout "$outroot"
+
+  echo "[+] Bundle extracted to $outroot"
+}
+
+BUILT_DEBS=()
+BUILT_ALL=0
+OUTPUT_DIR="$HOME/debbuild"
+mkdir -p "$OUTPUT_DIR"
+
+build_for_arch() {
+  local short="$1"
+  local rid deb_arch outdir_name
+  case "$short" in
+    x64)   rid="linux-x64";   deb_arch="amd64"; outdir_name="amd64" ;;
+    arm64) rid="linux-arm64"; deb_arch="arm64"; outdir_name="arm64" ;;
+    *) echo "Unknown arch '$short' (use x64|arm64)"; return 1 ;;
+  esac
+
+  echo "[*] Building for target: $short  (RID=$rid, DEB arch=$deb_arch)"
+
+  dotnet clean "$PROJECT" -c Release
+  rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
+
+  dotnet restore "$PROJECT"
+  dotnet publish "$PROJECT" \
+    -c Release -r "$rid" \
+    -p:PublishSingleFile=false \
+    -p:SelfContained=true
+
+  local RID_DIR="$rid"
+  local PUBDIR
+  PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
+  [[ -d "$PUBDIR" ]] || { echo "Publish directory not found: $PUBDIR"; return 1; }
+
+  local WORKDIR PKGROOT STAGE DEBIAN_DIR
+  WORKDIR="$(mktemp -d)"
+  PKGROOT="v2rayN-publish"
+  STAGE="$WORKDIR/${PKGROOT}_${VERSION}_${deb_arch}"
+  DEBIAN_DIR="$STAGE/DEBIAN"
+
+  mkdir -p "$STAGE/opt/v2rayN"
+  mkdir -p "$STAGE/usr/bin"
+  mkdir -p "$STAGE/usr/share/applications"
+  mkdir -p "$STAGE/usr/share/icons/hicolor/256x256/apps"
+  mkdir -p "$DEBIAN_DIR"
+
+  # Stage publish content from source build
+  cp -a "$PUBDIR/." "$STAGE/opt/v2rayN/"
+
+  local ICON_CANDIDATE
+  PROJECT_DIR="$(cd "$(dirname "$PROJECT")" && pwd)"
+  ICON_CANDIDATE="$PROJECT_DIR/v2rayN.png"
+  [[ -f "$ICON_CANDIDATE" ]] && cp "$ICON_CANDIDATE" "$STAGE/usr/share/icons/hicolor/256x256/apps/v2rayn.png" || true
+
+  mkdir -p "$STAGE/opt/v2rayN/bin/xray" "$STAGE/opt/v2rayN/bin/sing_box"
+
+  fetch_separate_cores_and_rules() {
+    local outroot="$1"
+
+    if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+      download_xray "$outroot/bin/xray" "$RID_DIR" || echo "[!] xray download failed (skipped)"
+    fi
+    if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+      download_singbox "$outroot/bin/sing_box" "$RID_DIR" || echo "[!] sing-box download failed (skipped)"
+    fi
+    download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
+  }
+
+  if [[ "$FORCE_NETCORE" -eq 0 ]]; then
+    if download_v2rayn_bundle "$STAGE/opt/v2rayN" "$RID_DIR"; then
+      echo "[*] Using v2rayN bundle bin assets."
+    else
+      echo "[*] Bundle failed, fallback to separate core + rules."
+      fetch_separate_cores_and_rules "$STAGE/opt/v2rayN"
+    fi
+  else
+    echo "[*] --netcore specified: use separate core + rules."
+    fetch_separate_cores_and_rules "$STAGE/opt/v2rayN"
+  fi
+
+  # Wrapper
+  install -m 755 /dev/stdin "$STAGE/usr/bin/v2rayn" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+DIR="/opt/v2rayN"
+cd "$DIR"
+
+if [[ -x "$DIR/v2rayN" ]]; then
+  exec "$DIR/v2rayN" "$@"
+fi
+
+for dll in v2rayN.Desktop.dll v2rayN.dll; do
+  if [[ -f "$DIR/$dll" ]]; then
+    exec /usr/bin/dotnet "$DIR/$dll" "$@"
+  fi
+done
+
+echo "v2rayN launcher: no executable found in $DIR" >&2
+ls -l "$DIR" >&2 || true
+exit 1
 EOF

-cat >"${PackagePath}/DEBIAN/postinst" <<-EOF
-if [ ! -s /usr/share/applications/v2rayN.desktop ]; then
-    cat >/usr/share/applications/v2rayN.desktop<<-END
+  SHLIBS_DEPENDS=""
+  EXTRA_DEPENDS="libc6 (>= 2.34), fontconfig (>= 2.13.1), desktop-file-utils (>= 0.26), xdg-utils (>= 1.1.3), coreutils (>= 8.32), bash (>= 5.1), libfreetype6 (>= 2.11)"
+
+  mkdir -p "$WORKDIR/debian"
+  cat > "$WORKDIR/debian/control" <<EOF
+Source: v2rayn
+Section: net
+Priority: optional
+Maintainer: 2dust <noreply@github.com>
+Standards-Version: 4.7.0
+
+Package: v2rayn
+Architecture: ${deb_arch}
+Description: v2rayN
+EOF
+
+  local SYS_LIBDIR=""
+  local SYS_USRLIBDIR=""
+  multiarch="$(dpkg-architecture -a"$deb_arch" -qDEB_HOST_MULTIARCH)"
+
+  SYS_LIBDIR="/lib/$multiarch"
+  SYS_USRLIBDIR="/usr/lib/$multiarch"
+
+  : > "$DEBIAN_DIR/substvars"
+  mapfile -t ELF_FILES < <(
+    find "$STAGE/opt/v2rayN" -type f \( -name "*.so*" -o -perm -111 \) ! -name 'libcoreclrtraceptprovider.so'
+  )
+  if [[ "${#ELF_FILES[@]}" -gt 0 ]]; then
+    (
+      cd "$WORKDIR"
+      dpkg-shlibdeps \
+        -l"$STAGE/opt/v2rayN" \
+        -l"$SYS_LIBDIR" \
+        -l"$SYS_USRLIBDIR" \
+        -T"$DEBIAN_DIR/substvars" \
+        "${ELF_FILES[@]}"
+    ) >/dev/null 2>&1 || true
+  fi
+
+  SHLIBS_DEPENDS="$(sed -n 's/^shlibs:Depends=//p' "$DEBIAN_DIR/substvars" | head -n1 || true)"
+
+  if [[ -n "$SHLIBS_DEPENDS" ]]; then
+    SHLIBS_DEPENDS="$(echo "$SHLIBS_DEPENDS" \
+      | sed -E 's/ *\([^)]*\)//g' \
+      | sed -E 's/ *, */, /g' \
+      | sed -E 's/^, *//; s/, *$//')"
+    FINAL_DEPENDS="${SHLIBS_DEPENDS}, ${EXTRA_DEPENDS}"
+  else
+    FINAL_DEPENDS="${EXTRA_DEPENDS}"
+  fi
+
+  # Desktop file
+  install -m 644 /dev/stdin "$STAGE/usr/share/applications/v2rayn.desktop" <<'EOF'
 [Desktop Entry]
-Name=v2rayN
-Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
-Exec=/opt/v2rayN/v2rayN
-Icon=/opt/v2rayN/v2rayN.png
-Terminal=false
 Type=Application
-Categories=Network;Application;
-END
-fi
-
-update-desktop-database
+Name=v2rayN
+Comment=v2rayN for Debian GNU Linux
+Exec=v2rayn
+Icon=v2rayn
+Terminal=false
+Categories=Network;
 EOF

-sudo chmod 0755 "${PackagePath}/DEBIAN/postinst"
-sudo chmod 0755 "${PackagePath}/opt/v2rayN/v2rayN"
-sudo chmod 0755 "${PackagePath}/opt/v2rayN/AmazTool"
+  # Control file
+  cat > "$DEBIAN_DIR/control" <<EOF
+Package: v2rayn
+Version: ${VERSION}
+Architecture: ${deb_arch}
+Maintainer: 2dust <noreply@github.com>
+Homepage: https://github.com/2dust/v2rayN
+Section: net
+Priority: optional
+Depends: ${FINAL_DEPENDS}
+Description: v2rayN (Avalonia) GUI client for Linux
+ Support vless / vmess / Trojan / http / socks / Anytls / Hysteria2 /
+ Shadowsocks / tuic / WireGuard.
+EOF

-# desktop && PATH
+  # postinst
+  install -m 755 /dev/stdin "$DEBIAN_DIR/postinst" <<'EOF'
+#!/bin/sh
+set -e
+update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
+if command -v gtk-update-icon-cache >/dev/null 2>&1; then
+  gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
+fi
+exit 0
+EOF

-sudo dpkg-deb -Zxz --build $PackagePath
-sudo mv "${PackagePath}.deb" "v2rayN-${Arch}.deb"
+  # postrm
+  install -m 755 /dev/stdin "$DEBIAN_DIR/postrm" <<'EOF'
+#!/bin/sh
+set -e
+update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
+if command -v gtk-update-icon-cache >/dev/null 2>&1; then
+  gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
+fi
+exit 0
+EOF
+
+  # Normalize permissions
+  find "$STAGE/opt/v2rayN" -type d -exec chmod 0755 {} +
+  find "$STAGE/opt/v2rayN" -type f -exec chmod 0644 {} +
+  [[ -f "$STAGE/opt/v2rayN/v2rayN" ]] && chmod 0755 "$STAGE/opt/v2rayN/v2rayN" || true
+  
+  local deb_out
+  deb_out="$OUTPUT_DIR/v2rayn_${VERSION}_${deb_arch}.deb"
+
+  dpkg-deb --root-owner-group --build "$STAGE" "$deb_out"
+
+  echo "Build done for $short. DEB at:"
+  echo "  $deb_out"
+  BUILT_DEBS+=("$deb_out")
+
+  rm -rf "$WORKDIR"
+}
+
+case "${ARCH_OVERRIDE:-}" in
+  all)           targets=(x64 arm64); BUILT_ALL=1 ;;
+  x64|amd64)     targets=(x64) ;;
+  arm64|aarch64) targets=(arm64) ;;
+  "")            targets=($([[ "$host_arch" == "aarch64" ]] && echo arm64 || echo x64)) ;;
+  *)             echo "Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all."; exit 1 ;;
+esac
+
+for arch in "${targets[@]}"; do
+  build_for_arch "$arch"
+done
+
+echo ""
+echo "================ Build Summary ================="
+if [[ "${#BUILT_DEBS[@]}" -gt 0 ]]; then
+  echo "Output directory: $OUTPUT_DIR"
+  for pkg in "${BUILT_DEBS[@]}"; do
+    echo "$pkg"
+  done
+else
+  echo "No DEBs detected in summary (check build logs above)."
+fi
+echo "==============================================="
@@ -43,6 +43,8 @@ cat >"$PackagePath/v2rayN.app/Contents/Info.plist" <<-EOF
  <true/>
  <key>NSHighResolutionCapable</key>
  <true/>
+  <key>LSMinimumSystemVersion</key>
+  <string>12.7</string>
 </dict>
 </plist>
 EOF
@@ -55,4 +57,4 @@ create-dmg \
    --hide-extension "v2rayN.app" \
    --app-drop-link 500 185 \
    "v2rayN-${Arch}.dmg" \
-    "$PackagePath/v2rayN.app"
+    "$PackagePath/v2rayN.app"
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-Arch="$1"
-OutputPath="$2"
-
-OutputArch="v2rayN-${Arch}"
-FileName="v2rayN-${Arch}.zip"
-
-wget -nv -O $FileName "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/$FileName"
-
-ZipPath64="./$OutputArch"
-mkdir $ZipPath64
-
-cp -rf $OutputPath "$ZipPath64/$OutputArch"
-7z a -tZip $FileName "$ZipPath64/$OutputArch" -mx1
@@ -0,0 +1,703 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Require Red Hat base branch
+. /etc/os-release
+
+case "${ID:-}" in
+  rhel|rocky|almalinux|fedora|centos)
+    echo "Detected supported system: ${NAME:-$ID} ${VERSION_ID:-}"
+    ;;
+  *)
+    echo "Unsupported system: ${NAME:-unknown} (${ID:-unknown})."
+    echo "This script only supports: RHEL / Rocky / AlmaLinux / Fedora / CentOS."
+    exit 1
+    ;;
+esac
+
+# Kernel version
+MIN_KERNEL="5.10"
+CURRENT_KERNEL="$(uname -r)"
+
+lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$CURRENT_KERNEL" | sort -V | head -n1)"
+
+if [[ "$lowest" != "$MIN_KERNEL" ]]; then
+    echo "Kernel $CURRENT_KERNEL is below $MIN_KERNEL"
+    exit 1
+fi
+
+echo "[OK] Kernel $CURRENT_KERNEL verified."
+
+# Config & Parse arguments
+VERSION_ARG="${1:-}"     # Pass version number like 7.13.8, or leave empty
+WITH_CORE="both"         # Default: bundle both xray+sing-box
+FORCE_NETCORE=0          # --netcore => skip archive bundle, use separate downloads
+BUILD_FROM=""            # --buildfrom 1|2|3 to select channel non-interactively
+DOTNET_RISCV_VERSION="10.0.105"
+DOTNET_RISCV_BASE="https://github.com/filipnavara/dotnet-riscv/releases/download"
+DOTNET_RISCV_FILE="dotnet-sdk-${DOTNET_RISCV_VERSION}-linux-riscv64.tar.gz"
+DOTNET_SDK_URL="${DOTNET_RISCV_BASE}/${DOTNET_RISCV_VERSION}/${DOTNET_RISCV_FILE}"
+SKIA_VER="${SKIA_VER:-3.119.1}"
+HARFBUZZ_VER="${HARFBUZZ_VER:-8.3.1.1}"
+
+# If the first argument starts with --, do not treat it as a version number
+if [[ "${VERSION_ARG:-}" == --* ]]; then
+  VERSION_ARG=""
+fi
+# Take the first non --* argument as version, discard it
+if [[ -n "${VERSION_ARG:-}" ]]; then shift || true; fi
+
+# Parse remaining optional arguments
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --with-core)     WITH_CORE="${2:-both}"; shift 2;;
+    --xray-ver)      XRAY_VER="${2:-}"; shift 2;;
+    --singbox-ver)   SING_VER="${2:-}"; shift 2;;
+    --netcore)       FORCE_NETCORE=1; shift;;
+    --buildfrom)     BUILD_FROM="${2:-}"; shift 2;;
+    *)
+      if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
+      shift;;
+  esac
+done
+
+# Conflict: version number AND --buildfrom cannot be used together
+if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
+  echo "You cannot specify both an explicit version and --buildfrom at the same time."
+  echo "        Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
+  exit 1
+fi
+
+apply_riscv_patch() {
+  # Upgrade net8.0 -> net10.0
+  find . -type f \( -name "*.csproj" -o -name "*.props" -o -name "*.targets" \) \
+    -exec sed -i 's/net8\.0/net10.0/g' {} +
+
+  # Patch all Directory.Packages.props for SkiaSharp/HarfBuzzSharp
+  while IFS= read -r -d '' f; do
+    # replace existing versions if present
+    sed -i \
+      -e "s#<PackageVersion Include=\"SkiaSharp\" Version=\"[^\"]*\" */>#<PackageVersion Include=\"SkiaSharp\" Version=\"$SKIA_VER\" />#g" \
+      -e "s#<PackageVersion Include=\"SkiaSharp.NativeAssets.Linux\" Version=\"[^\"]*\" */>#<PackageVersion Include=\"SkiaSharp.NativeAssets.Linux\" Version=\"$SKIA_VER\" />#g" \
+      -e "s#<PackageVersion Include=\"HarfBuzzSharp\" Version=\"[^\"]*\" */>#<PackageVersion Include=\"HarfBuzzSharp\" Version=\"$HARFBUZZ_VER\" />#g" \
+      -e "s#<PackageVersion Include=\"HarfBuzzSharp.NativeAssets.Linux\" Version=\"[^\"]*\" */>#<PackageVersion Include=\"HarfBuzzSharp.NativeAssets.Linux\" Version=\"$HARFBUZZ_VER\" />#g" \
+      "$f"
+
+    grep -q 'PackageVersion Include="SkiaSharp"' "$f" || \
+      sed -i "/<\/ItemGroup>/i\    <PackageVersion Include=\"SkiaSharp\" Version=\"$SKIA_VER\" />" "$f"
+
+    grep -q 'PackageVersion Include="SkiaSharp.NativeAssets.Linux"' "$f" || \
+      sed -i "/<\/ItemGroup>/i\    <PackageVersion Include=\"SkiaSharp.NativeAssets.Linux\" Version=\"$SKIA_VER\" />" "$f"
+
+    grep -q 'PackageVersion Include="HarfBuzzSharp"' "$f" || \
+      sed -i "/<\/ItemGroup>/i\    <PackageVersion Include=\"HarfBuzzSharp\" Version=\"$HARFBUZZ_VER\" />" "$f"
+
+    grep -q 'PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux"' "$f" || \
+      sed -i "/<\/ItemGroup>/i\    <PackageVersion Include=\"HarfBuzzSharp.NativeAssets.Linux\" Version=\"$HARFBUZZ_VER\" />" "$f"
+  done < <(find . -type f -name 'Directory.Packages.props' -print0)
+
+  # Patch SDK bundled RIDs
+  f="$(find "$DOTNET_ROOT/sdk/$(dotnet --version)" -type f -name 'Microsoft.NETCoreSdk.BundledVersions.props' | head -n1 || true)"
+  [[ -f "$f" ]] && sed -i \
+    -e 's/linux-arm64/&;linux-riscv64/g' \
+    -e 's/linux-musl-arm64/&;linux-musl-riscv64/g' \
+    "$f"
+}
+
+build_sqlite_native_riscv64() {
+  local outdir="$1"
+  local workdir sqlite_year sqlite_ver sqlite_zip srcdir
+
+  mkdir -p "$outdir"
+  workdir="$(mktemp -d)"
+
+  # SQLite 3.49.1 amalgamation
+  sqlite_year="2025"
+  sqlite_ver="3490100"
+  sqlite_zip="sqlite-amalgamation-${sqlite_ver}.zip"
+
+  echo "[+] Download SQLite amalgamation: ${sqlite_zip}"
+  curl -fL "https://www.sqlite.org/${sqlite_year}/${sqlite_zip}" -o "${workdir}/${sqlite_zip}"
+
+  unzip -q "${workdir}/${sqlite_zip}" -d "$workdir"
+  srcdir="$(find "$workdir" -maxdepth 1 -type d -name 'sqlite-amalgamation-*' | head -n1 || true)"
+  [[ -n "$srcdir" ]] || { echo "[!] SQLite source unpack failed"; rm -rf "$workdir"; return 1; }
+
+  echo "[+] Build libe_sqlite3.so for riscv64"
+  gcc -shared -fPIC -O2 \
+    -DSQLITE_THREADSAFE=1 \
+    -DSQLITE_ENABLE_FTS5 \
+    -DSQLITE_ENABLE_RTREE \
+    -DSQLITE_ENABLE_JSON1 \
+    -o "${outdir}/libe_sqlite3.so" "${srcdir}/sqlite3.c" -ldl -lpthread
+
+  rm -rf "$workdir"
+}
+
+copy_skiasharp_native_riscv64() {
+  local outdir="$1"
+  local skia_so=""
+  local harfbuzz_so=""
+
+  mkdir -p "$outdir"
+
+  skia_so="$(find "$HOME/.nuget/packages" -path "*/skiasharp.nativeassets.linux/${SKIA_VER}/runtimes/linux-riscv64/native/libSkiaSharp.so" | head -n1 || true)"
+  if [[ -z "$skia_so" ]]; then
+    skia_so="$(find "$HOME/.nuget/packages" -path "*/runtimes/linux-riscv64/native/libSkiaSharp.so" | head -n1 || true)"
+  fi
+
+  harfbuzz_so="$(find "$HOME/.nuget/packages" -path "*/harfbuzzsharp.nativeassets.linux/${HARFBUZZ_VER}/runtimes/linux-riscv64/native/libHarfBuzzSharp.so" | head -n1 || true)"
+  if [[ -z "$harfbuzz_so" ]]; then
+    harfbuzz_so="$(find "$HOME/.nuget/packages" -path "*/runtimes/linux-riscv64/native/libHarfBuzzSharp.so" | head -n1 || true)"
+  fi
+
+  if [[ -n "$skia_so" && -f "$skia_so" ]]; then
+    echo "[+] Copy libSkiaSharp.so from NuGet cache"
+    install -m 755 "$skia_so" "$outdir/libSkiaSharp.so"
+  else
+    echo "[WARN] libSkiaSharp.so for linux-riscv64 not found in NuGet cache"
+  fi
+
+  if [[ -n "$harfbuzz_so" && -f "$harfbuzz_so" ]]; then
+    echo "[+] Copy libHarfBuzzSharp.so from NuGet cache"
+    install -m 755 "$harfbuzz_so" "$outdir/libHarfBuzzSharp.so"
+  else
+    echo "[WARN] libHarfBuzzSharp.so for linux-riscv64 not found in NuGet cache"
+  fi
+}
+
+# Check and install dependencies
+host_arch="$(uname -m)"
+[[ "$host_arch" == "riscv64" ]] || { echo "Only supports riscv64"; exit 1; }
+
+install_ok=0
+
+if command -v dnf >/dev/null 2>&1; then
+  sudo dnf -y install \
+    rpm-build rpmdevtools curl unzip tar jq rsync git python3 gcc make \
+    glibc-devel kernel-headers libatomic file ca-certificates libicu\
+    && install_ok=1
+
+  mkdir -p "$HOME/.dotnet"
+  tmp_dotnet="$(mktemp -d)"
+  curl -fL "$DOTNET_SDK_URL" -o "$tmp_dotnet/$DOTNET_RISCV_FILE"
+  tar -C "$HOME/.dotnet" -xzf "$tmp_dotnet/$DOTNET_RISCV_FILE"
+  rm -rf "$tmp_dotnet"
+
+  export PATH="$HOME/.dotnet:$PATH"
+  export DOTNET_ROOT="$HOME/.dotnet"
+
+  dotnet --info >/dev/null 2>&1 || install_ok=0
+fi
+
+if [[ "$install_ok" -ne 1 ]]; then
+  echo "Could not auto-install dependencies for '$ID'. Make sure these are available:"
+  echo "dotnet-riscv SDK, curl, unzip, tar, rsync, git, python3, gcc, rpm, rpmdevtools, rpm-build (on Red Hat branch)"
+  exit 1
+fi
+
+# Root directory
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+# Git submodules (best effort)
+if [[ -f .gitmodules ]]; then
+  git submodule sync --recursive || true
+  git submodule update --init --recursive || true
+fi
+
+# Locate project
+PROJECT="v2rayN.Desktop/v2rayN.Desktop.csproj"
+if [[ ! -f "$PROJECT" ]]; then
+  PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
+fi
+[[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; }
+
+choose_channel() {
+  # If --buildfrom provided, map it directly and skip interaction.
+  if [[ -n "${BUILD_FROM:-}" ]]; then
+    case "$BUILD_FROM" in
+      1) echo "latest"; return 0;;
+      2) echo "prerelease"; return 0;;
+      3) echo "keep"; return 0;;
+      *) echo "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." >&2; exit 1;;
+    esac
+  fi
+
+  # Print menu to stderr and read from /dev/tty so stdout only carries the token.
+  local ch="latest" sel=""
+
+  if [[ -t 0 ]]; then
+    echo "[?] Choose v2rayN release channel:" >&2
+    echo "    1) Latest (stable)  [default]" >&2
+    echo "    2) Pre-release (preview)" >&2
+    echo "    3) Keep current (do nothing)" >&2
+    printf "Enter 1, 2 or 3 [default 1]: " >&2
+
+    if read -r sel </dev/tty; then
+      case "${sel:-}" in
+        2) ch="prerelease" ;;
+        3) ch="keep" ;;
+      esac
+    fi
+  fi
+
+  echo "$ch"
+}
+
+get_latest_tag_latest() {
+  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
+    | jq -re '.tag_name' \
+    | sed 's/^v//'
+}
+
+get_latest_tag_prerelease() {
+  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20" \
+    | jq -re 'first(.[] | select(.prerelease == true) | .tag_name)' \
+    | sed 's/^v//'
+}
+
+git_try_checkout() {
+  # Try a series of refs and checkout when found.
+  local want="$1" ref=""
+  if git rev-parse --git-dir >/dev/null 2>&1; then
+    git fetch --tags --force --prune --depth=1 || true
+    if git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then
+      ref="${want}"
+    fi
+    if [[ -n "$ref" ]]; then
+      echo "[OK] Found ref '${ref}', checking out..."
+      git checkout -f "${ref}"
+      if [[ -f .gitmodules ]]; then
+        git submodule sync --recursive || true
+        git submodule update --init --recursive || true
+      fi
+      return 0
+    fi
+  fi
+  return 1
+}
+
+apply_channel_or_keep() {
+  local ch="$1" tag
+
+  if [[ "$ch" == "keep" ]]; then
+    echo "[*] Keep current repository state (no checkout)."
+    VERSION="$(git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0+git')"
+    VERSION="${VERSION#v}"
+    return 0
+  fi
+
+  echo "[*] Resolving ${ch} tag from GitHub releases..."
+  if [[ "$ch" == "prerelease" ]]; then
+    tag="$(get_latest_tag_prerelease || true)"
+  else
+    tag="$(get_latest_tag_latest || true)"
+  fi
+
+  [[ -n "$tag" ]] || { echo "Failed to resolve latest tag for channel '${ch}'."; exit 1; }
+  echo "[*] Latest tag for '${ch}': ${tag}"
+  git_try_checkout "$tag" || { echo "Failed to checkout '${tag}'."; exit 1; }
+  VERSION="${tag#v}"
+}
+
+if git rev-parse --git-dir >/dev/null 2>&1; then
+  if [[ -n "${VERSION_ARG:-}" ]]; then
+    clean_ver="${VERSION_ARG#v}"
+    if git_try_checkout "$clean_ver"; then
+      VERSION="$clean_ver"
+    else
+      echo "[WARN] Tag '${VERSION_ARG}' not found."
+      ch="$(choose_channel)"
+      apply_channel_or_keep "$ch"
+    fi
+  else
+    ch="$(choose_channel)"
+    apply_channel_or_keep "$ch"
+  fi
+else
+  echo "Current directory is not a git repo; proceeding on current tree."
+  VERSION="${VERSION_ARG:-0.0.0}"
+fi
+
+VERSION="${VERSION#v}"
+echo "[*] GUI version resolved as: ${VERSION}"
+
+# riscv64 patch
+apply_riscv_patch
+
+# Helpers for core
+download_xray() {
+  # Download Xray core
+  local outdir="$1" rid="$2" ver="${XRAY_VER:-}" url="" tmp zipname="xray.zip"
+  mkdir -p "$outdir"
+  if [[ -z "$ver" ]]; then
+    ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
+        | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
+  fi
+  [[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
+  if [[ "$rid" == "linux-riscv64" ]]; then
+    url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-riscv64.zip"
+  fi
+  [[ -n "$url" ]] || { echo "[xray] Unsupported RID: $rid"; return 1; }
+  echo "[+] Download xray: $url"
+  tmp="$(mktemp -d)"
+  curl -fL "$url" -o "$tmp/$zipname"
+  unzip -q "$tmp/$zipname" -d "$tmp"
+  install -m 755 "$tmp/xray" "$outdir/xray"
+  rm -rf "$tmp"
+}
+
+download_singbox() {
+  # Download sing-box
+  local outdir="$1" rid="$2" ver="${SING_VER:-}" url="" tmp tarname="singbox.tar.gz" bin cronet
+  mkdir -p "$outdir"
+  if [[ -z "$ver" ]]; then
+    ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
+      | grep -Eo '"tag_name":\s*"v[^"]+"' \
+      | sed -E 's/.*"v([^"]+)".*/\1/' \
+      | head -n1)" || true
+  fi
+  [[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
+  if [[ "$rid" == "linux-riscv64" ]]; then
+    url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-riscv64.tar.gz"
+  fi
+  [[ -n "$url" ]] || { echo "[sing-box] Unsupported RID: $rid"; return 1; }
+  echo "[+] Download sing-box: $url"
+  tmp="$(mktemp -d)"
+  curl -fL "$url" -o "$tmp/$tarname"
+  tar -C "$tmp" -xzf "$tmp/$tarname"
+  bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
+  [[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
+  install -m 755 "$bin" "$outdir/sing-box"
+  cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
+  [[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so"
+  rm -rf "$tmp"
+}
+
+# Move geo files to outroot/bin
+unify_geo_layout() {
+  local outroot="$1"
+  mkdir -p "$outroot/bin"
+  local names=( \
+    "geosite.dat" \
+    "geoip.dat" \
+    "geoip-only-cn-private.dat" \
+    "Country.mmdb" \
+    "geoip.metadb" \
+  )
+  for n in "${names[@]}"; do
+    if [[ -f "$outroot/bin/xray/$n" ]]; then
+      mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
+    fi
+  done
+}
+
+# Download geo/rule assets
+download_geo_assets() {
+  local outroot="$1"
+  local bin_dir="$outroot/bin"
+  local srss_dir="$bin_dir/srss"
+  mkdir -p "$bin_dir" "$srss_dir"
+
+  echo "[+] Download Xray Geo to ${bin_dir}"
+  curl -fsSL -o "$bin_dir/geosite.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
+  curl -fsSL -o "$bin_dir/geoip.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
+  curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
+  curl -fsSL -o "$bin_dir/Country.mmdb" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
+
+  echo "[+] Download sing-box rule DB & rule-sets"
+  curl -fsSL -o "$bin_dir/geoip.metadb" \
+    "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" || true
+
+  for f in \
+    geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs \
+    geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
+    curl -fsSL -o "$srss_dir/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
+  done
+  for f in \
+    geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs \
+    geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
+    curl -fsSL -o "$srss_dir/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
+  done
+
+  # Unify to bin
+  unify_geo_layout "$outroot"
+}
+
+# Prefer the prebuilt v2rayN core bundle; then unify geo layout
+download_v2rayn_bundle() {
+  local outroot="$1" rid="$2"
+  local url=""
+  if [[ "$rid" == "linux-riscv64" ]]; then
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-riscv64.zip"
+  fi
+  [[ -n "$url" ]] || { echo "[!] Bundle unsupported RID: $rid"; return 1; }
+  echo "[+] Try v2rayN bundle archive: $url"
+  local tmp zipname
+  tmp="$(mktemp -d)"; zipname="$tmp/v2rayn.zip"
+  curl -fL "$url" -o "$zipname" || { echo "[!] Bundle download failed"; return 1; }
+  unzip -q "$zipname" -d "$tmp" || { echo "[!] Bundle unzip failed"; return 1; }
+
+  if [[ -d "$tmp/bin" ]]; then
+    mkdir -p "$outroot/bin"
+    rsync -a "$tmp/bin/" "$outroot/bin/"
+  else
+    rsync -a "$tmp/" "$outroot/"
+  fi
+
+  rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
+  find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
+
+  local nested_dir
+  nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
+  if [[ -n "$nested_dir" && -d "$nested_dir/bin" ]]; then
+    mkdir -p "$outroot/bin"
+    rsync -a "$nested_dir/bin/" "$outroot/bin/"
+    rm -rf "$nested_dir"
+  fi
+
+  # Unify to bin/
+  unify_geo_layout "$outroot"
+
+  echo "[+] Bundle extracted to $outroot"
+}
+
+# ===== Build results collection ========================================================
+BUILT_RPMS=()
+
+# ===== Build (single-arch) function ====================================================
+build_for_arch() {
+  # $1: target short arch: riscv64
+  local short="$1"
+  local rid rpm_target archdir
+  case "$short" in
+    riscv64) rid="linux-riscv64"; rpm_target="riscv64"; archdir="riscv64" ;;
+    *) echo "Unknown arch '$short' (use riscv64)"; return 1;;
+  esac
+
+  echo "[*] Building for target: $short  (RID=$rid, RPM --target $rpm_target)"
+
+  # .NET publish (self-contained) for this RID
+  dotnet clean "$PROJECT" -c Release -p:TargetFramework=net10.0
+  rm -rf "$(dirname "$PROJECT")/bin/Release/net10.0" || true
+
+  dotnet restore "$PROJECT" -r "$rid" -p:TargetFramework=net10.0
+  dotnet publish "$PROJECT" \
+    -c Release -r "$rid" \
+    -p:TargetFramework=net10.0 \
+    -p:PublishSingleFile=false \
+    -p:SelfContained=true
+
+  # Per-arch variables (scoped)
+  local RID_DIR="$rid"
+  local PUBDIR
+  PUBDIR="$(dirname "$PROJECT")/bin/Release/net10.0/${RID_DIR}/publish"
+  [[ -d "$PUBDIR" ]] || { echo "Publish directory not found: $PUBDIR"; return 1; }
+
+  # Per-arch working area
+  local PKGROOT="v2rayN-publish"
+  local WORKDIR
+  WORKDIR="$(mktemp -d)"
+  trap '[[ -n "${WORKDIR:-}" ]] && rm -rf "$WORKDIR"' RETURN
+
+  # rpmbuild topdir selection
+  local TOPDIR SPECDIR SOURCEDIR PROJECT_DIR
+  rpmdev-setuptree
+  TOPDIR="${HOME}/rpmbuild"
+  SPECDIR="${TOPDIR}/SPECS"
+  SOURCEDIR="${TOPDIR}/SOURCES"
+
+  # Stage publish content
+  mkdir -p "$WORKDIR/$PKGROOT"
+  cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/"
+
+  copy_skiasharp_native_riscv64 "$WORKDIR/$PKGROOT" || echo "[!] SkiaSharp native copy failed (skipped)"
+  build_sqlite_native_riscv64 "$WORKDIR/$PKGROOT" || echo "[!] sqlite native build failed (skipped)"
+
+  # Required icon
+  local ICON_CANDIDATE
+  PROJECT_DIR="$(cd "$(dirname "$PROJECT")" && pwd)"
+  ICON_CANDIDATE="$PROJECT_DIR/v2rayN.png"
+  [[ -f "$ICON_CANDIDATE" ]] || { echo "Required icon not found: $ICON_CANDIDATE"; return 1; }
+  cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png"
+
+  # Prepare bin structure
+  mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
+
+  # Bundle / cores per-arch
+  fetch_separate_cores_and_rules() {
+    local outroot="$1"
+
+    if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+      download_xray "$outroot/bin/xray" "$RID_DIR" || echo "[!] xray download failed (skipped)"
+    fi
+    if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+      download_singbox "$outroot/bin/sing_box" "$RID_DIR" || echo "[!] sing-box download failed (skipped)"
+    fi
+    download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
+  }
+
+  if [[ "$FORCE_NETCORE" -eq 0 ]]; then
+    if download_v2rayn_bundle "$WORKDIR/$PKGROOT" "$RID_DIR"; then
+      echo "[*] Using v2rayN bundle archive."
+    else
+      echo "[*] Bundle failed, fallback to separate core + rules."
+      fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT"
+    fi
+  else
+    echo "[*] --netcore specified: use separate core + rules."
+    fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT"
+  fi
+
+  # Tarball
+  mkdir -p "$SOURCEDIR"
+  tar -C "$WORKDIR" -czf "$SOURCEDIR/$PKGROOT.tar.gz" "$PKGROOT"
+
+  # SPEC
+  local SPECFILE="$SPECDIR/v2rayN.spec"
+  mkdir -p "$SPECDIR"
+  cat > "$SPECFILE" <<'SPEC'
+%global debug_package %{nil}
+%undefine _debuginfo_subpackages
+%undefine _debugsource_packages
+# Ignore outdated LTTng dependencies incorrectly reported by the .NET runtime (to avoid installation failures)
+%global __requires_exclude ^liblttng-ust\.so\..*$
+
+Name:           v2rayN
+Version:        __VERSION__
+Release:        1%{?dist}
+Summary:        v2rayN (Avalonia) GUI client for Linux (riscv64)
+License:        GPL-3.0-only
+URL:            https://github.com/2dust/v2rayN
+BugURL:         https://github.com/2dust/v2rayN/issues
+ExclusiveArch:  riscv64
+Source0:        __PKGROOT__.tar.gz
+
+# Runtime dependencies (Avalonia / X11 / Fonts / GL)
+Requires:       cairo, pango, openssl, mesa-libEGL, mesa-libGL
+Requires:       glibc >= 2.34
+Requires:       fontconfig >= 2.13.1
+Requires:       desktop-file-utils >= 0.26
+Requires:       xdg-utils >= 1.1.3
+Requires:       coreutils >= 8.32
+Requires:       bash >= 5.1
+Requires:       freetype >= 2.10
+
+%description
+v2rayN Linux for Red Hat Enterprise Linux
+Support vless / vmess / Trojan / http / socks / Anytls / Hysteria2 / Shadowsocks / tuic / WireGuard
+Support Red Hat Enterprise Linux / Fedora Linux / Rocky Linux / AlmaLinux / CentOS
+For more information, Please visit our website
+https://github.com/2dust/v2rayN
+
+%prep
+%setup -q -n __PKGROOT__
+
+%build
+# no build
+
+%install
+install -dm0755 %{buildroot}/opt/v2rayN
+cp -a * %{buildroot}/opt/v2rayN/
+
+# Normalize permissions
+find %{buildroot}/opt/v2rayN -type d -exec chmod 0755 {} +
+find %{buildroot}/opt/v2rayN -type f -exec chmod 0644 {} +
+[ -f %{buildroot}/opt/v2rayN/v2rayN ] && chmod 0755 %{buildroot}/opt/v2rayN/v2rayN || :
+[ -f %{buildroot}/opt/v2rayN/libSkiaSharp.so ] && chmod 0755 %{buildroot}/opt/v2rayN/libSkiaSharp.so || :
+[ -f %{buildroot}/opt/v2rayN/libHarfBuzzSharp.so ] && chmod 0755 %{buildroot}/opt/v2rayN/libHarfBuzzSharp.so || :
+[ -f %{buildroot}/opt/v2rayN/libe_sqlite3.so ] && chmod 0755 %{buildroot}/opt/v2rayN/libe_sqlite3.so || :
+
+# Launcher (prefer native ELF first, then DLL fallback)
+install -dm0755 %{buildroot}%{_bindir}
+install -m0755 /dev/stdin %{buildroot}%{_bindir}/v2rayn << 'EOF'
+#!/usr/bin/bash
+set -euo pipefail
+DIR="/opt/v2rayN"
+export LD_LIBRARY_PATH="$DIR:${LD_LIBRARY_PATH:-}"
+
+# Prefer native apphost
+if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi
+
+# DLL fallback
+for dll in v2rayN.Desktop.dll v2rayN.dll; do
+  if [[ -f "$DIR/$dll" ]]; then exec /usr/bin/dotnet "$DIR/$dll" "$@"; fi
+done
+
+echo "v2rayN launcher: no executable found in $DIR" >&2
+ls -l "$DIR" >&2 || true
+exit 1
+EOF
+
+# Desktop file
+install -dm0755 %{buildroot}%{_datadir}/applications
+install -m0644 /dev/stdin %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF'
+[Desktop Entry]
+Type=Application
+Name=v2rayN
+Comment=v2rayN for Red Hat Enterprise Linux
+Exec=v2rayn
+Icon=v2rayn
+Terminal=false
+Categories=Network;
+EOF
+
+# Icon
+install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
+install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
+
+%post
+/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || true
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2>&1 || true
+
+%postun
+/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || true
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2>&1 || true
+
+%files
+%{_bindir}/v2rayn
+/opt/v2rayN
+%{_datadir}/applications/v2rayn.desktop
+%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
+SPEC
+
+  # Replace placeholders
+  sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE"
+  sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE"
+
+  # Build RPM for this arch
+  rpmbuild -ba "$SPECFILE" --target "$rpm_target"
+
+  echo "Build done for $short. RPM at:"
+  local f
+  for f in "${TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm; do
+    [[ -e "$f" ]] || continue
+    echo "  $f"
+    BUILT_RPMS+=("$f")
+  done
+}
+
+# ===== Arch selection and build orchestration =========================================
+targets=(riscv64)
+
+for arch in "${targets[@]}"; do
+  build_for_arch "$arch"
+done
+
+echo ""
+echo "================ Build Summary ================"
+if [[ "${#BUILT_RPMS[@]}" -gt 0 ]]; then
+  for rp in "${BUILT_RPMS[@]}"; do
+    echo "$rp"
+  done
+else
+  echo "No RPMs detected in summary (check build logs above)."
+fi
+echo "=============================================="
@@ -0,0 +1,590 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Require Red Hat base branch
+. /etc/os-release
+
+case "${ID:-}" in
+  rhel|rocky|almalinux|fedora|centos)
+    echo "Detected supported system: ${NAME:-$ID} ${VERSION_ID:-}"
+    ;;
+  *)
+    echo "Unsupported system: ${NAME:-unknown} (${ID:-unknown})."
+    echo "This script only supports: RHEL / Rocky / AlmaLinux / Fedora / CentOS."
+    exit 1
+    ;;
+esac
+
+# Kernel version
+MIN_KERNEL="6.11"
+CURRENT_KERNEL="$(uname -r)"
+
+lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$CURRENT_KERNEL" | sort -V | head -n1)"
+
+if [[ "$lowest" != "$MIN_KERNEL" ]]; then
+    echo "Kernel $CURRENT_KERNEL is below $MIN_KERNEL"
+    exit 1
+fi
+
+echo "[OK] Kernel $CURRENT_KERNEL verified."
+
+# Config & Parse arguments
+VERSION_ARG="${1:-}"     # Pass version number like 7.13.8, or leave empty
+WITH_CORE="both"         # Default: bundle both xray+sing-box
+FORCE_NETCORE=0          # --netcore => skip archive bundle, use separate downloads
+ARCH_OVERRIDE=""         # --arch x64|arm64|all (optional compile target)
+BUILD_FROM=""            # --buildfrom 1|2|3 to select channel non-interactively
+
+# If the first argument starts with --, do not treat it as a version number
+if [[ "${VERSION_ARG:-}" == --* ]]; then
+  VERSION_ARG=""
+fi
+# Take the first non --* argument as version, discard it
+if [[ -n "${VERSION_ARG:-}" ]]; then shift || true; fi
+
+# Parse remaining optional arguments
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --with-core)     WITH_CORE="${2:-both}"; shift 2;;
+    --xray-ver)      XRAY_VER="${2:-}"; shift 2;;
+    --singbox-ver)   SING_VER="${2:-}"; shift 2;;
+    --netcore)       FORCE_NETCORE=1; shift;;
+    --arch)          ARCH_OVERRIDE="${2:-}"; shift 2;;
+    --buildfrom)     BUILD_FROM="${2:-}"; shift 2;;
+    *)
+      if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
+      shift;;
+  esac
+done
+
+# Conflict: version number AND --buildfrom cannot be used together
+if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
+  echo "You cannot specify both an explicit version and --buildfrom at the same time."
+  echo "        Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
+  exit 1
+fi
+
+# Check and install dependencies
+host_arch="$(uname -m)"
+[[ "$host_arch" == "aarch64" || "$host_arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
+
+install_ok=0
+
+if command -v dnf >/dev/null 2>&1; then
+  sudo dnf -y install rpm-build rpmdevtools curl unzip tar jq rsync dotnet-sdk-8.0 \
+    && install_ok=1
+fi
+
+if [[ "$install_ok" -ne 1 ]]; then
+  echo "Could not auto-install dependencies for '$ID'. Make sure these are available:"
+  echo "dotnet-sdk 8.x, curl, unzip, tar, rsync, rpm, rpmdevtools, rpm-build (on Red Hat branch)"
+fi
+
+# Root directory
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+# Git submodules (best effort)
+if [[ -f .gitmodules ]]; then
+  git submodule sync --recursive || true
+  git submodule update --init --recursive || true
+fi
+
+# Locate project
+PROJECT="v2rayN.Desktop/v2rayN.Desktop.csproj"
+if [[ ! -f "$PROJECT" ]]; then
+  PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
+fi
+[[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; }
+
+choose_channel() {
+  # If --buildfrom provided, map it directly and skip interaction.
+  if [[ -n "${BUILD_FROM:-}" ]]; then
+    case "$BUILD_FROM" in
+      1) echo "latest"; return 0;;
+      2) echo "prerelease"; return 0;;
+      3) echo "keep"; return 0;;
+      *) echo "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." >&2; exit 1;;
+    esac
+  fi
+
+  # Print menu to stderr and read from /dev/tty so stdout only carries the token.
+  local ch="latest" sel=""
+
+  if [[ -t 0 ]]; then
+    echo "[?] Choose v2rayN release channel:" >&2
+    echo "    1) Latest (stable)  [default]" >&2
+    echo "    2) Pre-release (preview)" >&2
+    echo "    3) Keep current (do nothing)" >&2
+    printf "Enter 1, 2 or 3 [default 1]: " >&2
+
+    if read -r sel </dev/tty; then
+      case "${sel:-}" in
+        2) ch="prerelease" ;;
+        3) ch="keep" ;;
+      esac
+    fi
+  fi
+
+  echo "$ch"
+}
+
+get_latest_tag_latest() {
+  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
+    | jq -re '.tag_name' \
+    | sed 's/^v//'
+}
+
+get_latest_tag_prerelease() {
+  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20" \
+    | jq -re 'first(.[] | select(.prerelease == true) | .tag_name)' \
+    | sed 's/^v//'
+}
+
+git_try_checkout() {
+  # Try a series of refs and checkout when found.
+  local want="$1" ref=""
+  if git rev-parse --git-dir >/dev/null 2>&1; then
+    git fetch --tags --force --prune --depth=1 || true
+    if git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then
+      ref="${want}"
+    fi
+    if [[ -n "$ref" ]]; then
+      echo "[OK] Found ref '${ref}', checking out..."
+      git checkout -f "${ref}"
+      if [[ -f .gitmodules ]]; then
+        git submodule sync --recursive || true
+        git submodule update --init --recursive || true
+      fi
+      return 0
+    fi
+  fi
+  return 1
+}
+
+apply_channel_or_keep() {
+  local ch="$1" tag
+
+  if [[ "$ch" == "keep" ]]; then
+    echo "[*] Keep current repository state (no checkout)."
+    VERSION="$(git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0+git')"
+    VERSION="${VERSION#v}"
+    return 0
+  fi
+
+  echo "[*] Resolving ${ch} tag from GitHub releases..."
+  if [[ "$ch" == "prerelease" ]]; then
+    tag="$(get_latest_tag_prerelease || true)"
+  else
+    tag="$(get_latest_tag_latest || true)"
+  fi
+
+  [[ -n "$tag" ]] || { echo "Failed to resolve latest tag for channel '${ch}'."; exit 1; }
+  echo "[*] Latest tag for '${ch}': ${tag}"
+  git_try_checkout "$tag" || { echo "Failed to checkout '${tag}'."; exit 1; }
+  VERSION="${tag#v}"
+}
+
+if git rev-parse --git-dir >/dev/null 2>&1; then
+  if [[ -n "${VERSION_ARG:-}" ]]; then
+    clean_ver="${VERSION_ARG#v}"
+    if git_try_checkout "$clean_ver"; then
+      VERSION="$clean_ver"
+    else
+      echo "[WARN] Tag '${VERSION_ARG}' not found."
+      ch="$(choose_channel)"
+      apply_channel_or_keep "$ch"
+    fi
+  else
+    ch="$(choose_channel)"
+    apply_channel_or_keep "$ch"
+  fi
+else
+  echo "Current directory is not a git repo; proceeding on current tree."
+  VERSION="${VERSION_ARG:-0.0.0}"
+fi
+
+VERSION="${VERSION#v}"
+echo "[*] GUI version resolved as: ${VERSION}"
+
+# Helpers for core
+download_xray() {
+  # Download Xray core
+  local outdir="$1" rid="$2" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
+  mkdir -p "$outdir"
+  if [[ -z "$ver" ]]; then
+    ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
+        | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
+  fi
+  [[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
+  if [[ "$rid" == "linux-arm64" ]]; then
+    url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip"
+  else
+    url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip"
+  fi
+  echo "[+] Download xray: $url"
+  tmp="$(mktemp -d)"
+  curl -fL "$url" -o "$tmp/$zipname"
+  unzip -q "$tmp/$zipname" -d "$tmp"
+  install -m 755 "$tmp/xray" "$outdir/xray"
+  rm -rf "$tmp"
+}
+
+download_singbox() {
+  # Download sing-box
+  local outdir="$1" rid="$2" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin cronet
+  mkdir -p "$outdir"
+  if [[ -z "$ver" ]]; then
+    ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
+      | grep -Eo '"tag_name":\s*"v[^"]+"' \
+      | sed -E 's/.*"v([^"]+)".*/\1/' \
+      | head -n1)" || true
+  fi
+  [[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
+  if [[ "$rid" == "linux-arm64" ]]; then
+    url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz"
+  else
+    url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz"
+  fi
+  echo "[+] Download sing-box: $url"
+  tmp="$(mktemp -d)"
+  curl -fL "$url" -o "$tmp/$tarname"
+  tar -C "$tmp" -xzf "$tmp/$tarname"
+  bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
+  [[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
+  install -m 755 "$bin" "$outdir/sing-box"
+  cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
+  [[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so"
+  rm -rf "$tmp"
+}
+
+# Move geo files to outroot/bin
+unify_geo_layout() {
+  local outroot="$1"
+  mkdir -p "$outroot/bin"
+  local names=( \
+    "geosite.dat" \
+    "geoip.dat" \
+    "geoip-only-cn-private.dat" \
+    "Country.mmdb" \
+    "geoip.metadb" \
+  )
+  for n in "${names[@]}"; do
+    if [[ -f "$outroot/bin/xray/$n" ]]; then
+      mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
+    fi
+  done
+}
+
+# Download geo/rule assets
+download_geo_assets() {
+  local outroot="$1"
+  local bin_dir="$outroot/bin"
+  local srss_dir="$bin_dir/srss"
+  mkdir -p "$bin_dir" "$srss_dir"
+
+  echo "[+] Download Xray Geo to ${bin_dir}"
+  curl -fsSL -o "$bin_dir/geosite.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
+  curl -fsSL -o "$bin_dir/geoip.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
+  curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
+  curl -fsSL -o "$bin_dir/Country.mmdb" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
+
+  echo "[+] Download sing-box rule DB & rule-sets"
+  curl -fsSL -o "$bin_dir/geoip.metadb" \
+    "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" || true
+
+  for f in \
+    geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs \
+    geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
+    curl -fsSL -o "$srss_dir/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
+  done
+  for f in \
+    geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs \
+    geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
+    curl -fsSL -o "$srss_dir/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
+  done
+
+  # Unify to bin
+  unify_geo_layout "$outroot"
+}
+
+# Prefer the prebuilt v2rayN core bundle; then unify geo layout
+download_v2rayn_bundle() {
+  local outroot="$1" rid="$2"
+  local url=""
+  if [[ "$rid" == "linux-arm64" ]]; then
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip"
+  else
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip"
+  fi
+  echo "[+] Try v2rayN bundle archive: $url"
+  local tmp zipname
+  tmp="$(mktemp -d)"; zipname="$tmp/v2rayn.zip"
+  curl -fL "$url" -o "$zipname" || { echo "[!] Bundle download failed"; return 1; }
+  unzip -q "$zipname" -d "$tmp" || { echo "[!] Bundle unzip failed"; return 1; }
+
+  if [[ -d "$tmp/bin" ]]; then
+    mkdir -p "$outroot/bin"
+    rsync -a "$tmp/bin/" "$outroot/bin/"
+  else
+    rsync -a "$tmp/" "$outroot/"
+  fi
+
+  rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
+  find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
+
+  local nested_dir
+  nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
+  if [[ -n "$nested_dir" && -d "$nested_dir/bin" ]]; then
+    mkdir -p "$outroot/bin"
+    rsync -a "$nested_dir/bin/" "$outroot/bin/"
+    rm -rf "$nested_dir"
+  fi
+
+  # Unify to bin/
+  unify_geo_layout "$outroot"
+
+  echo "[+] Bundle extracted to $outroot"
+}
+
+# ===== Build results collection for --arch all ========================================
+BUILT_RPMS=()     # Will collect absolute paths of built RPMs
+BUILT_ALL=0       # Flag to know if we should print the final summary
+
+# ===== Build (single-arch) function ====================================================
+build_for_arch() {
+  # $1: target short arch: x64 | arm64
+  local short="$1"
+  local rid rpm_target archdir
+  case "$short" in
+    x64)   rid="linux-x64";   rpm_target="x86_64"; archdir="x86_64" ;;
+    arm64) rid="linux-arm64"; rpm_target="aarch64"; archdir="aarch64" ;;
+    *) echo "Unknown arch '$short' (use x64|arm64)"; return 1;;
+  esac
+
+  echo "[*] Building for target: $short  (RID=$rid, RPM --target $rpm_target)"
+
+  # .NET publish (self-contained) for this RID
+  dotnet clean "$PROJECT" -c Release
+  rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
+
+  dotnet restore "$PROJECT"
+  dotnet publish "$PROJECT" \
+    -c Release -r "$rid" \
+    -p:PublishSingleFile=false \
+    -p:SelfContained=true
+
+  # Per-arch variables (scoped)
+  local RID_DIR="$rid"
+  local PUBDIR
+  PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
+  [[ -d "$PUBDIR" ]] || { echo "Publish directory not found: $PUBDIR"; return 1; }
+
+  # Per-arch working area
+  local PKGROOT="v2rayN-publish"
+  local WORKDIR
+  WORKDIR="$(mktemp -d)"
+  trap '[[ -n "${WORKDIR:-}" ]] && rm -rf "$WORKDIR"' RETURN
+
+  # rpmbuild topdir selection
+  local TOPDIR SPECDIR SOURCEDIR
+  rpmdev-setuptree
+  TOPDIR="${HOME}/rpmbuild"
+  SPECDIR="${TOPDIR}/SPECS"
+  SOURCEDIR="${TOPDIR}/SOURCES"
+
+  # Stage publish content
+  mkdir -p "$WORKDIR/$PKGROOT"
+  cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/"
+
+  # Required icon
+  local ICON_CANDIDATE
+  PROJECT_DIR="$(cd "$(dirname "$PROJECT")" && pwd)"
+  ICON_CANDIDATE="$PROJECT_DIR/v2rayN.png"
+  [[ -f "$ICON_CANDIDATE" ]] || { echo "Required icon not found: $ICON_CANDIDATE"; return 1; }
+  cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png"
+
+  # Prepare bin structure
+  mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
+
+  # Bundle / cores per-arch
+  fetch_separate_cores_and_rules() {
+    local outroot="$1"
+
+    if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+      download_xray "$outroot/bin/xray" "$RID_DIR" || echo "[!] xray download failed (skipped)"
+    fi
+    if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+      download_singbox "$outroot/bin/sing_box" "$RID_DIR" || echo "[!] sing-box download failed (skipped)"
+    fi
+    download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
+  }
+
+  if [[ "$FORCE_NETCORE" -eq 0 ]]; then
+    if download_v2rayn_bundle "$WORKDIR/$PKGROOT" "$RID_DIR"; then
+      echo "[*] Using v2rayN bundle archive."
+    else
+      echo "[*] Bundle failed, fallback to separate core + rules."
+      fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT"
+    fi
+  else
+    echo "[*] --netcore specified: use separate core + rules."
+    fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT"
+  fi
+
+  # Tarball
+  mkdir -p "$SOURCEDIR"
+  tar -C "$WORKDIR" -czf "$SOURCEDIR/$PKGROOT.tar.gz" "$PKGROOT"
+
+  # SPEC
+  local SPECFILE="$SPECDIR/v2rayN.spec"
+  mkdir -p "$SPECDIR"
+  cat > "$SPECFILE" <<'SPEC'
+%global debug_package %{nil}
+%undefine _debuginfo_subpackages
+%undefine _debugsource_packages
+# Ignore outdated LTTng dependencies incorrectly reported by the .NET runtime (to avoid installation failures)
+%global __requires_exclude ^liblttng-ust\.so\..*$
+
+Name:           v2rayN
+Version:        __VERSION__
+Release:        1%{?dist}
+Summary:        v2rayN (Avalonia) GUI client for Linux (x86_64/aarch64)
+License:        GPL-3.0-only
+URL:            https://github.com/2dust/v2rayN
+BugURL:         https://github.com/2dust/v2rayN/issues
+ExclusiveArch:  aarch64 x86_64
+Source0:        __PKGROOT__.tar.gz
+
+# Runtime dependencies (Avalonia / X11 / Fonts / GL)
+Requires:       cairo, pango, openssl, mesa-libEGL, mesa-libGL
+Requires:       glibc >= 2.34
+Requires:       fontconfig >= 2.13.1
+Requires:       desktop-file-utils >= 0.26
+Requires:       xdg-utils >= 1.1.3
+Requires:       coreutils >= 8.32
+Requires:       bash >= 5.1
+Requires:       freetype >= 2.10
+
+%description
+v2rayN Linux for Red Hat Enterprise Linux
+Support vless / vmess / Trojan / http / socks / Anytls / Hysteria2 / Shadowsocks / tuic / WireGuard
+Support Red Hat Enterprise Linux / Fedora Linux / Rocky Linux / AlmaLinux / CentOS
+For more information, Please visit our website
+https://github.com/2dust/v2rayN
+
+%prep
+%setup -q -n __PKGROOT__
+
+%build
+# no build
+
+%install
+install -dm0755 %{buildroot}/opt/v2rayN
+cp -a * %{buildroot}/opt/v2rayN/
+
+# Normalize permissions
+find %{buildroot}/opt/v2rayN -type d -exec chmod 0755 {} +
+find %{buildroot}/opt/v2rayN -type f -exec chmod 0644 {} +
+[ -f %{buildroot}/opt/v2rayN/v2rayN ] && chmod 0755 %{buildroot}/opt/v2rayN/v2rayN || :
+
+# Launcher (prefer native ELF first, then DLL fallback)
+install -dm0755 %{buildroot}%{_bindir}
+install -m0755 /dev/stdin %{buildroot}%{_bindir}/v2rayn << 'EOF'
+#!/usr/bin/bash
+set -euo pipefail
+DIR="/opt/v2rayN"
+
+# Prefer native apphost
+if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi
+
+# DLL fallback
+for dll in v2rayN.Desktop.dll v2rayN.dll; do
+  if [[ -f "$DIR/$dll" ]]; then exec /usr/bin/dotnet "$DIR/$dll" "$@"; fi
+done
+
+echo "v2rayN launcher: no executable found in $DIR" >&2
+ls -l "$DIR" >&2 || true
+exit 1
+EOF
+
+# Desktop file
+install -dm0755 %{buildroot}%{_datadir}/applications
+install -m0644 /dev/stdin %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF'
+[Desktop Entry]
+Type=Application
+Name=v2rayN
+Comment=v2rayN for Red Hat Enterprise Linux
+Exec=v2rayn
+Icon=v2rayn
+Terminal=false
+Categories=Network;
+EOF
+
+# Icon
+install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
+install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
+
+%post
+/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || true
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2>&1 || true
+
+%postun
+/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || true
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2>&1 || true
+
+%files
+%{_bindir}/v2rayn
+/opt/v2rayN
+%{_datadir}/applications/v2rayn.desktop
+%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
+SPEC
+
+  # Replace placeholders
+  sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE"
+  sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE"
+
+  # Build RPM for this arch
+  rpmbuild -ba "$SPECFILE" --target "$rpm_target"
+
+  echo "Build done for $short. RPM at:"
+  local f
+  for f in "${TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm; do
+    [[ -e "$f" ]] || continue
+    echo "  $f"
+    BUILT_RPMS+=("$f")
+  done
+}
+
+# ===== Arch selection and build orchestration =========================================
+case "${ARCH_OVERRIDE:-}" in
+  all)           targets=(x64 arm64); BUILT_ALL=1 ;;
+  x64|amd64)     targets=(x64) ;;
+  arm64|aarch64) targets=(arm64) ;;
+  "")            targets=($([[ "$host_arch" == "aarch64" ]] && echo arm64 || echo x64)) ;;
+  *)             echo "Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all."; exit 1 ;;
+esac
+
+for arch in "${targets[@]}"; do
+  build_for_arch "$arch"
+done
+
+# Print Both arches information
+if [[ "$BUILT_ALL" -eq 1 ]]; then
+  echo ""
+  echo "================ Build Summary (both architectures) ================"
+  if [[ "${#BUILT_RPMS[@]}" -gt 0 ]]; then
+    for rp in "${BUILT_RPMS[@]}"; do
+      echo "$rp"
+    done
+  else
+    echo "No RPMs detected in summary (check build logs above)."
+  fi
+  echo "===================================================================="
+fi
@@ -1,29 +1,87 @@
-namespace AmazTool
+namespace AmazTool;
+
+internal static class Program
 {
-    internal static class Program
+    [STAThread]
+    private static void Main(string[] args)
    {
-        /// <summary>
-        /// 应用程序的主入口点。
-        /// </summary>
-        [STAThread]
-        private static void Main(string[] args)
+        try
        {
+            // If no arguments are provided, display usage guidelines and exit
            if (args.Length == 0)
            {
-                Console.WriteLine(Resx.Resource.Guidelines);
-                Thread.Sleep(5000);
+                ShowHelp();
                return;
            }

-            var argData = Uri.UnescapeDataString(string.Join(" ", args));
-            if (argData.Equals("rebootas"))
+            // Log all arguments for debugging purposes
+            foreach (var arg in args)
            {
-                Thread.Sleep(1000);
-                Utils.StartV2RayN();
-                return;
+                Console.WriteLine(arg);
            }

-            UpgradeApp.Upgrade(argData);
+            // Parse command based on first argument
+            switch (args[0].ToLowerInvariant())
+            {
+                case "rebootas":
+                    // Handle application restart
+                    HandleRebootAsync();
+                    break;
+
+                case "help":
+                case "--help":
+                case "-h":
+                case "/?":
+                    // Display help information
+                    ShowHelp();
+                    break;
+
+                default:
+                    // Default behavior: handle as upgrade data
+                    // Maintain backward compatibility with existing usage pattern
+                    var argData = Uri.UnescapeDataString(string.Join(" ", args));
+                    HandleUpgrade(argData);
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            // Global exception handling
+            Console.WriteLine($"An error occurred: {ex.Message}");
+            Console.WriteLine("Press any key to exit...");
+            Console.ReadKey();
        }
    }
-}
+
+    /// <summary>
+    /// Display help information and usage guidelines
+    /// </summary>
+    private static void ShowHelp()
+    {
+        Console.WriteLine(Resx.Resource.Guidelines);
+        Console.WriteLine("Available commands:");
+        Console.WriteLine("  rebootas             - Restart the application");
+        Console.WriteLine("  help                 - Display this help information");
+        Thread.Sleep(5000);
+    }
+
+    /// <summary>
+    /// Handle application restart
+    /// </summary>
+    private static void HandleRebootAsync()
+    {
+        Console.WriteLine("Restarting application...");
+        Thread.Sleep(1000);
+        Utils.StartV2RayN();
+    }
+
+    /// <summary>
+    /// Handle application upgrade with the provided data
+    /// </summary>
+    /// <param name="upgradeData">Data for the upgrade process</param>
+    private static void HandleUpgrade(string upgradeData)
+    {
+        Console.WriteLine("Upgrading application...");
+        UpgradeApp.Upgrade(upgradeData);
+    }
+}
@@ -61,7 +61,7 @@ namespace AmazTool.Resx {
        }
        
        /// <summary>
-        ///   查找类似 Failed to terminate the v2rayN.Close it manually,or the upgrade may fail. 的本地化字符串。
+        ///   查找类似 Failed to terminate the v2rayN. Close it manually, or the upgrade may fail. 的本地化字符串。
        /// </summary>
        internal static string FailedTerminateProcess {
            get {
@@ -133,7 +133,7 @@
    <value>Try to terminate the v2rayN process...</value>
  </data>
  <data name="FailedTerminateProcess" xml:space="preserve">
-    <value>Failed to terminate the v2rayN.Close it manually,or the upgrade may fail.</value>
+    <value>Failed to terminate the v2rayN. Close it manually, or the upgrade may fail.</value>
  </data>
  <data name="StartUnzipping" xml:space="preserve">
    <value>Start extracting the update package...</value>
@@ -133,7 +133,7 @@
    <value>尝试结束 v2rayN 进程...</value>
  </data>
  <data name="FailedTerminateProcess" xml:space="preserve">
-    <value>请手动关闭正在运行的v2rayN，否则可能升级失败。</value>
+    <value>请手动关闭正在运行的 v2rayN，否则可能升级失败。</value>
  </data>
  <data name="StartUnzipping" xml:space="preserve">
    <value>开始解压缩更新包...</value>
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Restartv2rayN" xml:space="preserve">
+    <value>正在重啟，請等待...</value>
+  </data>
+  <data name="Guidelines" xml:space="preserve">
+    <value>請從主應用程式運行。</value>
+  </data>
+  <data name="UpgradeFileNotFound" xml:space="preserve">
+    <value>升級失敗，檔案不存在。</value>
+  </data>
+  <data name="InProgress" xml:space="preserve">
+    <value>正在進行中，請等待...</value>
+  </data>
+  <data name="TryTerminateProcess" xml:space="preserve">
+    <value>嘗試結束 v2rayN 進程...</value>
+  </data>
+  <data name="FailedTerminateProcess" xml:space="preserve">
+    <value>請手動關閉正在執行的 v2rayN，否則可能會升級失敗。</value>
+  </data>
+  <data name="StartUnzipping" xml:space="preserve">
+    <value>開始解壓縮更新包...</value>
+  </data>
+  <data name="SuccessUnzipping" xml:space="preserve">
+    <value>解壓縮更新包成功。</value>
+  </data>
+  <data name="FailedUnzipping" xml:space="preserve">
+    <value>解壓縮更新包失敗。</value>
+  </data>
+  <data name="FailedUpgrade" xml:space="preserve">
+    <value>升級失敗。</value>
+  </data>
+  <data name="SuccessUpgrade" xml:space="preserve">
+    <value>升級成功。</value>
+  </data>
+  <data name="Information" xml:space="preserve">
+    <value>提示</value>
+  </data>
+</root>
@@ -2,104 +2,127 @@ using System.Diagnostics;
 using System.IO.Compression;
 using System.Text;

-namespace AmazTool
+namespace AmazTool;
+
+internal class UpgradeApp
 {
-    internal class UpgradeApp
+    public static void Upgrade(string fileName)
    {
-        public static void Upgrade(string fileName)
+        Console.WriteLine($"{Resx.Resource.StartUnzipping}\n{fileName}");
+
+        Utils.Waiting(5);
+
+        if (!File.Exists(fileName))
        {
-            Console.WriteLine($"{Resx.Resource.StartUnzipping}\n{fileName}");
-
-            Utils.Waiting(5);
-
-            if (!File.Exists(fileName))
-            {
-                Console.WriteLine(Resx.Resource.UpgradeFileNotFound);
-                return;
-            }
-
-            Console.WriteLine(Resx.Resource.TryTerminateProcess);
-            try
-            {
-                var existing = Process.GetProcessesByName(Utils.V2rayN);
-                foreach (var pp in existing)
-                {
-                    var path = pp.MainModule?.FileName ?? "";
-                    if (path.StartsWith(Utils.GetPath(Utils.V2rayN)))
-                    {
-                        pp?.Kill();
-                        pp?.WaitForExit(1000);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                // Access may be denied without admin right. The user may not be an administrator.
-                Console.WriteLine(Resx.Resource.FailedTerminateProcess + ex.StackTrace);
-            }
-
-            Console.WriteLine(Resx.Resource.StartUnzipping);
-            StringBuilder sb = new();
-            try
-            {
-                var thisAppOldFile = $"{Utils.GetExePath()}.tmp";
-                File.Delete(thisAppOldFile);
-                var splitKey = "/";
-
-                using var archive = ZipFile.OpenRead(fileName);
-                foreach (var entry in archive.Entries)
-                {
-                    try
-                    {
-                        if (entry.Length == 0)
-                        {
-                            continue;
-                        }
-
-                        Console.WriteLine(entry.FullName);
-
-                        var lst = entry.FullName.Split(splitKey);
-                        if (lst.Length == 1)
-                            continue;
-                        var fullName = string.Join(splitKey, lst[1..lst.Length]);
-
-                        if (string.Equals(Utils.GetExePath(), Utils.GetPath(fullName), StringComparison.OrdinalIgnoreCase))
-                        {
-                            File.Move(Utils.GetExePath(), thisAppOldFile);
-                        }
-
-                        var entryOutputPath = Utils.GetPath(fullName);
-                        Directory.CreateDirectory(Path.GetDirectoryName(entryOutputPath)!);
-                        //In the bin folder, if the file already exists, it will be skipped
-                        if (fullName.StartsWith("bin") && File.Exists(entryOutputPath))
-                        {
-                            continue;
-                        }
-                        entry.ExtractToFile(entryOutputPath, true);
-
-                        Console.WriteLine(entryOutputPath);
-                    }
-                    catch (Exception ex)
-                    {
-                        sb.Append(ex.StackTrace);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(Resx.Resource.FailedUpgrade + ex.StackTrace);
-                //return;
-            }
-            if (sb.Length > 0)
-            {
-                Console.WriteLine(Resx.Resource.FailedUpgrade + sb.ToString());
-                //return;
-            }
-
-            Console.WriteLine(Resx.Resource.Restartv2rayN);
-            Utils.Waiting(2);
-
-            Utils.StartV2RayN();
+            Console.WriteLine(Resx.Resource.UpgradeFileNotFound);
+            return;
        }
+
+        Console.WriteLine(Resx.Resource.TryTerminateProcess);
+        try
+        {
+            var existing = Process.GetProcessesByName(Utils.V2rayN);
+            foreach (var pp in existing)
+            {
+                var path = pp.MainModule?.FileName ?? "";
+                if (path.StartsWith(Utils.GetPath(Utils.V2rayN)))
+                {
+                    pp?.Kill();
+                    pp?.WaitForExit(1000);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            // Access may be denied without admin right. The user may not be an administrator.
+            Console.WriteLine(Resx.Resource.FailedTerminateProcess + ex.StackTrace);
+        }
+
+        Console.WriteLine(Resx.Resource.StartUnzipping);
+        StringBuilder sb = new();
+        try
+        {
+            var thisAppOldFile = $"{Utils.GetExePath()}.tmp";
+            File.Delete(thisAppOldFile);
+            var splitKey = "/";
+
+            using var archive = ZipFile.OpenRead(fileName);
+            foreach (var entry in archive.Entries)
+            {
+                try
+                {
+                    if (entry.Length == 0)
+                    {
+                        continue;
+                    }
+
+                    Console.WriteLine(entry.FullName);
+
+                    var lst = entry.FullName.Split(splitKey);
+                    if (lst.Length == 1)
+                    {
+                        continue;
+                    }
+
+                    var fullName = string.Join(splitKey, lst[1..lst.Length]);
+
+                    if (string.Equals(Utils.GetExePath(), Utils.GetPath(fullName), StringComparison.OrdinalIgnoreCase))
+                    {
+                        File.Move(Utils.GetExePath(), thisAppOldFile);
+                    }
+
+                    var entryOutputPath = Utils.GetPath(fullName);
+                    Directory.CreateDirectory(Path.GetDirectoryName(entryOutputPath)!);
+                    //In the bin folder, if the file already exists, it will be skipped
+                    if (fullName.StartsWith("bin") && File.Exists(entryOutputPath))
+                    {
+                        continue;
+                    }
+
+                    TryExtractToFile(entry, entryOutputPath);
+
+                    Console.WriteLine(entryOutputPath);
+                }
+                catch (Exception ex)
+                {
+                    sb.Append(ex.StackTrace);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine(Resx.Resource.FailedUpgrade + ex.StackTrace);
+            //return;
+        }
+        if (sb.Length > 0)
+        {
+            Console.WriteLine(Resx.Resource.FailedUpgrade + sb.ToString());
+            //return;
+        }
+
+        Console.WriteLine(Resx.Resource.Restartv2rayN);
+        Utils.Waiting(2);
+
+        Utils.StartV2RayN();
+    }
+
+    private static bool TryExtractToFile(ZipArchiveEntry entry, string outputPath)
+    {
+        var retryCount = 5;
+        var delayMs = 1000;
+
+        for (var i = 1; i <= retryCount; i++)
+        {
+            try
+            {
+                entry.ExtractToFile(outputPath, true);
+                return true;
+            }
+            catch
+            {
+                Thread.Sleep(delayMs * i);
+            }
+        }
+        return false;
    }
 }
@@ -1,52 +1,51 @@
-using System.Diagnostics;
+using System.Diagnostics;

-namespace AmazTool
+namespace AmazTool;
+
+internal class Utils
 {
-    internal class Utils
+    public static string GetExePath()
    {
-        public static string GetExePath()
-        {
-            return Environment.ProcessPath ?? Process.GetCurrentProcess().MainModule?.FileName ?? string.Empty;
-        }
+        return Environment.ProcessPath ?? Process.GetCurrentProcess().MainModule?.FileName ?? string.Empty;
+    }

-        public static string StartupPath()
-        {
-            return AppDomain.CurrentDomain.BaseDirectory;
-        }
+    public static string StartupPath()
+    {
+        return AppDomain.CurrentDomain.BaseDirectory;
+    }

-        public static string GetPath(string fileName)
+    public static string GetPath(string fileName)
+    {
+        var startupPath = StartupPath();
+        if (string.IsNullOrEmpty(fileName))
        {
-            string startupPath = StartupPath();
-            if (string.IsNullOrEmpty(fileName))
+            return startupPath;
+        }
+        return Path.Combine(startupPath, fileName);
+    }
+
+    public static string V2rayN => "v2rayN";
+
+    public static void StartV2RayN()
+    {
+        Process process = new()
+        {
+            StartInfo = new()
            {
-                return startupPath;
+                UseShellExecute = true,
+                FileName = V2rayN,
+                WorkingDirectory = StartupPath()
            }
-            return Path.Combine(startupPath, fileName);
-        }
+        };
+        process.Start();
+    }

-        public static string V2rayN => "v2rayN";
-
-        public static void StartV2RayN()
+    public static void Waiting(int second)
+    {
+        for (var i = second; i > 0; i--)
        {
-            Process process = new()
-            {
-                StartInfo = new()
-                {
-                    UseShellExecute = true,
-                    FileName = V2rayN,
-                    WorkingDirectory = StartupPath()
-                }
-            };
-            process.Start();
-        }
-
-        public static void Waiting(int second)
-        {
-            for (var i = second; i > 0; i--)
-            {
-                Console.WriteLine(i);
-                Thread.Sleep(1000);
-            }
+            Console.WriteLine(i);
+            Thread.Sleep(1000);
        }
    }
-}
+}
@@ -1,14 +1,14 @@
 <Project>

    <PropertyGroup>
-        <Version>7.8.3</Version>
+        <Version>7.20.4</Version>
    </PropertyGroup>

    <PropertyGroup>
        <TargetFramework>net8.0</TargetFramework>
        <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
        <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-        <NoWarn>CA1031;CS1591;NU1507;CA1416</NoWarn>
+        <NoWarn>CA1031;CS1591;NU1507;CA1416;IDE0058;IDE0053;IDE0200</NoWarn>
        <Nullable>annotations</Nullable>
        <ImplicitUsings>enable</ImplicitUsings>
        <Authors>2dust</Authors>
@@ -28,5 +28,6 @@

        <UseSystemResourceKeys>true</UseSystemResourceKeys>
        <PublishSingleFile>true</PublishSingleFile>
+        <PublishReadyToRun>false</PublishReadyToRun>
    </PropertyGroup>
 </Project>
@@ -5,25 +5,30 @@
    <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
  </PropertyGroup>
  <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.3" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.2.3" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.3" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.3" />
-    <PackageVersion Include="CliWrap" Version="3.7.1" />
-    <PackageVersion Include="Downloader" Version="3.3.3" />
-    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
-    <PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
-    <PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
-    <PackageVersion Include="QRCoder" Version="1.6.0" />
-    <PackageVersion Include="ReactiveUI" Version="20.1.63" />
+    <PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.4.1" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.13" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.13" />
+    <PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.12" />
+    <PackageVersion Include="CliWrap" Version="3.10.1" />
+    <PackageVersion Include="Downloader" Version="5.1.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
+    <PackageVersion Include="MaterialDesignThemes" Version="5.3.1" />
+    <PackageVersion Include="MessageBox.Avalonia" Version="3.3.1.1" />
+    <PackageVersion Include="QRCoder" Version="1.8.0" />
+    <PackageVersion Include="ReactiveUI" Version="23.2.1" />
    <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
-    <PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
-    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.4" />
-    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.4" />
-    <PackageVersion Include="Splat.NLog" Version="15.3.1" />
+    <PackageVersion Include="ReactiveUI.WPF" Version="23.2.1" />
+    <PackageVersion Include="Semi.Avalonia" Version="11.3.7.3" />
+    <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.2" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.3" />
+    <PackageVersion Include="NLog" Version="6.1.2" />
    <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
-    <PackageVersion Include="TaskScheduler" Version="2.11.0" />
-    <PackageVersion Include="WebDav.Client" Version="2.8.0" />
+    <PackageVersion Include="TaskScheduler" Version="2.12.2" />
+    <PackageVersion Include="WebDav.Client" Version="2.9.0" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
    <PackageVersion Include="YamlDotNet" Version="16.3.0" />
    <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
  </ItemGroup>
@@ -0,0 +1,228 @@
+using System.Text.Json.Nodes;
+using ServiceLib;
+using ServiceLib.Enums;
+using ServiceLib.Models;
+using ServiceLib.Services.CoreConfig;
+using Xunit;
+
+namespace ServiceLib.Tests;
+
+public class CoreConfigV2rayServiceTests
+{
+    private const string SendThrough = "198.51.100.10";
+
+    [Fact]
+    public void GenerateClientConfigContent_OnlyAppliesSendThroughToRemoteProxyOutbounds()
+    {
+        var node = CreateProxyNode("proxy-1", "198.51.100.1", 443);
+        var service = new CoreConfigV2rayService(CreateContext(node));
+
+        var result = service.GenerateClientConfigContent();
+
+        Assert.True(result.Success);
+
+        var outbounds = GetOutbounds(result.Data?.ToString());
+        var proxyOutbound = outbounds.Single(outbound => outbound["tag"]!.GetValue<string>() == Global.ProxyTag);
+        var directOutbound = outbounds.Single(outbound => outbound["tag"]!.GetValue<string>() == Global.DirectTag);
+        var blockOutbound = outbounds.Single(outbound => outbound["tag"]!.GetValue<string>() == Global.BlockTag);
+
+        Assert.Equal(SendThrough, proxyOutbound["sendThrough"]?.GetValue<string>());
+        Assert.Null(directOutbound["sendThrough"]);
+        Assert.Null(blockOutbound["sendThrough"]);
+    }
+
+    [Fact]
+    public void GenerateClientConfigContent_OnlyAppliesSendThroughToChainExitOutbounds()
+    {
+        var exitNode = CreateProxyNode("exit", "198.51.100.2", 443);
+        var entryNode = CreateProxyNode("entry", "198.51.100.3", 443);
+        var chainNode = CreateChainNode("chain", exitNode, entryNode);
+
+        var service = new CoreConfigV2rayService(CreateContext(
+            chainNode,
+            allProxiesMap: new Dictionary<string, ProfileItem>
+            {
+                [exitNode.IndexId] = exitNode,
+                [entryNode.IndexId] = entryNode,
+            }));
+
+        var result = service.GenerateClientConfigContent();
+
+        Assert.True(result.Success);
+
+        var outbounds = GetOutbounds(result.Data?.ToString())
+            .Where(outbound => outbound["protocol"]?.GetValue<string>() is not ("freedom" or "blackhole" or "dns"))
+            .ToList();
+
+        var sendThroughOutbounds = outbounds
+            .Where(outbound => outbound["sendThrough"]?.GetValue<string>() == SendThrough)
+            .ToList();
+        var chainedOutbounds = outbounds
+            .Where(outbound => outbound["streamSettings"]?["sockopt"]?["dialerProxy"] is not null)
+            .ToList();
+
+        Assert.Single(sendThroughOutbounds);
+        Assert.All(chainedOutbounds, outbound => Assert.Null(outbound["sendThrough"]));
+    }
+
+    [Fact]
+    public void GenerateClientConfigContent_DoesNotApplySendThroughToTunRelayLoopbackOutbound()
+    {
+        var node = CreateProxyNode("proxy-1", "198.51.100.4", 443);
+        var config = CreateConfig();
+        config.TunModeItem.EnableLegacyProtect = false;
+
+        var service = new CoreConfigV2rayService(CreateContext(
+            node,
+            config,
+            isTunEnabled: true,
+            tunProtectSsPort: 10811,
+            proxyRelaySsPort: 10812));
+
+        var result = service.GenerateClientConfigContent();
+
+        Assert.True(result.Success);
+
+        var outbounds = GetOutbounds(result.Data?.ToString());
+        Assert.DoesNotContain(outbounds, outbound => outbound["sendThrough"]?.GetValue<string>() == SendThrough);
+    }
+
+    private static CoreConfigContext CreateContext(
+        ProfileItem node,
+        Config? config = null,
+        Dictionary<string, ProfileItem>? allProxiesMap = null,
+        bool isTunEnabled = false,
+        int tunProtectSsPort = 0,
+        int proxyRelaySsPort = 0)
+    {
+        return new CoreConfigContext
+        {
+            Node = node,
+            RunCoreType = ECoreType.Xray,
+            AppConfig = config ?? CreateConfig(),
+            AllProxiesMap = allProxiesMap ?? new(),
+            SimpleDnsItem = new SimpleDNSItem(),
+            IsTunEnabled = isTunEnabled,
+            TunProtectSocksPort = tunProtectSsPort,
+            ProxyRelaySocksPort = proxyRelaySsPort,
+        };
+    }
+
+    private static Config CreateConfig()
+    {
+        return new Config
+        {
+            IndexId = string.Empty,
+            SubIndexId = string.Empty,
+            CoreBasicItem = new()
+            {
+                LogEnabled = false,
+                Loglevel = "warning",
+                MuxEnabled = false,
+                DefAllowInsecure = false,
+                DefFingerprint = Global.Fingerprints.First(),
+                DefUserAgent = string.Empty,
+                SendThrough = SendThrough,
+                EnableFragment = false,
+                EnableCacheFile4Sbox = true,
+            },
+            TunModeItem = new()
+            {
+                EnableTun = false,
+                AutoRoute = true,
+                StrictRoute = true,
+                Stack = string.Empty,
+                Mtu = 9000,
+                EnableIPv6Address = false,
+                IcmpRouting = Global.TunIcmpRoutingPolicies.First(),
+                EnableLegacyProtect = false,
+            },
+            KcpItem = new(),
+            GrpcItem = new(),
+            RoutingBasicItem = new()
+            {
+                DomainStrategy = Global.DomainStrategies.First(),
+                DomainStrategy4Singbox = Global.DomainStrategies4Sbox.First(),
+                RoutingIndexId = string.Empty,
+            },
+            GuiItem = new(),
+            MsgUIItem = new(),
+            UiItem = new()
+            {
+                CurrentLanguage = "en",
+                CurrentFontFamily = string.Empty,
+                MainColumnItem = [],
+                WindowSizeItem = [],
+            },
+            ConstItem = new(),
+            SpeedTestItem = new(),
+            Mux4RayItem = new()
+            {
+                Concurrency = 8,
+                XudpConcurrency = 8,
+                XudpProxyUDP443 = "reject",
+            },
+            Mux4SboxItem = new()
+            {
+                Protocol = string.Empty,
+            },
+            HysteriaItem = new(),
+            ClashUIItem = new()
+            {
+                ConnectionsColumnItem = [],
+            },
+            SystemProxyItem = new(),
+            WebDavItem = new(),
+            CheckUpdateItem = new(),
+            Fragment4RayItem = null,
+            Inbound = [new InItem
+            {
+                Protocol = EInboundProtocol.socks.ToString(),
+                LocalPort = 10808,
+                UdpEnabled = true,
+                SniffingEnabled = true,
+                RouteOnly = false,
+            }],
+            GlobalHotkeys = [],
+            CoreTypeItem = [],
+            SimpleDNSItem = new(),
+        };
+    }
+
+    private static ProfileItem CreateProxyNode(string indexId, string address, int port)
+    {
+        return new ProfileItem
+        {
+            IndexId = indexId,
+            Remarks = indexId,
+            ConfigType = EConfigType.SOCKS,
+            CoreType = ECoreType.Xray,
+            Address = address,
+            Port = port,
+        };
+    }
+
+    private static ProfileItem CreateChainNode(string indexId, params ProfileItem[] nodes)
+    {
+        var chainNode = new ProfileItem
+        {
+            IndexId = indexId,
+            Remarks = indexId,
+            ConfigType = EConfigType.ProxyChain,
+            CoreType = ECoreType.Xray,
+        };
+        chainNode.SetProtocolExtra(new ProtocolExtraItem
+        {
+            ChildItems = string.Join(',', nodes.Select(node => node.IndexId)),
+        });
+        return chainNode;
+    }
+
+    private static List<JsonObject> GetOutbounds(string? json)
+    {
+        var root = JsonNode.Parse(json ?? throw new InvalidOperationException("Config JSON is missing"))?.AsObject()
+            ?? throw new InvalidOperationException("Failed to parse config JSON");
+        return root["outbounds"]?.AsArray().Select(node => node!.AsObject()).ToList()
+            ?? throw new InvalidOperationException("Config JSON does not contain outbounds");
+    }
+}
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -1,10 +1,7 @@
-using ReactiveUI;
+namespace ServiceLib.Base;

-namespace ServiceLib.Base
+public class MyReactiveObject : ReactiveObject
 {
-    public class MyReactiveObject : ReactiveObject
-    {
-        protected static Config? _config;
-        protected Func<EViewAction, object?, Task<bool>>? _updateView;
-    }
-}
+    protected static Config? _config;
+    protected Func<EViewAction, object?, Task<bool>>? _updateView;
+}
@@ -1,101 +0,0 @@
-using System.Security.Cryptography;
-using System.Text;
-
-namespace ServiceLib.Common
-{
-    public class AesUtils
-    {
-        private const int KeySize = 256; // AES-256
-        private const int IvSize = 16;   // AES block size
-        private const int Iterations = 10000;
-        private static readonly byte[] Salt = Encoding.ASCII.GetBytes("saltysalt".PadRight(16, ' ')); // google浏览器默认盐值
-        private static readonly string DefaultPassword = Utils.GetMd5(Utils.GetHomePath() + "AesUtils");
-
-        /// <summary>
-        /// Encrypt
-        /// </summary>
-        /// <param name="text">Plain text</param>
-        /// <param name="password">Password for key derivation or direct key in ASCII bytes</param>
-        /// <returns>Base64 encoded cipher text with IV</returns>
-        public static string Encrypt(string text, string? password = null)
-        {
-            if (string.IsNullOrEmpty(text))
-                return string.Empty;
-
-            var plaintext = Encoding.UTF8.GetBytes(text);
-            var key = GetKey(password);
-            var iv = GenerateIv();
-
-            using var aes = Aes.Create();
-            aes.Key = key;
-            aes.IV = iv;
-
-            using var ms = new MemoryStream();
-            ms.Write(iv, 0, iv.Length);
-
-            using (var cs = new CryptoStream(ms, aes.CreateEncryptor(), CryptoStreamMode.Write))
-            {
-                cs.Write(plaintext, 0, plaintext.Length);
-                cs.FlushFinalBlock();
-            }
-
-            var cipherTextWithIv = ms.ToArray();
-            return Convert.ToBase64String(cipherTextWithIv);
-        }
-
-        /// <summary>
-        /// Decrypt
-        /// </summary>
-        /// <param name="cipherTextWithIv">Base64 encoded cipher text with IV</param>
-        /// <param name="password">Password for key derivation or direct key in ASCII bytes</param>
-        /// <returns>Plain text</returns>
-        public static string Decrypt(string cipherTextWithIv, string? password = null)
-        {
-            if (string.IsNullOrEmpty(cipherTextWithIv))
-                return string.Empty;
-
-            var cipherTextWithIvBytes = Convert.FromBase64String(cipherTextWithIv);
-            var key = GetKey(password);
-
-            var iv = new byte[IvSize];
-            Buffer.BlockCopy(cipherTextWithIvBytes, 0, iv, 0, IvSize);
-
-            var cipherText = new byte[cipherTextWithIvBytes.Length - IvSize];
-            Buffer.BlockCopy(cipherTextWithIvBytes, IvSize, cipherText, 0, cipherText.Length);
-
-            using var aes = Aes.Create();
-            aes.Key = key;
-            aes.IV = iv;
-
-            using var ms = new MemoryStream();
-            using (var cs = new CryptoStream(ms, aes.CreateDecryptor(), CryptoStreamMode.Write))
-            {
-                cs.Write(cipherText, 0, cipherText.Length);
-                cs.FlushFinalBlock();
-            }
-
-            var plainText = ms.ToArray();
-            return Encoding.UTF8.GetString(plainText);
-        }
-
-        private static byte[] GetKey(string? password)
-        {
-            if (password.IsNullOrEmpty())
-            {
-                password = DefaultPassword;
-            }
-
-            using var pbkdf2 = new Rfc2898DeriveBytes(password, Salt, Iterations, HashAlgorithmName.SHA256);
-            return pbkdf2.GetBytes(KeySize / 8);
-        }
-
-        private static byte[] GenerateIv()
-        {
-            var randomNumber = new byte[IvSize];
-
-            using var rng = RandomNumberGenerator.Create();
-            rng.GetBytes(randomNumber);
-            return randomNumber;
-        }
-    }
-}
@@ -1,75 +0,0 @@
-using System.Security.Cryptography;
-using System.Text;
-
-namespace ServiceLib.Common
-{
-    public class DesUtils
-    {
-        /// <summary>
-        /// Encrypt
-        /// </summary>
-        /// <param name="text"></param>
-        /// /// <param name="key"></param>
-        /// <returns></returns>
-        public static string Encrypt(string? text, string? key = null)
-        {
-            if (text.IsNullOrEmpty())
-            {
-                return string.Empty;
-            }
-            GetKeyIv(key ?? GetDefaultKey(), out var rgbKey, out var rgbIv);
-            var dsp = DES.Create();
-            using var memStream = new MemoryStream();
-            using var cryStream = new CryptoStream(memStream, dsp.CreateEncryptor(rgbKey, rgbIv), CryptoStreamMode.Write);
-            using var sWriter = new StreamWriter(cryStream);
-            sWriter.Write(text);
-            sWriter.Flush();
-            cryStream.FlushFinalBlock();
-            memStream.Flush();
-            return Convert.ToBase64String(memStream.GetBuffer(), 0, (int)memStream.Length);
-        }
-
-        /// <summary>
-        /// Decrypt
-        /// </summary>
-        /// <param name="encryptText"></param>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        public static string Decrypt(string? encryptText, string? key = null)
-        {
-            if (encryptText.IsNullOrEmpty())
-            {
-                return string.Empty;
-            }
-            GetKeyIv(key ?? GetDefaultKey(), out var rgbKey, out var rgbIv);
-            var dsp = DES.Create();
-            var buffer = Convert.FromBase64String(encryptText);
-
-            using var memStream = new MemoryStream();
-            using var cryStream = new CryptoStream(memStream, dsp.CreateDecryptor(rgbKey, rgbIv), CryptoStreamMode.Write);
-            cryStream.Write(buffer, 0, buffer.Length);
-            cryStream.FlushFinalBlock();
-            return Encoding.UTF8.GetString(memStream.ToArray());
-        }
-
-        private static void GetKeyIv(string key, out byte[] rgbKey, out byte[] rgbIv)
-        {
-            if (key.IsNullOrEmpty())
-            {
-                throw new ArgumentNullException("The key cannot be null");
-            }
-            if (key.Length <= 8)
-            {
-                throw new ArgumentNullException("The key length cannot be less than 8 characters.");
-            }
-
-            rgbKey = Encoding.ASCII.GetBytes(key.Substring(0, 8));
-            rgbIv = Encoding.ASCII.GetBytes(key.Insert(0, "w").Substring(0, 8));
-        }
-
-        private static string GetDefaultKey()
-        {
-            return Utils.GetMd5(Utils.GetHomePath() + "DesUtils");
-        }
-    }
-}
@@ -1,184 +0,0 @@
-using System.Net;
-using Downloader;
-
-namespace ServiceLib.Common
-{
-    public class DownloaderHelper
-    {
-        private static readonly Lazy<DownloaderHelper> _instance = new(() => new());
-        public static DownloaderHelper Instance => _instance.Value;
-
-        public async Task<string?> DownloadStringAsync(IWebProxy? webProxy, string url, string? userAgent, int timeout)
-        {
-            if (Utils.IsNullOrEmpty(url))
-            {
-                return null;
-            }
-
-            Uri uri = new(url);
-            //Authorization Header
-            var headers = new WebHeaderCollection();
-            if (Utils.IsNotEmpty(uri.UserInfo))
-            {
-                headers.Add(HttpRequestHeader.Authorization, "Basic " + Utils.Base64Encode(uri.UserInfo));
-            }
-
-            var downloadOpt = new DownloadConfiguration()
-            {
-                Timeout = timeout * 1000,
-                MaxTryAgainOnFailover = 2,
-                RequestConfiguration =
-                {
-                    Headers = headers,
-                    UserAgent = userAgent,
-                    Timeout = timeout * 1000,
-                    Proxy = webProxy
-                }
-            };
-
-            await using var downloader = new Downloader.DownloadService(downloadOpt);
-            downloader.DownloadFileCompleted += (sender, value) =>
-            {
-                if (value.Error != null)
-                {
-                    throw value.Error;
-                }
-            };
-
-            using var cts = new CancellationTokenSource();
-            await using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token).WaitAsync(TimeSpan.FromSeconds(timeout), cts.Token);
-            using StreamReader reader = new(stream);
-
-            downloadOpt = null;
-
-            return await reader.ReadToEndAsync(cts.Token);
-        }
-
-        public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgress<string> progress, int timeout)
-        {
-            if (Utils.IsNullOrEmpty(url))
-            {
-                throw new ArgumentNullException(nameof(url));
-            }
-
-            var downloadOpt = new DownloadConfiguration()
-            {
-                Timeout = timeout * 1000,
-                MaxTryAgainOnFailover = 2,
-                RequestConfiguration =
-                {
-                    Timeout= timeout * 1000,
-                    Proxy = webProxy
-                }
-            };
-
-            var totalDatetime = DateTime.Now;
-            var totalSecond = 0;
-            var hasValue = false;
-            double maxSpeed = 0;
-            await using var downloader = new Downloader.DownloadService(downloadOpt);
-            //downloader.DownloadStarted += (sender, value) =>
-            //{
-            //    if (progress != null)
-            //    {
-            //        progress.Report("Start download data...");
-            //    }
-            //};
-            downloader.DownloadProgressChanged += (sender, value) =>
-            {
-                var ts = (DateTime.Now - totalDatetime);
-                if (progress != null && ts.Seconds > totalSecond)
-                {
-                    hasValue = true;
-                    totalSecond = ts.Seconds;
-                    if (value.BytesPerSecondSpeed > maxSpeed)
-                    {
-                        maxSpeed = value.BytesPerSecondSpeed;
-                        var speed = (maxSpeed / 1000 / 1000).ToString("#0.0");
-                        progress.Report(speed);
-                    }
-                }
-            };
-            downloader.DownloadFileCompleted += (sender, value) =>
-            {
-                if (progress != null)
-                {
-                    if (!hasValue && value.Error != null)
-                    {
-                        progress.Report(value.Error?.Message);
-                    }
-                }
-            };
-            //progress.Report("......");
-            using var cts = new CancellationTokenSource();
-            cts.CancelAfter(timeout * 1000);
-            await using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token);
-
-            downloadOpt = null;
-        }
-
-        public async Task DownloadFileAsync(IWebProxy? webProxy, string url, string fileName, IProgress<double> progress, int timeout)
-        {
-            if (Utils.IsNullOrEmpty(url))
-            {
-                throw new ArgumentNullException(nameof(url));
-            }
-            if (Utils.IsNullOrEmpty(fileName))
-            {
-                throw new ArgumentNullException(nameof(fileName));
-            }
-            if (File.Exists(fileName))
-            {
-                File.Delete(fileName);
-            }
-
-            var downloadOpt = new DownloadConfiguration()
-            {
-                Timeout = timeout * 1000,
-                MaxTryAgainOnFailover = 2,
-                RequestConfiguration =
-                {
-                    Timeout= timeout * 1000,
-                    Proxy = webProxy
-                }
-            };
-
-            var progressPercentage = 0;
-            var hasValue = false;
-            await using var downloader = new Downloader.DownloadService(downloadOpt);
-            downloader.DownloadStarted += (sender, value) =>
-            {
-                progress?.Report(0);
-            };
-            downloader.DownloadProgressChanged += (sender, value) =>
-            {
-                hasValue = true;
-                var percent = (int)value.ProgressPercentage;//   Convert.ToInt32((totalRead * 1d) / (total * 1d) * 100);
-                if (progressPercentage != percent && percent % 10 == 0)
-                {
-                    progressPercentage = percent;
-                    progress.Report(percent);
-                }
-            };
-            downloader.DownloadFileCompleted += (sender, value) =>
-            {
-                if (progress != null)
-                {
-                    if (hasValue && value.Error == null)
-                    {
-                        progress.Report(101);
-                    }
-                    else if (value.Error != null)
-                    {
-                        throw value.Error;
-                    }
-                }
-            };
-
-            using var cts = new CancellationTokenSource();
-            await downloader.DownloadFileTaskAsync(url, fileName, cts.Token);
-
-            downloadOpt = null;
-        }
-    }
-}
@@ -1,6 +1,3 @@
-using System.Collections.Concurrent;
-using System.Reflection;
-
 namespace ServiceLib.Common;

 public static class EmbedUtils
@@ -0,0 +1,121 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace ServiceLib.Common;
+
+public static class Extension
+{
+    public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
+    {
+        return string.IsNullOrWhiteSpace(value) || string.IsNullOrEmpty(value);
+    }
+
+    public static bool IsNotEmpty([NotNullWhen(false)] this string? value)
+    {
+        return !string.IsNullOrWhiteSpace(value);
+    }
+
+    public static string? NullIfEmpty(this string? value)
+    {
+        return string.IsNullOrWhiteSpace(value) ? null : value;
+    }
+
+    public static bool BeginWithAny(this string s, IEnumerable<char> chars)
+    {
+        if (s.IsNullOrEmpty())
+        {
+            return false;
+        }
+        return chars.Contains(s.First());
+    }
+
+    private static bool IsWhiteSpace(this string value)
+    {
+        return value.All(char.IsWhiteSpace);
+    }
+
+    public static IEnumerable<string> NonWhiteSpaceLines(this TextReader reader)
+    {
+        while (reader.ReadLine() is { } line)
+        {
+            if (line.IsWhiteSpace())
+            {
+                continue;
+            }
+            yield return line;
+        }
+    }
+
+    public static string TrimEx(this string? value)
+    {
+        return value == null ? string.Empty : value.Trim();
+    }
+
+    public static string RemovePrefix(this string value, char prefix)
+    {
+        return value.StartsWith(prefix) ? value[1..] : value;
+    }
+
+    public static string RemovePrefix(this string value, string prefix)
+    {
+        return value.StartsWith(prefix) ? value[prefix.Length..] : value;
+    }
+
+    public static string UpperFirstChar(this string value)
+    {
+        if (string.IsNullOrEmpty(value))
+        {
+            return string.Empty;
+        }
+
+        return char.ToUpper(value.First()) + value[1..];
+    }
+
+    public static string AppendQuotes(this string value)
+    {
+        return string.IsNullOrEmpty(value) ? string.Empty : $"\"{value}\"";
+    }
+
+    public static int ToInt(this string? value, int defaultValue = 0)
+    {
+        return int.TryParse(value, out var result) ? result : defaultValue;
+    }
+
+    public static List<string> AppendEmpty(this IEnumerable<string> source)
+    {
+        return source.Concat(new[] { string.Empty }).ToList();
+    }
+
+    public static bool IsGroupType(this EConfigType configType)
+    {
+        return configType is EConfigType.PolicyGroup or EConfigType.ProxyChain;
+    }
+
+    public static bool IsComplexType(this EConfigType configType)
+    {
+        return configType is EConfigType.Custom or EConfigType.PolicyGroup or EConfigType.ProxyChain;
+    }
+
+    /// <summary>
+    /// Safely adds elements from a collection to the list. Does nothing if the source is null.
+    /// </summary>
+    public static void AddRangeSafe<T>(this ICollection<T> destination, IEnumerable<T>? source)
+    {
+        ArgumentNullException.ThrowIfNull(destination);
+
+        if (source is null)
+        {
+            return;
+        }
+
+        if (destination is List<T> list)
+        {
+            list.AddRange(source);
+            return;
+        }
+
+        foreach (var item in source)
+        {
+            destination.Add(item);
+        }
+    }
+}
@@ -1,225 +0,0 @@
-using System.Formats.Tar;
-using System.IO.Compression;
-using System.Text;
-
-namespace ServiceLib.Common
-{
-    public static class FileManager
-    {
-        private static readonly string _tag = "FileManager";
-
-        public static bool ByteArrayToFile(string fileName, byte[] content)
-        {
-            try
-            {
-                File.WriteAllBytes(fileName, content);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-            return false;
-        }
-
-        public static void DecompressFile(string fileName, byte[] content)
-        {
-            try
-            {
-                using var fs = File.Create(fileName);
-                using GZipStream input = new(new MemoryStream(content), CompressionMode.Decompress, false);
-                input.CopyTo(fs);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-        }
-
-        public static void DecompressFile(string fileName, string toPath, string? toName)
-        {
-            try
-            {
-                FileInfo fileInfo = new(fileName);
-                using var originalFileStream = fileInfo.OpenRead();
-                using var decompressedFileStream = File.Create(toName != null ? Path.Combine(toPath, toName) : toPath);
-                using GZipStream decompressionStream = new(originalFileStream, CompressionMode.Decompress);
-                decompressionStream.CopyTo(decompressedFileStream);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-        }
-
-        public static void DecompressTarFile(string fileName, string toPath)
-        {
-            try
-            {
-                using var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read);
-                using var gz = new GZipStream(fs, CompressionMode.Decompress, leaveOpen: true);
-                TarFile.ExtractToDirectory(gz, toPath, overwriteFiles: true);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-        }
-
-        public static string NonExclusiveReadAllText(string path)
-        {
-            return NonExclusiveReadAllText(path, Encoding.Default);
-        }
-
-        private static string NonExclusiveReadAllText(string path, Encoding encoding)
-        {
-            try
-            {
-                using FileStream fs = new(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-                using StreamReader sr = new(fs, encoding);
-                return sr.ReadToEnd();
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-                throw;
-            }
-        }
-
-        public static bool ZipExtractToFile(string fileName, string toPath, string ignoredName)
-        {
-            try
-            {
-                using var archive = ZipFile.OpenRead(fileName);
-                foreach (var entry in archive.Entries)
-                {
-                    if (entry.Length == 0)
-                    {
-                        continue;
-                    }
-                    try
-                    {
-                        if (Utils.IsNotEmpty(ignoredName) && entry.Name.Contains(ignoredName))
-                        {
-                            continue;
-                        }
-                        entry.ExtractToFile(Path.Combine(toPath, entry.Name), true);
-                    }
-                    catch (IOException ex)
-                    {
-                        Logging.SaveLog(_tag, ex);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-                return false;
-            }
-            return true;
-        }
-
-        public static List<string>? GetFilesFromZip(string fileName)
-        {
-            if (!File.Exists(fileName))
-            {
-                return null;
-            }
-            try
-            {
-                using var archive = ZipFile.OpenRead(fileName);
-                return archive.Entries.Select(entry => entry.FullName).ToList();
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-                return null;
-            }
-        }
-
-        public static bool CreateFromDirectory(string sourceDirectoryName, string destinationArchiveFileName)
-        {
-            try
-            {
-                if (File.Exists(destinationArchiveFileName))
-                {
-                    File.Delete(destinationArchiveFileName);
-                }
-
-                ZipFile.CreateFromDirectory(sourceDirectoryName, destinationArchiveFileName, CompressionLevel.SmallestSize, true);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-                return false;
-            }
-            return true;
-        }
-
-        public static void CopyDirectory(string sourceDir, string destinationDir, bool recursive, bool overwrite, string? ignoredName = null)
-        {
-            // Get information about the source directory
-            var dir = new DirectoryInfo(sourceDir);
-
-            // Check if the source directory exists
-            if (!dir.Exists)
-                throw new DirectoryNotFoundException($"Source directory not found: {dir.FullName}");
-
-            // Cache directories before we start copying
-            var dirs = dir.GetDirectories();
-
-            // Create the destination directory
-            Directory.CreateDirectory(destinationDir);
-
-            // Get the files in the source directory and copy to the destination directory
-            foreach (var file in dir.GetFiles())
-            {
-                if (Utils.IsNotEmpty(ignoredName) && file.Name.Contains(ignoredName))
-                {
-                    continue;
-                }
-                if (file.Extension == file.Name)
-                {
-                    continue;
-                }
-                var targetFilePath = Path.Combine(destinationDir, file.Name);
-                if (!overwrite && File.Exists(targetFilePath))
-                {
-                    continue;
-                }
-                file.CopyTo(targetFilePath, overwrite);
-            }
-
-            // If recursive and copying subdirectories, recursively call this method
-            if (recursive)
-            {
-                foreach (var subDir in dirs)
-                {
-                    var newDestinationDir = Path.Combine(destinationDir, subDir.Name);
-                    CopyDirectory(subDir.FullName, newDestinationDir, true, overwrite, ignoredName);
-                }
-            }
-        }
-
-        public static void DeleteExpiredFiles(string sourceDir, DateTime dtLine)
-        {
-            try
-            {
-                var files = Directory.GetFiles(sourceDir, "*.*");
-                foreach (var filePath in files)
-                {
-                    var file = new FileInfo(filePath);
-                    if (file.CreationTime >= dtLine)
-                    {
-                        continue;
-                    }
-                    file.Delete();
-                }
-            }
-            catch
-            {
-                // ignored
-            }
-        }
-    }
-}
@@ -0,0 +1,249 @@
+using System.Formats.Tar;
+using System.IO.Compression;
+
+namespace ServiceLib.Common;
+
+public static class FileUtils
+{
+    private static readonly string _tag = "FileManager";
+
+    public static bool ByteArrayToFile(string fileName, byte[] content)
+    {
+        try
+        {
+            File.WriteAllBytes(fileName, content);
+            return true;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return false;
+    }
+
+    public static void DecompressFile(string fileName, byte[] content)
+    {
+        try
+        {
+            using var fs = File.Create(fileName);
+            using GZipStream input = new(new MemoryStream(content), CompressionMode.Decompress, false);
+            input.CopyTo(fs);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    public static void DecompressFile(string fileName, string toPath, string? toName)
+    {
+        try
+        {
+            FileInfo fileInfo = new(fileName);
+            using var originalFileStream = fileInfo.OpenRead();
+            using var decompressedFileStream = File.Create(toName != null ? Path.Combine(toPath, toName) : toPath);
+            using GZipStream decompressionStream = new(originalFileStream, CompressionMode.Decompress);
+            decompressionStream.CopyTo(decompressedFileStream);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    public static void DecompressTarFile(string fileName, string toPath)
+    {
+        try
+        {
+            using var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read);
+            using var gz = new GZipStream(fs, CompressionMode.Decompress, leaveOpen: true);
+            TarFile.ExtractToDirectory(gz, toPath, overwriteFiles: true);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    public static string NonExclusiveReadAllText(string path)
+    {
+        return NonExclusiveReadAllText(path, Encoding.Default);
+    }
+
+    private static string NonExclusiveReadAllText(string path, Encoding encoding)
+    {
+        try
+        {
+            using FileStream fs = new(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+            using StreamReader sr = new(fs, encoding);
+            return sr.ReadToEnd();
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            throw;
+        }
+    }
+
+    public static bool ZipExtractToFile(string fileName, string toPath, string ignoredName)
+    {
+        try
+        {
+            using var archive = ZipFile.OpenRead(fileName);
+            foreach (var entry in archive.Entries)
+            {
+                if (entry.Length == 0)
+                {
+                    continue;
+                }
+                try
+                {
+                    if (ignoredName.IsNotEmpty() && entry.Name.Contains(ignoredName))
+                    {
+                        continue;
+                    }
+                    entry.ExtractToFile(Path.Combine(toPath, entry.Name), true);
+                }
+                catch (IOException ex)
+                {
+                    Logging.SaveLog(_tag, ex);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            return false;
+        }
+        return true;
+    }
+
+    public static List<string>? GetFilesFromZip(string fileName)
+    {
+        if (!File.Exists(fileName))
+        {
+            return null;
+        }
+        try
+        {
+            using var archive = ZipFile.OpenRead(fileName);
+            return archive.Entries.Select(entry => entry.FullName).ToList();
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            return null;
+        }
+    }
+
+    public static bool CreateFromDirectory(string sourceDirectoryName, string destinationArchiveFileName)
+    {
+        try
+        {
+            if (File.Exists(destinationArchiveFileName))
+            {
+                File.Delete(destinationArchiveFileName);
+            }
+
+            ZipFile.CreateFromDirectory(sourceDirectoryName, destinationArchiveFileName, CompressionLevel.SmallestSize, true);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            return false;
+        }
+        return true;
+    }
+
+    public static void CopyDirectory(string sourceDir, string destinationDir, bool recursive, bool overwrite, string? ignoredName = null)
+    {
+        // Get information about the source directory
+        var dir = new DirectoryInfo(sourceDir);
+
+        // Check if the source directory exists
+        if (!dir.Exists)
+        {
+            throw new DirectoryNotFoundException($"Source directory not found: {dir.FullName}");
+        }
+
+        // Cache directories before we start copying
+        var dirs = dir.GetDirectories();
+
+        // Create the destination directory
+        _ = Directory.CreateDirectory(destinationDir);
+
+        // Get the files in the source directory and copy to the destination directory
+        foreach (var file in dir.GetFiles())
+        {
+            if (ignoredName.IsNotEmpty() && file.Name.Contains(ignoredName))
+            {
+                continue;
+            }
+            if (file.Extension == file.Name)
+            {
+                continue;
+            }
+            var targetFilePath = Path.Combine(destinationDir, file.Name);
+            if (!overwrite && File.Exists(targetFilePath))
+            {
+                continue;
+            }
+            _ = file.CopyTo(targetFilePath, overwrite);
+        }
+
+        // If recursive and copying subdirectories, recursively call this method
+        if (recursive)
+        {
+            foreach (var subDir in dirs)
+            {
+                var newDestinationDir = Path.Combine(destinationDir, subDir.Name);
+                CopyDirectory(subDir.FullName, newDestinationDir, true, overwrite, ignoredName);
+            }
+        }
+    }
+
+    public static void DeleteExpiredFiles(string sourceDir, DateTime dtLine)
+    {
+        try
+        {
+            var files = Directory.GetFiles(sourceDir, "*.*");
+            foreach (var filePath in files)
+            {
+                var file = new FileInfo(filePath);
+                if (file.CreationTime >= dtLine)
+                {
+                    continue;
+                }
+                file.Delete();
+            }
+        }
+        catch
+        {
+            // ignored
+        }
+    }
+
+    /// <summary>
+    /// Creates a Linux shell file with the specified contents.
+    /// </summary>
+    /// <param name="fileName"></param>
+    /// <param name="contents"></param>
+    /// <param name="overwrite"></param>
+    /// <returns></returns>
+    public static async Task<string> CreateLinuxShellFile(string fileName, string contents, bool overwrite)
+    {
+        var shFilePath = Utils.GetBinConfigPath(fileName);
+
+        // Check if the file already exists and if we should overwrite it
+        if (!overwrite && File.Exists(shFilePath))
+        {
+            return shFilePath;
+        }
+
+        File.Delete(shFilePath);
+        await File.WriteAllTextAsync(shFilePath, contents);
+        await Utils.SetLinuxChmod(shFilePath);
+
+        return shFilePath;
+    }
+}
@@ -1,191 +0,0 @@
-using System.Net.Http.Headers;
-using System.Net.Mime;
-using System.Text;
-
-namespace ServiceLib.Common
-{
-    /// <summary>
-    /// </summary>
-    public class HttpClientHelper
-    {
-        private static readonly Lazy<HttpClientHelper> _instance = new(() =>
-        {
-            SocketsHttpHandler handler = new() { UseCookies = false };
-            HttpClientHelper helper = new(new HttpClient(handler));
-            return helper;
-        });
-
-        public static HttpClientHelper Instance => _instance.Value;
-        private readonly HttpClient httpClient;
-
-        private HttpClientHelper(HttpClient httpClient) => this.httpClient = httpClient;
-
-        public async Task<string?> TryGetAsync(string url)
-        {
-            if (Utils.IsNullOrEmpty(url))
-                return null;
-
-            try
-            {
-                var response = await httpClient.GetAsync(url);
-                return await response.Content.ReadAsStringAsync();
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        public async Task<string?> GetAsync(string url)
-        {
-            if (Utils.IsNullOrEmpty(url))
-                return null;
-            return await httpClient.GetStringAsync(url);
-        }
-
-        public async Task<string?> GetAsync(HttpClient client, string url, CancellationToken token = default)
-        {
-            if (Utils.IsNullOrEmpty(url))
-                return null;
-            return await client.GetStringAsync(url, token);
-        }
-
-        public async Task PutAsync(string url, Dictionary<string, string> headers)
-        {
-            var jsonContent = JsonUtils.Serialize(headers);
-            var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
-
-            var result = await httpClient.PutAsync(url, content);
-        }
-
-        public async Task PatchAsync(string url, Dictionary<string, string> headers)
-        {
-            var myContent = JsonUtils.Serialize(headers);
-            var buffer = System.Text.Encoding.UTF8.GetBytes(myContent);
-            var byteContent = new ByteArrayContent(buffer);
-            byteContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
-
-            await httpClient.PatchAsync(url, byteContent);
-        }
-
-        public async Task DeleteAsync(string url)
-        {
-            await httpClient.DeleteAsync(url);
-        }
-
-        public static async Task DownloadFileAsync(HttpClient client, string url, string fileName, IProgress<double>? progress, CancellationToken token = default)
-        {
-            ArgumentNullException.ThrowIfNull(url);
-            ArgumentNullException.ThrowIfNull(fileName);
-            if (File.Exists(fileName))
-                File.Delete(fileName);
-
-            using var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
-
-            if (!response.IsSuccessStatusCode)
-                throw new Exception(response.StatusCode.ToString());
-
-            var total = response.Content.Headers.ContentLength ?? -1L;
-            var canReportProgress = total != -1 && progress != null;
-
-            await using var stream = await response.Content.ReadAsStreamAsync(token);
-            await using var file = File.Create(fileName);
-            var totalRead = 0L;
-            var buffer = new byte[1024 * 1024];
-            var progressPercentage = 0;
-
-            while (true)
-            {
-                token.ThrowIfCancellationRequested();
-
-                var read = await stream.ReadAsync(buffer, token);
-                totalRead += read;
-
-                if (read == 0)
-                    break;
-                await file.WriteAsync(buffer.AsMemory(0, read), token);
-
-                if (canReportProgress)
-                {
-                    var percent = (int)(100.0 * totalRead / total);
-                    //if (progressPercentage != percent && percent % 10 == 0)
-                    {
-                        progressPercentage = percent;
-                        progress?.Report(percent);
-                    }
-                }
-            }
-            if (canReportProgress)
-            {
-                progress?.Report(101);
-            }
-        }
-
-        public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token = default)
-        {
-            if (Utils.IsNullOrEmpty(url))
-            {
-                throw new ArgumentNullException(nameof(url));
-            }
-
-            var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
-
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new Exception(response.StatusCode.ToString());
-            }
-
-            //var total = response.Content.Headers.ContentLength.HasValue ? response.Content.Headers.ContentLength.Value : -1L;
-            //var canReportProgress = total != -1 && progress != null;
-
-            await using var stream = await response.Content.ReadAsStreamAsync(token);
-            var totalRead = 0L;
-            var buffer = new byte[1024 * 64];
-            var isMoreToRead = true;
-            var progressSpeed = string.Empty;
-            var totalDatetime = DateTime.Now;
-            var totalSecond = 0;
-
-            do
-            {
-                if (token.IsCancellationRequested)
-                {
-                    if (totalRead > 0)
-                    {
-                        return;
-                    }
-                    else
-                    {
-                        token.ThrowIfCancellationRequested();
-                    }
-                }
-
-                var read = await stream.ReadAsync(buffer, token);
-
-                if (read == 0)
-                {
-                    isMoreToRead = false;
-                }
-                else
-                {
-                    var data = new byte[read];
-                    buffer.ToList().CopyTo(0, data, 0, read);
-
-                    totalRead += read;
-
-                    var ts = (DateTime.Now - totalDatetime);
-                    if (progress != null && ts.Seconds > totalSecond)
-                    {
-                        totalSecond = ts.Seconds;
-                        var speed = (totalRead * 1d / ts.TotalMilliseconds / 1000).ToString("#0.0");
-                        if (progressSpeed != speed)
-                        {
-                            progressSpeed = speed;
-                            progress.Report(speed);
-                        }
-                    }
-                }
-            } while (isMoreToRead);
-        }
-    }
-}
@@ -1,177 +0,0 @@
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-
-namespace ServiceLib.Common
-{
-    /*
-     * See:
-     * http://stackoverflow.com/questions/6266820/working-example-of-createjobobject-setinformationjobobject-pinvoke-in-net
-     */
-
-    public sealed class Job : IDisposable
-    {
-        private IntPtr handle = IntPtr.Zero;
-
-        public Job()
-        {
-            handle = CreateJobObject(IntPtr.Zero, null);
-            IntPtr extendedInfoPtr = IntPtr.Zero;
-            JOBOBJECT_BASIC_LIMIT_INFORMATION info = new()
-            {
-                LimitFlags = 0x2000
-            };
-
-            JOBOBJECT_EXTENDED_LIMIT_INFORMATION extendedInfo = new()
-            {
-                BasicLimitInformation = info
-            };
-
-            try
-            {
-                int length = Marshal.SizeOf(typeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION));
-                extendedInfoPtr = Marshal.AllocHGlobal(length);
-                Marshal.StructureToPtr(extendedInfo, extendedInfoPtr, false);
-
-                if (!SetInformationJobObject(handle, JobObjectInfoType.ExtendedLimitInformation, extendedInfoPtr,
-                        (uint)length))
-                    throw new Exception(string.Format("Unable to set information.  Error: {0}",
-                        Marshal.GetLastWin32Error()));
-            }
-            finally
-            {
-                if (extendedInfoPtr != IntPtr.Zero)
-                {
-                    Marshal.FreeHGlobal(extendedInfoPtr);
-                }
-            }
-        }
-
-        public bool AddProcess(IntPtr processHandle)
-        {
-            bool succ = AssignProcessToJobObject(handle, processHandle);
-
-            if (!succ)
-            {
-                Logging.SaveLog("Failed to call AssignProcessToJobObject! GetLastError=" + Marshal.GetLastWin32Error());
-            }
-
-            return succ;
-        }
-
-        public bool AddProcess(int processId)
-        {
-            return AddProcess(Process.GetProcessById(processId).Handle);
-        }
-
-        #region IDisposable
-
-        private bool disposed;
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        private void Dispose(bool disposing)
-        {
-            if (disposed)
-                return;
-            disposed = true;
-
-            if (disposing)
-            {
-                // no managed objects to free
-            }
-
-            if (handle != IntPtr.Zero)
-            {
-                CloseHandle(handle);
-                handle = IntPtr.Zero;
-            }
-        }
-
-        ~Job()
-        {
-            Dispose(false);
-        }
-
-        #endregion IDisposable
-
-        #region Interop
-
-        [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
-        private static extern IntPtr CreateJobObject(IntPtr a, string? lpName);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        private static extern bool SetInformationJobObject(IntPtr hJob, JobObjectInfoType infoType, IntPtr lpJobObjectInfo, UInt32 cbJobObjectInfoLength);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        private static extern bool AssignProcessToJobObject(IntPtr job, IntPtr process);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool CloseHandle(IntPtr hObject);
-
-        #endregion Interop
-    }
-
-    #region Helper classes
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct IO_COUNTERS
-    {
-        public UInt64 ReadOperationCount;
-        public UInt64 WriteOperationCount;
-        public UInt64 OtherOperationCount;
-        public UInt64 ReadTransferCount;
-        public UInt64 WriteTransferCount;
-        public UInt64 OtherTransferCount;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct JOBOBJECT_BASIC_LIMIT_INFORMATION
-    {
-        public Int64 PerProcessUserTimeLimit;
-        public Int64 PerJobUserTimeLimit;
-        public UInt32 LimitFlags;
-        public UIntPtr MinimumWorkingSetSize;
-        public UIntPtr MaximumWorkingSetSize;
-        public UInt32 ActiveProcessLimit;
-        public UIntPtr Affinity;
-        public UInt32 PriorityClass;
-        public UInt32 SchedulingClass;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    public struct SECURITY_ATTRIBUTES
-    {
-        public UInt32 nLength;
-        public IntPtr lpSecurityDescriptor;
-        public Int32 bInheritHandle;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION
-    {
-        public JOBOBJECT_BASIC_LIMIT_INFORMATION BasicLimitInformation;
-        public IO_COUNTERS IoInfo;
-        public UIntPtr ProcessMemoryLimit;
-        public UIntPtr JobMemoryLimit;
-        public UIntPtr PeakProcessMemoryUsed;
-        public UIntPtr PeakJobMemoryUsed;
-    }
-
-    public enum JobObjectInfoType
-    {
-        AssociateCompletionPortInformation = 7,
-        BasicLimitInformation = 2,
-        BasicUIRestrictions = 4,
-        EndOfJobTimeInformation = 6,
-        ExtendedLimitInformation = 9,
-        SecurityLimitInformation = 5,
-        GroupInformation = 11
-    }
-
-    #endregion Helper classes
-}
@@ -1,131 +1,150 @@
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
+namespace ServiceLib.Common;

-namespace ServiceLib.Common
+public class JsonUtils
 {
-    public class JsonUtils
+    private static readonly string _tag = "JsonUtils";
+
+    private static readonly JsonSerializerOptions _defaultDeserializeOptions = new()
    {
-        private static readonly string _tag = "JsonUtils";
+        PropertyNameCaseInsensitive = true,
+        ReadCommentHandling = JsonCommentHandling.Skip
+    };

-        /// <summary>
-        /// DeepCopy
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public static T DeepCopy<T>(T obj)
+    private static readonly JsonSerializerOptions _defaultSerializeOptions = new()
+    {
+        WriteIndented = true,
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+    };
+
+    private static readonly JsonSerializerOptions _nullValueSerializeOptions = new()
+    {
+        WriteIndented = true,
+        DefaultIgnoreCondition = JsonIgnoreCondition.Never,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+    };
+
+    private static readonly JsonDocumentOptions _defaultDocumentOptions = new()
+    {
+        CommentHandling = JsonCommentHandling.Skip
+    };
+
+    /// <summary>
+    /// DeepCopy
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="obj"></param>
+    /// <returns></returns>
+    public static T? DeepCopy<T>(T? obj)
+    {
+        if (obj is null)
        {
-            return Deserialize<T>(Serialize(obj, false))!;
+            return default;
        }
+        return Deserialize<T>(Serialize(obj, false));
+    }

-        /// <summary>
-        /// Deserialize to object
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="strJson"></param>
-        /// <returns></returns>
-        public static T? Deserialize<T>(string? strJson)
+    /// <summary>
+    /// Deserialize to object
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="strJson"></param>
+    /// <returns></returns>
+    public static T? Deserialize<T>(string? strJson)
+    {
+        try
        {
-            try
-            {
-                if (string.IsNullOrWhiteSpace(strJson))
-                {
-                    return default;
-                }
-                var options = new JsonSerializerOptions
-                {
-                    PropertyNameCaseInsensitive = true
-                };
-                return JsonSerializer.Deserialize<T>(strJson, options);
-            }
-            catch
+            if (string.IsNullOrWhiteSpace(strJson))
            {
                return default;
            }
+            return JsonSerializer.Deserialize<T>(strJson, _defaultDeserializeOptions);
        }
-
-        /// <summary>
-        /// parse
-        /// </summary>
-        /// <param name="strJson"></param>
-        /// <returns></returns>
-        public static JsonNode? ParseJson(string strJson)
+        catch
        {
-            try
+            return default;
+        }
+    }
+
+    /// <summary>
+    /// parse
+    /// </summary>
+    /// <param name="strJson"></param>
+    /// <returns></returns>
+    public static JsonNode? ParseJson(string? strJson)
+    {
+        try
+        {
+            if (string.IsNullOrWhiteSpace(strJson))
            {
-                if (string.IsNullOrWhiteSpace(strJson))
-                {
-                    return null;
-                }
-                return JsonNode.Parse(strJson);
-            }
-            catch
-            {
-                //SaveLog(ex.Message, ex);
                return null;
            }
+            return JsonNode.Parse(strJson, nodeOptions: null, _defaultDocumentOptions);
        }
-
-        /// <summary>
-        /// Serialize Object to Json string
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <param name="indented"></param>
-        /// <param name="nullValue"></param>
-        /// <returns></returns>
-        public static string Serialize(object? obj, bool indented = true, bool nullValue = false)
+        catch
        {
-            var result = string.Empty;
-            try
-            {
-                if (obj == null)
-                {
-                    return result;
-                }
-                var options = new JsonSerializerOptions
-                {
-                    WriteIndented = indented,
-                    DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull
-                };
-                result = JsonSerializer.Serialize(obj, options);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-            return result;
+            //SaveLog(ex.Message, ex);
+            return null;
        }
-
-        /// <summary>
-        /// Serialize Object to Json string
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <param name="options"></param>
-        /// <returns></returns>
-        public static string Serialize(object? obj, JsonSerializerOptions options)
-        {
-            var result = string.Empty;
-            try
-            {
-                if (obj == null)
-                {
-                    return result;
-                }
-                result = JsonSerializer.Serialize(obj, options);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// SerializeToNode
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public static JsonNode? SerializeToNode(object? obj) => JsonSerializer.SerializeToNode(obj);
    }
-}
+
+    /// <summary>
+    /// Serialize Object to Json string
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <param name="indented"></param>
+    /// <param name="nullValue"></param>
+    /// <returns></returns>
+    public static string Serialize(object? obj, bool indented = true, bool nullValue = false)
+    {
+        var result = string.Empty;
+        try
+        {
+            if (obj == null)
+            {
+                return result;
+            }
+            var options = nullValue ? _nullValueSerializeOptions : _defaultSerializeOptions;
+            result = JsonSerializer.Serialize(obj, options);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return result;
+    }
+
+    /// <summary>
+    /// Serialize Object to Json string
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    public static string Serialize(object? obj, JsonSerializerOptions? options)
+    {
+        var result = string.Empty;
+        try
+        {
+            if (obj == null)
+            {
+                return result;
+            }
+            result = JsonSerializer.Serialize(obj, options ?? _defaultSerializeOptions);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return result;
+    }
+
+    /// <summary>
+    /// SerializeToNode
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <returns></returns>
+    public static JsonNode? SerializeToNode(object? obj, JsonSerializerOptions? options = null)
+    {
+        return JsonSerializer.SerializeToNode(obj, options);
+    }
+}
@@ -2,49 +2,54 @@ using NLog;
 using NLog.Config;
 using NLog.Targets;

-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public class Logging
 {
-    public class Logging
+    private static readonly Logger _logger1 = LogManager.GetLogger("Log1");
+    private static readonly Logger _logger2 = LogManager.GetLogger("Log2");
+
+    public static void Setup()
    {
-        public static void Setup()
+        LoggingConfiguration config = new();
+        FileTarget fileTarget = new();
+        config.AddTarget("file", fileTarget);
+        fileTarget.Layout = "${longdate}-${level:uppercase=true} ${message}";
+        fileTarget.FileName = Utils.GetLogPath("${shortdate}.txt");
+        config.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, fileTarget));
+        LogManager.Configuration = config;
+    }
+
+    public static void LoggingEnabled(bool enable)
+    {
+        if (!enable)
        {
-            LoggingConfiguration config = new();
-            FileTarget fileTarget = new();
-            config.AddTarget("file", fileTarget);
-            fileTarget.Layout = "${longdate}-${level:uppercase=true} ${message}";
-            fileTarget.FileName = Utils.GetLogPath("${shortdate}.txt");
-            config.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, fileTarget));
-            LogManager.Configuration = config;
+            LogManager.SuspendLogging();
+        }
+    }
+
+    public static void SaveLog(string strContent)
+    {
+        if (!LogManager.IsLoggingEnabled())
+        {
+            return;
        }

-        public static void LoggingEnabled(bool enable)
+        _logger1.Info(strContent);
+    }
+
+    public static void SaveLog(string strTitle, Exception ex)
+    {
+        if (!LogManager.IsLoggingEnabled())
        {
-            if (!enable)
-            {
-                LogManager.SuspendLogging();
-            }
+            return;
        }

-        public static void SaveLog(string strContent)
+        _logger2.Debug($"{strTitle},{ex.Message}");
+        _logger2.Debug(ex.StackTrace);
+        if (ex?.InnerException != null)
        {
-            if (!LogManager.IsLoggingEnabled())
-                return;
-
-            LogManager.GetLogger("Log1").Info(strContent);
-        }
-
-        public static void SaveLog(string strTitle, Exception ex)
-        {
-            if (!LogManager.IsLoggingEnabled())
-                return;
-
-            var logger = LogManager.GetLogger("Log2");
-            logger.Debug($"{strTitle},{ex.Message}");
-            logger.Debug(ex.StackTrace);
-            if (ex?.InnerException != null)
-            {
-                logger.Error(ex.InnerException);
-            }
+            _logger2.Error(ex.InnerException);
        }
    }
 }
@@ -1,5 +1,3 @@
-using System.Diagnostics;
-
 namespace ServiceLib.Common;

 public static class ProcUtils
@@ -8,7 +6,7 @@ public static class ProcUtils

    public static void ProcessStart(string? fileName, string arguments = "")
    {
-        ProcessStart(fileName, arguments, null);
+        _ = ProcessStart(fileName, arguments, null);
    }

    public static int? ProcessStart(string? fileName, string arguments, string? dir)
@@ -20,9 +18,13 @@ public static class ProcUtils
        try
        {
            if (fileName.Contains(' '))
+            {
                fileName = fileName.AppendQuotes();
+            }
            if (arguments.Contains(' '))
+            {
                arguments = arguments.AppendQuotes();
+            }

            Process proc = new()
            {
@@ -34,7 +36,7 @@ public static class ProcUtils
                    WorkingDirectory = dir ?? string.Empty
                }
            };
-            proc.Start();
+            _ = proc.Start();
            return dir is null ? null : proc.Id;
        }
        catch (Exception ex)
@@ -44,7 +46,7 @@ public static class ProcUtils
        return null;
    }

-    public static void RebootAsAdmin(bool blAdmin = true)
+    public static bool RebootAsAdmin(bool blAdmin = true)
    {
        try
        {
@@ -56,95 +58,12 @@ public static class ProcUtils
                FileName = Utils.GetExePath().AppendQuotes(),
                Verb = blAdmin ? "runas" : null,
            };
-            Process.Start(startInfo);
+            return Process.Start(startInfo) != null;
        }
        catch (Exception ex)
        {
            Logging.SaveLog(_tag, ex);
-        }
-    }
-
-    public static async Task ProcessKill(int pid)
-    {
-        try
-        {
-            await ProcessKill(Process.GetProcessById(pid), false);
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-    }
-
-    public static async Task ProcessKill(Process? proc, bool review)
-    {
-        if (proc is null)
-        {
-            return;
-        }
-
-        GetProcessKeyInfo(proc, review, out var procId, out var fileName, out var processName);
-
-        try
-        { proc?.Kill(true); }
-        catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-        try
-        { proc?.Kill(); }
-        catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-        try
-        { proc?.Close(); }
-        catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-        try
-        { proc?.Dispose(); }
-        catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-
-        await Task.Delay(300);
-        await ProcessKillByKeyInfo(review, procId, fileName, processName);
-    }
-
-    private static void GetProcessKeyInfo(Process? proc, bool review, out int? procId, out string? fileName, out string? processName)
-    {
-        procId = null;
-        fileName = null;
-        processName = null;
-        if (!review)
-            return;
-        try
-        {
-            procId = proc?.Id;
-            fileName = proc?.MainModule?.FileName;
-            processName = proc?.ProcessName;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-    }
-
-    private static async Task ProcessKillByKeyInfo(bool review, int? procId, string? fileName, string? processName)
-    {
-        if (review && procId != null && fileName != null)
-        {
-            try
-            {
-                var lstProc = Process.GetProcessesByName(processName);
-                foreach (var proc2 in lstProc)
-                {
-                    if (proc2.Id == procId)
-                    {
-                        Logging.SaveLog($"{_tag}, KillProcess not completing the job, procId");
-                        await ProcessKill(proc2, false);
-                    }
-                    if (proc2.MainModule != null && proc2.MainModule?.FileName == fileName)
-                    {
-                        Logging.SaveLog($"{_tag}, KillProcess not completing the job, fileName");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
+            return false;
        }
    }
 }
@@ -1,90 +0,0 @@
-using QRCoder;
-using SkiaSharp;
-using ZXing.SkiaSharp;
-
-namespace ServiceLib.Common
-{
-    public class QRCodeHelper
-    {
-        public static byte[]? GenQRCode(string? url)
-        {
-            using QRCodeGenerator qrGenerator = new();
-            using var qrCodeData = qrGenerator.CreateQrCode(url ?? string.Empty, QRCodeGenerator.ECCLevel.Q);
-            using PngByteQRCode qrCode = new(qrCodeData);
-            return qrCode.GetGraphic(20);
-        }
-
-        public static string? ParseBarcode(string? fileName)
-        {
-            if (fileName == null || !File.Exists(fileName))
-            {
-                return null;
-            }
-
-            try
-            {
-                var image = SKImage.FromEncodedData(fileName);
-                var bitmap = SKBitmap.FromImage(image);
-
-                return ReaderBarcode(bitmap);
-            }
-            catch
-            {
-                // ignored
-            }
-
-            return null;
-        }
-
-        public static string? ParseBarcode(byte[]? bytes)
-        {
-            try
-            {
-                var bitmap = SKBitmap.Decode(bytes);
-                //using var stream = new FileStream("test2.png", FileMode.Create, FileAccess.Write);
-                //using var image = SKImage.FromBitmap(bitmap);
-                //using var encodedImage = image.Encode();
-                //encodedImage.SaveTo(stream);
-                return ReaderBarcode(bitmap);
-            }
-            catch
-            {
-                // ignored
-            }
-
-            return null;
-        }
-
-        private static string? ReaderBarcode(SKBitmap? bitmap)
-        {
-            var reader = new BarcodeReader();
-            var result = reader.Decode(bitmap);
-
-            if (result != null && Utils.IsNotEmpty(result.Text))
-            {
-                return result.Text;
-            }
-
-            //FlipBitmap
-            var result2 = reader.Decode(FlipBitmap(bitmap));
-            return result2?.Text;
-        }
-
-        private static SKBitmap FlipBitmap(SKBitmap bmp)
-        {
-            // Create a bitmap (to return)
-            var flipped = new SKBitmap(bmp.Width, bmp.Height, bmp.Info.ColorType, bmp.Info.AlphaType);
-
-            // Create a canvas to draw into the bitmap
-            using var canvas = new SKCanvas(flipped);
-
-            // Set a transform matrix which moves the bitmap to the right,
-            // and then "scales" it by -1, which just flips the pixels
-            // horizontally
-            canvas.Translate(bmp.Width, 0);
-            canvas.Scale(-1, 1);
-            canvas.DrawBitmap(bmp, 0, 0);
-            return flipped;
-        }
-    }
-}
@@ -0,0 +1,125 @@
+using QRCoder;
+using QRCoder.Exceptions;
+using SkiaSharp;
+using ZXing.SkiaSharp;
+
+namespace ServiceLib.Common;
+
+public class QRCodeUtils
+{
+    public static byte[]? GenQRCode(string? url)
+    {
+        if (url.IsNullOrEmpty())
+        {
+            return null;
+        }
+        using QRCodeGenerator qrGenerator = new();
+        DataTooLongException? lastDtle = null;
+
+        var levels = new[]
+        {
+            QRCodeGenerator.ECCLevel.H,
+            QRCodeGenerator.ECCLevel.Q,
+            QRCodeGenerator.ECCLevel.M,
+            QRCodeGenerator.ECCLevel.L
+        };
+        foreach (var level in levels)
+        {
+            try
+            {
+                using var qrCodeData = qrGenerator.CreateQrCode(url, level);
+                using PngByteQRCode qrCode = new(qrCodeData);
+                return qrCode.GetGraphic(20);
+            }
+            catch (DataTooLongException ex)
+            {
+                lastDtle = ex;
+                continue;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        if (lastDtle != null)
+        {
+            throw lastDtle;
+        }
+
+        return null;
+    }
+
+    public static string? ParseBarcode(string? fileName)
+    {
+        if (fileName == null || !File.Exists(fileName))
+        {
+            return null;
+        }
+
+        try
+        {
+            var image = SKImage.FromEncodedData(fileName);
+            var bitmap = SKBitmap.FromImage(image);
+
+            return ReaderBarcode(bitmap);
+        }
+        catch
+        {
+            // ignored
+        }
+
+        return null;
+    }
+
+    public static string? ParseBarcode(byte[]? bytes)
+    {
+        try
+        {
+            var bitmap = SKBitmap.Decode(bytes);
+            //using var stream = new FileStream("test2.png", FileMode.Create, FileAccess.Write);
+            //using var image = SKImage.FromBitmap(bitmap);
+            //using var encodedImage = image.Encode();
+            //encodedImage.SaveTo(stream);
+            return ReaderBarcode(bitmap);
+        }
+        catch
+        {
+            // ignored
+        }
+
+        return null;
+    }
+
+    private static string? ReaderBarcode(SKBitmap? bitmap)
+    {
+        var reader = new BarcodeReader();
+        var result = reader.Decode(bitmap);
+
+        if (result != null && result.Text.IsNotEmpty())
+        {
+            return result.Text;
+        }
+
+        //FlipBitmap
+        var result2 = reader.Decode(FlipBitmap(bitmap));
+        return result2?.Text;
+    }
+
+    private static SKBitmap FlipBitmap(SKBitmap bmp)
+    {
+        // Create a bitmap (to return)
+        var flipped = new SKBitmap(bmp.Width, bmp.Height, bmp.Info.ColorType, bmp.Info.AlphaType);
+
+        // Create a canvas to draw into the bitmap
+        using var canvas = new SKCanvas(flipped);
+
+        // Set a transform matrix which moves the bitmap to the right,
+        // and then "scales" it by -1, which just flips the pixels
+        // horizontally
+        canvas.Translate(bmp.Width, 0);
+        canvas.Scale(-1, 1);
+        canvas.DrawBitmap(bmp, 0, 0);
+        return flipped;
+    }
+}
@@ -1,187 +0,0 @@
-namespace ServiceLib.Common
-{
-    public class SemanticVersion
-    {
-        private int major;
-        private int minor;
-        private int patch;
-        private string version;
-
-        public SemanticVersion(int major, int minor, int patch)
-        {
-            this.major = major;
-            this.minor = minor;
-            this.patch = patch;
-            this.version = $"{major}.{minor}.{patch}";
-        }
-
-        public SemanticVersion(string? version)
-        {
-            try
-            {
-                if (version.IsNullOrEmpty())
-                {
-                    this.major = 0;
-                    this.minor = 0;
-                    this.patch = 0;
-                    return;
-                }
-                this.version = version.RemovePrefix('v');
-
-                var parts = this.version.Split('.');
-                if (parts.Length == 2)
-                {
-                    this.major = int.Parse(parts.First());
-                    this.minor = int.Parse(parts.Last());
-                    this.patch = 0;
-                }
-                else if (parts.Length is 3 or 4)
-                {
-                    this.major = int.Parse(parts[0]);
-                    this.minor = int.Parse(parts[1]);
-                    this.patch = int.Parse(parts[2]);
-                }
-                else
-                {
-                    throw new ArgumentException("Invalid version string");
-                }
-            }
-            catch
-            {
-                this.major = 0;
-                this.minor = 0;
-                this.patch = 0;
-            }
-        }
-
-        public override bool Equals(object? obj)
-        {
-            if (obj is SemanticVersion other)
-            {
-                return this.major == other.major && this.minor == other.minor && this.patch == other.patch;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        public override int GetHashCode()
-        {
-            return this.major.GetHashCode() ^ this.minor.GetHashCode() ^ this.patch.GetHashCode();
-        }
-
-        /// <summary>
-        /// Use ToVersionString(string? prefix) instead if possible.
-        /// </summary>
-        /// <returns>major.minor.patch</returns>
-        public override string ToString()
-        {
-            return this.version;
-        }
-
-        public string ToVersionString(string? prefix = null)
-        {
-            if (prefix == null)
-            {
-                return this.version;
-            }
-            else
-            {
-                return $"{prefix}{this.version}";
-            }
-        }
-
-        public static bool operator ==(SemanticVersion v1, SemanticVersion v2)
-        { return v1.Equals(v2); }
-
-        public static bool operator !=(SemanticVersion v1, SemanticVersion v2)
-        { return !v1.Equals(v2); }
-
-        public static bool operator >=(SemanticVersion v1, SemanticVersion v2)
-        { return v1.GreaterEquals(v2); }
-
-        public static bool operator <=(SemanticVersion v1, SemanticVersion v2)
-        { return v1.LessEquals(v2); }
-
-        #region Private
-
-        private bool GreaterEquals(SemanticVersion other)
-        {
-            if (this.major < other.major)
-            {
-                return false;
-            }
-            else if (this.major > other.major)
-            {
-                return true;
-            }
-            else
-            {
-                if (this.minor < other.minor)
-                {
-                    return false;
-                }
-                else if (this.minor > other.minor)
-                {
-                    return true;
-                }
-                else
-                {
-                    if (this.patch < other.patch)
-                    {
-                        return false;
-                    }
-                    else if (this.patch > other.patch)
-                    {
-                        return true;
-                    }
-                    else
-                    {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        private bool LessEquals(SemanticVersion other)
-        {
-            if (this.major < other.major)
-            {
-                return true;
-            }
-            else if (this.major > other.major)
-            {
-                return false;
-            }
-            else
-            {
-                if (this.minor < other.minor)
-                {
-                    return true;
-                }
-                else if (this.minor > other.minor)
-                {
-                    return false;
-                }
-                else
-                {
-                    if (this.patch < other.patch)
-                    {
-                        return true;
-                    }
-                    else if (this.patch > other.patch)
-                    {
-                        return false;
-                    }
-                    else
-                    {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        #endregion Private
-    }
-}
@@ -1,91 +0,0 @@
-using System.Collections;
-using SQLite;
-
-namespace ServiceLib.Common
-{
-    public sealed class SQLiteHelper
-    {
-        private static readonly Lazy<SQLiteHelper> _instance = new(() => new());
-        public static SQLiteHelper Instance => _instance.Value;
-        private string _connstr;
-        private SQLiteConnection _db;
-        private SQLiteAsyncConnection _dbAsync;
-        private readonly string _configDB = "guiNDB.db";
-
-        public SQLiteHelper()
-        {
-            _connstr = Utils.GetConfigPath(_configDB);
-            _db = new SQLiteConnection(_connstr, false);
-            _dbAsync = new SQLiteAsyncConnection(_connstr, false);
-        }
-
-        public CreateTableResult CreateTable<T>()
-        {
-            return _db.CreateTable<T>();
-        }
-
-        public async Task<int> InsertAllAsync(IEnumerable models)
-        {
-            return await _dbAsync.InsertAllAsync(models);
-        }
-
-        public async Task<int> InsertAsync(object model)
-        {
-            return await _dbAsync.InsertAsync(model);
-        }
-
-        public async Task<int> ReplaceAsync(object model)
-        {
-            return await _dbAsync.InsertOrReplaceAsync(model);
-        }
-
-        public async Task<int> UpdateAsync(object model)
-        {
-            return await _dbAsync.UpdateAsync(model);
-        }
-
-        public async Task<int> UpdateAllAsync(IEnumerable models)
-        {
-            return await _dbAsync.UpdateAllAsync(models);
-        }
-
-        public async Task<int> DeleteAsync(object model)
-        {
-            return await _dbAsync.DeleteAsync(model);
-        }
-
-        public async Task<int> DeleteAllAsync<T>()
-        {
-            return await _dbAsync.DeleteAllAsync<T>();
-        }
-
-        public async Task<int> ExecuteAsync(string sql)
-        {
-            return await _dbAsync.ExecuteAsync(sql);
-        }
-
-        public async Task<List<T>> QueryAsync<T>(string sql) where T : new()
-        {
-            return await _dbAsync.QueryAsync<T>(sql);
-        }
-
-        public AsyncTableQuery<T> TableAsync<T>() where T : new()
-        {
-            return _dbAsync.Table<T>();
-        }
-
-        public async Task DisposeDbConnectionAsync()
-        {
-            await Task.Factory.StartNew(() =>
-            {
-                _db?.Close();
-                _db?.Dispose();
-                _db = null;
-
-                _dbAsync?.GetConnection()?.Close();
-                _dbAsync?.GetConnection()?.Dispose();
-                _dbAsync = null;
-            });
-        }
-    }
-}
@@ -1,74 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace ServiceLib.Common
-{
-    public static class StringEx
-    {
-        public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
-        {
-            return string.IsNullOrEmpty(value);
-        }
-
-        public static bool IsNullOrWhiteSpace([NotNullWhen(false)] this string? value)
-        {
-            return string.IsNullOrWhiteSpace(value);
-        }
-
-        public static bool IsNotEmpty([NotNullWhen(false)] this string? value)
-        {
-            return !string.IsNullOrEmpty(value);
-        }
-
-        public static bool BeginWithAny(this string s, IEnumerable<char> chars)
-        {
-            if (s.IsNullOrEmpty())
-                return false;
-            return chars.Contains(s.First());
-        }
-
-        private static bool IsWhiteSpace(this string value)
-        {
-            return value.All(char.IsWhiteSpace);
-        }
-
-        public static IEnumerable<string> NonWhiteSpaceLines(this TextReader reader)
-        {
-            while (reader.ReadLine() is { } line)
-            {
-                if (line.IsWhiteSpace())
-                    continue;
-                yield return line;
-            }
-        }
-
-        public static string TrimEx(this string? value)
-        {
-            return value == null ? string.Empty : value.Trim();
-        }
-
-        public static string RemovePrefix(this string value, char prefix)
-        {
-            return value.StartsWith(prefix) ? value[1..] : value;
-        }
-
-        public static string RemovePrefix(this string value, string prefix)
-        {
-            return value.StartsWith(prefix) ? value[prefix.Length..] : value;
-        }
-
-        public static string UpperFirstChar(this string value)
-        {
-            if (string.IsNullOrEmpty(value))
-            {
-                return string.Empty;
-            }
-
-            return char.ToUpper(value.First()) + value[1..];
-        }
-
-        public static string AppendQuotes(this string value)
-        {
-            return string.IsNullOrEmpty(value) ? string.Empty : $"\"{value}\"";
-        }
-    }
-}
@@ -1,74 +1,71 @@
-using System.Security.Cryptography;
-using System.Text;
 using Microsoft.Win32;

-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+internal static class WindowsUtils
 {
-    internal static class WindowsUtils
+    private static readonly string _tag = "WindowsUtils";
+
+    public static string? RegReadValue(string path, string name, string def)
    {
-        private static readonly string _tag = "WindowsUtils";
-
-        public static string? RegReadValue(string path, string name, string def)
+        RegistryKey? regKey = null;
+        try
        {
-            RegistryKey? regKey = null;
-            try
-            {
-                regKey = Registry.CurrentUser.OpenSubKey(path, false);
-                var value = regKey?.GetValue(name) as string;
-                return Utils.IsNullOrEmpty(value) ? def : value;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-            finally
-            {
-                regKey?.Close();
-            }
-            return def;
+            regKey = Registry.CurrentUser.OpenSubKey(path, false);
+            var value = regKey?.GetValue(name) as string;
+            return value.IsNullOrEmpty() ? def : value;
        }
-
-        public static void RegWriteValue(string path, string name, object value)
+        catch (Exception ex)
        {
-            RegistryKey? regKey = null;
-            try
+            Logging.SaveLog(_tag, ex);
+        }
+        finally
+        {
+            regKey?.Close();
+        }
+        return def;
+    }
+
+    public static void RegWriteValue(string path, string name, object value)
+    {
+        RegistryKey? regKey = null;
+        try
+        {
+            regKey = Registry.CurrentUser.CreateSubKey(path);
+            if (value.ToString().IsNullOrEmpty())
            {
-                regKey = Registry.CurrentUser.CreateSubKey(path);
-                if (Utils.IsNullOrEmpty(value.ToString()))
-                {
-                    regKey?.DeleteValue(name, false);
-                }
-                else
-                {
-                    regKey?.SetValue(name, value);
-                }
+                regKey?.DeleteValue(name, false);
            }
-            catch (Exception ex)
+            else
            {
-                Logging.SaveLog(_tag, ex);
-            }
-            finally
-            {
-                regKey?.Close();
+                regKey?.SetValue(name, value);
            }
        }
-
-        public static async Task RemoveTunDevice()
+        catch (Exception ex)
        {
-            try
-            {
-                var sum = MD5.HashData(Encoding.UTF8.GetBytes("wintunsingbox_tun"));
-                var guid = new Guid(sum);
-                var pnpUtilPath = @"C:\Windows\System32\pnputil.exe";
-                var arg = $$""" /remove-device  "SWD\Wintun\{{{guid}}}" """;
+            Logging.SaveLog(_tag, ex);
+        }
+        finally
+        {
+            regKey?.Close();
+        }
+    }

-                // Try to remove the device
-                await Utils.GetCliWrapOutput(pnpUtilPath, arg);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
+    public static async Task RemoveTunDevice()
+    {
+        try
+        {
+            var sum = MD5.HashData(Encoding.UTF8.GetBytes("wintunsingbox_tun"));
+            var guid = new Guid(sum);
+            var pnpUtilPath = @"C:\Windows\System32\pnputil.exe";
+            var arg = $$""" /remove-device  "SWD\Wintun\{{{guid}}}" """;
+
+            // Try to remove the device
+            _ = await Utils.GetCliWrapOutput(pnpUtilPath, arg);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
        }
    }
 }
@@ -1,83 +1,79 @@
-using YamlDotNet.Core;
+using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;

-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public class YamlUtils
 {
-    public class YamlUtils
+    private static readonly string _tag = "YamlUtils";
+
+    #region YAML
+
+    /// <summary>
+    /// Deserialize
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="str"></param>
+    /// <returns></returns>
+    public static T FromYaml<T>(string str)
    {
-        private static readonly string _tag = "YamlUtils";
-
-        #region YAML
-
-        /// <summary>
-        /// 反序列化成对象
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="str"></param>
-        /// <returns></returns>
-        public static T FromYaml<T>(string str)
+        var deserializer = new DeserializerBuilder()
+            .WithNamingConvention(PascalCaseNamingConvention.Instance)
+            .Build();
+        try
        {
-            var deserializer = new DeserializerBuilder()
-                .WithNamingConvention(PascalCaseNamingConvention.Instance)
-                .Build();
-            try
-            {
-                var obj = deserializer.Deserialize<T>(str);
-                return obj;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-                return deserializer.Deserialize<T>("");
-            }
+            var obj = deserializer.Deserialize<T>(str);
+            return obj;
        }
-
-        /// <summary>
-        /// 序列化
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public static string ToYaml(object? obj)
+        catch (Exception ex)
        {
-            var result = string.Empty;
-            if (obj == null)
-            {
-                return result;
-            }
-            var serializer = new SerializerBuilder()
-                    .WithNamingConvention(HyphenatedNamingConvention.Instance)
-                    .Build();
+            Logging.SaveLog(_tag, ex);
+            return deserializer.Deserialize<T>("");
+        }
+    }

-            try
-            {
-                result = serializer.Serialize(obj);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
+    /// <summary>
+    /// Serialize
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <returns></returns>
+    public static string ToYaml(object? obj)
+    {
+        var result = string.Empty;
+        if (obj == null)
+        {
            return result;
        }
-
-        public static string? PreprocessYaml(string str)
-        {
-            var deserializer = new DeserializerBuilder()
-                .WithNamingConvention(PascalCaseNamingConvention.Instance)
+        var serializer = new SerializerBuilder()
+                .WithNamingConvention(HyphenatedNamingConvention.Instance)
                .Build();
-            try
-            {
-                var mergingParser = new MergingParser(new Parser(new StringReader(str)));
-                var obj = new DeserializerBuilder().Build().Deserialize(mergingParser);
-                return ToYaml(obj);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-                return null;
-            }
-        }

-        #endregion YAML
+        try
+        {
+            result = serializer.Serialize(obj);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return result;
    }
-}
+
+    public static string? PreprocessYaml(string str)
+    {
+        try
+        {
+            var mergingParser = new MergingParser(new Parser(new StringReader(str)));
+            var obj = new DeserializerBuilder().Build().Deserialize(mergingParser);
+            return ToYaml(obj);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            return null;
+        }
+    }
+
+    #endregion YAML
+}
@@ -1,16 +1,19 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EConfigType
 {
-    public enum EConfigType
-    {
-        VMess = 1,
-        Custom = 2,
-        Shadowsocks = 3,
-        SOCKS = 4,
-        VLESS = 5,
-        Trojan = 6,
-        Hysteria2 = 7,
-        TUIC = 8,
-        WireGuard = 9,
-        HTTP = 10
-    }
-}
+    VMess = 1,
+    Custom = 2,
+    Shadowsocks = 3,
+    SOCKS = 4,
+    VLESS = 5,
+    Trojan = 6,
+    Hysteria2 = 7,
+    TUIC = 8,
+    WireGuard = 9,
+    HTTP = 10,
+    Anytls = 11,
+    Naive = 12,
+    PolicyGroup = 101,
+    ProxyChain = 102,
+}
@@ -1,19 +1,20 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ECoreType
 {
-    public enum ECoreType
-    {
-        v2fly = 1,
-        Xray = 2,
-        v2fly_v5 = 4,
-        mihomo = 13,
-        hysteria = 21,
-        naiveproxy = 22,
-        tuic = 23,
-        sing_box = 24,
-        juicity = 25,
-        hysteria2 = 26,
-        brook = 27,
-        overtls = 28,
-        v2rayN = 99
-    }
+    v2fly = 1,
+    Xray = 2,
+    v2fly_v5 = 4,
+    mihomo = 13,
+    hysteria = 21,
+    naiveproxy = 22,
+    tuic = 23,
+    sing_box = 24,
+    juicity = 25,
+    hysteria2 = 26,
+    brook = 27,
+    overtls = 28,
+    shadowquic = 29,
+    mieru = 30,
+    v2rayN = 99
 }
@@ -1,9 +1,8 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EGirdOrientation
 {
-    public enum EGirdOrientation
-    {
-        Horizontal,
-        Vertical,
-        Tab,
-    }
-}
+    Horizontal,
+    Vertical,
+    Tab,
+}
@@ -1,11 +1,10 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EGlobalHotkey
 {
-    public enum EGlobalHotkey
-    {
-        ShowForm = 0,
-        SystemProxyClear = 1,
-        SystemProxySet = 2,
-        SystemProxyUnchanged = 3,
-        SystemProxyPac = 4,
-    }
-}
+    ShowForm = 0,
+    SystemProxyClear = 1,
+    SystemProxySet = 2,
+    SystemProxyUnchanged = 3,
+    SystemProxyPac = 4,
+}
@@ -1,14 +1,13 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EInboundProtocol
 {
-    public enum EInboundProtocol
-    {
-        socks = 0,
-        socks2,
-        socks3,
-        pac,
-        api,
-        api2,
-        mixed,
-        speedtest = 21
-    }
-}
+    socks = 0,
+    socks2,
+    socks3,
+    pac,
+    api,
+    api2,
+    mixed,
+    speedtest = 21
+}
@@ -1,11 +1,10 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EMove
 {
-    public enum EMove
-    {
-        Top = 1,
-        Up = 2,
-        Down = 3,
-        Bottom = 4,
-        Position = 5
-    }
-}
+    Top = 1,
+    Up = 2,
+    Down = 3,
+    Bottom = 4,
+    Position = 5
+}
@@ -1,11 +0,0 @@
-namespace ServiceLib.Enums
-{
-    public enum EMsgCommand
-    {
-        ClearMsg,
-        SendMsgView,
-        SendSnackMsg,
-        RefreshProfiles,
-        AppExit
-    }
-}
@@ -0,0 +1,10 @@
+namespace ServiceLib.Enums;
+
+public enum EMultipleLoad
+{
+    LeastPing,
+    Fallback,
+    Random,
+    RoundRobin,
+    LeastLoad
+}
@@ -1,9 +1,8 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EPresetType
 {
-    public enum EPresetType
-    {
-        Default = 0,
-        Russia = 1,
-        Iran = 2,
-    }
-}
+    Default = 0,
+    Russia = 1,
+    Iran = 2,
+}
@@ -1,10 +1,9 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ERuleMode
 {
-    public enum ERuleMode
-    {
-        Rule = 0,
-        Global = 1,
-        Direct = 2,
-        Unchanged = 3
-    }
-}
+    Rule = 0,
+    Global = 1,
+    Direct = 2,
+    Unchanged = 3
+}
@@ -0,0 +1,8 @@
+namespace ServiceLib.Enums;
+
+public enum ERuleType
+{
+    ALL = 0,
+    Routing = 1,
+    DNS = 2,
+}
@@ -1,21 +1,20 @@
-namespace ServiceLib.Enums
-{
-    public enum EServerColName
-    {
-        Def = 0,
-        ConfigType,
-        Remarks,
-        Address,
-        Port,
-        Network,
-        StreamSecurity,
-        SubRemarks,
-        DelayVal,
-        SpeedVal,
+namespace ServiceLib.Enums;

-        TodayDown,
-        TodayUp,
-        TotalDown,
-        TotalUp
-    }
-}
+public enum EServerColName
+{
+    Def = 0,
+    ConfigType,
+    Remarks,
+    Address,
+    Port,
+    Network,
+    StreamSecurity,
+    SubRemarks,
+    DelayVal,
+    SpeedVal,
+
+    TodayDown,
+    TodayUp,
+    TotalDown,
+    TotalUp
+}
@@ -1,10 +1,10 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ESpeedActionType
 {
-    public enum ESpeedActionType
-    {
-        Tcping,
-        Realping,
-        Speedtest,
-        Mixedtest
-    }
-}
+    Tcping,
+    Realping,
+    Speedtest,
+    Mixedtest,
+    FastRealping
+}
@@ -1,10 +1,9 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ESysProxyType
 {
-    public enum ESysProxyType
-    {
-        ForcedClear = 0,
-        ForcedChange = 1,
-        Unchanged = 2,
-        Pac = 3
-    }
-}
+    ForcedClear = 0,
+    ForcedChange = 1,
+    Unchanged = 2,
+    Pac = 3
+}
@@ -1,13 +1,12 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ETheme
 {
-    public enum ETheme
-    {
-        FollowSystem,
-        Dark,
-        Light,
-        Aquatic,
-        Desert,
-        Dusk,
-        NightSky
-    }
-}
+    FollowSystem,
+    Dark,
+    Light,
+    Aquatic,
+    Desert,
+    Dusk,
+    NightSky
+}
@@ -1,15 +1,14 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ETransport
 {
-    public enum ETransport
-    {
-        tcp,
-        kcp,
-        ws,
-        httpupgrade,
-        xhttp,
-        h2,
-        http,
-        quic,
-        grpc
-    }
-}
+    tcp,
+    kcp,
+    ws,
+    httpupgrade,
+    xhttp,
+    h2,
+    http,
+    quic,
+    grpc
+}
@@ -1,46 +1,36 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EViewAction
 {
-    public enum EViewAction
-    {
-        CloseWindow,
-        ShowYesNo,
-        SaveFileDialog,
-        AddBatchRoutingRulesYesNo,
-        AdjustMainLvColWidth,
-        SetClipboardData,
-        AddServerViaClipboard,
-        ImportRulesFromClipboard,
-        ProfilesFocus,
-        ShareSub,
-        ShareServer,
-        ShowHideWindow,
-        ScanScreenTask,
-        ScanImageTask,
-        Shutdown,
-        BrowseServer,
-        ImportRulesFromFile,
-        InitSettingFont,
-        SubEditWindow,
-        RoutingRuleSettingWindow,
-        RoutingRuleDetailsWindow,
-        AddServerWindow,
-        AddServer2Window,
-        DNSSettingWindow,
-        RoutingSettingWindow,
-        OptionSettingWindow,
-        GlobalHotkeySettingWindow,
-        SubSettingWindow,
-        DispatcherSpeedTest,
-        DispatcherRefreshConnections,
-        DispatcherRefreshProxyGroups,
-        DispatcherProxiesDelayTest,
-        DispatcherStatistics,
-        DispatcherServerAvailability,
-        DispatcherReload,
-        DispatcherRefreshServersBiz,
-        DispatcherRefreshIcon,
-        DispatcherCheckUpdate,
-        DispatcherCheckUpdateFinished,
-        DispatcherShowMsg,
-    }
-}
+    CloseWindow,
+    ShowYesNo,
+    SaveFileDialog,
+    AddBatchRoutingRulesYesNo,
+    SetClipboardData,
+    AddServerViaClipboard,
+    ImportRulesFromClipboard,
+    ProfilesFocus,
+    ShareSub,
+    ShareServer,
+    ScanScreenTask,
+    ScanImageTask,
+    BrowseServer,
+    ImportRulesFromFile,
+    InitSettingFont,
+    PasswordInput,
+    SubEditWindow,
+    RoutingRuleSettingWindow,
+    RoutingRuleDetailsWindow,
+    AddServerWindow,
+    AddServer2Window,
+    AddGroupServerWindow,
+    DNSSettingWindow,
+    RoutingSettingWindow,
+    OptionSettingWindow,
+    FullConfigTemplateWindow,
+    GlobalHotkeySettingWindow,
+    SubSettingWindow,
+    DispatcherRefreshServersBiz,
+    DispatcherRefreshIcon,
+    DispatcherShowMsg,
+}
@@ -0,0 +1,30 @@
+namespace ServiceLib.Events;
+
+public static class AppEvents
+{
+    public static readonly EventChannel<Unit> ReloadRequested = new();
+    public static readonly EventChannel<bool?> ShowHideWindowRequested = new();
+    public static readonly EventChannel<Unit> AddServerViaScanRequested = new();
+    public static readonly EventChannel<Unit> AddServerViaClipboardRequested = new();
+    public static readonly EventChannel<bool> SubscriptionsUpdateRequested = new();
+
+    public static readonly EventChannel<Unit> ProfilesRefreshRequested = new();
+    public static readonly EventChannel<Unit> SubscriptionsRefreshRequested = new();
+    public static readonly EventChannel<Unit> ProxiesReloadRequested = new();
+    public static readonly EventChannel<ServerSpeedItem> DispatcherStatisticsRequested = new();
+
+    public static readonly EventChannel<string> SendSnackMsgRequested = new();
+    public static readonly EventChannel<string> SendMsgViewRequested = new();
+
+    public static readonly EventChannel<Unit> AppExitRequested = new();
+    public static readonly EventChannel<bool> ShutdownRequested = new();
+
+    public static readonly EventChannel<Unit> AdjustMainLvColWidthRequested = new();
+
+    public static readonly EventChannel<string> SetDefaultServerRequested = new();
+
+    public static readonly EventChannel<Unit> RoutingsMenuRefreshRequested = new();
+    public static readonly EventChannel<Unit> TestServerRequested = new();
+    public static readonly EventChannel<Unit> InboundDisplayRequested = new();
+    public static readonly EventChannel<ESysProxyType> SysProxyChangeRequested = new();
+}
@@ -0,0 +1,27 @@
+using System.Reactive.Subjects;
+
+namespace ServiceLib.Events;
+
+public sealed class EventChannel<T>
+{
+    private readonly ISubject<T> _subject = Subject.Synchronize(new Subject<T>());
+
+    public IObservable<T> AsObservable()
+    {
+        return _subject.AsObservable();
+    }
+
+    public void Publish(T value)
+    {
+        _subject.OnNext(value);
+    }
+
+    public void Publish()
+    {
+        if (typeof(T) != typeof(Unit))
+        {
+            throw new InvalidOperationException("Publish() without value is only valid for EventChannel<Unit>.");
+        }
+        _subject.OnNext((T)(object)Unit.Default);
+    }
+}
@@ -1,11 +1,37 @@
-global using ServiceLib.Base;
+global using System.Collections.Concurrent;
+global using System.Diagnostics;
+global using System.Net;
+global using System.Net.NetworkInformation;
+global using System.Net.Sockets;
+global using System.Reactive;
+global using System.Reactive.Disposables;
+global using System.Reactive.Linq;
+global using System.Reflection;
+global using System.Runtime.InteropServices;
+global using System.Security.Cryptography;
+global using System.Text;
+global using System.Text.Encodings.Web;
+global using System.Text.Json;
+global using System.Text.Json.Nodes;
+global using System.Text.Json.Serialization;
+global using System.Text.RegularExpressions;
+global using DynamicData;
+global using DynamicData.Binding;
+global using ReactiveUI;
+global using ReactiveUI.Fody.Helpers;
+global using ServiceLib.Base;
 global using ServiceLib.Common;
 global using ServiceLib.Enums;
+global using ServiceLib.Events;
 global using ServiceLib.Handler;
+global using ServiceLib.Handler.Builder;
 global using ServiceLib.Handler.Fmt;
-global using ServiceLib.Services;
-global using ServiceLib.Services.Statistics;
-global using ServiceLib.Services.CoreConfig;
+global using ServiceLib.Handler.SysProxy;
+global using ServiceLib.Helper;
+global using ServiceLib.Manager;
 global using ServiceLib.Models;
 global using ServiceLib.Resx;
-global using ServiceLib.Handler.SysProxy;
+global using ServiceLib.Services;
+global using ServiceLib.Services.CoreConfig;
+global using ServiceLib.Services.Statistics;
+global using SQLite;
@@ -1,255 +0,0 @@
-namespace ServiceLib.Handler
-{
-    public sealed class AppHandler
-    {
-        #region Property
-
-        private static readonly Lazy<AppHandler> _instance = new(() => new());
-        private Config _config;
-        private int? _statePort;
-        private int? _statePort2;
-        private Job? _processJob;
-        private bool? _isAdministrator;
-        public static AppHandler Instance => _instance.Value;
-        public Config Config => _config;
-
-        public int StatePort
-        {
-            get
-            {
-                _statePort ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api));
-                return _statePort.Value;
-            }
-        }
-
-        public int StatePort2
-        {
-            get
-            {
-                _statePort2 ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api2));
-                return _statePort2.Value + (_config.TunModeItem.EnableTun ? 1 : 0);
-            }
-        }
-
-        public bool IsAdministrator
-        {
-            get
-            {
-                _isAdministrator ??= Utils.IsAdministrator();
-                return _isAdministrator.Value;
-            }
-        }
-
-        #endregion Property
-
-        #region Init
-
-        public bool InitApp()
-        {
-            if (Utils.HasWritePermission() == false)
-            {
-                Environment.SetEnvironmentVariable(Global.LocalAppData, "1", EnvironmentVariableTarget.Process);
-            }
-
-            Logging.Setup();
-            var config = ConfigHandler.LoadConfig();
-            if (config == null)
-            {
-                return false;
-            }
-            _config = config;
-            Thread.CurrentThread.CurrentUICulture = new(_config.UiItem.CurrentLanguage);
-
-            //Under Win10
-            if (Utils.IsWindows() && Environment.OSVersion.Version.Major < 10)
-            {
-                Environment.SetEnvironmentVariable("DOTNET_EnableWriteXorExecute", "0", EnvironmentVariableTarget.User);
-            }
-
-            SQLiteHelper.Instance.CreateTable<SubItem>();
-            SQLiteHelper.Instance.CreateTable<ProfileItem>();
-            SQLiteHelper.Instance.CreateTable<ServerStatItem>();
-            SQLiteHelper.Instance.CreateTable<RoutingItem>();
-            SQLiteHelper.Instance.CreateTable<ProfileExItem>();
-            SQLiteHelper.Instance.CreateTable<DNSItem>();
-            return true;
-        }
-
-        public bool InitComponents()
-        {
-            Logging.SaveLog($"v2rayN start up | {Utils.GetRuntimeInfo()}");
-            Logging.LoggingEnabled(_config.GuiItem.EnableLog);
-
-            ClearExpiredFiles();
-
-            return true;
-        }
-
-        public bool Reset()
-        {
-            _statePort = null;
-            _statePort2 = null;
-            return true;
-        }
-
-        private void ClearExpiredFiles()
-        {
-            Task.Run(() =>
-            {
-                FileManager.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddMonths(-1));
-                FileManager.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
-            });
-        }
-
-        #endregion Init
-
-        #region Config
-
-        public int GetLocalPort(EInboundProtocol protocol)
-        {
-            var localPort = _config.Inbound.FirstOrDefault(t => t.Protocol == nameof(EInboundProtocol.socks))?.LocalPort ?? 10808;
-            return localPort + (int)protocol;
-        }
-
-        public void AddProcess(IntPtr processHandle)
-        {
-            if (Utils.IsWindows())
-            {
-                _processJob ??= new();
-                try
-                {
-                    _processJob?.AddProcess(processHandle);
-                }
-                catch
-                {
-                }
-            }
-        }
-
-        #endregion Config
-
-        #region SqliteHelper
-
-        public async Task<List<SubItem>?> SubItems()
-        {
-            return await SQLiteHelper.Instance.TableAsync<SubItem>().OrderBy(t => t.Sort).ToListAsync();
-        }
-
-        public async Task<SubItem?> GetSubItem(string? subid)
-        {
-            return await SQLiteHelper.Instance.TableAsync<SubItem>().FirstOrDefaultAsync(t => t.Id == subid);
-        }
-
-        public async Task<List<ProfileItem>?> ProfileItems(string subid)
-        {
-            if (Utils.IsNullOrEmpty(subid))
-            {
-                return await SQLiteHelper.Instance.TableAsync<ProfileItem>().ToListAsync();
-            }
-            else
-            {
-                return await SQLiteHelper.Instance.TableAsync<ProfileItem>().Where(t => t.Subid == subid).ToListAsync();
-            }
-        }
-
-        public async Task<List<string>?> ProfileItemIndexes(string subid)
-        {
-            return (await ProfileItems(subid))?.Select(t => t.IndexId)?.ToList();
-        }
-
-        public async Task<List<ProfileItemModel>?> ProfileItems(string subid, string filter)
-        {
-            var sql = @$"select a.*
-                           ,b.remarks subRemarks
-                        from ProfileItem a
-                        left join SubItem b on a.subid = b.id
-                        where 1=1 ";
-            if (Utils.IsNotEmpty(subid))
-            {
-                sql += $" and a.subid = '{subid}'";
-            }
-            if (Utils.IsNotEmpty(filter))
-            {
-                if (filter.Contains('\''))
-                {
-                    filter = filter.Replace("'", "");
-                }
-                sql += string.Format(" and (a.remarks like '%{0}%' or a.address like '%{0}%') ", filter);
-            }
-
-            return await SQLiteHelper.Instance.QueryAsync<ProfileItemModel>(sql);
-        }
-
-        public async Task<ProfileItem?> GetProfileItem(string indexId)
-        {
-            if (Utils.IsNullOrEmpty(indexId))
-            {
-                return null;
-            }
-            return await SQLiteHelper.Instance.TableAsync<ProfileItem>().FirstOrDefaultAsync(it => it.IndexId == indexId);
-        }
-
-        public async Task<ProfileItem?> GetProfileItemViaRemarks(string? remarks)
-        {
-            if (Utils.IsNullOrEmpty(remarks))
-            {
-                return null;
-            }
-            return await SQLiteHelper.Instance.TableAsync<ProfileItem>().FirstOrDefaultAsync(it => it.Remarks == remarks);
-        }
-
-        public async Task<List<RoutingItem>?> RoutingItems()
-        {
-            return await SQLiteHelper.Instance.TableAsync<RoutingItem>().OrderBy(t => t.Sort).ToListAsync();
-        }
-
-        public async Task<RoutingItem?> GetRoutingItem(string id)
-        {
-            return await SQLiteHelper.Instance.TableAsync<RoutingItem>().FirstOrDefaultAsync(it => it.Id == id);
-        }
-
-        public async Task<List<DNSItem>?> DNSItems()
-        {
-            return await SQLiteHelper.Instance.TableAsync<DNSItem>().ToListAsync();
-        }
-
-        public async Task<DNSItem?> GetDNSItem(ECoreType eCoreType)
-        {
-            return await SQLiteHelper.Instance.TableAsync<DNSItem>().FirstOrDefaultAsync(it => it.CoreType == eCoreType);
-        }
-
-        #endregion SqliteHelper
-
-        #region Core Type
-
-        public List<string> GetShadowsocksSecurities(ProfileItem profileItem)
-        {
-            var coreType = GetCoreType(profileItem, EConfigType.Shadowsocks);
-            switch (coreType)
-            {
-                case ECoreType.v2fly:
-                    return Global.SsSecurities;
-
-                case ECoreType.Xray:
-                    return Global.SsSecuritiesInXray;
-
-                case ECoreType.sing_box:
-                    return Global.SsSecuritiesInSingbox;
-            }
-            return Global.SsSecuritiesInSingbox;
-        }
-
-        public ECoreType GetCoreType(ProfileItem profileItem, EConfigType eConfigType)
-        {
-            if (profileItem?.CoreType != null)
-            {
-                return (ECoreType)profileItem.CoreType;
-            }
-
-            var item = _config.CoreTypeItem?.FirstOrDefault(it => it.ConfigType == eConfigType);
-            return item?.CoreType ?? ECoreType.Xray;
-        }
-
-        #endregion Core Type
-    }
-}
@@ -1,223 +1,222 @@
 using System.Security.Principal;
-using System.Text.RegularExpressions;

-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+public static class AutoStartupHandler
 {
-    public static class AutoStartupHandler
+    private static readonly string _tag = "AutoStartupHandler";
+
+    public static async Task<bool> UpdateTask(Config config)
    {
-        private static readonly string _tag = "AutoStartupHandler";
-
-        public static async Task<bool> UpdateTask(Config config)
+        if (Utils.IsWindows())
        {
-            if (Utils.IsWindows())
+            await ClearTaskWindows();
+
+            if (config.GuiItem.AutoRun)
            {
-                await ClearTaskWindows();
-
-                if (config.GuiItem.AutoRun)
-                {
-                    await SetTaskWindows();
-                }
+                await SetTaskWindows();
            }
-            else if (Utils.IsLinux())
+        }
+        else if (Utils.IsLinux())
+        {
+            await ClearTaskLinux();
+
+            if (config.GuiItem.AutoRun)
            {
-                await ClearTaskLinux();
-
-                if (config.GuiItem.AutoRun)
-                {
-                    await SetTaskLinux();
-                }
+                await SetTaskLinux();
            }
-            else if (Utils.IsOSX())
+        }
+        else if (Utils.IsMacOS())
+        {
+            await ClearTaskOSX();
+
+            if (config.GuiItem.AutoRun)
            {
-                await ClearTaskOSX();
-
-                if (config.GuiItem.AutoRun)
-                {
-                    await SetTaskOSX();
-                }
+                await SetTaskOSX();
            }
-
-            return true;
        }

-        #region Windows
+        return true;
+    }

-        private static async Task ClearTaskWindows()
+    #region Windows
+
+    private static async Task ClearTaskWindows()
+    {
+        var autoRunName = GetAutoRunNameWindows();
+        WindowsUtils.RegWriteValue(Global.AutoRunRegPath, autoRunName, "");
+        if (Utils.IsAdministrator())
+        {
+            AutoStartTaskService(autoRunName, "", "");
+        }
+
+        await Task.CompletedTask;
+    }
+
+    private static async Task SetTaskWindows()
+    {
+        try
        {
            var autoRunName = GetAutoRunNameWindows();
-            WindowsUtils.RegWriteValue(Global.AutoRunRegPath, autoRunName, "");
+            var exePath = Utils.GetExePath();
            if (Utils.IsAdministrator())
            {
-                AutoStartTaskService(autoRunName, "", "");
+                AutoStartTaskService(autoRunName, exePath, "");
            }
-
-            await Task.CompletedTask;
-        }
-
-        private static async Task SetTaskWindows()
-        {
-            try
+            else
            {
-                var autoRunName = GetAutoRunNameWindows();
-                var exePath = Utils.GetExePath();
-                if (Utils.IsAdministrator())
-                {
-                    AutoStartTaskService(autoRunName, exePath, "");
-                }
-                else
-                {
-                    WindowsUtils.RegWriteValue(Global.AutoRunRegPath, autoRunName, exePath.AppendQuotes());
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-            await Task.CompletedTask;
-        }
-
-        /// <summary>
-        /// Auto Start via TaskService
-        /// </summary>
-        /// <param name="taskName"></param>
-        /// <param name="fileName"></param>
-        /// <param name="description"></param>
-        /// <exception cref="ArgumentNullException"></exception>
-        public static void AutoStartTaskService(string taskName, string fileName, string description)
-        {
-            if (Utils.IsNullOrEmpty(taskName))
-            {
-                return;
-            }
-
-            var logonUser = WindowsIdentity.GetCurrent().Name;
-            using var taskService = new Microsoft.Win32.TaskScheduler.TaskService();
-            var tasks = taskService.RootFolder.GetTasks(new Regex(taskName));
-            if (Utils.IsNullOrEmpty(fileName))
-            {
-                foreach (var t in tasks)
-                {
-                    taskService.RootFolder.DeleteTask(t.Name);
-                }
-                return;
-            }
-
-            var task = taskService.NewTask();
-            task.RegistrationInfo.Description = description;
-            task.Settings.DisallowStartIfOnBatteries = false;
-            task.Settings.StopIfGoingOnBatteries = false;
-            task.Settings.RunOnlyIfIdle = false;
-            task.Settings.IdleSettings.StopOnIdleEnd = false;
-            task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
-            task.Triggers.Add(new Microsoft.Win32.TaskScheduler.LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(10) });
-            task.Principal.RunLevel = Microsoft.Win32.TaskScheduler.TaskRunLevel.Highest;
-            task.Actions.Add(new Microsoft.Win32.TaskScheduler.ExecAction(fileName.AppendQuotes(), null, Path.GetDirectoryName(fileName)));
-
-            taskService.RootFolder.RegisterTaskDefinition(taskName, task);
-        }
-
-        private static string GetAutoRunNameWindows()
-        {
-            return $"{Global.AutoRunName}_{Utils.GetMd5(Utils.StartupPath())}";
-        }
-
-        #endregion Windows
-
-        #region Linux
-
-        private static async Task ClearTaskLinux()
-        {
-            try
-            {
-                File.Delete(GetHomePathLinux());
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-            await Task.CompletedTask;
-        }
-
-        private static async Task SetTaskLinux()
-        {
-            try
-            {
-                var linuxConfig = EmbedUtils.GetEmbedText(Global.LinuxAutostartConfig);
-                if (linuxConfig.IsNotEmpty())
-                {
-                    linuxConfig = linuxConfig.Replace("$ExecPath$", Utils.GetExePath());
-                    Logging.SaveLog(linuxConfig);
-
-                    var homePath = GetHomePathLinux();
-                    await File.WriteAllTextAsync(homePath, linuxConfig);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
+                WindowsUtils.RegWriteValue(Global.AutoRunRegPath, autoRunName, exePath.AppendQuotes());
            }
        }
-
-        private static string GetHomePathLinux()
+        catch (Exception ex)
        {
-            var homePath = Path.Combine(Utils.GetHomePath(), ".config", "autostart", $"{Global.AppName}.desktop");
-            Directory.CreateDirectory(Path.GetDirectoryName(homePath));
-            return homePath;
+            Logging.SaveLog(_tag, ex);
+        }
+        await Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// Auto Start via TaskService
+    /// </summary>
+    /// <param name="taskName"></param>
+    /// <param name="fileName"></param>
+    /// <param name="description"></param>
+    /// <exception cref="ArgumentNullException"></exception>
+    public static void AutoStartTaskService(string taskName, string fileName, string description)
+    {
+        if (taskName.IsNullOrEmpty())
+        {
+            return;
        }

-        #endregion Linux
-
-        #region macOS
-
-        private static async Task ClearTaskOSX()
+        var logonUser = WindowsIdentity.GetCurrent().Name;
+        using var taskService = new Microsoft.Win32.TaskScheduler.TaskService();
+        var tasks = taskService.RootFolder.GetTasks(new Regex(taskName));
+        if (fileName.IsNullOrEmpty())
        {
-            try
+            foreach (var t in tasks)
            {
-                var launchAgentPath = GetLaunchAgentPathMacOS();
-                if (File.Exists(launchAgentPath))
-                {
-                    var args = new[] { "-c", $"launchctl unload -w \"{launchAgentPath}\"" };
-                    await Utils.GetCliWrapOutput("/bin/bash", args);
-
-                    File.Delete(launchAgentPath);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
+                taskService.RootFolder.DeleteTask(t.Name);
            }
+            return;
        }

-        private static async Task SetTaskOSX()
-        {
-            try
-            {
-                var plistContent = GenerateLaunchAgentPlist();
-                var launchAgentPath = GetLaunchAgentPathMacOS();
-                await File.WriteAllTextAsync(launchAgentPath, plistContent);
+        var task = taskService.NewTask();
+        task.RegistrationInfo.Description = description;
+        task.Settings.DisallowStartIfOnBatteries = false;
+        task.Settings.StopIfGoingOnBatteries = false;
+        task.Settings.RunOnlyIfIdle = false;
+        task.Settings.IdleSettings.StopOnIdleEnd = false;
+        task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
+        task.Triggers.Add(new Microsoft.Win32.TaskScheduler.LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(30) });
+        task.Principal.RunLevel = Microsoft.Win32.TaskScheduler.TaskRunLevel.Highest;
+        task.Actions.Add(new Microsoft.Win32.TaskScheduler.ExecAction(fileName.AppendQuotes(), null, Path.GetDirectoryName(fileName)));

-                var args = new[] { "-c", $"launchctl load -w \"{launchAgentPath}\"" };
-                await Utils.GetCliWrapOutput("/bin/bash", args);
-            }
-            catch (Exception ex)
+        taskService.RootFolder.RegisterTaskDefinition(taskName, task);
+    }
+
+    private static string GetAutoRunNameWindows()
+    {
+        return $"{Global.AutoRunName}_{Utils.GetMd5(Utils.StartupPath())}";
+    }
+
+    #endregion Windows
+
+    #region Linux
+
+    private static async Task ClearTaskLinux()
+    {
+        try
+        {
+            File.Delete(GetHomePathLinux());
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        await Task.CompletedTask;
+    }
+
+    private static async Task SetTaskLinux()
+    {
+        try
+        {
+            var linuxConfig = EmbedUtils.GetEmbedText(Global.LinuxAutostartConfig);
+            if (linuxConfig.IsNotEmpty())
            {
-                Logging.SaveLog(_tag, ex);
+                linuxConfig = linuxConfig.Replace("$ExecPath$", Utils.GetExePath());
+                Logging.SaveLog(linuxConfig);
+
+                var homePath = GetHomePathLinux();
+                await File.WriteAllTextAsync(homePath, linuxConfig);
            }
        }
-
-        private static string GetLaunchAgentPathMacOS()
+        catch (Exception ex)
        {
-            var homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-            var launchAgentPath = Path.Combine(homePath, "Library", "LaunchAgents", $"{Global.AppName}-LaunchAgent.plist");
-            Directory.CreateDirectory(Path.GetDirectoryName(launchAgentPath));
-            return launchAgentPath;
+            Logging.SaveLog(_tag, ex);
        }
+    }

-        private static string GenerateLaunchAgentPlist()
+    private static string GetHomePathLinux()
+    {
+        var homePath = Path.Combine(Utils.GetHomePath(), ".config", "autostart", $"{Global.AppName}.desktop");
+        Directory.CreateDirectory(Path.GetDirectoryName(homePath));
+        return homePath;
+    }
+
+    #endregion Linux
+
+    #region macOS
+
+    private static async Task ClearTaskOSX()
+    {
+        try
        {
-            var exePath = Utils.GetExePath();
-            var appName = Path.GetFileNameWithoutExtension(exePath);
-            return $@"<?xml version=""1.0"" encoding=""UTF-8""?>
+            var launchAgentPath = GetLaunchAgentPathMacOS();
+            if (File.Exists(launchAgentPath))
+            {
+                var args = new[] { "-c", $"launchctl unload -w \"{launchAgentPath}\"" };
+                await Utils.GetCliWrapOutput(Global.LinuxBash, args);
+
+                File.Delete(launchAgentPath);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private static async Task SetTaskOSX()
+    {
+        try
+        {
+            var plistContent = GenerateLaunchAgentPlist();
+            var launchAgentPath = GetLaunchAgentPathMacOS();
+            await File.WriteAllTextAsync(launchAgentPath, plistContent);
+
+            var args = new[] { "-c", $"launchctl load -w \"{launchAgentPath}\"" };
+            await Utils.GetCliWrapOutput(Global.LinuxBash, args);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private static string GetLaunchAgentPathMacOS()
+    {
+        var homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        var launchAgentPath = Path.Combine(homePath, "Library", "LaunchAgents", $"{Global.AppName}-LaunchAgent.plist");
+        Directory.CreateDirectory(Path.GetDirectoryName(launchAgentPath));
+        return launchAgentPath;
+    }
+
+    private static string GenerateLaunchAgentPlist()
+    {
+        var exePath = Utils.GetExePath();
+        var appName = Path.GetFileNameWithoutExtension(exePath);
+        return $@"<?xml version=""1.0"" encoding=""UTF-8""?>
 <!DOCTYPE plist PUBLIC ""-//Apple//DTD PLIST 1.0//EN"" ""http://www.apple.com/DTDs/PropertyList-1.0.dtd"">
 <plist version=""1.0"">
 <dict>
@@ -235,8 +234,7 @@ namespace ServiceLib.Handler
    <false/>
 </dict>
 </plist>";
-        }
-
-        #endregion macOS
    }
+
+    #endregion macOS
 }
@@ -0,0 +1,453 @@
+namespace ServiceLib.Handler.Builder;
+
+public record CoreConfigContextBuilderResult(CoreConfigContext Context, NodeValidatorResult ValidatorResult)
+{
+    public bool Success => ValidatorResult.Success;
+}
+
+/// <summary>
+/// Holds the results of a full context build, including the main context and an optional
+/// pre-socks context (e.g. for TUN protection or pre-socks chaining).
+/// </summary>
+public record CoreConfigContextBuilderAllResult(
+    CoreConfigContextBuilderResult MainResult,
+    CoreConfigContextBuilderResult? PreSocksResult)
+{
+    /// <summary>True only when both the main result and (if present) the pre-socks result succeeded.</summary>
+    public bool Success => MainResult.Success && (PreSocksResult?.Success ?? true);
+
+    /// <summary>
+    /// Merges all errors and warnings from the main result and the optional pre-socks result
+    /// into a single <see cref="NodeValidatorResult"/> for unified notification.
+    /// </summary>
+    public NodeValidatorResult CombinedValidatorResult => new(
+        [.. MainResult.ValidatorResult.Errors, .. PreSocksResult?.ValidatorResult.Errors ?? []],
+        [.. MainResult.ValidatorResult.Warnings, .. PreSocksResult?.ValidatorResult.Warnings ?? []]);
+
+    /// <summary>
+    /// The main context with TunProtectSocksPort/ProxyRelaySocksPort and ProtectDomainList merged in
+    /// from the pre-socks result (if any). Pass this to the core runner.
+    /// </summary>
+    public CoreConfigContext ResolvedMainContext => PreSocksResult is not null
+        ? MainResult.Context with
+        {
+            TunProtectSocksPort = PreSocksResult.Context.TunProtectSocksPort,
+            ProxyRelaySocksPort = PreSocksResult.Context.ProxyRelaySocksPort,
+            ProtectDomainList = [.. MainResult.Context.ProtectDomainList ?? [], .. PreSocksResult.Context.ProtectDomainList ?? []],
+        }
+        : MainResult.Context;
+}
+
+public class CoreConfigContextBuilder
+{
+    /// <summary>
+    /// Builds a <see cref="CoreConfigContext"/> for the given node, resolves its proxy map,
+    /// and processes outbound nodes referenced by routing rules.
+    /// </summary>
+    public static async Task<CoreConfigContextBuilderResult> Build(Config config, ProfileItem node)
+    {
+        var runCoreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
+        var coreType = runCoreType == ECoreType.sing_box ? ECoreType.sing_box : ECoreType.Xray;
+        var context = new CoreConfigContext()
+        {
+            Node = node,
+            RunCoreType = runCoreType,
+            AllProxiesMap = [],
+            AppConfig = config,
+            FullConfigTemplate = await AppManager.Instance.GetFullConfigTemplateItem(coreType),
+            IsTunEnabled = config.TunModeItem.EnableTun,
+            SimpleDnsItem = config.SimpleDNSItem,
+            ProtectDomainList = [],
+            TunProtectSocksPort = 0,
+            ProxyRelaySocksPort = 0,
+            RawDnsItem = await AppManager.Instance.GetDNSItem(coreType),
+            RoutingItem = await ConfigHandler.GetDefaultRouting(config),
+        };
+        var validatorResult = NodeValidatorResult.Empty();
+        var (actNode, nodeValidatorResult) = await ResolveNodeAsync(context, node);
+        if (!nodeValidatorResult.Success)
+        {
+            return new CoreConfigContextBuilderResult(context, nodeValidatorResult);
+        }
+        context = context with { Node = actNode };
+        validatorResult.Warnings.AddRange(nodeValidatorResult.Warnings);
+        if (!(context.RoutingItem?.RuleSet.IsNullOrEmpty() ?? true))
+        {
+            var rules = JsonUtils.Deserialize<List<RulesItem>>(context.RoutingItem?.RuleSet) ?? [];
+            foreach (var ruleItem in rules.Where(ruleItem => ruleItem.Enabled && !Global.OutboundTags.Contains(ruleItem.OutboundTag)))
+            {
+                if (ruleItem.OutboundTag.IsNullOrEmpty())
+                {
+                    validatorResult.Warnings.Add(string.Format(ResUI.MsgRoutingRuleEmptyOutboundTag, ruleItem.Remarks));
+                    ruleItem.OutboundTag = Global.ProxyTag;
+                    continue;
+                }
+                var ruleOutboundNode = await AppManager.Instance.GetProfileItemViaRemarks(ruleItem.OutboundTag);
+                if (ruleOutboundNode == null)
+                {
+                    validatorResult.Warnings.Add(string.Format(ResUI.MsgRoutingRuleOutboundNodeNotFound, ruleItem.Remarks, ruleItem.OutboundTag));
+                    ruleItem.OutboundTag = Global.ProxyTag;
+                    continue;
+                }
+
+                var (actRuleNode, ruleNodeValidatorResult) = await ResolveNodeAsync(context, ruleOutboundNode, false);
+                validatorResult.Warnings.AddRange(ruleNodeValidatorResult.Warnings.Select(w =>
+                    string.Format(ResUI.MsgRoutingRuleOutboundNodeWarning, ruleItem.Remarks, ruleItem.OutboundTag, w)));
+                if (!ruleNodeValidatorResult.Success)
+                {
+                    validatorResult.Warnings.AddRange(ruleNodeValidatorResult.Errors.Select(e =>
+                        string.Format(ResUI.MsgRoutingRuleOutboundNodeError, ruleItem.Remarks, ruleItem.OutboundTag, e)));
+                    ruleItem.OutboundTag = Global.ProxyTag;
+                    continue;
+                }
+
+                context.AllProxiesMap[$"remark:{ruleItem.OutboundTag}"] = actRuleNode;
+            }
+        }
+
+        return new CoreConfigContextBuilderResult(context, validatorResult);
+    }
+
+    /// <summary>
+    /// Builds the main <see cref="CoreConfigContext"/> for <paramref name="node"/> and, when
+    /// the main build succeeds, also builds the optional pre-socks context required for TUN
+    /// protection or pre-socks proxy chaining.
+    /// </summary>
+    public static async Task<CoreConfigContextBuilderAllResult> BuildAll(Config config, ProfileItem node)
+    {
+        var mainResult = await Build(config, node);
+        if (!mainResult.Success)
+        {
+            return new CoreConfigContextBuilderAllResult(mainResult, null);
+        }
+
+        var preResult = await BuildPreSocksIfNeeded(mainResult.Context);
+        return new CoreConfigContextBuilderAllResult(mainResult, preResult);
+    }
+
+    /// <summary>
+    /// Determines whether a pre-socks context is required for <paramref name="nodeContext"/>
+    /// and, if so, builds and returns it. Returns <c>null</c> when no pre-socks core is needed.
+    /// </summary>
+    private static async Task<CoreConfigContextBuilderResult?> BuildPreSocksIfNeeded(CoreConfigContext nodeContext)
+    {
+        var config = nodeContext.AppConfig;
+        var node = nodeContext.Node;
+        var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
+
+        var preSocksItem = ConfigHandler.GetPreSocksItem(config, node, coreType);
+        if (preSocksItem != null)
+        {
+            var preSocksResult = await Build(nodeContext.AppConfig, preSocksItem);
+            return preSocksResult with
+            {
+                Context = preSocksResult.Context with
+                {
+                    ProtectDomainList = [.. nodeContext.ProtectDomainList ?? [], .. preSocksResult.Context.ProtectDomainList ?? []],
+                }
+            };
+        }
+
+        if (!nodeContext.IsTunEnabled
+            || coreType != ECoreType.Xray
+            || node.ConfigType == EConfigType.Custom)
+        {
+            return null;
+        }
+
+        var tunProtectSocksPort = Utils.GetFreePort();
+        var proxyRelaySocksPort = Utils.GetFreePort();
+        var preItem = new ProfileItem()
+        {
+            CoreType = ECoreType.sing_box,
+            ConfigType = EConfigType.SOCKS,
+            Address = Global.Loopback,
+            Port = proxyRelaySocksPort,
+        };
+        var preResult2 = await Build(nodeContext.AppConfig, preItem);
+        return preResult2 with
+        {
+            Context = preResult2.Context with
+            {
+                ProtectDomainList = [.. nodeContext.ProtectDomainList ?? [], .. preResult2.Context.ProtectDomainList ?? []],
+                TunProtectSocksPort = tunProtectSocksPort,
+                ProxyRelaySocksPort = proxyRelaySocksPort,
+            }
+        };
+    }
+
+    /// <summary>
+    /// Resolves a node into the context, optionally wrapping it in a subscription-level proxy chain.
+    /// Returns the effective (possibly replaced) node and the validation result.
+    /// </summary>
+    public static async Task<(ProfileItem, NodeValidatorResult)> ResolveNodeAsync(CoreConfigContext context,
+        ProfileItem node,
+        bool includeSubChain = true)
+    {
+        if (node.IndexId.IsNullOrEmpty())
+        {
+            return (node, NodeValidatorResult.Empty());
+        }
+
+        if (includeSubChain)
+        {
+            var (virtualChainNode, chainValidatorResult) = await BuildSubscriptionChainNodeAsync(node);
+            if (virtualChainNode != null)
+            {
+                context.AllProxiesMap[virtualChainNode.IndexId] = virtualChainNode;
+                var (resolvedNode, resolvedResult) = await ResolveNodeAsync(context, virtualChainNode, false);
+                resolvedResult.Warnings.InsertRange(0, chainValidatorResult.Warnings);
+                return (resolvedNode, resolvedResult);
+            }
+            // Chain not built but warnings may still exist (e.g. missing profiles)
+            if (chainValidatorResult.Warnings.Count > 0)
+            {
+                var fillResult = await RegisterNodeAsync(context, node);
+                fillResult.Warnings.InsertRange(0, chainValidatorResult.Warnings);
+                return (node, fillResult);
+            }
+        }
+
+        var registerResult = await RegisterNodeAsync(context, node);
+        return (node, registerResult);
+    }
+
+    /// <summary>
+    /// If the node's subscription defines prev/next profiles, creates a virtual
+    /// <see cref="EConfigType.ProxyChain"/> node that wraps them together.
+    /// Returns <c>null</c> as the chain item when no chain is needed.
+    /// Any warnings (e.g. missing prev/next profile) are returned in the validator result.
+    /// </summary>
+    private static async Task<(ProfileItem? ChainNode, NodeValidatorResult ValidatorResult)> BuildSubscriptionChainNodeAsync(ProfileItem node)
+    {
+        var result = NodeValidatorResult.Empty();
+
+        if (node.Subid.IsNullOrEmpty() || node.ConfigType == EConfigType.Custom)
+        {
+            return (null, result);
+        }
+
+        var subItem = await AppManager.Instance.GetSubItem(node.Subid);
+        if (subItem == null)
+        {
+            return (null, result);
+        }
+
+        ProfileItem? prevNode = null;
+        ProfileItem? nextNode = null;
+
+        if (!subItem.PrevProfile.IsNullOrEmpty())
+        {
+            prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+            if (prevNode == null)
+            {
+                result.Warnings.Add(string.Format(ResUI.MsgSubscriptionPrevProfileNotFound, subItem.PrevProfile));
+            }
+        }
+        if (!subItem.NextProfile.IsNullOrEmpty())
+        {
+            nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
+            if (nextNode == null)
+            {
+                result.Warnings.Add(string.Format(ResUI.MsgSubscriptionNextProfileNotFound, subItem.NextProfile));
+            }
+        }
+
+        if (prevNode is null && nextNode is null)
+        {
+            return (null, result);
+        }
+
+        // Build new proxy chain node
+        var chainNode = new ProfileItem()
+        {
+            IndexId = $"inner-{Utils.GetGuid(false)}",
+            ConfigType = EConfigType.ProxyChain,
+            CoreType = AppManager.Instance.GetCoreType(node, node.ConfigType),
+            Remarks = node.Remarks,
+        };
+        List<string?> childItems = [prevNode?.IndexId, node.IndexId, nextNode?.IndexId];
+        var chainExtraItem = chainNode.GetProtocolExtra() with
+        {
+            GroupType = chainNode.ConfigType.ToString(),
+            ChildItems = string.Join(",", childItems.Where(x => !x.IsNullOrEmpty())),
+        };
+        chainNode.SetProtocolExtra(chainExtraItem);
+        return (chainNode, result);
+    }
+
+    /// <summary>
+    /// Dispatches registration to either <see cref="RegisterGroupNodeAsync"/> or
+    /// <see cref="RegisterSingleNodeAsync"/> based on the node's config type.
+    /// </summary>
+    private static async Task<NodeValidatorResult> RegisterNodeAsync(CoreConfigContext context, ProfileItem node)
+    {
+        if (node.ConfigType.IsGroupType())
+        {
+            return await RegisterGroupNodeAsync(context, node);
+        }
+        else
+        {
+            return RegisterSingleNodeAsync(context, node);
+        }
+    }
+
+    /// <summary>
+    /// Validates a single (non-group) node and, on success, adds it to the proxy map
+    /// and records any domain addresses that should bypass the proxy.
+    /// </summary>
+    private static NodeValidatorResult RegisterSingleNodeAsync(CoreConfigContext context, ProfileItem node)
+    {
+        if (node.ConfigType.IsGroupType())
+        {
+            return NodeValidatorResult.Empty();
+        }
+
+        var nodeValidatorResult = NodeValidator.Validate(node, context.RunCoreType);
+        var msgs = new List<string>([.. nodeValidatorResult.Errors, .. nodeValidatorResult.Warnings]);
+        if (msgs.Count > 0)
+        {
+            Logging.SaveLog($"{node.Remarks}: {string.Join("; ", msgs)}");
+        }
+        if (!nodeValidatorResult.Success)
+        {
+            return nodeValidatorResult;
+        }
+
+        context.AllProxiesMap[node.IndexId] = node;
+
+        var address = node.Address;
+        if (Utils.IsDomain(address))
+        {
+            context.ProtectDomainList.Add(address);
+        }
+
+        // ech query server name protect
+        if (!node.EchConfigList.IsNullOrEmpty())
+        {
+            var echQuerySni = node.Sni;
+            if (node.StreamSecurity == Global.StreamSecurity
+                && node.EchConfigList?.Contains("://") == true)
+            {
+                var idx = node.EchConfigList.IndexOf('+');
+                echQuerySni = idx > 0 ? node.EchConfigList[..idx] : node.Sni;
+            }
+
+            if (Utils.IsDomain(echQuerySni))
+            {
+                context.ProtectDomainList.Add(echQuerySni);
+            }
+        }
+
+        // xhttp downloadSettings address protect
+        if (!string.IsNullOrEmpty(node.Extra)
+            && JsonUtils.ParseJson(node.Extra) is JsonObject extra
+            && extra.TryGetPropertyValue("downloadSettings", out var dsNode)
+            && dsNode is JsonObject downloadSettings
+            && downloadSettings.TryGetPropertyValue("address", out var dAddrNode)
+            && dAddrNode is JsonValue dAddrValue
+            && dAddrValue.TryGetValue(out string? dAddr)
+            && !string.IsNullOrEmpty(dAddr)
+            && Utils.IsDomain(dAddr))
+        {
+            context.ProtectDomainList.Add(dAddr);
+        }
+
+        return nodeValidatorResult;
+    }
+
+    /// <summary>
+    /// Entry point for registering a group node. Initialises the visited/ancestor sets
+    /// and delegates to <see cref="TraverseGroupNodeAsync"/>.
+    /// </summary>
+    private static async Task<NodeValidatorResult> RegisterGroupNodeAsync(CoreConfigContext context,
+        ProfileItem node)
+    {
+        if (!node.ConfigType.IsGroupType())
+        {
+            return NodeValidatorResult.Empty();
+        }
+
+        HashSet<string> ancestors = [node.IndexId];
+        HashSet<string> globalVisited = [node.IndexId];
+        return await TraverseGroupNodeAsync(context, node, globalVisited, ancestors);
+    }
+
+    /// <summary>
+    /// Recursively walks the children of a group node, registering valid leaf nodes
+    /// and nested groups. Detects cycles via <paramref name="ancestorsGroup"/> and
+    /// deduplicates shared nodes via <paramref name="globalVisitedGroup"/>.
+    /// </summary>
+    private static async Task<NodeValidatorResult> TraverseGroupNodeAsync(
+        CoreConfigContext context,
+        ProfileItem node,
+        HashSet<string> globalVisitedGroup,
+        HashSet<string> ancestorsGroup)
+    {
+        var (groupChildList, _) = await GroupProfileManager.GetChildProfileItems(node);
+        List<string> childIndexIdList = [];
+        var childNodeValidatorResult = NodeValidatorResult.Empty();
+        foreach (var childNode in groupChildList)
+        {
+            if (ancestorsGroup.Contains(childNode.IndexId))
+            {
+                childNodeValidatorResult.Errors.Add(
+                    string.Format(ResUI.MsgGroupCycleDependency, node.Remarks, childNode.Remarks));
+                continue;
+            }
+
+            if (globalVisitedGroup.Contains(childNode.IndexId))
+            {
+                childIndexIdList.Add(childNode.IndexId);
+                continue;
+            }
+
+            if (!childNode.ConfigType.IsGroupType())
+            {
+                var childNodeResult = RegisterSingleNodeAsync(context, childNode);
+                childNodeValidatorResult.Warnings.AddRange(childNodeResult.Warnings.Select(w =>
+                    string.Format(ResUI.MsgGroupChildNodeWarning, node.Remarks, childNode.Remarks, w)));
+                childNodeValidatorResult.Errors.AddRange(childNodeResult.Errors.Select(e =>
+                    string.Format(ResUI.MsgGroupChildNodeError, node.Remarks, childNode.Remarks, e)));
+                if (!childNodeResult.Success)
+                {
+                    continue;
+                }
+
+                globalVisitedGroup.Add(childNode.IndexId);
+                childIndexIdList.Add(childNode.IndexId);
+                continue;
+            }
+
+            var newAncestorsGroup = new HashSet<string>(ancestorsGroup) { childNode.IndexId };
+            var childGroupResult =
+                await TraverseGroupNodeAsync(context, childNode, globalVisitedGroup, newAncestorsGroup);
+            childNodeValidatorResult.Warnings.AddRange(childGroupResult.Warnings.Select(w =>
+                string.Format(ResUI.MsgGroupChildGroupNodeWarning, node.Remarks, childNode.Remarks, w)));
+            childNodeValidatorResult.Errors.AddRange(childGroupResult.Errors.Select(e =>
+                string.Format(ResUI.MsgGroupChildGroupNodeError, node.Remarks, childNode.Remarks, e)));
+            if (!childGroupResult.Success)
+            {
+                continue;
+            }
+
+            globalVisitedGroup.Add(childNode.IndexId);
+            childIndexIdList.Add(childNode.IndexId);
+        }
+
+        if (childIndexIdList.Count == 0)
+        {
+            childNodeValidatorResult.Errors.Add(string.Format(ResUI.MsgGroupNoValidChildNode, node.Remarks));
+            return childNodeValidatorResult;
+        }
+        else
+        {
+            childNodeValidatorResult.Warnings.AddRange(childNodeValidatorResult.Errors);
+            childNodeValidatorResult.Errors.Clear();
+        }
+
+        node.SetProtocolExtra(node.GetProtocolExtra() with { ChildItems = Utils.List2String(childIndexIdList), });
+        context.AllProxiesMap[node.IndexId] = node;
+        return childNodeValidatorResult;
+    }
+}
@@ -0,0 +1,185 @@
+namespace ServiceLib.Handler.Builder;
+
+public record NodeValidatorResult(List<string> Errors, List<string> Warnings)
+{
+    public bool Success => Errors.Count == 0;
+
+    public static NodeValidatorResult Empty()
+    {
+        return new NodeValidatorResult([], []);
+    }
+}
+
+public class NodeValidator
+{
+    // Static validator rules
+    private static readonly HashSet<string> SingboxUnsupportedTransports =
+        [nameof(ETransport.kcp), nameof(ETransport.xhttp)];
+
+    private static readonly HashSet<EConfigType> SingboxTransportSupportedProtocols =
+        [EConfigType.VMess, EConfigType.VLESS, EConfigType.Trojan, EConfigType.Shadowsocks];
+
+    private static readonly HashSet<string> SingboxShadowsocksAllowedTransports =
+        [nameof(ETransport.tcp), nameof(ETransport.ws), nameof(ETransport.quic)];
+
+    public static NodeValidatorResult Validate(ProfileItem item, ECoreType coreType)
+    {
+        var v = new ValidationContext();
+        ValidateNodeAndCoreSupport(item, coreType, v);
+        return v.ToResult();
+    }
+
+    private class ValidationContext
+    {
+        public List<string> Errors { get; } = [];
+        public List<string> Warnings { get; } = [];
+
+        public void Error(string message)
+        {
+            Errors.Add(message);
+        }
+
+        public void Warning(string message)
+        {
+            Warnings.Add(message);
+        }
+
+        public void Assert(bool condition, string errorMsg)
+        {
+            if (!condition)
+            {
+                Error(errorMsg);
+            }
+        }
+
+        public NodeValidatorResult ToResult()
+        {
+            return new NodeValidatorResult(Errors, Warnings);
+        }
+    }
+
+    private static void ValidateNodeAndCoreSupport(ProfileItem item, ECoreType coreType, ValidationContext v)
+    {
+        if (item.ConfigType is EConfigType.Custom)
+        {
+            return;
+        }
+
+        if (item.ConfigType.IsGroupType())
+        {
+            // Group logic is handled in ValidateGroupNode
+            return;
+        }
+
+        // Basic Property Validation
+        v.Assert(!item.Address.IsNullOrEmpty(), string.Format(ResUI.MsgInvalidProperty, "Address"));
+        v.Assert(item.Port is > 0 and <= 65535, string.Format(ResUI.MsgInvalidProperty, "Port"));
+
+        // Network & Core Logic
+        var net = item.GetNetwork();
+        if (coreType == ECoreType.sing_box)
+        {
+            var transportError = ValidateSingboxTransport(item.ConfigType, net);
+            if (transportError != null)
+            {
+                v.Error(transportError);
+            }
+
+            if (!Global.SingboxSupportConfigType.Contains(item.ConfigType))
+            {
+                v.Error(string.Format(ResUI.MsgCoreNotSupportProtocol, nameof(ECoreType.sing_box), item.ConfigType));
+            }
+        }
+        else if (coreType is ECoreType.Xray)
+        {
+            if (!Global.XraySupportConfigType.Contains(item.ConfigType))
+            {
+                v.Error(string.Format(ResUI.MsgCoreNotSupportProtocol, nameof(ECoreType.Xray), item.ConfigType));
+            }
+        }
+
+        // Protocol Specifics
+        var protocolExtra = item.GetProtocolExtra();
+        switch (item.ConfigType)
+        {
+            case EConfigType.VMess:
+                v.Assert(!item.Password.IsNullOrEmpty() && Utils.IsGuidByParse(item.Password),
+                    string.Format(ResUI.MsgInvalidProperty, "Password"));
+                break;
+
+            case EConfigType.VLESS:
+                v.Assert(
+                    !item.Password.IsNullOrEmpty()
+                    && (Utils.IsGuidByParse(item.Password) || item.Password.Length <= 30),
+                    string.Format(ResUI.MsgInvalidProperty, "Password")
+                );
+                v.Assert(Global.Flows.Contains(protocolExtra.Flow ?? string.Empty),
+                    string.Format(ResUI.MsgInvalidProperty, "Flow"));
+                break;
+
+            case EConfigType.Shadowsocks:
+                v.Assert(!item.Password.IsNullOrEmpty(), string.Format(ResUI.MsgInvalidProperty, "Password"));
+                v.Assert(
+                    !string.IsNullOrEmpty(protocolExtra.SsMethod) &&
+                    Global.SsSecuritiesInSingbox.Contains(protocolExtra.SsMethod),
+                    string.Format(ResUI.MsgInvalidProperty, "SsMethod"));
+                break;
+        }
+
+        // TLS & Security
+        if (item.StreamSecurity == Global.StreamSecurity)
+        {
+            if (!item.Cert.IsNullOrEmpty() && CertPemManager.ParsePemChain(item.Cert).Count == 0 &&
+                !item.CertSha.IsNullOrEmpty())
+            {
+                v.Error(string.Format(ResUI.MsgInvalidProperty, "TLS Certificate"));
+            }
+        }
+
+        if (item.StreamSecurity == Global.StreamSecurityReality)
+        {
+            v.Assert(!item.PublicKey.IsNullOrEmpty(), string.Format(ResUI.MsgInvalidProperty, "PublicKey"));
+        }
+
+        if (item.Network == nameof(ETransport.xhttp) && !item.Extra.IsNullOrEmpty())
+        {
+            if (JsonUtils.ParseJson(item.Extra) is not JsonObject)
+            {
+                v.Error(string.Format(ResUI.MsgInvalidProperty, "XHTTP Extra"));
+            }
+        }
+
+        if (!item.Finalmask.IsNullOrEmpty())
+        {
+            if (JsonUtils.ParseJson(item.Finalmask) is not JsonObject)
+            {
+                v.Error(string.Format(ResUI.MsgInvalidProperty, "Finalmask"));
+            }
+        }
+    }
+
+    private static string? ValidateSingboxTransport(EConfigType configType, string net)
+    {
+        // sing-box does not support xhttp / kcp transports
+        if (SingboxUnsupportedTransports.Contains(net))
+        {
+            return string.Format(ResUI.MsgCoreNotSupportNetwork, nameof(ECoreType.sing_box), net);
+        }
+
+        // sing-box does not support non-tcp transports for protocols other than vmess/trojan/vless/shadowsocks
+        if (!SingboxTransportSupportedProtocols.Contains(configType) && net != nameof(ETransport.tcp))
+        {
+            return string.Format(ResUI.MsgCoreNotSupportProtocolTransport,
+                nameof(ECoreType.sing_box), configType.ToString(), net);
+        }
+
+        // sing-box shadowsocks only supports tcp/ws/quic transports
+        if (configType == EConfigType.Shadowsocks && !SingboxShadowsocksAllowedTransports.Contains(net))
+        {
+            return string.Format(ResUI.MsgCoreNotSupportProtocolTransport,
+                nameof(ECoreType.sing_box), configType.ToString(), net);
+        }
+
+        return null;
+    }
+}
@@ -1,197 +0,0 @@
-using static ServiceLib.Models.ClashProxies;
-
-namespace ServiceLib.Handler
-{
-    public sealed class ClashApiHandler
-    {
-        private static readonly Lazy<ClashApiHandler> instance = new(() => new());
-        public static ClashApiHandler Instance => instance.Value;
-
-        private Dictionary<string, ProxiesItem>? _proxies;
-        public Dictionary<string, object> ProfileContent { get; set; }
-        private static readonly string _tag = "ClashApiHandler";
-
-        public async Task<Tuple<ClashProxies, ClashProviders>?> GetClashProxiesAsync(Config config)
-        {
-            for (var i = 0; i < 5; i++)
-            {
-                var url = $"{GetApiUrl()}/proxies";
-                var result = await HttpClientHelper.Instance.TryGetAsync(url);
-                var clashProxies = JsonUtils.Deserialize<ClashProxies>(result);
-
-                var url2 = $"{GetApiUrl()}/providers/proxies";
-                var result2 = await HttpClientHelper.Instance.TryGetAsync(url2);
-                var clashProviders = JsonUtils.Deserialize<ClashProviders>(result2);
-
-                if (clashProxies != null || clashProviders != null)
-                {
-                    _proxies = clashProxies?.proxies;
-                    return new Tuple<ClashProxies, ClashProviders>(clashProxies, clashProviders);
-                }
-
-                await Task.Delay(2000);
-            }
-
-            return null;
-        }
-
-        public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Action<ClashProxyModel?, string> updateFunc)
-        {
-            Task.Run(() =>
-            {
-                if (blAll)
-                {
-                    for (var i = 0; i < 5; i++)
-                    {
-                        if (_proxies != null)
-                        {
-                            break;
-                        }
-                        Task.Delay(5000).Wait();
-                    }
-                    if (_proxies == null)
-                    {
-                        return;
-                    }
-                    lstProxy = new List<ClashProxyModel>();
-                    foreach (KeyValuePair<string, ProxiesItem> kv in _proxies)
-                    {
-                        if (Global.notAllowTestType.Contains(kv.Value.type.ToLower()))
-                        {
-                            continue;
-                        }
-                        lstProxy.Add(new ClashProxyModel()
-                        {
-                            Name = kv.Value.name,
-                            Type = kv.Value.type.ToLower(),
-                        });
-                    }
-                }
-
-                if (lstProxy == null)
-                {
-                    return;
-                }
-                var urlBase = $"{GetApiUrl()}/proxies";
-                urlBase += @"/{0}/delay?timeout=10000&url=" + AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
-
-                var tasks = new List<Task>();
-                foreach (var it in lstProxy)
-                {
-                    if (Global.notAllowTestType.Contains(it.Type.ToLower()))
-                    {
-                        continue;
-                    }
-                    var name = it.Name;
-                    var url = string.Format(urlBase, name);
-                    tasks.Add(Task.Run(async () =>
-                    {
-                        var result = await HttpClientHelper.Instance.TryGetAsync(url);
-                        updateFunc?.Invoke(it, result);
-                    }));
-                }
-                Task.WaitAll(tasks.ToArray());
-
-                Task.Delay(1000).Wait();
-                updateFunc?.Invoke(null, "");
-            });
-        }
-
-        public List<ProxiesItem>? GetClashProxyGroups()
-        {
-            try
-            {
-                var fileContent = ProfileContent;
-                if (fileContent is null || fileContent?.ContainsKey("proxy-groups") == false)
-                {
-                    return null;
-                }
-                return JsonUtils.Deserialize<List<ProxiesItem>>(JsonUtils.Serialize(fileContent["proxy-groups"]));
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-                return null;
-            }
-        }
-
-        public async Task ClashSetActiveProxy(string name, string nameNode)
-        {
-            try
-            {
-                var url = $"{GetApiUrl()}/proxies/{name}";
-                var headers = new Dictionary<string, string>();
-                headers.Add("name", nameNode);
-                await HttpClientHelper.Instance.PutAsync(url, headers);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-        }
-
-        public async Task ClashConfigUpdate(Dictionary<string, string> headers)
-        {
-            if (_proxies == null)
-            {
-                return;
-            }
-
-            var urlBase = $"{GetApiUrl()}/configs";
-
-            await HttpClientHelper.Instance.PatchAsync(urlBase, headers);
-        }
-
-        public async Task ClashConfigReload(string filePath)
-        {
-            await ClashConnectionClose("");
-            try
-            {
-                var url = $"{GetApiUrl()}/configs?force=true";
-                var headers = new Dictionary<string, string>();
-                headers.Add("path", filePath);
-                await HttpClientHelper.Instance.PutAsync(url, headers);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-        }
-
-        public async Task<ClashConnections?> GetClashConnectionsAsync(Config config)
-        {
-            try
-            {
-                var url = $"{GetApiUrl()}/connections";
-                var result = await HttpClientHelper.Instance.TryGetAsync(url);
-                var clashConnections = JsonUtils.Deserialize<ClashConnections>(result);
-
-                return clashConnections;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-
-            return null;
-        }
-
-        public async Task ClashConnectionClose(string id)
-        {
-            try
-            {
-                var url = $"{GetApiUrl()}/connections/{id}";
-                await HttpClientHelper.Instance.DeleteAsync(url);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-        }
-
-        private string GetApiUrl()
-        {
-            return $"{Global.HttpProtocol}{Global.Loopback}:{AppHandler.Instance.StatePort2}";
-        }
-    }
-}
@@ -0,0 +1,98 @@
+namespace ServiceLib.Handler;
+
+public static class ConnectionHandler
+{
+    private static readonly string _tag = "ConnectionHandler";
+
+    public static async Task<string> RunAvailabilityCheck()
+    {
+        var time = await GetRealPingTimeInfo();
+        var ip = time > 0 ? await GetIPInfo() ?? Global.None : Global.None;
+
+        return string.Format(ResUI.TestMeOutput, time, ip);
+    }
+
+    private static async Task<string?> GetIPInfo()
+    {
+        var url = AppManager.Instance.Config.SpeedTestItem.IPAPIUrl;
+        if (url.IsNullOrEmpty())
+        {
+            return null;
+        }
+
+        var downloadHandle = new DownloadService();
+        var result = await downloadHandle.TryDownloadString(url, true, "");
+        if (result == null)
+        {
+            return null;
+        }
+
+        var ipInfo = JsonUtils.Deserialize<IPAPIInfo>(result);
+        if (ipInfo == null)
+        {
+            return null;
+        }
+
+        var ip = ipInfo.ip ?? ipInfo.clientIp ?? ipInfo.ip_addr ?? ipInfo.query;
+        var country = ipInfo.country_code ?? ipInfo.country ?? ipInfo.countryCode ?? ipInfo.location?.country_code;
+
+        return $"({country ?? "unknown"}) {ip}";
+    }
+
+    private static async Task<int> GetRealPingTimeInfo()
+    {
+        var responseTime = -1;
+        try
+        {
+            var port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
+            var webProxy = new WebProxy($"socks5://{Global.Loopback}:{port}");
+            var url = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
+
+            for (var i = 0; i < 2; i++)
+            {
+                responseTime = await GetRealPingTime(url, webProxy, 10);
+                if (responseTime > 0)
+                {
+                    break;
+                }
+                await Task.Delay(500);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            return -1;
+        }
+        return responseTime;
+    }
+
+    public static async Task<int> GetRealPingTime(string url, IWebProxy? webProxy, int downloadTimeout)
+    {
+        var responseTime = -1;
+        try
+        {
+            using var cts = new CancellationTokenSource();
+            cts.CancelAfter(TimeSpan.FromSeconds(downloadTimeout));
+            using var client = new HttpClient(new SocketsHttpHandler()
+            {
+                Proxy = webProxy,
+                UseProxy = webProxy != null
+            });
+
+            List<int> oneTime = new();
+            for (var i = 0; i < 2; i++)
+            {
+                var timer = Stopwatch.StartNew();
+                await client.GetAsync(url, cts.Token).ConfigureAwait(false);
+                timer.Stop();
+                oneTime.Add((int)timer.Elapsed.TotalMilliseconds);
+                await Task.Delay(100);
+            }
+            responseTime = oneTime.Where(x => x > 0).OrderBy(x => x).FirstOrDefault();
+        }
+        catch
+        {
+        }
+        return responseTime;
+    }
+}
@@ -1,132 +1,151 @@
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+/// <summary>
+/// Core configuration file processing class
+/// </summary>
+public static class CoreConfigHandler
 {
-    /// <summary>
-    /// Core configuration file processing class
-    /// </summary>
-    public class CoreConfigHandler
+    private static readonly string _tag = "CoreConfigHandler";
+
+    public static async Task<RetResult> GenerateClientConfig(CoreConfigContext context, string? fileName)
    {
-        private static readonly string _tag = "CoreConfigHandler";
+        var config = AppManager.Instance.Config;
+        var result = new RetResult();
+        var node = context.Node;

-        public static async Task<RetResult> GenerateClientConfig(ProfileItem node, string? fileName)
+        if (node.ConfigType == EConfigType.Custom)
        {
-            var config = AppHandler.Instance.Config;
-            var result = new RetResult();
-
-            if (node.ConfigType == EConfigType.Custom)
+            result = node.CoreType switch
            {
-                result = node.CoreType switch
-                {
-                    ECoreType.mihomo => await new CoreConfigClashService(config).GenerateClientCustomConfig(node, fileName),
-                    ECoreType.sing_box => await new CoreConfigSingboxService(config).GenerateClientCustomConfig(node, fileName),
-                    _ => await GenerateClientCustomConfig(node, fileName)
-                };
-            }
-            else if (AppHandler.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
-            {
-                result = await new CoreConfigSingboxService(config).GenerateClientConfigContent(node);
-            }
-            else
-            {
-                result = await new CoreConfigV2rayService(config).GenerateClientConfigContent(node);
-            }
-            if (result.Success != true)
-            {
-                return result;
-            }
-            if (Utils.IsNotEmpty(fileName) && result.Data != null)
-            {
-                await File.WriteAllTextAsync(fileName, result.Data.ToString());
-            }
-
+                ECoreType.mihomo => await new CoreConfigClashService(config).GenerateClientCustomConfig(node, fileName),
+                _ => await GenerateClientCustomConfig(node, fileName)
+            };
+        }
+        else if (context.RunCoreType == ECoreType.sing_box)
+        {
+            result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
+        }
+        else
+        {
+            result = new CoreConfigV2rayService(context).GenerateClientConfigContent();
+        }
+        if (result.Success != true)
+        {
            return result;
        }
-
-        private static async Task<RetResult> GenerateClientCustomConfig(ProfileItem node, string? fileName)
+        if (fileName.IsNotEmpty() && result.Data != null)
        {
-            var ret = new RetResult();
-            try
+            await File.WriteAllTextAsync(fileName, result.Data.ToString());
+        }
+
+        return result;
+    }
+
+    private static async Task<RetResult> GenerateClientCustomConfig(ProfileItem node, string? fileName)
+    {
+        var ret = new RetResult();
+        try
+        {
+            if (node == null || fileName is null)
            {
-                if (node == null || fileName is null)
-                {
-                    ret.Msg = ResUI.CheckServerSettings;
-                    return ret;
-                }
-
-                if (File.Exists(fileName))
-                {
-                    File.SetAttributes(fileName, FileAttributes.Normal); //If the file has a read-only attribute, direct deletion will fail
-                    File.Delete(fileName);
-                }
-
-                string addressFileName = node.Address;
-                if (!File.Exists(addressFileName))
-                {
-                    addressFileName = Utils.GetConfigPath(addressFileName);
-                }
-                if (!File.Exists(addressFileName))
-                {
-                    ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                    return ret;
-                }
-                File.Copy(addressFileName, fileName);
-                File.SetAttributes(fileName, FileAttributes.Normal); //Copy will keep the attributes of addressFileName, so we need to add write permissions to fileName just in case of addressFileName is a read-only file.
-
-                //check again
-                if (!File.Exists(fileName))
-                {
-                    ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                    return ret;
-                }
-
-                ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
-                ret.Success = true;
-                return await Task.FromResult(ret);
+                ret.Msg = ResUI.CheckServerSettings;
+                return ret;
            }
-            catch (Exception ex)
+
+            if (File.Exists(fileName))
+            {
+                File.SetAttributes(fileName, FileAttributes.Normal); //If the file has a read-only attribute, direct deletion will fail
+                File.Delete(fileName);
+            }
+
+            var addressFileName = node.Address;
+            if (!File.Exists(addressFileName))
+            {
+                addressFileName = Utils.GetConfigPath(addressFileName);
+            }
+            if (!File.Exists(addressFileName))
            {
-                Logging.SaveLog(_tag, ex);
                ret.Msg = ResUI.FailedGenDefaultConfiguration;
                return ret;
            }
+            File.Copy(addressFileName, fileName);
+            File.SetAttributes(fileName, FileAttributes.Normal); //Copy will keep the attributes of addressFileName, so we need to add write permissions to fileName just in case of addressFileName is a read-only file.
+
+            //check again
+            if (!File.Exists(fileName))
+            {
+                ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                return ret;
+            }
+
+            ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
+            ret.Success = true;
+            return await Task.FromResult(ret);
        }
-
-        public static async Task<RetResult> GenerateClientSpeedtestConfig(Config config, string fileName, List<ServerTestItem> selecteds, ECoreType coreType)
+        catch (Exception ex)
        {
-            var result = new RetResult();
-            if (coreType == ECoreType.sing_box)
-            {
-                result = await new CoreConfigSingboxService(config).GenerateClientSpeedtestConfig(selecteds);
-            }
-            else if (coreType == ECoreType.Xray)
-            {
-                result = await new CoreConfigV2rayService(config).GenerateClientSpeedtestConfig(selecteds);
-            }
-            if (result.Success != true)
-            {
-                return result;
-            }
-            await File.WriteAllTextAsync(fileName, result.Data.ToString());
-            return result;
-        }
-
-        public static async Task<RetResult> GenerateClientMultipleLoadConfig(Config config, string fileName, List<ProfileItem> selecteds, ECoreType coreType)
-        {
-            var result = new RetResult();
-            if (coreType == ECoreType.sing_box)
-            {
-                result = await new CoreConfigSingboxService(config).GenerateClientMultipleLoadConfig(selecteds);
-            }
-            else if (coreType == ECoreType.Xray)
-            {
-                result = await new CoreConfigV2rayService(config).GenerateClientMultipleLoadConfig(selecteds);
-            }
-
-            if (result.Success != true)
-            {
-                return result;
-            }
-            await File.WriteAllTextAsync(fileName, result.Data.ToString());
-            return result;
+            Logging.SaveLog(_tag, ex);
+            ret.Msg = ResUI.FailedGenDefaultConfiguration;
+            return ret;
        }
    }
-}
+
+    public static async Task<RetResult> GenerateClientSpeedtestConfig(Config config, string fileName, List<ServerTestItem> selecteds, ECoreType coreType)
+    {
+        var result = new RetResult();
+        var dummyNode = new ProfileItem
+        {
+            CoreType = coreType
+        };
+        var builderResult = await CoreConfigContextBuilder.Build(config, dummyNode);
+        var context = builderResult.Context;
+        foreach (var testItem in selecteds)
+        {
+            var node = testItem.Profile;
+            var (actNode, _) = await CoreConfigContextBuilder.ResolveNodeAsync(context, node, true);
+            if (node.IndexId == actNode.IndexId)
+            {
+                continue;
+            }
+            context.ServerTestItemMap[node.IndexId] = actNode.IndexId;
+        }
+        if (coreType == ECoreType.sing_box)
+        {
+            result = new CoreConfigSingboxService(context).GenerateClientSpeedtestConfig(selecteds);
+        }
+        else if (coreType == ECoreType.Xray)
+        {
+            result = new CoreConfigV2rayService(context).GenerateClientSpeedtestConfig(selecteds);
+        }
+        if (result.Success != true)
+        {
+            return result;
+        }
+        await File.WriteAllTextAsync(fileName, result.Data.ToString());
+        return result;
+    }
+
+    public static async Task<RetResult> GenerateClientSpeedtestConfig(Config config, CoreConfigContext context, ServerTestItem testItem, string fileName)
+    {
+        var result = new RetResult();
+        var initPort = AppManager.Instance.GetLocalPort(EInboundProtocol.speedtest);
+        var port = Utils.GetFreePort(initPort + testItem.QueueNum);
+        testItem.Port = port;
+
+        if (context.RunCoreType == ECoreType.sing_box)
+        {
+            result = new CoreConfigSingboxService(context).GenerateClientSpeedtestConfig(port);
+        }
+        else
+        {
+            result = new CoreConfigV2rayService(context).GenerateClientSpeedtestConfig(port);
+        }
+        if (result.Success != true)
+        {
+            return result;
+        }
+
+        await File.WriteAllTextAsync(fileName, result.Data.ToString());
+        return result;
+    }
+}
@@ -1,381 +0,0 @@
-using System.Diagnostics;
-using System.Text;
-
-namespace ServiceLib.Handler
-{
-    /// <summary>
-    /// Core process processing class
-    /// </summary>
-    public class CoreHandler
-    {
-        private static readonly Lazy<CoreHandler> _instance = new(() => new());
-        public static CoreHandler Instance => _instance.Value;
-        private Config _config;
-        private Process? _process;
-        private Process? _processPre;
-        private int _linuxSudoPid = -1;
-        private Action<bool, string>? _updateFunc;
-        private const string _tag = "CoreHandler";
-
-        public async Task Init(Config config, Action<bool, string> updateFunc)
-        {
-            _config = config;
-            _updateFunc = updateFunc;
-
-            Environment.SetEnvironmentVariable(Global.V2RayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
-            Environment.SetEnvironmentVariable(Global.XrayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
-
-            //Copy the bin folder to the storage location (for init)
-            if (Environment.GetEnvironmentVariable(Global.LocalAppData) == "1")
-            {
-                var fromPath = Utils.GetBaseDirectory("bin");
-                var toPath = Utils.GetBinPath("");
-                if (fromPath != toPath)
-                {
-                    FileManager.CopyDirectory(fromPath, toPath, true, false);
-                }
-            }
-
-            if (Utils.IsNonWindows())
-            {
-                var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
-                foreach (var it in coreInfo)
-                {
-                    if (it.CoreType == ECoreType.v2rayN)
-                    {
-                        if (Utils.UpgradeAppExists(out var upgradeFileName))
-                        {
-                            await Utils.SetLinuxChmod(upgradeFileName);
-                        }
-                        continue;
-                    }
-
-                    foreach (var name in it.CoreExes)
-                    {
-                        var exe = Utils.GetBinPath(Utils.GetExeName(name), it.CoreType.ToString());
-                        if (File.Exists(exe))
-                        {
-                            await Utils.SetLinuxChmod(exe);
-                        }
-                    }
-                }
-            }
-        }
-
-        public async Task LoadCore(ProfileItem? node)
-        {
-            if (node == null)
-            {
-                UpdateFunc(false, ResUI.CheckServerSettings);
-                return;
-            }
-
-            var fileName = Utils.GetConfigPath(Global.CoreConfigFileName);
-            var result = await CoreConfigHandler.GenerateClientConfig(node, fileName);
-            if (result.Success != true)
-            {
-                UpdateFunc(true, result.Msg);
-                return;
-            }
-
-            UpdateFunc(false, $"{node.GetSummary()}");
-            UpdateFunc(false, $"{Utils.GetRuntimeInfo()}");
-            UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
-            await CoreStop();
-            await Task.Delay(100);
-
-            if (Utils.IsWindows() && _config.TunModeItem.EnableTun)
-            {
-                await Task.Delay(100);
-                await WindowsUtils.RemoveTunDevice();
-            }
-
-            await CoreStart(node);
-            await CoreStartPreService(node);
-            if (_process != null)
-            {
-                UpdateFunc(true, $"{node.GetSummary()}");
-            }
-        }
-
-        public async Task<int> LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
-        {
-            var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard) ? ECoreType.sing_box : ECoreType.Xray;
-            var configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
-            var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType);
-            UpdateFunc(false, result.Msg);
-            if (result.Success != true)
-            {
-                return -1;
-            }
-
-            UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
-            UpdateFunc(false, configPath);
-
-            var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
-            var proc = await RunProcess(coreInfo, Global.CoreSpeedtestConfigFileName, true, false);
-            if (proc is null)
-            {
-                return -1;
-            }
-
-            return proc.Id;
-        }
-
-        public async Task CoreStop()
-        {
-            try
-            {
-                if (_process != null)
-                {
-                    await ProcUtils.ProcessKill(_process, true);
-                    _process = null;
-                }
-
-                if (_processPre != null)
-                {
-                    await ProcUtils.ProcessKill(_processPre, true);
-                    _processPre = null;
-                }
-
-                if (_linuxSudoPid > 0)
-                {
-                    await KillProcessAsLinuxSudo();
-                }
-                _linuxSudoPid = -1;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-        }
-
-        #region Private
-
-        private async Task CoreStart(ProfileItem node)
-        {
-            var coreType = _config.RunningCoreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
-            var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
-
-            var displayLog = node.ConfigType != EConfigType.Custom || node.DisplayLog;
-            var proc = await RunProcess(coreInfo, Global.CoreConfigFileName, displayLog, true);
-            if (proc is null)
-            {
-                return;
-            }
-            _process = proc;
-        }
-
-        private async Task CoreStartPreService(ProfileItem node)
-        {
-            if (_process != null && !_process.HasExited)
-            {
-                var coreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
-                var itemSocks = await ConfigHandler.GetPreSocksItem(_config, node, coreType);
-                if (itemSocks != null)
-                {
-                    var preCoreType = itemSocks.CoreType ?? ECoreType.sing_box;
-                    var fileName = Utils.GetConfigPath(Global.CorePreConfigFileName);
-                    var result = await CoreConfigHandler.GenerateClientConfig(itemSocks, fileName);
-                    if (result.Success)
-                    {
-                        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(preCoreType);
-                        var proc = await RunProcess(coreInfo, Global.CorePreConfigFileName, true, true);
-                        if (proc is null)
-                        {
-                            return;
-                        }
-                        _processPre = proc;
-                    }
-                }
-            }
-        }
-
-        private void UpdateFunc(bool notify, string msg)
-        {
-            _updateFunc?.Invoke(notify, msg);
-        }
-
-        private bool IsNeedSudo(ECoreType eCoreType)
-        {
-            return _config.TunModeItem.EnableTun
-                   && eCoreType == ECoreType.sing_box
-                   && (Utils.IsNonWindows())
-                //&& _config.TunModeItem.LinuxSudoPwd.IsNotEmpty()
-                ;
-        }
-
-        #endregion Private
-
-        #region Process
-
-        private async Task<Process?> RunProcess(CoreInfo? coreInfo, string configPath, bool displayLog, bool mayNeedSudo)
-        {
-            var fileName = CoreInfoHandler.Instance.GetCoreExecFile(coreInfo, out var msg);
-            if (Utils.IsNullOrEmpty(fileName))
-            {
-                UpdateFunc(false, msg);
-                return null;
-            }
-
-            try
-            {
-                Process proc = new()
-                {
-                    StartInfo = new()
-                    {
-                        FileName = fileName,
-                        Arguments = string.Format(coreInfo.Arguments, coreInfo.AbsolutePath ? Utils.GetConfigPath(configPath) : configPath),
-                        WorkingDirectory = Utils.GetConfigPath(),
-                        UseShellExecute = false,
-                        RedirectStandardOutput = displayLog,
-                        RedirectStandardError = displayLog,
-                        CreateNoWindow = true,
-                        StandardOutputEncoding = displayLog ? Encoding.UTF8 : null,
-                        StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
-                    }
-                };
-
-                var isNeedSudo = mayNeedSudo && IsNeedSudo(coreInfo.CoreType);
-                if (isNeedSudo)
-                {
-                    await RunProcessAsLinuxSudo(proc, fileName, coreInfo, configPath);
-                }
-
-                if (displayLog)
-                {
-                    proc.OutputDataReceived += (sender, e) =>
-                    {
-                        if (Utils.IsNullOrEmpty(e.Data))
-                            return;
-                        UpdateFunc(false, e.Data + Environment.NewLine);
-                    };
-                    proc.ErrorDataReceived += (sender, e) =>
-                    {
-                        if (Utils.IsNullOrEmpty(e.Data))
-                            return;
-                        UpdateFunc(false, e.Data + Environment.NewLine);
-                    };
-                }
-                proc.Start();
-
-                if (isNeedSudo && _config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
-                {
-                    var pwd = DesUtils.Decrypt(_config.TunModeItem.LinuxSudoPwd);
-                    await Task.Delay(10);
-                    await proc.StandardInput.WriteLineAsync(pwd);
-                    await Task.Delay(10);
-                    await proc.StandardInput.WriteLineAsync(pwd);
-                }
-                if (isNeedSudo)
-                    _linuxSudoPid = proc.Id;
-
-                if (displayLog)
-                {
-                    proc.BeginOutputReadLine();
-                    proc.BeginErrorReadLine();
-                }
-
-                await Task.Delay(500);
-                AppHandler.Instance.AddProcess(proc.Handle);
-                if (proc is null or { HasExited: true })
-                {
-                    throw new Exception(ResUI.FailedToRunCore);
-                }
-                return proc;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-                UpdateFunc(mayNeedSudo, ex.Message);
-                return null;
-            }
-        }
-
-        #endregion Process
-
-        #region Linux
-
-        private async Task RunProcessAsLinuxSudo(Process proc, string fileName, CoreInfo coreInfo, string configPath)
-        {
-            var cmdLine = $"{fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetConfigPath(configPath).AppendQuotes())}";
-
-            var shFilePath = await CreateLinuxShellFile(cmdLine, "run_as_sudo.sh");
-            proc.StartInfo.FileName = shFilePath;
-            proc.StartInfo.Arguments = "";
-            proc.StartInfo.WorkingDirectory = "";
-            if (_config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
-            {
-                proc.StartInfo.StandardInputEncoding = Encoding.UTF8;
-                proc.StartInfo.RedirectStandardInput = true;
-            }
-        }
-
-        private async Task KillProcessAsLinuxSudo()
-        {
-            var cmdLine = $"kill {_linuxSudoPid}";
-            var shFilePath = await CreateLinuxShellFile(cmdLine, "kill_as_sudo.sh");
-            Process proc = new()
-            {
-                StartInfo = new()
-                {
-                    FileName = shFilePath,
-                    UseShellExecute = false,
-                    CreateNoWindow = true,
-                    StandardInputEncoding = Encoding.UTF8,
-                    RedirectStandardInput = true
-                }
-            };
-            proc.Start();
-
-            if (_config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
-            {
-                try
-                {
-                    var pwd = DesUtils.Decrypt(_config.TunModeItem.LinuxSudoPwd);
-                    await Task.Delay(10);
-                    await proc.StandardInput.WriteLineAsync(pwd);
-                    await Task.Delay(10);
-                    await proc.StandardInput.WriteLineAsync(pwd);
-                }
-                catch (Exception)
-                {
-                    // ignored
-                }
-            }
-
-            var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-            await proc.WaitForExitAsync(timeout.Token);
-            await Task.Delay(3000);
-        }
-
-        private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)
-        {
-            //Shell scripts
-            var shFilePath = Utils.GetBinPath(AppHandler.Instance.IsAdministrator ? "root_" + fileName : fileName);
-            File.Delete(shFilePath);
-            var sb = new StringBuilder();
-            sb.AppendLine("#!/bin/sh");
-            if (AppHandler.Instance.IsAdministrator)
-            {
-                sb.AppendLine($"{cmdLine}");
-            }
-            else if (_config.TunModeItem.LinuxSudoPwd.IsNullOrEmpty())
-            {
-                sb.AppendLine($"pkexec {cmdLine}");
-            }
-            else
-            {
-                sb.AppendLine($"sudo -S {cmdLine}");
-            }
-
-            await File.WriteAllTextAsync(shFilePath, sb.ToString());
-            await Utils.SetLinuxChmod(shFilePath);
-            Logging.SaveLog(shFilePath);
-
-            return shFilePath;
-        }
-
-        #endregion Linux
-    }
-}
@@ -0,0 +1,48 @@
+namespace ServiceLib.Handler.Fmt;
+
+public class AnytlsFmt : BaseFmt
+{
+    public static ProfileItem? Resolve(string str, out string msg)
+    {
+        msg = ResUI.ConfigurationFormatIncorrect;
+
+        var parsedUrl = Utils.TryUri(str);
+        if (parsedUrl == null)
+        {
+            return null;
+        }
+
+        ProfileItem item = new()
+        {
+            ConfigType = EConfigType.Anytls,
+            Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+            Address = parsedUrl.IdnHost,
+            Port = parsedUrl.Port,
+        };
+        var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
+        item.Password = rawUserInfo;
+
+        var query = Utils.ParseQueryString(parsedUrl.Query);
+        ResolveUriQuery(query, ref item);
+
+        return item;
+    }
+
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
+        {
+            return null;
+        }
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+        var pw = item.Password;
+        var dicQuery = new Dictionary<string, string>();
+        ToUriQuery(item, Global.None, ref dicQuery);
+
+        return ToUri(EConfigType.Anytls, item.Address, item.Port, pw, dicQuery, remark);
+    }
+}
@@ -1,240 +1,357 @@
 using System.Collections.Specialized;

-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class BaseFmt
 {
-    public class BaseFmt
+    private static readonly string[] _allowInsecureArray = new[] { "insecure", "allowInsecure", "allow_insecure" };
+
+    protected static string GetIpv6(string address)
    {
-        protected static string GetIpv6(string address)
+        if (Utils.IsIpv6(address))
        {
-            if (Utils.IsIpv6(address))
+            // Check if the address is already surrounded by square brackets, if not, add square brackets
+            return address.StartsWith('[') && address.EndsWith(']') ? address : $"[{address}]";
+        }
+        else
+        {
+            return address;
+        }
+    }
+
+    protected static int ToUriQuery(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
+    {
+        if (item.StreamSecurity.IsNotEmpty())
+        {
+            dicQuery.Add("security", item.StreamSecurity);
+        }
+        else
+        {
+            if (securityDef != null)
            {
-                // 检查地址是否已经被方括号包围，如果没有，则添加方括号
-                return address.StartsWith('[') && address.EndsWith(']') ? address : $"[{address}]";
+                dicQuery.Add("security", securityDef);
            }
-            return address;  // 如果不是IPv6地址，直接返回原地址
+        }
+        if (item.Sni.IsNotEmpty())
+        {
+            dicQuery.Add("sni", Utils.UrlEncode(item.Sni));
+        }
+        if (item.Fingerprint.IsNotEmpty())
+        {
+            dicQuery.Add("fp", Utils.UrlEncode(item.Fingerprint));
+        }
+        if (item.PublicKey.IsNotEmpty())
+        {
+            dicQuery.Add("pbk", Utils.UrlEncode(item.PublicKey));
+        }
+        if (item.ShortId.IsNotEmpty())
+        {
+            dicQuery.Add("sid", Utils.UrlEncode(item.ShortId));
+        }
+        if (item.SpiderX.IsNotEmpty())
+        {
+            dicQuery.Add("spx", Utils.UrlEncode(item.SpiderX));
+        }
+        if (item.Mldsa65Verify.IsNotEmpty())
+        {
+            dicQuery.Add("pqv", Utils.UrlEncode(item.Mldsa65Verify));
        }

-        protected static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
+        if (item.StreamSecurity.Equals(Global.StreamSecurity))
        {
-            if (Utils.IsNotEmpty(item.Flow))
-            {
-                dicQuery.Add("flow", item.Flow);
-            }
-
-            if (Utils.IsNotEmpty(item.StreamSecurity))
-            {
-                dicQuery.Add("security", item.StreamSecurity);
-            }
-            else
-            {
-                if (securityDef != null)
-                {
-                    dicQuery.Add("security", securityDef);
-                }
-            }
-            if (Utils.IsNotEmpty(item.Sni))
-            {
-                dicQuery.Add("sni", item.Sni);
-            }
-            if (Utils.IsNotEmpty(item.Alpn))
+            if (item.Alpn.IsNotEmpty())
            {
                dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
            }
-            if (Utils.IsNotEmpty(item.Fingerprint))
-            {
-                dicQuery.Add("fp", Utils.UrlEncode(item.Fingerprint));
-            }
-            if (Utils.IsNotEmpty(item.PublicKey))
-            {
-                dicQuery.Add("pbk", Utils.UrlEncode(item.PublicKey));
-            }
-            if (Utils.IsNotEmpty(item.ShortId))
-            {
-                dicQuery.Add("sid", Utils.UrlEncode(item.ShortId));
-            }
-            if (Utils.IsNotEmpty(item.SpiderX))
-            {
-                dicQuery.Add("spx", Utils.UrlEncode(item.SpiderX));
-            }
-            if (item.AllowInsecure.Equals("true"))
-            {
-                dicQuery.Add("allowInsecure", "1");
-            }
+            ToUriQueryAllowInsecure(item, ref dicQuery);
+        }
+        if (item.EchConfigList.IsNotEmpty())
+        {
+            dicQuery.Add("ech", Utils.UrlEncode(item.EchConfigList));
+        }
+        if (item.CertSha.IsNotEmpty())
+        {
+            dicQuery.Add("pcs", Utils.UrlEncode(item.CertSha));
+        }
+        if (item.Finalmask.IsNotEmpty())
+        {
+            var node = JsonUtils.ParseJson(item.Finalmask);
+            var finalmask = node != null
+                ? JsonUtils.Serialize(node, new JsonSerializerOptions
+                {
+                    WriteIndented = false,
+                    DefaultIgnoreCondition = JsonIgnoreCondition.Never,
+                    Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+                })
+                : item.Finalmask;
+            dicQuery.Add("fm", Utils.UrlEncode(finalmask));
+        }

-            dicQuery.Add("type", Utils.IsNotEmpty(item.Network) ? item.Network : nameof(ETransport.tcp));
+        dicQuery.Add("type", item.Network.IsNotEmpty() ? item.Network : nameof(ETransport.tcp));

-            switch (item.Network)
-            {
-                case nameof(ETransport.tcp):
-                    dicQuery.Add("headerType", Utils.IsNotEmpty(item.HeaderType) ? item.HeaderType : Global.None);
-                    if (Utils.IsNotEmpty(item.RequestHost))
-                    {
-                        dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
-                    }
-                    break;
+        switch (item.Network)
+        {
+            case nameof(ETransport.tcp):
+                dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
+                if (item.RequestHost.IsNotEmpty())
+                {
+                    dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
+                }
+                break;

-                case nameof(ETransport.kcp):
-                    dicQuery.Add("headerType", Utils.IsNotEmpty(item.HeaderType) ? item.HeaderType : Global.None);
-                    if (Utils.IsNotEmpty(item.Path))
-                    {
-                        dicQuery.Add("seed", Utils.UrlEncode(item.Path));
-                    }
-                    break;
+            case nameof(ETransport.kcp):
+                dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
+                if (item.Path.IsNotEmpty())
+                {
+                    dicQuery.Add("seed", Utils.UrlEncode(item.Path));
+                }
+                break;

-                case nameof(ETransport.ws):
-                case nameof(ETransport.httpupgrade):
-                    if (Utils.IsNotEmpty(item.RequestHost))
-                    {
-                        dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
-                    }
-                    if (Utils.IsNotEmpty(item.Path))
-                    {
-                        dicQuery.Add("path", Utils.UrlEncode(item.Path));
-                    }
-                    break;
+            case nameof(ETransport.ws):
+            case nameof(ETransport.httpupgrade):
+                if (item.RequestHost.IsNotEmpty())
+                {
+                    dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
+                }
+                if (item.Path.IsNotEmpty())
+                {
+                    dicQuery.Add("path", Utils.UrlEncode(item.Path));
+                }
+                break;

-                case nameof(ETransport.xhttp):
-                    if (Utils.IsNotEmpty(item.RequestHost))
-                    {
-                        dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
-                    }
-                    if (Utils.IsNotEmpty(item.Path))
-                    {
-                        dicQuery.Add("path", Utils.UrlEncode(item.Path));
-                    }
-                    if (Utils.IsNotEmpty(item.HeaderType) && Global.XhttpMode.Contains(item.HeaderType))
+            case nameof(ETransport.xhttp):
+                if (item.RequestHost.IsNotEmpty())
+                {
+                    dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
+                }
+                if (item.Path.IsNotEmpty())
+                {
+                    dicQuery.Add("path", Utils.UrlEncode(item.Path));
+                }
+                if (item.HeaderType.IsNotEmpty() && Global.XhttpMode.Contains(item.HeaderType))
+                {
+                    dicQuery.Add("mode", Utils.UrlEncode(item.HeaderType));
+                }
+                if (item.Extra.IsNotEmpty())
+                {
+                    var node = JsonUtils.ParseJson(item.Extra);
+                    var extra = node != null
+                        ? JsonUtils.Serialize(node, new JsonSerializerOptions
+                        {
+                            WriteIndented = false,
+                            DefaultIgnoreCondition = JsonIgnoreCondition.Never,
+                            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+                        })
+                        : item.Extra;
+                    dicQuery.Add("extra", Utils.UrlEncode(extra));
+                }
+                break;
+
+            case nameof(ETransport.http):
+            case nameof(ETransport.h2):
+                dicQuery["type"] = nameof(ETransport.http);
+                if (item.RequestHost.IsNotEmpty())
+                {
+                    dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
+                }
+                if (item.Path.IsNotEmpty())
+                {
+                    dicQuery.Add("path", Utils.UrlEncode(item.Path));
+                }
+                break;
+
+            case nameof(ETransport.quic):
+                dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
+                dicQuery.Add("quicSecurity", Utils.UrlEncode(item.RequestHost));
+                dicQuery.Add("key", Utils.UrlEncode(item.Path));
+                break;
+
+            case nameof(ETransport.grpc):
+                if (item.Path.IsNotEmpty())
+                {
+                    dicQuery.Add("authority", Utils.UrlEncode(item.RequestHost));
+                    dicQuery.Add("serviceName", Utils.UrlEncode(item.Path));
+                    if (item.HeaderType is Global.GrpcGunMode or Global.GrpcMultiMode)
                    {
                        dicQuery.Add("mode", Utils.UrlEncode(item.HeaderType));
                    }
-                    if (Utils.IsNotEmpty(item.Extra))
-                    {
-                        dicQuery.Add("extra", Utils.UrlEncode(item.Extra));
-                    }
-                    break;
+                }
+                break;
+        }
+        return 0;
+    }

-                case nameof(ETransport.http):
-                case nameof(ETransport.h2):
-                    dicQuery["type"] = nameof(ETransport.http);
-                    if (Utils.IsNotEmpty(item.RequestHost))
-                    {
-                        dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
-                    }
-                    if (Utils.IsNotEmpty(item.Path))
-                    {
-                        dicQuery.Add("path", Utils.UrlEncode(item.Path));
-                    }
-                    break;
+    protected static int ToUriQueryLite(ProfileItem item, ref Dictionary<string, string> dicQuery)
+    {
+        if (item.Sni.IsNotEmpty())
+        {
+            dicQuery.Add("sni", Utils.UrlEncode(item.Sni));
+        }
+        if (item.Alpn.IsNotEmpty())
+        {
+            dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
+        }

-                case nameof(ETransport.quic):
-                    dicQuery.Add("headerType", Utils.IsNotEmpty(item.HeaderType) ? item.HeaderType : Global.None);
-                    dicQuery.Add("quicSecurity", Utils.UrlEncode(item.RequestHost));
-                    dicQuery.Add("key", Utils.UrlEncode(item.Path));
-                    break;
+        ToUriQueryAllowInsecure(item, ref dicQuery);

-                case nameof(ETransport.grpc):
-                    if (Utils.IsNotEmpty(item.Path))
+        return 0;
+    }
+
+    private static int ToUriQueryAllowInsecure(ProfileItem item, ref Dictionary<string, string> dicQuery)
+    {
+        if (item.AllowInsecure.Equals(Global.AllowInsecure.First()))
+        {
+            // Add two for compatibility
+            dicQuery.Add("insecure", "1");
+            dicQuery.Add("allowInsecure", "1");
+        }
+        else
+        {
+            dicQuery.Add("insecure", "0");
+            dicQuery.Add("allowInsecure", "0");
+        }
+
+        return 0;
+    }
+
+    protected static int ResolveUriQuery(NameValueCollection query, ref ProfileItem item)
+    {
+        item.StreamSecurity = GetQueryValue(query, "security");
+        item.Sni = GetQueryValue(query, "sni");
+        item.Alpn = GetQueryDecoded(query, "alpn");
+        item.Fingerprint = GetQueryDecoded(query, "fp");
+        item.PublicKey = GetQueryDecoded(query, "pbk");
+        item.ShortId = GetQueryDecoded(query, "sid");
+        item.SpiderX = GetQueryDecoded(query, "spx");
+        item.Mldsa65Verify = GetQueryDecoded(query, "pqv");
+        item.EchConfigList = GetQueryDecoded(query, "ech");
+        item.CertSha = GetQueryDecoded(query, "pcs");
+
+        var finalmaskDecoded = GetQueryDecoded(query, "fm");
+        if (finalmaskDecoded.IsNotEmpty())
+        {
+            var node = JsonUtils.ParseJson(finalmaskDecoded);
+            item.Finalmask = node != null
+                ? JsonUtils.Serialize(node, new JsonSerializerOptions
+                {
+                    WriteIndented = true,
+                    DefaultIgnoreCondition = JsonIgnoreCondition.Never,
+                    Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+                })
+                : finalmaskDecoded;
+        }
+        else
+        {
+            item.Finalmask = string.Empty;
+        }
+
+        if (_allowInsecureArray.Any(k => GetQueryDecoded(query, k) == "1"))
+        {
+            item.AllowInsecure = Global.AllowInsecure.First();
+        }
+        else if (_allowInsecureArray.Any(k => GetQueryDecoded(query, k) == "0"))
+        {
+            item.AllowInsecure = Global.AllowInsecure.Skip(1).First();
+        }
+        else
+        {
+            item.AllowInsecure = string.Empty;
+        }
+
+        item.Network = GetQueryValue(query, "type", nameof(ETransport.tcp));
+        switch (item.Network)
+        {
+            case nameof(ETransport.tcp):
+                item.HeaderType = GetQueryValue(query, "headerType", Global.None);
+                item.RequestHost = GetQueryDecoded(query, "host");
+                break;
+
+            case nameof(ETransport.kcp):
+                item.HeaderType = GetQueryValue(query, "headerType", Global.None);
+                item.Path = GetQueryDecoded(query, "seed");
+                break;
+
+            case nameof(ETransport.ws):
+            case nameof(ETransport.httpupgrade):
+                item.RequestHost = GetQueryDecoded(query, "host");
+                item.Path = GetQueryDecoded(query, "path", "/");
+                break;
+
+            case nameof(ETransport.xhttp):
+                item.RequestHost = GetQueryDecoded(query, "host");
+                item.Path = GetQueryDecoded(query, "path", "/");
+                item.HeaderType = GetQueryDecoded(query, "mode");
+                var extraDecoded = GetQueryDecoded(query, "extra");
+                if (extraDecoded.IsNotEmpty())
+                {
+                    var node = JsonUtils.ParseJson(extraDecoded);
+                    if (node != null)
                    {
-                        dicQuery.Add("authority", Utils.UrlEncode(item.RequestHost));
-                        dicQuery.Add("serviceName", Utils.UrlEncode(item.Path));
-                        if (item.HeaderType is Global.GrpcGunMode or Global.GrpcMultiMode)
+                        extraDecoded = JsonUtils.Serialize(node, new JsonSerializerOptions
                        {
-                            dicQuery.Add("mode", Utils.UrlEncode(item.HeaderType));
-                        }
+                            WriteIndented = true,
+                            DefaultIgnoreCondition = JsonIgnoreCondition.Never,
+                            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+                        });
                    }
-                    break;
-            }
-            return 0;
+                }
+                item.Extra = extraDecoded;
+                break;
+
+            case nameof(ETransport.http):
+            case nameof(ETransport.h2):
+                item.Network = nameof(ETransport.h2);
+                item.RequestHost = GetQueryDecoded(query, "host");
+                item.Path = GetQueryDecoded(query, "path", "/");
+                break;
+
+            case nameof(ETransport.quic):
+                item.HeaderType = GetQueryValue(query, "headerType", Global.None);
+                item.RequestHost = GetQueryValue(query, "quicSecurity", Global.None);
+                item.Path = GetQueryDecoded(query, "key");
+                break;
+
+            case nameof(ETransport.grpc):
+                item.RequestHost = GetQueryDecoded(query, "authority");
+                item.Path = GetQueryDecoded(query, "serviceName");
+                item.HeaderType = GetQueryDecoded(query, "mode", Global.GrpcGunMode);
+                break;
+
+            default:
+                break;
        }
+        return 0;
+    }

-        protected static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
-        {
-            item.Flow = query["flow"] ?? "";
-            item.StreamSecurity = query["security"] ?? "";
-            item.Sni = query["sni"] ?? "";
-            item.Alpn = Utils.UrlDecode(query["alpn"] ?? "");
-            item.Fingerprint = Utils.UrlDecode(query["fp"] ?? "");
-            item.PublicKey = Utils.UrlDecode(query["pbk"] ?? "");
-            item.ShortId = Utils.UrlDecode(query["sid"] ?? "");
-            item.SpiderX = Utils.UrlDecode(query["spx"] ?? "");
-            item.AllowInsecure = (query["allowInsecure"] ?? "") == "1" ? "true" : "";
+    protected static bool Contains(string str, params string[] s)
+    {
+        return s.All(item => str.Contains(item, StringComparison.OrdinalIgnoreCase));
+    }

-            item.Network = query["type"] ?? nameof(ETransport.tcp);
-            switch (item.Network)
-            {
-                case nameof(ETransport.tcp):
-                    item.HeaderType = query["headerType"] ?? Global.None;
-                    item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
+    protected static string WriteAllText(string strData, string ext = "json")
+    {
+        var fileName = Utils.GetTempPath($"{Utils.GetGuid(false)}.{ext}");
+        File.WriteAllText(fileName, strData);
+        return fileName;
+    }

-                    break;
+    protected static string ToUri(EConfigType eConfigType, string address, object port, string userInfo, Dictionary<string, string>? dicQuery, string? remark)
+    {
+        var query = dicQuery != null
+            ? ("?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray()))
+            : string.Empty;

-                case nameof(ETransport.kcp):
-                    item.HeaderType = query["headerType"] ?? Global.None;
-                    item.Path = Utils.UrlDecode(query["seed"] ?? "");
-                    break;
+        var url = $"{Utils.UrlEncode(userInfo)}@{GetIpv6(address)}:{port}";
+        return $"{Global.ProtocolShares[eConfigType]}{url}{query}{remark}";
+    }

-                case nameof(ETransport.ws):
-                case nameof(ETransport.httpupgrade):
-                    item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
-                    item.Path = Utils.UrlDecode(query["path"] ?? "/");
-                    break;
+    protected static string GetQueryValue(NameValueCollection query, string key, string defaultValue = "")
+    {
+        return query[key] ?? defaultValue;
+    }

-                case nameof(ETransport.xhttp):
-                    item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
-                    item.Path = Utils.UrlDecode(query["path"] ?? "/");
-                    item.HeaderType = Utils.UrlDecode(query["mode"] ?? "");
-                    item.Extra = Utils.UrlDecode(query["extra"] ?? "");
-                    break;
-
-                case nameof(ETransport.http):
-                case nameof(ETransport.h2):
-                    item.Network = nameof(ETransport.h2);
-                    item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
-                    item.Path = Utils.UrlDecode(query["path"] ?? "/");
-                    break;
-
-                case nameof(ETransport.quic):
-                    item.HeaderType = query["headerType"] ?? Global.None;
-                    item.RequestHost = query["quicSecurity"] ?? Global.None;
-                    item.Path = Utils.UrlDecode(query["key"] ?? "");
-                    break;
-
-                case nameof(ETransport.grpc):
-                    item.RequestHost = Utils.UrlDecode(query["authority"] ?? "");
-                    item.Path = Utils.UrlDecode(query["serviceName"] ?? "");
-                    item.HeaderType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
-                    break;
-
-                default:
-                    break;
-            }
-            return 0;
-        }
-
-        protected static bool Contains(string str, params string[] s)
-        {
-            foreach (var item in s)
-            {
-                if (str.Contains(item, StringComparison.OrdinalIgnoreCase))
-                    return true;
-            }
-            return false;
-        }
-
-        protected static string WriteAllText(string strData, string ext = "json")
-        {
-            var fileName = Utils.GetTempPath($"{Utils.GetGuid(false)}.{ext}");
-            File.WriteAllText(fileName, strData);
-            return fileName;
-        }
-
-        protected static string ToUri(EConfigType eConfigType, string address, object port, string userInfo, Dictionary<string, string>? dicQuery, string? remark)
-        {
-            var query = dicQuery != null
-                ? ("?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray()))
-                : string.Empty;
-
-            var url = $"{Utils.UrlEncode(userInfo)}@{GetIpv6(address)}:{port}";
-            return $"{Global.ProtocolShares[eConfigType]}{url}{query}{remark}";
-        }
+    protected static string GetQueryDecoded(NameValueCollection query, string key, string defaultValue = "")
+    {
+        return Utils.UrlDecode(GetQueryValue(query, key, defaultValue));
    }
 }
@@ -1,23 +1,22 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class ClashFmt : BaseFmt
 {
-    public class ClashFmt : BaseFmt
+    public static ProfileItem? ResolveFull(string strData, string? subRemarks)
    {
-        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+        if (Contains(strData, "rules", "-port", "proxies"))
        {
-            if (Contains(strData, "port", "socks-port", "proxies"))
+            var fileName = WriteAllText(strData, "yaml");
+
+            var profileItem = new ProfileItem
            {
-                var fileName = WriteAllText(strData, "yaml");
-
-                var profileItem = new ProfileItem
-                {
-                    CoreType = ECoreType.mihomo,
-                    Address = fileName,
-                    Remarks = subRemarks ?? "clash_custom"
-                };
-                return profileItem;
-            }
-
-            return null;
+                CoreType = ECoreType.mihomo,
+                Address = fileName,
+                Remarks = subRemarks ?? "clash_custom"
+            };
+            return profileItem;
        }
+
+        return null;
    }
-}
+}
@@ -1,92 +1,103 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class FmtHandler
 {
-    public class FmtHandler
+    private static readonly string _tag = "FmtHandler";
+
+    public static string? GetShareUri(ProfileItem item)
    {
-        private static readonly string _tag = "FmtHandler";
-
-        public static string? GetShareUri(ProfileItem item)
+        try
        {
-            try
+            var url = item.ConfigType switch
            {
-                var url = item.ConfigType switch
-                {
-                    EConfigType.VMess => VmessFmt.ToUri(item),
-                    EConfigType.Shadowsocks => ShadowsocksFmt.ToUri(item),
-                    EConfigType.SOCKS => SocksFmt.ToUri(item),
-                    EConfigType.Trojan => TrojanFmt.ToUri(item),
-                    EConfigType.VLESS => VLESSFmt.ToUri(item),
-                    EConfigType.Hysteria2 => Hysteria2Fmt.ToUri(item),
-                    EConfigType.TUIC => TuicFmt.ToUri(item),
-                    EConfigType.WireGuard => WireguardFmt.ToUri(item),
-                    _ => null,
-                };
+                EConfigType.VMess => VmessFmt.ToUri(item),
+                EConfigType.Shadowsocks => ShadowsocksFmt.ToUri(item),
+                EConfigType.SOCKS => SocksFmt.ToUri(item),
+                EConfigType.Trojan => TrojanFmt.ToUri(item),
+                EConfigType.VLESS => VLESSFmt.ToUri(item),
+                EConfigType.Hysteria2 => Hysteria2Fmt.ToUri(item),
+                EConfigType.TUIC => TuicFmt.ToUri(item),
+                EConfigType.WireGuard => WireguardFmt.ToUri(item),
+                EConfigType.Anytls => AnytlsFmt.ToUri(item),
+                EConfigType.Naive => NaiveFmt.ToUri(item),
+                _ => null,
+            };

-                return url;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-                return "";
-            }
+            return url;
        }
-
-        public static ProfileItem? ResolveConfig(string config, out string msg)
+        catch (Exception ex)
        {
-            msg = ResUI.ConfigurationFormatIncorrect;
+            Logging.SaveLog(_tag, ex);
+            return string.Empty;
+        }
+    }

-            try
+    public static ProfileItem? ResolveConfig(string config, out string msg)
+    {
+        msg = ResUI.ConfigurationFormatIncorrect;
+
+        try
+        {
+            var str = config.TrimEx();
+            if (str.IsNullOrEmpty())
            {
-                string str = config.TrimEx();
-                if (Utils.IsNullOrEmpty(str))
-                {
-                    msg = ResUI.FailedReadConfiguration;
-                    return null;
-                }
-
-                if (str.StartsWith(Global.ProtocolShares[EConfigType.VMess]))
-                {
-                    return VmessFmt.Resolve(str, out msg);
-                }
-                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Shadowsocks]))
-                {
-                    return ShadowsocksFmt.Resolve(str, out msg);
-                }
-                else if (str.StartsWith(Global.ProtocolShares[EConfigType.SOCKS]))
-                {
-                    return SocksFmt.Resolve(str, out msg);
-                }
-                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Trojan]))
-                {
-                    return TrojanFmt.Resolve(str, out msg);
-                }
-                else if (str.StartsWith(Global.ProtocolShares[EConfigType.VLESS]))
-                {
-                    return VLESSFmt.Resolve(str, out msg);
-                }
-                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2]) || str.StartsWith(Global.Hysteria2ProtocolShare))
-                {
-                    return Hysteria2Fmt.Resolve(str, out msg);
-                }
-                else if (str.StartsWith(Global.ProtocolShares[EConfigType.TUIC]))
-                {
-                    return TuicFmt.Resolve(str, out msg);
-                }
-                else if (str.StartsWith(Global.ProtocolShares[EConfigType.WireGuard]))
-                {
-                    return WireguardFmt.Resolve(str, out msg);
-                }
-                else
-                {
-                    msg = ResUI.NonvmessOrssProtocol;
-                    return null;
-                }
+                msg = ResUI.FailedReadConfiguration;
+                return null;
            }
-            catch (Exception ex)
+
+            if (str.StartsWith(Global.ProtocolShares[EConfigType.VMess]))
            {
-                Logging.SaveLog(_tag, ex);
-                msg = ResUI.Incorrectconfiguration;
+                return VmessFmt.Resolve(str, out msg);
+            }
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.Shadowsocks]))
+            {
+                return ShadowsocksFmt.Resolve(str, out msg);
+            }
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.SOCKS]))
+            {
+                return SocksFmt.Resolve(str, out msg);
+            }
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.Trojan]))
+            {
+                return TrojanFmt.Resolve(str, out msg);
+            }
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.VLESS]))
+            {
+                return VLESSFmt.Resolve(str, out msg);
+            }
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2]) || str.StartsWith(Global.Hysteria2ProtocolShare))
+            {
+                return Hysteria2Fmt.Resolve(str, out msg);
+            }
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.TUIC]))
+            {
+                return TuicFmt.Resolve(str, out msg);
+            }
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.WireGuard]))
+            {
+                return WireguardFmt.Resolve(str, out msg);
+            }
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.Anytls]))
+            {
+                return AnytlsFmt.Resolve(str, out msg);
+            }
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.Naive])
+                     || str.StartsWith(Global.NaiveHttpsProtocolShare)
+                     || str.StartsWith(Global.NaiveQuicProtocolShare))
+            {
+                return NaiveFmt.Resolve(str, out msg);
+            }
+            else
+            {
+                msg = ResUI.NonvmessOrssProtocol;
                return null;
            }
        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            msg = ResUI.Incorrectconfiguration;
+            return null;
+        }
    }
-}
+}
@@ -0,0 +1,9 @@
+namespace ServiceLib.Handler.Fmt;
+
+public class HtmlPageFmt : BaseFmt
+{
+    public static bool IsHtmlPage(string strData)
+    {
+        return Contains(strData, "<html", "<!doctype html", "<head");
+    }
+}
@@ -1,96 +1,97 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class Hysteria2Fmt : BaseFmt
 {
-    public class Hysteria2Fmt : BaseFmt
+    public static ProfileItem? Resolve(string str, out string msg)
    {
-        public static ProfileItem? Resolve(string str, out string msg)
+        msg = ResUI.ConfigurationFormatIncorrect;
+        ProfileItem item = new()
        {
-            msg = ResUI.ConfigurationFormatIncorrect;
-            ProfileItem item = new()
+            ConfigType = EConfigType.Hysteria2
+        };
+
+        var url = Utils.TryUri(str);
+        if (url == null)
+        {
+            return null;
+        }
+
+        item.Address = url.IdnHost;
+        item.Port = url.Port;
+        item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+        item.Password = Utils.UrlDecode(url.UserInfo);
+
+        var query = Utils.ParseQueryString(url.Query);
+        ResolveUriQuery(query, ref item);
+        if (item.CertSha.IsNullOrEmpty())
+        {
+            item.CertSha = GetQueryDecoded(query, "pinSHA256");
+        }
+        item.SetProtocolExtra(item.GetProtocolExtra() with
+        {
+            Ports = GetQueryDecoded(query, "mport"),
+            SalamanderPass = GetQueryDecoded(query, "obfs-password"),
+        });
+
+        return item;
+    }
+
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
+        {
+            return null;
+        }
+
+        var url = string.Empty;
+
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+        var dicQuery = new Dictionary<string, string>();
+        ToUriQueryLite(item, ref dicQuery);
+        var protocolExtraItem = item.GetProtocolExtra();
+
+        if (!protocolExtraItem.SalamanderPass.IsNullOrEmpty())
+        {
+            dicQuery.Add("obfs", "salamander");
+            dicQuery.Add("obfs-password", Utils.UrlEncode(protocolExtraItem.SalamanderPass));
+        }
+        if (!protocolExtraItem.Ports.IsNullOrEmpty())
+        {
+            dicQuery.Add("mport", Utils.UrlEncode(protocolExtraItem.Ports.Replace(':', '-')));
+        }
+        if (!item.CertSha.IsNullOrEmpty())
+        {
+            var sha = item.CertSha;
+            var idx = sha.IndexOf(',');
+            if (idx > 0)
            {
-                ConfigType = EConfigType.Hysteria2
+                sha = sha[..idx];
+            }
+            dicQuery.Add("pinSHA256", Utils.UrlEncode(sha));
+        }
+
+        return ToUri(EConfigType.Hysteria2, item.Address, item.Port, item.Password, dicQuery, remark);
+    }
+
+    public static ProfileItem? ResolveFull2(string strData, string? subRemarks)
+    {
+        if (Contains(strData, "server", "auth", "up", "down", "listen"))
+        {
+            var fileName = WriteAllText(strData);
+
+            var profileItem = new ProfileItem
+            {
+                CoreType = ECoreType.hysteria2,
+                Address = fileName,
+                Remarks = subRemarks ?? "hysteria2_custom"
            };
-
-            var url = Utils.TryUri(str);
-            if (url == null)
-                return null;
-
-            item.Address = url.IdnHost;
-            item.Port = url.Port;
-            item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.Id = Utils.UrlDecode(url.UserInfo);
-
-            var query = Utils.ParseQueryString(url.Query);
-            ResolveStdTransport(query, ref item);
-            item.Path = Utils.UrlDecode(query["obfs-password"] ?? "");
-            item.AllowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
-
-            return item;
+            return profileItem;
        }

-        public static string? ToUri(ProfileItem? item)
-        {
-            if (item == null)
-                return null;
-            string url = string.Empty;
-
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
-            {
-                remark = "#" + Utils.UrlEncode(item.Remarks);
-            }
-            var dicQuery = new Dictionary<string, string>();
-            if (Utils.IsNotEmpty(item.Sni))
-            {
-                dicQuery.Add("sni", item.Sni);
-            }
-            if (Utils.IsNotEmpty(item.Alpn))
-            {
-                dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
-            }
-            if (Utils.IsNotEmpty(item.Path))
-            {
-                dicQuery.Add("obfs", "salamander");
-                dicQuery.Add("obfs-password", Utils.UrlEncode(item.Path));
-            }
-            dicQuery.Add("insecure", item.AllowInsecure.ToLower() == "true" ? "1" : "0");
-
-            return ToUri(EConfigType.Hysteria2, item.Address, item.Port, item.Id, dicQuery, remark);
-        }
-
-        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
-        {
-            if (Contains(strData, "server", "up", "down", "listen", "<html>", "<body>"))
-            {
-                var fileName = WriteAllText(strData);
-
-                var profileItem = new ProfileItem
-                {
-                    CoreType = ECoreType.hysteria,
-                    Address = fileName,
-                    Remarks = subRemarks ?? "hysteria_custom"
-                };
-                return profileItem;
-            }
-
-            return null;
-        }
-
-        public static ProfileItem? ResolveFull2(string strData, string? subRemarks)
-        {
-            if (Contains(strData, "server", "auth", "up", "down", "listen"))
-            {
-                var fileName = WriteAllText(strData);
-
-                var profileItem = new ProfileItem
-                {
-                    CoreType = ECoreType.hysteria2,
-                    Address = fileName,
-                    Remarks = subRemarks ?? "hysteria2_custom"
-                };
-                return profileItem;
-            }
-
-            return null;
-        }
+        return null;
    }
 }
@@ -0,0 +1,91 @@
+namespace ServiceLib.Handler.Fmt;
+
+public class NaiveFmt : BaseFmt
+{
+    public static ProfileItem? Resolve(string str, out string msg)
+    {
+        msg = ResUI.ConfigurationFormatIncorrect;
+
+        var parsedUrl = Utils.TryUri(str);
+        if (parsedUrl == null)
+        {
+            return null;
+        }
+
+        ProfileItem item = new()
+        {
+            ConfigType = EConfigType.Naive,
+            Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+            Address = parsedUrl.IdnHost,
+            Port = parsedUrl.Port,
+        };
+        var protocolExtra = item.GetProtocolExtra();
+        if (parsedUrl.Scheme.Contains("quic"))
+        {
+            protocolExtra = protocolExtra with
+            {
+                NaiveQuic = true,
+            };
+        }
+        var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
+        if (rawUserInfo.Contains(':'))
+        {
+            var split = rawUserInfo.Split(':', 2);
+            item.Username = split[0];
+            item.Password = split[1];
+        }
+        else
+        {
+            item.Password = rawUserInfo;
+        }
+
+        var query = Utils.ParseQueryString(parsedUrl.Query);
+        ResolveUriQuery(query, ref item);
+        var insecureConcurrency = int.TryParse(GetQueryValue(query, "insecure-concurrency"), out var ic) ? ic : 0;
+        if (insecureConcurrency > 0)
+        {
+            protocolExtra = protocolExtra with
+            {
+                InsecureConcurrency = insecureConcurrency,
+            };
+        }
+
+        item.SetProtocolExtra(protocolExtra);
+        return item;
+    }
+
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
+        {
+            return null;
+        }
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+        var userInfo = item.Username.IsNotEmpty() ? $"{Utils.UrlEncode(item.Username)}:{Utils.UrlEncode(item.Password)}" : Utils.UrlEncode(item.Password);
+        var dicQuery = new Dictionary<string, string>();
+        ToUriQuery(item, Global.None, ref dicQuery);
+        var protocolExtra = item.GetProtocolExtra();
+        if (protocolExtra.InsecureConcurrency > 0)
+        {
+            dicQuery.Add("insecure-concurrency", protocolExtra?.InsecureConcurrency.ToString());
+        }
+
+        var query = dicQuery.Count > 0
+            ? ("?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray()))
+            : string.Empty;
+        var url = $"{userInfo}@{GetIpv6(item.Address)}:{item.Port}";
+
+        if (protocolExtra.NaiveQuic == true)
+        {
+            return $"{Global.NaiveQuicProtocolShare}{url}{query}{remark}";
+        }
+        else
+        {
+            return $"{Global.NaiveHttpsProtocolShare}{url}{query}{remark}";
+        }
+    }
+}
@@ -1,23 +0,0 @@
-namespace ServiceLib.Handler.Fmt
-{
-    public class NaiveproxyFmt : BaseFmt
-    {
-        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
-        {
-            if (Contains(strData, "listen", "proxy", "<html>", "<body>"))
-            {
-                var fileName = WriteAllText(strData);
-
-                var profileItem = new ProfileItem
-                {
-                    CoreType = ECoreType.naiveproxy,
-                    Address = fileName,
-                    Remarks = subRemarks ?? "naiveproxy_custom"
-                };
-                return profileItem;
-            }
-
-            return null;
-        }
-    }
-}
@@ -1,174 +1,314 @@
-using System.Text.RegularExpressions;
+namespace ServiceLib.Handler.Fmt;

-namespace ServiceLib.Handler.Fmt
+public class ShadowsocksFmt : BaseFmt
 {
-    public class ShadowsocksFmt : BaseFmt
+    public static ProfileItem? Resolve(string str, out string msg)
    {
-        public static ProfileItem? Resolve(string str, out string msg)
+        msg = ResUI.ConfigurationFormatIncorrect;
+        ProfileItem? item;
+
+        item = ResolveSSLegacy(str) ?? ResolveSip002(str);
+        if (item == null)
        {
-            msg = ResUI.ConfigurationFormatIncorrect;
-            ProfileItem? item;
-
-            item = ResolveSSLegacy(str) ?? ResolveSip002(str);
-            if (item == null)
-            {
-                return null;
-            }
-            if (item.Address.Length == 0 || item.Port == 0 || item.Security.Length == 0 || item.Id.Length == 0)
-            {
-                return null;
-            }
-
-            item.ConfigType = EConfigType.Shadowsocks;
-
-            return item;
-        }
-
-        public static string? ToUri(ProfileItem? item)
-        {
-            if (item == null)
-                return null;
-            string url = string.Empty;
-
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
-            {
-                remark = "#" + Utils.UrlEncode(item.Remarks);
-            }
-            //url = string.Format("{0}:{1}@{2}:{3}",
-            //    item.security,
-            //    item.id,
-            //    item.address,
-            //    item.port);
-            //url = Utile.Base64Encode(url);
-            //new Sip002
-            var pw = Utils.Base64Encode($"{item.Security}:{item.Id}");
-            return ToUri(EConfigType.Shadowsocks, item.Address, item.Port, pw, null, remark);
-        }
-
-        private static readonly Regex UrlFinder = new(@"ss://(?<base64>[A-Za-z0-9+-/=_]+)(?:#(?<tag>\S+))?", RegexOptions.IgnoreCase | RegexOptions.Compiled);
-        private static readonly Regex DetailsParser = new(@"^((?<method>.+?):(?<password>.*)@(?<hostname>.+?):(?<port>\d+?))$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
-
-        private static ProfileItem? ResolveSSLegacy(string result)
-        {
-            var match = UrlFinder.Match(result);
-            if (!match.Success)
-                return null;
-
-            ProfileItem item = new();
-            var base64 = match.Groups["base64"].Value.TrimEnd('/');
-            var tag = match.Groups["tag"].Value;
-            if (Utils.IsNotEmpty(tag))
-            {
-                item.Remarks = Utils.UrlDecode(tag);
-            }
-            Match details;
-            try
-            {
-                details = DetailsParser.Match(Utils.Base64Decode(base64));
-            }
-            catch (FormatException)
-            {
-                return null;
-            }
-            if (!details.Success)
-                return null;
-            item.Security = details.Groups["method"].Value;
-            item.Id = details.Groups["password"].Value;
-            item.Address = details.Groups["hostname"].Value;
-            item.Port = Utils.ToInt(details.Groups["port"].Value);
-            return item;
-        }
-
-        private static ProfileItem? ResolveSip002(string result)
-        {
-            var parsedUrl = Utils.TryUri(result);
-            if (parsedUrl == null)
-                return null;
-
-            ProfileItem item = new()
-            {
-                Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
-                Address = parsedUrl.IdnHost,
-                Port = parsedUrl.Port,
-            };
-            var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
-            //2022-blake3
-            if (rawUserInfo.Contains(':'))
-            {
-                string[] userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
-                if (userInfoParts.Length != 2)
-                {
-                    return null;
-                }
-                item.Security = userInfoParts.First();
-                item.Id = Utils.UrlDecode(userInfoParts.Last());
-            }
-            else
-            {
-                // parse base64 UserInfo
-                string userInfo = Utils.Base64Decode(rawUserInfo);
-                string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
-                if (userInfoParts.Length != 2)
-                {
-                    return null;
-                }
-                item.Security = userInfoParts.First();
-                item.Id = userInfoParts.Last();
-            }
-
-            var queryParameters = Utils.ParseQueryString(parsedUrl.Query);
-            if (queryParameters["plugin"] != null)
-            {
-                //obfs-host exists
-                var obfsHost = queryParameters["plugin"]?.Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
-                if (queryParameters["plugin"].Contains("obfs=http") && Utils.IsNotEmpty(obfsHost))
-                {
-                    obfsHost = obfsHost?.Replace("obfs-host=", "");
-                    item.Network = Global.DefaultNetwork;
-                    item.HeaderType = Global.TcpHeaderHttp;
-                    item.RequestHost = obfsHost ?? "";
-                }
-                else
-                {
-                    return null;
-                }
-            }
-
-            return item;
-        }
-
-        public static List<ProfileItem>? ResolveSip008(string result)
-        {
-            //SsSIP008
-            var lstSsServer = JsonUtils.Deserialize<List<SsServer>>(result);
-            if (lstSsServer?.Count <= 0)
-            {
-                var ssSIP008 = JsonUtils.Deserialize<SsSIP008>(result);
-                if (ssSIP008?.servers?.Count > 0)
-                {
-                    lstSsServer = ssSIP008.servers;
-                }
-            }
-
-            if (lstSsServer?.Count > 0)
-            {
-                List<ProfileItem> lst = [];
-                foreach (var it in lstSsServer)
-                {
-                    var ssItem = new ProfileItem()
-                    {
-                        Remarks = it.remarks,
-                        Security = it.method,
-                        Id = it.password,
-                        Address = it.server,
-                        Port = Utils.ToInt(it.server_port)
-                    };
-                    lst.Add(ssItem);
-                }
-                return lst;
-            }
            return null;
        }
+
+        if (item.Address.Length == 0 || item.Port == 0 || item.GetProtocolExtra().SsMethod.IsNullOrEmpty() || item.Password.Length == 0)
+        {
+            return null;
+        }
+
+        item.ConfigType = EConfigType.Shadowsocks;
+
+        return item;
+    }
+
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
+        {
+            return null;
+        }
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+        //url = string.Format("{0}:{1}@{2}:{3}",
+        //    item.security,
+        //    item.id,
+        //    item.address,
+        //    item.port);
+        //url = Utile.Base64Encode(url);
+        //new Sip002
+        var pw = Utils.Base64Encode($"{item.GetProtocolExtra().SsMethod}:{item.Password}", true);
+
+        // plugin
+        var plugin = string.Empty;
+        var pluginArgs = string.Empty;
+
+        if (item.Network == nameof(ETransport.tcp) && item.HeaderType == Global.TcpHeaderHttp)
+        {
+            plugin = "obfs-local";
+            pluginArgs = $"obfs=http;obfs-host={item.RequestHost};";
+        }
+        else
+        {
+            if (item.Network == nameof(ETransport.ws))
+            {
+                pluginArgs += "mode=websocket;";
+                pluginArgs += $"host={item.RequestHost};";
+                // https://github.com/shadowsocks/v2ray-plugin/blob/e9af1cdd2549d528deb20a4ab8d61c5fbe51f306/args.go#L172
+                // Equal signs and commas [and backslashes] must be escaped with a backslash.
+                var path = item.Path.Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,");
+                pluginArgs += $"path={path};";
+            }
+            else if (item.Network == nameof(ETransport.quic))
+            {
+                pluginArgs += "mode=quic;";
+            }
+            if (item.StreamSecurity == Global.StreamSecurity)
+            {
+                pluginArgs += "tls;";
+                var certs = CertPemManager.ParsePemChain(item.Cert);
+                if (certs.Count > 0)
+                {
+                    var cert = certs.First();
+                    const string beginMarker = "-----BEGIN CERTIFICATE-----\n";
+                    const string endMarker = "\n-----END CERTIFICATE-----";
+
+                    var base64Content = cert.Replace(beginMarker, "").Replace(endMarker, "").Trim();
+
+                    base64Content = base64Content.Replace("=", "\\=");
+
+                    pluginArgs += $"certRaw={base64Content};";
+                }
+            }
+            if (pluginArgs.Length > 0)
+            {
+                plugin = "v2ray-plugin";
+                pluginArgs += "mux=0;";
+            }
+        }
+
+        var dicQuery = new Dictionary<string, string>();
+        if (plugin.IsNotEmpty())
+        {
+            var pluginStr = plugin + ";" + pluginArgs;
+            // pluginStr remove last ';' and url encode
+            if (pluginStr.EndsWith(';'))
+            {
+                pluginStr = pluginStr[..^1];
+            }
+            dicQuery["plugin"] = Utils.UrlEncode(pluginStr);
+        }
+
+        return ToUri(EConfigType.Shadowsocks, item.Address, item.Port, pw, dicQuery, remark);
+    }
+
+    private static readonly Regex UrlFinder = new(@"ss://(?<base64>[A-Za-z0-9+-/=_]+)(?:#(?<tag>\S+))?", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+    private static readonly Regex DetailsParser = new(@"^((?<method>.+?):(?<password>.*)@(?<hostname>.+?):(?<port>\d+?))$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+    private static ProfileItem? ResolveSSLegacy(string result)
+    {
+        var match = UrlFinder.Match(result);
+        if (!match.Success)
+        {
+            return null;
+        }
+
+        ProfileItem item = new();
+        var base64 = match.Groups["base64"].Value.TrimEnd('/');
+        var tag = match.Groups["tag"].Value;
+        if (tag.IsNotEmpty())
+        {
+            item.Remarks = Utils.UrlDecode(tag);
+        }
+        Match details;
+        try
+        {
+            details = DetailsParser.Match(Utils.Base64Decode(base64));
+        }
+        catch (FormatException)
+        {
+            return null;
+        }
+        if (!details.Success)
+        {
+            return null;
+        }
+        item.SetProtocolExtra(item.GetProtocolExtra() with { SsMethod = details.Groups["method"].Value });
+        item.Password = details.Groups["password"].Value;
+        item.Address = details.Groups["hostname"].Value;
+        item.Port = details.Groups["port"].Value.ToInt();
+        return item;
+    }
+
+    private static ProfileItem? ResolveSip002(string result)
+    {
+        var parsedUrl = Utils.TryUri(result);
+        if (parsedUrl == null)
+        {
+            return null;
+        }
+
+        ProfileItem item = new()
+        {
+            Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+            Address = parsedUrl.IdnHost,
+            Port = parsedUrl.Port,
+        };
+        var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
+        //2022-blake3
+        if (rawUserInfo.Contains(':'))
+        {
+            var userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
+            if (userInfoParts.Length != 2)
+            {
+                return null;
+            }
+            item.SetProtocolExtra(item.GetProtocolExtra() with { SsMethod = userInfoParts.First() });
+            item.Password = Utils.UrlDecode(userInfoParts.Last());
+        }
+        else
+        {
+            // parse base64 UserInfo
+            var userInfo = Utils.Base64Decode(rawUserInfo);
+            var userInfoParts = userInfo.Split(new[] { ':' }, 2);
+            if (userInfoParts.Length != 2)
+            {
+                return null;
+            }
+            item.SetProtocolExtra(item.GetProtocolExtra() with { SsMethod = userInfoParts.First() });
+            item.Password = userInfoParts.Last();
+        }
+
+        var queryParameters = Utils.ParseQueryString(parsedUrl.Query);
+        if (queryParameters["plugin"] != null)
+        {
+            var pluginStr = queryParameters["plugin"];
+            var pluginParts = pluginStr.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+
+            if (pluginParts.Length == 0)
+            {
+                return null;
+            }
+
+            var pluginName = pluginParts[0];
+
+            // A typo in https://github.com/shadowsocks/shadowsocks-org/blob/6b1c064db4129de99c516294960e731934841c94/docs/doc/sip002.md?plain=1#L15
+            // "simple-obfs" should be "obfs-local"
+            if (pluginName == "simple-obfs")
+            {
+                pluginName = "obfs-local";
+            }
+
+            // Parse obfs-local plugin
+            if (pluginName == "obfs-local")
+            {
+                var obfsMode = pluginParts.FirstOrDefault(t => t.StartsWith("obfs="));
+                var obfsHost = pluginParts.FirstOrDefault(t => t.StartsWith("obfs-host="));
+
+                if ((!obfsMode.IsNullOrEmpty()) && obfsMode.Contains("obfs=http") && obfsHost.IsNotEmpty())
+                {
+                    obfsHost = obfsHost.Replace("obfs-host=", "");
+                    item.Network = Global.DefaultNetwork;
+                    item.HeaderType = Global.TcpHeaderHttp;
+                    item.RequestHost = obfsHost;
+                }
+            }
+            // Parse v2ray-plugin
+            else if (pluginName == "v2ray-plugin")
+            {
+                var mode = pluginParts.FirstOrDefault(t => t.StartsWith("mode="), "websocket");
+                var host = pluginParts.FirstOrDefault(t => t.StartsWith("host="));
+                var path = pluginParts.FirstOrDefault(t => t.StartsWith("path="));
+                var hasTls = pluginParts.Any(t => t == "tls");
+                var certRaw = pluginParts.FirstOrDefault(t => t.StartsWith("certRaw="));
+                var mux = pluginParts.FirstOrDefault(t => t.StartsWith("mux="));
+
+                var modeValue = mode.Replace("mode=", "");
+                if (modeValue == "websocket")
+                {
+                    item.Network = nameof(ETransport.ws);
+                    if (!host.IsNullOrEmpty())
+                    {
+                        item.RequestHost = host.Replace("host=", "");
+                        item.Sni = item.RequestHost;
+                    }
+                    if (!path.IsNullOrEmpty())
+                    {
+                        var pathValue = path.Replace("path=", "");
+                        pathValue = pathValue.Replace("\\=", "=").Replace("\\,", ",").Replace("\\\\", "\\");
+                        item.Path = pathValue;
+                    }
+                }
+                else if (modeValue == "quic")
+                {
+                    item.Network = nameof(ETransport.quic);
+                }
+
+                if (hasTls)
+                {
+                    item.StreamSecurity = Global.StreamSecurity;
+
+                    if (!certRaw.IsNullOrEmpty())
+                    {
+                        var certBase64 = certRaw.Replace("certRaw=", "");
+
+                        certBase64 = certBase64.Replace("\\=", "=");
+
+                        const string beginMarker = "-----BEGIN CERTIFICATE-----\n";
+                        const string endMarker = "\n-----END CERTIFICATE-----";
+                        var certPem = beginMarker + certBase64 + endMarker;
+                        item.Cert = certPem;
+                    }
+                }
+
+                if (!mux.IsNullOrEmpty())
+                {
+                    var muxValue = mux.Replace("mux=", "");
+                    var muxCount = muxValue.ToInt();
+                    if (muxCount > 0)
+                    {
+                        return null;
+                    }
+                }
+            }
+        }
+        return item;
+    }
+
+    public static List<ProfileItem>? ResolveSip008(string result)
+    {
+        //SsSIP008
+        var lstSsServer = JsonUtils.Deserialize<List<SsServer>>(result);
+        if (lstSsServer?.Count <= 0)
+        {
+            var ssSIP008 = JsonUtils.Deserialize<SsSIP008>(result);
+            if (ssSIP008?.servers?.Count > 0)
+            {
+                lstSsServer = ssSIP008.servers;
+            }
+        }
+
+        if (lstSsServer?.Count > 0)
+        {
+            List<ProfileItem> lst = [];
+            foreach (var it in lstSsServer)
+            {
+                var ssItem = new ProfileItem()
+                {
+                    Remarks = it.remarks,
+                    Password = it.password,
+                    Address = it.server,
+                    Port = it.server_port.ToInt()
+                };
+                ssItem.SetProtocolExtra(new ProtocolExtraItem() { SsMethod = it.method });
+                lst.Add(ssItem);
+            }
+            return lst;
+        }
+        return null;
    }
 }
@@ -1,55 +1,47 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class SingboxFmt : BaseFmt
 {
-    public class SingboxFmt : BaseFmt
+    public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
    {
-        public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
+        var configObjects = JsonUtils.Deserialize<object[]>(strData);
+        if (configObjects is not { Length: > 0 })
        {
-            var configObjects = JsonUtils.Deserialize<Object[]>(strData);
-            if (configObjects != null && configObjects.Length > 0)
-            {
-                List<ProfileItem> lstResult = [];
-                foreach (var configObject in configObjects)
-                {
-                    var objectString = JsonUtils.Serialize(configObject);
-                    var singboxCon = JsonUtils.Deserialize<SingboxConfig>(objectString);
-                    if (singboxCon?.inbounds?.Count > 0
-                        && singboxCon.outbounds?.Count > 0
-                        && singboxCon.route != null)
-                    {
-                        var fileName = WriteAllText(objectString);
-
-                        var profileIt = new ProfileItem
-                        {
-                            CoreType = ECoreType.sing_box,
-                            Address = fileName,
-                            Remarks = subRemarks ?? "singbox_custom",
-                        };
-                        lstResult.Add(profileIt);
-                    }
-                }
-                return lstResult;
-            }
            return null;
        }

-        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+        List<ProfileItem> lstResult = [];
+        foreach (var configObject in configObjects)
        {
-            var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(strData);
-            if (singboxConfig?.inbounds?.Count > 0
-                && singboxConfig.outbounds?.Count > 0
-                && singboxConfig.route != null)
+            var objectString = JsonUtils.Serialize(configObject);
+            var profileIt = ResolveFull(objectString, subRemarks);
+            if (profileIt != null)
            {
-                var fileName = WriteAllText(strData);
-                var profileItem = new ProfileItem
-                {
-                    CoreType = ECoreType.sing_box,
-                    Address = fileName,
-                    Remarks = subRemarks ?? "singbox_custom"
-                };
-
-                return profileItem;
+                lstResult.Add(profileIt);
            }
-            return null;
        }
+        return lstResult;
    }
-}
+
+    public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+    {
+        var config = JsonUtils.ParseJson(strData);
+        if (config?["inbounds"] == null
+            || config["outbounds"] == null
+            || config["route"] == null
+            || config["dns"] == null)
+        {
+            return null;
+        }
+
+        var fileName = WriteAllText(strData);
+        var profileItem = new ProfileItem
+        {
+            CoreType = ECoreType.sing_box,
+            Address = fileName,
+            Remarks = subRemarks ?? "singbox_custom"
+        };
+
+        return profileItem;
+    }
+}
@@ -1,113 +1,112 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class SocksFmt : BaseFmt
 {
-    public class SocksFmt : BaseFmt
+    public static ProfileItem? Resolve(string str, out string msg)
    {
-        public static ProfileItem? Resolve(string str, out string msg)
+        msg = ResUI.ConfigurationFormatIncorrect;
+
+        var item = ResolveSocksNew(str) ?? ResolveSocks(str);
+        if (item == null)
        {
-            msg = ResUI.ConfigurationFormatIncorrect;
-
-            var item = ResolveSocksNew(str) ?? ResolveSocks(str);
-            if (item == null)
-            {
-                return null;
-            }
-            if (item.Address.Length == 0 || item.Port == 0)
-            {
-                return null;
-            }
-
-            item.ConfigType = EConfigType.SOCKS;
-
-            return item;
+            return null;
+        }
+        if (item.Address.Length == 0 || item.Port == 0)
+        {
+            return null;
        }

-        public static string? ToUri(ProfileItem? item)
-        {
-            if (item == null)
-                return null;
-            var url = string.Empty;
+        item.ConfigType = EConfigType.SOCKS;

-            var remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+        return item;
+    }
+
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
+        {
+            return null;
+        }
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+        //new
+        var pw = Utils.Base64Encode($"{item.Username}:{item.Password}", true);
+        return ToUri(EConfigType.SOCKS, item.Address, item.Port, pw, null, remark);
+    }
+
+    private static ProfileItem? ResolveSocks(string result)
+    {
+        ProfileItem item = new()
+        {
+            ConfigType = EConfigType.SOCKS
+        };
+        result = result[Global.ProtocolShares[EConfigType.SOCKS].Length..];
+        //remark
+        var indexRemark = result.IndexOf('#');
+        if (indexRemark > 0)
+        {
+            try
            {
-                remark = "#" + Utils.UrlEncode(item.Remarks);
+                item.Remarks = Utils.UrlDecode(result.Substring(indexRemark + 1));
            }
-            //new
-            var pw = Utils.Base64Encode($"{item.Security}:{item.Id}");
-            return ToUri(EConfigType.SOCKS, item.Address, item.Port, pw, null, remark);
+            catch { }
+            result = result[..indexRemark];
+        }
+        //part decode
+        var indexS = result.IndexOf('@');
+        if (indexS > 0)
+        {
+        }
+        else
+        {
+            result = Utils.Base64Decode(result);
        }

-        private static ProfileItem? ResolveSocks(string result)
+        var arr1 = result.Split('@');
+        if (arr1.Length != 2)
        {
-            ProfileItem item = new()
-            {
-                ConfigType = EConfigType.SOCKS
-            };
-            result = result[Global.ProtocolShares[EConfigType.SOCKS].Length..];
-            //remark
-            var indexRemark = result.IndexOf("#");
-            if (indexRemark > 0)
-            {
-                try
-                {
-                    item.Remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
-                }
-                catch { }
-                result = result[..indexRemark];
-            }
-            //part decode
-            var indexS = result.IndexOf("@");
-            if (indexS > 0)
-            {
-            }
-            else
-            {
-                result = Utils.Base64Decode(result);
-            }
+            return null;
+        }
+        var arr21 = arr1.First().Split(':');
+        var indexPort = arr1.Last().LastIndexOf(":");
+        if (arr21.Length != 2 || indexPort < 0)
+        {
+            return null;
+        }
+        item.Address = arr1[1][..indexPort];
+        item.Port = arr1[1][(indexPort + 1)..].ToInt();
+        item.Username = arr21.First();
+        item.Password = arr21[1];
+        return item;
+    }

-            var arr1 = result.Split('@');
-            if (arr1.Length != 2)
-            {
-                return null;
-            }
-            var arr21 = arr1.First().Split(':');
-            var indexPort = arr1.Last().LastIndexOf(":");
-            if (arr21.Length != 2 || indexPort < 0)
-            {
-                return null;
-            }
-            item.Address = arr1[1][..indexPort];
-            item.Port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
-            item.Security = arr21.First();
-            item.Id = arr21[1];
-
-            return item;
+    private static ProfileItem? ResolveSocksNew(string result)
+    {
+        var parsedUrl = Utils.TryUri(result);
+        if (parsedUrl == null)
+        {
+            return null;
        }

-        private static ProfileItem? ResolveSocksNew(string result)
+        ProfileItem item = new()
        {
-            var parsedUrl = Utils.TryUri(result);
-            if (parsedUrl == null)
-                return null;
-
-            ProfileItem item = new()
-            {
-                Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
-                Address = parsedUrl.IdnHost,
-                Port = parsedUrl.Port,
-            };
-
-            // parse base64 UserInfo
-            var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
-            var userInfo = Utils.Base64Decode(rawUserInfo);
-            var userInfoParts = userInfo.Split([':'], 2);
-            if (userInfoParts.Length == 2)
-            {
-                item.Security = userInfoParts.First();
-                item.Id = userInfoParts[1];
-            }
-
-            return item;
+            Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+            Address = parsedUrl.IdnHost,
+            Port = parsedUrl.Port,
+        };
+        // parse base64 UserInfo
+        var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
+        var userInfo = Utils.Base64Decode(rawUserInfo);
+        var userInfoParts = userInfo.Split([':'], 2);
+        if (userInfoParts.Length == 2)
+        {
+            item.Username = userInfoParts.First();
+            item.Password = userInfoParts[1];
        }
+
+        return item;
    }
 }
@@ -1,46 +1,52 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class TrojanFmt : BaseFmt
 {
-    public class TrojanFmt : BaseFmt
+    public static ProfileItem? Resolve(string str, out string msg)
    {
-        public static ProfileItem? Resolve(string str, out string msg)
+        msg = ResUI.ConfigurationFormatIncorrect;
+
+        ProfileItem item = new()
        {
-            msg = ResUI.ConfigurationFormatIncorrect;
+            ConfigType = EConfigType.Trojan
+        };

-            ProfileItem item = new()
-            {
-                ConfigType = EConfigType.Trojan
-            };
-
-            var url = Utils.TryUri(str);
-            if (url == null)
-                return null;
-
-            item.Address = url.IdnHost;
-            item.Port = url.Port;
-            item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.Id = Utils.UrlDecode(url.UserInfo);
-
-            var query = Utils.ParseQueryString(url.Query);
-            ResolveStdTransport(query, ref item);
-
-            return item;
+        var url = Utils.TryUri(str);
+        if (url == null)
+        {
+            return null;
        }

-        public static string? ToUri(ProfileItem? item)
+        item.Address = url.IdnHost;
+        item.Port = url.Port;
+        item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+        item.Password = Utils.UrlDecode(url.UserInfo);
+
+        var query = Utils.ParseQueryString(url.Query);
+        item.SetProtocolExtra(item.GetProtocolExtra() with { Flow = GetQueryValue(query, "flow") });
+        ResolveUriQuery(query, ref item);
+
+        return item;
+    }
+
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
        {
-            if (item == null)
-                return null;
-            string url = string.Empty;
-
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
-            {
-                remark = "#" + Utils.UrlEncode(item.Remarks);
-            }
-            var dicQuery = new Dictionary<string, string>();
-            GetStdTransport(item, null, ref dicQuery);
-
-            return ToUri(EConfigType.Trojan, item.Address, item.Port, item.Id, dicQuery, remark);
+            return null;
        }
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+        var dicQuery = new Dictionary<string, string>();
+        if (!item.GetProtocolExtra().Flow.IsNullOrEmpty())
+        {
+            dicQuery.Add("flow", item.GetProtocolExtra().Flow);
+        }
+        ToUriQuery(item, null, ref dicQuery);
+
+        return ToUri(EConfigType.Trojan, item.Address, item.Port, item.Password, dicQuery, remark);
    }
 }
@@ -1,61 +1,64 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class TuicFmt : BaseFmt
 {
-    public class TuicFmt : BaseFmt
+    public static ProfileItem? Resolve(string str, out string msg)
    {
-        public static ProfileItem? Resolve(string str, out string msg)
+        msg = ResUI.ConfigurationFormatIncorrect;
+
+        ProfileItem item = new()
        {
-            msg = ResUI.ConfigurationFormatIncorrect;
+            ConfigType = EConfigType.TUIC
+        };

-            ProfileItem item = new()
-            {
-                ConfigType = EConfigType.TUIC
-            };
-
-            var url = Utils.TryUri(str);
-            if (url == null)
-                return null;
-
-            item.Address = url.IdnHost;
-            item.Port = url.Port;
-            item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            var rawUserInfo = Utils.UrlDecode(url.UserInfo);
-            var userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
-            if (userInfoParts.Length == 2)
-            {
-                item.Id = userInfoParts.First();
-                item.Security = userInfoParts.Last();
-            }
-
-            var query = Utils.ParseQueryString(url.Query);
-            ResolveStdTransport(query, ref item);
-            item.HeaderType = query["congestion_control"] ?? "";
-
-            return item;
+        var url = Utils.TryUri(str);
+        if (url == null)
+        {
+            return null;
        }

-        public static string? ToUri(ProfileItem? item)
+        item.Address = url.IdnHost;
+        item.Port = url.Port;
+        item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+        var rawUserInfo = Utils.UrlDecode(url.UserInfo);
+        var userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
+        if (userInfoParts.Length == 2)
        {
-            if (item == null)
-                return null;
-            string url = string.Empty;
-
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
-            {
-                remark = "#" + Utils.UrlEncode(item.Remarks);
-            }
-            var dicQuery = new Dictionary<string, string>();
-            if (Utils.IsNotEmpty(item.Sni))
-            {
-                dicQuery.Add("sni", item.Sni);
-            }
-            if (Utils.IsNotEmpty(item.Alpn))
-            {
-                dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
-            }
-            dicQuery.Add("congestion_control", item.HeaderType);
-
-            return ToUri(EConfigType.TUIC, item.Address, item.Port, $"{item.Id}:{item.Security}", dicQuery, remark);
+            item.Username = userInfoParts.First();
+            item.Password = userInfoParts.Last();
        }
+
+        var query = Utils.ParseQueryString(url.Query);
+        ResolveUriQuery(query, ref item);
+        item.SetProtocolExtra(item.GetProtocolExtra() with
+        {
+            CongestionControl = GetQueryValue(query, "congestion_control")
+        });
+
+        return item;
+    }
+
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
+        {
+            return null;
+        }
+
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+
+        var dicQuery = new Dictionary<string, string>();
+        ToUriQueryLite(item, ref dicQuery);
+
+        if (!item.GetProtocolExtra().CongestionControl.IsNullOrEmpty())
+        {
+            dicQuery.Add("congestion_control", item.GetProtocolExtra().CongestionControl);
+        }
+
+        return ToUri(EConfigType.TUIC, item.Address, item.Port, $"{item.Username ?? ""}:{item.Password}", dicQuery, remark);
    }
 }
@@ -1,56 +1,48 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class V2rayFmt : BaseFmt
 {
-    public class V2rayFmt : BaseFmt
+    public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
    {
-        public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
+        var configObjects = JsonUtils.Deserialize<object[]>(strData);
+        if (configObjects is not { Length: > 0 })
        {
-            var configObjects = JsonUtils.Deserialize<Object[]>(strData);
-            if (configObjects != null && configObjects.Length > 0)
-            {
-                List<ProfileItem> lstResult = [];
-                foreach (var configObject in configObjects)
-                {
-                    var objectString = JsonUtils.Serialize(configObject);
-                    var v2rayCon = JsonUtils.Deserialize<V2rayConfig>(objectString);
-                    if (v2rayCon?.inbounds?.Count > 0
-                        && v2rayCon.outbounds?.Count > 0
-                        && v2rayCon.routing != null)
-                    {
-                        var fileName = WriteAllText(objectString);
-
-                        var profileIt = new ProfileItem
-                        {
-                            CoreType = ECoreType.Xray,
-                            Address = fileName,
-                            Remarks = v2rayCon.remarks ?? subRemarks ?? "v2ray_custom",
-                        };
-                        lstResult.Add(profileIt);
-                    }
-                }
-                return lstResult;
-            }
            return null;
        }

-        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+        List<ProfileItem> lstResult = [];
+        foreach (var configObject in configObjects)
        {
-            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(strData);
-            if (v2rayConfig?.inbounds?.Count > 0
-                && v2rayConfig.outbounds?.Count > 0
-                && v2rayConfig.routing != null)
+            var objectString = JsonUtils.Serialize(configObject);
+            var profileIt = ResolveFull(objectString, subRemarks);
+            if (profileIt != null)
            {
-                var fileName = WriteAllText(strData);
-
-                var profileItem = new ProfileItem
-                {
-                    CoreType = ECoreType.Xray,
-                    Address = fileName,
-                    Remarks = v2rayConfig.remarks ?? subRemarks ?? "v2ray_custom"
-                };
-
-                return profileItem;
+                lstResult.Add(profileIt);
            }
-            return null;
        }
+
+        return lstResult;
    }
-}
+
+    public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+    {
+        var config = JsonUtils.ParseJson(strData);
+        if (config?["inbounds"] == null
+            || config["outbounds"] == null
+            || config["routing"] == null)
+        {
+            return null;
+        }
+
+        var fileName = WriteAllText(strData);
+
+        var profileItem = new ProfileItem
+        {
+            CoreType = ECoreType.Xray,
+            Address = fileName,
+            Remarks = config?["remarks"]?.ToString() ?? subRemarks ?? "v2ray_custom"
+        };
+
+        return profileItem;
+    }
+}
@@ -1,57 +1,60 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class VLESSFmt : BaseFmt
 {
-    public class VLESSFmt : BaseFmt
+    public static ProfileItem? Resolve(string str, out string msg)
    {
-        public static ProfileItem? Resolve(string str, out string msg)
+        msg = ResUI.ConfigurationFormatIncorrect;
+
+        ProfileItem item = new()
        {
-            msg = ResUI.ConfigurationFormatIncorrect;
+            ConfigType = EConfigType.VLESS,
+        };

-            ProfileItem item = new()
-            {
-                ConfigType = EConfigType.VLESS,
-                Security = Global.None
-            };
-
-            var url = Utils.TryUri(str);
-            if (url == null)
-                return null;
-
-            item.Address = url.IdnHost;
-            item.Port = url.Port;
-            item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.Id = Utils.UrlDecode(url.UserInfo);
-
-            var query = Utils.ParseQueryString(url.Query);
-            item.Security = query["encryption"] ?? Global.None;
-            item.StreamSecurity = query["security"] ?? "";
-            ResolveStdTransport(query, ref item);
-
-            return item;
+        var url = Utils.TryUri(str);
+        if (url == null)
+        {
+            return null;
        }

-        public static string? ToUri(ProfileItem? item)
+        item.Address = url.IdnHost;
+        item.Port = url.Port;
+        item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+        item.Password = Utils.UrlDecode(url.UserInfo);
+
+        var query = Utils.ParseQueryString(url.Query);
+        item.SetProtocolExtra(item.GetProtocolExtra() with
        {
-            if (item == null)
-                return null;
-            string url = string.Empty;
+            VlessEncryption = GetQueryValue(query, "encryption", Global.None),
+            Flow = GetQueryValue(query, "flow")
+        });
+        item.StreamSecurity = GetQueryValue(query, "security");
+        ResolveUriQuery(query, ref item);

-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
-            {
-                remark = "#" + Utils.UrlEncode(item.Remarks);
-            }
-            var dicQuery = new Dictionary<string, string>();
-            if (Utils.IsNotEmpty(item.Security))
-            {
-                dicQuery.Add("encryption", item.Security);
-            }
-            else
-            {
-                dicQuery.Add("encryption", Global.None);
-            }
-            GetStdTransport(item, Global.None, ref dicQuery);
+        return item;
+    }

-            return ToUri(EConfigType.VLESS, item.Address, item.Port, item.Id, dicQuery, remark);
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
+        {
+            return null;
        }
+
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+        var dicQuery = new Dictionary<string, string>();
+        dicQuery.Add("encryption",
+            !item.GetProtocolExtra().VlessEncryption.IsNullOrEmpty() ? item.GetProtocolExtra().VlessEncryption : Global.None);
+        if (!item.GetProtocolExtra().Flow.IsNullOrEmpty())
+        {
+            dicQuery.Add("flow", item.GetProtocolExtra().Flow);
+        }
+        ToUriQuery(item, Global.None, ref dicQuery);
+
+        return ToUri(EConfigType.VLESS, item.Address, item.Port, item.Password, dicQuery, remark);
    }
 }
@@ -1,124 +1,133 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class VmessFmt : BaseFmt
 {
-    public class VmessFmt : BaseFmt
+    public static ProfileItem? Resolve(string str, out string msg)
    {
-        public static ProfileItem? Resolve(string str, out string msg)
+        msg = ResUI.ConfigurationFormatIncorrect;
+        ProfileItem? item;
+        if (str.IndexOf('@') > 0)
        {
-            msg = ResUI.ConfigurationFormatIncorrect;
-            ProfileItem? item;
-            if (str.IndexOf('?') > 0 && str.IndexOf('&') > 0)
-            {
-                item = ResolveStdVmess(str);
-            }
-            else
-            {
-                item = ResolveVmess(str, out msg);
-            }
-            return item;
+            item = ResolveStdVmess(str) ?? ResolveVmess(str, out msg);
+        }
+        else
+        {
+            item = ResolveVmess(str, out msg);
+        }
+        return item;
+    }
+
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
+        {
+            return null;
        }

-        public static string? ToUri(ProfileItem? item)
+        var vmessQRCode = new VmessQRCode
        {
-            if (item == null)
-                return null;
-            string url = string.Empty;
+            v = 2,
+            ps = item.Remarks.TrimEx(),
+            add = item.Address,
+            port = item.Port,
+            id = item.Password,
+            aid = int.TryParse(item.GetProtocolExtra()?.AlterId, out var result) ? result : 0,
+            scy = item.GetProtocolExtra().VmessSecurity ?? "",
+            net = item.Network,
+            type = item.HeaderType,
+            host = item.RequestHost,
+            path = item.Path,
+            tls = item.StreamSecurity,
+            sni = item.Sni,
+            alpn = item.Alpn,
+            fp = item.Fingerprint,
+            insecure = item.AllowInsecure.Equals(Global.AllowInsecure.First()) ? "1" : "0"
+        };

-            VmessQRCode vmessQRCode = new()
-            {
-                v = item.ConfigVersion,
-                ps = item.Remarks.TrimEx(),
-                add = item.Address,
-                port = item.Port,
-                id = item.Id,
-                aid = item.AlterId,
-                scy = item.Security,
-                net = item.Network,
-                type = item.HeaderType,
-                host = item.RequestHost,
-                path = item.Path,
-                tls = item.StreamSecurity,
-                sni = item.Sni,
-                alpn = item.Alpn,
-                fp = item.Fingerprint
-            };
+        var url = JsonUtils.Serialize(vmessQRCode);
+        url = Utils.Base64Encode(url);
+        url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";

-            url = JsonUtils.Serialize(vmessQRCode);
-            url = Utils.Base64Encode(url);
-            url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
+        return url;
+    }

-            return url;
+    private static ProfileItem? ResolveVmess(string result, out string msg)
+    {
+        msg = string.Empty;
+        var item = new ProfileItem
+        {
+            ConfigType = EConfigType.VMess
+        };
+
+        result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
+        result = Utils.Base64Decode(result);
+
+        var vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
+        if (vmessQRCode == null)
+        {
+            msg = ResUI.FailedConversionConfiguration;
+            return null;
        }

-        private static ProfileItem? ResolveVmess(string result, out string msg)
+        item.Network = Global.DefaultNetwork;
+        item.HeaderType = Global.None;
+
+        //item.ConfigVersion = vmessQRCode.v;
+        item.Remarks = Utils.ToString(vmessQRCode.ps);
+        item.Address = Utils.ToString(vmessQRCode.add);
+        item.Port = vmessQRCode.port;
+        item.Password = Utils.ToString(vmessQRCode.id);
+        item.SetProtocolExtra(new ProtocolExtraItem
        {
-            msg = string.Empty;
-            var item = new ProfileItem
-            {
-                ConfigType = EConfigType.VMess
-            };
-
-            result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
-            result = Utils.Base64Decode(result);
-
-            VmessQRCode? vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
-            if (vmessQRCode == null)
-            {
-                msg = ResUI.FailedConversionConfiguration;
-                return null;
-            }
-
-            item.Network = Global.DefaultNetwork;
-            item.HeaderType = Global.None;
-
-            item.ConfigVersion = vmessQRCode.v;
-            item.Remarks = Utils.ToString(vmessQRCode.ps);
-            item.Address = Utils.ToString(vmessQRCode.add);
-            item.Port = vmessQRCode.port;
-            item.Id = Utils.ToString(vmessQRCode.id);
-            item.AlterId = vmessQRCode.aid;
-            item.Security = Utils.ToString(vmessQRCode.scy);
-
-            item.Security = Utils.IsNotEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
-            if (Utils.IsNotEmpty(vmessQRCode.net))
-            {
-                item.Network = vmessQRCode.net;
-            }
-            if (Utils.IsNotEmpty(vmessQRCode.type))
-            {
-                item.HeaderType = vmessQRCode.type;
-            }
-
-            item.RequestHost = Utils.ToString(vmessQRCode.host);
-            item.Path = Utils.ToString(vmessQRCode.path);
-            item.StreamSecurity = Utils.ToString(vmessQRCode.tls);
-            item.Sni = Utils.ToString(vmessQRCode.sni);
-            item.Alpn = Utils.ToString(vmessQRCode.alpn);
-            item.Fingerprint = Utils.ToString(vmessQRCode.fp);
-
-            return item;
+            AlterId = vmessQRCode.aid.ToString(),
+            VmessSecurity = vmessQRCode.scy.IsNullOrEmpty() ? Global.DefaultSecurity : vmessQRCode.scy,
+        });
+        if (vmessQRCode.net.IsNotEmpty())
+        {
+            item.Network = vmessQRCode.net;
+        }
+        if (vmessQRCode.type.IsNotEmpty())
+        {
+            item.HeaderType = vmessQRCode.type;
        }

-        public static ProfileItem? ResolveStdVmess(string str)
+        item.RequestHost = Utils.ToString(vmessQRCode.host);
+        item.Path = Utils.ToString(vmessQRCode.path);
+        item.StreamSecurity = Utils.ToString(vmessQRCode.tls);
+        item.Sni = Utils.ToString(vmessQRCode.sni);
+        item.Alpn = Utils.ToString(vmessQRCode.alpn);
+        item.Fingerprint = Utils.ToString(vmessQRCode.fp);
+        item.AllowInsecure = vmessQRCode.insecure == "1" ? Global.AllowInsecure.First() : string.Empty;
+
+        return item;
+    }
+
+    public static ProfileItem? ResolveStdVmess(string str)
+    {
+        var item = new ProfileItem
        {
-            ProfileItem item = new()
-            {
-                ConfigType = EConfigType.VMess,
-                Security = "auto"
-            };
+            ConfigType = EConfigType.VMess,
+        };

-            var url = Utils.TryUri(str);
-            if (url == null)
-                return null;
-
-            item.Address = url.IdnHost;
-            item.Port = url.Port;
-            item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.Id = Utils.UrlDecode(url.UserInfo);
-
-            var query = Utils.ParseQueryString(url.Query);
-            ResolveStdTransport(query, ref item);
-
-            return item;
+        var url = Utils.TryUri(str);
+        if (url == null)
+        {
+            return null;
        }
+
+        item.Address = url.IdnHost;
+        item.Port = url.Port;
+        item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+        item.Password = Utils.UrlDecode(url.UserInfo);
+
+        item.SetProtocolExtra(new ProtocolExtraItem
+        {
+            VmessSecurity = "auto",
+        });
+
+        var query = Utils.ParseQueryString(url.Query);
+        ResolveUriQuery(query, ref item);
+
+        return item;
    }
 }
@@ -1,65 +1,67 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class WireguardFmt : BaseFmt
 {
-    public class WireguardFmt : BaseFmt
+    public static ProfileItem? Resolve(string str, out string msg)
    {
-        public static ProfileItem? Resolve(string str, out string msg)
+        msg = ResUI.ConfigurationFormatIncorrect;
+
+        ProfileItem item = new()
        {
-            msg = ResUI.ConfigurationFormatIncorrect;
+            ConfigType = EConfigType.WireGuard
+        };

-            ProfileItem item = new()
-            {
-                ConfigType = EConfigType.WireGuard
-            };
-
-            var url = Utils.TryUri(str);
-            if (url == null)
-                return null;
-
-            item.Address = url.IdnHost;
-            item.Port = url.Port;
-            item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.Id = Utils.UrlDecode(url.UserInfo);
-
-            var query = Utils.ParseQueryString(url.Query);
-
-            item.PublicKey = Utils.UrlDecode(query["publickey"] ?? "");
-            item.Path = Utils.UrlDecode(query["reserved"] ?? "");
-            item.RequestHost = Utils.UrlDecode(query["address"] ?? "");
-            item.ShortId = Utils.UrlDecode(query["mtu"] ?? "");
-
-            return item;
+        var url = Utils.TryUri(str);
+        if (url == null)
+        {
+            return null;
        }

-        public static string? ToUri(ProfileItem? item)
+        item.Address = url.IdnHost;
+        item.Port = url.Port;
+        item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+        item.Password = Utils.UrlDecode(url.UserInfo);
+
+        var query = Utils.ParseQueryString(url.Query);
+
+        item.SetProtocolExtra(item.GetProtocolExtra() with
        {
-            if (item == null)
-                return null;
-            string url = string.Empty;
+            WgPublicKey = GetQueryDecoded(query, "publickey"),
+            WgReserved = GetQueryDecoded(query, "reserved"),
+            WgInterfaceAddress = GetQueryDecoded(query, "address"),
+            WgMtu = int.TryParse(GetQueryDecoded(query, "mtu"), out var mtuVal) ? mtuVal : 1280,
+        });

-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
-            {
-                remark = "#" + Utils.UrlEncode(item.Remarks);
-            }
+        return item;
+    }

-            var dicQuery = new Dictionary<string, string>();
-            if (Utils.IsNotEmpty(item.PublicKey))
-            {
-                dicQuery.Add("publickey", Utils.UrlEncode(item.PublicKey));
-            }
-            if (Utils.IsNotEmpty(item.Path))
-            {
-                dicQuery.Add("reserved", Utils.UrlEncode(item.Path));
-            }
-            if (Utils.IsNotEmpty(item.RequestHost))
-            {
-                dicQuery.Add("address", Utils.UrlEncode(item.RequestHost));
-            }
-            if (Utils.IsNotEmpty(item.ShortId))
-            {
-                dicQuery.Add("mtu", Utils.UrlEncode(item.ShortId));
-            }
-            return ToUri(EConfigType.WireGuard, item.Address, item.Port, item.Id, dicQuery, remark);
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
+        {
+            return null;
        }
+
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+
+        var dicQuery = new Dictionary<string, string>();
+        if (!item.GetProtocolExtra().WgPublicKey.IsNullOrEmpty())
+        {
+            dicQuery.Add("publickey", Utils.UrlEncode(item.GetProtocolExtra().WgPublicKey));
+        }
+        if (!item.GetProtocolExtra().WgReserved.IsNullOrEmpty())
+        {
+            dicQuery.Add("reserved", Utils.UrlEncode(item.GetProtocolExtra().WgReserved));
+        }
+        if (!item.GetProtocolExtra().WgInterfaceAddress.IsNullOrEmpty())
+        {
+            dicQuery.Add("address", Utils.UrlEncode(item.GetProtocolExtra().WgInterfaceAddress));
+        }
+        dicQuery.Add("mtu", Utils.UrlEncode(item.GetProtocolExtra().WgMtu > 0 ? item.GetProtocolExtra().WgMtu.ToString() : "1280"));
+        return ToUri(EConfigType.WireGuard, item.Address, item.Port, item.Password, dicQuery, remark);
    }
 }
--- a/Show More
+++ b/Show More