up 7.15.5

Also fix the handling of IPv6 domains

.github/ISSUE_TEMPLATE/01_bug_report.yml

@@ -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

.github/ISSUE_TEMPLATE/config.yml

@@ -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: 查看常见问题和使用文档。

.github/workflows/build-all.yml

@@ -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: github.event.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\": \"${{ github.event.inputs.release_tag }}\"
+              }
+            }"
+
+      - name: Trigger build linux
+        if: github.event.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\": \"${{ github.event.inputs.release_tag }}\"
+              }
+            }"
+
+      - name: Trigger build osx
+        if: github.event.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\": \"${{ github.event.inputs.release_tag }}\"
+              }
+            }"
+
+      - name: Trigger build windows desktop
+        if: github.event.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\": \"${{ github.event.inputs.release_tag }}\"
+              }
+            }"

.github/workflows/build-linux.yml

@@ -22,27 +22,30 @@ jobs:
       matrix:
         configuration: [Release]
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
+      with:
+        submodules: 'recursive'
+        fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
+      uses: actions/setup-dotnet@v5.0.0
       with:
         dotnet-version: '8.0.x'
 
     - name: Build
       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
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-x64   --self-contained=true -o $OutputPath64
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-arm64 --self-contained=true -o $OutputPathArm64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r linux-x64   --self-contained=true -p:PublishTrimmed=true -o $OutputPath64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r linux-arm64 --self-contained=true -p:PublishTrimmed=true -o $OutputPathArm64
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v4.6.0
+      uses: actions/upload-artifact@v4.6.2
       with:
         name: v2rayN-linux
         path: |
@@ -68,9 +71,8 @@ jobs:
     - 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 }}
+        chmod a+x package-appimage.sh
+        ./package-appimage.sh
 
     - name: Upload AppImage to release
       uses: svenstaro/upload-release-action@v2
@@ -96,4 +98,38 @@ jobs:
         file: ${{ github.workspace }}/v2rayN*.zip
         tag: ${{ github.event.inputs.release_tag }}
         file_glob: true
-        prerelease: true
+        prerelease: true
+
+    # release RHEL package
+    - name: Package RPM (RHEL-family)
+      if: github.event.inputs.release_tag != ''
+      run: |
+        chmod 755 package-rhel.sh
+        # Build for both x86_64 and aarch64 in one go (explicit version passed; no --buildfrom)
+        ./package-rhel.sh "${{ github.event.inputs.release_tag }}" --arch all
+
+    - name: Collect RPMs into workspace
+      if: github.event.inputs.release_tag != ''
+      run: |
+        mkdir -p "${{ github.workspace }}/dist/rpm"
+        rsync -av "$HOME/rpmbuild/RPMS/" "${{ github.workspace }}/dist/rpm/"
+        # Rename to requested filenames
+        find "${{ github.workspace }}/dist/rpm" -name "v2rayN-*-1.x86_64.rpm" -exec mv {} "${{ github.workspace }}/dist/rpm/v2rayN-linux-rhel-x64.rpm" \; || true
+        find "${{ github.workspace }}/dist/rpm" -name "v2rayN-*-1.aarch64.rpm" -exec mv {} "${{ github.workspace }}/dist/rpm/v2rayN-linux-rhel-arm64.rpm" \; || true
+
+    - name: Upload RPM artifacts
+      if: github.event.inputs.release_tag != ''
+      uses: actions/upload-artifact@v4.6.2
+      with:
+        name: v2rayN-rpm
+        path: |
+          ${{ github.workspace }}/dist/rpm/**/*.rpm
+
+    - name: Upload RPMs to release
+      uses: svenstaro/upload-release-action@v2
+      if: github.event.inputs.release_tag != ''
+      with:
+        file: ${{ github.workspace }}/dist/rpm/**/*.rpm
+        tag: ${{ github.event.inputs.release_tag }}
+        file_glob: true
+        prerelease: true

.github/workflows/build-osx.yml

@@ -26,23 +26,26 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
+      with:
+        submodules: 'recursive'
+        fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
+      uses: actions/setup-dotnet@v5.0.0
       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
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-x64   --self-contained=true -o $OutputPath64
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-arm64 --self-contained=true -o $OutputPathArm64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r osx-x64   --self-contained=true -p:PublishTrimmed=true -o $OutputPath64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r osx-arm64 --self-contained=true -p:PublishTrimmed=true -o $OutputPathArm64
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v4.6.0
+      uses: actions/upload-artifact@v4.6.2
       with:
         name: v2rayN-macos
         path: |

.github/workflows/build-windows-desktop.yml

@@ -26,25 +26,46 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
+      with:
+        submodules: 'recursive'
+        fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
+      uses: actions/setup-dotnet@v5.0.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
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r win-x64   --self-contained=true -p:EnableWindowsTargeting=true -o $OutputPath64
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r win-arm64 --self-contained=true -p:EnableWindowsTargeting=true -o $OutputPathArm64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r win-x64   --self-contained=true -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPath64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r win-arm64 --self-contained=true -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPathArm64
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v4.6.0
+      uses: actions/upload-artifact@v4.6.2
       with:
         name: v2rayN-windows-desktop
         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
+        mv "v2rayN-${OutputArch}.zip" "v2rayN-${OutputArch}-desktop.zip"
+        ./package-release-zip.sh $OutputArchArm $OutputPathArm64
+        mv "v2rayN-${OutputArchArm}.zip" "v2rayN-${OutputArchArm}-desktop.zip"
+
+    - 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

.github/workflows/build-windows.yml

@@ -27,26 +27,26 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
+      uses: actions/setup-dotnet@v5.0.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
+        dotnet publish ./v2rayN/v2rayN.csproj     -c Release -r win-x64   --self-contained=false -p:EnableWindowsTargeting=true -o $OutputPath64
+        dotnet publish ./v2rayN/v2rayN.csproj     -c Release -r win-arm64 --self-contained=false -p:EnableWindowsTargeting=true -o $OutputPathArm64
+        dotnet publish ./v2rayN/v2rayN.csproj     -c Release -r win-x64   --self-contained=true  -p:EnableWindowsTargeting=true -o $OutputPath64Sc
+        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64   --self-contained=false -p:EnableWindowsTargeting=true -o $OutputPath64
+        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 --self-contained=false -p:EnableWindowsTargeting=true -o $OutputPathArm64
+        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64   --self-contained=true  -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPath64Sc
 
   
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v4.6.0
+      uses: actions/upload-artifact@v4.6.2
       with:
         name: v2rayN-windows
         path: |

.github/workflows/winget-publish.yml

@@ -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

.gitignore

@@ -397,4 +397,5 @@ FodyWeavers.xsd
 *.msp
 
 # JetBrains Rider
-*.sln.iml
+.idea/
+*.sln.iml

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "v2rayN/GlobalHotKeys"]
+	path = v2rayN/GlobalHotKeys
+	url = https://github.com/2dust/GlobalHotKeys

LICENSE

@@ -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.

README.md

@@ -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)

package-appimage.sh

@@ -1,38 +1,26 @@
 #!/bin/bash
+set -euo pipefail
 
-Arch="$1"
-OutputPath="$2"
-Version="$3"
+# Install deps
+sudo apt update -y
+sudo apt install -y libfuse2 wget file
 
-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
+# Get tools
+wget -qO appimagetool https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+chmod +x appimagetool
 
-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"
+# x86_64 AppDir
+APPDIR_X64="AppDir-x86_64"
+rm -rf "$APPDIR_X64"
+mkdir -p "$APPDIR_X64/usr/lib/v2rayN" "$APPDIR_X64/usr/bin" "$APPDIR_X64/usr/share/applications" "$APPDIR_X64/usr/share/pixmaps"
+cp -rf "$OutputPath64"/* "$APPDIR_X64/usr/lib/v2rayN" || true
+[ -f "$APPDIR_X64/usr/lib/v2rayN/v2rayN.png" ] && cp "$APPDIR_X64/usr/lib/v2rayN/v2rayN.png" "$APPDIR_X64/usr/share/pixmaps/v2rayN.png" || true
+[ -f "$APPDIR_X64/usr/lib/v2rayN/v2rayN.png" ] && cp "$APPDIR_X64/usr/lib/v2rayN/v2rayN.png" "$APPDIR_X64/v2rayN.png" || true
 
-if [ $Arch = "linux-64" ]; then
-    Arch2="x86_64"
-    Arch3="amd64"
-else
-    Arch2="aarch64"
-    Arch3="arm64"
-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}"
-exec "\${HERE}/opt/v2rayN/v2rayN" \$@
-EOF
-
-cat >"${PackagePath}/AppDir/v2rayN.desktop" <<-EOF
+printf '%s\n' '#!/bin/sh' 'HERE="$(dirname "$(readlink -f "$0")")"' 'cd "$HERE/usr/lib/v2rayN"' 'exec "$HERE/usr/lib/v2rayN/v2rayN" "$@"' > "$APPDIR_X64/AppRun"
+chmod +x "$APPDIR_X64/AppRun"
+ln -sf usr/lib/v2rayN/v2rayN "$APPDIR_X64/usr/bin/v2rayN"
+cat > "$APPDIR_X64/v2rayN.desktop" <<EOF
 [Desktop Entry]
 Name=v2rayN
 Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
@@ -42,30 +30,38 @@ Terminal=false
 Type=Application
 Categories=Network;
 EOF
+install -Dm644 "$APPDIR_X64/v2rayN.desktop" "$APPDIR_X64/usr/share/applications/v2rayN.desktop"
 
-sudo cp "${PackagePath}/AppDir/opt/v2rayN/v2rayN.png" "${PackagePath}/AppDir/v2rayN.png"
-sudo dpkg --add-architecture ${Arch3}
-mkdir deb_folder
-cd deb_folder
-apt download libicu74:${Arch3}
-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
+ARCH=x86_64 ./appimagetool "$APPDIR_X64" "v2rayN-${OutputArch}.AppImage"
+file "v2rayN-${OutputArch}.AppImage" | grep -q 'x86-64'
 
-sudo chmod 0755 "${PackagePath}/AppDir/opt/v2rayN/v2rayN"
-sudo chmod 0755 "${PackagePath}/AppDir/AppRun"
+# aarch64 AppDir
+APPDIR_ARM64="AppDir-aarch64"
+rm -rf "$APPDIR_ARM64"
+mkdir -p "$APPDIR_ARM64/usr/lib/v2rayN" "$APPDIR_ARM64/usr/bin" "$APPDIR_ARM64/usr/share/applications" "$APPDIR_ARM64/usr/share/pixmaps"
+cp -rf "$OutputPathArm64"/* "$APPDIR_ARM64/usr/lib/v2rayN" || true
+[ -f "$APPDIR_ARM64/usr/lib/v2rayN/v2rayN.png" ] && cp "$APPDIR_ARM64/usr/lib/v2rayN/v2rayN.png" "$APPDIR_ARM64/usr/share/pixmaps/v2rayN.png" || true
+[ -f "$APPDIR_ARM64/usr/lib/v2rayN/v2rayN.png" ] && cp "$APPDIR_ARM64/usr/lib/v2rayN/v2rayN.png" "$APPDIR_ARM64/v2rayN.png" || true
 
-# desktop && PATH
+printf '%s\n' '#!/bin/sh' 'HERE="$(dirname "$(readlink -f "$0")")"' 'cd "$HERE/usr/lib/v2rayN"' 'exec "$HERE/usr/lib/v2rayN/v2rayN" "$@"' > "$APPDIR_ARM64/AppRun"
+chmod +x "$APPDIR_ARM64/AppRun"
+ln -sf usr/lib/v2rayN/v2rayN "$APPDIR_ARM64/usr/bin/v2rayN"
+cat > "$APPDIR_ARM64/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
+install -Dm644 "$APPDIR_ARM64/v2rayN.desktop" "$APPDIR_ARM64/usr/share/applications/v2rayN.desktop"
 
-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"
+# aarch64 runtime
+wget -qO runtime-aarch64 https://github.com/AppImage/AppImageKit/releases/download/continuous/runtime-aarch64
+chmod +x runtime-aarch64
+
+# build aarch64 AppImage
+ARCH=aarch64 ./appimagetool --runtime-file ./runtime-aarch64 "$APPDIR_ARM64" "v2rayN-${OutputArchArm}.AppImage"
+file "v2rayN-${OutputArchArm}.AppImage" | grep -q 'ARM aarch64'

package-debian.sh

@@ -28,6 +28,7 @@ Package: v2rayN
 Version: $Version
 Architecture: $Arch2
 Maintainer: https://github.com/2dust/v2rayN
+Depends: desktop-file-utils, xdg-utils
 Description: A GUI client for Windows and Linux, support Xray core and sing-box-core and others
 EOF
 
@@ -52,7 +53,17 @@ sudo chmod 0755 "${PackagePath}/DEBIAN/postinst"
 sudo chmod 0755 "${PackagePath}/opt/v2rayN/v2rayN"
 sudo chmod 0755 "${PackagePath}/opt/v2rayN/AmazTool"
 
-# desktop && PATH
+# Patch
+# set owner to root:root
+sudo chown -R root:root "${PackagePath}"
+# set all directories to 755 (readable & traversable by all users)
+sudo find "${PackagePath}/opt/v2rayN" -type d -exec chmod 755 {} +
+# set all regular files to 644 (readable by all users)
+sudo find "${PackagePath}/opt/v2rayN" -type f -exec chmod 644 {} +
+# ensure main binaries are 755 (executable by all users)
+sudo chmod 755 "${PackagePath}/opt/v2rayN/v2rayN" 2>/dev/null || true
+sudo chmod 755 "${PackagePath}/opt/v2rayN/AmazTool" 2>/dev/null || true
 
+# build deb package
 sudo dpkg-deb -Zxz --build $PackagePath
-sudo mv "${PackagePath}.deb" "v2rayN-${Arch}.deb"
+sudo mv "${PackagePath}.deb" "v2rayN-${Arch}.deb"

package-rhel.sh

@@ -0,0 +1,808 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# == Require Red Hat Enterprise Linux/FedoraLinux/RockyLinux/AlmaLinux/CentOS OR Ubuntu/Debian ==
+if [[ -r /etc/os-release ]]; then
+  . /etc/os-release
+  case "$ID" in
+    rhel|rocky|almalinux|fedora|centos|ubuntu|debian)
+      echo "[OK] Detected supported system: $NAME $VERSION_ID"
+      ;;
+    *)
+      echo "[ERROR] Unsupported system: $NAME ($ID)."
+      echo "This script only supports Red Hat Enterprise Linux/RockyLinux/AlmaLinux/CentOS or Ubuntu/Debian."
+      exit 1
+      ;;
+  esac
+else
+  echo "[ERROR] Cannot detect system (missing /etc/os-release)."
+  exit 1
+fi
+
+# ===== 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
+AUTOSTART=0              # 1 = enable system-wide autostart (/etc/xdg/autostart)
+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;;
+    --autostart)     AUTOSTART=1; shift;;
+    --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 "[ERROR] 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
+
+# ===== Environment check + Dependencies ========================================
+host_arch="$(uname -m)"
+[[ "$host_arch" == "aarch64" || "$host_arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
+
+install_ok=0
+case "$ID" in
+  # ------------------------------ RHEL family (UNCHANGED) ------------------------------
+  rhel|rocky|almalinux|centos)
+    if command -v dnf >/dev/null 2>&1; then
+      sudo dnf -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync || \
+      sudo dnf -y install dotnet-sdk rpm-build rpmdevtools curl unzip tar rsync
+      install_ok=1
+    elif command -v yum >/dev/null 2>&1; then
+      sudo yum -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync || \
+      sudo yum -y install dotnet-sdk rpm-build rpmdevtools curl unzip tar rsync
+      install_ok=1
+    fi
+    ;;
+  # ------------------------------ Ubuntu ----------------------------------------------
+  ubuntu)
+    sudo apt-get update
+    # Ensure 'universe' (Ubuntu) to get 'rpm'
+    if ! apt-cache policy | grep -q '^500 .*ubuntu.com/ubuntu.* universe'; then
+      sudo apt-get -y install software-properties-common || true
+      sudo add-apt-repository -y universe || true
+      sudo apt-get update
+    fi
+    # Base tools + rpm (provides rpmbuild)
+    sudo apt-get -y install curl unzip tar rsync rpm || true
+    # Cross-arch binutils so strip matches target arch + objdump for brp scripts
+    sudo apt-get -y install binutils binutils-x86-64-linux-gnu binutils-aarch64-linux-gnu || true
+    # rpmbuild presence check
+    if ! command -v rpmbuild >/dev/null 2>&1; then
+      echo "[ERROR] 'rpmbuild' not found after installing 'rpm'."
+      echo "        Please ensure the 'rpm' package is available from your repos (universe on Ubuntu)."
+      exit 1
+    fi
+    # .NET SDK 8 (best effort via apt)
+    if ! command -v dotnet >/dev/null 2>&1; then
+      sudo apt-get -y install dotnet-sdk-8.0 || true
+      sudo apt-get -y install dotnet-sdk-8 || true
+      sudo apt-get -y install dotnet-sdk || true
+    fi
+    install_ok=1
+    ;;
+  # ------------------------------ Debian (KEEP, with local dotnet install) ------------
+  debian)
+    sudo apt-get update
+    # Base tools + rpm (provides rpmbuild on Debian) + objdump/strip
+    sudo apt-get -y install curl unzip tar rsync rpm binutils || true
+    # rpmbuild presence check
+    if ! command -v rpmbuild >/dev/null 2>&1; then
+      echo "[ERROR] 'rpmbuild' not found after installing 'rpm'."
+      echo "        Please ensure 'rpm' is available from Debian repos."
+      exit 1
+    fi
+    # Try apt for dotnet; fallback to official installer into $HOME/.dotnet
+    if ! command -v dotnet >/dev/null 2>&1; then
+      echo "[INFO] 'dotnet' not found. Installing .NET 8 SDK locally to \$HOME/.dotnet ..."
+      tmp="$(mktemp -d)"; trap '[[ -n "${tmp:-}" ]] && rm -rf "$tmp"' RETURN
+      curl -fsSL https://dot.net/v1/dotnet-install.sh -o "$tmp/dotnet-install.sh"
+      bash "$tmp/dotnet-install.sh" --channel 8.0 --install-dir "$HOME/.dotnet"
+      export PATH="$HOME/.dotnet:$HOME/.dotnet/tools:$PATH"
+      export DOTNET_ROOT="$HOME/.dotnet"
+      if ! command -v dotnet >/dev/null 2>&1; then
+        echo "[ERROR] dotnet installation failed."
+        exit 1
+      fi
+    fi
+    install_ok=1
+    ;;
+esac
+
+if [[ "$install_ok" -ne 1 ]]; then
+  echo "[WARN] 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 RPM-based distros)"
+fi
+
+command -v curl >/dev/null
+
+# Root directory = the script's location
+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; }
+
+# ===== Resolve GUI version & auto checkout ============================================
+VERSION=""
+
+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" ;;
+        *) ch="latest" ;;
+      esac
+    else
+      ch="latest"
+    fi
+  else
+    ch="latest"
+  fi
+  echo "$ch"
+}
+
+get_latest_tag_latest() {
+  # Resolve /releases/latest → tag_name
+  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
+    | grep -Eo '"tag_name":\s*"v?[^"]+"' \
+    | head -n1 \
+    | sed -E 's/.*"tag_name":\s*"v?([^"]+)".*/\1/'
+}
+
+get_latest_tag_prerelease() {
+  # Resolve newest prerelease=true tag; prefer jq, fallback to sed/grep (no awk)
+  local json tag
+  json="$(curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20")" || return 1
+
+  # 1) Use jq if present
+  if command -v jq >/dev/null 2>&1; then
+    tag="$(printf '%s' "$json" \
+      | jq -r '[.[] | select(.prerelease==true)][0].tag_name' 2>/dev/null \
+      | sed 's/^v//')" || true
+  fi
+
+  # 2) Fallback to sed/grep only
+  if [[ -z "${tag:-}" || "${tag:-}" == "null" ]]; then
+    tag="$(printf '%s' "$json" \
+      | tr '\n' ' ' \
+      | sed 's/},[[:space:]]*{/\n/g' \
+      | grep -m1 -E '"prerelease"[[:space:]]*:[[:space:]]*true' \
+      | grep -Eo '"tag_name"[[:space:]]*:[[:space:]]*"v?[^"]+"' \
+      | head -n1 \
+      | sed -E 's/.*"tag_name"[[:space:]]*:[[:space:]]*"v?([^"]+)".*/\1/')" || true
+  fi
+
+  [[ -n "${tag:-}" && "${tag:-}" != "null" ]] || return 1
+  printf '%s\n' "$tag"
+}
+
+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/v${want}" >/dev/null 2>&1; then
+      ref="v${want}"
+    elif git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then
+      ref="${want}"
+    elif git rev-parse --verify "${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
+}
+
+if git rev-parse --git-dir >/dev/null 2>&1; then
+  if [[ -n "${VERSION_ARG:-}" ]]; then
+    echo "[*] Trying to switch v2rayN repo to version: ${VERSION_ARG}"
+    if git_try_checkout "${VERSION_ARG#v}"; then
+      VERSION="${VERSION_ARG#v}"
+    else
+      echo "[WARN] Tag '${VERSION_ARG}' not found."
+      ch="$(choose_channel)"
+      if [[ "$ch" == "keep" ]]; then
+        echo "[*] Keep current repository state (no checkout)."
+        if git describe --tags --abbrev=0 >/dev/null 2>&1; then
+          VERSION="$(git describe --tags --abbrev=0)"
+        else
+          VERSION="0.0.0+git"
+        fi
+        VERSION="${VERSION#v}"
+      else
+        echo "[*] Resolving ${ch} tag from GitHub releases..."
+        tag=""
+        if [[ "$ch" == "prerelease" ]]; then
+          tag="$(get_latest_tag_prerelease || true)"
+          if [[ -z "$tag" ]]; then
+            echo "[WARN] Failed to resolve prerelease tag, falling back to latest."
+            tag="$(get_latest_tag_latest || true)"
+          fi
+        else
+          tag="$(get_latest_tag_latest || true)"
+        fi
+        [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; }
+        echo "[*] Latest tag for '${ch}': ${tag}"
+        git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
+        VERSION="${tag#v}"
+      fi
+    fi
+  else
+    ch="$(choose_channel)"
+    if [[ "$ch" == "keep" ]]; then
+      echo "[*] Keep current repository state (no checkout)."
+      if git describe --tags --abbrev=0 >/dev/null 2>&1; then
+        VERSION="$(git describe --tags --abbrev=0)"
+      else
+        VERSION="0.0.0+git"
+      fi
+      VERSION="${VERSION#v}"
+    else
+      echo "[*] Resolving ${ch} tag from GitHub releases..."
+      tag=""
+      if [[ "$ch" == "prerelease" ]]; then
+        tag="$(get_latest_tag_prerelease || true)"
+        if [[ -z "$tag" ]]; then
+          echo "[WARN] Failed to resolve prerelease tag, falling back to latest."
+          tag="$(get_latest_tag_latest || true)"
+        fi
+      else
+        tag="$(get_latest_tag_latest || true)"
+      fi
+      [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; }
+      echo "[*] Latest tag for '${ch}': ${tag}"
+      git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
+      VERSION="${tag#v}"
+    fi
+  fi
+else
+  echo "[WARN] Current directory is not a git repo; cannot checkout version. Proceeding on current tree."
+  VERSION="${VERSION_ARG:-}"
+  if [[ -z "$VERSION" ]]; then
+    if git describe --tags --abbrev=0 >/dev/null 2>&1; then
+      VERSION="$(git describe --tags --abbrev=0)"
+    else
+      VERSION="0.0.0+git"
+    fi
+  fi
+  VERSION="${VERSION#v}"
+fi
+echo "[*] GUI version resolved as: ${VERSION}"
+
+# ===== Helpers for core/rules download (use RID_DIR for arch sync) =====================
+download_xray() {
+  # Download Xray core and install to outdir/xray
+  local outdir="$1" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
+  mkdir -p "$outdir"
+  if [[ -n "${XRAY_VER:-}" ]]; then ver="${XRAY_VER}"; fi
+  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_DIR" == "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)"; trap '[[ -n "${tmp:-}" ]] && rm -rf "$tmp"' RETURN
+  curl -fL "$url" -o "$tmp/$zipname"
+  unzip -q "$tmp/$zipname" -d "$tmp"
+  install -Dm755 "$tmp/xray" "$outdir/xray"
+}
+
+download_singbox() {
+  # Download sing-box core and install to outdir/sing-box
+  local outdir="$1" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin
+  mkdir -p "$outdir"
+  if [[ -n "${SING_VER:-}" ]]; then ver="${SING_VER}"; fi
+  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_DIR" == "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)"; trap '[[ -n "${tmp:-}" ]] && rm -rf "$tmp"' RETURN
+  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"; return 1; }
+  install -Dm755 "$bin" "$outdir/sing-box"
+}
+
+# ---- NEW: download_mihomo (REQUIRED in --netcore mode) ----
+download_mihomo() {
+  # Download mihomo into outroot/bin/mihomo/mihomo
+  local outroot="$1"
+  local url=""
+  if [[ "$RID_DIR" == "linux-arm64" ]]; then
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64/bin/mihomo/mihomo"
+  else
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64/bin/mihomo/mihomo"
+  fi
+  echo "[+] Download mihomo: $url"
+  mkdir -p "$outroot/bin/mihomo"
+  curl -fL "$url" -o "$outroot/bin/mihomo/mihomo"
+  chmod +x "$outroot/bin/mihomo/mihomo" || true
+}
+
+# Move geo files to a unified path: 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 file exists under bin/xray/, move it up to bin/
+    if [[ -f "$outroot/bin/xray/$n" ]]; then
+      mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
+    fi
+    # If file already in bin/, leave it as-is
+    if [[ -f "$outroot/bin/$n" ]]; then
+      :
+    fi
+  done
+}
+
+# Download geo/rule assets; then unify to bin/
+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-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"
+  local url=""
+  if [[ "$RID_DIR" == "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
+  # keep mihomo
+  # 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 "[ERROR] 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 \
+    -p:IncludeNativeLibrariesForSelfExtract=true
+
+  # Per-arch variables (scoped)
+  local RID_DIR="$rid"
+  local PUBDIR
+  PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
+  [[ -d "$PUBDIR" ]]
+
+  # Make RID_DIR visible to download helpers (they read this var)
+  export RID_DIR
+
+  # 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 USE_TOPDIR_DEFINE
+  if [[ "$ID" =~ ^(rhel|rocky|almalinux|centos)$ ]]; then
+    rpmdev-setuptree
+    TOPDIR="${HOME}/rpmbuild"
+    SPECDIR="${TOPDIR}/SPECS"
+    SOURCEDIR="${TOPDIR}/SOURCES"
+    USE_TOPDIR_DEFINE=0
+  else
+    TOPDIR="${WORKDIR}/rpmbuild"
+    SPECDIR="${TOPDIR}/SPECS}"
+    SOURCEDIR="${TOPDIR}/SOURCES"
+    mkdir -p "${SPECDIR}" "${SOURCEDIR}" "${TOPDIR}/BUILD" "${TOPDIR}/RPMS" "${TOPDIR}/SRPMS"
+    USE_TOPDIR_DEFINE=1
+  fi
+
+  # Stage publish content
+  mkdir -p "$WORKDIR/$PKGROOT"
+  cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/"
+
+  # Optional icon
+  local ICON_CANDIDATE
+  ICON_CANDIDATE="$(dirname "$PROJECT")/../v2rayN.Desktop/v2rayN.png"
+  [[ -f "$ICON_CANDIDATE" ]] && cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png" || true
+
+  # Prepare bin structure
+  mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
+
+  # Bundle / cores per-arch
+  if [[ "$FORCE_NETCORE" -eq 0 ]]; then
+    if download_v2rayn_bundle "$WORKDIR/$PKGROOT"; then
+      echo "[*] Using v2rayN bundle archive."
+    else
+      echo "[*] Bundle failed, fallback to separate core + rules."
+      if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+        download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
+      fi
+      if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+        download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
+      fi
+      download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
+    fi
+  else
+    echo "[*] --netcore specified: use separate core + rules."
+    if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+      download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
+    fi
+    if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+      download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
+    fi
+    download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
+    # ---- REQUIRED: always fetch mihomo in netcore mode, per-arch ----
+    download_mihomo "$WORKDIR/$PKGROOT" || echo "[!] mihomo download failed (skipped)"
+  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:       libX11, libXrandr, libXcursor, libXi, libXext, libxcb, libXrender, libXfixes, libXinerama, libxkbcommon
+Requires:       fontconfig, freetype, cairo, pango, mesa-libEGL, mesa-libGL, xdg-utils
+
+%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/
+
+# Launcher (prefer native ELF first, then DLL fallback)
+install -dm0755 %{buildroot}%{_bindir}
+cat > %{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
+chmod 0755 %{buildroot}%{_bindir}/v2rayn
+
+# Desktop file
+install -dm0755 %{buildroot}%{_datadir}/applications
+cat > %{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
+if [ -f "%{_builddir}/__PKGROOT__/v2rayn.png" ]; then
+  install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
+  install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
+fi
+
+%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
+
+  # Autostart injection (inside %install) and %files entry
+  if [[ "$AUTOSTART" -eq 1 ]]; then
+    awk '
+      BEGIN{ins=0}
+      /^%post$/ && !ins {
+        print "# --- Autostart (.desktop) ---"
+        print "install -dm0755 %{buildroot}/etc/xdg/autostart"
+        print "cat > %{buildroot}/etc/xdg/autostart/v2rayn.desktop << '\''EOF'\''"
+        print "[Desktop Entry]"
+        print "Type=Application"
+        print "Name=v2rayN (Autostart)"
+        print "Exec=v2rayn"
+        print "X-GNOME-Autostart-enabled=true"
+        print "NoDisplay=false"
+        print "EOF"
+        ins=1
+      }
+      {print}
+    ' "$SPECFILE" > "${SPECFILE}.tmp" && mv "${SPECFILE}.tmp" "$SPECFILE"
+
+    awk '
+      BEGIN{infiles=0; done=0}
+      /^%files$/        {infiles=1}
+      infiles && done==0 && $0 ~ /%{_datadir}\/icons\/hicolor\/256x256\/apps\/v2rayn\.png/ {
+        print
+        print "%config(noreplace) /etc/xdg/autostart/v2rayn.desktop"
+        done=1
+        next
+      }
+      {print}
+    ' "$SPECFILE" > "${SPECFILE}.tmp" && mv "${SPECFILE}.tmp" "$SPECFILE"
+  fi
+
+  # Replace placeholders
+  sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE"
+  sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE"
+
+  # ----- Select proper 'strip' per target arch on Ubuntu only (cross-binutils) -----
+  # NOTE: We define only __strip to point to the target-arch strip.
+  #       DO NOT override __brp_strip (it must stay the brp script path).
+  local STRIP_ARGS=()
+  if [[ "$ID" == "ubuntu" ]]; then
+    local STRIP_BIN=""
+    if [[ "$short" == "x64" ]]; then
+      STRIP_BIN="/usr/bin/x86_64-linux-gnu-strip"
+    else
+      STRIP_BIN="/usr/bin/aarch64-linux-gnu-strip"
+    fi
+    if [[ -x "$STRIP_BIN" ]]; then
+      STRIP_ARGS=( --define "__strip $STRIP_BIN" )
+    fi
+  fi
+
+  # Build RPM for this arch (force rpm --target to match compile arch)
+  if [[ "$USE_TOPDIR_DEFINE" -eq 1 ]]; then
+    rpmbuild -ba "$SPECFILE" --define "_topdir $TOPDIR" --target "$rpm_target" "${STRIP_ARGS[@]}"
+  else
+    rpmbuild -ba "$SPECFILE" --target "$rpm_target" "${STRIP_ARGS[@]}"
+  fi
+
+  # Copy temporary rpmbuild to ~/rpmbuild on Debian/Ubuntu path
+  if [[ "$USE_TOPDIR_DEFINE" -eq 1 ]]; then
+    mkdir -p "$HOME/rpmbuild"
+    rsync -a "$TOPDIR"/ "$HOME/rpmbuild"/
+    TOPDIR="$HOME/rpmbuild"
+  fi
+
+  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
+  "")
+    # No --arch: use host architecture
+    if [[ "$host_arch" == "aarch64" ]]; then
+      build_for_arch arm64
+    else
+      build_for_arch x64
+    fi
+    ;;
+  x64|amd64)
+    build_for_arch x64
+    ;;
+  arm64|aarch64)
+    build_for_arch arm64
+    ;;
+  all)
+    BUILT_ALL=1
+    # Build x64 and arm64 separately; each package contains its own arch-only binaries.
+    build_for_arch x64
+    build_for_arch arm64
+    ;;
+  *)
+    echo "[ERROR] Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all."
+    exit 1
+    ;;
+esac
+
+# ===== Final summary if building both arches ==========================================
+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 "[WARN] No RPMs detected in summary (check build logs above)."
+  fi
+  echo "==================================================================="
+fi

