up 7.20.2

* Fix sing-box selector generation for dynamic group tags

* 修复 TUN 模式下 DNS 失败及 Windows 提权重启后 TUN 状态丢失

* 按上游意见回滚 TUN 提权时保留启用状态的改动

.github/workflows/build-linux.yml

@@ -9,9 +9,6 @@ on:
   push:
     branches:
       - master
-    tags:
-      - 'v*'
-      - 'V*'
 
 permissions:
   contents: write
@@ -37,7 +34,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v5.0.1
+      uses: actions/setup-dotnet@v5.2.0
       with:
         dotnet-version: '8.0.x'
 
@@ -56,23 +53,6 @@ jobs:
         path: |
           ${{ github.workspace }}/v2rayN/Release/linux*
 
-    # release debian package
-    - name: Package debian
-      if: github.event.inputs.release_tag != ''
-      run: |
-        chmod 755 package-debian.sh
-        ./package-debian.sh "$OutputArch" "$OutputPath64" "${{ github.event.inputs.release_tag }}"
-        ./package-debian.sh "$OutputArchArm" "$OutputPathArm64" "${{ github.event.inputs.release_tag }}"
-
-    - name: Upload deb to release
-      uses: svenstaro/upload-release-action@v2
-      if: github.event.inputs.release_tag != ''
-      with:
-        file: ${{ github.workspace }}/v2rayN*.deb
-        tag: ${{ github.event.inputs.release_tag }}
-        file_glob: true
-        prerelease: true
-
     # release zip archive
     - name: Package release zip archive
       if: github.event.inputs.release_tag != ''
@@ -90,6 +70,65 @@ jobs:
         file_glob: true
         prerelease: true
 
+  deb:
+    needs: build
+    if: |
+      (github.event_name == 'workflow_dispatch' && github.event.inputs.release_tag != '') ||
+      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
+    runs-on: ubuntu-24.04
+    container:
+      image: debian:13
+    env:
+      RELEASE_TAG: ${{ github.event.inputs.release_tag != '' && github.event.inputs.release_tag || github.ref_name }}
+
+    steps:
+    - name: Prepare tools (Debian)
+      shell: bash
+      run: |
+        set -euo pipefail
+        export DEBIAN_FRONTEND=noninteractive
+        apt-get update
+        apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file \
+                           ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev \
+                           libc6 libgcc-s1 libstdc++6 zlib1g libicu-dev libssl-dev
+
+    - name: Checkout repo (for scripts)
+      uses: actions/checkout@v6.0.2
+      with:
+        submodules: 'recursive'
+        fetch-depth: '0'
+
+    - name: Ensure script permissions
+      run: chmod 755 package-debian.sh
+
+    - name: Package DEB (Debian-family)
+      run: ./package-debian.sh "${RELEASE_TAG}" --arch all
+
+    - name: Collect DEBs into workspace
+      run: |
+        mkdir -p "$GITHUB_WORKSPACE/dist/deb"
+        rsync -av "$HOME/debbuild/" "$GITHUB_WORKSPACE/dist/deb/" || true
+        find "$GITHUB_WORKSPACE/dist/deb" -name "v2rayn_*_amd64.deb" \
+          -exec mv {} "$GITHUB_WORKSPACE/dist/deb/v2rayN-linux-64.deb" \; || true
+        find "$GITHUB_WORKSPACE/dist/deb" -name "v2rayn_*_arm64.deb" \
+          -exec mv {} "$GITHUB_WORKSPACE/dist/deb/v2rayN-linux-arm64.deb" \; || true
+        echo "==== Dist tree ===="
+        ls -R "$GITHUB_WORKSPACE/dist/deb" || true
+
+    - name: Upload DEB artifacts
+      uses: actions/upload-artifact@v7.0.0
+      with:
+        name: v2rayN-deb
+        path: dist/deb/**/*.deb
+
+    - name: Upload DEBs to release
+      uses: svenstaro/upload-release-action@v2
+      with:
+        file: dist/deb/**/*.deb
+        tag: ${{ env.RELEASE_TAG }}
+        file_glob: true
+        prerelease: true
+
   rpm:
     needs: build
     if: |

.github/workflows/build-osx.yml

@@ -32,7 +32,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v5.0.1
+      uses: actions/setup-dotnet@v5.2.0
       with:
         dotnet-version: '8.0.x'
 

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

@@ -32,7 +32,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v5.0.1
+      uses: actions/setup-dotnet@v5.2.0
       with:
         dotnet-version: '8.0.x'
 

.github/workflows/build-windows.yml

@@ -29,7 +29,7 @@ jobs:
       uses: actions/checkout@v6.0.2
 
     - name: Setup
-      uses: actions/setup-dotnet@v5.0.1
+      uses: actions/setup-dotnet@v5.2.0
       with:
         dotnet-version: '8.0.x'
 

package-debian.sh

@@ -1,70 +1,612 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -euo pipefail
 
-Arch="$1"
+# Require Debian base branch
-OutputPath="$2"
+. /etc/os-release
-Version="$3"
 
-FileName="v2rayN-${Arch}.zip"
+case "${ID:-}" in
-wget -nv -O $FileName "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/$FileName"
+  debian)
-7z x $FileName
+    echo "Detected supported system: ${NAME:-$ID} ${VERSION_ID:-}"
-cp -rf v2rayN-${Arch}/* $OutputPath
+    ;;
+  *)
+    echo "Unsupported system: ${NAME:-unknown} (${ID:-unknown})."
+    echo "This script only supports: Debian."
+    exit 1
+    ;;
+esac
 
-PackagePath="v2rayN-Package-${Arch}"
+# Kernel version
-mkdir -p "${PackagePath}/DEBIAN"
+MIN_KERNEL="6.11"
-mkdir -p "${PackagePath}/opt"
+CURRENT_KERNEL="$(uname -r)"
-cp -rf $OutputPath "${PackagePath}/opt/v2rayN"
-echo "When this file exists, app will not store configs under this folder" > "${PackagePath}/opt/v2rayN/NotStoreConfigHere.txt"
 
-if [ $Arch = "linux-64" ]; then
+lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$CURRENT_KERNEL" | sort -V | head -n1)"
-    Arch2="amd64"
+
-else
+if [[ "$lowest" != "$MIN_KERNEL" ]]; then
-    Arch2="arm64"
+    echo "Kernel $CURRENT_KERNEL is below $MIN_KERNEL"
+    exit 1
 fi
-echo $Arch2
 
-# basic
+echo "[OK] Kernel $CURRENT_KERNEL verified."
-cat >"${PackagePath}/DEBIAN/control" <<-EOF
+
-Package: v2rayN
+# Config & Parse arguments
-Version: $Version
+VERSION_ARG="${1:-}"     # Pass version number like 7.13.8, or leave empty
-Architecture: $Arch2
+WITH_CORE="both"         # Default: bundle both xray+sing-box
-Maintainer: https://github.com/2dust/v2rayN
+FORCE_NETCORE=0          # --netcore => skip archive bundle, use separate downloads
-Depends: libc6 (>= 2.34), fontconfig (>= 2.13.1), desktop-file-utils (>= 0.26), xdg-utils (>= 1.1.3), coreutils (>= 8.32), bash (>= 5.1), libfreetype6 (>= 2.11)
+ARCH_OVERRIDE=""         # --arch x64|arm64|all (optional compile target)
-Description: A GUI client for Windows and Linux, support Xray core and sing-box-core and others
+BUILD_FROM=""            # --buildfrom 1|2|3 to select channel non-interactively
+
+# If the first argument starts with --, do not treat it as a version number
+if [[ "${VERSION_ARG:-}" == --* ]]; then
+  VERSION_ARG=""
+fi
+# Take the first non --* argument as version, discard it
+if [[ -n "${VERSION_ARG:-}" ]]; then shift || true; fi
+
+# Parse remaining optional arguments
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --with-core)     WITH_CORE="${2:-both}"; shift 2;;
+    --xray-ver)      XRAY_VER="${2:-}"; shift 2;;
+    --singbox-ver)   SING_VER="${2:-}"; shift 2;;
+    --netcore)       FORCE_NETCORE=1; shift;;
+    --arch)          ARCH_OVERRIDE="${2:-}"; shift 2;;
+    --buildfrom)     BUILD_FROM="${2:-}"; shift 2;;
+    *)
+      if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
+      shift;;
+  esac
+done
+
+# Conflict: version number AND --buildfrom cannot be used together
+if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
+  echo "You cannot specify both an explicit version and --buildfrom at the same time."
+  echo "        Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
+  exit 1
+fi
+
+# Check and install dependencies
+host_arch="$(uname -m)"
+[[ "$host_arch" == "aarch64" || "$host_arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
+
+install_ok=0
+
+if command -v apt-get >/dev/null 2>&1; then
+  sudo apt-get update
+  sudo apt-get -y install \
+    curl unzip tar jq rsync ca-certificates git dpkg-dev fakeroot file \
+    desktop-file-utils xdg-utils wget
+
+  if [[ "$host_arch" == "aarch64" ]]; then
+    sudo dpkg --add-architecture amd64 || true
+    sudo apt-get update
+    sudo apt-get -y install \
+      libc6:amd64 libgcc-s1:amd64 libstdc++6:amd64 zlib1g:amd64 libfontconfig1:amd64
+  elif [[ "$host_arch" == "x86_64" ]]; then
+    sudo dpkg --add-architecture arm64 || true
+    sudo apt-get update
+    sudo apt-get -y install \
+      libc6:arm64 libgcc-s1:arm64 libstdc++6:arm64 zlib1g:arm64 libfontconfig1:arm64
+  fi
+
+  # Install .NET SDK 8 via official script
+  wget -q https://dot.net/v1/dotnet-install.sh
+  chmod +x dotnet-install.sh
+  ./dotnet-install.sh --channel 8.0 --install-dir "$HOME/.dotnet"
+
+  export PATH="$HOME/.dotnet:$PATH"
+  export DOTNET_ROOT="$HOME/.dotnet"
+
+  dotnet --info >/dev/null 2>&1 && install_ok=1
+fi
+
+if [[ "$install_ok" -ne 1 ]]; then
+  echo "Could not auto-install dependencies for '$ID'. Make sure these are available:"
+  echo "dotnet-sdk 8.x, curl, unzip, tar, rsync, git, dpkg-deb, desktop-file-utils, xdg-utils"
+  exit 1
+fi
+
+# Root directory
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+# Git submodules (best effort)
+if [[ -f .gitmodules ]]; then
+  git submodule sync --recursive || true
+  git submodule update --init --recursive || true
+fi
+
+# Locate project
+PROJECT="v2rayN.Desktop/v2rayN.Desktop.csproj"
+if [[ ! -f "$PROJECT" ]]; then
+  PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
+fi
+[[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; }
+
+choose_channel() {
+  # If --buildfrom provided, map it directly and skip interaction.
+  if [[ -n "${BUILD_FROM:-}" ]]; then
+    case "$BUILD_FROM" in
+      1) echo "latest"; return 0;;
+      2) echo "prerelease"; return 0;;
+      3) echo "keep"; return 0;;
+      *) echo "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." >&2; exit 1;;
+    esac
+  fi
+
+  # Print menu to stderr and read from /dev/tty so stdout only carries the token.
+  local ch="latest" sel=""
+
+  if [[ -t 0 ]]; then
+    echo "[?] Choose v2rayN release channel:" >&2
+    echo "    1) Latest (stable)  [default]" >&2
+    echo "    2) Pre-release (preview)" >&2
+    echo "    3) Keep current (do nothing)" >&2
+    printf "Enter 1, 2 or 3 [default 1]: " >&2
+
+    if read -r sel </dev/tty; then
+      case "${sel:-}" in
+        2) ch="prerelease" ;;
+        3) ch="keep" ;;
+      esac
+    fi
+  fi
+
+  echo "$ch"
+}
+
+get_latest_tag_latest() {
+  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
+    | jq -re '.tag_name' \
+    | sed 's/^v//'
+}
+
+get_latest_tag_prerelease() {
+  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20" \
+    | jq -re 'first(.[] | select(.prerelease == true) | .tag_name)' \
+    | sed 's/^v//'
+}
+
+git_try_checkout() {
+  local want="$1" ref=""
+  if git rev-parse --git-dir >/dev/null 2>&1; then
+    git fetch --tags --force --prune --depth=1 || true
+    if git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then
+      ref="${want}"
+    fi
+    if [[ -n "$ref" ]]; then
+      echo "[OK] Found ref '${ref}', checking out..."
+      git checkout -f "${ref}"
+      if [[ -f .gitmodules ]]; then
+        git submodule sync --recursive || true
+        git submodule update --init --recursive || true
+      fi
+      return 0
+    fi
+  fi
+  return 1
+}
+
+apply_channel_or_keep() {
+  local ch="$1" tag
+
+  if [[ "$ch" == "keep" ]]; then
+    echo "[*] Keep current repository state (no checkout)."
+    VERSION="$(git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0+git')"
+    VERSION="${VERSION#v}"
+    return 0
+  fi
+
+  echo "[*] Resolving ${ch} tag from GitHub releases..."
+  if [[ "$ch" == "prerelease" ]]; then
+    tag="$(get_latest_tag_prerelease || true)"
+  else
+    tag="$(get_latest_tag_latest || true)"
+  fi
+
+  [[ -n "$tag" ]] || { echo "Failed to resolve latest tag for channel '${ch}'."; exit 1; }
+  echo "[*] Latest tag for '${ch}': ${tag}"
+  git_try_checkout "$tag" || { echo "Failed to checkout '${tag}'."; exit 1; }
+  VERSION="${tag#v}"
+}
+
+if git rev-parse --git-dir >/dev/null 2>&1; then
+  if [[ -n "${VERSION_ARG:-}" ]]; then
+    clean_ver="${VERSION_ARG#v}"
+    if git_try_checkout "$clean_ver"; then
+      VERSION="$clean_ver"
+    else
+      echo "[WARN] Tag '${VERSION_ARG}' not found."
+      ch="$(choose_channel)"
+      apply_channel_or_keep "$ch"
+    fi
+  else
+    ch="$(choose_channel)"
+    apply_channel_or_keep "$ch"
+  fi
+else
+  echo "Current directory is not a git repo; proceeding on current tree."
+  VERSION="${VERSION_ARG:-0.0.0}"
+fi
+
+VERSION="${VERSION#v}"
+echo "[*] GUI version resolved as: ${VERSION}"
+
+download_xray() {
+  local outdir="$1" rid="$2" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
+  mkdir -p "$outdir"
+  if [[ -z "$ver" ]]; then
+    ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
+        | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
+  fi
+  [[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
+  if [[ "$rid" == "linux-arm64" ]]; then
+    url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip"
+  else
+    url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip"
+  fi
+  echo "[+] Download xray: $url"
+  tmp="$(mktemp -d)"
+  curl -fL "$url" -o "$tmp/$zipname"
+  unzip -q "$tmp/$zipname" -d "$tmp"
+  install -m 755 "$tmp/xray" "$outdir/xray"
+  rm -rf "$tmp"
+}
+
+download_singbox() {
+  # Download sing-box
+  local outdir="$1" rid="$2" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin cronet
+  mkdir -p "$outdir"
+  if [[ -z "$ver" ]]; then
+    ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
+      | grep -Eo '"tag_name":\s*"v[^"]+"' \
+      | sed -E 's/.*"v([^"]+)".*/\1/' \
+      | head -n1)" || true
+  fi
+  [[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
+  if [[ "$rid" == "linux-arm64" ]]; then
+    url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz"
+  else
+    url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz"
+  fi
+  echo "[+] Download sing-box: $url"
+  tmp="$(mktemp -d)"
+  curl -fL "$url" -o "$tmp/$tarname"
+  tar -C "$tmp" -xzf "$tmp/$tarname"
+  bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
+  [[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
+  install -m 755 "$bin" "$outdir/sing-box"
+  cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
+  [[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so"
+  rm -rf "$tmp"
+}
+
+unify_geo_layout() {
+  local outroot="$1"
+  mkdir -p "$outroot/bin"
+  local names=(
+    "geosite.dat"
+    "geoip.dat"
+    "geoip-only-cn-private.dat"
+    "Country.mmdb"
+    "geoip.metadb"
+  )
+  for n in "${names[@]}"; do
+    if [[ -f "$outroot/bin/xray/$n" ]]; then
+      mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
+    fi
+  done
+}
+
+download_geo_assets() {
+  local outroot="$1"
+  local bin_dir="$outroot/bin"
+  local srss_dir="$bin_dir/srss"
+  mkdir -p "$bin_dir" "$srss_dir"
+
+  echo "[+] Download Xray Geo to ${bin_dir}"
+  curl -fsSL -o "$bin_dir/geosite.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
+  curl -fsSL -o "$bin_dir/geoip.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
+  curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
+  curl -fsSL -o "$bin_dir/Country.mmdb" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
+
+  echo "[+] Download sing-box rule DB & rule-sets"
+  curl -fsSL -o "$bin_dir/geoip.metadb" \
+    "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" || true
+
+  for f in \
+    geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs \
+    geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
+    curl -fsSL -o "$srss_dir/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
+  done
+
+  for f in \
+    geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs \
+    geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
+    curl -fsSL -o "$srss_dir/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
+  done
+
+  unify_geo_layout "$outroot"
+}
+
+download_v2rayn_bundle() {
+  local outroot="$1" rid="$2"
+  local url=""
+  if [[ "$rid" == "linux-arm64" ]]; then
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip"
+  else
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip"
+  fi
+  echo "[+] Try v2rayN bundle archive: $url"
+  local tmp zipname
+  tmp="$(mktemp -d)"; zipname="$tmp/v2rayn.zip"
+  curl -fL "$url" -o "$zipname" || { echo "[!] Bundle download failed"; return 1; }
+  unzip -q "$zipname" -d "$tmp" || { echo "[!] Bundle unzip failed"; return 1; }
+
+  if [[ -d "$tmp/bin" ]]; then
+    mkdir -p "$outroot/bin"
+    rsync -a "$tmp/bin/" "$outroot/bin/"
+  else
+    rsync -a "$tmp/" "$outroot/"
+  fi
+
+  rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
+  find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
+
+  local nested_dir
+  nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
+  if [[ -n "$nested_dir" && -d "$nested_dir/bin" ]]; then
+    mkdir -p "$outroot/bin"
+    rsync -a "$nested_dir/bin/" "$outroot/bin/"
+    rm -rf "$nested_dir"
+  fi
+
+  # Unify to bin/
+  unify_geo_layout "$outroot"
+
+  echo "[+] Bundle extracted to $outroot"
+}
+
+BUILT_DEBS=()
+BUILT_ALL=0
+OUTPUT_DIR="$HOME/debbuild"
+mkdir -p "$OUTPUT_DIR"
+
+build_for_arch() {
+  local short="$1"
+  local rid deb_arch outdir_name
+  case "$short" in
+    x64)   rid="linux-x64";   deb_arch="amd64"; outdir_name="amd64" ;;
+    arm64) rid="linux-arm64"; deb_arch="arm64"; outdir_name="arm64" ;;
+    *) echo "Unknown arch '$short' (use x64|arm64)"; return 1 ;;
+  esac
+
+  echo "[*] Building for target: $short  (RID=$rid, DEB arch=$deb_arch)"
+
+  dotnet clean "$PROJECT" -c Release
+  rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
+
+  dotnet restore "$PROJECT"
+  dotnet publish "$PROJECT" \
+    -c Release -r "$rid" \
+    -p:PublishSingleFile=false \
+    -p:SelfContained=true
+
+  local RID_DIR="$rid"
+  local PUBDIR
+  PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
+  [[ -d "$PUBDIR" ]] || { echo "Publish directory not found: $PUBDIR"; return 1; }
+
+  local WORKDIR PKGROOT STAGE DEBIAN_DIR
+  WORKDIR="$(mktemp -d)"
+  PKGROOT="v2rayN-publish"
+  STAGE="$WORKDIR/${PKGROOT}_${VERSION}_${deb_arch}"
+  DEBIAN_DIR="$STAGE/DEBIAN"
+
+  mkdir -p "$STAGE/opt/v2rayN"
+  mkdir -p "$STAGE/usr/bin"
+  mkdir -p "$STAGE/usr/share/applications"
+  mkdir -p "$STAGE/usr/share/icons/hicolor/256x256/apps"
+  mkdir -p "$DEBIAN_DIR"
+
+  # Stage publish content from source build
+  cp -a "$PUBDIR/." "$STAGE/opt/v2rayN/"
+
+  local ICON_CANDIDATE
+  PROJECT_DIR="$(cd "$(dirname "$PROJECT")" && pwd)"
+  ICON_CANDIDATE="$PROJECT_DIR/v2rayN.png"
+  [[ -f "$ICON_CANDIDATE" ]] && cp "$ICON_CANDIDATE" "$STAGE/usr/share/icons/hicolor/256x256/apps/v2rayn.png" || true
+
+  mkdir -p "$STAGE/opt/v2rayN/bin/xray" "$STAGE/opt/v2rayN/bin/sing_box"
+
+  fetch_separate_cores_and_rules() {
+    local outroot="$1"
+
+    if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+      download_xray "$outroot/bin/xray" "$RID_DIR" || echo "[!] xray download failed (skipped)"
+    fi
+    if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+      download_singbox "$outroot/bin/sing_box" "$RID_DIR" || echo "[!] sing-box download failed (skipped)"
+    fi
+    download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
+  }
+
+  if [[ "$FORCE_NETCORE" -eq 0 ]]; then
+    if download_v2rayn_bundle "$STAGE/opt/v2rayN" "$RID_DIR"; then
+      echo "[*] Using v2rayN bundle bin assets."
+    else
+      echo "[*] Bundle failed, fallback to separate core + rules."
+      fetch_separate_cores_and_rules "$STAGE/opt/v2rayN"
+    fi
+  else
+    echo "[*] --netcore specified: use separate core + rules."
+    fetch_separate_cores_and_rules "$STAGE/opt/v2rayN"
+  fi
+
+  # Wrapper
+  install -m 755 /dev/stdin "$STAGE/usr/bin/v2rayn" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+DIR="/opt/v2rayN"
+cd "$DIR"
+
+if [[ -x "$DIR/v2rayN" ]]; then
+  exec "$DIR/v2rayN" "$@"
+fi
+
+for dll in v2rayN.Desktop.dll v2rayN.dll; do
+  if [[ -f "$DIR/$dll" ]]; then
+    exec /usr/bin/dotnet "$DIR/$dll" "$@"
+  fi
+done
+
+echo "v2rayN launcher: no executable found in $DIR" >&2
+ls -l "$DIR" >&2 || true
+exit 1
 EOF
 
-mkdir -p "${PackagePath}/usr/share/applications"
+  SHLIBS_DEPENDS=""
-cat >"${PackagePath}/usr/share/applications/v2rayN.desktop" <<-EOF
+  EXTRA_DEPENDS="libc6 (>= 2.34), fontconfig (>= 2.13.1), desktop-file-utils (>= 0.26), xdg-utils (>= 1.1.3), coreutils (>= 8.32), bash (>= 5.1), libfreetype6 (>= 2.11)"
+
+  mkdir -p "$WORKDIR/debian"
+  cat > "$WORKDIR/debian/control" <<EOF
+Source: v2rayn
+Section: net
+Priority: optional
+Maintainer: 2dust <noreply@github.com>
+Standards-Version: 4.7.0
+
+Package: v2rayn
+Architecture: ${deb_arch}
+Description: v2rayN
+EOF
+
+  local SYS_LIBDIR=""
+  local SYS_USRLIBDIR=""
+  multiarch="$(dpkg-architecture -a"$deb_arch" -qDEB_HOST_MULTIARCH)"
+
+  SYS_LIBDIR="/lib/$multiarch"
+  SYS_USRLIBDIR="/usr/lib/$multiarch"
+
+  : > "$DEBIAN_DIR/substvars"
+  mapfile -t ELF_FILES < <(
+    find "$STAGE/opt/v2rayN" -type f \( -name "*.so*" -o -perm -111 \) ! -name 'libcoreclrtraceptprovider.so'
+  )
+  if [[ "${#ELF_FILES[@]}" -gt 0 ]]; then
+    (
+      cd "$WORKDIR"
+      dpkg-shlibdeps \
+        -l"$STAGE/opt/v2rayN" \
+        -l"$SYS_LIBDIR" \
+        -l"$SYS_USRLIBDIR" \
+        -T"$DEBIAN_DIR/substvars" \
+        "${ELF_FILES[@]}"
+    ) >/dev/null 2>&1 || true
+  fi
+
+  SHLIBS_DEPENDS="$(sed -n 's/^shlibs:Depends=//p' "$DEBIAN_DIR/substvars" | head -n1 || true)"
+
+  if [[ -n "$SHLIBS_DEPENDS" ]]; then
+    SHLIBS_DEPENDS="$(echo "$SHLIBS_DEPENDS" \
+      | sed -E 's/ *\([^)]*\)//g' \
+      | sed -E 's/ *, */, /g' \
+      | sed -E 's/^, *//; s/, *$//')"
+    FINAL_DEPENDS="${SHLIBS_DEPENDS}, ${EXTRA_DEPENDS}"
+  else
+    FINAL_DEPENDS="${EXTRA_DEPENDS}"
+  fi
+
+  # Desktop file
+  install -m 644 /dev/stdin "$STAGE/usr/share/applications/v2rayn.desktop" <<'EOF'
 [Desktop Entry]
-Name=v2rayN
-Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
-Exec=/opt/v2rayN/v2rayN
-Icon=/opt/v2rayN/v2rayN.png
-Terminal=false
 Type=Application
-Categories=Network;Application;
+Name=v2rayN
+Comment=v2rayN for Debian GNU Linux
+Exec=v2rayn
+Icon=v2rayn
+Terminal=false
+Categories=Network;
 EOF
 
-cat >"${PackagePath}/DEBIAN/postinst" <<-'EOF'
+  # Control file
+  cat > "$DEBIAN_DIR/control" <<EOF
+Package: v2rayn
+Version: ${VERSION}
+Architecture: ${deb_arch}
+Maintainer: 2dust <noreply@github.com>
+Homepage: https://github.com/2dust/v2rayN
+Section: net
+Priority: optional
+Depends: ${FINAL_DEPENDS}
+Description: v2rayN (Avalonia) GUI client for Linux
+ Support vless / vmess / Trojan / http / socks / Anytls / Hysteria2 /
+ Shadowsocks / tuic / WireGuard.
+EOF
+
+  # postinst
+  install -m 755 /dev/stdin "$DEBIAN_DIR/postinst" <<'EOF'
+#!/bin/sh
 set -e
-update-desktop-database || true
+update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
+if command -v gtk-update-icon-cache >/dev/null 2>&1; then
+  gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
+fi
 exit 0
 EOF
 
-sudo chmod 0755 "${PackagePath}/DEBIAN/postinst"
+  # postrm
-sudo chmod 0755 "${PackagePath}/opt/v2rayN/v2rayN"
+  install -m 755 /dev/stdin "$DEBIAN_DIR/postrm" <<'EOF'
-sudo chmod 0755 "${PackagePath}/opt/v2rayN/AmazTool"
+#!/bin/sh
+set -e
+update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
+if command -v gtk-update-icon-cache >/dev/null 2>&1; then
+  gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
+fi
+exit 0
+EOF
 
-# Patch
+  # Normalize permissions
-# set owner to root:root
+  find "$STAGE/opt/v2rayN" -type d -exec chmod 0755 {} +
-sudo chown -R root:root "${PackagePath}"
+  find "$STAGE/opt/v2rayN" -type f -exec chmod 0644 {} +
-# set all directories to 755 (readable & traversable by all users)
+  [[ -f "$STAGE/opt/v2rayN/v2rayN" ]] && chmod 0755 "$STAGE/opt/v2rayN/v2rayN" || true
-sudo find "${PackagePath}/opt/v2rayN" -type d -exec chmod 755 {} +
+  
-# set all regular files to 644 (readable by all users)
+  local deb_out
-sudo find "${PackagePath}/opt/v2rayN" -type f -exec chmod 644 {} +
+  deb_out="$OUTPUT_DIR/v2rayn_${VERSION}_${deb_arch}.deb"
-# 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
+  dpkg-deb --root-owner-group --build "$STAGE" "$deb_out"
-sudo dpkg-deb -Zxz --build $PackagePath
+
-sudo mv "${PackagePath}.deb" "v2rayN-${Arch}.deb"
+  echo "Build done for $short. DEB at:"
+  echo "  $deb_out"
+  BUILT_DEBS+=("$deb_out")
+
+  rm -rf "$WORKDIR"
+}
+
+case "${ARCH_OVERRIDE:-}" in
+  all)           targets=(x64 arm64); BUILT_ALL=1 ;;
+  x64|amd64)     targets=(x64) ;;
+  arm64|aarch64) targets=(arm64) ;;
+  "")            targets=($([[ "$host_arch" == "aarch64" ]] && echo arm64 || echo x64)) ;;
+  *)             echo "Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all."; exit 1 ;;
+esac
+
+for arch in "${targets[@]}"; do
+  build_for_arch "$arch"
+done
+
+echo ""
+echo "================ Build Summary ================="
+if [[ "${#BUILT_DEBS[@]}" -gt 0 ]]; then
+  echo "Output directory: $OUTPUT_DIR"
+  for pkg in "${BUILT_DEBS[@]}"; do
+    echo "$pkg"
+  done
+else
+  echo "No DEBs detected in summary (check build logs above)."
+fi
+echo "==============================================="

package-rhel.sh

@@ -210,46 +210,52 @@ echo "[*] GUI version resolved as: ${VERSION}"
 # Helpers for core
 download_xray() {
   # Download Xray core
-  local outdir="$1" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
+  local outdir="$1" rid="$2" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
   mkdir -p "$outdir"
   if [[ -z "$ver" ]]; then
     ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
         | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
   fi
   [[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
-  if [[ "$RID_DIR" == "linux-arm64" ]]; then
+  if [[ "$rid" == "linux-arm64" ]]; then
     url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip"
   else
     url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip"
   fi
   echo "[+] Download xray: $url"
-  tmp="$(mktemp -d)"; trap '[[ -n "${tmp:-}" ]] && rm -rf "$tmp"' RETURN
+  tmp="$(mktemp -d)"
   curl -fL "$url" -o "$tmp/$zipname"
   unzip -q "$tmp/$zipname" -d "$tmp"
-  install -Dm755 "$tmp/xray" "$outdir/xray"
+  install -m 755 "$tmp/xray" "$outdir/xray"
+  rm -rf "$tmp"
 }
 
 download_singbox() {
   # Download sing-box
-  local outdir="$1" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin
+  local outdir="$1" rid="$2" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin cronet
   mkdir -p "$outdir"
   if [[ -z "$ver" ]]; then
     ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
-        | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
+      | 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
+  if [[ "$rid" == "linux-arm64" ]]; then
     url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz"
   else
     url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz"
   fi
   echo "[+] Download sing-box: $url"
-  tmp="$(mktemp -d)"; trap '[[ -n "${tmp:-}" ]] && rm -rf "$tmp"' RETURN
+  tmp="$(mktemp -d)"
   curl -fL "$url" -o "$tmp/$tarname"
   tar -C "$tmp" -xzf "$tmp/$tarname"
   bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
-  [[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; return 1; }
+  [[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
-  install -Dm755 "$bin" "$outdir/sing-box"
+  install -m 755 "$bin" "$outdir/sing-box"
+  cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
+  [[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so"
+  rm -rf "$tmp"
 }
 
 # Move geo files to outroot/bin
@@ -310,9 +316,9 @@ download_geo_assets() {
 
 # Prefer the prebuilt v2rayN core bundle; then unify geo layout
 download_v2rayn_bundle() {
-  local outroot="$1"
+  local outroot="$1" rid="$2"
   local url=""
-  if [[ "$RID_DIR" == "linux-arm64" ]]; then
+  if [[ "$rid" == "linux-arm64" ]]; then
     url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip"
   else
     url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip"
@@ -378,10 +384,7 @@ build_for_arch() {
   local RID_DIR="$rid"
   local PUBDIR
   PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
-  [[ -d "$PUBDIR" ]]
+  [[ -d "$PUBDIR" ]] || { echo "Publish directory not found: $PUBDIR"; return 1; }
-
-  # Make RID_DIR visible to download helpers (they read this var)
-  export RID_DIR
 
   # Per-arch working area
   local PKGROOT="v2rayN-publish"
@@ -400,10 +403,12 @@ build_for_arch() {
   mkdir -p "$WORKDIR/$PKGROOT"
   cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/"
 
-  # Optional icon
+  # Required icon
   local ICON_CANDIDATE
-  ICON_CANDIDATE="$(dirname "$PROJECT")/../v2rayN.Desktop/v2rayN.png"
+  PROJECT_DIR="$(cd "$(dirname "$PROJECT")" && pwd)"
-  [[ -f "$ICON_CANDIDATE" ]] && cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png" || true
+  ICON_CANDIDATE="$PROJECT_DIR/v2rayN.png"
+  [[ -f "$ICON_CANDIDATE" ]] || { echo "Required icon not found: $ICON_CANDIDATE"; return 1; }
+  cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png"
 
   # Prepare bin structure
   mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
@@ -413,16 +418,16 @@ build_for_arch() {
     local outroot="$1"
 
     if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
-      download_xray "$outroot/bin/xray" || echo "[!] xray download failed (skipped)"
+      download_xray "$outroot/bin/xray" "$RID_DIR" || echo "[!] xray download failed (skipped)"
     fi
     if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
-      download_singbox "$outroot/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
+      download_singbox "$outroot/bin/sing_box" "$RID_DIR" || echo "[!] sing-box download failed (skipped)"
     fi
     download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
   }
 
   if [[ "$FORCE_NETCORE" -eq 0 ]]; then
-    if download_v2rayn_bundle "$WORKDIR/$PKGROOT"; then
+    if download_v2rayn_bundle "$WORKDIR/$PKGROOT" "$RID_DIR"; then
       echo "[*] Using v2rayN bundle archive."
     else
       echo "[*] Bundle failed, fallback to separate core + rules."
@@ -484,9 +489,14 @@ https://github.com/2dust/v2rayN
 install -dm0755 %{buildroot}/opt/v2rayN
 cp -a * %{buildroot}/opt/v2rayN/
 
+# Normalize permissions
+find %{buildroot}/opt/v2rayN -type d -exec chmod 0755 {} +
+find %{buildroot}/opt/v2rayN -type f -exec chmod 0644 {} +
+[ -f %{buildroot}/opt/v2rayN/v2rayN ] && chmod 0755 %{buildroot}/opt/v2rayN/v2rayN || :
+
 # Launcher (prefer native ELF first, then DLL fallback)
 install -dm0755 %{buildroot}%{_bindir}
-cat > %{buildroot}%{_bindir}/v2rayn << 'EOF'
+install -m0755 /dev/stdin %{buildroot}%{_bindir}/v2rayn << 'EOF'
 #!/usr/bin/bash
 set -euo pipefail
 DIR="/opt/v2rayN"
@@ -503,11 +513,10 @@ 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'
+install -m0644 /dev/stdin %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF'
 [Desktop Entry]
 Type=Application
 Name=v2rayN
@@ -519,10 +528,8 @@ Categories=Network;
 EOF
 
 # Icon
-if [ -f "%{_builddir}/__PKGROOT__/v2rayn.png" ]; then
+install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
-  install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
+install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
-  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

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.19.2</Version>
+        <Version>7.20.2</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -6,23 +6,23 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.4.1" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.12" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.12" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.13" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.12" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.13" />
-    <PackageVersion Include="ReactiveUI.Avalonia" Version="11.3.8" />
+    <PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.12" />
-    <PackageVersion Include="CliWrap" Version="3.10.0" />
+    <PackageVersion Include="CliWrap" Version="3.10.1" />
-    <PackageVersion Include="Downloader" Version="4.1.1" />
+    <PackageVersion Include="Downloader" Version="5.1.0" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
-    <PackageVersion Include="MaterialDesignThemes" Version="5.3.0" />
+    <PackageVersion Include="MaterialDesignThemes" Version="5.3.1" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.3.1.1" />
     <PackageVersion Include="QRCoder" Version="1.7.0" />
-    <PackageVersion Include="ReactiveUI" Version="22.3.1" />
+    <PackageVersion Include="ReactiveUI" Version="23.2.1" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
-    <PackageVersion Include="ReactiveUI.WPF" Version="22.3.1" />
+    <PackageVersion Include="ReactiveUI.WPF" Version="23.2.1" />
     <PackageVersion Include="Semi.Avalonia" Version="11.3.7.3" />
-    <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.1" />
+    <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.2" />
     <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.3" />
-    <PackageVersion Include="NLog" Version="6.1.1" />
+    <PackageVersion Include="NLog" Version="6.1.2" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageVersion Include="TaskScheduler" Version="2.12.2" />
     <PackageVersion Include="WebDav.Client" Version="2.9.0" />

v2rayN/ServiceLib/Common/ProcUtils.cs

@@ -46,7 +46,7 @@ public static class ProcUtils
         return null;
     }
 
-    public static void RebootAsAdmin(bool blAdmin = true)
+    public static bool RebootAsAdmin(bool blAdmin = true)
     {
         try
         {
@@ -58,11 +58,12 @@ public static class ProcUtils
                 FileName = Utils.GetExePath().AppendQuotes(),
                 Verb = blAdmin ? "runas" : null,
             };
-            _ = Process.Start(startInfo);
+            return Process.Start(startInfo) != null;
         }
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
+            return false;
         }
     }
 }

v2rayN/ServiceLib/Enums/EConfigType.cs

@@ -13,6 +13,7 @@ public enum EConfigType
     WireGuard = 9,
     HTTP = 10,
     Anytls = 11,
+    Naive = 12,
     PolicyGroup = 101,
     ProxyChain = 102,
 }

v2rayN/ServiceLib/Global.cs

@@ -95,7 +95,7 @@ public class Global
 
     public const string PolicyGroupDefaultAllFilter = $"^(?!.*(?:{PolicyGroupExcludeKeywords})).*$";
 
-    public static readonly List<string> PolicyGroupDefaultFilterList = 
+    public static readonly List<string> PolicyGroupDefaultFilterList =
     [
         // All nodes (exclude traffic/expiry info)
         PolicyGroupDefaultAllFilter,
@@ -182,17 +182,22 @@ public class Global
         @"https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/main/v2rayN/"
     ];
 
-    public static readonly Dictionary<string, string> UserAgentTexts = new()
+    public static readonly Dictionary<string, string> TcpHttpUserAgentTexts = 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" },
         {"safari","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.1 Safari/605.1.15" },
         {"edge","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36 Edg/91.0.864.70" },
-        {"none",""}
+        {"none",""},
+        {"golang",""}
     };
 
     public const string Hysteria2ProtocolShare = "hy2://";
 
+    public const string NaiveHttpsProtocolShare = "naive+https://";
+
+    public const string NaiveQuicProtocolShare = "naive+quic://";
+
     public static readonly Dictionary<EConfigType, string> ProtocolShares = new()
     {
         { EConfigType.VMess, "vmess://" },
@@ -203,7 +208,8 @@ public class Global
         { EConfigType.Hysteria2, "hysteria2://" },
         { EConfigType.TUIC, "tuic://" },
         { EConfigType.WireGuard, "wireguard://" },
-        { EConfigType.Anytls, "anytls://" }
+        { EConfigType.Anytls, "anytls://" },
+        { EConfigType.Naive, "naive://" }
     };
 
     public static readonly Dictionary<EConfigType, string> ProtocolTypes = new()
@@ -217,7 +223,8 @@ public class Global
         { EConfigType.Hysteria2, "hysteria2" },
         { EConfigType.TUIC, "tuic" },
         { EConfigType.WireGuard, "wireguard" },
-        { EConfigType.Anytls, "anytls" }
+        { EConfigType.Anytls, "anytls" },
+        { EConfigType.Naive, "naive" }
     };
 
     public static readonly List<string> VmessSecurities =
@@ -342,6 +349,7 @@ public class Global
         EConfigType.Hysteria2,
         EConfigType.TUIC,
         EConfigType.Anytls,
+        EConfigType.Naive,
         EConfigType.WireGuard,
         EConfigType.SOCKS,
         EConfigType.HTTP,
@@ -384,9 +392,8 @@ public class Global
     [
         "chrome",
         "firefox",
-        "safari",
         "edge",
-        "none"
+        "golang"
     ];
 
     public static readonly List<string> XhttpMode =
@@ -558,6 +565,14 @@ public class Global
         "bbr"
     ];
 
+    public static readonly List<string> NaiveCongestionControls =
+    [
+        "bbr",
+        "bbr2",
+        "cubic",
+        "reno"
+    ];
+
     public static readonly List<string> allowSelectType =
     [
         "selector",
@@ -660,5 +675,14 @@ public class Global
         ""
     ];
 
+    public static readonly List<string> TunIcmpRoutingPolicies =
+    [
+        "rule",
+        "direct",
+        "unreachable",
+        "drop",
+        "reply",
+    ];
+
     #endregion const
 }

v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs

@@ -1,3 +1,5 @@
+using System.ComponentModel.DataAnnotations;
+
 namespace ServiceLib.Handler.Builder;
 
 public record CoreConfigContextBuilderResult(CoreConfigContext Context, NodeValidatorResult ValidatorResult)
@@ -227,7 +229,7 @@ public class CoreConfigContextBuilder
     {
         var result = NodeValidatorResult.Empty();
 
-        if (node.Subid.IsNullOrEmpty())
+        if (node.Subid.IsNullOrEmpty() || node.ConfigType == EConfigType.Custom)
         {
             return (null, result);
         }
@@ -268,7 +270,8 @@ public class CoreConfigContextBuilder
         {
             IndexId = $"inner-{Utils.GetGuid(false)}",
             ConfigType = EConfigType.ProxyChain,
-            CoreType = node.CoreType ?? ECoreType.Xray,
+            CoreType = AppManager.Instance.GetCoreType(node, node.ConfigType),
+            Remarks = node.Remarks,
         };
         List<string?> childItems = [prevNode?.IndexId, node.IndexId, nextNode?.IndexId];
         var chainExtraItem = chainNode.GetProtocolExtra() with
@@ -308,6 +311,11 @@ public class CoreConfigContextBuilder
         }
 
         var nodeValidatorResult = NodeValidator.Validate(node, context.RunCoreType);
+        var msgs = new List<string>([.. nodeValidatorResult.Errors, .. nodeValidatorResult.Warnings]);
+        if (msgs.Count > 0)
+        {
+            Logging.SaveLog($"{node.Remarks}: {string.Join("; ", msgs)}");
+        }
         if (!nodeValidatorResult.Success)
         {
             return nodeValidatorResult;
@@ -321,6 +329,7 @@ public class CoreConfigContextBuilder
             context.ProtectDomainList.Add(address);
         }
 
+        // ech query server name protect
         if (!node.EchConfigList.IsNullOrEmpty())
         {
             var echQuerySni = node.Sni;
@@ -337,6 +346,20 @@ public class CoreConfigContextBuilder
             }
         }
 
+        // xhttp downloadSettings address protect
+        if (!string.IsNullOrEmpty(node.Extra)
+            && JsonUtils.ParseJson(node.Extra) is JsonObject extra
+            && extra.TryGetPropertyValue("downloadSettings", out var dsNode)
+            && dsNode is JsonObject downloadSettings
+            && downloadSettings.TryGetPropertyValue("address", out var dAddrNode)
+            && dAddrNode is JsonValue dAddrValue
+            && dAddrValue.TryGetValue(out string? dAddr)
+            && !string.IsNullOrEmpty(dAddr)
+            && Utils.IsDomain(dAddr))
+        {
+            context.ProtectDomainList.Add(dAddr);
+        }
+
         return nodeValidatorResult;
     }
 

v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs

@@ -81,7 +81,9 @@ public class NodeValidator
         {
             var transportError = ValidateSingboxTransport(item.ConfigType, net);
             if (transportError != null)
+            {
                 v.Error(transportError);
+            }
 
             if (!Global.SingboxSupportConfigType.Contains(item.ConfigType))
             {
@@ -141,11 +143,19 @@ public class NodeValidator
 
         if (item.Network == nameof(ETransport.xhttp) && !item.Extra.IsNullOrEmpty())
         {
-            if (JsonUtils.ParseJson(item.Extra) is null)
+            if (JsonUtils.ParseJson(item.Extra) is not JsonObject)
             {
                 v.Error(string.Format(ResUI.MsgInvalidProperty, "XHTTP Extra"));
             }
         }
+
+        if (!item.Finalmask.IsNullOrEmpty())
+        {
+            if (JsonUtils.ParseJson(item.Finalmask) is not JsonObject)
+            {
+                v.Error(string.Format(ResUI.MsgInvalidProperty, "Finalmask"));
+            }
+        }
     }
 
     private static string? ValidateSingboxTransport(EConfigType configType, string net)

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -91,14 +91,13 @@ public static class ConfigHandler
         {
             EnableTun = false,
             Mtu = 9000,
+            IcmpRouting = Global.TunIcmpRoutingPolicies.First(),
+            EnableLegacyProtect = false,
         };
         config.GuiItem ??= new();
         config.MsgUIItem ??= new();
 
-        config.UiItem ??= new UIItem()
+        config.UiItem ??= new();
-        {
-            EnableUpdateSubOnlyRemarksExist = true
-        };
         config.UiItem.MainColumnItem ??= new();
         config.UiItem.WindowSizeItem ??= new();
 
@@ -154,6 +153,7 @@ public static class ConfigHandler
             DownMbps = 100
         };
         config.ClashUIItem ??= new();
+        config.ClashUIItem.ConnectionsColumnItem ??= new();
         config.SystemProxyItem ??= new();
         config.WebDavItem ??= new();
         config.CheckUpdateItem ??= new();
@@ -271,6 +271,7 @@ public static class ConfigHandler
             EConfigType.TUIC => await AddTuicServer(config, item),
             EConfigType.WireGuard => await AddWireguardServer(config, item),
             EConfigType.Anytls => await AddAnytlsServer(config, item),
+            EConfigType.Naive => await AddNaiveServer(config, item),
             _ => -1,
         };
         return ret;
@@ -722,8 +723,6 @@ public static class ConfigHandler
         profileItem.SetProtocolExtra(profileItem.GetProtocolExtra() with
         {
             SalamanderPass = profileItem.GetProtocolExtra().SalamanderPass?.TrimEx(),
-            UpMbps = profileItem.GetProtocolExtra().UpMbps is null or < 0 ? config.HysteriaItem.UpMbps : profileItem.GetProtocolExtra().UpMbps,
-            DownMbps = profileItem.GetProtocolExtra().DownMbps is null or < 0 ? config.HysteriaItem.DownMbps : profileItem.GetProtocolExtra().DownMbps,
             HopInterval = profileItem.GetProtocolExtra().HopInterval?.TrimEx(),
         });
 