v2rayN/AmazTool/Program.cs

@@ -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);
+    }
+}

v2rayN/AmazTool/Resx/Resource.Designer.cs

@@ -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 {

v2rayN/AmazTool/Resx/Resource.resx

@@ -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>

v2rayN/AmazTool/Resx/Resource.zh-Hans.resx

@@ -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>

v2rayN/AmazTool/Resx/Resource.zh-Hant.resx

@@ -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>

v2rayN/AmazTool/UpgradeApp.cs

@@ -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;
     }
 }

v2rayN/AmazTool/Utils.cs

@@ -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);
         }
     }
-}
+}

v2rayN/Directory.Build.props

@@ -1,14 +1,14 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.8.0</Version>
+        <Version>7.15.5</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</NoWarn>
         <Nullable>annotations</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <Authors>2dust</Authors>
@@ -28,6 +28,6 @@
 
         <UseSystemResourceKeys>true</UseSystemResourceKeys>
         <PublishSingleFile>true</PublishSingleFile>
-        <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+        <PublishReadyToRun>false</PublishReadyToRun>
     </PropertyGroup>
 </Project>

v2rayN/Directory.Packages.props

@@ -5,25 +5,27 @@
     <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="Avalonia.AvaloniaEdit" Version="11.3.0" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.7" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.7" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.7" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.7" />
+    <PackageVersion Include="CliWrap" Version="3.9.0" />
+    <PackageVersion Include="Downloader" Version="4.0.3" />
+    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.1" />
+    <PackageVersion Include="MaterialDesignThemes" Version="5.3.0" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
-    <PackageVersion Include="QRCoder" Version="1.6.0" />
-    <PackageVersion Include="ReactiveUI" Version="20.1.63" />
+    <PackageVersion Include="QRCoder" Version="1.7.0" />
+    <PackageVersion Include="ReactiveUI" Version="20.4.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="20.4.1" />
+    <PackageVersion Include="Semi.Avalonia" Version="11.3.7" />
+    <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.1" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7" />
+    <PackageVersion Include="NLog" Version="6.0.5" />
     <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="YamlDotNet" Version="16.3.0" />
     <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
   </ItemGroup>

v2rayN/ServiceLib/Base/MyReactiveObject.cs

@@ -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;
+}

v2rayN/ServiceLib/Common/AesUtils.cs

@@ -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;
-        }
-    }
-}

v2rayN/ServiceLib/Common/DesUtils.cs

@@ -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");
-        }
-    }
-}

v2rayN/ServiceLib/Common/DownloaderHelper.cs

@@ -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;
-        }
-    }
-}

v2rayN/ServiceLib/Common/EmbedUtils.cs

@@ -1,6 +1,3 @@
-using System.Collections.Concurrent;
-using System.Reflection;
-
 namespace ServiceLib.Common;
 
 public static class EmbedUtils

v2rayN/ServiceLib/Common/Extension.cs

@@ -0,0 +1,97 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace ServiceLib.Common;
+
+public static class Extension
+{
+    public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
+    {
+        return string.IsNullOrEmpty(value) || string.IsNullOrWhiteSpace(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}\"";
+    }
+
+    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;
+    }
+}

v2rayN/ServiceLib/Common/FileManager.cs

@@ -1,225 +1,249 @@
-using System.Formats.Tar;
+using System.Formats.Tar;
 using System.IO.Compression;
-using System.Text;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public static class FileManager
 {
-    public static class FileManager
-    {
-        private static readonly string _tag = "FileManager";
+    private static readonly string _tag = "FileManager";
 
-        public static bool ByteArrayToFile(string fileName, byte[] content)
+    public static bool ByteArrayToFile(string fileName, byte[] content)
+    {
+        try
         {
-            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)
             {
-                File.WriteAllBytes(fileName, content);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
+                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 void DecompressFile(string fileName, byte[] content)
+    public static List<string>? GetFilesFromZip(string fileName)
+    {
+        if (!File.Exists(fileName))
         {
-            try
+            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))
             {
-                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);
+                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}");
         }
 
-        public static void DecompressFile(string fileName, string toPath, string? toName)
+        // 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())
         {
-            try
+            if (ignoredName.IsNotEmpty() && file.Name.Contains(ignoredName))
             {
-                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);
+                continue;
             }
-            catch (Exception ex)
+            if (file.Extension == file.Name)
             {
-                Logging.SaveLog(_tag, ex);
+                continue;
             }
+            var targetFilePath = Path.Combine(destinationDir, file.Name);
+            if (!overwrite && File.Exists(targetFilePath))
+            {
+                continue;
+            }
+            _ = file.CopyTo(targetFilePath, overwrite);
         }
 
-        public static void DecompressTarFile(string fileName, string toPath)
+        // If recursive and copying subdirectories, recursively call this method
+        if (recursive)
         {
-            try
+            foreach (var subDir in dirs)
             {
-                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
+                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;
+    }
+}

v2rayN/ServiceLib/Common/HttpClientHelper.cs

@@ -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);
-        }
-    }
-}

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -1,131 +1,146 @@
-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)
-        {
-            return Deserialize<T>(Serialize(obj, false))!;
-        }
+    private static readonly JsonSerializerOptions _defaultSerializeOptions = new()
+    {
+        WriteIndented = true,
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+    };
 
-        /// <summary>
-        /// Deserialize to object
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="strJson"></param>
-        /// <returns></returns>
-        public static T? Deserialize<T>(string? strJson)
+    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)
+    {
+        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)
+    {
+        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);
+        }
+        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);
+    }
+}

v2rayN/ServiceLib/Common/Logging.cs

@@ -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);
         }
     }
 }

v2rayN/ServiceLib/Common/ProcUtils.cs

@@ -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)
@@ -56,95 +58,11 @@ public static class ProcUtils
                 FileName = Utils.GetExePath().AppendQuotes(),
                 Verb = blAdmin ? "runas" : null,
             };
-            Process.Start(startInfo);
+            _ = Process.Start(startInfo);
         }
         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);
-            }
-        }
-    }
 }

v2rayN/ServiceLib/Common/QRCodeHelper.cs

@@ -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;
-        }
-    }
-}

v2rayN/ServiceLib/Common/QRCodeUtils.cs

@@ -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;
+    }
+}

v2rayN/ServiceLib/Common/SemanticVersion.cs

@@ -1,187 +1,186 @@
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public class SemanticVersion
 {
-    public class SemanticVersion
+    private readonly int major;
+    private readonly int minor;
+    private readonly int patch;
+    private readonly string version;
+
+    public SemanticVersion(int major, int minor, int patch)
     {
-        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
+        this.major = major;
+        this.minor = minor;
+        this.patch = patch;
+        version = $"{major}.{minor}.{patch}";
     }
-}
+
+    public SemanticVersion(string? version)
+    {
+        try
+        {
+            if (string.IsNullOrEmpty(version))
+            {
+                major = 0;
+                minor = 0;
+                patch = 0;
+                return;
+            }
+            this.version = version.RemovePrefix('v');
+
+            var parts = this.version.Split('.');
+            if (parts.Length == 2)
+            {
+                major = int.Parse(parts.First());
+                minor = int.Parse(parts.Last());
+                patch = 0;
+            }
+            else if (parts.Length is 3 or 4)
+            {
+                major = int.Parse(parts[0]);
+                minor = int.Parse(parts[1]);
+                patch = int.Parse(parts[2]);
+            }
+            else
+            {
+                throw new ArgumentException("Invalid version string");
+            }
+        }
+        catch
+        {
+            major = 0;
+            minor = 0;
+            patch = 0;
+        }
+    }
+
+    public override bool Equals(object? obj)
+    {
+        if (obj is SemanticVersion other)
+        {
+            return major == other.major && minor == other.minor && patch == other.patch;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return major.GetHashCode() ^ minor.GetHashCode() ^ patch.GetHashCode();
+    }
+
+    /// <summary>
+    /// Use ToVersionString(string? prefix) instead if possible.
+    /// </summary>
+    /// <returns>major.minor.patch</returns>
+    public override string ToString()
+    {
+        return version;
+    }
+
+    public string ToVersionString(string? prefix = null)
+    {
+        if (prefix == null)
+        {
+            return version;
+        }
+        else
+        {
+            return $"{prefix}{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 (major < other.major)
+        {
+            return false;
+        }
+        else if (major > other.major)
+        {
+            return true;
+        }
+        else
+        {
+            if (minor < other.minor)
+            {
+                return false;
+            }
+            else if (minor > other.minor)
+            {
+                return true;
+            }
+            else
+            {
+                if (patch < other.patch)
+                {
+                    return false;
+                }
+                else if (patch > other.patch)
+                {
+                    return true;
+                }
+                else
+                {
+                    return true;
+                }
+            }
+        }
+    }
+
+    private bool LessEquals(SemanticVersion other)
+    {
+        if (major < other.major)
+        {
+            return true;
+        }
+        else if (major > other.major)
+        {
+            return false;
+        }
+        else
+        {
+            if (minor < other.minor)
+            {
+                return true;
+            }
+            else if (minor > other.minor)
+            {
+                return false;
+            }
+            else
+            {
+                if (patch < other.patch)
+                {
+                    return true;
+                }
+                else if (patch > other.patch)
+                {
+                    return false;
+                }
+                else
+                {
+                    return true;
+                }
+            }
+        }
+    }
+
+    #endregion Private
+}

v2rayN/ServiceLib/Common/SqliteHelper.cs

@@ -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;
-            });
-        }
-    }
-}

v2rayN/ServiceLib/Common/StringEx.cs

@@ -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}\"";
-        }
-    }
-}

v2rayN/ServiceLib/Common/WindowsJob.cs