@@ -808,7 +807,7 @@ public static class ConfigHandler
     }
 
     /// <summary>
-    /// Add or edit a Anytls server
+    /// Add or edit an Anytls server
     /// Validates and processes Anytls-specific settings
     /// </summary>
     /// <param name="config">Current configuration</param>
@@ -835,6 +834,36 @@ public static class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Add or edit a Naive server
+    /// Validates and processes Naive-specific settings
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">Naive profile to add</param>
+    /// <param name="toFile">Whether to save to file</param>
+    /// <returns>0 if successful, -1 if failed</returns>
+    public static async Task<int> AddNaiveServer(Config config, ProfileItem profileItem, bool toFile = true)
+    {
+        profileItem.ConfigType = EConfigType.Naive;
+        profileItem.CoreType = ECoreType.sing_box;
+
+        profileItem.Address = profileItem.Address.TrimEx();
+        profileItem.Username = profileItem.Username.TrimEx();
+        profileItem.Password = profileItem.Password.TrimEx();
+        profileItem.Alpn = string.Empty;
+        profileItem.Network = string.Empty;
+        if (profileItem.StreamSecurity.IsNullOrEmpty())
+        {
+            profileItem.StreamSecurity = Global.StreamSecurity;
+        }
+        if (profileItem.Password.IsNullOrEmpty())
+        {
+            return -1;
+        }
+        await AddServerCommon(config, profileItem, toFile);
+        return 0;
+    }
+
     /// <summary>
     /// Sort the server list by the specified column
     /// Updates the sort order in the profile extension data
@@ -1041,8 +1070,8 @@ public static class ConfigHandler
 
         if (profileItem.StreamSecurity.IsNotEmpty())
         {
-            if (profileItem.StreamSecurity != Global.StreamSecurity
+            if (profileItem.StreamSecurity is not Global.StreamSecurity
-                 && profileItem.StreamSecurity != Global.StreamSecurityReality)
+                 and not Global.StreamSecurityReality)
             {
                 profileItem.StreamSecurity = string.Empty;
             }
@@ -1081,7 +1110,8 @@ public static class ConfigHandler
 
         if (toFile)
         {
-            profileItem.SetProtocolExtra();
+            //profileItem.SetProtocolExtra();
+            profileItem.SetProtocolExtra(profileItem.GetProtocolExtra());
             await SQLiteHelper.Instance.ReplaceAsync(profileItem);
         }
         return 0;
@@ -1109,6 +1139,7 @@ public static class ConfigHandler
                && AreEqual(o.Address, n.Address)
                && o.Port == n.Port
                && AreEqual(o.Password, n.Password)
+               && AreEqual(o.Username, n.Username)
                && AreEqual(oProtocolExtra.VlessEncryption, nProtocolExtra.VlessEncryption)
                && AreEqual(oProtocolExtra.SsMethod, nProtocolExtra.SsMethod)
                && AreEqual(oProtocolExtra.VmessSecurity, nProtocolExtra.VmessSecurity)
@@ -1133,6 +1164,84 @@ public static class ConfigHandler
         }
     }
 
+    /// <summary>
+    /// Searches the specified collection for a profile item that matches the target profile item based on a series of
+    /// criteria.
+    /// </summary>
+    /// <remarks>The method attempts to find a match by comparing the target's remarks, address, port, and
+    /// password in various combinations. The search is performed in order of specificity, starting with the most
+    /// detailed comparison. If no match is found at any stage, the method returns null.</remarks>
+    /// <param name="source">An enumerable collection of profile items to search. This parameter can be null.</param>
+    /// <param name="target">The profile item to match against items in the source collection. This parameter can be null.</param>
+    /// <returns>A profile item from the source collection that matches the target item according to defined criteria; otherwise,
+    /// null if no match is found or if either parameter is null.</returns>
+    private static ProfileItem? FindMatchedProfileItem(IEnumerable<ProfileItem>? source, ProfileItem? target)
+    {
+        if (source == null || target == null)
+        {
+            return null;
+        }
+
+        var matchedItem = source.FirstOrDefault(t => CompareProfileItem(t, target, true));
+        if (matchedItem != null)
+        {
+            return matchedItem;
+        }
+
+        if (target.Remarks.IsNotEmpty())
+        {
+            matchedItem = source.FirstOrDefault(t => t.Remarks == target.Remarks);
+            if (matchedItem != null)
+            {
+                return matchedItem;
+            }
+        }
+
+        if (target.Address.IsNotEmpty() && target.Port > 0 && target.Password.IsNotEmpty())
+        {
+            matchedItem = source.FirstOrDefault(t =>
+                IsSameText(t.Address, target.Address) &&
+                t.Port == target.Port &&
+                IsSameText(t.Password, target.Password));
+            if (matchedItem != null)
+            {
+                return matchedItem;
+            }
+        }
+
+        if (target.Address.IsNotEmpty() && target.Port > 0)
+        {
+            matchedItem = source.FirstOrDefault(t =>
+                IsSameText(t.Address, target.Address) &&
+                t.Port == target.Port);
+            if (matchedItem != null)
+            {
+                return matchedItem;
+            }
+        }
+
+        if (target.Address.IsNotEmpty())
+        {
+            matchedItem = source.FirstOrDefault(t => IsSameText(t.Address, target.Address));
+            if (matchedItem != null)
+            {
+                return matchedItem;
+            }
+        }
+
+        return null;
+
+        static bool IsSameText(string? left, string? right)
+        {
+            if (left.IsNullOrEmpty() || right.IsNullOrEmpty())
+            {
+                return false;
+            }
+
+            return string.Equals(left.TrimEx(), right.TrimEx(), StringComparison.OrdinalIgnoreCase);
+        }
+    }
+
     /// <summary>
     /// Remove a single server profile by its index ID
     /// Deletes the configuration file if it's a custom config
@@ -1306,19 +1415,32 @@ public static class ConfigHandler
     /// <returns>A SOCKS profile item or null if not needed</returns>
     public static ProfileItem? GetPreSocksItem(Config config, ProfileItem node, ECoreType coreType)
     {
-        if (node.ConfigType != EConfigType.Custom || !(node.PreSocksPort > 0))
-        {
-            return null;
-        }
         ProfileItem? itemSocks = null;
-        var preCoreType = AppManager.Instance.RunningCoreType = config.TunModeItem.EnableTun ? ECoreType.sing_box : ECoreType.Xray;
+        if (node.ConfigType != EConfigType.Custom
-        itemSocks = new ProfileItem()
+            && coreType != ECoreType.sing_box
+            && config.TunModeItem.EnableTun
+            && config.TunModeItem.EnableLegacyProtect)
         {
-            CoreType = preCoreType,
+            itemSocks = new ProfileItem()
-            ConfigType = EConfigType.SOCKS,
+            {
-            Address = Global.Loopback,
+                CoreType = ECoreType.sing_box,
-            Port = node.PreSocksPort.Value,
+                ConfigType = EConfigType.SOCKS,
-        };
+                Address = Global.Loopback,
+                Port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks)
+            };
+        }
+        else if (node.ConfigType == EConfigType.Custom
+            && node.PreSocksPort is > 0 and <= 65535)
+        {
+            var preCoreType = config.TunModeItem.EnableTun ? ECoreType.sing_box : ECoreType.Xray;
+            itemSocks = new ProfileItem()
+            {
+                CoreType = preCoreType,
+                ConfigType = EConfigType.SOCKS,
+                Address = Global.Loopback,
+                Port = node.PreSocksPort.Value,
+            };
+        }
         return itemSocks;
     }
 
@@ -1422,6 +1544,7 @@ public static class ConfigHandler
                 EConfigType.TUIC => await AddTuicServer(config, profileItem, false),
                 EConfigType.WireGuard => await AddWireguardServer(config, profileItem, false),
                 EConfigType.Anytls => await AddAnytlsServer(config, profileItem, false),
+                EConfigType.Naive => await AddNaiveServer(config, profileItem, false),
                 _ => -1,
             };
 
@@ -1637,7 +1760,7 @@ public static class ConfigHandler
         if (activeProfile != null)
         {
             var lstSub = await AppManager.Instance.ProfileItems(subid);
-            var existItem = lstSub?.FirstOrDefault(t => config.UiItem.EnableUpdateSubOnlyRemarksExist ? t.Remarks == activeProfile.Remarks : CompareProfileItem(t, activeProfile, true));
+            var existItem = FindMatchedProfileItem(lstSub, activeProfile);
             if (existItem != null)
             {
                 await ConfigHandler.SetDefaultServerIndex(config, existItem.IndexId);
@@ -1650,7 +1773,7 @@ public static class ConfigHandler
             var lstSub = await AppManager.Instance.ProfileItems(subid);
             foreach (var item in lstSub)
             {
-                var existItem = lstOriSub?.FirstOrDefault(t => config.UiItem.EnableUpdateSubOnlyRemarksExist ? t.Remarks == item.Remarks : CompareProfileItem(t, item, true));
+                var existItem = FindMatchedProfileItem(lstOriSub, item);
                 if (existItem != null)
                 {
                     await StatisticsManager.Instance.CloneServerStatItem(existItem.IndexId, item.IndexId);

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -21,7 +21,7 @@ public static class CoreConfigHandler
                 _ => await GenerateClientCustomConfig(node, fileName)
             };
         }
-        else if (AppManager.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
+        else if (context.RunCoreType == ECoreType.sing_box)
         {
             result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
         }
@@ -128,12 +128,11 @@ public static class CoreConfigHandler
     public static async Task<RetResult> GenerateClientSpeedtestConfig(Config config, CoreConfigContext context, ServerTestItem testItem, string fileName)
     {
         var result = new RetResult();
-        var node = context.Node;
         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)
+        if (context.RunCoreType == ECoreType.sing_box)
         {
             result = new CoreConfigSingboxService(context).GenerateClientSpeedtestConfig(port);
         }

v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs

@@ -19,6 +19,7 @@ public class FmtHandler
                 EConfigType.TUIC => TuicFmt.ToUri(item),
                 EConfigType.WireGuard => WireguardFmt.ToUri(item),
                 EConfigType.Anytls => AnytlsFmt.ToUri(item),
+                EConfigType.Naive => NaiveFmt.ToUri(item),
                 _ => null,
             };
 
@@ -80,6 +81,12 @@ public class FmtHandler
             {
                 return AnytlsFmt.Resolve(str, out msg);
             }
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.Naive])
+                     || str.StartsWith(Global.NaiveHttpsProtocolShare)
+                     || str.StartsWith(Global.NaiveQuicProtocolShare))
+            {
+                return NaiveFmt.Resolve(str, out msg);
+            }
             else
             {
                 msg = ResUI.NonvmessOrssProtocol;

v2rayN/ServiceLib/Handler/Fmt/NaiveFmt.cs

@@ -0,0 +1,91 @@
+namespace ServiceLib.Handler.Fmt;
+
+public class NaiveFmt : BaseFmt
+{
+    public static ProfileItem? Resolve(string str, out string msg)
+    {
+        msg = ResUI.ConfigurationFormatIncorrect;
+
+        var parsedUrl = Utils.TryUri(str);
+        if (parsedUrl == null)
+        {
+            return null;
+        }
+
+        ProfileItem item = new()
+        {
+            ConfigType = EConfigType.Naive,
+            Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+            Address = parsedUrl.IdnHost,
+            Port = parsedUrl.Port,
+        };
+        var protocolExtra = item.GetProtocolExtra();
+        if (parsedUrl.Scheme.Contains("quic"))
+        {
+            protocolExtra = protocolExtra with
+            {
+                NaiveQuic = true,
+            };
+        }
+        var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
+        if (rawUserInfo.Contains(':'))
+        {
+            var split = rawUserInfo.Split(':', 2);
+            item.Username = split[0];
+            item.Password = split[1];
+        }
+        else
+        {
+            item.Password = rawUserInfo;
+        }
+
+        var query = Utils.ParseQueryString(parsedUrl.Query);
+        ResolveUriQuery(query, ref item);
+        var insecureConcurrency = int.TryParse(GetQueryValue(query, "insecure-concurrency"), out var ic) ? ic : 0;
+        if (insecureConcurrency > 0)
+        {
+            protocolExtra = protocolExtra with
+            {
+                InsecureConcurrency = insecureConcurrency,
+            };
+        }
+
+        item.SetProtocolExtra(protocolExtra);
+        return item;
+    }
+
+    public static string? ToUri(ProfileItem? item)
+    {
+        if (item == null)
+        {
+            return null;
+        }
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
+        {
+            remark = "#" + Utils.UrlEncode(item.Remarks);
+        }
+        var userInfo = item.Username.IsNotEmpty() ? $"{Utils.UrlEncode(item.Username)}:{Utils.UrlEncode(item.Password)}" : Utils.UrlEncode(item.Password);
+        var dicQuery = new Dictionary<string, string>();
+        ToUriQuery(item, Global.None, ref dicQuery);
+        var protocolExtra = item.GetProtocolExtra();
+        if (protocolExtra.InsecureConcurrency > 0)
+        {
+            dicQuery.Add("insecure-concurrency", protocolExtra?.InsecureConcurrency.ToString());
+        }
+
+        var query = dicQuery.Count > 0
+            ? ("?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray()))
+            : string.Empty;
+        var url = $"{userInfo}@{GetIpv6(item.Address)}:{item.Port}";
+
+        if (protocolExtra.NaiveQuic == true)
+        {
+            return $"{Global.NaiveQuicProtocolShare}{url}{query}{remark}";
+        }
+        else
+        {
+            return $"{Global.NaiveHttpsProtocolShare}{url}{query}{remark}";
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/TuicFmt.cs

@@ -30,7 +30,10 @@ public class TuicFmt : BaseFmt
 
         var query = Utils.ParseQueryString(url.Query);
         ResolveUriQuery(query, ref item);
-        item.HeaderType = GetQueryValue(query, "congestion_control");
+        item.SetProtocolExtra(item.GetProtocolExtra() with
+        {
+            CongestionControl = GetQueryValue(query, "congestion_control")
+        });
 
         return item;
     }
@@ -51,7 +54,10 @@ public class TuicFmt : BaseFmt
         var dicQuery = new Dictionary<string, string>();
         ToUriQueryLite(item, ref dicQuery);
 
-        dicQuery.Add("congestion_control", item.HeaderType);
+        if (!item.GetProtocolExtra().CongestionControl.IsNullOrEmpty())
+        {
+            dicQuery.Add("congestion_control", item.GetProtocolExtra().CongestionControl);
+        }
 
         return ToUri(EConfigType.TUIC, item.Address, item.Port, $"{item.Username ?? ""}:{item.Password}", dicQuery, remark);
     }

v2rayN/ServiceLib/Manager/AppManager.cs

@@ -305,12 +305,11 @@ public sealed class AppManager
         return await SQLiteHelper.Instance.TableAsync<FullConfigTemplateItem>().FirstOrDefaultAsync(it => it.CoreType == eCoreType);
     }
 
+#pragma warning disable CS0618
     public async Task MigrateProfileExtra()
     {
         await MigrateProfileExtraGroup();
 
-#pragma warning disable CS0618
-
         const int pageSize = 100;
         var offset = 0;
 
@@ -334,7 +333,6 @@ public sealed class AppManager
         }
 
         //await ProfileGroupItemManager.Instance.ClearAll();
-#pragma warning restore CS0618
     }
 
     private async Task<int> MigrateProfileExtraSub(List<ProfileItem> batch)
@@ -380,6 +378,7 @@ public sealed class AppManager
                         break;
 
                     case EConfigType.TUIC:
+                        extra = extra with { CongestionControl = item.HeaderType.NullIfEmpty(), };
                         item.Username = item.Id;
                         item.Id = item.Security;
                         item.Password = item.Security;
@@ -436,7 +435,6 @@ public sealed class AppManager
 
     private async Task<bool> MigrateProfileExtraGroup()
     {
-#pragma warning disable CS0618
         var list = await SQLiteHelper.Instance.TableAsync<ProfileGroupItem>().ToListAsync();
         var groupItems = new ConcurrentDictionary<string, ProfileGroupItem>(list.Where(t => !string.IsNullOrEmpty(t.IndexId)).ToDictionary(t => t.IndexId!));
 
@@ -501,8 +499,8 @@ public sealed class AppManager
         return true;
 
         //await ProfileGroupItemManager.Instance.ClearAll();
-#pragma warning restore CS0618
     }
+#pragma warning restore CS0618
 
     #endregion SqliteHelper
 

v2rayN/ServiceLib/Manager/CoreManager.cs

@@ -90,6 +90,9 @@ public class CoreManager
 
         await CoreStart(mainContext);
         await CoreStartPreService(preContext);
+
+        AppManager.Instance.RunningCoreType = preContext?.RunCoreType ?? mainContext.RunCoreType;
+
         if (_processService != null)
         {
             await UpdateFunc(true, $"{node.GetSummary()}");
@@ -132,7 +135,7 @@ public class CoreManager
             return null;
         }
 
-        var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
+        var coreType = context.RunCoreType;
         var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
         return await RunProcess(coreInfo, fileName, true, false);
     }
@@ -172,7 +175,7 @@ public class CoreManager
     private async Task CoreStart(CoreConfigContext context)
     {
         var node = context.Node;
-        var coreType = AppManager.Instance.RunningCoreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
+        var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
         var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
 
         var displayLog = node.ConfigType != EConfigType.Custom || node.DisplayLog;

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -87,7 +87,6 @@ public class MsgUIItem
 public class UIItem
 {
     public bool EnableAutoAdjustMainLvColWidth { get; set; }
-    public bool EnableUpdateSubOnlyRemarksExist { get; set; }
     public int MainGirdHeight1 { get; set; }
     public int MainGirdHeight2 { get; set; }
     public EGirdOrientation MainGirdOrientation { get; set; } = EGirdOrientation.Vertical;
@@ -145,6 +144,8 @@ public class TunModeItem
     public string Stack { get; set; }
     public int Mtu { get; set; }
     public bool EnableIPv6Address { get; set; }
+    public string IcmpRouting { get; set; }
+    public bool EnableLegacyProtect { get; set; }
 }
 
 [Serializable]
@@ -208,6 +209,7 @@ public class ClashUIItem
     public int ProxiesAutoDelayTestInterval { get; set; } = 10;
     public bool ConnectionsAutoRefresh { get; set; }
     public int ConnectionsRefreshInterval { get; set; } = 2;
+    public List<ColumnItem> ConnectionsColumnItem { get; set; }
 }
 
 [Serializable]

v2rayN/ServiceLib/Models/ProtocolExtraItem.cs

@@ -2,6 +2,9 @@ namespace ServiceLib.Models;
 
 public record ProtocolExtraItem
 {
+    public bool? Uot { get; init; }
+    public string? CongestionControl { get; init; }
+
     // vmess
     public string? AlterId { get; init; }
     public string? VmessSecurity { get; init; }
@@ -29,6 +32,10 @@ public record ProtocolExtraItem
     public string? Ports { get; init; }
     public string? HopInterval { get; init; }
 
+    // naiveproxy
+    public int? InsecureConcurrency { get; init; }
+    public bool? NaiveQuic { get; init; }
+
     // group profile
     public string? GroupType { get; init; }
     public string? ChildItems { get; init; }

v2rayN/ServiceLib/Models/ServerTestItem.cs

@@ -9,6 +9,6 @@ public class ServerTestItem
     public EConfigType ConfigType { get; set; }
     public bool AllowTest { get; set; }
     public int QueueNum { get; set; }
-    public required ProfileItem Profile { get; set; }
+    public ProfileItem Profile { get; set; }
     public ECoreType CoreType { get; set; }
 }

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -134,10 +134,14 @@ public class Outbound4Sbox : BaseServer4Sbox
     public int? recv_window_conn { get; set; }
     public int? recv_window { get; set; }
     public bool? disable_mtu_discovery { get; set; }
+    public int? insecure_concurrency { get; set; }
+    public bool? udp_over_tcp { get; set; }
     public string? method { get; set; }
     public string? username { get; set; }
     public string? password { get; set; }
     public string? congestion_control { get; set; }
+    public bool? quic { get; set; }
+    public string? quic_congestion_control { get; set; }
     public string? version { get; set; }
     public string? network { get; set; }
     public string? packet_encoding { get; set; }

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -179,6 +179,8 @@ public class ServersItem4Ray
 
     public string flow { get; set; }
 
+    public bool? uot { get; set; }
+
     public List<SocksUsersItem4Ray> users { get; set; }
 }
 
@@ -335,7 +337,7 @@ public class StreamSettings4Ray
 
     public HysteriaSettings4Ray? hysteriaSettings { get; set; }
 
-    public Finalmask4Ray? finalmask { get; set; }
+    public object? finalmask { get; set; }
 
     public Sockopt4Ray? sockopt { get; set; }
 }
@@ -360,6 +362,7 @@ public class TlsSettings4Ray
     public bool? disableSystemRoot { get; set; }
     public string? echConfigList { get; set; }
     public string? echForceQuery { get; set; }
+    public Sockopt4Ray? echSockopt { get; set; }
 }
 
 public class CertificateSettings4Ray
@@ -418,6 +421,8 @@ public class HttpupgradeSettings4Ray
     public string? path { get; set; }
 
     public string? host { get; set; }
+
+    public Headers4Ray headers { get; set; }
 }
 
 public class XhttpSettings4Ray
@@ -453,33 +458,31 @@ public class GrpcSettings4Ray
     public int? health_check_timeout { get; set; }
     public bool? permit_without_stream { get; set; }
     public int? initial_windows_size { get; set; }
+    public string? user_agent { get; set; }
 }
 
 public class HysteriaSettings4Ray
 {
     public int version { get; set; }
     public string? auth { get; set; }
-    public string? up { get; set; }
-    public string? down { get; set; }
-    public HysteriaUdpHop4Ray? udphop { get; set; }
 }
 
-public class HysteriaUdpHop4Ray
+public class UdpHop4Ray
 {
-    public string? port { get; set; }
+    public string? ports { get; set; }
     public string? interval { get; set; }
 }
 
 public class Finalmask4Ray
 {
-    public List<Mask4Ray>? tcp { get; set; }
     public List<Mask4Ray>? udp { get; set; }
+    public QuicParams4Ray? quicParams { get; set; }
 }
 
 public class Mask4Ray
 {
     public string type { get; set; }
-    public object? settings { get; set; }
+    public MaskSettings4Ray? settings { get; set; }
 }
 
 public class MaskSettings4Ray
@@ -488,6 +491,14 @@ public class MaskSettings4Ray
     public string? domain { get; set; }
 }
 