@@ -1,41 +1,42 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-namespace ServiceLib.Common
-{
+namespace ServiceLib.Common;
     /*
      * See:
      * http://stackoverflow.com/questions/6266820/working-example-of-createjobobject-setinformationjobobject-pinvoke-in-net
      */
 
-    public sealed class Job : IDisposable
+    public sealed class WindowsJob : IDisposable
     {
         private IntPtr handle = IntPtr.Zero;
 
-        public Job()
+        public WindowsJob()
         {
             handle = CreateJobObject(IntPtr.Zero, null);
-            IntPtr extendedInfoPtr = IntPtr.Zero;
-            JOBOBJECT_BASIC_LIMIT_INFORMATION info = new()
+            var extendedInfoPtr = IntPtr.Zero;
+            var info = new JOBOBJECT_BASIC_LIMIT_INFORMATION
             {
                 LimitFlags = 0x2000
             };
 
-            JOBOBJECT_EXTENDED_LIMIT_INFORMATION extendedInfo = new()
+            var extendedInfo = new JOBOBJECT_EXTENDED_LIMIT_INFORMATION
             {
                 BasicLimitInformation = info
             };
 
             try
             {
-                int length = Marshal.SizeOf(typeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION));
+                var 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
             {
@@ -48,7 +49,7 @@ namespace ServiceLib.Common
 
         public bool AddProcess(IntPtr processHandle)
         {
-            bool succ = AssignProcessToJobObject(handle, processHandle);
+            var succ = AssignProcessToJobObject(handle, processHandle);
 
             if (!succ)
             {
@@ -76,7 +77,9 @@ namespace ServiceLib.Common
         private void Dispose(bool disposing)
         {
             if (disposed)
+            {
                 return;
+            }
             disposed = true;
 
             if (disposing)
@@ -91,7 +94,7 @@ namespace ServiceLib.Common
             }
         }
 
-        ~Job()
+        ~WindowsJob()
         {
             Dispose(false);
         }
@@ -104,7 +107,7 @@ namespace ServiceLib.Common
         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);
+        private static extern bool SetInformationJobObject(IntPtr hJob, JobObjectInfoType infoType, IntPtr lpJobObjectInfo, uint cbJobObjectInfoLength);
 
         [DllImport("kernel32.dll", SetLastError = true)]
         private static extern bool AssignProcessToJobObject(IntPtr job, IntPtr process);
@@ -121,34 +124,34 @@ namespace ServiceLib.Common
     [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;
+        public ulong ReadOperationCount;
+        public ulong WriteOperationCount;
+        public ulong OtherOperationCount;
+        public ulong ReadTransferCount;
+        public ulong WriteTransferCount;
+        public ulong OtherTransferCount;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct JOBOBJECT_BASIC_LIMIT_INFORMATION
     {
-        public Int64 PerProcessUserTimeLimit;
-        public Int64 PerJobUserTimeLimit;
-        public UInt32 LimitFlags;
+        public long PerProcessUserTimeLimit;
+        public long PerJobUserTimeLimit;
+        public uint LimitFlags;
         public UIntPtr MinimumWorkingSetSize;
         public UIntPtr MaximumWorkingSetSize;
-        public UInt32 ActiveProcessLimit;
+        public uint ActiveProcessLimit;
         public UIntPtr Affinity;
-        public UInt32 PriorityClass;
-        public UInt32 SchedulingClass;
+        public uint PriorityClass;
+        public uint SchedulingClass;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     public struct SECURITY_ATTRIBUTES
     {
-        public UInt32 nLength;
+        public uint nLength;
         public IntPtr lpSecurityDescriptor;
-        public Int32 bInheritHandle;
+        public int bInheritHandle;
     }
 
     [StructLayout(LayoutKind.Sequential)]
@@ -174,4 +177,4 @@ namespace ServiceLib.Common
     }
 
     #endregion Helper classes
-}
+

v2rayN/ServiceLib/Common/WindowsUtils.cs

@@ -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);
         }
     }
 }

v2rayN/ServiceLib/Common/YamlUtils.cs

@@ -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
+}

v2rayN/ServiceLib/Enums/EConfigType.cs

@@ -1,16 +1,18 @@
-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,
+    PolicyGroup = 101,
+    ProxyChain = 102,
+}

v2rayN/ServiceLib/Enums/ECoreType.cs

@@ -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
 }

v2rayN/ServiceLib/Enums/EGirdOrientation.cs

@@ -1,9 +1,8 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EGirdOrientation
 {
-    public enum EGirdOrientation
-    {
-        Horizontal,
-        Vertical,
-        Tab,
-    }
-}
+    Horizontal,
+    Vertical,
+    Tab,
+}

v2rayN/ServiceLib/Enums/EGlobalHotkey.cs

@@ -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,
+}

v2rayN/ServiceLib/Enums/EInboundProtocol.cs

@@ -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
+}

v2rayN/ServiceLib/Enums/EMove.cs

@@ -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
+}

v2rayN/ServiceLib/Enums/EMsgCommand.cs

@@ -1,12 +0,0 @@
-namespace ServiceLib.Enums
-{
-    public enum EMsgCommand
-    {
-        ClearMsg,
-        SendMsgView,
-        SendSnackMsg,
-        RefreshProfiles,
-        StopSpeedtest,
-        AppExit
-    }
-}

v2rayN/ServiceLib/Enums/EMultipleLoad.cs

@@ -0,0 +1,10 @@
+namespace ServiceLib.Enums;
+
+public enum EMultipleLoad
+{
+    LeastPing,
+    Fallback,
+    Random,
+    RoundRobin,
+    LeastLoad
+}

v2rayN/ServiceLib/Enums/EPresetType.cs

@@ -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,
+}

v2rayN/ServiceLib/Enums/ERuleMode.cs

@@ -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
+}

v2rayN/ServiceLib/Enums/ERuleType.cs

@@ -0,0 +1,8 @@
+namespace ServiceLib.Enums;
+
+public enum ERuleType
+{
+    ALL = 0,
+    Routing = 1,
+    DNS = 2,
+}

v2rayN/ServiceLib/Enums/EServerColName.cs

@@ -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
+}

v2rayN/ServiceLib/Enums/ESpeedActionType.cs

@@ -1,10 +1,9 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ESpeedActionType
 {
-    public enum ESpeedActionType
-    {
-        Tcping,
-        Realping,
-        Speedtest,
-        Mixedtest
-    }
-}
+    Tcping,
+    Realping,
+    Speedtest,
+    Mixedtest
+}

v2rayN/ServiceLib/Enums/ESysProxyType.cs

@@ -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
+}

v2rayN/ServiceLib/Enums/ETheme.cs

@@ -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
+}

v2rayN/ServiceLib/Enums/ETransport.cs

@@ -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
+}

v2rayN/ServiceLib/Enums/EViewAction.cs

@@ -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,
+}

v2rayN/ServiceLib/Events/AppEvents.cs

@@ -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();
+}

v2rayN/ServiceLib/Events/EventChannel.cs

@@ -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);
+    }
+}

v2rayN/ServiceLib/Global.cs