+public class QuicParams4Ray
+{
+    public string? congestion { get; set; }
+    public string? brutalUp { get; set; }
+    public string? brutalDown { get; set; }
+    public UdpHop4Ray? udpHop { get; set; }
+}
+
 public class AccountsItem4Ray
 {
     public string user { get; set; }

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -691,7 +691,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add Child  的本地化字符串。
+        ///   查找类似 Add Child 的本地化字符串。
         /// </summary>
         public static string menuAddChildServer {
             get {
@@ -718,7 +718,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [Hysteria2]  的本地化字符串。
+        ///   查找类似 Add [Hysteria2] 的本地化字符串。
         /// </summary>
         public static string menuAddHysteria2Server {
             get {
@@ -727,7 +727,16 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add Policy Group  的本地化字符串。
+        ///   查找类似 Add [NaïveProxy] 的本地化字符串。
+        /// </summary>
+        public static string menuAddNaiveServer {
+            get {
+                return ResourceManager.GetString("menuAddNaiveServer", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add Policy Group 的本地化字符串。
         /// </summary>
         public static string menuAddPolicyGroupServer {
             get {
@@ -772,7 +781,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [Shadowsocks]  的本地化字符串。
+        ///   查找类似 Add [Shadowsocks] 的本地化字符串。
         /// </summary>
         public static string menuAddShadowsocksServer {
             get {
@@ -781,7 +790,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [SOCKS]  的本地化字符串。
+        ///   查找类似 Add [SOCKS] 的本地化字符串。
         /// </summary>
         public static string menuAddSocksServer {
             get {
@@ -790,7 +799,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [Trojan]  的本地化字符串。
+        ///   查找类似 Add [Trojan] 的本地化字符串。
         /// </summary>
         public static string menuAddTrojanServer {
             get {
@@ -799,7 +808,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [TUIC]  的本地化字符串。
+        ///   查找类似 Add [TUIC] 的本地化字符串。
         /// </summary>
         public static string menuAddTuicServer {
             get {
@@ -808,7 +817,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [VLESS]  的本地化字符串。
+        ///   查找类似 Add [VLESS] 的本地化字符串。
         /// </summary>
         public static string menuAddVlessServer {
             get {
@@ -817,7 +826,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [VMess]  的本地化字符串。
+        ///   查找类似 Add [VMess] 的本地化字符串。
         /// </summary>
         public static string menuAddVmessServer {
             get {
@@ -826,7 +835,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [WireGuard]  的本地化字符串。
+        ///   查找类似 Add [WireGuard] 的本地化字符串。
         /// </summary>
         public static string menuAddWireguardServer {
             get {
@@ -924,6 +933,42 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Copy 的本地化字符串。
+        /// </summary>
+        public static string menuEditCopy {
+            get {
+                return ResourceManager.GetString("menuEditCopy", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Format 的本地化字符串。
+        /// </summary>
+        public static string menuEditFormat {
+            get {
+                return ResourceManager.GetString("menuEditFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Paste 的本地化字符串。
+        /// </summary>
+        public static string menuEditPaste {
+            get {
+                return ResourceManager.GetString("menuEditPaste", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Select all 的本地化字符串。
+        /// </summary>
+        public static string menuEditSelectAll {
+            get {
+                return ResourceManager.GetString("menuEditSelectAll", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Edit  的本地化字符串。
         /// </summary>
@@ -3033,6 +3078,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 ICMP routing policy 的本地化字符串。
+        /// </summary>
+        public static string TbIcmpRoutingPolicy {
+            get {
+                return ResourceManager.GetString("TbIcmpRoutingPolicy", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 UUID(id) 的本地化字符串。
         /// </summary>
@@ -3069,6 +3123,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Insecure Concurrency 的本地化字符串。
+        /// </summary>
+        public static string TbInsecureConcurrency {
+            get {
+                return ResourceManager.GetString("TbInsecureConcurrency", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Most Stable 的本地化字符串。
         /// </summary>
@@ -3087,6 +3150,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Legacy TUN Protect 的本地化字符串。
+        /// </summary>
+        public static string TbLegacyProtect {
+            get {
+                return ResourceManager.GetString("TbLegacyProtect", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Address (IPv4, IPv6) 的本地化字符串。
         /// </summary>
@@ -3376,7 +3448,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Process (Tun mode) 的本地化字符串。
+        ///   查找类似 Process (Linux/Windows) 的本地化字符串。
         /// </summary>
         public static string TbRoutingRuleProcess {
             get {
@@ -3816,15 +3888,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Updating subscription, only determining if remarks exist 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsEnableUpdateSubOnlyRemarksExist {
-            get {
-                return ResourceManager.GetString("TbSettingsEnableUpdateSubOnlyRemarksExist", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Exception 的本地化字符串。
         /// </summary>
@@ -4464,6 +4527,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 UDP over TCP 的本地化字符串。
+        /// </summary>
+        public static string TbUot {
+            get {
+                return ResourceManager.GetString("TbUot", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Username 的本地化字符串。
+        /// </summary>
+        public static string TbUsername {
+            get {
+                return ResourceManager.GetString("TbUsername", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Validate Regional Domain IPs 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -1027,7 +1027,7 @@
     <value>پروتکل sing-box Mux</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process (Tun mode)</value>
+    <value>Process (Linux/Windows)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP or IP CIDR</value>
@@ -1098,9 +1098,6 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>آدرس اینترنتی تست پینگ سرعت</value>
   </data>
-  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>اشتراک در حال به‌روزرسانی، فقط مشخص کنید که ملاحظاتی آیا وجود دارد!</value>
-  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>پایان تست...</value>
   </data>
@@ -1671,4 +1668,34 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuGenRegionGroup" xml:space="preserve">
     <value>Group by Region</value>
   </data>
+  <data name="menuEditCopy" xml:space="preserve">
+    <value>کپی</value>
+  </data>
+  <data name="menuEditSelectAll" xml:space="preserve">
+    <value>انتخاب همه</value>
+  </data>
+  <data name="menuEditPaste" xml:space="preserve">
+    <value>Paste</value>
+  </data>
+  <data name="menuEditFormat" xml:space="preserve">
+    <value>Format</value>
+  </data>
+  <data name="TbUot" xml:space="preserve">
+    <value>UDP over TCP</value>
+  </data>
+  <data name="menuAddNaiveServer" xml:space="preserve">
+    <value>Add NaïveProxy</value>
+  </data>
+  <data name="TbInsecureConcurrency" xml:space="preserve">
+    <value>Insecure Concurrency</value>
+  </data>
+  <data name="TbUsername" xml:space="preserve">
+    <value>Username</value>
+  </data>
+  <data name="TbIcmpRoutingPolicy" xml:space="preserve">
+    <value>ICMP routing policy</value>
+  </data>
+  <data name="TbLegacyProtect" xml:space="preserve">
+    <value>Legacy TUN Protect</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.fr.resx

@@ -1024,7 +1024,7 @@
     <value>Protocole de multiplexage Mux (sing-box)</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process (Tun mode)</value>
+    <value>Process (Linux/Windows)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP ou IP CIDR</value>
@@ -1095,9 +1095,6 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>Adresse de test de connexion réelle</value>
   </data>
-  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>Ne vérifier l’existence de l’alias qu’à la maj. des abonnements</value>
-  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>Arrêt du test en cours...</value>
   </data>
@@ -1668,4 +1665,34 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuGenRegionGroup" xml:space="preserve">
     <value>Group by Region</value>
   </data>
-</root>
+  <data name="menuEditCopy" xml:space="preserve">
+    <value>Copier</value>
+  </data>
+  <data name="menuEditSelectAll" xml:space="preserve">
+    <value>Tout sélect</value>
+  </data>
+  <data name="menuEditPaste" xml:space="preserve">
+    <value>Paste</value>
+  </data>
+  <data name="menuEditFormat" xml:space="preserve">
+    <value>Format</value>
+  </data>
+  <data name="TbUot" xml:space="preserve">
+    <value>UDP over TCP</value>
+  </data>
+  <data name="menuAddNaiveServer" xml:space="preserve">
+    <value>Ajouter [NaïveProxy]</value>
+  </data>
+  <data name="TbInsecureConcurrency" xml:space="preserve">
+    <value>Insecure Concurrency</value>
+  </data>
+  <data name="TbUsername" xml:space="preserve">
+    <value>Username</value>
+  </data>
+  <data name="TbIcmpRoutingPolicy" xml:space="preserve">
+    <value>ICMP routing policy</value>
+  </data>
+  <data name="TbLegacyProtect" xml:space="preserve">
+    <value>Legacy TUN Protect</value>
+  </data>
+</root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1027,7 +1027,7 @@
     <value>sing-box Mux protokoll</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process (Tun mode)</value>
+    <value>Process (Linux/Windows)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP vagy IP CIDR</value>
@@ -1098,9 +1098,6 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>Sebesség Ping Teszt URL</value>
   </data>
-  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>Előfizetés frissítése, csak a megjegyzések létezésének ellenőrzése</value>
-  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>Teszt megszakítása...</value>
   </data>
@@ -1671,4 +1668,34 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuGenRegionGroup" xml:space="preserve">
     <value>Group by Region</value>
   </data>
+  <data name="menuEditCopy" xml:space="preserve">
+    <value>Másolás</value>
+  </data>
+  <data name="menuEditSelectAll" xml:space="preserve">
+    <value>Összes kijelölése</value>
+  </data>
+  <data name="menuEditPaste" xml:space="preserve">
+    <value>Paste</value>
+  </data>
+  <data name="menuEditFormat" xml:space="preserve">
+    <value>Format</value>
+  </data>
+  <data name="TbUot" xml:space="preserve">
+    <value>UDP over TCP</value>
+  </data>
+  <data name="menuAddNaiveServer" xml:space="preserve">
+    <value>[NaïveProxy] konfiguráció hozzáadása</value>
+  </data>
+  <data name="TbInsecureConcurrency" xml:space="preserve">
+    <value>Insecure Concurrency</value>
+  </data>
+  <data name="TbUsername" xml:space="preserve">
+    <value>Username</value>
+  </data>
+  <data name="TbIcmpRoutingPolicy" xml:space="preserve">
+    <value>ICMP routing policy</value>
+  </data>
+  <data name="TbLegacyProtect" xml:space="preserve">
+    <value>Legacy TUN Protect</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -514,19 +514,19 @@
     <value>Add a custom configuration</value>
   </data>
   <data name="menuAddShadowsocksServer" xml:space="preserve">
-    <value>Add [Shadowsocks] </value>
+    <value>Add [Shadowsocks]</value>
   </data>
   <data name="menuAddSocksServer" xml:space="preserve">
-    <value>Add [SOCKS] </value>
+    <value>Add [SOCKS]</value>
   </data>
   <data name="menuAddTrojanServer" xml:space="preserve">
-    <value>Add [Trojan] </value>
+    <value>Add [Trojan]</value>
   </data>
   <data name="menuAddVlessServer" xml:space="preserve">
-    <value>Add [VLESS] </value>
+    <value>Add [VLESS]</value>
   </data>
   <data name="menuAddVmessServer" xml:space="preserve">
-    <value>Add [VMess] </value>
+    <value>Add [VMess]</value>
   </data>
   <data name="menuSelectAll" xml:space="preserve">
     <value>Select all</value>
@@ -1027,7 +1027,7 @@
     <value>sing-box Mux Protocol</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process (Tun mode)</value>
+    <value>Process (Linux/Windows)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP or IP CIDR</value>
@@ -1036,7 +1036,7 @@
     <value>Domain</value>
   </data>
   <data name="menuAddHysteria2Server" xml:space="preserve">
-    <value>Add [Hysteria2] </value>
+    <value>Add [Hysteria2]</value>
   </data>
   <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
     <value>Hysteria Max bandwidth (Up/Down)</value>
@@ -1045,7 +1045,7 @@
     <value>Use System Hosts</value>
   </data>
   <data name="menuAddTuicServer" xml:space="preserve">
-    <value>Add [TUIC] </value>
+    <value>Add [TUIC]</value>
   </data>
   <data name="TbHeaderType8" xml:space="preserve">
     <value>Congestion control</value>
@@ -1075,7 +1075,7 @@
     <value>Enable IPv6 Address</value>
   </data>
   <data name="menuAddWireguardServer" xml:space="preserve">
-    <value>Add [WireGuard] </value>
+    <value>Add [WireGuard]</value>
   </data>
   <data name="TbPrivateKey" xml:space="preserve">
     <value>Private Key</value>
@@ -1098,9 +1098,6 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>Speed Ping Test URL</value>
   </data>
-  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>Updating subscription, only determining if remarks exist</value>
-  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>Test terminating...</value>
   </data>
@@ -1498,13 +1495,13 @@
     <value>Policy Group Type</value>
   </data>
   <data name="menuAddPolicyGroupServer" xml:space="preserve">
-    <value>Add Policy Group </value>
+    <value>Add Policy Group</value>
   </data>
   <data name="menuAddProxyChainServer" xml:space="preserve">
     <value>Add Proxy Chain</value>
   </data>
   <data name="menuAddChildServer" xml:space="preserve">
-    <value>Add Child </value>
+    <value>Add Child</value>
   </data>
   <data name="menuRemoveChildServer" xml:space="preserve">
     <value>Remove Child </value>
@@ -1671,4 +1668,34 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuGenRegionGroup" xml:space="preserve">
     <value>Group by Region</value>
   </data>
+  <data name="menuEditCopy" xml:space="preserve">
+    <value>Copy</value>
+  </data>
+  <data name="menuEditSelectAll" xml:space="preserve">
+    <value>Select all</value>
+  </data>
+  <data name="menuEditPaste" xml:space="preserve">
+    <value>Paste</value>
+  </data>
+  <data name="menuEditFormat" xml:space="preserve">
+    <value>Format</value>
+  </data>
+  <data name="TbUot" xml:space="preserve">
+    <value>UDP over TCP</value>
+  </data>
+  <data name="menuAddNaiveServer" xml:space="preserve">
+    <value>Add [NaïveProxy]</value>
+  </data>
+  <data name="TbInsecureConcurrency" xml:space="preserve">
+    <value>Insecure Concurrency</value>
+  </data>
+  <data name="TbUsername" xml:space="preserve">
+    <value>Username</value>
+  </data>
+  <data name="TbIcmpRoutingPolicy" xml:space="preserve">
+    <value>ICMP routing policy</value>
+  </data>
+  <data name="TbLegacyProtect" xml:space="preserve">
+    <value>Legacy TUN Protect</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -517,16 +517,16 @@
     <value>添加 [Shadowsocks]</value>
   </data>
   <data name="menuAddSocksServer" xml:space="preserve">
-    <value>添加 [SOCKS] </value>
+    <value>添加 [SOCKS]</value>
   </data>
   <data name="menuAddTrojanServer" xml:space="preserve">
-    <value>添加 [Trojan] </value>
+    <value>添加 [Trojan]</value>
   </data>
   <data name="menuAddVlessServer" xml:space="preserve">
-    <value>添加 [VLESS] </value>
+    <value>添加 [VLESS]</value>
   </data>
   <data name="menuAddVmessServer" xml:space="preserve">
-    <value>添加 [VMess] </value>
+    <value>添加 [VMess]</value>
   </data>
   <data name="menuSelectAll" xml:space="preserve">
     <value>全选</value>
@@ -1024,7 +1024,7 @@
     <value>sing-box Mux 多路复用协议</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>进程 (Tun 模式)</value>
+    <value>进程 (Linux/Windows)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP 或 IP CIDR</value>
@@ -1033,7 +1033,7 @@
     <value>Domain</value>
   </data>
   <data name="menuAddHysteria2Server" xml:space="preserve">
-    <value>添加 [Hysteria2] </value>
+    <value>添加 [Hysteria2]</value>
   </data>
   <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
     <value>Hysteria 最大带宽 (Up/Dw)</value>
@@ -1042,7 +1042,7 @@
     <value>使用系统 hosts</value>
   </data>
   <data name="menuAddTuicServer" xml:space="preserve">
-    <value>添加 [TUIC] </value>
+    <value>添加 [TUIC]</value>
   </data>
   <data name="TbHeaderType8" xml:space="preserve">
     <value>拥塞控制算法</value>
@@ -1072,7 +1072,7 @@
     <value>启用 IPv6</value>
   </data>
   <data name="menuAddWireguardServer" xml:space="preserve">
-    <value>添加 [WireGuard] </value>
+    <value>添加 [WireGuard]</value>
   </data>
   <data name="TbPrivateKey" xml:space="preserve">
     <value>PrivateKey</value>
@@ -1095,9 +1095,6 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>真连接测试地址</value>
   </data>
-  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>更新订阅时只判断别名已存在否</value>
-  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>测试终止中...</value>
   </data>
@@ -1105,7 +1102,7 @@
     <value>*grpc Authority</value>
   </data>
   <data name="menuAddHttpServer" xml:space="preserve">
-    <value>添加 [HTTP] </value>
+    <value>添加 [HTTP]</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>启用分片 (Fragment)</value>
@@ -1384,7 +1381,7 @@
     <value>Mldsa65Verify</value>
   </data>
   <data name="menuAddAnytlsServer" xml:space="preserve">
-    <value>添加 [Anytls] </value>
+    <value>添加 [Anytls]</value>
   </data>
   <data name="TbRemoteDNS" xml:space="preserve">
     <value>远程 DNS</value>
@@ -1668,4 +1665,34 @@
   <data name="menuGenRegionGroup" xml:space="preserve">
     <value>按地区分组</value>
   </data>
+  <data name="menuEditCopy" xml:space="preserve">
+    <value>复制</value>
+  </data>
+  <data name="menuEditSelectAll" xml:space="preserve">
+    <value>全选</value>
+  </data>
+  <data name="menuEditPaste" xml:space="preserve">
+    <value>粘贴</value>
+  </data>
+  <data name="menuEditFormat" xml:space="preserve">
+    <value>格式化</value>
+  </data>
+  <data name="TbUot" xml:space="preserve">
+    <value>UDP over TCP</value>
+  </data>
+  <data name="menuAddNaiveServer" xml:space="preserve">
+    <value>添加 [NaïveProxy]</value>
+  </data>
+  <data name="TbInsecureConcurrency" xml:space="preserve">
+    <value>不安全并发</value>
+  </data>
+  <data name="TbUsername" xml:space="preserve">
+    <value>用户名</value>
+  </data>
+  <data name="TbIcmpRoutingPolicy" xml:space="preserve">
+    <value>ICMP 路由策略</value>
+  </data>
+  <data name="TbLegacyProtect" xml:space="preserve">
+    <value>旧版 TUN 保护</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -1024,7 +1024,7 @@
     <value>sing-box Mux 多路復用協定</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>行程 (Tun 模式)</value>
+    <value>行程 (Linux/Windows)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP 或 IP CIDR</value>
@@ -1095,9 +1095,6 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>真連線測試位址</value>
   </data>
-  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>更新訂閱時只判斷別名是否存在</value>
-  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>測試終止中...</value>
   </data>
@@ -1668,4 +1665,34 @@
   <data name="menuGenRegionGroup" xml:space="preserve">
     <value>按區域分組</value>
   </data>
+  <data name="menuEditCopy" xml:space="preserve">
+    <value>複製</value>
+  </data>
+  <data name="menuEditSelectAll" xml:space="preserve">
+    <value>全選</value>
+  </data>
+  <data name="menuEditPaste" xml:space="preserve">
+    <value>貼上</value>
+  </data>
+  <data name="menuEditFormat" xml:space="preserve">
+    <value>格式化</value>
+  </data>
+  <data name="TbUot" xml:space="preserve">
+    <value>UDP over TCP</value>
+  </data>
+  <data name="menuAddNaiveServer" xml:space="preserve">
+    <value>新增 [NaïveProxy] 節點</value>
+  </data>
+  <data name="TbInsecureConcurrency" xml:space="preserve">
+    <value>不安全的並行處理</value>
+  </data>
+  <data name="TbUsername" xml:space="preserve">
+    <value>使用者名稱</value>
+  </data>
+  <data name="TbIcmpRoutingPolicy" xml:space="preserve">
+    <value>ICMP 路由策略</value>
+  </data>
+  <data name="TbLegacyProtect" xml:space="preserve">
+    <value>Legacy TUN Protect</value>
+  </data>
 </root>

v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs

@@ -61,7 +61,8 @@ public partial class CoreConfigSingboxService(CoreConfigContext context)
             ret.Success = true;
 
             ret.Data = ApplyFullConfigTemplate();
-            if (context.TunProtectSsPort is > 0 and <= 65535)
+            if (!context.AppConfig.TunModeItem.EnableLegacyProtect
+                && context.TunProtectSsPort is > 0 and <= 65535)
             {
                 var ssInbound = new
                 {

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs

@@ -243,7 +243,6 @@ public partial class CoreConfigSingboxService
                 if (Utils.IsIpv6(predefined))
                 {
                     rule.answer = new List<string> { $"*. IN AAAA {predefined}" };
-
                 }
                 else
                 {

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs

@@ -22,7 +22,7 @@ public partial class CoreConfigSingboxService
         }
         if (withSelector)
         {
-            var proxyTags = proxyOutboundList.Where(n => n.tag.StartsWith(Global.ProxyTag)).Select(n => n.tag).ToList();
+            var proxyTags = proxyOutboundList.Where(n => n.tag.StartsWith(baseTagName)).Select(n => n.tag).ToList();
             if (proxyTags.Count > 1)
             {
                 proxyOutboundList.InsertRange(0, BuildSelectorOutbounds(proxyTags, baseTagName));
@@ -112,6 +112,7 @@ public partial class CoreConfigSingboxService
                         outbound.method = AppManager.Instance.GetShadowsocksSecurities(_node).Contains(protocolExtra.SsMethod)
                             ? protocolExtra.SsMethod : Global.None;
                         outbound.password = _node.Password;
+                        outbound.udp_over_tcp = protocolExtra.Uot == true ? true : null;
 
                         if (_node.Network == nameof(ETransport.tcp) && _node.HeaderType == Global.TcpHeaderHttp)
                         {
@@ -223,13 +224,14 @@ public partial class CoreConfigSingboxService
                                 password = protocolExtra.SalamanderPass.TrimEx(),
                             };
                         }
-
+                        int? upMbps = protocolExtra?.UpMbps is { } su and >= 0
-                        outbound.up_mbps = protocolExtra?.UpMbps is { } su and >= 0
                             ? su
                             : _config.HysteriaItem.UpMbps;
-                        outbound.down_mbps = protocolExtra?.DownMbps is { } sd and >= 0
+                        int? downMbps = protocolExtra?.DownMbps is { } sd and >= 0
                             ? sd
-                            : _config.HysteriaItem.DownMbps;
+                            : _config.HysteriaItem.UpMbps;
+                        outbound.up_mbps = upMbps > 0 ? upMbps : null;
+                        outbound.down_mbps = downMbps > 0 ? downMbps : null;
                         var ports = protocolExtra?.Ports?.IsNullOrEmpty() == false ? protocolExtra.Ports : null;
                         if ((!ports.IsNullOrEmpty()) && (ports.Contains(':') || ports.Contains('-') || ports.Contains(',')))
                         {
@@ -269,7 +271,7 @@ public partial class CoreConfigSingboxService
                     {
                         outbound.uuid = _node.Username;
                         outbound.password = _node.Password;
-                        outbound.congestion_control = _node.HeaderType;
+                        outbound.congestion_control = protocolExtra.CongestionControl;
                         break;
                     }
                 case EConfigType.Anytls:
@@ -277,6 +279,22 @@ public partial class CoreConfigSingboxService
                         outbound.password = _node.Password;
                         break;
                     }
+                case EConfigType.Naive:
+                    {
+                        outbound.username = _node.Username;
+                        outbound.password = _node.Password;
+                        if (protocolExtra.NaiveQuic == true)
+                        {
+                            outbound.quic = true;
+                            outbound.quic_congestion_control = protocolExtra.CongestionControl.NullIfEmpty();
+                        }
+                        if (protocolExtra.InsecureConcurrency > 0)
+                        {
+                            outbound.insecure_concurrency = protocolExtra.InsecureConcurrency;
+                        }
+                        outbound.udp_over_tcp = protocolExtra.Uot == true ? true : null;
+                        break;
+                    }
             }
 
             FillOutboundTls(outbound);
@@ -327,6 +345,14 @@ public partial class CoreConfigSingboxService
     {
         try
         {
+            // The synthetic TUN relay outbound talks to the local Xray shadowsocks relay.
+            // Xray cannot terminate sing-box h2mux, so muxing here turns local relay traffic
+            // into sp.mux.sing-box.arpa pseudo-destinations and breaks DNS over TUN.
+            if (IsTunRelayProxyOutbound())
+            {
+                return;
+            }
+
             var muxEnabled = _node.MuxEnabled ?? _config.CoreBasicItem.MuxEnabled;
             if (muxEnabled && _config.Mux4SboxItem.Protocol.IsNotEmpty())
             {
@@ -346,6 +372,21 @@ public partial class CoreConfigSingboxService
         }
     }
 
+    private bool IsTunRelayProxyOutbound()
+    {
+        if (!context.IsTunEnabled
+            || _node.ConfigType != EConfigType.Shadowsocks
+            || _node.Address != Global.Loopback
+            || _node.Port != context.ProxyRelaySsPort
+            || _node.Password != Global.None)
+        {
+            return false;
+        }
+
+        var protocolExtra = _node.GetProtocolExtra();
+        return protocolExtra.SsMethod == Global.None;
+    }
+
     private void FillOutboundTls(Outbound4Sbox outbound)
     {
         try
@@ -554,7 +595,12 @@ public partial class CoreConfigSingboxService
         for (var i = 0; i < nodes.Count; i++)
         {
             var node = nodes[i];
-            var currentTag = $"{baseTagName}-{i + 1}";
+            var currentTag = $"{baseTagName}-{i + 1}-{node.Remarks}";
+
+            if (nodes.Count == 1)
+            {
+                currentTag = baseTagName;
+            }
 
             if (node.ConfigType.IsGroupType())
             {
@@ -585,8 +631,8 @@ public partial class CoreConfigSingboxService
         for (var i = 0; i < nodesReverse.Count; i++)
         {
             var node = nodesReverse[i];
-            var currentTag = i == 0 ? baseTagName : $"chain-{baseTagName}-{i}";
+            var currentTag = i == 0 ? baseTagName : $"chain-{baseTagName}-{i}-{node.Remarks}";
-            var dialerProxyTag = i != nodesReverse.Count - 1 ? $"chain-{baseTagName}-{i + 1}" : null;
+            var dialerProxyTag = i != nodesReverse.Count - 1 ? $"chain-{baseTagName}-{i + 1}-{nodesReverse[i + 1].Remarks}" : null;
             if (node.ConfigType.IsGroupType())
             {
                 var childProfiles = new CoreConfigSingboxService(context with { Node = node, }).BuildGroupProxyOutbounds(currentTag);
@@ -727,13 +773,12 @@ public partial class CoreConfigSingboxService
             }, null);
         }
         var idx = echConfig.IndexOf('+');
-        // NOTE: query_server_name, since sing-box 1.13.0
+        var queryServerName = idx > 0 ? echConfig[..idx] : null;
-        //var queryServerName = idx > 0 ? echConfig[..idx] : null;
         var echDnsServer = idx > 0 ? echConfig[(idx + 1)..] : echConfig;
         return (new Ech4Sbox()
         {
             enabled = true,
-            query_server_name = null,
+            query_server_name = queryServerName,
         }, ParseDnsAddress(echDnsServer));
     }
 }

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs

@@ -47,6 +47,36 @@ public partial class CoreConfigSingboxService
                     outbound = Global.DirectTag,
                     process_name = lstDirectExe
                 });
+
+                // ICMP Routing
+                var icmpRouting = _config.TunModeItem.IcmpRouting ?? "";
+                if (!Global.TunIcmpRoutingPolicies.Contains(icmpRouting))
+                {
+                    icmpRouting = Global.TunIcmpRoutingPolicies.First();
+                }
+                if (icmpRouting == "direct")
+                {
+                    _coreConfig.route.rules.Add(new()
+                    {
+                        network = ["icmp"],
+                        outbound = Global.DirectTag,
+                    });
+                }
+                else if (icmpRouting != "rule")
+                {
+                    var rejectMethod = icmpRouting switch
+                    {
+                        "unreachable" => "default",
+                        "drop" => "drop",
+                        _ => "reply",
+                    };
+                    _coreConfig.route.rules.Add(new()
+                    {
+                        network = ["icmp"],
+                        action = "reject",
+                        method = rejectMethod,
+                    });
+                }
             }
 
             if (_config.Inbound.First().SniffingEnabled)
@@ -464,7 +494,7 @@ public partial class CoreConfigSingboxService
             return Global.ProxyTag;
         }
 
-        var tag = $"{node.IndexId}-{Global.ProxyTag}";
+        var tag = $"{node.IndexId}-{Global.ProxyTag}-{node.Remarks}";
         if (_coreConfig.outbounds.Any(o => o.tag.StartsWith(tag))
             || (_coreConfig.endpoints != null && _coreConfig.endpoints.Any(e => e.tag.StartsWith(tag))))
         {

v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs

@@ -15,7 +15,10 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
         var ret = new RetResult();
         try
         {
-            if (context.IsTunEnabled && context.TunProtectSsPort > 0 && context.ProxyRelaySsPort > 0)
+            if (!context.AppConfig.TunModeItem.EnableLegacyProtect
+                && context.IsTunEnabled
+                && context.TunProtectSsPort is > 0 and <= 65535
+                && context.ProxyRelaySsPort is > 0 and <= 65535)
             {
                 return GenerateClientProxyRelayConfig();
             }
@@ -316,16 +319,50 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
                 SsMethod = Global.None,
             });
 
-            foreach (var outbound in _coreConfig.outbounds.Where(outbound => outbound.streamSettings?.sockopt?.dialerProxy?.IsNullOrEmpty() ?? true))
+            const string protectTag = "tun-protect-ss";
+            foreach (var outbound in _coreConfig.outbounds
+                .Where(o => o.streamSettings?.sockopt?.dialerProxy?.IsNullOrEmpty() ?? true))
             {
-                outbound.streamSettings ??= new StreamSettings4Ray();
+                outbound.streamSettings ??= new();
-                outbound.streamSettings.sockopt ??= new Sockopt4Ray();
+                outbound.streamSettings.sockopt ??= new();
-                outbound.streamSettings.sockopt.dialerProxy = "tun-project-ss";
+                outbound.streamSettings.sockopt.dialerProxy = protectTag;
+            }
+            // ech protected
+            foreach (var outbound in _coreConfig.outbounds
+                .Where(outbound => outbound.streamSettings?.tlsSettings?.echConfigList?.IsNullOrEmpty() == false))
+            {
+                outbound.streamSettings!.tlsSettings!.echSockopt ??= new();
+                outbound.streamSettings.tlsSettings.echSockopt.dialerProxy = protectTag;
+            }
+            // xhttp download protected
+            foreach (var outbound in _coreConfig.outbounds
+                .Where(o => o.streamSettings?.xhttpSettings?.extra is not null))
+            {
+                var xhttpExtra = JsonUtils.ParseJson(JsonUtils.Serialize(outbound.streamSettings.xhttpSettings!.extra));
+                if (xhttpExtra is not JsonObject xhttpExtraObject
+                    || xhttpExtraObject["downloadSettings"] is not JsonObject downloadSettings)
+                {
+                    continue;
+                }
+                // dialerProxy
+                var sockopt = downloadSettings["sockopt"] as JsonObject ?? new JsonObject();
+                sockopt["dialerProxy"] = protectTag;
+                downloadSettings["sockopt"] = sockopt;
+                // ech protected
+                if (downloadSettings["tlsSettings"] is JsonObject tlsSettings
+                    && tlsSettings["echConfigList"] is not null)
+                {
+                    tlsSettings["echSockopt"] = new JsonObject
+                    {
+                        ["dialerProxy"] = protectTag
+                    };
+                }
+                outbound.streamSettings.xhttpSettings.extra = xhttpExtraObject;
             }
             _coreConfig.outbounds.Add(new CoreConfigV2rayService(context with
             {
                 Node = protectNode,
-            }).BuildProxyOutbound("tun-project-ss"));
+            }).BuildProxyOutbound(protectTag));
 
             _coreConfig.routing.rules ??= [];
             var hasBalancer = _coreConfig.routing.balancers is { Count: > 0 };

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayConfigTemplateService.cs

@@ -109,9 +109,7 @@ public partial class CoreConfigV2rayService
                     ?? string.Empty;
                 if (!Utils.IsPrivateNetwork(outboundAddress))
                 {
-                    outbound.streamSettings ??= new StreamSettings4Ray();
+                    FillDialerProxy(outbound, fullConfigTemplate.ProxyDetour);
-                    outbound.streamSettings.sockopt ??= new Sockopt4Ray();
-                    outbound.streamSettings.sockopt.dialerProxy = fullConfigTemplate.ProxyDetour;
                 }
             }
             customOutboundsNode.Add(JsonUtils.DeepCopy(outbound));

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs

@@ -51,10 +51,7 @@ public partial class CoreConfigV2rayService
             }
             foreach (var outbound in actOutboundWithTlsList)
             {
-                outbound.streamSettings.sockopt = new()
+                FillDialerProxy(outbound, fragmentOutbound.tag);
-                {
-                    dialerProxy = fragmentOutbound.tag
-                };
             }
         }
         return proxyOutboundList;
@@ -153,6 +150,7 @@ public partial class CoreConfigV2rayService
                         serversItem.password = _node.Password;
                         serversItem.method = AppManager.Instance.GetShadowsocksSecurities(_node).Contains(protocolExtra.SsMethod)
                             ? protocolExtra.SsMethod : "none";
+                        serversItem.uot = protocolExtra.Uot == true ? true : null;
 
                         serversItem.ota = false;
                         serversItem.level = 1;
@@ -353,11 +351,7 @@ public partial class CoreConfigV2rayService
             var host = _node.RequestHost.TrimEx();
             var path = _node.Path.TrimEx();
             var sni = _node.Sni.TrimEx();
-            var useragent = "";
+            var useragent = _config.CoreBasicItem.DefUserAgent ?? string.Empty;
-            if (!_config.CoreBasicItem.DefUserAgent.IsNullOrEmpty())
-            {
-                useragent = Global.UserAgentTexts.GetValueOrDefault(_config.CoreBasicItem.DefUserAgent, _config.CoreBasicItem.DefUserAgent);
-            }
 
             //if tls
             if (_node.StreamSecurity == Global.StreamSecurity)
@@ -440,10 +434,10 @@ public partial class CoreConfigV2rayService
                     kcpSettings.congestion = _config.KcpItem.Congestion;
                     kcpSettings.readBufferSize = _config.KcpItem.ReadBufferSize;
                     kcpSettings.writeBufferSize = _config.KcpItem.WriteBufferSize;
-                    streamSettings.finalmask ??= new();
+                    var kcpFinalmask = new Finalmask4Ray();
                     if (Global.KcpHeaderMaskMap.TryGetValue(_node.HeaderType, out var header))
                     {
-                        streamSettings.finalmask.udp =
+                        kcpFinalmask.udp =
                         [
                             new Mask4Ray
                             {
@@ -452,23 +446,24 @@ public partial class CoreConfigV2rayService
                             }
                         ];
                     }
-                    streamSettings.finalmask.udp ??= [];
+                    kcpFinalmask.udp ??= [];
                     if (path.IsNullOrEmpty())
                     {
-                        streamSettings.finalmask.udp.Add(new Mask4Ray
+                        kcpFinalmask.udp.Add(new Mask4Ray
                         {
                             type = "mkcp-original"
                         });
                     }
                     else
                     {
-                        streamSettings.finalmask.udp.Add(new Mask4Ray
+                        kcpFinalmask.udp.Add(new Mask4Ray
                         {
                             type = "mkcp-aes128gcm",
                             settings = new MaskSettings4Ray { password = path }
                         });
                     }
                     streamSettings.kcpSettings = kcpSettings;
+                    streamSettings.finalmask = kcpFinalmask;
                     break;
                 //ws
                 case nameof(ETransport.ws):
@@ -494,13 +489,17 @@ public partial class CoreConfigV2rayService
                 case nameof(ETransport.httpupgrade):
                     HttpupgradeSettings4Ray httpupgradeSettings = new();
 
+                    if (host.IsNotEmpty())
+                    {
+                        httpupgradeSettings.host = host;
+                    }
                     if (path.IsNotEmpty())
                     {
                         httpupgradeSettings.path = path;
                     }
-                    if (host.IsNotEmpty())
+                    if (useragent.IsNotEmpty())
                     {
-                        httpupgradeSettings.host = host;
+                        httpupgradeSettings.headers.UserAgent = useragent;
                     }
                     streamSettings.httpupgradeSettings = httpupgradeSettings;
 
@@ -579,6 +578,7 @@ public partial class CoreConfigV2rayService
                         health_check_timeout = _config.GrpcItem.HealthCheckTimeout,
                         permit_without_stream = _config.GrpcItem.PermitWithoutStream,
                         initial_windows_size = _config.GrpcItem.InitialWindowsSize,
+                        user_agent = useragent.NullIfEmpty(),
                     };
                     streamSettings.grpcSettings = grpcSettings;
                     break;
@@ -597,36 +597,46 @@ public partial class CoreConfigV2rayService
                         : (_config.HysteriaItem.HopInterval >= 5
                             ? _config.HysteriaItem.HopInterval
                             : Global.Hysteria2DefaultHopInt).ToString();
-                    HysteriaUdpHop4Ray? udpHop = null;
+                    var hy2Finalmask = new Finalmask4Ray();
+                    var quicParams = new QuicParams4Ray();
                     if (!ports.IsNullOrEmpty() &&
                         (ports.Contains(':') || ports.Contains('-') || ports.Contains(',')))
                     {
-                        udpHop = new HysteriaUdpHop4Ray
+                        var udpHop = new UdpHop4Ray
                         {
-                            port = ports.Replace(':', '-'),
+                            ports = ports.Replace(':', '-'),
                             interval = hopInterval,
                         };
+                        quicParams.udpHop = udpHop;
+                    }
+                    if (upMbps > 0 || downMbps > 0)
+                    {
+                        quicParams.congestion = "brutal";
+                        quicParams.brutalUp = upMbps > 0 ? $"{upMbps}mbps" : null;
+                        quicParams.brutalDown = downMbps > 0 ? $"{downMbps}mbps" : null;
+                    }
+                    else
+                    {
+                        quicParams.congestion = "bbr";
+                    }
+                    hy2Finalmask.quicParams = quicParams;
+                    if (!protocolExtra.SalamanderPass.IsNullOrEmpty())
+                    {
+                        hy2Finalmask.udp =
+                            [
+                                new Mask4Ray
+                                {
+                                    type = "salamander",
+                                    settings = new MaskSettings4Ray { password = protocolExtra.SalamanderPass.TrimEx(), }
+                                }
+                            ];
                     }
                     streamSettings.hysteriaSettings = new()
                     {
                         version = 2,
                         auth = _node.Password,
-                        up = upMbps > 0 ? $"{upMbps}mbps" : null,
-                        down = downMbps > 0 ? $"{downMbps}mbps" : null,
-                        udphop = udpHop,
                     };
-                    if (!protocolExtra.SalamanderPass.IsNullOrEmpty())
+                    streamSettings.finalmask = hy2Finalmask;
-                    {
-                        streamSettings.finalmask ??= new();
-                        streamSettings.finalmask.udp =
-                        [
-                            new Mask4Ray
-                            {
-                                type = "salamander",
-                                settings = new MaskSettings4Ray { password = protocolExtra.SalamanderPass.TrimEx(), }
-                            }
-                        ];
-                    }
                     break;
 
                 default:
@@ -643,10 +653,11 @@ public partial class CoreConfigV2rayService
 
                         //request Host
                         var request = EmbedUtils.GetEmbedText(Global.V2raySampleHttpRequestFileName);
+                        var useragentValue = Global.TcpHttpUserAgentTexts.GetValueOrDefault(useragent, useragent);
                         var arrHost = host.Split(',');
                         var host2 = string.Join(",".AppendQuotes(), arrHost);
                         request = request.Replace("$requestHost$", $"{host2.AppendQuotes()}");
-                        request = request.Replace("$requestUserAgent$", $"{useragent.AppendQuotes()}");
+                        request = request.Replace("$requestUserAgent$", $"{useragentValue.AppendQuotes()}");
                         //Path
                         var pathHttp = @"/";
                         if (path.IsNotEmpty())
@@ -664,7 +675,7 @@ public partial class CoreConfigV2rayService
 
             if (!_node.Finalmask.IsNullOrEmpty())
             {
-                streamSettings.finalmask = JsonUtils.Deserialize<Finalmask4Ray>(_node.Finalmask);
+                streamSettings.finalmask = JsonUtils.ParseJson(_node.Finalmask);
             }
         }
         catch (Exception ex)
@@ -687,7 +698,12 @@ public partial class CoreConfigV2rayService
         for (var i = 0; i < nodes.Count; i++)
         {
             var node = nodes[i];
-            var currentTag = $"{baseTagName}-{i + 1}";
+            var currentTag = $"{baseTagName}-{i + 1}-{node.Remarks}";
+
+            if (nodes.Count == 1)
+            {
+                currentTag = baseTagName;
+            }
 
             if (node.ConfigType.IsGroupType())
             {
@@ -718,8 +734,8 @@ public partial class CoreConfigV2rayService
         for (var i = 0; i < nodesReverse.Count; i++)
         {
             var node = nodesReverse[i];
-            var currentTag = i == 0 ? baseTagName : $"chain-{baseTagName}-{i}";
+            var currentTag = i == 0 ? baseTagName : $"chain-{baseTagName}-{i}-{node.Remarks}";
-            var dialerProxyTag = i != nodesReverse.Count - 1 ? $"chain-{baseTagName}-{i + 1}" : null;
+            var dialerProxyTag = i != nodesReverse.Count - 1 ? $"chain-{baseTagName}-{i + 1}-{nodesReverse[i + 1].Remarks}" : null;
             if (node.ConfigType.IsGroupType())
             {
                 var childProfiles = new CoreConfigV2rayService(context with { Node = node, }).BuildGroupProxyOutbounds(currentTag);
@@ -729,10 +745,7 @@ public partial class CoreConfigV2rayService
                         childProfiles.Where(n => n?.streamSettings?.sockopt?.dialerProxy?.IsNullOrEmpty() ?? true);
                     foreach (var chainEndNode in chainEndNodes)
                     {
-                        chainEndNode.streamSettings.sockopt = new()
+                        FillDialerProxy(chainEndNode, dialerProxyTag);
-                        {
-                            dialerProxy = dialerProxyTag
-                        };
                     }
                 }
                 if (i != 0)
@@ -740,12 +753,10 @@ public partial class CoreConfigV2rayService
                     var chainStartNodes = childProfiles.Where(n => n.tag.StartsWith(currentTag)).ToList();
                     if (chainStartNodes.Count == 1)
                     {
+                        var firstChainTag = chainStartNodes.First().tag;
                         foreach (var existedChainEndNode in resultOutbounds.Where(n => n.streamSettings?.sockopt?.dialerProxy == currentTag))
                         {
-                            existedChainEndNode.streamSettings.sockopt = new()
+                            FillDialerProxy(existedChainEndNode, firstChainTag);
-                            {
-                                dialerProxy = chainStartNodes.First().tag
-                            };
                         }
                     }
                     else if (chainStartNodes.Count > 1)
@@ -768,12 +779,8 @@ public partial class CoreConfigV2rayService
                                 var nextTag = k + 1 < existedChainNodesClone.Count
                                     ? existedChainNodesClone[k + 1].tag
                                     : chainStartNode.tag;
-                                existedChainNode.streamSettings.sockopt = new()
+                                FillDialerProxy(existedChainNode,
-                                {
+                                    previousDialerProxyTag == currentTag ? chainStartNode.tag : nextTag);
-                                    dialerProxy = (previousDialerProxyTag == currentTag)
-                                        ? chainStartNode.tag
-                                        : nextTag
-                                };
                                 resultOutbounds.Add(existedChainNode);
                             }
                             j++;
@@ -789,14 +796,32 @@ public partial class CoreConfigV2rayService
 
             if (!dialerProxyTag.IsNullOrEmpty())
             {
-                outbound.streamSettings.sockopt = new()
+                FillDialerProxy(outbound, dialerProxyTag);
-                {
-                    dialerProxy = dialerProxyTag
-                };
             }
 
             resultOutbounds.Add(outbound);
         }
         return resultOutbounds;
     }
+
+    private static void FillDialerProxy(Outbounds4Ray outbound, string dialerProxyTag)
+    {
+        outbound.streamSettings ??= new();
+        outbound.streamSettings.sockopt ??= new();
+        outbound.streamSettings.sockopt.dialerProxy = dialerProxyTag;
+
+        // xhttp download dialer proxy
+        if (outbound?.streamSettings?.xhttpSettings?.extra is not null)
+        {
+            var xhttpExtra = JsonUtils.ParseJson(JsonUtils.Serialize(outbound.streamSettings.xhttpSettings!.extra));
+            if (xhttpExtra is JsonObject xhttpExtraObject
+                && xhttpExtraObject["downloadSettings"] is JsonObject downloadSettings)
+            {
+                var sockopt = downloadSettings["sockopt"] as JsonObject ?? new JsonObject();
+                sockopt["dialerProxy"] = dialerProxyTag;
+                downloadSettings["sockopt"] = sockopt;
+                outbound.streamSettings.xhttpSettings.extra = xhttpExtraObject;
+            }
+        }
+    }
 }

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs

@@ -164,7 +164,7 @@ public partial class CoreConfigV2rayService
             return Global.ProxyTag;
         }
 
-        var tag = $"{node.IndexId}-{Global.ProxyTag}";
+        var tag = $"{node.IndexId}-{Global.ProxyTag}-{node.Remarks}";
         if (_coreConfig.outbounds.Any(p => p.tag.StartsWith(tag)))
         {
             return tag;

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -363,44 +363,36 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         var geoipFiles = new List<string>();
         var geoSiteFiles = new List<string>();
 
-        //Collect used files list
+        // Collect from routing rules
         var routingItems = await AppManager.Instance.RoutingItems();
         foreach (var routing in routingItems)
         {
             var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet);
             foreach (var item in rules ?? [])
             {
-                foreach (var ip in item.Ip ?? [])
+                AddPrefixedItems(item.Ip, "geoip:", geoipFiles);
-                {
+                AddPrefixedItems(item.Domain, "geosite:", geoSiteFiles);
-                    var prefix = "geoip:";
-                    if (ip.StartsWith(prefix))
-                    {
-                        geoipFiles.Add(ip.Substring(prefix.Length));
-                    }
-                }
-
-                foreach (var domain in item.Domain ?? [])
-                {
-                    var prefix = "geosite:";
-                    if (domain.StartsWith(prefix))
-                    {
-                        geoSiteFiles.Add(domain.Substring(prefix.Length));
-                    }
-                }
             }
         }
 
-        //append dns items TODO
+        // Collect from DNS configuration
-        geoSiteFiles.Add("google");
+        var dnsItem = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
-        geoSiteFiles.Add("cn");
+        if (dnsItem != null)
-        geoSiteFiles.Add("geolocation-cn");
+        {
-        geoSiteFiles.Add("category-ads-all");
+            ExtractDnsRuleSets(dnsItem.NormalDNS, geoipFiles, geoSiteFiles);
+            ExtractDnsRuleSets(dnsItem.TunDNS, geoipFiles, geoSiteFiles);
+        }
 
+        // Append default items
+        geoSiteFiles.AddRange(["google", "cn", "geolocation-cn", "category-ads-all"]);
+
+        // Download files
         var path = Utils.GetBinPath("srss");
         if (!Directory.Exists(path))
         {
             Directory.CreateDirectory(path);
         }
+
         foreach (var item in geoipFiles.Distinct())
         {
             await UpdateSrsFile("geoip", item);
@@ -412,6 +404,63 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         }
     }
 
+    private void AddPrefixedItems(List<string>? items, string prefix, List<string> output)
+    {
+        if (items == null)
+        {
+            return;
+        }
+
+        foreach (var item in items)
+        {
+            if (item.StartsWith(prefix))
+            {
+                output.Add(item.Substring(prefix.Length));
+            }
+        }
+    }
+
+    private void ExtractDnsRuleSets(string? dnsJson, List<string> geoipFiles, List<string> geoSiteFiles)
+    {
+        if (string.IsNullOrEmpty(dnsJson))
+        {
+            return;
+        }
+
+        try
+        {
+            var dns = JsonUtils.Deserialize<Dns4Sbox>(dnsJson);
+            if (dns?.rules != null)
+            {
+                foreach (var rule in dns.rules)
+                {
+                    ExtractSrsRuleSets(rule, geoipFiles, geoSiteFiles);
+                }
+            }
+        }
+        catch { }
+    }
+
+    private void ExtractSrsRuleSets(Rule4Sbox? rule, List<string> geoipFiles, List<string> geoSiteFiles)
+    {
+        if (rule == null)
+        {
+            return;
+        }
+
+        AddPrefixedItems(rule.rule_set, "geosite-", geoSiteFiles);
+        AddPrefixedItems(rule.rule_set, "geoip-", geoipFiles);
+
+        // Handle nested rules recursively
+        if (rule.rules != null)
+        {
+            foreach (var nestedRule in rule.rules)
+            {
+                ExtractSrsRuleSets(nestedRule, geoipFiles, geoSiteFiles);
+            }
+        }
+    }
+
     private async Task UpdateSrsFile(string type, string srsName)
     {
         var srsUrl = string.IsNullOrEmpty(_config.ConstItem.SrsSourceUrl)

v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs

@@ -27,10 +27,10 @@ public class AddServerViewModel : MyReactiveObject
     public string Ports { get; set; }
 
     [Reactive]
-    public int UpMbps { get; set; }
+    public int? UpMbps { get; set; }
 
     [Reactive]
-    public int DownMbps { get; set; }
+    public int? DownMbps { get; set; }
 
     [Reactive]
     public string HopInterval { get; set; }
@@ -61,6 +61,18 @@ public class AddServerViewModel : MyReactiveObject
     [Reactive]
     public int WgMtu { get; set; }
 
+    [Reactive]
+    public bool Uot { get; set; }
+
+    [Reactive]
+    public string CongestionControl { get; set; }
+
+    [Reactive]
+    public int? InsecureConcurrency { get; set; }
+
+    [Reactive]
+    public bool NaiveQuic { get; set; }
+
     public ReactiveCommand<Unit, Unit> FetchCertCmd { get; }
     public ReactiveCommand<Unit, Unit> FetchCertChainCmd { get; }
     public ReactiveCommand<Unit, Unit> SaveCmd { get; }
@@ -113,8 +125,8 @@ public class AddServerViewModel : MyReactiveObject
         AlterId = int.TryParse(protocolExtra?.AlterId, out var result) ? result : 0;
         Flow = protocolExtra?.Flow ?? string.Empty;
         SalamanderPass = protocolExtra?.SalamanderPass ?? string.Empty;
-        UpMbps = protocolExtra?.UpMbps ?? _config.HysteriaItem.UpMbps;
+        UpMbps = protocolExtra?.UpMbps;
-        DownMbps = protocolExtra?.DownMbps ?? _config.HysteriaItem.DownMbps;
+        DownMbps = protocolExtra?.DownMbps;
         HopInterval = protocolExtra?.HopInterval.IsNullOrEmpty() ?? true ? Global.Hysteria2DefaultHopInt.ToString() : protocolExtra.HopInterval;
         VmessSecurity = protocolExtra?.VmessSecurity?.IsNullOrEmpty() == false ? protocolExtra.VmessSecurity : Global.DefaultSecurity;
         VlessEncryption = protocolExtra?.VlessEncryption.IsNullOrEmpty() == false ? protocolExtra.VlessEncryption : Global.None;
@@ -123,6 +135,10 @@ public class AddServerViewModel : MyReactiveObject
         WgInterfaceAddress = protocolExtra?.WgInterfaceAddress ?? string.Empty;
         WgReserved = protocolExtra?.WgReserved ?? string.Empty;
         WgMtu = protocolExtra?.WgMtu ?? 1280;
+        Uot = protocolExtra?.Uot ?? false;
+        CongestionControl = protocolExtra?.CongestionControl ?? string.Empty;
+        InsecureConcurrency = protocolExtra?.InsecureConcurrency > 0 ? protocolExtra.InsecureConcurrency : null;
+        NaiveQuic = protocolExtra?.NaiveQuic ?? false;
     }
 
     private async Task SaveServerAsync()
@@ -175,8 +191,8 @@ public class AddServerViewModel : MyReactiveObject
             AlterId = AlterId > 0 ? AlterId.ToString() : null,
             Flow = Flow.NullIfEmpty(),
             SalamanderPass = SalamanderPass.NullIfEmpty(),
-            UpMbps = UpMbps >= 0 ? UpMbps : null,
+            UpMbps = UpMbps,
-            DownMbps = DownMbps >= 0 ? DownMbps : null,
+            DownMbps = DownMbps,
             HopInterval = HopInterval.NullIfEmpty(),
             VmessSecurity = VmessSecurity.NullIfEmpty(),
             VlessEncryption = VlessEncryption.NullIfEmpty(),
@@ -185,6 +201,10 @@ public class AddServerViewModel : MyReactiveObject
             WgInterfaceAddress = WgInterfaceAddress.NullIfEmpty(),
             WgReserved = WgReserved.NullIfEmpty(),
             WgMtu = WgMtu >= 576 ? WgMtu : null,
+            Uot = Uot ? true : null,
+            CongestionControl = CongestionControl.NullIfEmpty(),
+            InsecureConcurrency = InsecureConcurrency > 0 ? InsecureConcurrency : null,
+            NaiveQuic = NaiveQuic ? true : null,
         });
 
         if (await ConfigHandler.AddServer(_config, SelectedSource) == 0)

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -204,7 +204,7 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     private async Task UpdateFinishedSub(bool blReload)
     {
-        RxApp.MainThreadScheduler.Schedule(blReload, (scheduler, blReload) =>
+        RxSchedulers.MainThreadScheduler.Schedule(blReload, (scheduler, blReload) =>
         {
             _ = UpdateFinishedResult(blReload);
             return Disposable.Empty;
@@ -317,7 +317,7 @@ public class CheckUpdateViewModel : MyReactiveObject
             Remarks = msg,
         };
 
-        RxApp.MainThreadScheduler.Schedule(item, (scheduler, model) =>
+        RxSchedulers.MainThreadScheduler.Schedule(item, (scheduler, model) =>
         {
             _ = UpdateViewResult(model);
             return Disposable.Empty;

v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs

@@ -56,7 +56,7 @@ public class ClashConnectionsViewModel : MyReactiveObject
             return;
         }
 
-        RxApp.MainThreadScheduler.Schedule(ret?.connections, (scheduler, model) =>
+        RxSchedulers.MainThreadScheduler.Schedule(ret?.connections, (scheduler, model) =>
         {
             _ = RefreshConnections(model);
             return Disposable.Empty;

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -90,7 +90,7 @@ public class ClashProxiesViewModel : MyReactiveObject
 
         AppEvents.ProxiesReloadRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await ProxiesReload());
 
         #endregion AppEvents
@@ -173,7 +173,7 @@ public class ClashProxiesViewModel : MyReactiveObject
 
         if (refreshUI)
         {
-            RxApp.MainThreadScheduler.Schedule(() => _ = RefreshProxyGroups());
+            RxSchedulers.MainThreadScheduler.Schedule(() => _ = RefreshProxyGroups());
         }
     }
 
@@ -387,7 +387,7 @@ public class ClashProxiesViewModel : MyReactiveObject
             }
 
             var model = new SpeedTestResult() { IndexId = item.Name, Delay = result };
-            RxApp.MainThreadScheduler.Schedule(model, (scheduler, model) =>
+            RxSchedulers.MainThreadScheduler.Schedule(model, (scheduler, model) =>
             {
                 _ = ProxiesDelayTestResult(model);
                 return Disposable.Empty;

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -18,6 +18,7 @@ public class MainWindowViewModel : MyReactiveObject
     public ReactiveCommand<Unit, Unit> AddTuicServerCmd { get; }
     public ReactiveCommand<Unit, Unit> AddWireguardServerCmd { get; }
     public ReactiveCommand<Unit, Unit> AddAnytlsServerCmd { get; }
+    public ReactiveCommand<Unit, Unit> AddNaiveServerCmd { get; }
     public ReactiveCommand<Unit, Unit> AddCustomServerCmd { get; }
     public ReactiveCommand<Unit, Unit> AddPolicyGroupServerCmd { get; }
     public ReactiveCommand<Unit, Unit> AddProxyChainServerCmd { get; }
@@ -117,6 +118,10 @@ public class MainWindowViewModel : MyReactiveObject
         {
             await AddServerAsync(EConfigType.Anytls);
         });
+        AddNaiveServerCmd = ReactiveCommand.CreateFromTask(async () =>
+        {
+            await AddServerAsync(EConfigType.Naive);
+        });
         AddCustomServerCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             await AddServerAsync(EConfigType.Custom);
@@ -228,22 +233,22 @@ public class MainWindowViewModel : MyReactiveObject
 
         AppEvents.ReloadRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await Reload());
 
         AppEvents.AddServerViaScanRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await AddServerViaScanAsync());
 
         AppEvents.AddServerViaClipboardRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await AddServerViaClipboardAsync(null));
 
         AppEvents.SubscriptionsUpdateRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async blProxy => await UpdateSubscriptionProcess("", blProxy));
 
         #endregion AppEvents
@@ -583,7 +588,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     private void ReloadResult(bool showClashUI)
     {
-        RxApp.MainThreadScheduler.Schedule(() =>
+        RxSchedulers.MainThreadScheduler.Schedule(() =>
         {
             ShowClashUI = showClashUI;
             TabMainSelectedIndex = showClashUI ? TabMainSelectedIndex : 0;
@@ -592,7 +597,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     private void SetReloadEnabled(bool enabled)
     {
-        RxApp.MainThreadScheduler.Schedule(() => BlReloadEnabled = enabled);
+        RxSchedulers.MainThreadScheduler.Schedule(() => BlReloadEnabled = enabled);
     }
 
     private async Task LoadCore(CoreConfigContext? mainContext, CoreConfigContext? preContext)

v2rayN/ServiceLib/ViewModels/MsgViewModel.cs

@@ -31,7 +31,7 @@ public class MsgViewModel : MyReactiveObject
 
         AppEvents.SendMsgViewRequested
          .AsObservable()
-         //.ObserveOn(RxApp.MainThreadScheduler)
+         //.ObserveOn(RxSchedulers.MainThreadScheduler)
          .Subscribe(content => _ = AppendQueueMsg(content));
     }
 
@@ -86,15 +86,25 @@ public class MsgViewModel : MyReactiveObject
             }
             catch (Exception ex)
             {
-                _queueMsg.Enqueue(ex.Message);
+                EnqueueWithLimit(ex.Message);
                 _lastMsgFilterNotAvailable = true;
             }
         }
 
-        _queueMsg.Enqueue(msg);
+        EnqueueWithLimit(msg);
         if (!msg.EndsWith(Environment.NewLine))
         {
-            _queueMsg.Enqueue(Environment.NewLine);
+            EnqueueWithLimit(Environment.NewLine);
+        }
+    }
+
+    private void EnqueueWithLimit(string item)
+    {
+        _queueMsg.Enqueue(item);
+
+        while (_queueMsg.Count > NumMaxMsg)
+        {
+            _queueMsg.TryDequeue(out _);
         }
     }
 

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -22,8 +22,8 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public string defUserAgent { get; set; }
     [Reactive] public string mux4SboxProtocol { get; set; }
     [Reactive] public bool enableCacheFile4Sbox { get; set; }
-    [Reactive] public int hyUpMbps { get; set; }
+    [Reactive] public int? hyUpMbps { get; set; }
-    [Reactive] public int hyDownMbps { get; set; }
+    [Reactive] public int? hyDownMbps { get; set; }
     [Reactive] public bool enableFragment { get; set; }
 
     #endregion Core
@@ -47,7 +47,6 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public bool KeepOlderDedupl { get; set; }
     [Reactive] public bool DisplayRealTimeSpeed { get; set; }
     [Reactive] public bool EnableAutoAdjustMainLvColWidth { get; set; }
-    [Reactive] public bool EnableUpdateSubOnlyRemarksExist { get; set; }
     [Reactive] public bool AutoHideStartup { get; set; }
     [Reactive] public bool Hide2TrayWhenClose { get; set; }
     [Reactive] public bool MacOSShowInDock { get; set; }
@@ -96,6 +95,8 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public string TunStack { get; set; }
     [Reactive] public int TunMtu { get; set; }
     [Reactive] public bool TunEnableIPv6Address { get; set; }
+    [Reactive] public string TunIcmpRouting { get; set; }
+    [Reactive] public bool TunEnableLegacyProtect { get; set; }
 
     #endregion Tun mode
 
@@ -180,7 +181,6 @@ public class OptionSettingViewModel : MyReactiveObject
         DisplayRealTimeSpeed = _config.GuiItem.DisplayRealTimeSpeed;
         KeepOlderDedupl = _config.GuiItem.KeepOlderDedupl;
         EnableAutoAdjustMainLvColWidth = _config.UiItem.EnableAutoAdjustMainLvColWidth;
-        EnableUpdateSubOnlyRemarksExist = _config.UiItem.EnableUpdateSubOnlyRemarksExist;
         AutoHideStartup = _config.UiItem.AutoHideStartup;
         Hide2TrayWhenClose = _config.UiItem.Hide2TrayWhenClose;
         MacOSShowInDock = _config.UiItem.MacOSShowInDock;
@@ -220,6 +220,8 @@ public class OptionSettingViewModel : MyReactiveObject
         TunStack = _config.TunModeItem.Stack;
         TunMtu = _config.TunModeItem.Mtu;
         TunEnableIPv6Address = _config.TunModeItem.EnableIPv6Address;
+        TunIcmpRouting = _config.TunModeItem.IcmpRouting;
+        TunEnableLegacyProtect = _config.TunModeItem.EnableLegacyProtect;
 
         #endregion Tun mode
 
@@ -336,8 +338,8 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.CoreBasicItem.DefUserAgent = defUserAgent;
         _config.Mux4SboxItem.Protocol = mux4SboxProtocol;
         _config.CoreBasicItem.EnableCacheFile4Sbox = enableCacheFile4Sbox;
-        _config.HysteriaItem.UpMbps = hyUpMbps;
+        _config.HysteriaItem.UpMbps = hyUpMbps ?? 0;
-        _config.HysteriaItem.DownMbps = hyDownMbps;
+        _config.HysteriaItem.DownMbps = hyDownMbps ?? 0;
         _config.CoreBasicItem.EnableFragment = enableFragment;
 
         _config.GuiItem.AutoRun = AutoRun;
@@ -345,7 +347,6 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.GuiItem.DisplayRealTimeSpeed = DisplayRealTimeSpeed;
         _config.GuiItem.KeepOlderDedupl = KeepOlderDedupl;
         _config.UiItem.EnableAutoAdjustMainLvColWidth = EnableAutoAdjustMainLvColWidth;
-        _config.UiItem.EnableUpdateSubOnlyRemarksExist = EnableUpdateSubOnlyRemarksExist;
         _config.UiItem.AutoHideStartup = AutoHideStartup;
         _config.UiItem.Hide2TrayWhenClose = Hide2TrayWhenClose;
         _config.UiItem.MacOSShowInDock = MacOSShowInDock;
@@ -379,6 +380,8 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.TunModeItem.Stack = TunStack;
         _config.TunModeItem.Mtu = TunMtu;
         _config.TunModeItem.EnableIPv6Address = TunEnableIPv6Address;
+        _config.TunModeItem.IcmpRouting = TunIcmpRouting;
+        _config.TunModeItem.EnableLegacyProtect = TunEnableLegacyProtect;
 
         //coreType
         await SaveCoreType();

v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs

@@ -188,14 +188,9 @@ public class ProfilesSelectViewModel : MyReactiveObject
         {
             SubItems.Add(item);
         }
-        if (_subIndexId != null && SubItems.FirstOrDefault(t => t.Id == _subIndexId) != null)
+        SelectedSub = (_config.SubIndexId.IsNotEmpty()
-        {
+                        ? SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId)
-            SelectedSub = SubItems.FirstOrDefault(t => t.Id == _subIndexId);
+                        : null) ?? SubItems.LastOrDefault();
-        }
-        else
-        {
-            SelectedSub = SubItems.First();
-        }
     }
 
     private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -228,22 +228,22 @@ public class ProfilesViewModel : MyReactiveObject
 
         AppEvents.ProfilesRefreshRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await RefreshServersBiz());
 
         AppEvents.SubscriptionsRefreshRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await RefreshSubscriptions());
 
         AppEvents.DispatcherStatisticsRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async result => await UpdateStatistics(result));
 
         AppEvents.SetDefaultServerRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async indexId => await SetDefaultServer(indexId));
 
         #endregion AppEvents
@@ -391,14 +391,9 @@ public class ProfilesViewModel : MyReactiveObject
         {
             SubItems.Add(item);
         }
-        if (_config.SubIndexId != null && SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId) != null)
+        SelectedSub = (_config.SubIndexId.IsNotEmpty()
-        {
+                        ? SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId)
-            SelectedSub = SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId);
+                        : null) ?? SubItems.LastOrDefault();
-        }
-        else
-        {
-            SelectedSub = SubItems.First();
-        }
     }
 
     private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
@@ -714,25 +709,29 @@ public class ProfilesViewModel : MyReactiveObject
 
     public async Task ServerSpeedtest(ESpeedActionType actionType)
     {
-        if (actionType == ESpeedActionType.Mixedtest)
+        List<ProfileItem>? lstSelected;
+        if (actionType is ESpeedActionType.Mixedtest or ESpeedActionType.FastRealping)
         {
-            SelectedProfiles = ProfileItems;
+            if (actionType == ESpeedActionType.FastRealping)
+            {
+                actionType = ESpeedActionType.Realping;
+            }
+
+            lstSelected = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(ProfileItems?.OrderBy(t => t.Sort)));
         }
-        else if (actionType == ESpeedActionType.FastRealping)
+        else
         {
-            SelectedProfiles = ProfileItems;
+            lstSelected = await GetProfileItems(false);
-            actionType = ESpeedActionType.Realping;
         }
 
-        var lstSelected = await GetProfileItems(false);
+        if (lstSelected is null || lstSelected.Count <= 0)
-        if (lstSelected == null)
         {
             return;
         }
 
         _speedtestService ??= new SpeedtestService(_config, async (SpeedTestResult result) =>
         {
-            RxApp.MainThreadScheduler.Schedule(result, (scheduler, result) =>
+            RxSchedulers.MainThreadScheduler.Schedule(result, (scheduler, result) =>
             {
                 _ = SetSpeedTestResult(result);
                 return Disposable.Empty;

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -200,27 +200,27 @@ public class StatusBarViewModel : MyReactiveObject
 
         AppEvents.DispatcherStatisticsRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async result => await UpdateStatistics(result));
 
         AppEvents.RoutingsMenuRefreshRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await RefreshRoutingsMenu());
 
         AppEvents.TestServerRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await TestServerAvailability());
 
         AppEvents.InboundDisplayRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await InboundDisplayStatus());
 
         AppEvents.SysProxyChangeRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async result => await SetListenerType(result));
 
         #endregion AppEvents
@@ -243,7 +243,7 @@ public class StatusBarViewModel : MyReactiveObject
         {
             AppEvents.ProfilesRefreshRequested
               .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
               .Subscribe(async _ => await RefreshServersBiz()); //.DisposeWith(_disposables);
         }
     }
@@ -362,7 +362,7 @@ public class StatusBarViewModel : MyReactiveObject
 
     private async Task TestServerAvailabilitySub(string msg)
     {
-        RxApp.MainThreadScheduler.Schedule(msg, (scheduler, msg) =>
+        RxSchedulers.MainThreadScheduler.Schedule(msg, (scheduler, msg) =>
         {
             _ = TestServerAvailabilityResult(msg);
             return Disposable.Empty;
@@ -490,6 +490,7 @@ public class StatusBarViewModel : MyReactiveObject
                 }
             }
         }
+
         await ConfigHandler.SaveConfig(_config);
         AppEvents.ReloadRequested.Publish();
     }

v2rayN/v2rayN.Desktop/Program.cs

@@ -59,7 +59,7 @@ internal class Program
            //.WithInterFont()
            .WithFontByDefault()
            .LogToTrace()
-           .UseReactiveUI();
+           .UseReactiveUI(_ => { });
 
         if (OperatingSystem.IsMacOS())
         {

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -5,6 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
+    xmlns:views="clr-namespace:v2rayN.Desktop.Views"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuServers}"
     Width="900"
@@ -197,6 +198,19 @@
                         Width="300"
                         Margin="{StaticResource Margin4}" />
 
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbUot}" />
+                    <ToggleSwitch
+                        x:Name="togUotEnabled3"
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
+
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
@@ -483,7 +497,7 @@
                         VerticalAlignment="Center"
                         Text="{x:Static resx:ResUI.TbHeaderType8}" />
                     <ComboBox
-                        x:Name="cmbHeaderType8"
+                        x:Name="cmbCongestionControl8"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
@@ -580,12 +594,93 @@
                         VerticalAlignment="Center"
                         Text="{x:Static resx:ResUI.TbId3}" />
                     <TextBox
-                        x:Name="txtId10"
+                        x:Name="txtId11"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
                         Margin="{StaticResource Margin4}" />
                 </Grid>
+                <Grid
+                    x:Name="gridNaive"
+                    Grid.Row="2"
+                    ColumnDefinitions="300,Auto"
+                    IsVisible="False"
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbUsername}" />
+                    <TextBox
+                        x:Name="txtId12"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}" />
+
+                    <TextBlock
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbId3}" />
+                    <TextBox
+                        x:Name="txtSecurity12"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}" />
+
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="QUIC" />
+                    <StackPanel
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <ToggleSwitch
+                            x:Name="togNaiveQuic12"
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Left" />
+                        <ComboBox
+                            x:Name="cmbCongestionControl12"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            PlaceholderText="{x:Static resx:ResUI.TbHeaderType8}" />
+                    </StackPanel>
+
+                    <TextBlock
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbInsecureConcurrency}" />
+                    <TextBox
+                        x:Name="txtInsecureConcurrency12"
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
+
+                    <TextBlock
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbUot}" />
+                    <ToggleSwitch
+                        x:Name="togUotEnabled12"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
+                </Grid>
 
                 <Separator
                     x:Name="sepa2"
@@ -658,16 +753,13 @@
                                             Margin="{StaticResource Margin4}"
                                             VerticalAlignment="Center"
                                             Text="{x:Static resx:ResUI.TransportExtraTip}" />
-                                        <TextBox
+                                        <views:JsonEditor
                                             x:Name="txtExtra"
                                             Width="400"
                                             MinHeight="100"
                                             Margin="{StaticResource Margin4}"
                                             HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Center"
+                                            VerticalAlignment="Center" />
-                                            Classes="TextArea"
-                                            MinLines="6"
-                                            TextWrapping="Wrap" />
                                     </StackPanel>
                                 </Flyout>
                             </Button.Flyout>
@@ -749,13 +841,13 @@
                         <Button.Flyout>
                             <Flyout>
                                 <StackPanel>
-                                    <TextBox
+                                    <views:JsonEditor
                                         x:Name="txtFinalmask"
                                         Width="400"
+                                        MinHeight="100"
                                         Margin="{StaticResource Margin4}"
-                                        AcceptsReturn="True"
+                                        HorizontalAlignment="Stretch"
-                                        Classes="TextArea"
+                                        VerticalAlignment="Center" />
-                                        TextWrapping="NoWrap" />
                                 </StackPanel>
                             </Flyout>
                         </Button.Flyout>

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs

@@ -80,7 +80,7 @@ public partial class AddServerWindow : WindowBase<AddServerViewModel>
                 cmbFingerprint.SelectedValue = string.Empty;
                 gridFinalmask.IsVisible = false;
 
-                cmbHeaderType8.ItemsSource = Global.TuicCongestionControls;
+                cmbCongestionControl8.ItemsSource = Global.TuicCongestionControls;
                 break;
 
             case EConfigType.WireGuard:
@@ -94,10 +94,28 @@ public partial class AddServerWindow : WindowBase<AddServerViewModel>
 
             case EConfigType.Anytls:
                 gridAnytls.IsVisible = true;
+                sepa2.IsVisible = false;
+                gridTransport.IsVisible = false;
                 lstStreamSecurity.Add(Global.StreamSecurityReality);
                 cmbCoreType.IsEnabled = false;
                 gridFinalmask.IsVisible = false;
                 break;
+
+            case EConfigType.Naive:
+                gridNaive.IsVisible = true;
+                sepa2.IsVisible = false;
+                gridTransport.IsVisible = false;
+                cmbCoreType.IsEnabled = false;
+                gridFinalmask.IsVisible = false;
+                cmbFingerprint.IsEnabled = false;
+                cmbFingerprint.SelectedValue = string.Empty;
+                cmbAlpn.IsEnabled = false;
+                cmbAlpn.SelectedValue = string.Empty;
+                cmbAllowInsecure.IsEnabled = false;
+                cmbAllowInsecure.SelectedValue = string.Empty;
+
+                cmbCongestionControl12.ItemsSource = Global.NaiveCongestionControls;
+                break;
         }
         cmbStreamSecurity.ItemsSource = lstStreamSecurity;
 
@@ -122,6 +140,7 @@ public partial class AddServerWindow : WindowBase<AddServerViewModel>
                 case EConfigType.Shadowsocks:
                     this.Bind(ViewModel, vm => vm.SelectedSource.Password, v => v.txtId3.Text).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SsMethod, v => v.cmbSecurity3.SelectedValue).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.Uot, v => v.togUotEnabled3.IsChecked).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SelectedSource.MuxEnabled, v => v.togmuxEnabled3.IsChecked).DisposeWith(disposables);
                     break;
 
@@ -156,7 +175,7 @@ public partial class AddServerWindow : WindowBase<AddServerViewModel>
                 case EConfigType.TUIC:
                     this.Bind(ViewModel, vm => vm.SelectedSource.Username, v => v.txtId8.Text).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SelectedSource.Password, v => v.txtSecurity8.Text).DisposeWith(disposables);
-                    this.Bind(ViewModel, vm => vm.SelectedSource.HeaderType, v => v.cmbHeaderType8.SelectedValue).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.CongestionControl, v => v.cmbCongestionControl8.SelectedValue).DisposeWith(disposables);
                     break;
 
                 case EConfigType.WireGuard:
@@ -168,7 +187,17 @@ public partial class AddServerWindow : WindowBase<AddServerViewModel>
                     break;
 
                 case EConfigType.Anytls:
-                    this.Bind(ViewModel, vm => vm.SelectedSource.Password, v => v.txtId10.Text).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.SelectedSource.Password, v => v.txtId11.Text).DisposeWith(disposables);
+                    break;
+
+                case EConfigType.Naive:
+                    this.Bind(ViewModel, vm => vm.SelectedSource.Username, v => v.txtId12.Text).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.SelectedSource.Password, v => v.txtSecurity12.Text).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.NaiveQuic, v => v.togNaiveQuic12.IsChecked).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.NaiveQuic, v => v.cmbCongestionControl12.IsEnabled).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.CongestionControl, v => v.cmbCongestionControl12.SelectedValue).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.InsecureConcurrency, v => v.txtInsecureConcurrency12.Text).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.Uot, v => v.togUotEnabled12.IsChecked).DisposeWith(disposables);
                     break;
             }
             this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.SelectedValue).DisposeWith(disposables);

v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml

@@ -74,23 +74,28 @@
                 <DataGridTextColumn
                     Width="300"
                     Binding="{Binding Host}"
-                    Header="{x:Static resx:ResUI.TbSortingHost}" />
+                    Header="{x:Static resx:ResUI.TbSortingHost}"
+                    Tag="Host" />
                 <DataGridTextColumn
                     Width="500"
                     Binding="{Binding Chain}"
-                    Header="{x:Static resx:ResUI.TbSortingChain}" />
+                    Header="{x:Static resx:ResUI.TbSortingChain}"
+                    Tag="Chain" />
                 <DataGridTextColumn
                     Width="80"
                     Binding="{Binding Network}"
-                    Header="{x:Static resx:ResUI.TbSortingNetwork}" />
+                    Header="{x:Static resx:ResUI.TbSortingNetwork}"
+                    Tag="Network" />
                 <DataGridTextColumn
                     Width="160"
                     Binding="{Binding Type}"
-                    Header="{x:Static resx:ResUI.TbSortingType}" />
+                    Header="{x:Static resx:ResUI.TbSortingType}"
+                    Tag="Type" />
                 <DataGridTextColumn
                     Width="100"
                     Binding="{Binding Elapsed}"
-                    Header="{x:Static resx:ResUI.TbSortingTime}" />
+                    Header="{x:Static resx:ResUI.TbSortingTime}"
+                    Tag="Elapsed" />
             </DataGrid.Columns>
         </DataGrid>
     </DockPanel>

v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs

@@ -2,9 +2,15 @@ namespace v2rayN.Desktop.Views;
 
 public partial class ClashConnectionsView : ReactiveUserControl<ClashConnectionsViewModel>
 {
+    private static Config _config;
+    private static readonly string _tag = "ClashConnectionsView";
+
     public ClashConnectionsView()
     {
         InitializeComponent();
+
+        _config = AppManager.Instance.Config;
+
         ViewModel = new ClashConnectionsViewModel(UpdateViewHandler);
         btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
 
@@ -19,7 +25,15 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
             this.Bind(ViewModel, vm => vm.HostFilter, v => v.txtHostFilter.Text).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.ConnectionCloseAllCmd, v => v.btnConnectionCloseAll).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoRefresh, v => v.togAutoRefresh.IsChecked).DisposeWith(disposables);
+
+            AppEvents.AppExitRequested
+              .AsObservable()
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
+              .Subscribe(_ => StorageUI())
+              .DisposeWith(disposables);
         });
+
+        RestoreUI();
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@@ -51,4 +65,74 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
     {
         ViewModel?.ClashConnectionClose(false);
     }
+
+    #region UI
+
+    private void RestoreUI()
+    {
+        try
+        {
+            var lvColumnItem = _config.ClashUIItem?.ConnectionsColumnItem?.OrderBy(t => t.Index).ToList();
+            if (lvColumnItem == null)
+            {
+                return;
+            }
+
+            var displayIndex = 0;
+            foreach (var item in lvColumnItem)
+            {
+                foreach (var item2 in lstConnections.Columns)
+                {
+                    if (item2.Tag == null)
+                    {
+                        continue;
+                    }
+                    if (item2.Tag.Equals(item.Name))
+                    {
+                        if (item.Width < 0)
+                        {
+                            item2.IsVisible = false;
+                        }
+                        else
+                        {
+                            item2.Width = new DataGridLength(item.Width, DataGridLengthUnitType.Pixel);
+                            item2.DisplayIndex = displayIndex++;
+                        }
+                    }
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private void StorageUI()
+    {
+        try
+        {
+            List<ColumnItem> lvColumnItem = new();
+            foreach (var item2 in lstConnections.Columns)
+            {
+                if (item2.Tag == null)
+                {
+                    continue;
+                }
+                lvColumnItem.Add(new()
+                {
+                    Name = (string)item2.Tag,
+                    Width = (int)(item2.IsVisible == true ? item2.ActualWidth : -1),
+                    Index = item2.DisplayIndex
+                });
+            }
+            _config.ClashUIItem.ConnectionsColumnItem = lvColumnItem;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    #endregion UI
 }

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml

@@ -3,6 +3,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:v2rayN.Desktop.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
@@ -399,12 +400,7 @@
                         BorderBrush="Gray"
                         BorderThickness="1"
                         Header="HTTP/SOCKS">
-                        <TextBox
+                        <local:JsonEditor Name="txtnormalDNSCompatible" VerticalAlignment="Stretch" />
-                            Name="txtnormalDNSCompatible"
-                            VerticalAlignment="Stretch"
-                            Classes="TextArea"
-                            MinLines="10"
-                            TextWrapping="Wrap" />
                     </HeaderedContentControl>
                 </DockPanel>
             </TabItem>
@@ -473,12 +469,7 @@
                             BorderBrush="Gray"
                             BorderThickness="1"
                             Header="HTTP/SOCKS">
-                            <TextBox
+                            <local:JsonEditor Name="txtnormalDNS2Compatible" VerticalAlignment="Stretch" />
-                                Name="txtnormalDNS2Compatible"
-                                VerticalAlignment="Stretch"
-                                Classes="TextArea"
-                                MinLines="10"
-                                TextWrapping="Wrap" />
                         </HeaderedContentControl>
 
                         <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
@@ -488,12 +479,7 @@
                             BorderBrush="Gray"
                             BorderThickness="1"
                             Header="{x:Static resx:ResUI.TbSettingsTunMode}">
-                            <TextBox
+                            <local:JsonEditor Name="txttunDNS2Compatible" VerticalAlignment="Stretch" />
-                                Name="txttunDNS2Compatible"
-                                VerticalAlignment="Stretch"
-                                Classes="TextArea"
-                                MinLines="10"
-                                TextWrapping="Wrap" />
                         </HeaderedContentControl>
 
                     </Grid>

v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml

@@ -5,6 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
+    xmlns:views="clr-namespace:v2rayN.Desktop.Views"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuFullConfigTemplate}"
     Width="900"
@@ -94,12 +95,7 @@
                         BorderBrush="Gray"
                         BorderThickness="1"
                         Header="xray config template json">
-                        <TextBox
+                        <views:JsonEditor x:Name="rayFullConfigTemplate" VerticalAlignment="Stretch" />
-                            x:Name="rayFullConfigTemplate"
-                            VerticalAlignment="Stretch"
-                            Classes="TextArea"
-                            MinLines="10"
-                            TextWrapping="Wrap" />
                     </HeaderedContentControl>
                 </DockPanel>
             </TabItem>
@@ -166,12 +162,7 @@
                             BorderBrush="Gray"
                             BorderThickness="1"
                             Header="sing-box config template json">
-                            <TextBox
+                            <views:JsonEditor x:Name="sbFullConfigTemplate" VerticalAlignment="Stretch" />
-                                x:Name="sbFullConfigTemplate"
-                                VerticalAlignment="Stretch"
-                                Classes="TextArea"
-                                MinLines="10"
-                                TextWrapping="Wrap" />
                         </HeaderedContentControl>
 
                         <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
@@ -181,12 +172,7 @@
                             BorderBrush="Gray"
                             BorderThickness="1"
                             Header="sing-box tun config template json">
-                            <TextBox
+                            <views:JsonEditor x:Name="sbFullTunConfigTemplate" VerticalAlignment="Stretch" />
-                                x:Name="sbFullTunConfigTemplate"
-                                VerticalAlignment="Stretch"
-                                Classes="TextArea"
-                                MinLines="10"
-                                TextWrapping="Wrap" />
                         </HeaderedContentControl>
                     </Grid>
                 </DockPanel>

v2rayN/v2rayN.Desktop/Views/JsonEditor.axaml

@@ -0,0 +1,23 @@
+<UserControl
+    x:Class="v2rayN.Desktop.Views.JsonEditor"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ae="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
+    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib">
+
+    <ae:TextEditor
+        Name="Editor"
+        FontFamily="Cascadia Code,Consolas,Monospace"
+        FontSize="14"
+        ShowLineNumbers="True">
+        <ae:TextEditor.ContextMenu>
+            <ContextMenu>
+                <MenuItem Click="FormatJson_Click" Header="{x:Static resx:ResUI.menuEditFormat}" />
+                <Separator />
+                <MenuItem Click="Copy_Click" Header="{x:Static resx:ResUI.menuEditCopy}" />
+                <MenuItem Click="Paste_Click" Header="{x:Static resx:ResUI.menuEditPaste}" />
+                <MenuItem Click="SelectAll_Click" Header="{x:Static resx:ResUI.menuEditSelectAll}" />
+            </ContextMenu>
+        </ae:TextEditor.ContextMenu>
+    </ae:TextEditor>
+</UserControl>

v2rayN/v2rayN.Desktop/Views/JsonEditor.axaml.cs

@@ -0,0 +1,96 @@
+using System.Text.Json;
+using System.Xml;
+using AvaloniaEdit.Highlighting;
+using AvaloniaEdit.Highlighting.Xshd;
+
+namespace v2rayN.Desktop.Views;
+
+public partial class JsonEditor : UserControl
+{
+    private static readonly JsonSerializerOptions SIndentedOptions = new() { WriteIndented = true };
+
+    private static readonly Lazy<IHighlightingDefinition> SHighlightingDark =
+        new(() => BuildHighlighting(dark: true), isThreadSafe: true);
+
+    private static readonly Lazy<IHighlightingDefinition> SHighlightingLight =
+        new(() => BuildHighlighting(dark: false), isThreadSafe: true);
+
+    public static readonly StyledProperty<string> TextProperty =
+        AvaloniaProperty.Register<JsonEditor, string>(nameof(Text), defaultValue: string.Empty);
+
+    public string Text
+    {
+        get => GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    public JsonEditor()
+    {
+        InitializeComponent();
+        var isDark = Application.Current?.ActualThemeVariant != ThemeVariant.Light;
+        Editor.SyntaxHighlighting = isDark ? SHighlightingDark.Value : SHighlightingLight.Value;
+        Editor.TextArea.TextView.Options.EnableHyperlinks = false;
+
+        Editor.TextChanged += (_, _) =>
+        {
+            if (Text != Editor.Text)
+            {
+                SetCurrentValue(TextProperty, Editor.Text);
+            }
+        };
+
+        this.GetObservable(TextProperty).Subscribe(text =>
+        {
+            if (Editor.Text != text)
+            {
+                Editor.Text = text ?? string.Empty;
+            }
+        });
+    }
+
+    private static IHighlightingDefinition BuildHighlighting(bool dark)
+    {
+        var keyColor = dark ? "#9CDCFE" : "#0451A5";
+        var strColor = dark ? "#CE9178" : "#A31515";
+        var numColor = dark ? "#B5CEA8" : "#098658";
+        var kwColor  = dark ? "#569CD6" : "#0000FF";
+        var xshd = $"""
+            <?xml version="1.0"?>
+            <SyntaxDefinition name="JSON" xmlns="http://icsharpcode.net/sharpdevelop/syntaxdefinition/2008">
+              <Color name="Key" foreground="{keyColor}" />
+              <Color name="String" foreground="{strColor}" />
+              <Color name="Number" foreground="{numColor}" />
+              <Color name="Keyword" foreground="{kwColor}" fontWeight="bold" />
+              <RuleSet>
+                <Rule color="Key">"([^"\\]|\\.)*"(?=\s*:)</Rule>
+                <Rule color="String">"([^"\\]|\\.)*"</Rule>
+                <Rule color="Number">-?(?:0|[1-9][0-9]*)(?:\.[0-9]+)?(?:[eE][+-]?[0-9]+)?</Rule>
+                <Keywords color="Keyword">
+                  <Word>true</Word>
+                  <Word>false</Word>
+                  <Word>null</Word>
+                </Keywords>
+              </RuleSet>
+            </SyntaxDefinition>
+            """;
+        using var reader = XmlReader.Create(new StringReader(xshd));
+        return HighlightingLoader.Load(reader, HighlightingManager.Instance);
+    }
+
+    private void FormatJson_Click(object? sender, RoutedEventArgs e)
+    {
+        try
+        {
+            var obj = JsonUtils.ParseJson(Editor.Text);
+            Editor.Text = JsonUtils.Serialize(obj, SIndentedOptions);
+        }
+        catch
+        {
+            // ignored
+        }
+    }
+
+    private void Copy_Click(object? sender, RoutedEventArgs e) => Editor.Copy();
+    private void Paste_Click(object? sender, RoutedEventArgs e) => Editor.Paste();
+    private void SelectAll_Click(object? sender, RoutedEventArgs e) => Editor.SelectAll();
+}

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml

@@ -50,6 +50,7 @@
                         <Separator />
                         <MenuItem x:Name="menuAddTuicServer" Header="{x:Static resx:ResUI.menuAddTuicServer}" />
                         <MenuItem x:Name="menuAddAnytlsServer" Header="{x:Static resx:ResUI.menuAddAnytlsServer}" />
+                        <MenuItem x:Name="menuAddNaiveServer" Header="{x:Static resx:ResUI.menuAddNaiveServer}" />
                     </MenuItem>
 
                     <MenuItem Header="{x:Static resx:ResUI.menuSubscription}">

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -72,6 +72,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
             this.BindCommand(ViewModel, vm => vm.AddTuicServerCmd, v => v.menuAddTuicServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddWireguardServerCmd, v => v.menuAddWireguardServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddAnytlsServerCmd, v => v.menuAddAnytlsServer).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.AddNaiveServerCmd, v => v.menuAddNaiveServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddCustomServerCmd, v => v.menuAddCustomServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddPolicyGroupServerCmd, v => v.menuAddPolicyGroupServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddProxyChainServerCmd, v => v.menuAddProxyChainServer).DisposeWith(disposables);
@@ -128,25 +129,25 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
 
             AppEvents.SendSnackMsgRequested
               .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
               .Subscribe(async content => await DelegateSnackMsg(content))
               .DisposeWith(disposables);
 
             AppEvents.AppExitRequested
               .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
 
             AppEvents.ShutdownRequested
               .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
               .Subscribe(content => Shutdown(content))
               .DisposeWith(disposables);
 
             AppEvents.ShowHideWindowRequested
              .AsObservable()
-             .ObserveOn(RxApp.MainThreadScheduler)
+             .ObserveOn(RxSchedulers.MainThreadScheduler)
              .Subscribe(blShow => ShowHideWindow(blShow))
              .DisposeWith(disposables);
         });

v2rayN/v2rayN.Desktop/Views/MsgView.axaml

@@ -79,8 +79,8 @@
                     <MenuItem
                         x:Name="menuMsgViewSelectAll"
                         Click="menuMsgViewSelectAll_Click"
-                        InputGesture="Ctrl+A" 
+                        Header="{x:Static resx:ResUI.menuMsgViewSelectAll}"
-                        Header="{x:Static resx:ResUI.menuMsgViewSelectAll}" />
+                        InputGesture="Ctrl+A" />
                     <MenuItem
                         x:Name="menuMsgViewCopy"
                         Click="menuMsgViewCopy_Click"

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -410,19 +410,6 @@
                             Margin="{StaticResource Margin4}"
                             HorizontalAlignment="Left" />
 
-                        <TextBlock
-                            Grid.Row="6"
-                            Grid.Column="0"
-                            Margin="{StaticResource Margin4}"
-                            VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbSettingsEnableUpdateSubOnlyRemarksExist}" />
-                        <ToggleSwitch
-                            x:Name="togEnableUpdateSubOnlyRemarksExist"
-                            Grid.Row="6"
-                            Grid.Column="1"
-                            Margin="{StaticResource Margin4}"
-                            HorizontalAlignment="Left" />
-
                         <TextBlock
                             Grid.Row="8"
                             Grid.Column="0"
@@ -781,7 +768,7 @@
                     Margin="{StaticResource Margin4}"
                     ColumnDefinitions="Auto,Auto,Auto"
                     DockPanel.Dock="Top"
-                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
 
                     <TextBlock
                         Grid.Row="2"
@@ -837,6 +824,20 @@
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
 
+                    <TextBlock
+                        Grid.Row="6"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbIcmpRoutingPolicy}" />
+                    <ComboBox
+                        x:Name="cmbIcmpRoutingPolicy"
+                        Grid.Row="6"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
+
                     <TextBlock
                         Grid.Row="7"
                         Grid.Column="0"
@@ -850,6 +851,18 @@
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
 
+                    <TextBlock
+                        Grid.Row="8"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbLegacyProtect}" />
+                    <ToggleSwitch
+                        x:Name="togEnableLegacyProtect"
+                        Grid.Row="8"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
                 </Grid>
             </TabItem>
 

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -34,6 +34,7 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
         cmbmux4SboxProtocol.ItemsSource = Global.SingboxMuxs;
         cmbMtu.ItemsSource = Global.TunMtus;
         cmbStack.ItemsSource = Global.TunStacks;
+        cmbIcmpRoutingPolicy.ItemsSource = Global.TunIcmpRoutingPolicies;
 
         cmbCoreType1.ItemsSource = Global.CoreTypes;
         cmbCoreType2.ItemsSource = Global.CoreTypes;
@@ -86,7 +87,6 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
             this.Bind(ViewModel, vm => vm.DisplayRealTimeSpeed, v => v.togDisplayRealTimeSpeed.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.EnableUpdateSubOnlyRemarksExist, v => v.togEnableUpdateSubOnlyRemarksExist.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoHideStartup, v => v.togAutoHideStartup.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Hide2TrayWhenClose, v => v.togHide2TrayWhenClose.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.MacOSShowInDock, v => v.togMacOSShowInDock.IsChecked).DisposeWith(disposables);
@@ -115,6 +115,8 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
             this.Bind(ViewModel, vm => vm.TunStack, v => v.cmbStack.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunMtu, v => v.cmbMtu.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunEnableIPv6Address, v => v.togEnableIPv6Address.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.TunIcmpRouting, v => v.cmbIcmpRoutingPolicy.SelectedValue).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.TunEnableLegacyProtect, v => v.togEnableLegacyProtect.IsChecked).DisposeWith(disposables);
 
             this.Bind(ViewModel, vm => vm.CoreType1, v => v.cmbCoreType1.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CoreType2, v => v.cmbCoreType2.SelectedValue).DisposeWith(disposables);

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -7,6 +7,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
 {
     private static Config _config;
     private Window? _window;
+    private static readonly string _tag = "ProfilesView";
 
     public ProfilesView()
     {
@@ -89,13 +90,13 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
 
             AppEvents.AppExitRequested
               .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
 
             AppEvents.AdjustMainLvColWidthRequested
                 .AsObservable()
-                .ObserveOn(RxApp.MainThreadScheduler)
+                .ObserveOn(RxSchedulers.MainThreadScheduler)
                 .Subscribe(_ => AutofitColumnWidth())
                 .DisposeWith(disposables);
         });
@@ -381,7 +382,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
         }
         catch (Exception ex)
         {
-            Logging.SaveLog("ProfilesView", ex);
+            Logging.SaveLog(_tag, ex);
         }
     }
 
@@ -399,53 +400,67 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
 
     private void RestoreUI()
     {
-        var lvColumnItem = _config.UiItem.MainColumnItem.OrderBy(t => t.Index).ToList();
+        try
-        var displayIndex = 0;
-        foreach (var item in lvColumnItem)
         {
+            var lvColumnItem = _config.UiItem.MainColumnItem.OrderBy(t => t.Index).ToList();
+            var displayIndex = 0;
+            foreach (var item in lvColumnItem)
+            {
+                foreach (var item2 in lstProfiles.Columns)
+                {
+                    if (item2.Tag == null)
+                    {
+                        continue;
+                    }
+                    if (item2.Tag.Equals(item.Name))
+                    {
+                        if (item.Width < 0)
+                        {
+                            item2.IsVisible = false;
+                        }
+                        else
+                        {
+                            item2.Width = new DataGridLength(item.Width, DataGridLengthUnitType.Pixel);
+                            item2.DisplayIndex = displayIndex++;
+                        }
+                        if (item.Name.ToLower().StartsWith("to"))
+                        {
+                            item2.IsVisible = _config.GuiItem.EnableStatistics;
+                        }
+                    }
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private void StorageUI()
+    {
+        try
+        {
+            List<ColumnItem> lvColumnItem = new();
             foreach (var item2 in lstProfiles.Columns)
             {
                 if (item2.Tag == null)
                 {
                     continue;
                 }
-                if (item2.Tag.Equals(item.Name))
+                lvColumnItem.Add(new()
                 {
-                    if (item.Width < 0)
+                    Name = (string)item2.Tag,
-                    {
+                    Width = (int)(item2.IsVisible == true ? item2.ActualWidth : -1),
-                        item2.IsVisible = false;
+                    Index = item2.DisplayIndex
-                    }
+                });
-                    else
-                    {
-                        item2.Width = new DataGridLength(item.Width, DataGridLengthUnitType.Pixel);
-                        item2.DisplayIndex = displayIndex++;
-                    }
-                    if (item.Name.ToLower().StartsWith("to"))
-                    {
-                        item2.IsVisible = _config.GuiItem.EnableStatistics;
-                    }
-                }
             }
+            _config.UiItem.MainColumnItem = lvColumnItem;
         }
-    }
+        catch (Exception ex)
-
-    private void StorageUI()
-    {
-        List<ColumnItem> lvColumnItem = new();
-        foreach (var item2 in lstProfiles.Columns)
         {
-            if (item2.Tag == null)
+            Logging.SaveLog(_tag, ex);
-            {
-                continue;
-            }
-            lvColumnItem.Add(new()
-            {
-                Name = (string)item2.Tag,
-                Width = (int)(item2.IsVisible == true ? item2.ActualWidth : -1),
-                Index = item2.DisplayIndex
-            });
         }
-        _config.UiItem.MainColumnItem = lvColumnItem;
     }
 
     #endregion UI

v2rayN/v2rayN/App.xaml.cs

@@ -39,6 +39,11 @@ public partial class App : Application
         }
 
         AppManager.Instance.InitComponents();
+
+        RxAppBuilder.CreateReactiveUIBuilder()
+            .WithWpf()
+            .BuildApp();
+
         base.OnStartup(e);
     }
 

v2rayN/v2rayN/GlobalUsings.cs

@@ -20,6 +20,7 @@ global using System.Windows.Threading;
 global using DynamicData;
 global using DynamicData.Binding;
 global using ReactiveUI;
+global using ReactiveUI.Builder;
 global using ReactiveUI.Fody.Helpers;
 global using ServiceLib;
 global using ServiceLib.Base;

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -277,6 +277,20 @@
                         Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
 
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbUot}" />
+                    <ToggleButton
+                        x:Name="togUotEnabled3"
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
+
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
@@ -646,7 +660,7 @@
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbHeaderType8}" />
                     <ComboBox
-                        x:Name="cmbHeaderType8"
+                        x:Name="cmbCongestionControl8"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
@@ -772,13 +786,116 @@
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId3}" />
                     <TextBox
-                        x:Name="txtId10"
+                        x:Name="txtId11"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
                         Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
+                <Grid
+                    x:Name="gridNaive"
+                    Grid.Row="2"
+                    Visibility="Hidden">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="300" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbUsername}" />
+                    <TextBox
+                        x:Name="txtId12"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}"
+                        Style="{StaticResource DefTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbId3}" />
+                    <TextBox
+                        x:Name="txtSecurity12"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}"
+                        Style="{StaticResource DefTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="QUIC" />
+                    <StackPanel
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <ToggleButton
+                            x:Name="togNaiveQuic12"
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Left" />
+                        <ComboBox
+                            x:Name="cmbCongestionControl12"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Right"
+                            materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbHeaderType8}"
+                            Style="{StaticResource DefComboBox}" />
+                    </StackPanel>
+
+                    <TextBlock
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbInsecureConcurrency}" />
+                    <TextBox
+                        x:Name="txtInsecureConcurrency12"
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left"
+                        Style="{StaticResource DefTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbUot}" />
+                    <ToggleButton
+                        x:Name="togUotEnabled12"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
+
+                </Grid>
 
                 <Separator
                     x:Name="sepa2"

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -75,7 +75,7 @@ public partial class AddServerWindow
                 cmbFingerprint.Text = string.Empty;
                 gridFinalmask.Visibility = Visibility.Collapsed;
 
-                cmbHeaderType8.ItemsSource = Global.TuicCongestionControls;
+                cmbCongestionControl8.ItemsSource = Global.TuicCongestionControls;
                 break;
 
             case EConfigType.WireGuard:
@@ -89,10 +89,28 @@ public partial class AddServerWindow
 
             case EConfigType.Anytls:
                 gridAnytls.Visibility = Visibility.Visible;
+                sepa2.Visibility = Visibility.Collapsed;
+                gridTransport.Visibility = Visibility.Collapsed;
                 cmbCoreType.IsEnabled = false;
                 lstStreamSecurity.Add(Global.StreamSecurityReality);
                 gridFinalmask.Visibility = Visibility.Collapsed;
                 break;
+
+            case EConfigType.Naive:
+                gridNaive.Visibility = Visibility.Visible;
+                sepa2.Visibility = Visibility.Collapsed;
+                gridTransport.Visibility = Visibility.Collapsed;
+                cmbCoreType.IsEnabled = false;
+                gridFinalmask.Visibility = Visibility.Collapsed;
+                cmbFingerprint.IsEnabled = false;
+                cmbFingerprint.Text = string.Empty;
+                cmbAlpn.IsEnabled = false;
+                cmbAlpn.Text = string.Empty;
+                cmbAllowInsecure.IsEnabled = false;
+                cmbAllowInsecure.Text = string.Empty;
+
+                cmbCongestionControl12.ItemsSource = Global.NaiveCongestionControls;
+                break;
         }
         cmbStreamSecurity.ItemsSource = lstStreamSecurity;
 