@@ -1,152 +1,167 @@
-namespace ServiceLib
+namespace ServiceLib;
+
+public class Global
 {
-    public class Global
-    {
-        #region const
+    #region const
 
-        public const string AppName = "v2rayN";
-        public const string GithubUrl = "https://github.com";
-        public const string GithubApiUrl = "https://api.github.com/repos";
-        public const string GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
-        public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
-        public const string SingboxRulesetUrl = @"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-{0}/{1}.srs";
-        public const string IPAPIUrl = "https://api.ip.sb/geoip";
+    public const string AppName = "v2rayN";
+    public const string GithubUrl = "https://github.com";
+    public const string GithubApiUrl = "https://api.github.com/repos";
+    public const string GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
+    public const string SingboxRulesetUrl = @"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-{0}/{1}.srs";
 
-        public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
-        public const string ConfigFileName = "guiNConfig.json";
-        public const string CoreConfigFileName = "config.json";
-        public const string CorePreConfigFileName = "configPre.json";
-        public const string CoreSpeedtestConfigFileName = "configSpeedtest.json";
-        public const string CoreMultipleLoadConfigFileName = "configMultipleLoad.json";
-        public const string ClashMixinConfigFileName = "Mixin.yaml";
+    public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
+    public const string ConfigFileName = "guiNConfig.json";
+    public const string CoreConfigFileName = "config.json";
+    public const string CorePreConfigFileName = "configPre.json";
+    public const string CoreSpeedtestConfigFileName = "configTest{0}.json";
+    public const string CoreMultipleLoadConfigFileName = "configMultipleLoad.json";
+    public const string ClashMixinConfigFileName = "Mixin.yaml";
 
-        public const string NamespaceSample = "ServiceLib.Sample.";
-        public const string V2raySampleClient = NamespaceSample + "SampleClientConfig";
-        public const string SingboxSampleClient = NamespaceSample + "SingboxSampleClientConfig";
-        public const string V2raySampleHttpRequestFileName = NamespaceSample + "SampleHttpRequest";
-        public const string V2raySampleHttpResponseFileName = NamespaceSample + "SampleHttpResponse";
-        public const string V2raySampleInbound = NamespaceSample + "SampleInbound";
-        public const string V2raySampleOutbound = NamespaceSample + "SampleOutbound";
-        public const string SingboxSampleOutbound = NamespaceSample + "SingboxSampleOutbound";
-        public const string CustomRoutingFileName = NamespaceSample + "custom_routing_";
-        public const string TunSingboxDNSFileName = NamespaceSample + "tun_singbox_dns";
-        public const string TunSingboxInboundFileName = NamespaceSample + "tun_singbox_inbound";
-        public const string TunSingboxRulesFileName = NamespaceSample + "tun_singbox_rules";
-        public const string DNSV2rayNormalFileName = NamespaceSample + "dns_v2ray_normal";
-        public const string DNSSingboxNormalFileName = NamespaceSample + "dns_singbox_normal";
-        public const string ClashMixinYaml = NamespaceSample + "clash_mixin_yaml";
-        public const string ClashTunYaml = NamespaceSample + "clash_tun_yaml";
-        public const string LinuxAutostartConfig = NamespaceSample + "linux_autostart_config";
-        public const string PacFileName = NamespaceSample + "pac";
+    public const string NamespaceSample = "ServiceLib.Sample.";
+    public const string V2raySampleClient = NamespaceSample + "SampleClientConfig";
+    public const string SingboxSampleClient = NamespaceSample + "SingboxSampleClientConfig";
+    public const string V2raySampleHttpRequestFileName = NamespaceSample + "SampleHttpRequest";
+    public const string V2raySampleHttpResponseFileName = NamespaceSample + "SampleHttpResponse";
+    public const string V2raySampleInbound = NamespaceSample + "SampleInbound";
+    public const string V2raySampleOutbound = NamespaceSample + "SampleOutbound";
+    public const string SingboxSampleOutbound = NamespaceSample + "SingboxSampleOutbound";
+    public const string CustomRoutingFileName = NamespaceSample + "custom_routing_";
+    public const string TunSingboxDNSFileName = NamespaceSample + "tun_singbox_dns";
+    public const string TunSingboxInboundFileName = NamespaceSample + "tun_singbox_inbound";
+    public const string TunSingboxRulesFileName = NamespaceSample + "tun_singbox_rules";
+    public const string DNSV2rayNormalFileName = NamespaceSample + "dns_v2ray_normal";
+    public const string DNSSingboxNormalFileName = NamespaceSample + "dns_singbox_normal";
+    public const string ClashMixinYaml = NamespaceSample + "clash_mixin_yaml";
+    public const string ClashTunYaml = NamespaceSample + "clash_tun_yaml";
+    public const string LinuxAutostartConfig = NamespaceSample + "linux_autostart_config";
+    public const string PacFileName = NamespaceSample + "pac";
+    public const string ProxySetOSXShellFileName = NamespaceSample + "proxy_set_osx_sh";
+    public const string ProxySetLinuxShellFileName = NamespaceSample + "proxy_set_linux_sh";
+    public const string KillAsSudoOSXShellFileName = NamespaceSample + "kill_as_sudo_osx_sh";
+    public const string KillAsSudoLinuxShellFileName = NamespaceSample + "kill_as_sudo_linux_sh";
+    public const string SingboxFakeIPFilterFileName = NamespaceSample + "singbox_fakeip_filter";
 
-        public const string DefaultSecurity = "auto";
-        public const string DefaultNetwork = "tcp";
-        public const string TcpHeaderHttp = "http";
-        public const string None = "none";
-        public const string ProxyTag = "proxy";
-        public const string DirectTag = "direct";
-        public const string BlockTag = "block";
-        public const string StreamSecurity = "tls";
-        public const string StreamSecurityReality = "reality";
-        public const string Loopback = "127.0.0.1";
-        public const string InboundAPIProtocol = "dokodemo-door";
-        public const string HttpProtocol = "http://";
-        public const string HttpsProtocol = "https://";
-        public const string SocksProtocol = "socks://";
-        public const string Socks5Protocol = "socks5://";
+    public const string DefaultSecurity = "auto";
+    public const string DefaultNetwork = "tcp";
+    public const string TcpHeaderHttp = "http";
+    public const string None = "none";
+    public const string ProxyTag = "proxy";
+    public const string DirectTag = "direct";
+    public const string BlockTag = "block";
+    public const string DnsTag = "dns-module";
+    public const string BalancerTagSuffix = "-round";
+    public const string StreamSecurity = "tls";
+    public const string StreamSecurityReality = "reality";
+    public const string Loopback = "127.0.0.1";
+    public const string InboundAPIProtocol = "dokodemo-door";
+    public const string HttpProtocol = "http://";
+    public const string HttpsProtocol = "https://";
+    public const string SocksProtocol = "socks://";
+    public const string Socks5Protocol = "socks5://";
+    public const string AsIs = "AsIs";
+    public const string IPIfNonMatch = "IPIfNonMatch";
+    public const string IPOnDemand = "IPOnDemand";
 
-        public const string UserEMail = "t@t.tt";
-        public const string AutoRunRegPath = @"Software\Microsoft\Windows\CurrentVersion\Run";
-        public const string AutoRunName = "v2rayNAutoRun";
-        public const string SystemProxyExceptionsWindows = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*";
-        public const string SystemProxyExceptionsLinux = "localhost,127.0.0.0/8,::1";
-        public const string RoutingRuleComma = "<COMMA>";
-        public const string GrpcGunMode = "gun";
-        public const string GrpcMultiMode = "multi";
-        public const int MaxPort = 65536;
-        public const string DelayUnit = "";
-        public const string SpeedUnit = "";
-        public const int MinFontSize = 8;
-        public const string RebootAs = "rebootas";
-        public const string AvaAssets = "avares://v2rayN/Assets/";
-        public const string LocalAppData = "V2RAYN_LOCAL_APPLICATION_DATA";
-        public const string V2RayLocalAsset = "V2RAY_LOCATION_ASSET";
-        public const string XrayLocalAsset = "XRAY_LOCATION_ASSET";
+    public const string UserEMail = "t@t.tt";
+    public const string AutoRunRegPath = @"Software\Microsoft\Windows\CurrentVersion\Run";
+    public const string AutoRunName = "v2rayNAutoRun";
+    public const string SystemProxyExceptionsWindows = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*";
+    public const string SystemProxyExceptionsLinux = "localhost,127.0.0.0/8,::1";
+    public const string RoutingRuleComma = "<COMMA>";
+    public const string GrpcGunMode = "gun";
+    public const string GrpcMultiMode = "multi";
+    public const int MaxPort = 65536;
+    public const int MinFontSize = 8;
+    public const string RebootAs = "rebootas";
+    public const string AvaAssets = "avares://v2rayN/Assets/";
+    public const string LocalAppData = "V2RAYN_LOCAL_APPLICATION_DATA_V2";
+    public const string V2RayLocalAsset = "V2RAY_LOCATION_ASSET";
+    public const string XrayLocalAsset = "XRAY_LOCATION_ASSET";
+    public const string XrayLocalCert = "XRAY_LOCATION_CERT";
+    public const int SpeedTestPageSize = 1000;
+    public const string LinuxBash = "/bin/bash";
 
-        public static readonly List<string> IEProxyProtocols =
-        [
-            "{ip}:{http_port}",
+    public const string SingboxDirectDNSTag = "direct_dns";
+    public const string SingboxRemoteDNSTag = "remote_dns";
+    public const string SingboxLocalDNSTag = "local_local";
+    public const string SingboxHostsDNSTag = "hosts_dns";
+    public const string SingboxFakeDNSTag = "fake_dns";
+
+    public static readonly List<string> IEProxyProtocols =
+    [
+        "{ip}:{http_port}",
             "socks={ip}:{socks_port}",
             "http={ip}:{http_port};https={ip}:{http_port};ftp={ip}:{http_port};socks={ip}:{socks_port}",
             "http=http://{ip}:{http_port};https=http://{ip}:{http_port}",
             ""
-        ];
+    ];
 
-        public static readonly List<string> SubConvertUrls =
-        [
-            @"https://sub.xeton.dev/sub?url={0}",
+    public static readonly List<string> SubConvertUrls =
+    [
+        @"https://sub.xeton.dev/sub?url={0}",
             @"https://api.dler.io/sub?url={0}",
             @"http://127.0.0.1:25500/sub?url={0}",
             ""
-        ];
+    ];
 
-        public static readonly List<string> SubConvertConfig =
-            [@"https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online.ini"];
+    public static readonly List<string> SubConvertConfig =
+        [@"https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online.ini"];
 
-        public static readonly List<string> SubConvertTargets =
-        [
-            "",
+    public static readonly List<string> SubConvertTargets =
+    [
+        "",
             "mixed",
             "v2ray",
             "clash",
             "ss"
-        ];
+    ];
 
-        public static readonly List<string> SpeedTestUrls =
-        [
-            @"https://speed.cloudflare.com/__down?bytes=100000000",
-            @"https://speed.cloudflare.com/__down?bytes=50000000",
+    public static readonly List<string> SpeedTestUrls =
+    [
+        @"https://cachefly.cachefly.net/50mb.test",
             @"https://speed.cloudflare.com/__down?bytes=10000000",
-            @"https://cachefly.cachefly.net/50mb.test"
+            @"https://speed.cloudflare.com/__down?bytes=50000000",
+            @"https://speed.cloudflare.com/__down?bytes=100000000",
         ];
 
-        public static readonly List<string> SpeedPingTestUrls =
-        [
-            @"https://www.google.com/generate_204",
+    public static readonly List<string> SpeedPingTestUrls =
+    [
+        @"https://www.google.com/generate_204",
             @"https://www.gstatic.com/generate_204",
             @"https://www.apple.com/library/test/success.html",
             @"http://www.msftconnecttest.com/connecttest.txt"
-        ];
+    ];
 
-        public static readonly List<string> GeoFilesSources =
-        [
-            "",
+    public static readonly List<string> GeoFilesSources =
+    [
+        "",
             @"https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/{0}.dat",
-            @"https://cdn.jsdelivr.net/gh/chocolate4u/Iran-v2ray-rules@release/{0}.dat"
-        ];
+            @"https://github.com/Chocolate4U/Iran-v2ray-rules/releases/latest/download/{0}.dat"
+    ];
 
-        public static readonly List<string> SingboxRulesetSources =
-        [
-            "",
-            @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-rules-dat@release/sing-box/rule-set-{0}/{1}.srs",
-            @"https://cdn.jsdelivr.net/gh/chocolate4u/Iran-sing-box-rules@rule-set/{1}.srs"
-        ];
+    public static readonly List<string> SingboxRulesetSources =
+[
+    "",
+    @"https://raw.githubusercontent.com/runetfreedom/russia-v2ray-rules-dat/release/sing-box/rule-set-{0}/{1}.srs",
+    @"https://raw.githubusercontent.com/chocolate4u/Iran-sing-box-rules/rule-set/{1}.srs"
+];
 
-        public static readonly List<string> RoutingRulesSources =
-        [
-            "",
-            @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-custom-routing-list@main/v2rayN/template.json",
-            @"https://cdn.jsdelivr.net/gh/Chocolate4U/Iran-v2ray-rules@main/v2rayN/template.json"
-        ];
+    public static readonly List<string> RoutingRulesSources =
+    [
+        "",
+    @"https://raw.githubusercontent.com/runetfreedom/russia-v2ray-custom-routing-list/main/v2rayN/template.json",
+    @"https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/main/v2rayN/template.json"
+    ];
 
-        public static readonly List<string> DNSTemplateSources =
-        [
-            "",
-            @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-custom-routing-list@main/v2rayN/",
-            @"https://cdn.jsdelivr.net/gh/Chocolate4U/Iran-v2ray-rules@main/v2rayN/"
-        ];
+    public static readonly List<string> DNSTemplateSources =
+    [
+        "",
+    @"https://raw.githubusercontent.com/runetfreedom/russia-v2ray-custom-routing-list/main/v2rayN/",
+    @"https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/main/v2rayN/"
+    ];
 
-        public static readonly Dictionary<string, string> UserAgentTexts = new()
+    public static readonly Dictionary<string, string> UserAgentTexts = new()
         {
             {"chrome","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36" },
             {"firefox","Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:90.0) Gecko/20100101 Firefox/90.0" },
@@ -155,9 +170,9 @@ namespace ServiceLib
             {"none",""}
         };
 
-        public const string Hysteria2ProtocolShare = "hy2://";
+    public const string Hysteria2ProtocolShare = "hy2://";
 
-        public static readonly Dictionary<EConfigType, string> ProtocolShares = new()
+    public static readonly Dictionary<EConfigType, string> ProtocolShares = new()
         {
             { EConfigType.VMess, "vmess://" },
             { EConfigType.Shadowsocks, "ss://" },
@@ -166,10 +181,11 @@ namespace ServiceLib
             { EConfigType.Trojan, "trojan://" },
             { EConfigType.Hysteria2, "hysteria2://" },
             { EConfigType.TUIC, "tuic://" },
-            { EConfigType.WireGuard, "wireguard://" }
+            { EConfigType.WireGuard, "wireguard://" },
+            { EConfigType.Anytls, "anytls://" }
         };
 
-        public static readonly Dictionary<EConfigType, string> ProtocolTypes = new()
+    public static readonly Dictionary<EConfigType, string> ProtocolTypes = new()
         {
             { EConfigType.VMess, "vmess" },
             { EConfigType.Shadowsocks, "shadowsocks" },
@@ -179,31 +195,32 @@ namespace ServiceLib
             { EConfigType.Trojan, "trojan" },
             { EConfigType.Hysteria2, "hysteria2" },
             { EConfigType.TUIC, "tuic" },
-            { EConfigType.WireGuard, "wireguard" }
+            { EConfigType.WireGuard, "wireguard" },
+            { EConfigType.Anytls, "anytls" }
         };
 
-        public static readonly List<string> VmessSecurities =
-        [
-            "aes-128-gcm",
+    public static readonly List<string> VmessSecurities =
+    [
+        "aes-128-gcm",
             "chacha20-poly1305",
             "auto",
             "none",
             "zero"
-        ];
+    ];
 
-        public static readonly List<string> SsSecurities =
-        [
-            "aes-256-gcm",
+    public static readonly List<string> SsSecurities =
+    [
+        "aes-256-gcm",
             "aes-128-gcm",
             "chacha20-poly1305",
             "chacha20-ietf-poly1305",
             "none",
             "plain"
-        ];
+    ];
 
-        public static readonly List<string> SsSecuritiesInXray =
-        [
-            "aes-256-gcm",
+    public static readonly List<string> SsSecuritiesInXray =
+    [
+        "aes-256-gcm",
             "aes-128-gcm",
             "chacha20-poly1305",
             "chacha20-ietf-poly1305",
@@ -214,11 +231,11 @@ namespace ServiceLib
             "2022-blake3-aes-128-gcm",
             "2022-blake3-aes-256-gcm",
             "2022-blake3-chacha20-poly1305"
-        ];
+    ];
 
-        public static readonly List<string> SsSecuritiesInSingbox =
-        [
-            "aes-256-gcm",
+    public static readonly List<string> SsSecuritiesInSingbox =
+    [
+        "aes-256-gcm",
             "aes-192-gcm",
             "aes-128-gcm",
             "chacha20-ietf-poly1305",
@@ -236,18 +253,18 @@ namespace ServiceLib
             "rc4-md5",
             "chacha20-ietf",
             "xchacha20"
-        ];
+    ];
 
-        public static readonly List<string> Flows =
-        [
-            "",
+    public static readonly List<string> Flows =
+    [
+        "",
             "xtls-rprx-vision",
             "xtls-rprx-vision-udp443"
-        ];
+    ];
 
-        public static readonly List<string> Networks =
-        [
-            "tcp",
+    public static readonly List<string> Networks =
+    [
+        "tcp",
             "kcp",
             "ws",
             "httpupgrade",
@@ -255,49 +272,70 @@ namespace ServiceLib
             "h2",
             "quic",
             "grpc"
-        ];
+    ];
 
-        public static readonly List<string> KcpHeaderTypes =
-        [
-            "srtp",
+    public static readonly List<string> KcpHeaderTypes =
+    [
+        "srtp",
             "utp",
             "wechat-video",
             "dtls",
-            "wireguard"
-        ];
+            "wireguard",
+            "dns"
+    ];
 
-        public static readonly List<string> CoreTypes =
-        [
-            "Xray",
+    public static readonly List<string> CoreTypes =
+    [
+        "Xray",
             "sing_box"
-        ];
+    ];
 
-        public static readonly List<string> DomainStrategies =
-        [
-            "AsIs",
-            "IPIfNonMatch",
-            "IPOnDemand"
-        ];
+    public static readonly HashSet<EConfigType> XraySupportConfigType =
+    [
+        EConfigType.VMess,
+            EConfigType.VLESS,
+            EConfigType.Shadowsocks,
+            EConfigType.Trojan,
+            EConfigType.WireGuard,
+            EConfigType.SOCKS,
+            EConfigType.HTTP,
+    ];
 
-        public static readonly List<string> DomainStrategies4Singbox =
-        [
-            "ipv4_only",
+    public static readonly HashSet<EConfigType> SingboxSupportConfigType =
+    [
+        EConfigType.VMess,
+            EConfigType.VLESS,
+            EConfigType.Shadowsocks,
+            EConfigType.Trojan,
+            EConfigType.Hysteria2,
+            EConfigType.TUIC,
+            EConfigType.Anytls,
+            EConfigType.WireGuard,
+            EConfigType.SOCKS,
+            EConfigType.HTTP,
+    ];
+
+    public static readonly HashSet<EConfigType> SingboxOnlyConfigType = SingboxSupportConfigType.Except(XraySupportConfigType).ToHashSet();
+
+    public static readonly List<string> DomainStrategies =
+    [
+        AsIs,
+        IPIfNonMatch,
+        IPOnDemand
+    ];
+
+    public static readonly List<string> DomainStrategies4Singbox =
+    [
+        "ipv4_only",
             "ipv6_only",
             "prefer_ipv4",
             "prefer_ipv6",
             ""
-        ];
+    ];
 
-        public static readonly List<string> DomainMatchers =
-        [
-            "linear",
-            "mph",
-            ""
-        ];
-
-        public static readonly List<string> Fingerprints =
-        [
-            "chrome",
+    public static readonly List<string> Fingerprints =
+    [
+        "chrome",
             "firefox",
             "safari",
             "ios",
@@ -308,174 +346,201 @@ namespace ServiceLib
             "random",
             "randomized",
             ""
-        ];
+    ];
 
-        public static readonly List<string> UserAgent =
-        [
-            "chrome",
+    public static readonly List<string> UserAgent =
+    [
+        "chrome",
             "firefox",
             "safari",
             "edge",
             "none"
-        ];
+    ];
 
-        public static readonly List<string> XhttpMode =
-        [
-            "auto",
+    public static readonly List<string> XhttpMode =
+    [
+        "auto",
             "packet-up",
             "stream-up",
             "stream-one"
-        ];
+    ];
 
-        public static readonly List<string> AllowInsecure =
-        [
-            "true",
+    public static readonly List<string> AllowInsecure =
+    [
+        "true",
             "false",
             ""
-        ];
+    ];
 
-        public static readonly List<string> DomainStrategy4Freedoms =
-        [
-            "AsIs",
+    public static readonly List<string> DomainStrategy4Freedoms =
+    [
+        "AsIs",
             "UseIP",
             "UseIPv4",
             "UseIPv6",
             ""
-        ];
+    ];
 
-        public static readonly List<string> SingboxDomainStrategy4Out =
-        [
+    public static readonly List<string> SingboxDomainStrategy4Out =
+    [
+        "",
             "ipv4_only",
             "prefer_ipv4",
             "prefer_ipv6",
-            "ipv6_only",
-            ""
-        ];
+            "ipv6_only"
+    ];
 
-        public static readonly List<string> DomainDNSAddress =
-        [
+    public static readonly List<string> DomainDirectDNSAddress =
+    [
+        "https://dns.alidns.com/dns-query",
+            "https://doh.pub/dns-query",
             "223.5.5.5",
-            "223.6.6.6",
+            "119.29.29.29",
             "localhost"
-        ];
+    ];
 
-        public static readonly List<string> SingboxDomainDNSAddress =
-        [
-            "223.5.5.5",
-            "223.6.6.6",
-            "dhcp://auto"
-        ];
+    public static readonly List<string> DomainRemoteDNSAddress =
+    [
+        "https://cloudflare-dns.com/dns-query",
+            "https://dns.cloudflare.com/dns-query",
+            "https://dns.google/dns-query",
+            "https://doh.dns.sb/dns-query",
+            "https://doh.opendns.com/dns-query",
+            "https://common.dot.dns.yandex.net",
+            "8.8.8.8",
+            "1.1.1.1",
+            "185.222.222.222",
+            "208.67.222.222",
+            "77.88.8.8"
+    ];
 
-        public static readonly List<string> Languages =
-        [
-            "zh-Hans",
+    public static readonly List<string> DomainPureIPDNSAddress =
+    [
+        "223.5.5.5",
+            "119.29.29.29",
+            "localhost"
+    ];
+
+    public static readonly List<string> Languages =
+    [
+        "zh-Hans",
             "zh-Hant",
             "en",
             "fa-Ir",
             "ru",
             "hu"
-        ];
+    ];
 
-        public static readonly List<string> Alpns =
-        [
-            "h3",
+    public static readonly List<string> Alpns =
+    [
+        "h3",
             "h2",
             "http/1.1",
             "h3,h2",
             "h2,http/1.1",
             "h3,h2,http/1.1",
             ""
-        ];
+    ];
 
-        public static readonly List<string> LogLevels =
-        [
-            "debug",
+    public static readonly List<string> LogLevels =
+    [
+        "debug",
             "info",
             "warning",
             "error",
             "none"
-        ];
+    ];
 
-        public static readonly List<string> InboundTags =
-        [
-            "socks",
+    public static readonly Dictionary<string, string> LogLevelColors = new()
+    {
+        { "debug",   "#6C757D" },
+        { "info",    "#2ECC71" },
+        { "warning", "#FFA500" },
+        { "error",   "#E74C3C" },
+    };
+
+    public static readonly List<string> InboundTags =
+    [
+        "socks",
             "socks2",
             "socks3"
-        ];
+    ];
 
-        public static readonly List<string> RuleProtocols =
-        [
-            "http",
+    public static readonly List<string> RuleProtocols =
+    [
+        "http",
             "tls",
             "bittorrent"
-        ];
+    ];
 
-        public static readonly List<string> RuleNetworks =
-        [
-            "",
+    public static readonly List<string> RuleNetworks =
+    [
+        "",
             "tcp",
             "udp",
             "tcp,udp"
-        ];
+    ];
 
-        public static readonly List<string> destOverrideProtocols =
-        [
-            "http",
+    public static readonly List<string> destOverrideProtocols =
+    [
+        "http",
             "tls",
             "quic",
             "fakedns",
             "fakedns+others"
-        ];
+    ];
 
-        public static readonly List<string> TunMtus =
-        [
-            "1280",
-            "1408",
-            "1500",
-            "9000"
-        ];
+    public static readonly List<int> TunMtus =
+    [
+        1280,
+        1408,
+        1500,
+        4064,
+        9000,
+        65535
+    ];
 
-        public static readonly List<string> TunStacks =
-        [
-            "gvisor",
+    public static readonly List<string> TunStacks =
+    [
+        "gvisor",
             "system",
             "mixed"
-        ];
+    ];
 
-        public static readonly List<string> PresetMsgFilters =
-        [
-            "proxy",
+    public static readonly List<string> PresetMsgFilters =
+    [
+        "proxy",
             "direct",
             "block",
             ""
-        ];
+    ];
 
-        public static readonly List<string> SingboxMuxs =
-        [
-            "h2mux",
+    public static readonly List<string> SingboxMuxs =
+    [
+        "h2mux",
             "smux",
             "yamux",
             ""
-        ];
+    ];
 
-        public static readonly List<string> TuicCongestionControls =
-        [
-            "cubic",
+    public static readonly List<string> TuicCongestionControls =
+    [
+        "cubic",
             "new_reno",
             "bbr"
-        ];
+    ];
 
-        public static readonly List<string> allowSelectType =
-        [
-            "selector",
+    public static readonly List<string> allowSelectType =
+    [
+        "selector",
             "urltest",
             "loadbalance",
             "fallback"
-        ];
+    ];
 
-        public static readonly List<string> notAllowTestType =
-        [
-            "selector",
+    public static readonly List<string> notAllowTestType =
+    [
+        "selector",
             "urltest",
             "direct",
             "reject",
@@ -483,15 +548,15 @@ namespace ServiceLib
             "pass",
             "loadbalance",
             "fallback"
-        ];
+    ];
 
-        public static readonly List<string> proxyVehicleType =
-        [
-            "file",
+    public static readonly List<string> proxyVehicleType =
+    [
+        "file",
             "http"
-        ];
+    ];
 
-        public static readonly Dictionary<ECoreType, string> CoreUrls = new()
+    public static readonly Dictionary<ECoreType, string> CoreUrls = new()
         {
             { ECoreType.v2fly, "v2fly/v2ray-core" },
             { ECoreType.v2fly_v5, "v2fly/v2ray-core" },
@@ -505,9 +570,60 @@ namespace ServiceLib
             { ECoreType.juicity, "juicity/juicity" },
             { ECoreType.brook, "txthinking/brook" },
             { ECoreType.overtls, "ShadowsocksR-Live/overtls" },
+            { ECoreType.shadowquic, "spongebob888/shadowquic" },
+            { ECoreType.mieru, "enfein/mieru" },
             { ECoreType.v2rayN, "2dust/v2rayN" },
         };
 
-        #endregion const
-    }
+    public static readonly List<string> OtherGeoUrls =
+    [
+        @"https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat",
+            @"https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb",
+            @"https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb"
+    ];
+
+    public static readonly List<string> IPAPIUrls =
+    [
+        @"https://speed.cloudflare.com/meta",
+        @"https://api.ip.sb/geoip",
+        @"https://api-ipv4.ip.sb/geoip",
+        @"https://api-ipv6.ip.sb/geoip",
+        @"https://api.ipapi.is",
+        @""
+    ];
+
+    public static readonly List<string> OutboundTags =
+    [
+        ProxyTag,
+        DirectTag,
+        BlockTag
+    ];
+
+    public static readonly Dictionary<string, List<string>> PredefinedHosts = new()
+        {
+            { "dns.google", new List<string> { "8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844" } },
+            { "dns.alidns.com", new List<string> { "223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1" } },
+            { "one.one.one.one", new List<string> { "1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001" } },
+            { "1dot1dot1dot1.cloudflare-dns.com", new List<string> { "1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001" } },
+            { "cloudflare-dns.com", new List<string> { "104.16.249.249", "104.16.248.249", "2606:4700::6810:f8f9", "2606:4700::6810:f9f9" } },
+            { "dns.cloudflare.com", new List<string> { "104.16.132.229", "104.16.133.229", "2606:4700::6810:84e5", "2606:4700::6810:85e5" } },
+            { "dot.pub", new List<string> { "1.12.12.12", "120.53.53.53" } },
+            { "doh.pub", new List<string> { "1.12.12.12", "120.53.53.53" } },
+            { "dns.quad9.net", new List<string> { "9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9" } },
+            { "dns.yandex.net", new List<string> { "77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff" } },
+            { "dns.sb", new List<string> { "185.222.222.222", "2a09::" } },
+            { "dns.umbrella.com", new List<string> { "208.67.220.220", "208.67.222.222", "2620:119:35::35", "2620:119:53::53" } },
+            { "dns.sse.cisco.com", new List<string> { "208.67.220.220", "208.67.222.222", "2620:119:35::35", "2620:119:53::53" } },
+            { "engage.cloudflareclient.com", new List<string> { "162.159.192.1", "2606:4700:d0::a29f:c001" } }
+        };
+
+    public static readonly List<string> ExpectedIPs =
+    [
+        "geoip:cn",
+            "geoip:ir",
+            "geoip:ru",
+            ""
+    ];
+
+    #endregion const
 }

v2rayN/ServiceLib/GlobalUsings.cs

@@ -1,11 +1,36 @@
-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.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;

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -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
-    }
-}

v2rayN/ServiceLib/Handler/AutoStartupHandler.cs

@@ -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.IsOSX())
+        {
+            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
 }

v2rayN/ServiceLib/Handler/ClashApiHandler.cs

@@ -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 (int 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;
-
-            List<Task> 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}";
-                Dictionary<string, string> 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";
-                Dictionary<string, string> 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}";
-        }
-    }
-}

v2rayN/ServiceLib/Handler/ConnectionHandler.cs

@@ -0,0 +1,68 @@
+namespace ServiceLib.Handler;
+
+public static class ConnectionHandler
+{
+    private static readonly string _tag = "ConnectionHandler";
+
+    public static async Task<string> RunAvailabilityCheck()
+    {
+        var time = await GetRealPingTime();
+        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> GetRealPingTime()
+    {
+        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 HttpClientHelper.Instance.GetRealPingTime(url, webProxy, 10);
+                if (responseTime > 0)
+                {
+                    break;
+                }
+                await Task.Delay(500);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            return -1;
+        }
+        return responseTime;
+    }
+}

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -1,132 +1,135 @@
-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(ProfileItem node, string? fileName)
     {
-        private static readonly string _tag = "CoreConfigHandler";
+        var config = AppManager.Instance.Config;
+        var result = new RetResult();
 
-        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),
+                ECoreType.sing_box => await new CoreConfigSingboxService(config).GenerateClientCustomConfig(node, fileName),
+                _ => await GenerateClientCustomConfig(node, fileName)
+            };
+        }
+        else if (AppManager.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;
         }
-
-        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);
+            }
+
+            string 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();
+        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> GenerateClientSpeedtestConfig(Config config, ProfileItem node, 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 (AppManager.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
+        {
+            result = await new CoreConfigSingboxService(config).GenerateClientSpeedtestConfig(node, port);
+        }
+        else
+        {
+            result = await new CoreConfigV2rayService(config).GenerateClientSpeedtestConfig(node, port);
+        }
+        if (result.Success != true)
+        {
+            return result;
+        }
+
+        await File.WriteAllTextAsync(fileName, result.Data.ToString());
+        return result;
+    }
+}

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -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(true, 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
-    }
-}

v2rayN/ServiceLib/Handler/Fmt/AnytlsFmt.cs

@@ -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.Id = rawUserInfo;
+
+        var query = Utils.ParseQueryString(parsedUrl.Query);
+        _ = ResolveStdTransport(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.Id;
+        var dicQuery = new Dictionary<string, string>();
+        _ = GetStdTransport(item, Global.None, ref dicQuery);
+
+        return ToUri(EConfigType.Anytls, item.Address, item.Port, pw, dicQuery, remark);
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -1,240 +1,251 @@
 using System.Collections.Specialized;
 
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class BaseFmt
 {
-    public class BaseFmt
+    protected static string GetIpv6(string address)
     {
-        protected static string GetIpv6(string address)
+        if (Utils.IsIpv6(address))
         {
-            if (Utils.IsIpv6(address))
-            {
-                // 检查地址是否已经被方括号包围，如果没有，则添加方括号
-                return address.StartsWith('[') && address.EndsWith(']') ? address : $"[{address}]";
-            }
-            return address;  // 如果不是IPv6地址，直接返回原地址
+            // 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 GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
+    {
+        if (item.Flow.IsNotEmpty())
+        {
+            dicQuery.Add("flow", item.Flow);
         }
 
-        protected static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
+        if (item.StreamSecurity.IsNotEmpty())
         {
-            if (Utils.IsNotEmpty(item.Flow))
+            dicQuery.Add("security", item.StreamSecurity);
+        }
+        else
+        {
+            if (securityDef != null)
             {
-                dicQuery.Add("flow", item.Flow);
+                dicQuery.Add("security", securityDef);
             }
+        }
+        if (item.Sni.IsNotEmpty())
+        {
+            dicQuery.Add("sni", item.Sni);
+        }
+        if (item.Alpn.IsNotEmpty())
+        {
+            dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
+        }
+        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));
+        }
+        if (item.AllowInsecure.Equals("true"))
+        {
+            dicQuery.Add("allowInsecure", "1");
+        }
 
-            if (Utils.IsNotEmpty(item.StreamSecurity))
-            {
-                dicQuery.Add("security", item.StreamSecurity);
-            }
-            else
-            {
-                if (securityDef != null)
+        dicQuery.Add("type", item.Network.IsNotEmpty() ? item.Network : nameof(ETransport.tcp));
+
+        switch (item.Network)
+        {
+            case nameof(ETransport.tcp):
+                dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
+                if (item.RequestHost.IsNotEmpty())
                 {
-                    dicQuery.Add("security", securityDef);
+                    dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
                 }
-            }
-            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.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");
-            }
+                break;
 
-            dicQuery.Add("type", Utils.IsNotEmpty(item.Network) ? item.Network : nameof(ETransport.tcp));
+            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;
 
-            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;
+            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.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.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())
+                {
+                    dicQuery.Add("extra", Utils.UrlEncode(item.Extra));
+                }
+                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.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.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.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;
-
-                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;
-
-                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;
-
-                case nameof(ETransport.grpc):
-                    if (Utils.IsNotEmpty(item.Path))
-                    {
-                        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));
-                        }
-                    }
-                    break;
-            }
-            return 0;
+                }
+                break;
         }
+        return 0;
+    }
 
-        protected static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
+    protected static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
+    {
+        item.Flow = GetQueryValue(query, "flow");
+        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.AllowInsecure = new[] { "allowInsecure", "allow_insecure", "insecure" }.Any(k => (query[k] ?? "") == "1") ? "true" : "";
+
+        item.Network = GetQueryValue(query, "type", nameof(ETransport.tcp));
+        switch (item.Network)
         {
-            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" : "";
+            case nameof(ETransport.tcp):
+                item.HeaderType = GetQueryValue(query, "headerType", Global.None);
+                item.RequestHost = GetQueryDecoded(query, "host");
+                break;
 
-            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"] ?? "");
+            case nameof(ETransport.kcp):
+                item.HeaderType = GetQueryValue(query, "headerType", Global.None);
+                item.Path = GetQueryDecoded(query, "seed");
+                break;
 
-                    break;
+            case nameof(ETransport.ws):
+            case nameof(ETransport.httpupgrade):
+                item.RequestHost = GetQueryDecoded(query, "host");
+                item.Path = GetQueryDecoded(query, "path", "/");
+                break;
 
-                case nameof(ETransport.kcp):
-                    item.HeaderType = query["headerType"] ?? Global.None;
-                    item.Path = Utils.UrlDecode(query["seed"] ?? "");
-                    break;
+            case nameof(ETransport.xhttp):
+                item.RequestHost = GetQueryDecoded(query, "host");
+                item.Path = GetQueryDecoded(query, "path", "/");
+                item.HeaderType = GetQueryDecoded(query, "mode");
+                item.Extra = GetQueryDecoded(query, "extra");
+                break;
 
-                case nameof(ETransport.ws):
-                case nameof(ETransport.httpupgrade):
-                    item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
-                    item.Path = Utils.UrlDecode(query["path"] ?? "/");
-                    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.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.quic):
+                item.HeaderType = GetQueryValue(query, "headerType", Global.None);
+                item.RequestHost = GetQueryValue(query, "quicSecurity", Global.None);
+                item.Path = GetQueryDecoded(query, "key");
+                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.grpc):
+                item.RequestHost = GetQueryDecoded(query, "authority");
+                item.Path = GetQueryDecoded(query, "serviceName");
+                item.HeaderType = GetQueryDecoded(query, "mode", Global.GrpcGunMode);
+                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;
+            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 bool Contains(string str, params string[] s)
+    {
+        return s.All(item => str.Contains(item, StringComparison.OrdinalIgnoreCase));
+    }
 
-        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 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;
+    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}";
-        }
+        var url = $"{Utils.UrlEncode(userInfo)}@{GetIpv6(address)}:{port}";
+        return $"{Global.ProtocolShares[eConfigType]}{url}{query}{remark}";
+    }
+
+    protected static string GetQueryValue(NameValueCollection query, string key, string defaultValue = "")
+    {
+        return query[key] ?? defaultValue;
+    }
+
+    protected static string GetQueryDecoded(NameValueCollection query, string key, string defaultValue = "")
+    {
+        return Utils.UrlDecode(GetQueryValue(query, key, defaultValue));
     }
 }

v2rayN/ServiceLib/Handler/Fmt/ClashFmt.cs

@@ -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;
     }
-}
+}

v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs

@@ -1,92 +1,96 @@
-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),
+                _ => 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
+        {
+            string 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
+            {
+                msg = ResUI.NonvmessOrssProtocol;
                 return null;
             }
         }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            msg = ResUI.Incorrectconfiguration;
+            return null;
+        }
     }
-}
+}

v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs

@@ -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");
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs

@@ -1,96 +1,83 @@
-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.Id = Utils.UrlDecode(url.UserInfo);
+
+        var query = Utils.ParseQueryString(url.Query);
+        ResolveStdTransport(query, ref item);
+        item.Path = GetQueryDecoded(query, "obfs-password");
+        item.AllowInsecure = GetQueryValue(query, "insecure") == "1" ? "true" : "false";
+
+        item.Ports = GetQueryDecoded(query, "mport");
+
+        return item;
+    }
+
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
+            return null;
+        string url = string.Empty;
+
+        string remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+        var dicQuery = new Dictionary<string, string>();
+        if (item.Sni.IsNotEmpty())
+        {
+            dicQuery.Add("sni", item.Sni);
+        }
+        if (item.Alpn.IsNotEmpty())
+        {
+            dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
+        }
+        if (item.Path.IsNotEmpty())
+        {
+            dicQuery.Add("obfs", "salamander");
+            dicQuery.Add("obfs-password", Utils.UrlEncode(item.Path));
+        }
+        dicQuery.Add("insecure", item.AllowInsecure.ToLower() == "true" ? "1" : "0");
+        if (item.Ports.IsNotEmpty())
+        {
+            dicQuery.Add("mport", Utils.UrlEncode(item.Ports.Replace(':', '-')));
+        }
+
+        return ToUri(EConfigType.Hysteria2, item.Address, item.Port, item.Id, 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
             {
-                ConfigType = EConfigType.Hysteria2
+                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;
     }
 }

v2rayN/ServiceLib/Handler/Fmt/NaiveproxyFmt.cs

@@ -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;
-        }
-    }
-}

v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs

@@ -1,174 +1,177 @@
-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;
+            return null;
+        }
+        if (item.Address.Length == 0 || item.Port == 0 || item.Security.Length == 0 || item.Id.Length == 0)
+        {
+            return null;
         }
 
-        public static string? ToUri(ProfileItem? item)
-        {
-            if (item == null)
-                return null;
-            string url = string.Empty;
+        item.ConfigType = EConfigType.Shadowsocks;
 
-            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);
+        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.Security}:{item.Id}", true);
+        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;
         }
 
-        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)
+        ProfileItem item = new();
+        var base64 = match.Groups["base64"].Value.TrimEnd('/');
+        var tag = match.Groups["tag"].Value;
+        if (tag.IsNotEmpty())
         {
-            var match = UrlFinder.Match(result);
-            if (!match.Success)
-                return null;
+            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 = details.Groups["port"].Value.ToInt();
+        return item;
+    }
 
-            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;
         }
 
-        private static ProfileItem? ResolveSip002(string result)
+        ProfileItem item = new()
         {
-            var parsedUrl = Utils.TryUri(result);
-            if (parsedUrl == null)
+            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.Security = userInfoParts.First();
+            item.Id = 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.Security = userInfoParts.First();
+            item.Id = userInfoParts.Last();
+        }
 
-            ProfileItem item = new()
+        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") && obfsHost.IsNotEmpty())
             {
-                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());
+                obfsHost = obfsHost?.Replace("obfs-host=", "");
+                item.Network = Global.DefaultNetwork;
+                item.HeaderType = Global.TcpHeaderHttp;
+                item.RequestHost = obfsHost ?? "";
             }
             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();
+                return null;
             }
-
-            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)
+        return item;
+    }
+
+    public static List<ProfileItem>? ResolveSip008(string result)
+    {
+        //SsSIP008
+        var lstSsServer = JsonUtils.Deserialize<List<SsServer>>(result);
+        if (lstSsServer?.Count <= 0)
         {
-            //SsSIP008
-            var lstSsServer = JsonUtils.Deserialize<List<SsServer>>(result);
-            if (lstSsServer?.Count <= 0)
+            var ssSIP008 = JsonUtils.Deserialize<SsSIP008>(result);
+            if (ssSIP008?.servers?.Count > 0)
             {
-                var ssSIP008 = JsonUtils.Deserialize<SsSIP008>(result);
-                if (ssSIP008?.servers?.Count > 0)
-                {
-                    lstSsServer = ssSIP008.servers;
-                }
+                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 (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 = it.server_port.ToInt()
+                };
+                lst.Add(ssItem);
+            }
+            return lst;
+        }
+        return null;
     }
 }

v2rayN/ServiceLib/Handler/Fmt/SingboxFmt.cs

@@ -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;
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/SocksFmt.cs

@@ -1,113 +1,114 @@
-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.Security}:{item.Id}", 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, result.Length - 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.Security = arr21.First();
+        item.Id = arr21[1];
 
-            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;
+    }
 
-            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;
+            Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+            Address = parsedUrl.IdnHost,
+            Port = parsedUrl.Port,
+        };
 
-            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;
+        // 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;
     }
 }

v2rayN/ServiceLib/Handler/Fmt/TrojanFmt.cs

@@ -1,46 +1,47 @@
-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.Id = Utils.UrlDecode(url.UserInfo);
+
+        var query = Utils.ParseQueryString(url.Query);
+        _ = ResolveStdTransport(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>();
+        _ = GetStdTransport(item, null, ref dicQuery);
+
+        return ToUri(EConfigType.Trojan, item.Address, item.Port, item.Id, dicQuery, remark);
     }
 }

v2rayN/ServiceLib/Handler/Fmt/TuicFmt.cs

@@ -1,61 +1,63 @@
-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.Id = userInfoParts.First();
+            item.Security = userInfoParts.Last();
         }
+
+        var query = Utils.ParseQueryString(url.Query);
+        ResolveStdTransport(query, ref item);
+        item.HeaderType = 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>();
+        if (item.Sni.IsNotEmpty())
+        {
+            dicQuery.Add("sni", item.Sni);
+        }
+        if (item.Alpn.IsNotEmpty())
+        {
+            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);
     }
 }

v2rayN/ServiceLib/Handler/Fmt/V2rayFmt.cs

@@ -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;
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/VLESSFmt.cs

@@ -1,57 +1,59 @@
-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,
+            Security = Global.None
+        };
 
-            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.Id = Utils.UrlDecode(url.UserInfo);
+
+        var query = Utils.ParseQueryString(url.Query);
+        item.Security = GetQueryValue(query, "encryption", Global.None);
+        item.StreamSecurity = GetQueryValue(query, "security");
+        _ = ResolveStdTransport(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>();
-            if (Utils.IsNotEmpty(item.Security))
-            {
-                dicQuery.Add("encryption", item.Security);
-            }
-            else
-            {
-                dicQuery.Add("encryption", Global.None);
-            }
-            GetStdTransport(item, Global.None, ref dicQuery);
-
-            return ToUri(EConfigType.VLESS, 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.Security.IsNotEmpty())
+        {
+            dicQuery.Add("encryption", item.Security);
+        }
+        else
+        {
+            dicQuery.Add("encryption", Global.None);
+        }
+        _ = GetStdTransport(item, Global.None, ref dicQuery);
+
+        return ToUri(EConfigType.VLESS, item.Address, item.Port, item.Id, dicQuery, remark);
     }
 }

v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs

@@ -1,124 +1,125 @@
-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;
+        }
+        var vmessQRCode = new VmessQRCode
+        {
+            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}";
+
+        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;
         }
 
-        public static string? ToUri(ProfileItem? item)
+        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 = vmessQRCode.scy.IsNotEmpty() ? vmessQRCode.scy : Global.DefaultSecurity;
+        if (vmessQRCode.net.IsNotEmpty())
         {
-            if (item == null)
-                return null;
-            string url = string.Empty;
-
-            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
-            };
-
-            url = JsonUtils.Serialize(vmessQRCode);
-            url = Utils.Base64Encode(url);
-            url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
-
-            return url;
+            item.Network = vmessQRCode.net;
+        }
+        if (vmessQRCode.type.IsNotEmpty())
+        {
+            item.HeaderType = vmessQRCode.type;
         }
 
-        private static ProfileItem? ResolveVmess(string result, out string msg)
+        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;
+    }
+
+    public static ProfileItem? ResolveStdVmess(string str)
+    {
+        var item = new ProfileItem
         {
-            msg = string.Empty;
-            var item = new ProfileItem
-            {
-                ConfigType = EConfigType.VMess
-            };
+            ConfigType = EConfigType.VMess,
+            Security = "auto"
+        };
 
-            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;
+        var url = Utils.TryUri(str);
+        if (url == null)
+        {
+            return null;
         }
 
-        public static ProfileItem? ResolveStdVmess(string str)
-        {
-            ProfileItem item = new()
-            {
-                ConfigType = EConfigType.VMess,
-                Security = "auto"
-            };
+        item.Address = url.IdnHost;
+        item.Port = url.Port;
+        item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+        item.Id = Utils.UrlDecode(url.UserInfo);
 
-            var url = Utils.TryUri(str);
-            if (url == null)
-                return null;
+        var query = Utils.ParseQueryString(url.Query);
+        ResolveStdTransport(query, ref item);
 
-            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;
-        }
+        return item;
     }
 }

v2rayN/ServiceLib/Handler/Fmt/WireguardFmt.cs

@@ -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.Id = Utils.UrlDecode(url.UserInfo);
+
+        var query = Utils.ParseQueryString(url.Query);
+
+        item.PublicKey = GetQueryDecoded(query, "publickey");
+        item.Path = GetQueryDecoded(query, "reserved");
+        item.RequestHost = GetQueryDecoded(query, "address");
+        item.ShortId = GetQueryDecoded(query, "mtu");
+
+        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>();
-            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);
+            return null;
         }
+
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+
+        var dicQuery = new Dictionary<string, string>();
+        if (item.PublicKey.IsNotEmpty())
+        {
+            dicQuery.Add("publickey", Utils.UrlEncode(item.PublicKey));
+        }
+        if (item.Path.IsNotEmpty())
+        {
+            dicQuery.Add("reserved", Utils.UrlEncode(item.Path));
+        }
+        if (item.RequestHost.IsNotEmpty())
+        {
+            dicQuery.Add("address", Utils.UrlEncode(item.RequestHost));
+        }
+        if (item.ShortId.IsNotEmpty())
+        {
+            dicQuery.Add("mtu", Utils.UrlEncode(item.ShortId));
+        }
+        return ToUri(EConfigType.WireGuard, item.Address, item.Port, item.Id, dicQuery, remark);
     }
 }

v2rayN/ServiceLib/Handler/NoticeHandler.cs

@@ -1,44 +0,0 @@
-using ReactiveUI;
-
-namespace ServiceLib.Handler
-{
-    public class NoticeHandler
-    {
-        private static readonly Lazy<NoticeHandler> _instance = new(() => new());
-        public static NoticeHandler Instance => _instance.Value;
-
-        public void Enqueue(string? content)
-        {
-            if (content.IsNullOrEmpty())
-            {
-                return;
-            }
-            MessageBus.Current.SendMessage(content, EMsgCommand.SendSnackMsg.ToString());
-        }
-
-        public void SendMessage(string? content)
-        {
-            if (content.IsNullOrEmpty())
-            {
-                return;
-            }
-            MessageBus.Current.SendMessage(content, EMsgCommand.SendMsgView.ToString());
-        }
-
-        public void SendMessageEx(string? content)
-        {
-            if (content.IsNullOrEmpty())
-            {
-                return;
-            }
-            content = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss} {content}";
-            SendMessage(content);
-        }
-
-        public void SendMessageAndEnqueue(string? msg)
-        {
-            Enqueue(msg);
-            SendMessage(msg);
-        }
-    }
-}

v2rayN/ServiceLib/Handler/PacHandler.cs

@@ -1,106 +0,0 @@
-using System.Net.Sockets;
-using System.Text;
-
-namespace ServiceLib.Handler
-{
-    public class PacHandler
-    {
-        private static string _configPath;
-        private static int _httpPort;
-        private static int _pacPort;
-        private static TcpListener? _tcpListener;
-        private static byte[] _writeContent;
-        private static bool _isRunning;
-        private static bool _needRestart = true;
-
-        public static async Task Start(string configPath, int httpPort, int pacPort)
-        {
-            _needRestart = (configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning);
-
-            _configPath = configPath;
-            _httpPort = httpPort;
-            _pacPort = pacPort;
-
-            await InitText();
-
-            if (_needRestart)
-            {
-                Stop();
-                RunListener();
-            }
-        }
-
-        private static async Task InitText()
-        {
-            var path = Path.Combine(_configPath, "pac.txt");
-            if (!File.Exists(path))
-            {
-                var pac = EmbedUtils.GetEmbedText(Global.PacFileName);
-                await File.AppendAllTextAsync(path, pac);
-            }
-
-            var pacText =
-                (await File.ReadAllTextAsync(path)).Replace("__PROXY__", $"PROXY 127.0.0.1:{_httpPort};DIRECT;");
-
-            var sb = new StringBuilder();
-            sb.AppendLine("HTTP/1.0 200 OK");
-            sb.AppendLine("Content-type:application/x-ns-proxy-autoconfig");
-            sb.AppendLine("Connection:close");
-            sb.AppendLine("Content-Length:" + Encoding.UTF8.GetByteCount(pacText));
-            sb.AppendLine();
-            sb.Append(pacText);
-            _writeContent = Encoding.UTF8.GetBytes(sb.ToString());
-        }
-
-        private static void RunListener()
-        {
-            _tcpListener = TcpListener.Create(_pacPort);
-            _isRunning = true;
-            _tcpListener.Start();
-            Task.Factory.StartNew(async () =>
-            {
-                while (_isRunning)
-                {
-                    try
-                    {
-                        if (!_tcpListener.Pending())
-                        {
-                            await Task.Delay(10);
-                            continue;
-                        }
-
-                        var client = await _tcpListener.AcceptTcpClientAsync();
-                        await Task.Run(() => { WriteContent(client); });
-                    }
-                    catch
-                    {
-                        // ignored
-                    }
-                }
-            }, TaskCreationOptions.LongRunning);
-        }
-
-        private static void WriteContent(TcpClient client)
-        {
-            var stream = client.GetStream();
-            stream.Write(_writeContent, 0, _writeContent.Length);
-            stream.Flush();
-        }
-
-        public static void Stop()
-        {
-            if (_tcpListener == null)
-                return;
-            try
-            {
-                _isRunning = false;
-                _tcpListener.Stop();
-                _tcpListener = null;
-            }
-            catch
-            {
-                // ignored
-            }
-        }
-    }
-}

v2rayN/ServiceLib/Handler/ProfileExHandler.cs