@@ -117,6 +135,7 @@ public partial class AddServerWindow
                 case EConfigType.Shadowsocks:
                     this.Bind(ViewModel, vm => vm.SelectedSource.Password, v => v.txtId3.Text).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SsMethod, v => v.cmbSecurity3.Text).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.Uot, v => v.togUotEnabled3.IsChecked).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SelectedSource.MuxEnabled, v => v.togmuxEnabled3.IsChecked).DisposeWith(disposables);
                     break;
 
@@ -151,7 +170,7 @@ public partial class AddServerWindow
                 case EConfigType.TUIC:
                     this.Bind(ViewModel, vm => vm.SelectedSource.Username, v => v.txtId8.Text).DisposeWith(disposables);
                     this.Bind(ViewModel, vm => vm.SelectedSource.Password, v => v.txtSecurity8.Text).DisposeWith(disposables);
-                    this.Bind(ViewModel, vm => vm.SelectedSource.HeaderType, v => v.cmbHeaderType8.Text).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.CongestionControl, v => v.cmbCongestionControl8.Text).DisposeWith(disposables);
                     break;
 
                 case EConfigType.WireGuard:
@@ -163,7 +182,16 @@ public partial class AddServerWindow
                     break;
 
                 case EConfigType.Anytls:
-                    this.Bind(ViewModel, vm => vm.SelectedSource.Password, v => v.txtId10.Text).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.SelectedSource.Password, v => v.txtId11.Text).DisposeWith(disposables);
+                    break;
+
+                case EConfigType.Naive:
+                    this.Bind(ViewModel, vm => vm.SelectedSource.Username, v => v.txtId12.Text).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.SelectedSource.Password, v => v.txtSecurity12.Text).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.NaiveQuic, v => v.togNaiveQuic12.IsChecked).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.CongestionControl, v => v.cmbCongestionControl12.Text).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.InsecureConcurrency, v => v.txtInsecureConcurrency12.Text).DisposeWith(disposables);
+                    this.Bind(ViewModel, vm => vm.Uot, v => v.togUotEnabled12.IsChecked).DisposeWith(disposables);
                     break;
             }
             this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.Text).DisposeWith(disposables);

v2rayN/v2rayN/Views/ClashConnectionsView.xaml

@@ -2,6 +2,7 @@
     x:Class="v2rayN.Views.ClashConnectionsView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -78,25 +79,30 @@
                 </ContextMenu>
             </DataGrid.ContextMenu>
             <DataGrid.Columns>
-                <DataGridTextColumn
+                <base:MyDGTextColumn
                     Width="300"
                     Binding="{Binding Host}"
+                    ExName="Host"
                     Header="{x:Static resx:ResUI.TbSortingHost}" />
-                <DataGridTextColumn
+                <base:MyDGTextColumn
                     Width="500"
                     Binding="{Binding Chain}"
+                    ExName="Chain"
                     Header="{x:Static resx:ResUI.TbSortingChain}" />
-                <DataGridTextColumn
+                <base:MyDGTextColumn
                     Width="80"
                     Binding="{Binding Network}"
+                    ExName="Network"
                     Header="{x:Static resx:ResUI.TbSortingNetwork}" />
-                <DataGridTextColumn
+                <base:MyDGTextColumn
                     Width="160"
                     Binding="{Binding Type}"
+                    ExName="Type"
                     Header="{x:Static resx:ResUI.TbSortingType}" />
-                <DataGridTextColumn
+                <base:MyDGTextColumn
                     Width="100"
                     Binding="{Binding Elapsed}"