@@ -1,183 +0,0 @@
-using System.Collections.Concurrent;
-
-//using System.Reactive.Linq;
-
-namespace ServiceLib.Handler
-{
-    public class ProfileExHandler
-    {
-        private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
-        private ConcurrentBag<ProfileExItem> _lstProfileEx = [];
-        private Queue<string> _queIndexIds = new();
-        public static ProfileExHandler Instance => _instance.Value;
-        private static readonly string _tag = "ProfileExHandler";
-
-        public ProfileExHandler()
-        {
-            //Init();
-        }
-
-        public async Task Init()
-        {
-            await InitData();
-            _ = Task.Run(async () =>
-            {
-                while (true)
-                {
-                    await Task.Delay(1000 * 600);
-                    await SaveQueueIndexIds();
-                }
-            });
-        }
-
-        public async Task<ConcurrentBag<ProfileExItem>> GetProfileExs()
-        {
-            return await Task.FromResult(_lstProfileEx);
-        }
-
-        private async Task InitData()
-        {
-            await SQLiteHelper.Instance.ExecuteAsync($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
-
-            _lstProfileEx = new(await SQLiteHelper.Instance.TableAsync<ProfileExItem>().ToListAsync());
-        }
-
-        private void IndexIdEnqueue(string indexId)
-        {
-            if (Utils.IsNotEmpty(indexId) && !_queIndexIds.Contains(indexId))
-            {
-                _queIndexIds.Enqueue(indexId);
-            }
-        }
-
-        private async Task SaveQueueIndexIds()
-        {
-            var cnt = _queIndexIds.Count;
-            if (cnt > 0)
-            {
-                var lstExists = await SQLiteHelper.Instance.TableAsync<ProfileExItem>().ToListAsync();
-                List<ProfileExItem> lstInserts = [];
-                List<ProfileExItem> lstUpdates = [];
-
-                for (int i = 0; i < cnt; i++)
-                {
-                    var id = _queIndexIds.Dequeue();
-                    var item = lstExists.FirstOrDefault(t => t.IndexId == id);
-                    var itemNew = _lstProfileEx?.FirstOrDefault(t => t.IndexId == id);
-                    if (itemNew is null)
-                    {
-                        continue;
-                    }
-
-                    if (item is not null)
-                    {
-                        lstUpdates.Add(itemNew);
-                    }
-                    else
-                    {
-                        lstInserts.Add(itemNew);
-                    }
-                }
-                try
-                {
-                    if (lstInserts.Count() > 0)
-                        await SQLiteHelper.Instance.InsertAllAsync(lstInserts);
-
-                    if (lstUpdates.Count() > 0)
-                        await SQLiteHelper.Instance.UpdateAllAsync(lstUpdates);
-                }
-                catch (Exception ex)
-                {
-                    Logging.SaveLog(_tag, ex);
-                }
-            }
-        }
-
-        private void AddProfileEx(string indexId, ref ProfileExItem? profileEx)
-        {
-            profileEx = new()
-            {
-                IndexId = indexId,
-                Delay = 0,
-                Speed = 0,
-                Sort = 0
-            };
-            _lstProfileEx.Add(profileEx);
-            IndexIdEnqueue(indexId);
-        }
-
-        public async Task ClearAll()
-        {
-            await SQLiteHelper.Instance.ExecuteAsync($"delete from ProfileExItem ");
-            _lstProfileEx = new();
-        }
-
-        public async Task SaveTo()
-        {
-            try
-            {
-                await SaveQueueIndexIds();
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-        }
-
-        public void SetTestDelay(string indexId, string delayVal)
-        {
-            var profileEx = _lstProfileEx.FirstOrDefault(t => t.IndexId == indexId);
-            if (profileEx == null)
-            {
-                AddProfileEx(indexId, ref profileEx);
-            }
-
-            int.TryParse(delayVal, out int delay);
-            profileEx.Delay = delay;
-            IndexIdEnqueue(indexId);
-        }
-
-        public void SetTestSpeed(string indexId, string speedVal)
-        {
-            var profileEx = _lstProfileEx.FirstOrDefault(t => t.IndexId == indexId);
-            if (profileEx == null)
-            {
-                AddProfileEx(indexId, ref profileEx);
-            }
-
-            decimal.TryParse(speedVal, out decimal speed);
-            profileEx.Speed = speed;
-            IndexIdEnqueue(indexId);
-        }
-
-        public void SetSort(string indexId, int sort)
-        {
-            var profileEx = _lstProfileEx.FirstOrDefault(t => t.IndexId == indexId);
-            if (profileEx == null)
-            {
-                AddProfileEx(indexId, ref profileEx);
-            }
-            profileEx.Sort = sort;
-            IndexIdEnqueue(indexId);
-        }
-
-        public int GetSort(string indexId)
-        {
-            var profileEx = _lstProfileEx.FirstOrDefault(t => t.IndexId == indexId);
-            if (profileEx == null)
-            {
-                return 0;
-            }
-            return profileEx.Sort;
-        }
-
-        public int GetMaxSort()
-        {
-            if (_lstProfileEx.Count <= 0)
-            {
-                return 0;
-            }
-            return _lstProfileEx.Max(t => t == null ? 0 : t.Sort);
-        }
-    }
-}

v2rayN/ServiceLib/Handler/StatisticsHandler.cs

@@ -1,164 +0,0 @@
-namespace ServiceLib.Handler
-{
-    public class StatisticsHandler
-    {
-        private static readonly Lazy<StatisticsHandler> instance = new(() => new());
-        public static StatisticsHandler Instance => instance.Value;
-
-        private Config _config;
-        private ServerStatItem? _serverStatItem;
-        private List<ServerStatItem> _lstServerStat;
-        private Action<ServerSpeedItem>? _updateFunc;
-
-        private StatisticsXrayService? _statisticsXray;
-        private StatisticsSingboxService? _statisticsSingbox;
-        private static readonly string _tag = "StatisticsHandler";
-        public List<ServerStatItem> ServerStat => _lstServerStat;
-
-        public async Task Init(Config config, Action<ServerSpeedItem> updateFunc)
-        {
-            _config = config;
-            _updateFunc = updateFunc;
-            if (config.GuiItem.EnableStatistics || _config.GuiItem.DisplayRealTimeSpeed)
-            {
-                await InitData();
-
-                _statisticsXray = new StatisticsXrayService(config, UpdateServerStatHandler);
-                _statisticsSingbox = new StatisticsSingboxService(config, UpdateServerStatHandler);
-            }
-        }
-
-        public void Close()
-        {
-            try
-            {
-                _statisticsXray?.Close();
-                _statisticsSingbox?.Close();
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-        }
-
-        public async Task ClearAllServerStatistics()
-        {
-            await SQLiteHelper.Instance.ExecuteAsync($"delete from ServerStatItem ");
-            _serverStatItem = null;
-            _lstServerStat = new();
-        }
-
-        public async Task SaveTo()
-        {
-            try
-            {
-                if (_lstServerStat != null)
-                {
-                    await SQLiteHelper.Instance.UpdateAllAsync(_lstServerStat);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-        }
-
-        public async Task CloneServerStatItem(string indexId, string toIndexId)
-        {
-            if (_lstServerStat == null)
-            {
-                return;
-            }
-
-            if (indexId == toIndexId)
-            {
-                return;
-            }
-
-            var stat = _lstServerStat.FirstOrDefault(t => t.IndexId == indexId);
-            if (stat == null)
-            {
-                return;
-            }
-
-            var toStat = JsonUtils.DeepCopy(stat);
-            toStat.IndexId = toIndexId;
-            await SQLiteHelper.Instance.ReplaceAsync(toStat);
-            _lstServerStat.Add(toStat);
-        }
-
-        private async Task InitData()
-        {
-            await SQLiteHelper.Instance.ExecuteAsync($"delete from ServerStatItem where indexId not in ( select indexId from ProfileItem )");
-
-            long ticks = DateTime.Now.Date.Ticks;
-            await SQLiteHelper.Instance.ExecuteAsync($"update ServerStatItem set todayUp = 0,todayDown=0,dateNow={ticks} where dateNow<>{ticks}");
-
-            _lstServerStat = await SQLiteHelper.Instance.TableAsync<ServerStatItem>().ToListAsync();
-        }
-
-        private void UpdateServerStatHandler(ServerSpeedItem server)
-        {
-            _ = UpdateServerStat(server);
-        }
-
-        private async Task UpdateServerStat(ServerSpeedItem server)
-        {
-            await GetServerStatItem(_config.IndexId);
-
-            if (_serverStatItem is null)
-            {
-                return;
-            }
-            if (server.ProxyUp != 0 || server.ProxyDown != 0)
-            {
-                _serverStatItem.TodayUp += server.ProxyUp;
-                _serverStatItem.TodayDown += server.ProxyDown;
-                _serverStatItem.TotalUp += server.ProxyUp;
-                _serverStatItem.TotalDown += server.ProxyDown;
-            }
-
-            server.IndexId = _config.IndexId;
-            server.TodayUp = _serverStatItem.TodayUp;
-            server.TodayDown = _serverStatItem.TodayDown;
-            server.TotalUp = _serverStatItem.TotalUp;
-            server.TotalDown = _serverStatItem.TotalDown;
-            _updateFunc?.Invoke(server);
-        }
-
-        private async Task GetServerStatItem(string indexId)
-        {
-            long ticks = DateTime.Now.Date.Ticks;
-            if (_serverStatItem != null && _serverStatItem.IndexId != indexId)
-            {
-                _serverStatItem = null;
-            }
-
-            if (_serverStatItem == null)
-            {
-                _serverStatItem = _lstServerStat.FirstOrDefault(t => t.IndexId == indexId);
-                if (_serverStatItem == null)
-                {
-                    _serverStatItem = new ServerStatItem
-                    {
-                        IndexId = indexId,
-                        TotalUp = 0,
-                        TotalDown = 0,
-                        TodayUp = 0,
-                        TodayDown = 0,
-                        DateNow = ticks
-                    };
-                    await SQLiteHelper.Instance.ReplaceAsync(_serverStatItem);
-                    _lstServerStat.Add(_serverStatItem);
-                }
-            }
-
-            if (_serverStatItem.DateNow != ticks)
-            {
-                _serverStatItem.TodayUp = 0;
-                _serverStatItem.TodayDown = 0;
-                _serverStatItem.DateNow = ticks;
-            }
-        }
-    }
-}

v2rayN/ServiceLib/Handler/SubscriptionHandler.cs

@@ -0,0 +1,221 @@
+namespace ServiceLib.Handler;
+
+public static class SubscriptionHandler
+{
+    public static async Task UpdateProcess(Config config, string subId, bool blProxy, Func<bool, string, Task> updateFunc)
+    {
+        await updateFunc?.Invoke(false, ResUI.MsgUpdateSubscriptionStart);
+        var subItem = await AppManager.Instance.SubItems();
+
+        if (subItem is not { Count: > 0 })
+        {
+            await updateFunc?.Invoke(false, ResUI.MsgNoValidSubscription);
+            return;
+        }
+
+        var successCount = 0;
+        foreach (var item in subItem)
+        {
+            try
+            {
+                if (!IsValidSubscription(item, subId))
+                {
+                    continue;
+                }
+
+                var hashCode = $"{item.Remarks}->";
+                if (item.Enabled == false)
+                {
+                    await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
+                    continue;
+                }
+
+                // Create download handler
+                var downloadHandle = CreateDownloadHandler(hashCode, updateFunc);
+                await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
+
+                // Get all subscription content (main subscription + additional subscriptions)
+                var result = await DownloadAllSubscriptions(config, item, blProxy, downloadHandle);
+
+                // Process download result
+                if (await ProcessDownloadResult(config, item.Id, result, hashCode, updateFunc))
+                {
+                    successCount++;
+                }
+
+                await updateFunc?.Invoke(false, "-------------------------------------------------------");
+            }
+            catch (Exception ex)
+            {
+                var hashCode = $"{item.Remarks}->";
+                Logging.SaveLog("UpdateSubscription", ex);
+                await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgFailedImportSubscription}: {ex.Message}");
+                await updateFunc?.Invoke(false, "-------------------------------------------------------");
+            }
+        }
+
+        await updateFunc?.Invoke(successCount > 0, $"{ResUI.MsgUpdateSubscriptionEnd}");
+    }
+
+    private static bool IsValidSubscription(SubItem item, string subId)
+    {
+        var id = item.Id.TrimEx();
+        var url = item.Url.TrimEx();
+
+        if (id.IsNullOrEmpty() || url.IsNullOrEmpty())
+        {
+            return false;
+        }
+
+        if (subId.IsNotEmpty() && item.Id != subId)
+        {
+            return false;
+        }
+
+        if (!url.StartsWith(Global.HttpsProtocol) && !url.StartsWith(Global.HttpProtocol))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    private static DownloadService CreateDownloadHandler(string hashCode, Func<bool, string, Task> updateFunc)
+    {
+        var downloadHandle = new DownloadService();
+        downloadHandle.Error += (sender2, args) =>
+        {
+            updateFunc?.Invoke(false, $"{hashCode}{args.GetException().Message}");
+        };
+        return downloadHandle;
+    }
+
+    private static async Task<string> DownloadSubscriptionContent(DownloadService downloadHandle, string url, bool blProxy, string userAgent)
+    {
+        var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
+
+        // If download with proxy fails, try direct connection
+        if (blProxy && result.IsNullOrEmpty())
+        {
+            result = await downloadHandle.TryDownloadString(url, false, userAgent);
+        }
+
+        return result ?? string.Empty;
+    }
+
+    private static async Task<string> DownloadAllSubscriptions(Config config, SubItem item, bool blProxy, DownloadService downloadHandle)
+    {
+        // Download main subscription content
+        var result = await DownloadMainSubscription(config, item, blProxy, downloadHandle);
+
+        // Process additional subscription links (if any)
+        if (item.ConvertTarget.IsNullOrEmpty() && item.MoreUrl.TrimEx().IsNotEmpty())
+        {
+            result = await DownloadAdditionalSubscriptions(item, result, blProxy, downloadHandle);
+        }
+
+        return result;
+    }
+
+    private static async Task<string> DownloadMainSubscription(Config config, SubItem item, bool blProxy, DownloadService downloadHandle)
+    {
+        // Prepare subscription URL and download directly
+        var url = Utils.GetPunycode(item.Url.TrimEx());
+
+        // If conversion is needed
+        if (item.ConvertTarget.IsNotEmpty())
+        {
+            var subConvertUrl = config.ConstItem.SubConvertUrl.IsNullOrEmpty()
+                ? Global.SubConvertUrls.FirstOrDefault()
+                : config.ConstItem.SubConvertUrl;
+
+            url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
+
+            if (!url.Contains("target="))
+            {
+                url += string.Format("&target={0}", item.ConvertTarget);
+            }
+
+            if (!url.Contains("config="))
+            {
+                url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
+            }
+        }
+
+        // Download and return result directly
+        return await DownloadSubscriptionContent(downloadHandle, url, blProxy, item.UserAgent);
+    }
+
+    private static async Task<string> DownloadAdditionalSubscriptions(SubItem item, string mainResult, bool blProxy, DownloadService downloadHandle)
+    {
+        var result = mainResult;
+
+        // If main subscription result is Base64 encoded, decode it first
+        if (result.IsNotEmpty() && Utils.IsBase64String(result))
+        {
+            result = Utils.Base64Decode(result);
+        }
+
+        // Process additional URL list
+        var lstUrl = item.MoreUrl.TrimEx().Split(",") ?? [];
+        foreach (var it in lstUrl)
+        {
+            var url2 = Utils.GetPunycode(it);
+            if (url2.IsNullOrEmpty())
+            {
+                continue;
+            }
+
+            var additionalResult = await DownloadSubscriptionContent(downloadHandle, url2, blProxy, item.UserAgent);
+
+            if (additionalResult.IsNotEmpty())
+            {
+                // Process additional subscription results, add to main result
+                if (Utils.IsBase64String(additionalResult))
+                {
+                    result += Environment.NewLine + Utils.Base64Decode(additionalResult);
+                }
+                else
+                {
+                    result += Environment.NewLine + additionalResult;
+                }
+            }
+        }
+
+        return result;
+    }
+
+    private static async Task<bool> ProcessDownloadResult(Config config, string id, string result, string hashCode, Func<bool, string, Task> updateFunc)
+    {
+        if (result.IsNullOrEmpty())
+        {
+            await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
+            return false;
+        }
+
+        await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
+
+        // If result is too short, display content directly
+        if (result.Length < 99)
+        {
+            await updateFunc?.Invoke(false, $"{hashCode}{result}");
+        }
+
+        await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartParsingSubscription}");
+
+        // Add servers to configuration
+        var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
+        if (ret <= 0)
+        {
+            Logging.SaveLog("FailedImportSubscription");
+            Logging.SaveLog(result);
+        }
+
+        // Update completion message
+        await updateFunc?.Invoke(false, ret > 0
+                ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
+                : $"{hashCode}{ResUI.MsgFailedImportSubscription}");
+
+        return ret > 0;
+    }
+}

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs

@@ -1,202 +1,25 @@
-namespace ServiceLib.Handler.SysProxy
+namespace ServiceLib.Handler.SysProxy;
+
+public static class ProxySettingLinux
 {
-    public class ProxySettingLinux
+    private static readonly string _proxySetFileName = $"{Global.ProxySetLinuxShellFileName.Replace(Global.NamespaceSample, "")}.sh";
+
+    public static async Task SetProxy(string host, int port, string exceptions)
     {
-        public static async Task SetProxy(string host, int port, string exceptions)
-        {
-            var lstCmd = GetSetCmds(host, port, exceptions);
-
-            await ExecCmd(lstCmd);
-        }
-
-        public static async Task UnsetProxy()
-        {
-            var lstCmd = GetUnsetCmds();
-
-            await ExecCmd(lstCmd);
-        }
-
-        private static async Task ExecCmd(List<CmdItem> lstCmd)
-        {
-            foreach (var cmd in lstCmd)
-            {
-                if (cmd is null || cmd.Cmd.IsNullOrEmpty() || cmd.Arguments is null)
-                {
-                    continue;
-                }
-                await Task.Delay(10);
-                await Utils.GetCliWrapOutput(cmd.Cmd, cmd.Arguments);
-            }
-        }
-
-        private static List<CmdItem> GetSetCmds(string host, int port, string exceptions)
-        {
-            var isKde = IsKde(out var configDir);
-            List<string> lstType = ["", "http", "https", "socks", "ftp"];
-            List<CmdItem> lstCmd = [];
-
-            //GNOME
-            foreach (var type in lstType)
-            {
-                lstCmd.AddRange(GetSetCmd4Gnome(type, host, port));
-            }
-            if (exceptions.IsNotEmpty())
-            {
-                lstCmd.AddRange(GetSetCmd4Gnome("exceptions", exceptions, 0));
-            }
-
-            if (isKde)
-            {
-                foreach (var type in lstType)
-                {
-                    lstCmd.AddRange(GetSetCmd4Kde(type, host, port, configDir));
-                }
-                if (exceptions.IsNotEmpty())
-                {
-                    lstCmd.AddRange(GetSetCmd4Kde("exceptions", exceptions, 0, configDir));
-                }
-
-                // Notify system to reload
-                lstCmd.Add(new CmdItem()
-                {
-                    Cmd = "dbus-send",
-                    Arguments = ["--type=signal", "/KIO/Scheduler", "org.kde.KIO.Scheduler.reparseSlaveConfiguration", "string:''"]
-                });
-            }
-            return lstCmd;
-        }
-
-        private static List<CmdItem> GetUnsetCmds()
-        {
-            var isKde = IsKde(out var configDir);
-            List<CmdItem> lstCmd = [];
-
-            //GNOME
-            lstCmd.Add(new CmdItem()
-            {
-                Cmd = "gsettings",
-                Arguments = ["set", "org.gnome.system.proxy", "mode", "none"]
-            });
-
-            if (isKde)
-            {
-                lstCmd.Add(new CmdItem()
-                {
-                    Cmd = GetKdeVersion(),
-                    Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "0"]
-                });
-
-                // Notify system to reload
-                lstCmd.Add(new CmdItem()
-                {
-                    Cmd = "dbus-send",
-                    Arguments = ["--type=signal", "/KIO/Scheduler", "org.kde.KIO.Scheduler.reparseSlaveConfiguration", "string:''"]
-                });
-            }
-            return lstCmd;
-        }
-
-        private static List<CmdItem> GetSetCmd4Kde(string type, string host, int port, string configDir)
-        {
-            List<CmdItem> lstCmd = [];
-            var cmd = GetKdeVersion();
-
-            if (type.IsNullOrEmpty())
-            {
-                lstCmd.Add(new()
-                {
-                    Cmd = cmd,
-                    Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "1"]
-                });
-            }
-            else if (type == "exceptions")
-            {
-                lstCmd.Add(new()
-                {
-                    Cmd = cmd,
-                    Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "NoProxyFor", host]
-                });
-            }
-            else
-            {
-                var type2 = type.Equals("https") ? "http" : type;
-                lstCmd.Add(new CmdItem()
-                {
-                    Cmd = cmd,
-                    Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", $"{type}Proxy", $"{type2}://{host}:{port}"]
-                });
-            }
-
-            return lstCmd;
-        }
-
-        private static List<CmdItem> GetSetCmd4Gnome(string type, string host, int port)
-        {
-            List<CmdItem> lstCmd = [];
-
-            if (type.IsNullOrEmpty())
-            {
-                lstCmd.Add(new()
-                {
-                    Cmd = "gsettings",
-                    Arguments = ["set", "org.gnome.system.proxy", "mode", "manual"]
-                });
-            }
-            else if (type == "exceptions")
-            {
-                lstCmd.Add(new()
-                {
-                    Cmd = "gsettings",
-                    Arguments = ["set", $"org.gnome.system.proxy", "ignore-hosts", JsonUtils.Serialize(host.Split(','), false)]
-                });
-            }
-            else
-            {
-                lstCmd.Add(new()
-                {
-                    Cmd = "gsettings",
-                    Arguments = ["set", $"org.gnome.system.proxy.{type}", "host", host]
-                });
-
-                lstCmd.Add(new()
-                {
-                    Cmd = "gsettings",
-                    Arguments = ["set", $"org.gnome.system.proxy.{type}", "port", $"{port}"]
-                });
-            }
-
-            return lstCmd;
-        }
-
-        private static bool IsKde(out string configDir)
-        {
-            configDir = "/home";
-            var desktop = Environment.GetEnvironmentVariable("XDG_CURRENT_DESKTOP");
-            var desktop2 = Environment.GetEnvironmentVariable("XDG_SESSION_DESKTOP");
-            var isKde = string.Equals(desktop, "KDE", StringComparison.OrdinalIgnoreCase)
-                        || string.Equals(desktop, "plasma", StringComparison.OrdinalIgnoreCase)
-                        || string.Equals(desktop2, "KDE", StringComparison.OrdinalIgnoreCase)
-                        || string.Equals(desktop2, "plasma", StringComparison.OrdinalIgnoreCase);
-            if (isKde)
-            {
-                var homeDir = Environment.GetEnvironmentVariable("HOME");
-                if (homeDir != null)
-                {
-                    configDir = Path.Combine(homeDir, ".config");
-                }
-            }
-
-            return isKde;
-        }
-
-        private static string GetKdeVersion()
-        {
-            var ver = Environment.GetEnvironmentVariable("KDE_SESSION_VERSION") ?? "0";
-            return ver switch
-            {
-                "6" => "kwriteconfig6",
-                _ => "kwriteconfig5"
-            };
-        }
+        List<string> args = ["manual", host, port.ToString(), exceptions];
+        await ExecCmd(args);
     }
-}
+
+    public static async Task UnsetProxy()
+    {
+        List<string> args = ["none"];
+        await ExecCmd(args);
+    }
+
+    private static async Task ExecCmd(List<string> args)
+    {
+        var fileName = await FileManager.CreateLinuxShellFile(_proxySetFileName, EmbedUtils.GetEmbedText(Global.ProxySetLinuxShellFileName), false);
+
+        await Utils.GetCliWrapOutput(fileName, args);
+    }
+}

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs

@@ -1,101 +1,30 @@
-namespace ServiceLib.Handler.SysProxy
+namespace ServiceLib.Handler.SysProxy;
+
+public static class ProxySettingOSX
 {
-    public class ProxySettingOSX
+    private static readonly string _proxySetFileName = $"{Global.ProxySetOSXShellFileName.Replace(Global.NamespaceSample, "")}.sh";
+
+    public static async Task SetProxy(string host, int port, string exceptions)
     {
-        /// <summary>
-        /// 应用接口类型
-        /// </summary>
-        private static readonly List<string> LstInterface = ["Ethernet", "Wi-Fi", "Thunderbolt Bridge", "USB 10/100/1000 LAN"];
-
-        /// <summary>
-        /// 代理类型，对应 http,https,socks
-        /// </summary>
-        private static readonly List<string> LstTypes = ["setwebproxy", "setsecurewebproxy", "setsocksfirewallproxy"];
-
-        public static async Task SetProxy(string host, int port, string exceptions)
+        List<string> args = ["set", host, port.ToString()];
+        if (exceptions.IsNotEmpty())
         {
-            var lstInterface = await GetListNetworkServices();
-            var lstCmd = GetSetCmds(lstInterface, host, port, exceptions);
-            await ExecCmd(lstCmd);
+            args.AddRange(exceptions.Split(','));
         }
 
-        public static async Task UnsetProxy()
-        {
-            var lstInterface = await GetListNetworkServices();
-            var lstCmd = GetUnsetCmds(lstInterface);
-            await ExecCmd(lstCmd);
-        }
-
-        private static async Task ExecCmd(List<CmdItem> lstCmd)
-        {
-            foreach (var cmd in lstCmd)
-            {
-                if (cmd is null || cmd.Cmd.IsNullOrEmpty() || cmd.Arguments is null)
-                {
-                    continue;
-                }
-
-                await Task.Delay(10);
-                await Utils.GetCliWrapOutput(cmd.Cmd, cmd.Arguments);
-            }
-        }
-
-        private static List<CmdItem> GetSetCmds(List<string> lstInterface, string host, int port, string exceptions)
-        {
-            List<CmdItem> lstCmd = [];
-            foreach (var interf in lstInterface)
-            {
-                foreach (var type in LstTypes)
-                {
-                    lstCmd.Add(new CmdItem()
-                    {
-                        Cmd = "networksetup",
-                        Arguments = [$"-{type}", interf, host, port.ToString()]
-                    });
-                }
-                if (exceptions.IsNotEmpty())
-                {
-                    List<string> args = [$"-setproxybypassdomains", interf];
-                    args.AddRange(exceptions.Split(','));
-                    lstCmd.Add(new CmdItem()
-                    {
-                        Cmd = "networksetup",
-                        Arguments = args
-                    });
-                }
-            }
-
-            return lstCmd;
-        }
-
-        private static List<CmdItem> GetUnsetCmds(List<string> lstInterface)
-        {
-            List<CmdItem> lstCmd = [];
-            foreach (var interf in lstInterface)
-            {
-                foreach (var type in LstTypes)
-                {
-                    lstCmd.Add(new CmdItem()
-                    {
-                        Cmd = "networksetup",
-                        Arguments = [$"-{type}state", interf, "off"]
-                    });
-                }
-            }
-
-            return lstCmd;
-        }
-
-        public static async Task<List<string>> GetListNetworkServices()
-        {
-            var services = await Utils.GetListNetworkServices();
-            if (services.IsNullOrEmpty())
-            {
-                return LstInterface;
-            }
-
-            var lst = services.Split(Environment.NewLine).Where(t => t.Length > 0 && t.Contains('*') == false);
-            return lst.ToList();
-        }
+        await ExecCmd(args);
     }
-}
+
+    public static async Task UnsetProxy()
+    {
+        List<string> args = ["clear"];
+        await ExecCmd(args);
+    }
+
+    private static async Task ExecCmd(List<string> args)
+    {
+        var fileName = await FileManager.CreateLinuxShellFile(_proxySetFileName, EmbedUtils.GetEmbedText(Global.ProxySetOSXShellFileName), false);
+
+        await Utils.GetCliWrapOutput(fileName, args);
+    }
+}

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs

@@ -1,360 +1,358 @@
-using System.Runtime.InteropServices;
 using static ServiceLib.Handler.SysProxy.ProxySettingWindows.InternetConnectionOption;
 
-namespace ServiceLib.Handler.SysProxy
+namespace ServiceLib.Handler.SysProxy;
+
+public static class ProxySettingWindows
 {
-    public class ProxySettingWindows
+    private const string _regPath = @"Software\Microsoft\Windows\CurrentVersion\Internet Settings";
+
+    private static bool SetProxyFallback(string? strProxy, string? exceptions, int type)
     {
-        private const string _regPath = @"Software\Microsoft\Windows\CurrentVersion\Internet Settings";
-
-        private static bool SetProxyFallback(string? strProxy, string? exceptions, int type)
+        if (type == 1)
         {
-            if (type == 1)
-            {
-                WindowsUtils.RegWriteValue(_regPath, "ProxyEnable", 0);
-                WindowsUtils.RegWriteValue(_regPath, "ProxyServer", string.Empty);
-                WindowsUtils.RegWriteValue(_regPath, "ProxyOverride", string.Empty);
-                WindowsUtils.RegWriteValue(_regPath, "AutoConfigURL", string.Empty);
-            }
-            if (type == 2)
-            {
-                WindowsUtils.RegWriteValue(_regPath, "ProxyEnable", 1);
-                WindowsUtils.RegWriteValue(_regPath, "ProxyServer", strProxy ?? string.Empty);
-                WindowsUtils.RegWriteValue(_regPath, "ProxyOverride", exceptions ?? string.Empty);
-                WindowsUtils.RegWriteValue(_regPath, "AutoConfigURL", string.Empty);
-            }
-            else if (type == 4)
-            {
-                WindowsUtils.RegWriteValue(_regPath, "ProxyEnable", 0);
-                WindowsUtils.RegWriteValue(_regPath, "ProxyServer", string.Empty);
-                WindowsUtils.RegWriteValue(_regPath, "ProxyOverride", string.Empty);
-                WindowsUtils.RegWriteValue(_regPath, "AutoConfigURL", strProxy ?? string.Empty);
-            }
-            return true;
+            WindowsUtils.RegWriteValue(_regPath, "ProxyEnable", 0);
+            WindowsUtils.RegWriteValue(_regPath, "ProxyServer", string.Empty);
+            WindowsUtils.RegWriteValue(_regPath, "ProxyOverride", string.Empty);
+            WindowsUtils.RegWriteValue(_regPath, "AutoConfigURL", string.Empty);
         }
-
-        /// <summary>
-        // set to use no proxy
-        /// </summary>
-        /// <exception cref="ApplicationException">Error message with win32 error code</exception>
-        public static bool UnsetProxy()
+        if (type == 2)
         {
-            return SetProxy(null, null, 1);
+            WindowsUtils.RegWriteValue(_regPath, "ProxyEnable", 1);
+            WindowsUtils.RegWriteValue(_regPath, "ProxyServer", strProxy ?? string.Empty);
+            WindowsUtils.RegWriteValue(_regPath, "ProxyOverride", exceptions ?? string.Empty);
+            WindowsUtils.RegWriteValue(_regPath, "AutoConfigURL", string.Empty);
         }
-
-        /// <summary>
-        /// Set system proxy settings
-        /// </summary>
-        /// <param name="strProxy"> proxy address</param>
-        /// <param name="exceptions">exception addresses that do not use proxy</param>
-        /// <param name="type">type of proxy defined in PerConnFlags
-        ///     PROXY_TYPE_DIRECT           = 0x00000001, // direct connection (no proxy)
-        ///     PROXY_TYPE_PROXY            = 0x00000002, // via named proxy
-        ///     PROXY_TYPE_AUTO_PROXY_URL   = 0x00000004, // autoproxy script URL
-        ///     PROXY_TYPE_AUTO_DETECT      = 0x00000008  // use autoproxy detection
-        /// </param>
-        /// <exception cref="ApplicationException">Error message with win32 error code</exception>
-        /// <returns>true: one of connection is successfully updated proxy settings</returns>
-        public static bool SetProxy(string? strProxy, string? exceptions, int type)
+        else if (type == 4)
         {
-            try
-            {
-                // set proxy for LAN
-                bool result = SetConnectionProxy(null, strProxy, exceptions, type);
-                // set proxy for dial up connections
-                var connections = EnumerateRasEntries();
-                foreach (var connection in connections)
-                {
-                    result |= SetConnectionProxy(connection, strProxy, exceptions, type);
-                }
-                return result;
-            }
-            catch
-            {
-                SetProxyFallback(strProxy, exceptions, type);
-                return false;
-            }
+            WindowsUtils.RegWriteValue(_regPath, "ProxyEnable", 0);
+            WindowsUtils.RegWriteValue(_regPath, "ProxyServer", string.Empty);
+            WindowsUtils.RegWriteValue(_regPath, "ProxyOverride", string.Empty);
+            WindowsUtils.RegWriteValue(_regPath, "AutoConfigURL", strProxy ?? string.Empty);
         }
+        return true;
+    }
 
-        private static bool SetConnectionProxy(string? connectionName, string? strProxy, string? exceptions, int type)
+    /// <summary>
+    // set to use no proxy
+    /// </summary>
+    /// <exception cref="ApplicationException">Error message with win32 error code</exception>
+    public static bool UnsetProxy()
+    {
+        return SetProxy(null, null, 1);
+    }
+
+    /// <summary>
+    /// Set system proxy settings
+    /// </summary>
+    /// <param name="strProxy"> proxy address</param>
+    /// <param name="exceptions">exception addresses that do not use proxy</param>
+    /// <param name="type">type of proxy defined in PerConnFlags
+    ///     PROXY_TYPE_DIRECT           = 0x00000001, // direct connection (no proxy)
+    ///     PROXY_TYPE_PROXY            = 0x00000002, // via named proxy
+    ///     PROXY_TYPE_AUTO_PROXY_URL   = 0x00000004, // autoproxy script URL
+    ///     PROXY_TYPE_AUTO_DETECT      = 0x00000008  // use autoproxy detection
+    /// </param>
+    /// <exception cref="ApplicationException">Error message with win32 error code</exception>
+    /// <returns>true: one of connection is successfully updated proxy settings</returns>
+    public static bool SetProxy(string? strProxy, string? exceptions, int type)
+    {
+        try
         {
-            InternetPerConnOptionList list = new();
-
-            int optionCount = 1;
-            if (type == 1) // No proxy
+            // set proxy for LAN
+            var result = SetConnectionProxy(null, strProxy, exceptions, type);
+            // set proxy for dial up connections
+            var connections = EnumerateRasEntries();
+            foreach (var connection in connections)
             {
-                optionCount = 1;
+                result |= SetConnectionProxy(connection, strProxy, exceptions, type);
             }
-            else if (type is 2 or 4) // named proxy or autoproxy script URL
-            {
-                optionCount = string.IsNullOrEmpty(exceptions) ? 2 : 3;
-            }
-
-            int m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;
-            PerConnOption m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
-            if (type == 2) // named proxy
-            {
-                m_Int = (int)(PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY);
-                m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_SERVER;
-            }
-            else if (type == 4) // autoproxy script url
-            {
-                m_Int = (int)(PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_AUTO_PROXY_URL);
-                m_Option = PerConnOption.INTERNET_PER_CONN_AUTOCONFIG_URL;
-            }
-
-            //int optionCount = Utile.IsNullOrEmpty(strProxy) ? 1 : (Utile.IsNullOrEmpty(exceptions) ? 2 : 3);
-            InternetConnectionOption[] options = new InternetConnectionOption[optionCount];
-            // USE a proxy server ...
-            options[0].m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
-            //options[0].m_Value.m_Int = (int)((optionCount < 2) ? PerConnFlags.PROXY_TYPE_DIRECT : (PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY));
-            options[0].m_Value.m_Int = m_Int;
-            // use THIS proxy server
-            if (optionCount > 1)
-            {
-                options[1].m_Option = m_Option;
-                options[1].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(strProxy); // !! remember to deallocate memory 1
-                // except for these addresses ...
-                if (optionCount > 2)
-                {
-                    options[2].m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_BYPASS;
-                    options[2].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(exceptions); // !! remember to deallocate memory 2
-                }
-            }
-
-            // default stuff
-            list.dwSize = Marshal.SizeOf(list);
-            if (connectionName != null)
-            {
-                list.szConnection = Marshal.StringToHGlobalAuto(connectionName); // !! remember to deallocate memory 3
-            }
-            else
-            {
-                list.szConnection = nint.Zero;
-            }
-            list.dwOptionCount = options.Length;
-            list.dwOptionError = 0;
-
-            int optSize = Marshal.SizeOf(typeof(InternetConnectionOption));
-            // make a pointer out of all that ...
-            nint optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length); // !! remember to deallocate memory 4
-            // copy the array over into that spot in memory ...
-            for (int i = 0; i < options.Length; ++i)
-            {
-                if (Environment.Is64BitOperatingSystem)
-                {
-                    nint opt = new(optionsPtr.ToInt64() + (i * optSize));
-                    Marshal.StructureToPtr(options[i], opt, false);
-                }
-                else
-                {
-                    nint opt = new(optionsPtr.ToInt32() + (i * optSize));
-                    Marshal.StructureToPtr(options[i], opt, false);
-                }
-            }
-
-            list.options = optionsPtr;
-
-            // and then make a pointer out of the whole list
-            nint ipcoListPtr = Marshal.AllocCoTaskMem(list.dwSize); // !! remember to deallocate memory 5
-            Marshal.StructureToPtr(list, ipcoListPtr, false);
-
-            // and finally, call the API method!
-            bool isSuccess = NativeMethods.InternetSetOption(nint.Zero,
-               InternetOption.INTERNET_OPTION_PER_CONNECTION_OPTION,
-               ipcoListPtr, list.dwSize);
-            int returnvalue = 0; // ERROR_SUCCESS
-            if (!isSuccess)
-            {  // get the error codes, they might be helpful
-                returnvalue = Marshal.GetLastPInvokeError();
-            }
-            else
-            {
-                // Notify the system that the registry settings have been changed and cause them to be refreshed
-                NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_SETTINGS_CHANGED, nint.Zero, 0);
-                NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_REFRESH, nint.Zero, 0);
-            }
-
-            // FREE the data ASAP
-            if (list.szConnection != nint.Zero)
-                Marshal.FreeHGlobal(list.szConnection); // release mem 3
-            if (optionCount > 1)
-            {
-                Marshal.FreeHGlobal(options[1].m_Value.m_StringPtr); // release mem 1
-                if (optionCount > 2)
-                {
-                    Marshal.FreeHGlobal(options[2].m_Value.m_StringPtr); // release mem 2
-                }
-            }
-            Marshal.FreeCoTaskMem(optionsPtr); // release mem 4
-            Marshal.FreeCoTaskMem(ipcoListPtr); // release mem 5
-            if (returnvalue != 0)
-            {
-                // throw the error codes, they might be helpful
-                throw new ApplicationException($"Set Internet Proxy failed with error code: {Marshal.GetLastWin32Error()}");
-            }
-
-            return true;
+            return result;
         }
-
-        /// <summary>
-        /// Retrieve list of connections including LAN and WAN to support PPPoE connection
-        /// </summary>
-        /// <returns>A list of RAS connection names. May be empty list if no dial up connection.</returns>
-        /// <exception cref="ApplicationException">Error message with win32 error code</exception>
-        private static IEnumerable<string> EnumerateRasEntries()
+        catch
         {
-            int entries = 0;
-            // attempt to query with 1 entry buffer
-            RASENTRYNAME[] rasEntryNames = new RASENTRYNAME[1];
-            int bufferSize = Marshal.SizeOf(typeof(RASENTRYNAME));
-            rasEntryNames[0].dwSize = Marshal.SizeOf(typeof(RASENTRYNAME));
-
-            uint result = NativeMethods.RasEnumEntries(null, null, rasEntryNames, ref bufferSize, ref entries);
-            // increase buffer if the buffer is not large enough
-            if (result == (uint)ErrorCode.ERROR_BUFFER_TOO_SMALL)
-            {
-                rasEntryNames = new RASENTRYNAME[bufferSize / Marshal.SizeOf(typeof(RASENTRYNAME))];
-                for (int i = 0; i < rasEntryNames.Length; i++)
-                {
-                    rasEntryNames[i].dwSize = Marshal.SizeOf(typeof(RASENTRYNAME));
-                }
-
-                result = NativeMethods.RasEnumEntries(null, null, rasEntryNames, ref bufferSize, ref entries);
-            }
-            if (result == 0)
-            {
-                var entryNames = new List<string>();
-                for (int i = 0; i < entries; i++)
-                {
-                    entryNames.Add(rasEntryNames[i].szEntryName);
-                }
-
-                return entryNames;
-            }
-            throw new ApplicationException($"RasEnumEntries failed with error code: {result}");
-        }
-
-        #region WinInet structures
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        public struct InternetPerConnOptionList
-        {
-            public int dwSize;               // size of the INTERNET_PER_CONN_OPTION_LIST struct
-            public nint szConnection;         // connection name to set/query options
-            public int dwOptionCount;        // number of options to set/query
-            public int dwOptionError;           // on error, which option failed
-
-            //[MarshalAs(UnmanagedType.)]
-            public nint options;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        public struct InternetConnectionOption
-        {
-            private static readonly int Size;
-            public PerConnOption m_Option;
-            public InternetConnectionOptionValue m_Value;
-
-            static InternetConnectionOption()
-            {
-                Size = Marshal.SizeOf(typeof(InternetConnectionOption));
-            }
-
-            // Nested Types
-            [StructLayout(LayoutKind.Explicit)]
-            public struct InternetConnectionOptionValue
-            {
-                // Fields
-                [FieldOffset(0)]
-                public System.Runtime.InteropServices.ComTypes.FILETIME m_FileTime;
-
-                [FieldOffset(0)]
-                public int m_Int;
-
-                [FieldOffset(0)]
-                public nint m_StringPtr;
-            }
-
-            [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-            public struct RASENTRYNAME
-            {
-                public int dwSize;
-
-                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = RAS_MaxEntryName + 1)]
-                public string szEntryName;
-
-                public int dwFlags;
-
-                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = MAX_PATH + 1)]
-                public string szPhonebookPath;
-            }
-
-            // Constants
-            public const int RAS_MaxEntryName = 256;
-
-            public const int MAX_PATH = 260; // Standard MAX_PATH value in Windows
-        }
-
-        #endregion WinInet structures
-
-        #region WinInet enums
-
-        //
-        // options manifests for Internet{Query|Set}Option
-        //
-        public enum InternetOption : uint
-        {
-            INTERNET_OPTION_PER_CONNECTION_OPTION = 75,
-            INTERNET_OPTION_REFRESH = 37,
-            INTERNET_OPTION_SETTINGS_CHANGED = 39
-        }
-
-        //
-        // Options used in INTERNET_PER_CONN_OPTON struct
-        //
-        public enum PerConnOption
-        {
-            INTERNET_PER_CONN_FLAGS = 1, // Sets or retrieves the connection type. The Value member will contain one or more of the values from PerConnFlags
-            INTERNET_PER_CONN_PROXY_SERVER = 2, // Sets or retrieves a string containing the proxy servers.
-            INTERNET_PER_CONN_PROXY_BYPASS = 3, // Sets or retrieves a string containing the URLs that do not use the proxy server.
-            INTERNET_PER_CONN_AUTOCONFIG_URL = 4//, // Sets or retrieves a string containing the URL to the automatic configuration script.
-        }
-
-        //
-        // PER_CONN_FLAGS
-        //
-        [Flags]
-        public enum PerConnFlags
-        {
-            PROXY_TYPE_DIRECT = 0x00000001,  // direct to net
-            PROXY_TYPE_PROXY = 0x00000002,  // via named proxy
-            PROXY_TYPE_AUTO_PROXY_URL = 0x00000004,  // autoproxy URL
-            PROXY_TYPE_AUTO_DETECT = 0x00000008   // use autoproxy detection
-        }
-
-        public enum ErrorCode : uint
-        {
-            ERROR_BUFFER_TOO_SMALL = 603,
-            ERROR_INVALID_SIZE = 632
-        }
-
-        #endregion WinInet enums
-
-        internal static class NativeMethods
-        {
-            [DllImport("WinInet.dll", SetLastError = true, CharSet = CharSet.Auto)]
-            [return: MarshalAs(UnmanagedType.Bool)]
-            public static extern bool InternetSetOption(nint hInternet, InternetOption dwOption, nint lpBuffer, int dwBufferLength);
-
-            [DllImport("Rasapi32.dll", CharSet = CharSet.Auto)]
-            public static extern uint RasEnumEntries(
-                string? reserved,          // Reserved, must be null
-                string? lpszPhonebook,     // Pointer to full path and filename of phone-book file. If this parameter is NULL, the entries are enumerated from all the remote access phone-book files
-                [In, Out] RASENTRYNAME[]? lprasentryname, // Buffer to receive RAS entry names
-                ref int lpcb,             // Size of the buffer
-                ref int lpcEntries        // Number of entries written to the buffer
-            );
+            _ = SetProxyFallback(strProxy, exceptions, type);
+            return false;
         }
     }