+                    ExName="Elapsed"
                     Header="{x:Static resx:ResUI.TbSortingTime}" />
             </DataGrid.Columns>
         </DataGrid>

v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs

@@ -1,4 +1,5 @@
 using System.Windows.Controls;
+using v2rayN.Base;
 
 namespace v2rayN.Views;
 
@@ -7,9 +8,14 @@ namespace v2rayN.Views;
 /// </summary>
 public partial class ClashConnectionsView
 {
+    private static Config _config;
+    private static readonly string _tag = "ClashConnectionsView";
+
     public ClashConnectionsView()
     {
         InitializeComponent();
+        _config = AppManager.Instance.Config;
+
         ViewModel = new ClashConnectionsViewModel(UpdateViewHandler);
         btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
 
@@ -24,7 +30,15 @@ public partial class ClashConnectionsView
             this.Bind(ViewModel, vm => vm.HostFilter, v => v.txtHostFilter.Text).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.ConnectionCloseAllCmd, v => v.btnConnectionCloseAll).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoRefresh, v => v.togAutoRefresh.IsChecked).DisposeWith(disposables);
+
+            AppEvents.AppExitRequested
+                .AsObservable()
+                .ObserveOn(RxSchedulers.MainThreadScheduler)
+                .Subscribe(_ => StorageUI())
+                .DisposeWith(disposables);
         });