+
+    private static bool SetConnectionProxy(string? connectionName, string? strProxy, string? exceptions, int type)
+    {
+        var list = new InternetPerConnOptionList();
+
+        var optionCount = 1;
+        if (type == 1) // No proxy
+        {
+            optionCount = 1;
+        }
+        else if (type is 2 or 4) // named proxy or autoproxy script URL
+        {
+            optionCount = exceptions.IsNullOrEmpty() ? 2 : 3;
+        }
+
+        var m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;
+        var m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
+        if (type == 2) // named proxy
+        {
+            m_Int = (int)(PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY);
+            m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_SERVER;
+        }
+        else if (type == 4) // autoproxy script url
+        {
+            m_Int = (int)(PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_AUTO_PROXY_URL);
+            m_Option = PerConnOption.INTERNET_PER_CONN_AUTOCONFIG_URL;
+        }
+
+        var options = new InternetConnectionOption[optionCount];
+        // USE a proxy server ...
+        options[0].m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
+        options[0].m_Value.m_Int = m_Int;
+        // use THIS proxy server
+        if (optionCount > 1)
+        {
+            options[1].m_Option = m_Option;
+            options[1].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(strProxy); // !! remember to deallocate memory 1
+                                                                                    // except for these addresses ...
+            if (optionCount > 2)
+            {
+                options[2].m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_BYPASS;
+                options[2].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(exceptions); // !! remember to deallocate memory 2
+            }
+        }
+
+        // default stuff
+        list.dwSize = Marshal.SizeOf(list);
+        if (connectionName != null)
+        {
+            list.szConnection = Marshal.StringToHGlobalAuto(connectionName); // !! remember to deallocate memory 3
+        }
+        else
+        {
+            list.szConnection = nint.Zero;
+        }
+        list.dwOptionCount = options.Length;
+        list.dwOptionError = 0;
+
+        var optSize = Marshal.SizeOf(typeof(InternetConnectionOption));
+        // make a pointer out of all that ...
+        var optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length); // !! remember to deallocate memory 4
+                                                                           // copy the array over into that spot in memory ...
+        for (var i = 0; i < options.Length; ++i)
+        {
+            if (Environment.Is64BitOperatingSystem)
+            {
+                var opt = new nint(optionsPtr.ToInt64() + (i * optSize));
+                Marshal.StructureToPtr(options[i], opt, false);
+            }
+            else
+            {
+                var opt = new nint(optionsPtr.ToInt32() + (i * optSize));
+                Marshal.StructureToPtr(options[i], opt, false);
+            }
+        }
+
+        list.options = optionsPtr;
+
+        // and then make a pointer out of the whole list
+        var ipcoListPtr = Marshal.AllocCoTaskMem(list.dwSize); // !! remember to deallocate memory 5
+        Marshal.StructureToPtr(list, ipcoListPtr, false);
+
+        // and finally, call the API method!
+        var isSuccess = NativeMethods.InternetSetOption(nint.Zero,
+           InternetOption.INTERNET_OPTION_PER_CONNECTION_OPTION,
+           ipcoListPtr, list.dwSize);
+        var returnvalue = 0; // ERROR_SUCCESS
+        if (!isSuccess)
+        {  // get the error codes, they might be helpful
+            returnvalue = Marshal.GetLastPInvokeError();
+        }
+        else
+        {
+            // Notify the system that the registry settings have been changed and cause them to be refreshed
+            _ = NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_SETTINGS_CHANGED, nint.Zero, 0);
+            _ = NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_REFRESH, nint.Zero, 0);
+        }
+
+        // FREE the data ASAP
+        if (list.szConnection != nint.Zero)
+        {
+            Marshal.FreeHGlobal(list.szConnection); // release mem 3
+        }
+        if (optionCount > 1)
+        {
+            Marshal.FreeHGlobal(options[1].m_Value.m_StringPtr); // release mem 1
+            if (optionCount > 2)
+            {
+                Marshal.FreeHGlobal(options[2].m_Value.m_StringPtr); // release mem 2
+            }
+        }
+        Marshal.FreeCoTaskMem(optionsPtr); // release mem 4
+        Marshal.FreeCoTaskMem(ipcoListPtr); // release mem 5
+        if (returnvalue != 0)
+        {
+            // throw the error codes, they might be helpful
+            throw new ApplicationException($"Set Internet Proxy failed with error code: {Marshal.GetLastWin32Error()}");
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Retrieve list of connections including LAN and WAN to support PPPoE connection
+    /// </summary>
+    /// <returns>A list of RAS connection names. May be empty list if no dial up connection.</returns>
+    /// <exception cref="ApplicationException">Error message with win32 error code</exception>
+    private static IEnumerable<string> EnumerateRasEntries()
+    {
+        var entries = 0;
+        // attempt to query with 1 entry buffer
+        var rasEntryNames = new RASENTRYNAME[1];
+        var bufferSize = Marshal.SizeOf(typeof(RASENTRYNAME));
+        rasEntryNames[0].dwSize = Marshal.SizeOf(typeof(RASENTRYNAME));
+
+        var result = NativeMethods.RasEnumEntries(null, null, rasEntryNames, ref bufferSize, ref entries);
+        // increase buffer if the buffer is not large enough
+        if (result == (uint)ErrorCode.ERROR_BUFFER_TOO_SMALL)
+        {
+            rasEntryNames = new RASENTRYNAME[bufferSize / Marshal.SizeOf(typeof(RASENTRYNAME))];
+            for (var i = 0; i < rasEntryNames.Length; i++)
+            {
+                rasEntryNames[i].dwSize = Marshal.SizeOf(typeof(RASENTRYNAME));
+            }
+
+            result = NativeMethods.RasEnumEntries(null, null, rasEntryNames, ref bufferSize, ref entries);
+        }
+        if (result == 0)
+        {
+            var entryNames = new List<string>();
+            for (var i = 0; i < entries; i++)
+            {
+                entryNames.Add(rasEntryNames[i].szEntryName);
+            }
+
+            return entryNames;
+        }
+        throw new ApplicationException($"RasEnumEntries failed with error code: {result}");
+    }
+
+    #region WinInet structures
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    public struct InternetPerConnOptionList
+    {
+        public int dwSize;               // size of the INTERNET_PER_CONN_OPTION_LIST struct
+        public nint szConnection;         // connection name to set/query options
+        public int dwOptionCount;        // number of options to set/query
+        public int dwOptionError;           // on error, which option failed
+
+        //[MarshalAs(UnmanagedType.)]
+        public nint options;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    public struct InternetConnectionOption
+    {
+        private static readonly int Size;
+        public PerConnOption m_Option;
+        public InternetConnectionOptionValue m_Value;
+
+        static InternetConnectionOption()
+        {
+            Size = Marshal.SizeOf(typeof(InternetConnectionOption));
+        }
+
+        // Nested Types
+        [StructLayout(LayoutKind.Explicit)]
+        public struct InternetConnectionOptionValue
+        {
+            // Fields
+            [FieldOffset(0)]
+            public System.Runtime.InteropServices.ComTypes.FILETIME m_FileTime;
+
+            [FieldOffset(0)]
+            public int m_Int;
+
+            [FieldOffset(0)]
+            public nint m_StringPtr;
+        }
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        public struct RASENTRYNAME
+        {
+            public int dwSize;
+
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = RAS_MaxEntryName + 1)]
+            public string szEntryName;
+
+            public int dwFlags;
+
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = MAX_PATH + 1)]
+            public string szPhonebookPath;
+        }
+
+        // Constants
+        public const int RAS_MaxEntryName = 256;
+
+        public const int MAX_PATH = 260; // Standard MAX_PATH value in Windows
+    }
+
+    #endregion WinInet structures
+
+    #region WinInet enums
+
+    //
+    // options manifests for Internet{Query|Set}Option
+    //
+    public enum InternetOption : uint
+    {
+        INTERNET_OPTION_PER_CONNECTION_OPTION = 75,
+        INTERNET_OPTION_REFRESH = 37,
+        INTERNET_OPTION_SETTINGS_CHANGED = 39
+    }
+
+    //
+    // Options used in INTERNET_PER_CONN_OPTON struct
+    //
+    public enum PerConnOption
+    {
+        INTERNET_PER_CONN_FLAGS = 1, // Sets or retrieves the connection type. The Value member will contain one or more of the values from PerConnFlags
+        INTERNET_PER_CONN_PROXY_SERVER = 2, // Sets or retrieves a string containing the proxy servers.
+        INTERNET_PER_CONN_PROXY_BYPASS = 3, // Sets or retrieves a string containing the URLs that do not use the proxy server.
+        INTERNET_PER_CONN_AUTOCONFIG_URL = 4//, // Sets or retrieves a string containing the URL to the automatic configuration script.
+    }
+
+    //
+    // PER_CONN_FLAGS
+    //
+    [Flags]
+    public enum PerConnFlags
+    {
+        PROXY_TYPE_DIRECT = 0x00000001,  // direct to net
+        PROXY_TYPE_PROXY = 0x00000002,  // via named proxy
+        PROXY_TYPE_AUTO_PROXY_URL = 0x00000004,  // autoproxy URL
+        PROXY_TYPE_AUTO_DETECT = 0x00000008   // use autoproxy detection
+    }
+
+    public enum ErrorCode : uint
+    {
+        ERROR_BUFFER_TOO_SMALL = 603,
+        ERROR_INVALID_SIZE = 632
+    }
+
+    #endregion WinInet enums
+
+    internal static class NativeMethods
+    {
+        [DllImport("WinInet.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool InternetSetOption(nint hInternet, InternetOption dwOption, nint lpBuffer, int dwBufferLength);
+
+        [DllImport("Rasapi32.dll", CharSet = CharSet.Auto)]
+        public static extern uint RasEnumEntries(
+            string? reserved,          // Reserved, must be null
+            string? lpszPhonebook,     // Pointer to full path and filename of phone-book file. If this parameter is NULL, the entries are enumerated from all the remote access phone-book files
+            [In, Out] RASENTRYNAME[]? lprasentryname, // Buffer to receive RAS entry names
+            ref int lpcb,             // Size of the buffer
+            ref int lpcEntries        // Number of entries written to the buffer
+        );
+    }
 }

v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs

@@ -1,99 +1,98 @@
-namespace ServiceLib.Handler.SysProxy
+namespace ServiceLib.Handler.SysProxy;
+
+public static class SysProxyHandler
 {
-    public static class SysProxyHandler
+    private static readonly string _tag = "SysProxyHandler";
+
+    public static async Task<bool> UpdateSysProxy(Config config, bool forceDisable)
     {
-        private static readonly string _tag = "SysProxyHandler";
+        var type = config.SystemProxyItem.SysProxyType;
 
-        public static async Task<bool> UpdateSysProxy(Config config, bool forceDisable)
+        if (forceDisable && type != ESysProxyType.Unchanged)
         {
-            var type = config.SystemProxyItem.SysProxyType;
-
-            if (forceDisable && type != ESysProxyType.Unchanged)
-            {
-                type = ESysProxyType.ForcedClear;
-            }
-
-            try
-            {
-                var port = AppHandler.Instance.GetLocalPort(EInboundProtocol.socks);
-                var exceptions = config.SystemProxyItem.SystemProxyExceptions.Replace(" ", "");
-                if (port <= 0)
-                {
-                    return false;
-                }
-                switch (type)
-                {
-                    case ESysProxyType.ForcedChange when Utils.IsWindows():
-                        {
-                            GetWindowsProxyString(config, port, out var strProxy, out var strExceptions);
-                            ProxySettingWindows.SetProxy(strProxy, strExceptions, 2);
-                            break;
-                        }
-                    case ESysProxyType.ForcedChange when Utils.IsLinux():
-                        await ProxySettingLinux.SetProxy(Global.Loopback, port, exceptions);
-                        break;
-
-                    case ESysProxyType.ForcedChange when Utils.IsOSX():
-                        await ProxySettingOSX.SetProxy(Global.Loopback, port, exceptions);
-                        break;
-
-                    case ESysProxyType.ForcedClear when Utils.IsWindows():
-                        ProxySettingWindows.UnsetProxy();
-                        break;
-
-                    case ESysProxyType.ForcedClear when Utils.IsLinux():
-                        await ProxySettingLinux.UnsetProxy();
-                        break;
-
-                    case ESysProxyType.ForcedClear when Utils.IsOSX():
-                        await ProxySettingOSX.UnsetProxy();
-                        break;
-
-                    case ESysProxyType.Pac when Utils.IsWindows():
-                        await SetWindowsProxyPac(port);
-                        break;
-                }
-
-                if (type != ESysProxyType.Pac && Utils.IsWindows())
-                {
-                    PacHandler.Stop();
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-            return true;
+            type = ESysProxyType.ForcedClear;
         }
 
-        private static void GetWindowsProxyString(Config config, int port, out string strProxy, out string strExceptions)
+        try
         {
-            strExceptions = config.SystemProxyItem.SystemProxyExceptions.Replace(" ", "");
-            if (config.SystemProxyItem.NotProxyLocalAddress)
+            var port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
+            var exceptions = config.SystemProxyItem.SystemProxyExceptions.Replace(" ", "");
+            if (port <= 0)
             {
-                strExceptions = $"<local>;{strExceptions}";
+                return false;
+            }
+            switch (type)
+            {
+                case ESysProxyType.ForcedChange when Utils.IsWindows():
+                    {
+                        GetWindowsProxyString(config, port, out var strProxy, out var strExceptions);
+                        ProxySettingWindows.SetProxy(strProxy, strExceptions, 2);
+                        break;
+                    }
+                case ESysProxyType.ForcedChange when Utils.IsLinux():
+                    await ProxySettingLinux.SetProxy(Global.Loopback, port, exceptions);
+                    break;
+
+                case ESysProxyType.ForcedChange when Utils.IsOSX():
+                    await ProxySettingOSX.SetProxy(Global.Loopback, port, exceptions);
+                    break;
+
+                case ESysProxyType.ForcedClear when Utils.IsWindows():
+                    ProxySettingWindows.UnsetProxy();
+                    break;
+
+                case ESysProxyType.ForcedClear when Utils.IsLinux():
+                    await ProxySettingLinux.UnsetProxy();
+                    break;
+
+                case ESysProxyType.ForcedClear when Utils.IsOSX():
+                    await ProxySettingOSX.UnsetProxy();
+                    break;
+
+                case ESysProxyType.Pac when Utils.IsWindows():
+                    await SetWindowsProxyPac(port);
+                    break;
             }
 
-            strProxy = string.Empty;
-            if (Utils.IsNullOrEmpty(config.SystemProxyItem.SystemProxyAdvancedProtocol))
+            if (type != ESysProxyType.Pac && Utils.IsWindows())
             {
-                strProxy = $"{Global.Loopback}:{port}";
-            }
-            else
-            {
-                strProxy = config.SystemProxyItem.SystemProxyAdvancedProtocol
-                    .Replace("{ip}", Global.Loopback)
-                    .Replace("{http_port}", port.ToString())
-                    .Replace("{socks_port}", port.ToString());
+                PacManager.Instance.Stop();
             }
         }
-
-        private static async Task SetWindowsProxyPac(int port)
+        catch (Exception ex)
         {
-            var portPac = AppHandler.Instance.GetLocalPort(EInboundProtocol.pac);
-            await PacHandler.Start(Utils.GetConfigPath(), port, portPac);
-            var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
-            ProxySettingWindows.SetProxy(strProxy, "", 4);
+            Logging.SaveLog(_tag, ex);
+        }
+        return true;
+    }
+
+    private static void GetWindowsProxyString(Config config, int port, out string strProxy, out string strExceptions)
+    {
+        strExceptions = config.SystemProxyItem.SystemProxyExceptions.Replace(" ", "");
+        if (config.SystemProxyItem.NotProxyLocalAddress)
+        {
+            strExceptions = $"<local>;{strExceptions}";
+        }
+
+        strProxy = string.Empty;
+        if (config.SystemProxyItem.SystemProxyAdvancedProtocol.IsNullOrEmpty())
+        {
+            strProxy = $"{Global.Loopback}:{port}";
+        }
+        else
+        {
+            strProxy = config.SystemProxyItem.SystemProxyAdvancedProtocol
+                .Replace("{ip}", Global.Loopback)
+                .Replace("{http_port}", port.ToString())
+                .Replace("{socks_port}", port.ToString());
         }
     }
-}
+
+    private static async Task SetWindowsProxyPac(int port)
+    {
+        var portPac = AppManager.Instance.GetLocalPort(EInboundProtocol.pac);
+        await PacManager.Instance.StartAsync(Utils.GetConfigPath(), port, portPac);
+        var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
+        ProxySettingWindows.SetProxy(strProxy, "", 4);
+    }
+}

v2rayN/ServiceLib/Handler/TaskHandler.cs

@@ -1,72 +0,0 @@
-namespace ServiceLib.Handler
-{
-    public class TaskHandler
-    {
-        private static readonly Lazy<TaskHandler> _instance = new(() => new());
-        public static TaskHandler Instance => _instance.Value;
-
-        public void RegUpdateTask(Config config, Action<bool, string> updateFunc)
-        {
-            Task.Run(() => UpdateTaskRunSubscription(config, updateFunc));
-            Task.Run(() => UpdateTaskRunGeo(config, updateFunc));
-        }
-
-        private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> updateFunc)
-        {
-            await Task.Delay(60000);
-            Logging.SaveLog("UpdateTaskRunSubscription");
-
-            var updateHandle = new UpdateService();
-            while (true)
-            {
-                var updateTime = ((DateTimeOffset)DateTime.Now).ToUnixTimeSeconds();
-                var lstSubs = (await AppHandler.Instance.SubItems())
-                            .Where(t => t.AutoUpdateInterval > 0)
-                            .Where(t => updateTime - t.UpdateTime >= t.AutoUpdateInterval * 60)
-                            .ToList();
-
-                foreach (var item in lstSubs)
-                {
-                    await updateHandle.UpdateSubscriptionProcess(config, item.Id, true, (bool success, string msg) =>
-                        {
-                            updateFunc?.Invoke(success, msg);
-                            if (success)
-                                Logging.SaveLog("subscription" + msg);
-                        });
-                    item.UpdateTime = updateTime;
-                    await ConfigHandler.AddSubItem(config, item);
-
-                    await Task.Delay(5000);
-                }
-                await Task.Delay(60000);
-            }
-        }
-
-        private async Task UpdateTaskRunGeo(Config config, Action<bool, string> updateFunc)
-        {
-            var autoUpdateGeoTime = DateTime.Now;
-
-            //await Task.Delay(1000 * 120);
-            Logging.SaveLog("UpdateTaskRunGeo");
-
-            var updateHandle = new UpdateService();
-            while (true)
-            {
-                await Task.Delay(1000 * 3600);
-
-                var dtNow = DateTime.Now;
-                if (config.GuiItem.AutoUpdateInterval > 0)
-                {
-                    if ((dtNow - autoUpdateGeoTime).Hours % config.GuiItem.AutoUpdateInterval == 0)
-                    {
-                        await updateHandle.UpdateGeoFileAll(config, (bool success, string msg) =>
-                        {
-                            updateFunc?.Invoke(false, msg);
-                        });
-                        autoUpdateGeoTime = dtNow;
-                    }
-                }
-            }
-        }
-    }
-}

v2rayN/ServiceLib/Handler/WebDavHandler.cs

@@ -1,180 +0,0 @@
-using System.Net;
-using WebDav;
-
-namespace ServiceLib.Handler
-{
-    public sealed class WebDavHandler
-    {
-        private static readonly Lazy<WebDavHandler> _instance = new(() => new());
-        public static WebDavHandler Instance => _instance.Value;
-
-        private Config? _config;
-        private WebDavClient? _client;
-        private string? _lastDescription;
-        private string _webDir = Global.AppName + "_backup";
-        private readonly string _webFileName = "backup.zip";
-        private readonly string _tag = "WebDav--";
-
-        public WebDavHandler()
-        {
-            _config = AppHandler.Instance.Config;
-        }
-
-        private async Task<bool> GetClient()
-        {
-            try
-            {
-                if (_config.WebDavItem.Url.IsNullOrEmpty()
-                || _config.WebDavItem.UserName.IsNullOrEmpty()
-                || _config.WebDavItem.Password.IsNullOrEmpty())
-                {
-                    throw new ArgumentException("webdav parameter error or null");
-                }
-                if (_client != null)
-                {
-                    _client?.Dispose();
-                    _client = null;
-                }
-                if (_config.WebDavItem.DirName.IsNullOrEmpty())
-                {
-                    _webDir = Global.AppName + "_backup";
-                }
-                else
-                {
-                    _webDir = _config.WebDavItem.DirName.TrimEx();
-                }
-
-                var clientParams = new WebDavClientParams
-                {
-                    BaseAddress = new Uri(_config.WebDavItem.Url),
-                    Credentials = new NetworkCredential(_config.WebDavItem.UserName, _config.WebDavItem.Password)
-                };
-                _client = new WebDavClient(clientParams);
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex);
-                return false;
-            }
-            return await Task.FromResult(true);
-        }
-
-        private async Task<bool> TryCreateDir()
-        {
-            if (_client is null)
-                return false;
-            try
-            {
-                var result2 = await _client.Mkcol(_webDir);
-                if (result2.IsSuccessful)
-                {
-                    return true;
-                }
-                SaveLog(result2.Description);
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex);
-            }
-            return false;
-        }
-
-        private void SaveLog(string desc)
-        {
-            _lastDescription = desc;
-            Logging.SaveLog(_tag + desc);
-        }
-
-        private void SaveLog(Exception ex)
-        {
-            _lastDescription = ex.Message;
-            Logging.SaveLog(_tag, ex);
-        }
-
-        public async Task<bool> CheckConnection()
-        {
-            if (await GetClient() == false)
-            {
-                return false;
-            }
-            await TryCreateDir();
-
-            try
-            {
-                var testName = "readme_test";
-                var myContent = new StringContent(testName);
-                var result = await _client.PutFile($"{_webDir}/{testName}", myContent);
-                if (result.IsSuccessful)
-                {
-                    await _client.Delete($"{_webDir}/{testName}");
-                    return true;
-                }
-                else
-                {
-                    SaveLog(result.Description);
-                }
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex);
-            }
-            return false;
-        }
-
-        public async Task<bool> PutFile(string fileName)
-        {
-            if (await GetClient() == false)
-            {
-                return false;
-            }
-            await TryCreateDir();
-
-            try
-            {
-                await using var fs = File.OpenRead(fileName);
-                var result = await _client.PutFile($"{_webDir}/{_webFileName}", fs); // upload a resource
-                if (result.IsSuccessful)
-                {
-                    return true;
-                }
-
-                SaveLog(result.Description);
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex);
-            }
-            return false;
-        }
-
-        public async Task<bool> GetRawFile(string fileName)
-        {
-            if (await GetClient() == false)
-            {
-                return false;
-            }
-            await TryCreateDir();
-
-            try
-            {
-                var response = await _client.GetRawFile($"{_webDir}/{_webFileName}");
-                if (!response.IsSuccessful)
-                {
-                    SaveLog(response.Description);
-                    return false;
-                }
-
-                await using var outputFileStream = new FileStream(fileName, FileMode.Create);
-                await response.Stream.CopyToAsync(outputFileStream);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex);
-            }
-            return false;
-        }
-
-        public string GetLastError() => _lastDescription ?? string.Empty;
-    }
-}