+
+        RestoreUI();
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@@ -48,7 +62,7 @@ public partial class ClashConnectionsView
         }
         catch (Exception ex)
         {
-            Logging.SaveLog("ClashConnectionsView", ex);
+            Logging.SaveLog(_tag, ex);
         }
     }
 
@@ -56,4 +70,71 @@ public partial class ClashConnectionsView
     {
         ViewModel?.ClashConnectionClose(false);
     }
+
+    #region UI
+
+    private void RestoreUI()
+    {
+        try
+        {
+            var lvColumnItem = _config.ClashUIItem?.ConnectionsColumnItem?.OrderBy(t => t.Index).ToList();
+            if (lvColumnItem == null)
+            {
+                return;
+            }
+
+            var displayIndex = 0;
+            foreach (var item in lvColumnItem)
+            {
+                foreach (var col in lstConnections.Columns.Cast<MyDGTextColumn>())
+                {
+                    if (col.ExName == item.Name)
+                    {
+                        if (item.Width > 0)
+                        {
+                            col.Width = item.Width;
+                        }
+
+                        col.DisplayIndex = displayIndex++;
+                        break;
+                    }
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private void StorageUI()
+    {
+        try
+        {
+            List<ColumnItem> lvColumnItem = new();
+            foreach (var col in lstConnections.Columns.Cast<MyDGTextColumn>())
+            {
+                var name = col.ExName;
+                if (string.IsNullOrWhiteSpace(name))
+                {
+                    continue;
+                }
+
+                lvColumnItem.Add(new()
+                {
+                    Name = name,
+                    Width = (int)col.ActualWidth,
+                    Index = col.DisplayIndex
+                });
+            }
+
+            _config.ClashUIItem.ConnectionsColumnItem = lvColumnItem;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    #endregion UI
 }

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -124,6 +124,10 @@
                                     x:Name="menuAddAnytlsServer"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuAddAnytlsServer}" />
+                                <MenuItem
+                                    x:Name="menuAddNaiveServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuAddNaiveServer}" />
                             </MenuItem>
                         </Menu>
                         <Separator />

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -71,6 +71,7 @@ public partial class MainWindow
             this.BindCommand(ViewModel, vm => vm.AddTuicServerCmd, v => v.menuAddTuicServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddWireguardServerCmd, v => v.menuAddWireguardServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddAnytlsServerCmd, v => v.menuAddAnytlsServer).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.AddNaiveServerCmd, v => v.menuAddNaiveServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddCustomServerCmd, v => v.menuAddCustomServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddPolicyGroupServerCmd, v => v.menuAddPolicyGroupServer).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.AddProxyChainServerCmd, v => v.menuAddProxyChainServer).DisposeWith(disposables);
@@ -127,25 +128,25 @@ public partial class MainWindow
 
             AppEvents.SendSnackMsgRequested
               .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
               .Subscribe(async content => await DelegateSnackMsg(content))
               .DisposeWith(disposables);
 
             AppEvents.AppExitRequested
               .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
 
             AppEvents.ShutdownRequested
              .AsObservable()
-             .ObserveOn(RxApp.MainThreadScheduler)
+             .ObserveOn(RxSchedulers.MainThreadScheduler)
              .Subscribe(content => Shutdown(content))
              .DisposeWith(disposables);
 
             AppEvents.ShowHideWindowRequested
              .AsObservable()
-             .ObserveOn(RxApp.MainThreadScheduler)
+             .ObserveOn(RxSchedulers.MainThreadScheduler)
              .Subscribe(blShow => ShowHideWindow(blShow))
              .DisposeWith(disposables);
         });

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -630,20 +630,6 @@
                             Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
-                        <TextBlock
-                            Grid.Row="6"
-                            Grid.Column="0"
-                            Margin="{StaticResource Margin8}"
-                            VerticalAlignment="Center"
-                            Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSettingsEnableUpdateSubOnlyRemarksExist}" />
-                        <ToggleButton
-                            x:Name="togEnableUpdateSubOnlyRemarksExist"
-                            Grid.Row="6"
-                            Grid.Column="1"
-                            Margin="{StaticResource Margin8}"
-                            HorizontalAlignment="Left" />
-
                         <TextBlock
                             Grid.Row="8"
                             Grid.Column="0"
@@ -1023,6 +1009,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -1090,6 +1077,22 @@
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefComboBox}" />
 
+                    <TextBlock
+                        Grid.Row="6"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin8}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbIcmpRoutingPolicy}" />
+                    <ComboBox
+                        x:Name="cmbIcmpRoutingPolicy"
+                        Grid.Row="6"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="{StaticResource Margin8}"
+                        HorizontalAlignment="Left"
+                        Style="{StaticResource DefComboBox}" />
+
                     <TextBlock
                         Grid.Row="7"
                         Grid.Column="0"
@@ -1103,6 +1106,20 @@
                         Grid.Column="1"
                         Margin="{StaticResource Margin8}"
                         HorizontalAlignment="Left" />
+
+                    <TextBlock
+                        Grid.Row="8"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin8}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbLegacyProtect}" />
+                    <ToggleButton
+                        x:Name="togEnableLegacyProtect"
+                        Grid.Row="8"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin8}"
+                        HorizontalAlignment="Left" />
                 </Grid>
             </TabItem>
 

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -31,6 +31,7 @@ public partial class OptionSettingWindow
         cmbmux4SboxProtocol.ItemsSource = Global.SingboxMuxs;
         cmbMtu.ItemsSource = Global.TunMtus;
         cmbStack.ItemsSource = Global.TunStacks;
+        cmbIcmpRoutingPolicy.ItemsSource = Global.TunIcmpRoutingPolicies;
 
         cmbCoreType1.ItemsSource = Global.CoreTypes;
         cmbCoreType2.ItemsSource = Global.CoreTypes;
@@ -91,7 +92,6 @@ public partial class OptionSettingWindow
             this.Bind(ViewModel, vm => vm.DisplayRealTimeSpeed, v => v.togDisplayRealTimeSpeed.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.EnableUpdateSubOnlyRemarksExist, v => v.togEnableUpdateSubOnlyRemarksExist.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoHideStartup, v => v.togAutoHideStartup.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.EnableDragDropSort, v => v.togEnableDragDropSort.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.DoubleClick2Activate, v => v.togDoubleClick2Activate.IsChecked).DisposeWith(disposables);
@@ -120,6 +120,8 @@ public partial class OptionSettingWindow
             this.Bind(ViewModel, vm => vm.TunStack, v => v.cmbStack.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunMtu, v => v.cmbMtu.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunEnableIPv6Address, v => v.togEnableIPv6Address.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.TunIcmpRouting, v => v.cmbIcmpRoutingPolicy.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.TunEnableLegacyProtect, v => v.togEnableLegacyProtect.IsChecked).DisposeWith(disposables);
 
             this.Bind(ViewModel, vm => vm.CoreType1, v => v.cmbCoreType1.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CoreType2, v => v.cmbCoreType2.Text).DisposeWith(disposables);

v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs

@@ -97,8 +97,7 @@ public partial class ProfilesSelectWindow
 
     private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
     {
-        var colHeader = sender as DataGridColumnHeader;
+        if (sender is not DataGridColumnHeader colHeader || colHeader.TabIndex < 0 || colHeader.Column == null)
-        if (colHeader == null || colHeader.TabIndex < 0 || colHeader.Column == null)
         {
             return;
         }

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -10,6 +10,7 @@ namespace v2rayN.Views;
 public partial class ProfilesView
 {
     private static Config _config;
+    private static readonly string _tag = "ProfilesView";
 
     public ProfilesView()
     {
@@ -83,13 +84,13 @@ public partial class ProfilesView
 
             AppEvents.AppExitRequested
               .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
 
             AppEvents.AdjustMainLvColWidthRequested
                 .AsObservable()
-                .ObserveOn(RxApp.MainThreadScheduler)
+                .ObserveOn(RxSchedulers.MainThreadScheduler)
                 .Subscribe(_ => AutofitColumnWidth())
                 .DisposeWith(disposables);
         });
@@ -232,8 +233,7 @@ public partial class ProfilesView
 
     private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
     {
-        var colHeader = sender as DataGridColumnHeader;
+        if (sender is not DataGridColumnHeader colHeader || colHeader.TabIndex < 0 || colHeader.Column == null)
-        if (colHeader == null || colHeader.TabIndex < 0 || colHeader.Column == null)
         {
             return;
         }
@@ -339,7 +339,7 @@ public partial class ProfilesView
         }
         catch (Exception ex)
         {
-            Logging.SaveLog("ProfilesView", ex);
+            Logging.SaveLog(_tag, ex);
         }
     }
 
@@ -357,46 +357,59 @@ public partial class ProfilesView
 
     private void RestoreUI()
     {
-        var lvColumnItem = _config.UiItem.MainColumnItem.OrderBy(t => t.Index).ToList();
+        try
-        var displayIndex = 0;
-        foreach (var item in lvColumnItem)
         {
-            foreach (MyDGTextColumn item2 in lstProfiles.Columns)
+            var lvColumnItem = _config.UiItem.MainColumnItem.OrderBy(t => t.Index).ToList();
+            var displayIndex = 0;
+            foreach (var item in lvColumnItem)
             {
-                if (item2.ExName == item.Name)
+                foreach (var item2 in lstProfiles.Columns.Cast<MyDGTextColumn>())
                 {
-                    if (item.Width < 0)
+                    if (item2.ExName == item.Name)
                     {
-                        item2.Visibility = Visibility.Hidden;
+                        if (item.Width < 0)
-                    }
+                        {
-                    else
+                            item2.Visibility = Visibility.Hidden;
-                    {
+                        }
-                        item2.Width = item.Width;
+                        else
-                        item2.DisplayIndex = displayIndex++;
+                        {
-                    }
+                            item2.Width = item.Width;
-                    if (item.Name.ToLower().StartsWith("to"))
+                            item2.DisplayIndex = displayIndex++;
-                    {
+                        }
-                        item2.Visibility = _config.GuiItem.EnableStatistics ? Visibility.Visible : Visibility.Hidden;
+                        if (item.Name.ToLower().StartsWith("to"))
+                        {
+                            item2.Visibility = _config.GuiItem.EnableStatistics ? Visibility.Visible : Visibility.Hidden;
+                        }
                     }
                 }
             }
         }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
     }
 
     private void StorageUI()
     {
-        List<ColumnItem> lvColumnItem = new();
+        try
-        foreach (var t in lstProfiles.Columns)
         {
-            var item2 = (MyDGTextColumn)t;
+            List<ColumnItem> lvColumnItem = new();
-            lvColumnItem.Add(new()
+            foreach (var item2 in lstProfiles.Columns.Cast<MyDGTextColumn>())
             {
-                Name = item2.ExName,
+                lvColumnItem.Add(new()
-                Width = (int)(item2.Visibility == Visibility.Visible ? item2.ActualWidth : -1),
+                {
-                Index = item2.DisplayIndex
+                    Name = item2.ExName,
-            });
+                    Width = (int)(item2.Visibility == Visibility.Visible ? item2.ActualWidth : -1),
+                    Index = item2.DisplayIndex
+                });
+            }
+            _config.UiItem.MainColumnItem = lvColumnItem;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
         }
-        _config.UiItem.MainColumnItem = lvColumnItem;
     }
 
     #endregion UI
@@ -405,7 +418,7 @@ public partial class ProfilesView
 
     private Point startPoint = new();
     private int startIndex = -1;
-    private string formatData = "ProfileItemModel";
+    private readonly string formatData = "ProfileItemModel";
 
     /// <summary>
     /// Helper to search up the VisualTree

v2rayN/v2rayN/v2rayN.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net8.0-windows10.0.17763</TargetFramework>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
 		<UseWPF>true</UseWPF>
 		<ApplicationIcon>Resources\v2rayN.ico</ApplicationIcon>