.github/workflows/build-linux.yml

@@ -50,7 +50,7 @@ jobs:
         dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r linux-arm64 -p:SelfContained=true -p:PublishTrimmed=true -o "$OutputPathArm64"
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v7.0.0
+      uses: actions/upload-artifact@v6.0.0
       with:
         name: v2rayN-linux
         path: |
@@ -169,7 +169,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Restore build artifacts
-      uses: actions/download-artifact@v8
+      uses: actions/download-artifact@v7
       with:
         name: v2rayN-linux
         path: ${{ github.workspace }}/v2rayN/Release
@@ -190,7 +190,7 @@ jobs:
         ls -R "$GITHUB_WORKSPACE/dist/rpm" || true
 
     - name: Upload RPM artifacts
-      uses: actions/upload-artifact@v7.0.0
+      uses: actions/upload-artifact@v6.0.0
       with:
         name: v2rayN-rpm
         path: dist/rpm/**/*.rpm

.github/workflows/build-osx.yml

@@ -45,7 +45,7 @@ jobs:
         dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r osx-arm64 -p:SelfContained=true -p:PublishTrimmed=true -o $OutputPathArm64
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v7.0.0
+      uses: actions/upload-artifact@v6.0.0
       with:
         name: v2rayN-macos
         path: |

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

@@ -45,7 +45,7 @@ jobs:
         dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r win-arm64 -p:SelfContained=true -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPathArm64
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v7.0.0
+      uses: actions/upload-artifact@v6.0.0
       with:
         name: v2rayN-windows-desktop
         path: |

.github/workflows/build-windows.yml

@@ -42,7 +42,7 @@ jobs:
         dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 -p:SelfContained=true -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPathArm64
   
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v7.0.0
+      uses: actions/upload-artifact@v6.0.0
       with:
         name: v2rayN-windows
         path: |

package-debian.sh

@@ -32,8 +32,9 @@ Depends: libc6 (>= 2.34), fontconfig (>= 2.13.1), desktop-file-utils (>= 0.26),
 Description: A GUI client for Windows and Linux, support Xray core and sing-box-core and others
 EOF
 
-mkdir -p "${PackagePath}/usr/share/applications"
-cat >"${PackagePath}/usr/share/applications/v2rayN.desktop" <<-EOF
+cat >"${PackagePath}/DEBIAN/postinst" <<-EOF
+if [ ! -s /usr/share/applications/v2rayN.desktop ]; then
+    cat >/usr/share/applications/v2rayN.desktop<<-END
 [Desktop Entry]
 Name=v2rayN
 Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
@@ -42,12 +43,10 @@ Icon=/opt/v2rayN/v2rayN.png
 Terminal=false
 Type=Application
 Categories=Network;Application;
-EOF
+END
+fi
 
-cat >"${PackagePath}/DEBIAN/postinst" <<-'EOF'
-set -e
-update-desktop-database || true
-exit 0
+update-desktop-database
 EOF
 
 sudo chmod 0755 "${PackagePath}/DEBIAN/postinst"

package-rhel.sh

@@ -1,36 +1,45 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Require Red Hat base branch
+# ====== Require Red Hat Enterprise Linux/FedoraLinux/RockyLinux/AlmaLinux/CentOS ======
+if [[ -r /etc/os-release ]]; then
   . /etc/os-release
-
-case "${ID:-}" in
+  case "$ID" in
     rhel|rocky|almalinux|fedora|centos)
-    echo "Detected supported system: ${NAME:-$ID} ${VERSION_ID:-}"
+      echo "[OK] Detected supported system: $NAME $VERSION_ID"
       ;;
     *)
-    echo "Unsupported system: ${NAME:-unknown} (${ID:-unknown})."
-    echo "This script only supports: RHEL / Rocky / AlmaLinux / Fedora / CentOS."
+      echo "[ERROR] Unsupported system: $NAME ($ID)."
+      echo "This script only supports Red Hat Enterprise Linux/RockyLinux/AlmaLinux/CentOS."
       exit 1
       ;;
   esac
-
-# Kernel version
-MIN_KERNEL="6.11"
-CURRENT_KERNEL="$(uname -r)"
-
-lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$CURRENT_KERNEL" | sort -V | head -n1)"
-
-if [[ "$lowest" != "$MIN_KERNEL" ]]; then
-    echo "Kernel $CURRENT_KERNEL is below $MIN_KERNEL"
+else
+  echo "[ERROR] Cannot detect system (missing /etc/os-release)."
   exit 1
 fi
 
-echo "[OK] Kernel $CURRENT_KERNEL verified."
+# ======================== Kernel version check (require >= 6.11) =======================
+MIN_KERNEL_MAJOR=6
+MIN_KERNEL_MINOR=11
+KERNEL_FULL=$(uname -r)
+KERNEL_MAJOR=$(echo "$KERNEL_FULL" | cut -d. -f1)
+KERNEL_MINOR=$(echo "$KERNEL_FULL" | cut -d. -f2)
 
-# Config & Parse arguments
+echo "[INFO] Detected kernel version: $KERNEL_FULL"
+
+if (( KERNEL_MAJOR < MIN_KERNEL_MAJOR )) || { (( KERNEL_MAJOR == MIN_KERNEL_MAJOR )) && (( KERNEL_MINOR < MIN_KERNEL_MINOR )); }; then
+  echo "[ERROR] Kernel $KERNEL_FULL is too old. Requires Linux >= ${MIN_KERNEL_MAJOR}.${MIN_KERNEL_MINOR}."
+  echo "Please upgrade your system or use a newer container (e.g. Fedora 42+, RHEL 10+)."
+  exit 1
+fi
+
+echo "[OK] Kernel version >= ${MIN_KERNEL_MAJOR}.${MIN_KERNEL_MINOR}."
+
+# ===== Config & Parse arguments =========================================================
 VERSION_ARG="${1:-}"     # Pass version number like 7.13.8, or leave empty
 WITH_CORE="both"         # Default: bundle both xray+sing-box
+AUTOSTART=0              # 1 = enable system-wide autostart (/etc/xdg/autostart)
 FORCE_NETCORE=0          # --netcore => skip archive bundle, use separate downloads
 ARCH_OVERRIDE=""         # --arch x64|arm64|all (optional compile target)
 BUILD_FROM=""            # --buildfrom 1|2|3 to select channel non-interactively
@@ -46,6 +55,7 @@ if [[ -n "${VERSION_ARG:-}" ]]; then shift || true; fi
 while [[ $# -gt 0 ]]; do
   case "$1" in
     --with-core)     WITH_CORE="${2:-both}"; shift 2;;
+    --autostart)     AUTOSTART=1; shift;;
     --xray-ver)      XRAY_VER="${2:-}"; shift 2;;
     --singbox-ver)   SING_VER="${2:-}"; shift 2;;
     --netcore)       FORCE_NETCORE=1; shift;;
@@ -59,27 +69,39 @@ 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 "[ERROR] You cannot specify both an explicit version and --buildfrom at the same time."
   echo "        Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
   exit 1
 fi
 
-# Check and install dependencies
+# ===== Environment check + Dependencies ========================================
 host_arch="$(uname -m)"
 [[ "$host_arch" == "aarch64" || "$host_arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
 
 install_ok=0
-
+case "$ID" in
+  rhel|rocky|almalinux|centos)
     if command -v dnf >/dev/null 2>&1; then
-  sudo dnf -y install rpm-build rpmdevtools curl unzip tar jq rsync dotnet-sdk-8.0 \
-    && install_ok=1
+      sudo dnf -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync || \
+      sudo dnf -y install dotnet-sdk rpm-build rpmdevtools curl unzip tar rsync
+      install_ok=1
+    elif command -v yum >/dev/null 2>&1; then
+      sudo yum -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync || \
+      sudo yum -y install dotnet-sdk rpm-build rpmdevtools curl unzip tar rsync
+      install_ok=1
     fi
+    ;;
+  *)
+    ;;
+esac
 
 if [[ "$install_ok" -ne 1 ]]; then
-  echo "Could not auto-install dependencies for '$ID'. Make sure these are available:"
-  echo "dotnet-sdk 8.x, curl, unzip, tar, rsync, rpm, rpmdevtools, rpm-build (on Red Hat branch)"
+  echo "[WARN] Could not auto-install dependencies for '$ID'. Make sure these are available:"
+  echo "       dotnet-sdk 8.x, curl, unzip, tar, rsync, rpm, rpmdevtools, rpm-build (on RPM-based distros)"
 fi
 
+command -v curl >/dev/null
+
 # Root directory
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
 cd "$SCRIPT_DIR"
@@ -97,6 +119,9 @@ if [[ ! -f "$PROJECT" ]]; then
 fi
 [[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; }
 
+# Resolve GUI version & auto checkout
+VERSION=""
+
 choose_channel() {
   # If --buildfrom provided, map it directly and skip interaction.
   if [[ -n "${BUILD_FROM:-}" ]]; then
@@ -110,35 +135,60 @@ choose_channel() {
 
   # Print menu to stderr and read from /dev/tty so stdout only carries the token.
   local ch="latest" sel=""
-
   if [[ -t 0 ]]; then
     echo "[?] Choose v2rayN release channel:" >&2
     echo "    1) Latest (stable)  [default]" >&2
     echo "    2) Pre-release (preview)" >&2
     echo "    3) Keep current (do nothing)" >&2
     printf "Enter 1, 2 or 3 [default 1]: " >&2
-
     if read -r sel </dev/tty; then
       case "${sel:-}" in
         2) ch="prerelease" ;;
         3) ch="keep" ;;
+        *) ch="latest" ;;
       esac
+    else
+      ch="latest"
     fi
+  else
+    ch="latest"
   fi
-
   echo "$ch"
 }
 
 get_latest_tag_latest() {
+  # Resolve /releases/latest → tag_name
   curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
-    | jq -re '.tag_name' \
-    | sed 's/^v//'
+    | grep -Eo '"tag_name":\s*"v?[^"]+"' \
+    | head -n1 \
+    | sed -E 's/.*"tag_name":\s*"v?([^"]+)".*/\1/'
 }
 
 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//'
+  # Resolve newest prerelease=true tag; prefer jq, fallback to sed/grep (no awk)
+  local json tag
+  json="$(curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20")" || return 1
+
+  # 1) Use jq if present
+  if command -v jq >/dev/null 2>&1; then
+    tag="$(printf '%s' "$json" \
+      | jq -r '[.[] | select(.prerelease==true)][0].tag_name' 2>/dev/null \
+      | sed 's/^v//')" || true
+  fi
+
+  # 2) Fallback to sed/grep only
+  if [[ -z "${tag:-}" || "${tag:-}" == "null" ]]; then
+    tag="$(printf '%s' "$json" \
+      | tr '\n' ' ' \
+      | sed 's/},[[:space:]]*{/\n/g' \
+      | grep -m1 -E '"prerelease"[[:space:]]*:[[:space:]]*true' \
+      | grep -Eo '"tag_name"[[:space:]]*:[[:space:]]*"v?[^"]+"' \
+      | head -n1 \
+      | sed -E 's/.*"tag_name"[[:space:]]*:[[:space:]]*"v?([^"]+)".*/\1/')" || true
+  fi
+
+  [[ -n "${tag:-}" && "${tag:-}" != "null" ]] || return 1
+  printf '%s\n' "$tag"
 }
 
 git_try_checkout() {
@@ -146,7 +196,11 @@ 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
+    if git rev-parse "refs/tags/v${want}" >/dev/null 2>&1; then
+      ref="v${want}"
+    elif git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then
+      ref="${want}"
+    elif git rev-parse --verify "${want}" >/dev/null 2>&1; then
       ref="${want}"
     fi
     if [[ -n "$ref" ]]; then
@@ -162,56 +216,88 @@ git_try_checkout() {
   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"
+    echo "[*] Trying to switch v2rayN repo to version: ${VERSION_ARG}"
+    if git_try_checkout "${VERSION_ARG#v}"; then
+      VERSION="${VERSION_ARG#v}"
     else
       echo "[WARN] Tag '${VERSION_ARG}' not found."
       ch="$(choose_channel)"
-      apply_channel_or_keep "$ch"
+      if [[ "$ch" == "keep" ]]; then
+        echo "[*] Keep current repository state (no checkout)."
+        if git describe --tags --abbrev=0 >/dev/null 2>&1; then
+          VERSION="$(git describe --tags --abbrev=0)"
+        else
+          VERSION="0.0.0+git"
+        fi
+        VERSION="${VERSION#v}"
+      else
+        echo "[*] Resolving ${ch} tag from GitHub releases..."
+        tag=""
+        if [[ "$ch" == "prerelease" ]]; then
+          tag="$(get_latest_tag_prerelease || true)"
+          if [[ -z "$tag" ]]; then
+            echo "[WARN] Failed to resolve prerelease tag, falling back to latest."
+            tag="$(get_latest_tag_latest || true)"
+          fi
+        else
+          tag="$(get_latest_tag_latest || true)"
+        fi
+        [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; }
+        echo "[*] Latest tag for '${ch}': ${tag}"
+        git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
+        VERSION="${tag#v}"
+      fi
     fi
   else
     ch="$(choose_channel)"
-    apply_channel_or_keep "$ch"
+    if [[ "$ch" == "keep" ]]; then
+      echo "[*] Keep current repository state (no checkout)."
+      if git describe --tags --abbrev=0 >/dev/null 2>&1; then
+        VERSION="$(git describe --tags --abbrev=0)"
+      else
+        VERSION="0.0.0+git"
+      fi
+      VERSION="${VERSION#v}"
+    else
+      echo "[*] Resolving ${ch} tag from GitHub releases..."
+      tag=""
+      if [[ "$ch" == "prerelease" ]]; then
+        tag="$(get_latest_tag_prerelease || true)"
+        if [[ -z "$tag" ]]; then
+          echo "[WARN] Failed to resolve prerelease tag, falling back to latest."
+          tag="$(get_latest_tag_latest || true)"
         fi
       else
-  echo "Current directory is not a git repo; proceeding on current tree."
-  VERSION="${VERSION_ARG:-0.0.0}"
+        tag="$(get_latest_tag_latest || true)"
+      fi
+      [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; }
+      echo "[*] Latest tag for '${ch}': ${tag}"
+      git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
+      VERSION="${tag#v}"
+    fi
+  fi
+else
+  echo "[WARN] Current directory is not a git repo; cannot checkout version. Proceeding on current tree."
+  VERSION="${VERSION_ARG:-}"
+  if [[ -z "$VERSION" ]]; then
+    if git describe --tags --abbrev=0 >/dev/null 2>&1; then
+      VERSION="$(git describe --tags --abbrev=0)"
+    else
+      VERSION="0.0.0+git"
+    fi
   fi
-
   VERSION="${VERSION#v}"
+fi
 echo "[*] GUI version resolved as: ${VERSION}"
 
-# Helpers for core
+# ===== Helpers for core/rules download (use RID_DIR for arch sync) =====================
 download_xray() {
-  # Download Xray core
+  # Download Xray core and install to outdir/xray
   local outdir="$1" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
   mkdir -p "$outdir"
+  if [[ -n "${XRAY_VER:-}" ]]; then ver="${XRAY_VER}"; fi
   if [[ -z "$ver" ]]; then
     ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
         | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
@@ -230,9 +316,10 @@ download_xray() {
 }
 
 download_singbox() {
-  # Download sing-box
+  # Download sing-box core and install to outdir/sing-box
   local outdir="$1" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin
   mkdir -p "$outdir"
+  if [[ -n "${SING_VER:-}" ]]; then ver="${SING_VER}"; fi
   if [[ -z "$ver" ]]; then
     ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
         | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
@@ -252,7 +339,7 @@ download_singbox() {
   install -Dm755 "$bin" "$outdir/sing-box"
 }
 
-# Move geo files to outroot/bin
+# Move geo files to a unified path: outroot/bin
 unify_geo_layout() {
   local outroot="$1"
   mkdir -p "$outroot/bin"
@@ -264,13 +351,18 @@ unify_geo_layout() {
     "geoip.metadb" \
   )
   for n in "${names[@]}"; do
+    # If file exists under bin/xray/, move it up to bin/
     if [[ -f "$outroot/bin/xray/$n" ]]; then
       mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
     fi
+    # If file already in bin/, leave it as-is
+    if [[ -f "$outroot/bin/$n" ]]; then
+      :
+    fi
   done
 }
 
-# Download geo/rule assets
+# Download geo/rule assets; then unify to bin/
 download_geo_assets() {
   local outroot="$1"
   local bin_dir="$outroot/bin"
@@ -304,7 +396,7 @@ download_geo_assets() {
       "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
   done
 
-  # Unify to bin
+  # Unify to bin/
   unify_geo_layout "$outroot"
 }
 
@@ -335,7 +427,7 @@ download_v2rayn_bundle() {
 
   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
+  if [[ -n "${nested_dir:-}" && -d "$nested_dir/bin" ]]; then
     mkdir -p "$outroot/bin"
     rsync -a "$nested_dir/bin/" "$outroot/bin/"
     rm -rf "$nested_dir"
@@ -359,7 +451,7 @@ build_for_arch() {
   case "$short" in
     x64)   rid="linux-x64";   rpm_target="x86_64"; archdir="x86_64" ;;
     arm64) rid="linux-arm64"; rpm_target="aarch64"; archdir="aarch64" ;;
-    *) echo "Unknown arch '$short' (use x64|arm64)"; return 1;;
+    *) echo "[ERROR] Unknown arch '$short' (use x64|arm64)"; return 1;;
   esac
 
   echo "[*] Building for target: $short  (RID=$rid, RPM --target $rpm_target)"
@@ -372,7 +464,8 @@ build_for_arch() {
   dotnet publish "$PROJECT" \
     -c Release -r "$rid" \
     -p:PublishSingleFile=false \
-    -p:SelfContained=true
+    -p:SelfContained=true \
+    -p:IncludeNativeLibrariesForSelfExtract=true
 
   # Per-arch variables (scoped)
   local RID_DIR="$rid"
@@ -409,28 +502,28 @@ build_for_arch() {
   mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
 
   # Bundle / cores per-arch
-  fetch_separate_cores_and_rules() {
-    local outroot="$1"
-
-    if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
-      download_xray "$outroot/bin/xray" || 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)"
-    fi
-    download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
-  }
-
   if [[ "$FORCE_NETCORE" -eq 0 ]]; then
     if download_v2rayn_bundle "$WORKDIR/$PKGROOT"; then
       echo "[*] Using v2rayN bundle archive."
     else
       echo "[*] Bundle failed, fallback to separate core + rules."
-      fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT"
+      if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+        download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
+      fi
+      if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+        download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
+      fi
+      download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
     fi
   else
     echo "[*] --netcore specified: use separate core + rules."
-    fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT"
+    if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+      download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
+    fi
+    if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+      download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
+    fi
+    download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
   fi
 
   # Tarball
@@ -484,6 +577,12 @@ https://github.com/2dust/v2rayN
 install -dm0755 %{buildroot}/opt/v2rayN
 cp -a * %{buildroot}/opt/v2rayN/
 
+install -dm0755 %{buildroot}%{_sysconfdir}/sudoers.d
+cat > %{buildroot}%{_sysconfdir}/sudoers.d/v2rayn-mihomo-deny << 'EOF'
+ALL ALL=(ALL) !/home/*/.local/share/v2rayN/bin/mihomo/mihomo
+EOF
+chmod 0440 %{buildroot}%{_sysconfdir}/sudoers.d/v2rayn-mihomo-deny
+
 # Launcher (prefer native ELF first, then DLL fallback)
 install -dm0755 %{buildroot}%{_bindir}
 cat > %{buildroot}%{_bindir}/v2rayn << 'EOF'
@@ -537,13 +636,47 @@ fi
 /opt/v2rayN
 %{_datadir}/applications/v2rayn.desktop
 %{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
+%config(noreplace) /etc/sudoers.d/v2rayn-mihomo-deny
 SPEC
 
+  # Autostart injection (inside %install) and %files entry
+  if [[ "$AUTOSTART" -eq 1 ]]; then
+    awk '
+      BEGIN{ins=0}
+      /^%post$/ && !ins {
+        print "# --- Autostart (.desktop) ---"
+        print "install -dm0755 %{buildroot}/etc/xdg/autostart"
+        print "cat > %{buildroot}/etc/xdg/autostart/v2rayn.desktop << '\''EOF'\''"
+        print "[Desktop Entry]"
+        print "Type=Application"
+        print "Name=v2rayN (Autostart)"
+        print "Exec=v2rayn"
+        print "X-GNOME-Autostart-enabled=true"
+        print "NoDisplay=false"
+        print "EOF"
+        ins=1
+      }
+      {print}
+    ' "$SPECFILE" > "${SPECFILE}.tmp" && mv "${SPECFILE}.tmp" "$SPECFILE"
+
+    awk '
+      BEGIN{infiles=0; done=0}
+      /^%files$/        {infiles=1}
+      infiles && done==0 && $0 ~ /%{_datadir}\/icons\/hicolor\/256x256\/apps\/v2rayn\.png/ {
+        print
+        print "%config(noreplace) /etc/xdg/autostart/v2rayn.desktop"
+        done=1
+        next
+      }
+      {print}
+    ' "$SPECFILE" > "${SPECFILE}.tmp" && mv "${SPECFILE}.tmp" "$SPECFILE"
+  fi
+
   # Replace placeholders
   sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE"
   sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE"
 
-  # Build RPM for this arch
+  # Build RPM for this arch (force rpm --target to match compile arch)
   rpmbuild -ba "$SPECFILE" --target "$rpm_target"
 
   echo "Build done for $short. RPM at:"
@@ -557,18 +690,33 @@ SPEC
 
 # ===== Arch selection and build orchestration =========================================
 case "${ARCH_OVERRIDE:-}" in
-  all)           targets=(x64 arm64); BUILT_ALL=1 ;;
-  x64|amd64)     targets=(x64) ;;
-  arm64|aarch64) targets=(arm64) ;;
-  "")            targets=($([[ "$host_arch" == "aarch64" ]] && echo arm64 || echo x64)) ;;
-  *)             echo "Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all."; exit 1 ;;
+  "")
+    # No --arch: use host architecture
+    if [[ "$host_arch" == "aarch64" ]]; then
+      build_for_arch arm64
+    else
+      build_for_arch x64
+    fi
+    ;;
+  x64|amd64)
+    build_for_arch x64
+    ;;
+  arm64|aarch64)
+    build_for_arch arm64
+    ;;
+  all)
+    BUILT_ALL=1
+    # Build x64 and arm64 separately; each package contains its own arch-only binaries.
+    build_for_arch x64
+    build_for_arch arm64
+    ;;
+  *)
+    echo "[ERROR] Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all."
+    exit 1
+    ;;
 esac
 
-for arch in "${targets[@]}"; do
-  build_for_arch "$arch"
-done
-
-# Print Both arches information
+# ===== Final summary if building both arches ==========================================
 if [[ "$BUILT_ALL" -eq 1 ]]; then
   echo ""
   echo "================ Build Summary (both architectures) ================"
@@ -577,7 +725,7 @@ if [[ "$BUILT_ALL" -eq 1 ]]; then
       echo "$rp"
     done
   else
-    echo "No RPMs detected in summary (check build logs above)."
+    echo "[WARN] No RPMs detected in summary (check build logs above)."
   fi
-  echo "===================================================================="
+  echo "==================================================================="
 fi

v2rayN/Directory.Packages.props

@@ -11,7 +11,7 @@
     <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.12" />
     <PackageVersion Include="ReactiveUI.Avalonia" Version="11.3.8" />
     <PackageVersion Include="CliWrap" Version="3.10.0" />
-    <PackageVersion Include="Downloader" Version="4.1.1" />
+    <PackageVersion Include="Downloader" Version="4.0.3" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.3.0" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.3.1.1" />

v2rayN/ServiceLib/GlobalUsings.cs

@@ -24,7 +24,6 @@ global using ServiceLib.Common;
 global using ServiceLib.Enums;
 global using ServiceLib.Events;
 global using ServiceLib.Handler;
-global using ServiceLib.Handler.Builder;
 global using ServiceLib.Handler.Fmt;
 global using ServiceLib.Handler.SysProxy;
 global using ServiceLib.Helper;

v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs

@@ -1,331 +0,0 @@
-namespace ServiceLib.Handler.Builder;
-
-public record CoreConfigContextBuilderResult(CoreConfigContext Context, NodeValidatorResult ValidatorResult)
-{
-    public bool Success => ValidatorResult.Success;
-}
-
-public class CoreConfigContextBuilder
-{
-    /// <summary>
-    /// Builds a <see cref="CoreConfigContext"/> for the given node, resolves its proxy map,
-    /// and processes outbound nodes referenced by routing rules.
-    /// </summary>
-    public static async Task<CoreConfigContextBuilderResult> Build(Config config, ProfileItem node)
-    {
-        var runCoreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
-        var coreType = runCoreType == ECoreType.sing_box ? ECoreType.sing_box : ECoreType.Xray;
-        var context = new CoreConfigContext()
-        {
-            Node = node,
-            RunCoreType = runCoreType,
-            AllProxiesMap = [],
-            AppConfig = config,
-            FullConfigTemplate = await AppManager.Instance.GetFullConfigTemplateItem(coreType),
-            IsTunEnabled = config.TunModeItem.EnableTun,
-            SimpleDnsItem = config.SimpleDNSItem,
-            ProtectDomainList = [],
-            TunProtectSsPort = 0,
-            ProxyRelaySsPort = 0,
-            RawDnsItem = await AppManager.Instance.GetDNSItem(coreType),
-            RoutingItem = await ConfigHandler.GetDefaultRouting(config),
-        };
-        var validatorResult = NodeValidatorResult.Empty();
-        var (actNode, nodeValidatorResult) = await ResolveNodeAsync(context, node);
-        if (!nodeValidatorResult.Success)
-        {
-            return new CoreConfigContextBuilderResult(context, nodeValidatorResult);
-        }
-        context = context with { Node = actNode };
-        validatorResult.Warnings.AddRange(nodeValidatorResult.Warnings);
-        if (!(context.RoutingItem?.RuleSet.IsNullOrEmpty() ?? true))
-        {
-            var rules = JsonUtils.Deserialize<List<RulesItem>>(context.RoutingItem?.RuleSet) ?? [];
-            foreach (var ruleItem in rules.Where(ruleItem => ruleItem.Enabled && !Global.OutboundTags.Contains(ruleItem.OutboundTag)))
-            {
-                if (ruleItem.OutboundTag.IsNullOrEmpty())
-                {
-                    validatorResult.Warnings.Add(string.Format(ResUI.MsgRoutingRuleEmptyOutboundTag, ruleItem.Remarks));
-                    ruleItem.OutboundTag = Global.ProxyTag;
-                    continue;
-                }
-                var ruleOutboundNode = await AppManager.Instance.GetProfileItemViaRemarks(ruleItem.OutboundTag);
-                if (ruleOutboundNode == null)
-                {
-                    validatorResult.Warnings.Add(string.Format(ResUI.MsgRoutingRuleOutboundNodeNotFound, ruleItem.Remarks, ruleItem.OutboundTag));
-                    ruleItem.OutboundTag = Global.ProxyTag;
-                    continue;
-                }
-
-                var (actRuleNode, ruleNodeValidatorResult) = await ResolveNodeAsync(context, ruleOutboundNode, false);
-                validatorResult.Warnings.AddRange(ruleNodeValidatorResult.Warnings.Select(w =>
-                    string.Format(ResUI.MsgRoutingRuleOutboundNodeWarning, ruleItem.Remarks, ruleItem.OutboundTag, w)));
-                if (!ruleNodeValidatorResult.Success)
-                {
-                    validatorResult.Warnings.AddRange(ruleNodeValidatorResult.Errors.Select(e =>
-                        string.Format(ResUI.MsgRoutingRuleOutboundNodeError, ruleItem.Remarks, ruleItem.OutboundTag, e)));
-                    ruleItem.OutboundTag = Global.ProxyTag;
-                    continue;
-                }
-
-                context.AllProxiesMap[$"remark:{ruleItem.OutboundTag}"] = actRuleNode;
-            }
-        }
-
-        return new CoreConfigContextBuilderResult(context, validatorResult);
-    }
-
-    /// <summary>
-    /// Resolves a node into the context, optionally wrapping it in a subscription-level proxy chain.
-    /// Returns the effective (possibly replaced) node and the validation result.
-    /// </summary>
-    public static async Task<(ProfileItem, NodeValidatorResult)> ResolveNodeAsync(CoreConfigContext context,
-        ProfileItem node,
-        bool includeSubChain = true)
-    {
-        if (node.IndexId.IsNullOrEmpty())
-        {
-            return (node, NodeValidatorResult.Empty());
-        }
-
-        if (includeSubChain)
-        {
-            var (virtualChainNode, chainValidatorResult) = await BuildSubscriptionChainNodeAsync(node);
-            if (virtualChainNode != null)
-            {
-                context.AllProxiesMap[virtualChainNode.IndexId] = virtualChainNode;
-                var (resolvedNode, resolvedResult) = await ResolveNodeAsync(context, virtualChainNode, false);
-                resolvedResult.Warnings.InsertRange(0, chainValidatorResult.Warnings);
-                return (resolvedNode, resolvedResult);
-            }
-            // Chain not built but warnings may still exist (e.g. missing profiles)
-            if (chainValidatorResult.Warnings.Count > 0)
-            {
-                var fillResult = await RegisterNodeAsync(context, node);
-                fillResult.Warnings.InsertRange(0, chainValidatorResult.Warnings);
-                return (node, fillResult);
-            }
-        }
-
-        var registerResult = await RegisterNodeAsync(context, node);
-        return (node, registerResult);
-    }
-
-    /// <summary>
-    /// If the node's subscription defines prev/next profiles, creates a virtual
-    /// <see cref="EConfigType.ProxyChain"/> node that wraps them together.
-    /// Returns <c>null</c> as the chain item when no chain is needed.
-    /// Any warnings (e.g. missing prev/next profile) are returned in the validator result.
-    /// </summary>
-    private static async Task<(ProfileItem? ChainNode, NodeValidatorResult ValidatorResult)> BuildSubscriptionChainNodeAsync(ProfileItem node)
-    {
-        var result = NodeValidatorResult.Empty();
-
-        if (node.Subid.IsNullOrEmpty())
-        {
-            return (null, result);
-        }
-
-        var subItem = await AppManager.Instance.GetSubItem(node.Subid);
-        if (subItem == null)
-        {
-            return (null, result);
-        }
-
-        ProfileItem? prevNode = null;
-        ProfileItem? nextNode = null;
-
-        if (!subItem.PrevProfile.IsNullOrEmpty())
-        {
-            prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
-            if (prevNode == null)
-            {
-                result.Warnings.Add(string.Format(ResUI.MsgSubscriptionPrevProfileNotFound, subItem.PrevProfile));
-            }
-        }
-        if (!subItem.NextProfile.IsNullOrEmpty())
-        {
-            nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
-            if (nextNode == null)
-            {
-                result.Warnings.Add(string.Format(ResUI.MsgSubscriptionNextProfileNotFound, subItem.NextProfile));
-            }
-        }
-
-        if (prevNode is null && nextNode is null)
-        {
-            return (null, result);
-        }
-
-        // Build new proxy chain node
-        var chainNode = new ProfileItem()
-        {
-            IndexId = $"inner-{Utils.GetGuid(false)}",
-            ConfigType = EConfigType.ProxyChain,
-            CoreType = node.CoreType ?? ECoreType.Xray,
-        };
-        List<string?> childItems = [prevNode?.IndexId, node.IndexId, nextNode?.IndexId];
-        var chainExtraItem = chainNode.GetProtocolExtra() with
-        {
-            GroupType = chainNode.ConfigType.ToString(),
-            ChildItems = string.Join(",", childItems.Where(x => !x.IsNullOrEmpty())),
-        };
-        chainNode.SetProtocolExtra(chainExtraItem);
-        return (chainNode, result);
-    }
-
-    /// <summary>
-    /// Dispatches registration to either <see cref="RegisterGroupNodeAsync"/> or
-    /// <see cref="RegisterSingleNodeAsync"/> based on the node's config type.
-    /// </summary>
-    private static async Task<NodeValidatorResult> RegisterNodeAsync(CoreConfigContext context, ProfileItem node)
-    {
-        if (node.ConfigType.IsGroupType())
-        {
-            return await RegisterGroupNodeAsync(context, node);
-        }
-        else
-        {
-            return RegisterSingleNodeAsync(context, node);
-        }
-    }
-
-    /// <summary>
-    /// Validates a single (non-group) node and, on success, adds it to the proxy map
-    /// and records any domain addresses that should bypass the proxy.
-    /// </summary>
-    private static NodeValidatorResult RegisterSingleNodeAsync(CoreConfigContext context, ProfileItem node)
-    {
-        if (node.ConfigType.IsGroupType())
-        {
-            return NodeValidatorResult.Empty();
-        }
-
-        var nodeValidatorResult = NodeValidator.Validate(node, context.RunCoreType);
-        if (!nodeValidatorResult.Success)
-        {
-            return nodeValidatorResult;
-        }
-
-        context.AllProxiesMap[node.IndexId] = node;
-
-        var address = node.Address;
-        if (Utils.IsDomain(address))
-        {
-            context.ProtectDomainList.Add(address);
-        }
-
-        if (!node.EchConfigList.IsNullOrEmpty())
-        {
-            var echQuerySni = node.Sni;
-            if (node.StreamSecurity == Global.StreamSecurity
-                && node.EchConfigList?.Contains("://") == true)
-            {
-                var idx = node.EchConfigList.IndexOf('+');
-                echQuerySni = idx > 0 ? node.EchConfigList[..idx] : node.Sni;
-            }
-
-            if (Utils.IsDomain(echQuerySni))
-            {
-                context.ProtectDomainList.Add(echQuerySni);
-            }
-        }
-
-        return nodeValidatorResult;
-    }
-
-    /// <summary>
-    /// Entry point for registering a group node. Initialises the visited/ancestor sets
-    /// and delegates to <see cref="TraverseGroupNodeAsync"/>.
-    /// </summary>
-    private static async Task<NodeValidatorResult> RegisterGroupNodeAsync(CoreConfigContext context,
-        ProfileItem node)
-    {
-        if (!node.ConfigType.IsGroupType())
-        {
-            return NodeValidatorResult.Empty();
-        }
-
-        HashSet<string> ancestors = [node.IndexId];
-        HashSet<string> globalVisited = [node.IndexId];
-        return await TraverseGroupNodeAsync(context, node, globalVisited, ancestors);
-    }
-
-    /// <summary>
-    /// Recursively walks the children of a group node, registering valid leaf nodes
-    /// and nested groups. Detects cycles via <paramref name="ancestorsGroup"/> and
-    /// deduplicates shared nodes via <paramref name="globalVisitedGroup"/>.
-    /// </summary>
-    private static async Task<NodeValidatorResult> TraverseGroupNodeAsync(
-        CoreConfigContext context,
-        ProfileItem node,
-        HashSet<string> globalVisitedGroup,
-        HashSet<string> ancestorsGroup)
-    {
-        var (groupChildList, _) = await GroupProfileManager.GetChildProfileItems(node);
-        List<string> childIndexIdList = [];
-        var childNodeValidatorResult = NodeValidatorResult.Empty();
-        foreach (var childNode in groupChildList)
-        {
-            if (ancestorsGroup.Contains(childNode.IndexId))
-            {
-                childNodeValidatorResult.Errors.Add(
-                    string.Format(ResUI.MsgGroupCycleDependency, node.Remarks, childNode.Remarks));
-                continue;
-            }
-
-            if (globalVisitedGroup.Contains(childNode.IndexId))
-            {
-                childIndexIdList.Add(childNode.IndexId);
-                continue;
-            }
-
-            if (!childNode.ConfigType.IsGroupType())
-            {
-                var childNodeResult = RegisterSingleNodeAsync(context, childNode);
-                childNodeValidatorResult.Warnings.AddRange(childNodeResult.Warnings.Select(w =>
-                    string.Format(ResUI.MsgGroupChildNodeWarning, node.Remarks, childNode.Remarks, w)));
-                childNodeValidatorResult.Errors.AddRange(childNodeResult.Errors.Select(e =>
-                    string.Format(ResUI.MsgGroupChildNodeError, node.Remarks, childNode.Remarks, e)));
-                if (!childNodeResult.Success)
-                {
-                    continue;
-                }
-
-                globalVisitedGroup.Add(childNode.IndexId);
-                childIndexIdList.Add(childNode.IndexId);
-                continue;
-            }
-
-            var newAncestorsGroup = new HashSet<string>(ancestorsGroup) { childNode.IndexId };
-            var childGroupResult =
-                await TraverseGroupNodeAsync(context, childNode, globalVisitedGroup, newAncestorsGroup);
-            childNodeValidatorResult.Warnings.AddRange(childGroupResult.Warnings.Select(w =>
-                string.Format(ResUI.MsgGroupChildGroupNodeWarning, node.Remarks, childNode.Remarks, w)));
-            childNodeValidatorResult.Errors.AddRange(childGroupResult.Errors.Select(e =>
-                string.Format(ResUI.MsgGroupChildGroupNodeError, node.Remarks, childNode.Remarks, e)));
-            if (!childGroupResult.Success)
-            {
-                continue;
-            }
-
-            globalVisitedGroup.Add(childNode.IndexId);
-            childIndexIdList.Add(childNode.IndexId);
-        }
-
-        if (childIndexIdList.Count == 0)
-        {
-            childNodeValidatorResult.Errors.Add(string.Format(ResUI.MsgGroupNoValidChildNode, node.Remarks));
-            return childNodeValidatorResult;
-        }
-        else
-        {
-            childNodeValidatorResult.Warnings.AddRange(childNodeValidatorResult.Errors);
-            childNodeValidatorResult.Errors.Clear();
-        }
-
-        node.SetProtocolExtra(node.GetProtocolExtra() with { ChildItems = Utils.List2String(childIndexIdList), });
-        context.AllProxiesMap[node.IndexId] = node;
-        return childNodeValidatorResult;
-    }
-}

v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs

@@ -1,175 +0,0 @@
-namespace ServiceLib.Handler.Builder;
-
-public record NodeValidatorResult(List<string> Errors, List<string> Warnings)
-{
-    public bool Success => Errors.Count == 0;
-
-    public static NodeValidatorResult Empty()
-    {
-        return new NodeValidatorResult([], []);
-    }
-}
-
-public class NodeValidator
-{
-    // Static validator rules
-    private static readonly HashSet<string> SingboxUnsupportedTransports =
-        [nameof(ETransport.kcp), nameof(ETransport.xhttp)];
-
-    private static readonly HashSet<EConfigType> SingboxTransportSupportedProtocols =
-        [EConfigType.VMess, EConfigType.VLESS, EConfigType.Trojan, EConfigType.Shadowsocks];
-
-    private static readonly HashSet<string> SingboxShadowsocksAllowedTransports =
-        [nameof(ETransport.tcp), nameof(ETransport.ws), nameof(ETransport.quic)];
-
-    public static NodeValidatorResult Validate(ProfileItem item, ECoreType coreType)
-    {
-        var v = new ValidationContext();
-        ValidateNodeAndCoreSupport(item, coreType, v);
-        return v.ToResult();
-    }
-
-    private class ValidationContext
-    {
-        public List<string> Errors { get; } = [];
-        public List<string> Warnings { get; } = [];
-
-        public void Error(string message)
-        {
-            Errors.Add(message);
-        }
-
-        public void Warning(string message)
-        {
-            Warnings.Add(message);
-        }
-
-        public void Assert(bool condition, string errorMsg)
-        {
-            if (!condition)
-            {
-                Error(errorMsg);
-            }
-        }
-
-        public NodeValidatorResult ToResult()
-        {
-            return new NodeValidatorResult(Errors, Warnings);
-        }
-    }
-
-    private static void ValidateNodeAndCoreSupport(ProfileItem item, ECoreType coreType, ValidationContext v)
-    {
-        if (item.ConfigType is EConfigType.Custom)
-        {
-            return;
-        }
-
-        if (item.ConfigType.IsGroupType())
-        {
-            // Group logic is handled in ValidateGroupNode
-            return;
-        }
-
-        // Basic Property Validation
-        v.Assert(!item.Address.IsNullOrEmpty(), string.Format(ResUI.MsgInvalidProperty, "Address"));
-        v.Assert(item.Port is > 0 and <= 65535, string.Format(ResUI.MsgInvalidProperty, "Port"));
-
-        // Network & Core Logic
-        var net = item.GetNetwork();
-        if (coreType == ECoreType.sing_box)
-        {
-            var transportError = ValidateSingboxTransport(item.ConfigType, net);
-            if (transportError != null)
-                v.Error(transportError);
-
-            if (!Global.SingboxSupportConfigType.Contains(item.ConfigType))
-            {
-                v.Error(string.Format(ResUI.MsgCoreNotSupportProtocol, nameof(ECoreType.sing_box), item.ConfigType));
-            }
-        }
-        else if (coreType is ECoreType.Xray)
-        {
-            if (!Global.XraySupportConfigType.Contains(item.ConfigType))
-            {
-                v.Error(string.Format(ResUI.MsgCoreNotSupportProtocol, nameof(ECoreType.Xray), item.ConfigType));
-            }
-        }
-
-        // Protocol Specifics
-        var protocolExtra = item.GetProtocolExtra();
-        switch (item.ConfigType)
-        {
-            case EConfigType.VMess:
-                v.Assert(!item.Password.IsNullOrEmpty() && Utils.IsGuidByParse(item.Password),
-                    string.Format(ResUI.MsgInvalidProperty, "Password"));
-                break;
-
-            case EConfigType.VLESS:
-                v.Assert(
-                    !item.Password.IsNullOrEmpty()
-                    && (Utils.IsGuidByParse(item.Password) || item.Password.Length <= 30),
-                    string.Format(ResUI.MsgInvalidProperty, "Password")
-                );
-                v.Assert(Global.Flows.Contains(protocolExtra.Flow ?? string.Empty),
-                    string.Format(ResUI.MsgInvalidProperty, "Flow"));
-                break;
-
-            case EConfigType.Shadowsocks:
-                v.Assert(!item.Password.IsNullOrEmpty(), string.Format(ResUI.MsgInvalidProperty, "Password"));
-                v.Assert(
-                    !string.IsNullOrEmpty(protocolExtra.SsMethod) &&
-                    Global.SsSecuritiesInSingbox.Contains(protocolExtra.SsMethod),
-                    string.Format(ResUI.MsgInvalidProperty, "SsMethod"));
-                break;
-        }
-
-        // TLS & Security
-        if (item.StreamSecurity == Global.StreamSecurity)
-        {
-            if (!item.Cert.IsNullOrEmpty() && CertPemManager.ParsePemChain(item.Cert).Count == 0 &&
-                !item.CertSha.IsNullOrEmpty())
-            {
-                v.Error(string.Format(ResUI.MsgInvalidProperty, "TLS Certificate"));
-            }
-        }
-
-        if (item.StreamSecurity == Global.StreamSecurityReality)
-        {
-            v.Assert(!item.PublicKey.IsNullOrEmpty(), string.Format(ResUI.MsgInvalidProperty, "PublicKey"));
-        }
-
-        if (item.Network == nameof(ETransport.xhttp) && !item.Extra.IsNullOrEmpty())
-        {
-            if (JsonUtils.ParseJson(item.Extra) is null)
-            {
-                v.Error(string.Format(ResUI.MsgInvalidProperty, "XHTTP Extra"));
-            }
-        }
-    }
-
-    private static string? ValidateSingboxTransport(EConfigType configType, string net)
-    {
-        // sing-box does not support xhttp / kcp transports
-        if (SingboxUnsupportedTransports.Contains(net))
-        {
-            return string.Format(ResUI.MsgCoreNotSupportNetwork, nameof(ECoreType.sing_box), net);
-        }
-
-        // sing-box does not support non-tcp transports for protocols other than vmess/trojan/vless/shadowsocks
-        if (!SingboxTransportSupportedProtocols.Contains(configType) && net != nameof(ETransport.tcp))
-        {
-            return string.Format(ResUI.MsgCoreNotSupportProtocolTransport,
-                nameof(ECoreType.sing_box), configType.ToString(), net);
-        }
-
-        // sing-box shadowsocks only supports tcp/ws/quic transports
-        if (configType == EConfigType.Shadowsocks && !SingboxShadowsocksAllowedTransports.Contains(net))
-        {
-            return string.Format(ResUI.MsgCoreNotSupportProtocolTransport,
-                nameof(ECoreType.sing_box), configType.ToString(), net);
-        }
-
-        return null;
-    }
-}

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -93,18 +93,13 @@ public static class CoreConfigHandler
     public static async Task<RetResult> GenerateClientSpeedtestConfig(Config config, string fileName, List<ServerTestItem> selecteds, ECoreType coreType)
     {
         var result = new RetResult();
-        var dummyNode = new ProfileItem
-        {
-            CoreType = coreType
-        };
-        var builderResult = await CoreConfigContextBuilder.Build(config, dummyNode);
-        var context = builderResult.Context;
+        var context = await BuildCoreConfigContext(config, new());
         var ids = selecteds.Where(serverTestItem => !serverTestItem.IndexId.IsNullOrEmpty())
             .Select(serverTestItem => serverTestItem.IndexId);
         var nodes = await AppManager.Instance.GetProfileItemsByIndexIds(ids);
         foreach (var node in nodes)
         {
-            var (actNode, _) = await CoreConfigContextBuilder.ResolveNodeAsync(context, node, true);
+            var actNode = await FillNodeContext(context, node, true);
             if (node.IndexId == actNode.IndexId)
             {
                 continue;
@@ -151,4 +146,128 @@ public static class CoreConfigHandler
         await File.WriteAllTextAsync(fileName, result.Data.ToString());
         return result;
     }
+
+    public static async Task<CoreConfigContext> BuildCoreConfigContext(Config config, ProfileItem node)
+    {
+        var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box ? ECoreType.sing_box : ECoreType.Xray;
+        var context = new CoreConfigContext()
+        {
+            Node = node,
+            AllProxiesMap = [],
+            AppConfig = config,
+            FullConfigTemplate = await AppManager.Instance.GetFullConfigTemplateItem(coreType),
+            IsTunEnabled = config.TunModeItem.EnableTun,
+            SimpleDnsItem = config.SimpleDNSItem,
+            ProtectDomainList = [],
+            TunProtectSsPort = 0,
+            ProxyRelaySsPort = 0,
+            RawDnsItem = await AppManager.Instance.GetDNSItem(coreType),
+            RoutingItem = await ConfigHandler.GetDefaultRouting(config),
+        };
+        context = context with
+        {
+            Node = await FillNodeContext(context, node)
+        };
+        if (!(context.RoutingItem?.RuleSet.IsNullOrEmpty() ?? true))
+        {
+            var rules = JsonUtils.Deserialize<List<RulesItem>>(context.RoutingItem?.RuleSet);
+            foreach (var ruleItem in rules.Where(ruleItem => !Global.OutboundTags.Contains(ruleItem.OutboundTag)))
+            {
+                var ruleOutboundNode = await AppManager.Instance.GetProfileItemViaRemarks(ruleItem.OutboundTag);
+                if (ruleOutboundNode != null)
+                {
+                    var ruleOutboundNodeAct = await FillNodeContext(context, ruleOutboundNode, false);
+                    context.AllProxiesMap[$"remark:{ruleItem.OutboundTag}"] = ruleOutboundNodeAct;
+                }
+            }
+        }
+        return context;
+    }
+
+    private static async Task<ProfileItem> FillNodeContext(CoreConfigContext context, ProfileItem node, bool includeSubChain = true)
+    {
+        if (node.IndexId.IsNullOrEmpty())
+        {
+            return node;
+        }
+        var newItems = new List<ProfileItem> { node };
+        if (node.ConfigType.IsGroupType())
+        {
+            var (groupChildList, _) = await GroupProfileManager.GetChildProfileItems(node);
+            foreach (var childItem in groupChildList.Where(childItem => !context.AllProxiesMap.ContainsKey(childItem.IndexId)))
+            {
+                await FillNodeContext(context, childItem, false);
+            }
+            node.SetProtocolExtra(node.GetProtocolExtra() with
+            {
+                ChildItems = Utils.List2String(groupChildList.Select(n => n.IndexId).ToList()),
+            });
+            newItems.AddRange(groupChildList);
+        }
+        context.AllProxiesMap[node.IndexId] = node;
+
+        foreach (var item in newItems)
+        {
+            var address = item.Address;
+            if (Utils.IsDomain(address))
+            {
+                context.ProtectDomainList.Add(address);
+            }
+
+            if (item.EchConfigList.IsNullOrEmpty())
+            {
+                continue;
+            }
+
+            var echQuerySni = item.Sni;
+            if (item.StreamSecurity == Global.StreamSecurity
+                && item.EchConfigList?.Contains("://") == true)
+            {
+                var idx = item.EchConfigList.IndexOf('+');
+                echQuerySni = idx > 0 ? item.EchConfigList[..idx] : item.Sni;
+            }
+            if (!Utils.IsDomain(echQuerySni))
+            {
+                continue;
+            }
+            context.ProtectDomainList.Add(echQuerySni);
+        }
+
+        if (!includeSubChain || node.Subid.IsNullOrEmpty())
+        {
+            return node;
+        }
+
+        var subItem = await AppManager.Instance.GetSubItem(node.Subid);
+        if (subItem == null)
+        {
+            return node;
+        }
+        var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+        var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
+        if (prevNode is null && nextNode is null)
+        {
+            return node;
+        }
+
+        var prevNodeAct = prevNode is null ? null : await FillNodeContext(context, prevNode, false);
+        var nextNodeAct = nextNode is null ? null : await FillNodeContext(context, nextNode, false);
+
+        // Build new proxy chain node
+        var chainNode = new ProfileItem()
+        {
+            IndexId = $"inner-{Utils.GetGuid(false)}",
+            ConfigType = EConfigType.ProxyChain,
+            CoreType = node.CoreType ?? ECoreType.Xray,
+        };
+        List<string?> childItems = [prevNodeAct?.IndexId, node.IndexId, nextNodeAct?.IndexId];
+        var chainExtraItem = chainNode.GetProtocolExtra() with
+        {
+            GroupType = chainNode.ConfigType.ToString(),
+            ChildItems = string.Join(",", childItems.Where(x => !x.IsNullOrEmpty())),
+        };
+        chainNode.SetProtocolExtra(chainExtraItem);
+        context.AllProxiesMap[chainNode.IndexId] = chainNode;
+        return chainNode;
+    }
 }

v2rayN/ServiceLib/Helper/DownloaderHelper.cs

@@ -24,13 +24,13 @@ public class DownloaderHelper
 
         var downloadOpt = new DownloadConfiguration()
         {
-            BlockTimeout = timeout * 1000,
+            Timeout = timeout * 1000,
             MaxTryAgainOnFailure = 2,
             RequestConfiguration =
                 {
                     Headers = headers,
                     UserAgent = userAgent,
-                    ConnectTimeout = timeout * 1000,
+                    Timeout = timeout * 1000,
                     Proxy = webProxy
                 }
         };
@@ -62,11 +62,11 @@ public class DownloaderHelper
 
         var downloadOpt = new DownloadConfiguration()
         {
-            BlockTimeout = timeout * 1000,
+            Timeout = timeout * 1000,
             MaxTryAgainOnFailure = 2,
             RequestConfiguration =
                 {
-                    ConnectTimeout= timeout * 1000,
+                    Timeout= timeout * 1000,
                     Proxy = webProxy
                 }
         };
@@ -139,11 +139,11 @@ public class DownloaderHelper
 
         var downloadOpt = new DownloadConfiguration()
         {
-            BlockTimeout = timeout * 1000,
+            Timeout = timeout * 1000,
             MaxTryAgainOnFailure = 2,
             RequestConfiguration =
                 {
-                    ConnectTimeout= timeout * 1000,
+                    Timeout= timeout * 1000,
                     Proxy = webProxy
                 }
         };

v2rayN/ServiceLib/Manager/ActionPrecheckManager.cs

@@ -0,0 +1,352 @@
+namespace ServiceLib.Manager;
+
+/// <summary>
+/// Centralized pre-checks before sensitive actions (set active profile, generate config, etc.).
+/// </summary>
+public class ActionPrecheckManager
+{
+    private static readonly Lazy<ActionPrecheckManager> _instance = new();
+    public static ActionPrecheckManager Instance => _instance.Value;
+
+    // sing-box supported transports for different protocol types
+    private static readonly HashSet<string> SingboxUnsupportedTransports = [nameof(ETransport.kcp), nameof(ETransport.xhttp)];
+
+    private static readonly HashSet<EConfigType> SingboxTransportSupportedProtocols =
+        [EConfigType.VMess, EConfigType.VLESS, EConfigType.Trojan, EConfigType.Shadowsocks];
+
+    private static readonly HashSet<string> SingboxShadowsocksAllowedTransports =
+        [nameof(ETransport.tcp), nameof(ETransport.ws), nameof(ETransport.quic)];
+
+    public async Task<List<string>> Check(string? indexId)
+    {
+        if (indexId.IsNullOrEmpty())
+        {
+            return [ResUI.PleaseSelectServer];
+        }
+
+        var item = await AppManager.Instance.GetProfileItem(indexId);
+        if (item is null)
+        {
+            return [ResUI.PleaseSelectServer];
+        }
+
+        return await Check(item);
+    }
+
+    public async Task<List<string>> Check(ProfileItem? item)
+    {
+        if (item is null)
+        {
+            return [ResUI.PleaseSelectServer];
+        }
+
+        var errors = new List<string>();
+
+        errors.AddRange(await ValidateCurrentNodeAndCoreSupport(item));
+        errors.AddRange(await ValidateRelatedNodesExistAndValid(item));
+
+        return errors;
+    }
+
+    private async Task<List<string>> ValidateCurrentNodeAndCoreSupport(ProfileItem item)
+    {
+        if (item.ConfigType == EConfigType.Custom)
+        {
+            return [];
+        }
+
+        var coreType = AppManager.Instance.GetCoreType(item, item.ConfigType);
+        return await ValidateNodeAndCoreSupport(item, coreType);
+    }
+
+    private async Task<List<string>> ValidateNodeAndCoreSupport(ProfileItem item, ECoreType? coreType = null)
+    {
+        var errors = new List<string>();
+
+        coreType ??= AppManager.Instance.GetCoreType(item, item.ConfigType);
+
+        if (item.ConfigType is EConfigType.Custom)
+        {
+            errors.Add(string.Format(ResUI.NotSupportProtocol, item.ConfigType.ToString()));
+            return errors;
+        }
+        else if (item.ConfigType.IsGroupType())
+        {
+            var groupErrors = await ValidateGroupNode(item, coreType);
+            errors.AddRange(groupErrors);
+            return errors;
+        }
+        else if (!item.IsComplex())
+        {
+            var normalErrors = await ValidateNormalNode(item, coreType);
+            errors.AddRange(normalErrors);
+            return errors;
+        }
+
+        return errors;
+    }
+
+    private async Task<List<string>> ValidateNormalNode(ProfileItem item, ECoreType? coreType = null)
+    {
+        var errors = new List<string>();
+
+        if (item.Address.IsNullOrEmpty())
+        {
+            errors.Add(string.Format(ResUI.InvalidProperty, "Address"));
+            return errors;
+        }
+
+        if (item.Port is <= 0 or > 65535)
+        {
+            errors.Add(string.Format(ResUI.InvalidProperty, "Port"));
+            return errors;
+        }
+
+        var net = item.GetNetwork();
+
+        if (coreType == ECoreType.sing_box)
+        {
+            var transportError = ValidateSingboxTransport(item.ConfigType, net);
+            if (transportError != null)
+            {
+                errors.Add(transportError);
+            }
+
+            if (!Global.SingboxSupportConfigType.Contains(item.ConfigType))
+            {
+                errors.Add(string.Format(ResUI.CoreNotSupportProtocol,
+                    nameof(ECoreType.sing_box), item.ConfigType.ToString()));
+            }
+        }
+        else if (coreType is ECoreType.Xray)
+        {
+            // Xray core does not support these protocols
+            if (!Global.XraySupportConfigType.Contains(item.ConfigType))
+            {
+                errors.Add(string.Format(ResUI.CoreNotSupportProtocol,
+                    nameof(ECoreType.Xray), item.ConfigType.ToString()));
+            }
+        }
+
+        var protocolExtra = item.GetProtocolExtra();
+
+        switch (item.ConfigType)
+        {
+            case EConfigType.VMess:
+                if (item.Password.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Password))
+                {
+                    errors.Add(string.Format(ResUI.InvalidProperty, "Password"));
+                }
+
+                break;
+
+            case EConfigType.VLESS:
+                if (item.Password.IsNullOrEmpty() || (!Utils.IsGuidByParse(item.Password) && item.Password.Length > 30))
+                {
+                    errors.Add(string.Format(ResUI.InvalidProperty, "Password"));
+                }
+
+                if (!Global.Flows.Contains(protocolExtra.Flow ?? string.Empty))
+                {
+                    errors.Add(string.Format(ResUI.InvalidProperty, "Flow"));
+                }
+
+                break;
+
+            case EConfigType.Shadowsocks:
+                if (item.Password.IsNullOrEmpty())
+                {
+                    errors.Add(string.Format(ResUI.InvalidProperty, "Password"));
+                }
+
+                if (string.IsNullOrEmpty(protocolExtra.SsMethod) || !Global.SsSecuritiesInSingbox.Contains(protocolExtra.SsMethod))
+                {
+                    errors.Add(string.Format(ResUI.InvalidProperty, "SsMethod"));
+                }
+
+                break;
+        }
+
+        if (item.StreamSecurity == Global.StreamSecurity)
+        {
+            // check certificate validity
+            if (!item.Cert.IsNullOrEmpty()
+                && (CertPemManager.ParsePemChain(item.Cert).Count == 0)
+                && !item.CertSha.IsNullOrEmpty())
+            {
+                errors.Add(string.Format(ResUI.InvalidProperty, "TLS Certificate"));
+            }
+        }
+
+        if (item.StreamSecurity == Global.StreamSecurityReality)
+        {
+            if (item.PublicKey.IsNullOrEmpty())
+            {
+                errors.Add(string.Format(ResUI.InvalidProperty, "PublicKey"));
+            }
+        }
+
+        if (item.Network == nameof(ETransport.xhttp)
+            && !item.Extra.IsNullOrEmpty())
+        {
+            // check xhttp extra json validity
+            var xhttpExtra = JsonUtils.ParseJson(item.Extra);
+            if (xhttpExtra is null)
+            {
+                errors.Add(string.Format(ResUI.InvalidProperty, "XHTTP Extra"));
+            }
+        }
+
+        return errors;
+    }
+
+    private async Task<List<string>> ValidateGroupNode(ProfileItem item, ECoreType? coreType = null)
+    {
+        var errors = new List<string>();
+
+        var hasCycle = await GroupProfileManager.HasCycle(item.IndexId, item.GetProtocolExtra());
+        if (hasCycle)
+        {
+            errors.Add(string.Format(ResUI.GroupSelfReference, item.Remarks));
+            return errors;
+        }
+
+        var (childItems, _) = await GroupProfileManager.GetChildProfileItems(item);
+
+        foreach (var childItem in childItems)
+        {
+            var childErrors = new List<string>();
+
+            if (childItem is null)
+            {
+                childErrors.Add(string.Format(ResUI.NodeTagNotExist, ""));
+                continue;
+            }
+
+            if (childItem.ConfigType is EConfigType.Custom or EConfigType.ProxyChain)
+            {
+                childErrors.Add(string.Format(ResUI.InvalidProperty, childItem.Remarks));
+                continue;
+            }
+
+            childErrors.AddRange(await ValidateNodeAndCoreSupport(childItem, coreType));
+            errors.AddRange(childErrors.Select(s => s.Insert(0, $"{childItem.Remarks}: ")));
+        }
+        return errors;
+    }
+
+    private static string? ValidateSingboxTransport(EConfigType configType, string net)
+    {
+        // sing-box does not support xhttp / kcp transports
+        if (SingboxUnsupportedTransports.Contains(net))
+        {
+            return string.Format(ResUI.CoreNotSupportNetwork, nameof(ECoreType.sing_box), net);
+        }
+
+        // sing-box does not support non-tcp transports for protocols other than vmess/trojan/vless/shadowsocks
+        if (!SingboxTransportSupportedProtocols.Contains(configType) && net != nameof(ETransport.tcp))
+        {
+            return string.Format(ResUI.CoreNotSupportProtocolTransport,
+                nameof(ECoreType.sing_box), configType.ToString(), net);
+        }
+
+        // sing-box shadowsocks only supports tcp/ws/quic transports
+        if (configType == EConfigType.Shadowsocks && !SingboxShadowsocksAllowedTransports.Contains(net))
+        {
+            return string.Format(ResUI.CoreNotSupportProtocolTransport,
+                nameof(ECoreType.sing_box), configType.ToString(), net);
+        }
+
+        return null;
+    }
+
+    private async Task<List<string>> ValidateRelatedNodesExistAndValid(ProfileItem? item)
+    {
+        var errors = new List<string>();
+        errors.AddRange(await ValidateProxyChainedNodeExistAndValid(item));
+        errors.AddRange(await ValidateRoutingNodeExistAndValid(item));
+        return errors;
+    }
+
+    private async Task<List<string>> ValidateProxyChainedNodeExistAndValid(ProfileItem? item)
+    {
+        var errors = new List<string>();
+        if (item is null)
+        {
+            return errors;
+        }
+
+        // prev node and next node
+        var subItem = await AppManager.Instance.GetSubItem(item.Subid);
+        if (subItem is null)
+        {
+            return errors;
+        }
+
+        var prevNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+        var nextNode = await AppManager.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
+        var coreType = AppManager.Instance.GetCoreType(item, item.ConfigType);
+
+        await CollectProxyChainedNodeValidation(prevNode, subItem.PrevProfile, coreType, errors);
+        await CollectProxyChainedNodeValidation(nextNode, subItem.NextProfile, coreType, errors);
+
+        return errors;
+    }
+
+    private async Task CollectProxyChainedNodeValidation(ProfileItem? node, string tag, ECoreType coreType, List<string> errors)
+    {
+        if (node is not null)
+        {
+            var nodeErrors = await ValidateNodeAndCoreSupport(node, coreType);
+            errors.AddRange(nodeErrors.Select(s => ResUI.ProxyChainedPrefix + $"{node.Remarks}: " + s));
+        }
+        else if (tag.IsNotEmpty())
+        {
+            errors.Add(ResUI.ProxyChainedPrefix + string.Format(ResUI.NodeTagNotExist, tag));
+        }
+    }
+
+    private async Task<List<string>> ValidateRoutingNodeExistAndValid(ProfileItem? item)
+    {
+        var errors = new List<string>();
+
+        if (item is null)
+        {
+            return errors;
+        }
+
+        var coreType = AppManager.Instance.GetCoreType(item, item.ConfigType);
+        var routing = await ConfigHandler.GetDefaultRouting(AppManager.Instance.Config);
+        if (routing == null)
+        {
+            return errors;
+        }
+
+        var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet);
+        foreach (var ruleItem in rules ?? [])
+        {
+            if (!ruleItem.Enabled)
+            {
+                continue;
+            }
+
+            var outboundTag = ruleItem.OutboundTag;
+            if (outboundTag.IsNullOrEmpty() || Global.OutboundTags.Contains(outboundTag))
+            {
+                continue;
+            }
+
+            var tagItem = await AppManager.Instance.GetProfileItemViaRemarks(outboundTag);
+            if (tagItem is null)
+            {
+                errors.Add(ResUI.RoutingRuleOutboundPrefix + string.Format(ResUI.NodeTagNotExist, outboundTag));
+                continue;
+            }
+
+            var tagErrors = await ValidateNodeAndCoreSupport(tagItem, coreType);
+            errors.AddRange(tagErrors.Select(s => ResUI.RoutingRuleOutboundPrefix + $"{tagItem.Remarks}: " + s));
+        }
+
+        return errors;
+    }
+}

v2rayN/ServiceLib/Manager/CoreManager.cs

@@ -57,27 +57,26 @@ public class CoreManager
         }
     }
 
-    public async Task LoadCore(CoreConfigContext? context)
+    public async Task LoadCore(ProfileItem? node)
     {
-        if (context == null)
+        if (node == null)
         {
             await UpdateFunc(false, ResUI.CheckServerSettings);
             return;
         }
 
-        var contextMod = context;
-        var node = contextMod.Node;
         var fileName = Utils.GetBinConfigPath(Global.CoreConfigFileName);
-        var preContext = ConfigHandler.GetPreSocksCoreConfigContext(contextMod);
+        var context = await CoreConfigHandler.BuildCoreConfigContext(_config, node);
+        var preContext = ConfigHandler.GetPreSocksCoreConfigContext(context);
         if (preContext is not null)
         {
-            contextMod = contextMod with
+            context = context with
             {
                 TunProtectSsPort = preContext.TunProtectSsPort,
                 ProxyRelaySsPort = preContext.ProxyRelaySsPort,
             };
         }
-        var result = await CoreConfigHandler.GenerateClientConfig(contextMod, fileName);
+        var result = await CoreConfigHandler.GenerateClientConfig(context, fileName);
         if (result.Success != true)
         {
             await UpdateFunc(true, result.Msg);
@@ -96,7 +95,7 @@ public class CoreManager
             await WindowsUtils.RemoveTunDevice();
         }
 
-        await CoreStart(contextMod);
+        await CoreStart(context);
         await CoreStartPreService(preContext);
         if (_processService != null)
         {
@@ -133,7 +132,7 @@ public class CoreManager
 
         var fileName = string.Format(Global.CoreSpeedtestConfigFileName, Utils.GetGuid(false));
         var configPath = Utils.GetBinConfigPath(fileName);
-        var (context, _) = await CoreConfigContextBuilder.Build(_config, node);
+        var context = await CoreConfigHandler.BuildCoreConfigContext(_config, node);
         var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, context, testItem, configPath);
         if (result.Success != true)
         {

v2rayN/ServiceLib/Manager/GroupProfileManager.cs

@@ -143,27 +143,26 @@ public class GroupProfileManager
             .ToList() ?? [];
     }
 
-    public static async Task<Dictionary<string, ProfileItem>> GetAllChildProfileItems(ProfileItem profileItem)
+    public static async Task<List<ProfileItem>> GetAllChildProfileItems(ProfileItem profileItem)
     {
-        var itemMap = new Dictionary<string, ProfileItem>();
+        var allChildItems = new List<ProfileItem>();
         var visited = new HashSet<string>();
 
-        await CollectChildItems(profileItem, itemMap, visited);
+        await CollectChildItems(profileItem, allChildItems, visited);
 
-        return itemMap;
+        return allChildItems;
     }
 
-    private static async Task CollectChildItems(ProfileItem profileItem, Dictionary<string, ProfileItem> itemMap,
-        HashSet<string> visited)
+    private static async Task CollectChildItems(ProfileItem profileItem, List<ProfileItem> allChildItems, HashSet<string> visited)
     {
         var (childItems, _) = await GetChildProfileItems(profileItem);
         foreach (var child in childItems.Where(child => visited.Add(child.IndexId)))
         {
-            itemMap[child.IndexId] = child;
+            allChildItems.Add(child);
 
             if (child.ConfigType.IsGroupType())
             {
-                await CollectChildItems(child, itemMap, visited);
+                await CollectChildItems(child, allChildItems, visited);
             }
         }
     }

v2rayN/ServiceLib/Models/CoreConfigContext.cs

@@ -3,7 +3,6 @@ namespace ServiceLib.Models;
 public record CoreConfigContext
 {
     public required ProfileItem Node { get; init; }
-    public required ECoreType RunCoreType { get; init; }
     public RoutingItem? RoutingItem { get; init; }
     public DNSItem? RawDnsItem { get; init; }
     public SimpleDNSItem SimpleDnsItem { get; init; } = new();

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -132,6 +132,33 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Core &apos;{0}&apos; does not support network type &apos;{1}&apos;. 的本地化字符串。
+        /// </summary>
+        public static string CoreNotSupportNetwork {
+            get {
+                return ResourceManager.GetString("CoreNotSupportNetwork", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Core &apos;{0}&apos; does not support protocol &apos;{1}&apos;. 的本地化字符串。
+        /// </summary>
+        public static string CoreNotSupportProtocol {
+            get {
+                return ResourceManager.GetString("CoreNotSupportProtocol", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Core &apos;{0}&apos; does not support protocol &apos;{1}&apos; when using transport &apos;{2}&apos;. 的本地化字符串。
+        /// </summary>
+        public static string CoreNotSupportProtocolTransport {
+            get {
+                return ResourceManager.GetString("CoreNotSupportProtocolTransport", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Note that custom configuration relies entirely on your own configuration and does not work with all settings. If you want to use the system proxy, please modify the listening port manually. 的本地化字符串。
         /// </summary>
@@ -285,6 +312,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Group &apos;{0}&apos; is empty. Please add at least one node. 的本地化字符串。
+        /// </summary>
+        public static string GroupEmpty {
+            get {
+                return ResourceManager.GetString("GroupEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 {0} Group cannot reference itself or have a circular reference 的本地化字符串。
+        /// </summary>
+        public static string GroupSelfReference {
+            get {
+                return ResourceManager.GetString("GroupSelfReference", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 This is not the correct configuration, please check 的本地化字符串。
         /// </summary>
@@ -312,6 +357,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 The {0} property is invalid, please check. 的本地化字符串。
+        /// </summary>
+        public static string InvalidProperty {
+            get {
+                return ResourceManager.GetString("InvalidProperty", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Invalid address (URL) 的本地化字符串。
         /// </summary>
@@ -1860,33 +1914,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Core &apos;{0}&apos; does not support network type &apos;{1}&apos; 的本地化字符串。
-        /// </summary>
-        public static string MsgCoreNotSupportNetwork {
-            get {
-                return ResourceManager.GetString("MsgCoreNotSupportNetwork", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Core &apos;{0}&apos; does not support protocol &apos;{1}&apos; 的本地化字符串。
-        /// </summary>
-        public static string MsgCoreNotSupportProtocol {
-            get {
-                return ResourceManager.GetString("MsgCoreNotSupportProtocol", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Core &apos;{0}&apos; does not support protocol &apos;{1}&apos; when using transport &apos;{2}&apos; 的本地化字符串。
-        /// </summary>
-        public static string MsgCoreNotSupportProtocolTransport {
-            get {
-                return ResourceManager.GetString("MsgCoreNotSupportProtocolTransport", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Downloaded GeoFile: {0} successfully 的本地化字符串。
         /// </summary>
@@ -1932,60 +1959,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Group {0} child group node {1} error: {2}. Skipping this node. 的本地化字符串。
-        /// </summary>
-        public static string MsgGroupChildGroupNodeError {
-            get {
-                return ResourceManager.GetString("MsgGroupChildGroupNodeError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Group {0} child group node {1} warning: {2} 的本地化字符串。
-        /// </summary>
-        public static string MsgGroupChildGroupNodeWarning {
-            get {
-                return ResourceManager.GetString("MsgGroupChildGroupNodeWarning", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Group {0} child node {1} error: {2}. Skipping this node. 的本地化字符串。
-        /// </summary>
-        public static string MsgGroupChildNodeError {
-            get {
-                return ResourceManager.GetString("MsgGroupChildNodeError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Group {0} child node {1} warning: {2} 的本地化字符串。
-        /// </summary>
-        public static string MsgGroupChildNodeWarning {
-            get {
-                return ResourceManager.GetString("MsgGroupChildNodeWarning", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Group {0} has a cycle dependency on child node {1}. Skipping this node. 的本地化字符串。
-        /// </summary>
-        public static string MsgGroupCycleDependency {
-            get {
-                return ResourceManager.GetString("MsgGroupCycleDependency", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Group {0} has no valid child node. 的本地化字符串。
-        /// </summary>
-        public static string MsgGroupNoValidChildNode {
-            get {
-                return ResourceManager.GetString("MsgGroupNoValidChildNode", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Information 的本地化字符串。
         /// </summary>
@@ -1995,15 +1968,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 The {0} property is invalid, please check 的本地化字符串。
-        /// </summary>
-        public static string MsgInvalidProperty {
-            get {
-                return ResourceManager.GetString("MsgInvalidProperty", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Please enter the URL 的本地化字符串。
         /// </summary>
@@ -2013,15 +1977,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Not support protocol &apos;{0}&apos; 的本地化字符串。
-        /// </summary>
-        public static string MsgNotSupportProtocol {
-            get {
-                return ResourceManager.GetString("MsgNotSupportProtocol", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 No valid subscriptions set 的本地化字符串。
         /// </summary>
@@ -2040,42 +1995,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Routing rule {0} has an empty outbound tag. Fallback to proxy node only. 的本地化字符串。
-        /// </summary>
-        public static string MsgRoutingRuleEmptyOutboundTag {
-            get {
-                return ResourceManager.GetString("MsgRoutingRuleEmptyOutboundTag", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Routing rule {0} outbound node {1} error: {2}. Fallback to proxy node only. 的本地化字符串。
-        /// </summary>
-        public static string MsgRoutingRuleOutboundNodeError {
-            get {
-                return ResourceManager.GetString("MsgRoutingRuleOutboundNodeError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Routing rule {0} outbound node {1} not found. Fallback to proxy node only. 的本地化字符串。
-        /// </summary>
-        public static string MsgRoutingRuleOutboundNodeNotFound {
-            get {
-                return ResourceManager.GetString("MsgRoutingRuleOutboundNodeNotFound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Routing rule {0} outbound node {1} warning: {2} 的本地化字符串。
-        /// </summary>
-        public static string MsgRoutingRuleOutboundNodeWarning {
-            get {
-                return ResourceManager.GetString("MsgRoutingRuleOutboundNodeWarning", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Filter, press Enter to execute 的本地化字符串。
         /// </summary>
@@ -2130,24 +2049,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Subscription next proxy {0} not found. Skipping. 的本地化字符串。
-        /// </summary>
-        public static string MsgSubscriptionNextProfileNotFound {
-            get {
-                return ResourceManager.GetString("MsgSubscriptionNextProfileNotFound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Subscription previous proxy {0} not found. Skipping. 的本地化字符串。
-        /// </summary>
-        public static string MsgSubscriptionPrevProfileNotFound {
-            get {
-                return ResourceManager.GetString("MsgSubscriptionPrevProfileNotFound", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Unpacking... 的本地化字符串。
         /// </summary>
@@ -2202,6 +2103,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Node alias &apos;{0}&apos; does not exist. 的本地化字符串。
+        /// </summary>
+        public static string NodeTagNotExist {
+            get {
+                return ResourceManager.GetString("NodeTagNotExist", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Non-VMess or SS protocol 的本地化字符串。
         /// </summary>
@@ -2229,6 +2139,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Not support protocol &apos;{0}&apos;. 的本地化字符串。
+        /// </summary>
+        public static string NotSupportProtocol {
+            get {
+                return ResourceManager.GetString("NotSupportProtocol", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Scan completed, no valid QR code found 的本地化字符串。
         /// </summary>
@@ -2310,6 +2229,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Policy group:  的本地化字符串。
+        /// </summary>
+        public static string PolicyGroupPrefix {
+            get {
+                return ResourceManager.GetString("PolicyGroupPrefix", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Proxy chained:  的本地化字符串。
+        /// </summary>
+        public static string ProxyChainedPrefix {
+            get {
+                return ResourceManager.GetString("ProxyChainedPrefix", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Global hotkey {0} registration failed, reason: {1} 的本地化字符串。
         /// </summary>
@@ -2373,6 +2310,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Routing rule outbound:  的本地化字符串。
+        /// </summary>
+        public static string RoutingRuleOutboundPrefix {
+            get {
+                return ResourceManager.GetString("RoutingRuleOutboundPrefix", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Run as Admin 的本地化字符串。
         /// </summary>

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

@@ -1539,20 +1539,38 @@
   <data name="menuGenGroupMultipleServerXrayFallback" xml:space="preserve">
     <value>Multi-Configuration Fallback by Xray</value>
   </data>
-  <data name="MsgCoreNotSupportNetwork" xml:space="preserve">
-    <value>Core '{0}' does not support network type '{1}'</value>
+  <data name="CoreNotSupportNetwork" xml:space="preserve">
+    <value>Core '{0}' does not support network type '{1}'.</value>
   </data>
-  <data name="MsgCoreNotSupportProtocolTransport" xml:space="preserve">
-    <value>Core '{0}' does not support protocol '{1}' when using transport '{2}'</value>
+  <data name="CoreNotSupportProtocolTransport" xml:space="preserve">
+    <value>Core '{0}' does not support protocol '{1}' when using transport '{2}'.</value>
   </data>
-  <data name="MsgCoreNotSupportProtocol" xml:space="preserve">
-    <value>Core '{0}' does not support protocol '{1}'</value>
+  <data name="CoreNotSupportProtocol" xml:space="preserve">
+    <value>Core '{0}' does not support protocol '{1}'.</value>
   </data>
-  <data name="MsgInvalidProperty" xml:space="preserve">
-    <value>The {0} property is invalid, please check</value>
+  <data name="ProxyChainedPrefix" xml:space="preserve">
+    <value>Proxy chained: </value>
   </data>
-  <data name="MsgNotSupportProtocol" xml:space="preserve">
-    <value>Not support protocol '{0}'</value>
+  <data name="RoutingRuleOutboundPrefix" xml:space="preserve">
+    <value>Routing rule outbound: </value>
+  </data>
+  <data name="PolicyGroupPrefix" xml:space="preserve">
+    <value>Policy group: </value>
+  </data>
+  <data name="NodeTagNotExist" xml:space="preserve">
+    <value>Node alias '{0}' does not exist.</value>
+  </data>
+  <data name="GroupEmpty" xml:space="preserve">
+    <value>Group '{0}' is empty. Please add at least one node.</value>
+  </data>
+  <data name="InvalidProperty" xml:space="preserve">
+    <value>The {0} property is invalid, please check.</value>
+  </data>
+  <data name="GroupSelfReference" xml:space="preserve">
+    <value>{0} Group cannot reference itself or have a circular reference</value>
+  </data>
+  <data name="NotSupportProtocol" xml:space="preserve">
+    <value>Not support protocol '{0}'.</value>
   </data>
   <data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
     <value>If the system does not have a tray function, please do not enable it</value>
@@ -1650,40 +1668,4 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="TbFinalmask" xml:space="preserve">
     <value>Finalmask</value>
   </data>
-  <data name="MsgRoutingRuleOutboundNodeWarning" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} warning: {2}</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeError" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} error: {2}. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgGroupCycleDependency" xml:space="preserve">
-    <value>Group {0} has a cycle dependency on child node {1}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupChildNodeWarning" xml:space="preserve">
-    <value>Group {0} child node {1} warning: {2}</value>
-  </data>
-  <data name="MsgGroupChildNodeError" xml:space="preserve">
-    <value>Group {0} child node {1} error: {2}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeWarning" xml:space="preserve">
-    <value>Group {0} child group node {1} warning: {2}</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeError" xml:space="preserve">
-    <value>Group {0} child group node {1} error: {2}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupNoValidChildNode" xml:space="preserve">
-    <value>Group {0} has no valid child node.</value>
-  </data>
-  <data name="MsgRoutingRuleEmptyOutboundTag" xml:space="preserve">
-    <value>Routing rule {0} has an empty outbound tag. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeNotFound" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} not found. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgSubscriptionPrevProfileNotFound" xml:space="preserve">
-    <value>Subscription previous proxy {0} not found. Skipping.</value>
-  </data>
-  <data name="MsgSubscriptionNextProfileNotFound" xml:space="preserve">
-    <value>Subscription next proxy {0} not found. Skipping.</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.fr.resx

@@ -1536,20 +1536,38 @@
   <data name="menuGenGroupMultipleServerXrayFallback" xml:space="preserve">
     <value>Xray basculement (multi-sélection)</value>
   </data>
-  <data name="MsgCoreNotSupportNetwork" xml:space="preserve">
-    <value>Le cœur « {0} » ne prend pas en charge le type de réseau « {1} »</value>
+  <data name="CoreNotSupportNetwork" xml:space="preserve">
+    <value>Le cœur « {0} » ne prend pas en charge le type de réseau « {1} ».</value>
   </data>
-  <data name="MsgCoreNotSupportProtocolTransport" xml:space="preserve">
-    <value>Le cœur « {0} » ne prend pas en charge le protocole « {1} » avec le mode de transport « {2} »</value>
+  <data name="CoreNotSupportProtocolTransport" xml:space="preserve">
+    <value>Le cœur « {0} » ne prend pas en charge le protocole « {1} » avec le mode de transport « {2} ».</value>
   </data>
-  <data name="MsgCoreNotSupportProtocol" xml:space="preserve">
-    <value>Le cœur « {0} » ne prend pas en charge le protocole « {1} »</value>
+  <data name="CoreNotSupportProtocol" xml:space="preserve">
+    <value>Le cœur « {0} » ne prend pas en charge le protocole « {1} ».</value>
   </data>
-  <data name="MsgInvalidProperty" xml:space="preserve">
+  <data name="ProxyChainedPrefix" xml:space="preserve">
+    <value>Chaîne de proxy : </value>
+  </data>
+  <data name="RoutingRuleOutboundPrefix" xml:space="preserve">
+    <value>Règle de routage sortante : </value>
+  </data>
+  <data name="PolicyGroupPrefix" xml:space="preserve">
+    <value>Groupe de stratégie : </value>
+  </data>
+  <data name="NodeTagNotExist" xml:space="preserve">
+    <value>L’alias « {0} » n’existe pas.</value>
+  </data>
+  <data name="GroupEmpty" xml:space="preserve">
+    <value>Le groupe « {0} » est vide. Veuillez ajouter au moins une configuration.</value>
+  </data>
+  <data name="InvalidProperty" xml:space="preserve">
     <value>La propriété {0} est invalide, veuillez vérifier</value>
   </data>
-  <data name="MsgNotSupportProtocol" xml:space="preserve">
-    <value>Protocole « {0} » non pris en charge</value>
+  <data name="GroupSelfReference" xml:space="preserve">
+    <value>Le groupe {0} ne peut pas se référencer lui-même ni créer de référence circulaire</value>
+  </data>
+  <data name="NotSupportProtocol" xml:space="preserve">
+    <value>Protocole « {0} » non pris en charge.</value>
   </data>
   <data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
     <value>Si le système n’a pas de zone de notif., n’activez pas cette option</value>
@@ -1615,72 +1633,36 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
     <value>EchForceQuery</value>
   </data>
   <data name="TbFullCertTips" xml:space="preserve">
-    <value>Certificat complet (chaîne), format PEM</value>
+    <value>Full certificate (chain), PEM format</value>
   </data>
   <data name="TbCertSha256Tips" xml:space="preserve">
-    <value>Empreinte du certificat (SHA-256)</value>
+    <value>Certificate fingerprint (SHA-256)</value>
   </data>
   <data name="TbServeStale" xml:space="preserve">
-    <value>Cache optimiste</value>
+    <value>Serve Stale</value>
   </data>
   <data name="TbParallelQuery" xml:space="preserve">
-    <value>Requête parallèle</value>
+    <value>Parallel Query</value>
   </data>
   <data name="TbDomesticDNSTips" xml:space="preserve">
-    <value>Par défaut, utilisé uniquement lors du routage pour la résolution.</value>
+    <value>By default, invoked only during routing for resolution</value>
   </data>
   <data name="TbRemoteDNSTips" xml:space="preserve">
-    <value>Par défaut, invoqué uniquement au routage pour la résolution. Vérifiez que le serveur distant peut joindre ce DNS.</value>
+    <value>By default, invoked only during routing for resolution; ensure the remote server can reach this DNS</value>
   </data>
   <data name="TbDirectResolveStrategyTips" xml:space="preserve">
-    <value>Si non défini ou « AsIs », le DNS système est utilisé ; sinon, le module DNS interne est utilisé.</value>
+    <value>If unset or "AsIs", DNS resolution uses the system DNS; otherwise, the internal DNS module is used.</value>
   </data>
   <data name="TbRemoteResolveStrategyTips" xml:space="preserve">
-    <value>Si non défini ou « AsIs », la résolution DNS est assurée par le serveur distant ; sinon, le module DNS interne est utilisé.</value>
+    <value>If unset or "AsIs", DNS resolution is performed by the remote server's DNS; otherwise, the internal DNS module is used.</value>
   </data>
   <data name="TbHopInt7" xml:space="preserve">
-    <value>Intervalle de saut de port</value>
+    <value>Port hopping interval</value>
   </data>
   <data name="menuServerListPreview" xml:space="preserve">
-    <value>Aperçu des sous-config</value>
+    <value>Configuration item preview</value>
   </data>
   <data name="TbFinalmask" xml:space="preserve">
     <value>Finalmask</value>
   </data>
-  <data name="MsgRoutingRuleOutboundNodeWarning" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} warning: {2}</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeError" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} error: {2}. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgGroupCycleDependency" xml:space="preserve">
-    <value>Group {0} has a cycle dependency on child node {1}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupChildNodeWarning" xml:space="preserve">
-    <value>Group {0} child node {1} warning: {2}</value>
-  </data>
-  <data name="MsgGroupChildNodeError" xml:space="preserve">
-    <value>Group {0} child node {1} error: {2}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeWarning" xml:space="preserve">
-    <value>Group {0} child group node {1} warning: {2}</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeError" xml:space="preserve">
-    <value>Group {0} child group node {1} error: {2}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupNoValidChildNode" xml:space="preserve">
-    <value>Group {0} has no valid child node.</value>
-  </data>
-  <data name="MsgRoutingRuleEmptyOutboundTag" xml:space="preserve">
-    <value>Routing rule {0} has an empty outbound tag. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeNotFound" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} not found. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgSubscriptionPrevProfileNotFound" xml:space="preserve">
-    <value>Subscription previous proxy {0} not found. Skipping.</value>
-  </data>
-  <data name="MsgSubscriptionNextProfileNotFound" xml:space="preserve">
-    <value>Subscription next proxy {0} not found. Skipping.</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1539,20 +1539,38 @@
   <data name="menuGenGroupMultipleServerXrayFallback" xml:space="preserve">
     <value>Multi-Configuration Fallback by Xray</value>
   </data>
-  <data name="MsgCoreNotSupportNetwork" xml:space="preserve">
-    <value>Core '{0}' does not support network type '{1}'</value>
+  <data name="CoreNotSupportNetwork" xml:space="preserve">
+    <value>Core '{0}' does not support network type '{1}'.</value>
   </data>
-  <data name="MsgCoreNotSupportProtocolTransport" xml:space="preserve">
-    <value>Core '{0}' does not support protocol '{1}' when using transport '{2}'</value>
+  <data name="CoreNotSupportProtocolTransport" xml:space="preserve">
+    <value>Core '{0}' does not support protocol '{1}' when using transport '{2}'.</value>
   </data>
-  <data name="MsgCoreNotSupportProtocol" xml:space="preserve">
-    <value>Core '{0}' does not support protocol '{1}'</value>
+  <data name="CoreNotSupportProtocol" xml:space="preserve">
+    <value>Core '{0}' does not support protocol '{1}'.</value>
   </data>
-  <data name="MsgInvalidProperty" xml:space="preserve">
-    <value>The {0} property is invalid, please check</value>
+  <data name="ProxyChainedPrefix" xml:space="preserve">
+    <value>Proxy chained: </value>
   </data>
-  <data name="MsgNotSupportProtocol" xml:space="preserve">
-    <value>Not support protocol '{0}'</value>
+  <data name="RoutingRuleOutboundPrefix" xml:space="preserve">
+    <value>Routing rule outbound: </value>
+  </data>
+  <data name="PolicyGroupPrefix" xml:space="preserve">
+    <value>Policy group: </value>
+  </data>
+  <data name="NodeTagNotExist" xml:space="preserve">
+    <value>Node alias '{0}' does not exist.</value>
+  </data>
+  <data name="GroupEmpty" xml:space="preserve">
+    <value>Group '{0}' is empty. Please add at least one node.</value>
+  </data>
+  <data name="InvalidProperty" xml:space="preserve">
+    <value>The {0} property is invalid, please check.</value>
+  </data>
+  <data name="GroupSelfReference" xml:space="preserve">
+    <value>{0} Group cannot reference itself or have a circular reference</value>
+  </data>
+  <data name="NotSupportProtocol" xml:space="preserve">
+    <value>Not support protocol '{0}'.</value>
   </data>
   <data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
     <value>If the system does not have a tray function, please do not enable it</value>
@@ -1650,40 +1668,4 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="TbFinalmask" xml:space="preserve">
     <value>Finalmask</value>
   </data>
-  <data name="MsgRoutingRuleOutboundNodeWarning" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} warning: {2}</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeError" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} error: {2}. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgGroupCycleDependency" xml:space="preserve">
-    <value>Group {0} has a cycle dependency on child node {1}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupChildNodeWarning" xml:space="preserve">
-    <value>Group {0} child node {1} warning: {2}</value>
-  </data>
-  <data name="MsgGroupChildNodeError" xml:space="preserve">
-    <value>Group {0} child node {1} error: {2}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeWarning" xml:space="preserve">
-    <value>Group {0} child group node {1} warning: {2}</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeError" xml:space="preserve">
-    <value>Group {0} child group node {1} error: {2}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupNoValidChildNode" xml:space="preserve">
-    <value>Group {0} has no valid child node.</value>
-  </data>
-  <data name="MsgRoutingRuleEmptyOutboundTag" xml:space="preserve">
-    <value>Routing rule {0} has an empty outbound tag. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeNotFound" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} not found. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgSubscriptionPrevProfileNotFound" xml:space="preserve">
-    <value>Subscription previous proxy {0} not found. Skipping.</value>
-  </data>
-  <data name="MsgSubscriptionNextProfileNotFound" xml:space="preserve">
-    <value>Subscription next proxy {0} not found. Skipping.</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1539,20 +1539,38 @@
   <data name="menuGenGroupMultipleServerXrayFallback" xml:space="preserve">
     <value>Fallback by Xray</value>
   </data>
-  <data name="MsgCoreNotSupportNetwork" xml:space="preserve">
-    <value>Core '{0}' does not support network type '{1}'</value>
+  <data name="CoreNotSupportNetwork" xml:space="preserve">
+    <value>Core '{0}' does not support network type '{1}'.</value>
   </data>
-  <data name="MsgCoreNotSupportProtocolTransport" xml:space="preserve">
-    <value>Core '{0}' does not support protocol '{1}' when using transport '{2}'</value>
+  <data name="CoreNotSupportProtocolTransport" xml:space="preserve">
+    <value>Core '{0}' does not support protocol '{1}' when using transport '{2}'.</value>
   </data>
-  <data name="MsgCoreNotSupportProtocol" xml:space="preserve">
-    <value>Core '{0}' does not support protocol '{1}'</value>
+  <data name="CoreNotSupportProtocol" xml:space="preserve">
+    <value>Core '{0}' does not support protocol '{1}'.</value>
   </data>
-  <data name="MsgInvalidProperty" xml:space="preserve">
-    <value>The {0} property is invalid, please check</value>
+  <data name="ProxyChainedPrefix" xml:space="preserve">
+    <value>Proxy chained: </value>
   </data>
-  <data name="MsgNotSupportProtocol" xml:space="preserve">
-    <value>Not support protocol '{0}'</value>
+  <data name="RoutingRuleOutboundPrefix" xml:space="preserve">
+    <value>Routing rule outbound: </value>
+  </data>
+  <data name="PolicyGroupPrefix" xml:space="preserve">
+    <value>Policy group: </value>
+  </data>
+  <data name="NodeTagNotExist" xml:space="preserve">
+    <value>Node alias '{0}' does not exist.</value>
+  </data>
+  <data name="GroupEmpty" xml:space="preserve">
+    <value>Group '{0}' is empty. Please add at least one node.</value>
+  </data>
+  <data name="InvalidProperty" xml:space="preserve">
+    <value>The {0} property is invalid, please check.</value>
+  </data>
+  <data name="GroupSelfReference" xml:space="preserve">
+    <value>{0} Group cannot reference itself or have a circular reference</value>
+  </data>
+  <data name="NotSupportProtocol" xml:space="preserve">
+    <value>Not support protocol '{0}'.</value>
   </data>
   <data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
     <value>If the system does not have a tray function, please do not enable it</value>
@@ -1650,40 +1668,4 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="TbFinalmask" xml:space="preserve">
     <value>Finalmask</value>
   </data>
-  <data name="MsgRoutingRuleOutboundNodeWarning" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} warning: {2}</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeError" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} error: {2}. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgGroupCycleDependency" xml:space="preserve">
-    <value>Group {0} has a cycle dependency on child node {1}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupChildNodeWarning" xml:space="preserve">
-    <value>Group {0} child node {1} warning: {2}</value>
-  </data>
-  <data name="MsgGroupChildNodeError" xml:space="preserve">
-    <value>Group {0} child node {1} error: {2}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeWarning" xml:space="preserve">
-    <value>Group {0} child group node {1} warning: {2}</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeError" xml:space="preserve">
-    <value>Group {0} child group node {1} error: {2}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupNoValidChildNode" xml:space="preserve">
-    <value>Group {0} has no valid child node.</value>
-  </data>
-  <data name="MsgRoutingRuleEmptyOutboundTag" xml:space="preserve">
-    <value>Routing rule {0} has an empty outbound tag. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeNotFound" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} not found. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgSubscriptionPrevProfileNotFound" xml:space="preserve">
-    <value>Subscription previous proxy {0} not found. Skipping.</value>
-  </data>
-  <data name="MsgSubscriptionNextProfileNotFound" xml:space="preserve">
-    <value>Subscription next proxy {0} not found. Skipping.</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1539,20 +1539,38 @@
   <data name="menuGenGroupMultipleServerXrayFallback" xml:space="preserve">
     <value>Multi-Configuration Fallback by Xray</value>
   </data>
-  <data name="MsgCoreNotSupportNetwork" xml:space="preserve">
-    <value>Core '{0}' does not support network type '{1}'</value>
+  <data name="CoreNotSupportNetwork" xml:space="preserve">
+    <value>Core '{0}' does not support network type '{1}'.</value>
   </data>
-  <data name="MsgCoreNotSupportProtocolTransport" xml:space="preserve">
-    <value>Core '{0}' does not support protocol '{1}' when using transport '{2}'</value>
+  <data name="CoreNotSupportProtocolTransport" xml:space="preserve">
+    <value>Core '{0}' does not support protocol '{1}' when using transport '{2}'.</value>
   </data>
-  <data name="MsgCoreNotSupportProtocol" xml:space="preserve">
-    <value>Core '{0}' does not support protocol '{1}'</value>
+  <data name="CoreNotSupportProtocol" xml:space="preserve">
+    <value>Core '{0}' does not support protocol '{1}'.</value>
   </data>
-  <data name="MsgInvalidProperty" xml:space="preserve">
-    <value>The {0} property is invalid, please check</value>
+  <data name="ProxyChainedPrefix" xml:space="preserve">
+    <value>Proxy chained: </value>
   </data>
-  <data name="MsgNotSupportProtocol" xml:space="preserve">
-    <value>Not support protocol '{0}'</value>
+  <data name="RoutingRuleOutboundPrefix" xml:space="preserve">
+    <value>Routing rule outbound: </value>
+  </data>
+  <data name="PolicyGroupPrefix" xml:space="preserve">
+    <value>Policy group: </value>
+  </data>
+  <data name="NodeTagNotExist" xml:space="preserve">
+    <value>Node alias '{0}' does not exist.</value>
+  </data>
+  <data name="GroupEmpty" xml:space="preserve">
+    <value>Group '{0}' is empty. Please add at least one node.</value>
+  </data>
+  <data name="InvalidProperty" xml:space="preserve">
+    <value>The {0} property is invalid, please check.</value>
+  </data>
+  <data name="GroupSelfReference" xml:space="preserve">
+    <value>{0} Group cannot reference itself or have a circular reference</value>
+  </data>
+  <data name="NotSupportProtocol" xml:space="preserve">
+    <value>Not support protocol '{0}'.</value>
   </data>
   <data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
     <value>If the system does not have a tray function, please do not enable it</value>
@@ -1650,40 +1668,4 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="TbFinalmask" xml:space="preserve">
     <value>Finalmask</value>
   </data>
-  <data name="MsgRoutingRuleOutboundNodeWarning" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} warning: {2}</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeError" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} error: {2}. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgGroupCycleDependency" xml:space="preserve">
-    <value>Group {0} has a cycle dependency on child node {1}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupChildNodeWarning" xml:space="preserve">
-    <value>Group {0} child node {1} warning: {2}</value>
-  </data>
-  <data name="MsgGroupChildNodeError" xml:space="preserve">
-    <value>Group {0} child node {1} error: {2}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeWarning" xml:space="preserve">
-    <value>Group {0} child group node {1} warning: {2}</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeError" xml:space="preserve">
-    <value>Group {0} child group node {1} error: {2}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupNoValidChildNode" xml:space="preserve">
-    <value>Group {0} has no valid child node.</value>
-  </data>
-  <data name="MsgRoutingRuleEmptyOutboundTag" xml:space="preserve">
-    <value>Routing rule {0} has an empty outbound tag. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeNotFound" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} not found. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgSubscriptionPrevProfileNotFound" xml:space="preserve">
-    <value>Subscription previous proxy {0} not found. Skipping.</value>
-  </data>
-  <data name="MsgSubscriptionNextProfileNotFound" xml:space="preserve">
-    <value>Subscription next proxy {0} not found. Skipping.</value>
-  </data>
 </root>

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

@@ -1536,20 +1536,38 @@
   <data name="menuGenGroupMultipleServerXrayFallback" xml:space="preserve">
     <value>多选故障转移 Xray</value>
   </data>
-  <data name="MsgCoreNotSupportNetwork" xml:space="preserve">
-    <value>核心 '{0}' 不支持网络类型 '{1}'</value>
+  <data name="CoreNotSupportNetwork" xml:space="preserve">
+    <value>核心 '{0}' 不支持网络类型 '{1}'。</value>
   </data>
-  <data name="MsgCoreNotSupportProtocolTransport" xml:space="preserve">
-    <value>核心 '{0}' 在使用传输方式 '{2}' 时不支持协议 '{1}'</value>
+  <data name="CoreNotSupportProtocolTransport" xml:space="preserve">
+    <value>核心 '{0}' 在使用传输方式 '{2}' 时不支持协议 '{1}'。</value>
   </data>
-  <data name="MsgCoreNotSupportProtocol" xml:space="preserve">
-    <value>核心 '{0}' 不支持协议 '{1}'</value>
+  <data name="CoreNotSupportProtocol" xml:space="preserve">
+    <value>核心 '{0}' 不支持协议 '{1}'。</value>
   </data>
-  <data name="MsgInvalidProperty" xml:space="preserve">
+  <data name="ProxyChainedPrefix" xml:space="preserve">
+    <value>代理链： </value>
+  </data>
+  <data name="RoutingRuleOutboundPrefix" xml:space="preserve">
+    <value>路由规则出站： </value>
+  </data>
+  <data name="PolicyGroupPrefix" xml:space="preserve">
+    <value>策略组： </value>
+  </data>
+  <data name="NodeTagNotExist" xml:space="preserve">
+    <value>别名 '{0}' 不存在。</value>
+  </data>
+  <data name="GroupEmpty" xml:space="preserve">
+    <value>组“{0}”为空。请至少添加一个配置。</value>
+  </data>
+  <data name="InvalidProperty" xml:space="preserve">
     <value>{0}属性无效，请检查</value>
   </data>
-  <data name="MsgNotSupportProtocol" xml:space="preserve">
-    <value>不支持协议 '{0}'</value>
+  <data name="GroupSelfReference" xml:space="preserve">
+    <value>{0} 分组不能引用自身或循环引用</value>
+  </data>
+  <data name="NotSupportProtocol" xml:space="preserve">
+    <value>不支持协议 '{0}'。</value>
   </data>
   <data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
     <value>如果系统没有托盘功能，请不要开启</value>
@@ -1647,40 +1665,4 @@
   <data name="TbFinalmask" xml:space="preserve">
     <value>Finalmask</value>
   </data>
-  <data name="MsgRoutingRuleOutboundNodeWarning" xml:space="preserve">
-    <value>路由规则 {0} 出站节点 {1} 警告：{2}</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeError" xml:space="preserve">
-    <value>路由规则 {0} 出站节点 {1} 错误：{2}。已回退为仅使用代理节点。</value>
-  </data>
-  <data name="MsgGroupCycleDependency" xml:space="preserve">
-    <value>节点组 {0} 与子节点 {1} 存在循环依赖，已跳过该节点。</value>
-  </data>
-  <data name="MsgGroupChildNodeWarning" xml:space="preserve">
-    <value>节点组 {0} 子节点 {1} 警告：{2}</value>
-  </data>
-  <data name="MsgGroupChildNodeError" xml:space="preserve">
-    <value>节点组 {0} 子节点 {1} 错误：{2}。已跳过该节点。</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeWarning" xml:space="preserve">
-    <value>节点组 {0} 子节点组 {1} 警告：{2}</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeError" xml:space="preserve">
-    <value>节点组 {0} 子节点组 {1} 错误：{2}。已跳过该节点。</value>
-  </data>
-  <data name="MsgGroupNoValidChildNode" xml:space="preserve">
-    <value>节点组 {0} 下没有有效的子节点。</value>
-  </data>
-  <data name="MsgRoutingRuleEmptyOutboundTag" xml:space="preserve">
-    <value>路由规则 {0} 的出站标签为空，已回退为仅使用代理节点。</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeNotFound" xml:space="preserve">
-    <value>路由规则 {0} 的出站节点 {1} 未找到，已回退为仅使用代理节点。</value>
-  </data>
-  <data name="MsgSubscriptionPrevProfileNotFound" xml:space="preserve">
-    <value>订阅前置节点 {0} 未找到，已跳过。</value>
-  </data>
-  <data name="MsgSubscriptionNextProfileNotFound" xml:space="preserve">
-    <value>订阅后置节点 {0} 未找到，已跳过。</value>
-  </data>
 </root>

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

@@ -1536,20 +1536,38 @@
   <data name="menuGenGroupMultipleServerXrayFallback" xml:space="preserve">
     <value>多選容錯移轉 Xray</value>
   </data>
-  <data name="MsgCoreNotSupportNetwork" xml:space="preserve">
-    <value>核心 '{0}' 不支援網路類型 '{1}'</value>
+  <data name="CoreNotSupportNetwork" xml:space="preserve">
+    <value>核心 '{0}' 不支援網路類型 '{1}'.</value>
   </data>
-  <data name="MsgCoreNotSupportProtocolTransport" xml:space="preserve">
-    <value>核心 '{0}' 在使用傳輸方式 '{2}' 時不支援協定 '{1}'</value>
+  <data name="CoreNotSupportProtocolTransport" xml:space="preserve">
+    <value>核心 '{0}' 在使用傳輸方式 '{2}' 時不支援協定 '{1}'.</value>
   </data>
-  <data name="MsgCoreNotSupportProtocol" xml:space="preserve">
-    <value>核心 '{0}' 不支援協定 '{1}'</value>
+  <data name="CoreNotSupportProtocol" xml:space="preserve">
+    <value>核心 '{0}' 不支援協定 '{1}'.</value>
   </data>
-  <data name="MsgInvalidProperty" xml:space="preserve">
+  <data name="ProxyChainedPrefix" xml:space="preserve">
+    <value>代理鏈： </value>
+  </data>
+  <data name="RoutingRuleOutboundPrefix" xml:space="preserve">
+    <value>路由規則出站： </value>
+  </data>
+  <data name="PolicyGroupPrefix" xml:space="preserve">
+    <value>策略組： </value>
+  </data>
+  <data name="NodeTagNotExist" xml:space="preserve">
+    <value>別名 '{0}' 不存在。</value>
+  </data>
+  <data name="GroupEmpty" xml:space="preserve">
+    <value>組“{0}”為空.請至少添加一個配置。</value>
+  </data>
+  <data name="InvalidProperty" xml:space="preserve">
     <value>{0}屬性無效，請檢查</value>
   </data>
-  <data name="MsgNotSupportProtocol" xml:space="preserve">
-    <value>不支援協定 '{0}'</value>
+  <data name="GroupSelfReference" xml:space="preserve">
+    <value>{0} 分組不能引用自身或循環引用</value>
+  </data>
+  <data name="NotSupportProtocol" xml:space="preserve">
+    <value>不支援協定 '{0}'.</value>
   </data>
   <data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
     <value>如果系統沒有託盤功能，請不要開啟</value>
@@ -1647,40 +1665,4 @@
   <data name="TbFinalmask" xml:space="preserve">
     <value>Finalmask</value>
   </data>
-  <data name="MsgRoutingRuleOutboundNodeWarning" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} warning: {2}</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeError" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} error: {2}. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgGroupCycleDependency" xml:space="preserve">
-    <value>Group {0} has a cycle dependency on child node {1}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupChildNodeWarning" xml:space="preserve">
-    <value>Group {0} child node {1} warning: {2}</value>
-  </data>
-  <data name="MsgGroupChildNodeError" xml:space="preserve">
-    <value>Group {0} child node {1} error: {2}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeWarning" xml:space="preserve">
-    <value>Group {0} child group node {1} warning: {2}</value>
-  </data>
-  <data name="MsgGroupChildGroupNodeError" xml:space="preserve">
-    <value>Group {0} child group node {1} error: {2}. Skipping this node.</value>
-  </data>
-  <data name="MsgGroupNoValidChildNode" xml:space="preserve">
-    <value>Group {0} has no valid child node.</value>
-  </data>
-  <data name="MsgRoutingRuleEmptyOutboundTag" xml:space="preserve">
-    <value>Routing rule {0} has an empty outbound tag. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgRoutingRuleOutboundNodeNotFound" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} not found. Fallback to proxy node only.</value>
-  </data>
-  <data name="MsgSubscriptionPrevProfileNotFound" xml:space="preserve">
-    <value>Subscription previous proxy {0} not found. Skipping.</value>
-  </data>
-  <data name="MsgSubscriptionNextProfileNotFound" xml:space="preserve">
-    <value>Subscription next proxy {0} not found. Skipping.</value>
-  </data>
 </root>

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

@@ -26,15 +26,11 @@ public partial class CoreConfigSingboxService
             {
                 var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
 
-                if (rules?.LastOrDefault() is { } lastRule && lastRule.OutboundTag == Global.DirectTag)
-                {
-                    var noDomain = lastRule.Domain == null || lastRule.Domain.Count == 0;
-                    var noProcess = lastRule.Process == null || lastRule.Process.Count == 0;
-                    var isAnyIp = lastRule.Ip == null || lastRule.Ip.Count == 0 || lastRule.Ip.Contains("0.0.0.0/0");
-                    var isAnyPort = string.IsNullOrEmpty(lastRule.Port) || lastRule.Port == "0-65535";
-                    var isAnyNetwork = string.IsNullOrEmpty(lastRule.Network) || lastRule.Network == "tcp,udp";
-                    useDirectDns = noDomain && noProcess && isAnyIp && isAnyPort && isAnyNetwork;
-                }
+                useDirectDns = rules?.LastOrDefault() is { } lastRule &&
+                                  lastRule.OutboundTag == Global.DirectTag &&
+                                  (lastRule.Port == "0-65535" ||
+                                   lastRule.Network == "tcp,udp" ||
+                                   lastRule.Ip?.Contains("0.0.0.0/0") == true);
             }
             _coreConfig.dns.final = useDirectDns ? Global.SingboxDirectDNSTag : Global.SingboxRemoteDNSTag;
             var simpleDnsItem = context.SimpleDnsItem;

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

@@ -20,14 +20,11 @@ public partial class CoreConfigSingboxService
         {
             proxyOutboundList.AddRange(BuildGroupProxyOutbounds(baseTagName));
         }
-        if (withSelector)
-        {
         var proxyTags = proxyOutboundList.Where(n => n.tag.StartsWith(Global.ProxyTag)).Select(n => n.tag).ToList();
         if (proxyTags.Count > 1)
         {
             proxyOutboundList.InsertRange(0, BuildSelectorOutbounds(proxyTags, baseTagName));
         }
-        }
         return proxyOutboundList;
     }
 

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

@@ -60,12 +60,6 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
 
             GenStatistic();
 
-            var finalRule = BuildFinalRule();
-            if (!string.IsNullOrEmpty(finalRule?.balancerTag))
-            {
-                _coreConfig.routing.rules.Add(finalRule);
-            }
-
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
             ret.Success = true;
             ret.Data = ApplyFullConfigTemplate();
@@ -240,7 +234,6 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
             GenLog();
             GenOutbounds();
 
-            _coreConfig.routing.domainStrategy = Global.AsIs;
             _coreConfig.routing.rules.Clear();
             _coreConfig.inbounds.Clear();
             _coreConfig.inbounds.Add(new()
@@ -251,8 +244,6 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
                 protocol = EInboundProtocol.mixed.ToString(),
             });
 
-            _coreConfig.routing.rules.Add(BuildFinalRule());
-
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
             ret.Success = true;
             ret.Data = JsonUtils.Serialize(_coreConfig);

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

@@ -70,16 +70,17 @@ public partial class CoreConfigV2rayService
             dnsItem.serveStale = simpleDnsItem?.ServeStale is true ? true : null;
             dnsItem.enableParallelQuery = simpleDnsItem?.ParallelQuery is true ? true : null;
 
+            if (_coreConfig.routing.domainStrategy == Global.IPIfNonMatch)
+            {
                 // DNS routing
-            var finalRule = BuildFinalRule();
                 dnsItem.tag = Global.DnsTag;
-            _coreConfig.routing.rules.Add(new()
+                _coreConfig.routing.rules.Add(new RulesItem4Ray
                 {
                     type = "field",
-                inboundTag = [Global.DnsTag],
-                outboundTag = finalRule.outboundTag,
-                balancerTag = finalRule.balancerTag
+                    inboundTag = new List<string> { Global.DnsTag },
+                    outboundTag = Global.ProxyTag,
                 });
+            }
 
             _coreConfig.dns = dnsItem;
         }
@@ -92,6 +93,45 @@ public partial class CoreConfigV2rayService
     private void FillDnsServers(Dns4Ray dnsItem)
     {
         var simpleDNSItem = context.SimpleDnsItem;
+        static List<string> ParseDnsAddresses(string? dnsInput, string defaultAddress)
+        {
+            var addresses = dnsInput?.Split(dnsInput.Contains(',') ? ',' : ';')
+                .Select(addr => addr.Trim())
+                .Where(addr => !string.IsNullOrEmpty(addr))
+                .Select(addr => addr.StartsWith("dhcp", StringComparison.OrdinalIgnoreCase) ? "localhost" : addr)
+                .Distinct()
+                .ToList() ?? new List<string> { defaultAddress };
+            return addresses.Count > 0 ? addresses : new List<string> { defaultAddress };
+        }
+
+        static object? CreateDnsServer(string dnsAddress, List<string> domains, List<string>? expectedIPs = null)
+        {
+            var (domain, scheme, port, path) = Utils.ParseUrl(dnsAddress);
+            var domainFinal = dnsAddress;
+            int? portFinal = null;
+            if (scheme.IsNullOrEmpty() || scheme.StartsWith("udp", StringComparison.OrdinalIgnoreCase))
+            {
+                domainFinal = domain;
+                portFinal = port > 0 ? port : null;
+            }
+            else if (scheme.StartsWith("tcp", StringComparison.OrdinalIgnoreCase))
+            {
+                domainFinal = scheme + "://" + domain;
+                portFinal = port > 0 ? port : null;
+            }
+            var dnsServer = new DnsServer4Ray
+            {
+                address = domainFinal,
+                port = portFinal,
+                skipFallback = true,
+                domains = domains.Count > 0 ? domains : null,
+                expectedIPs = expectedIPs?.Count > 0 ? expectedIPs : null
+            };
+            return JsonUtils.SerializeToNode(dnsServer, new JsonSerializerOptions
+            {
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+            });
+        }
 
         var directDNSAddress = ParseDnsAddresses(simpleDNSItem?.DirectDNS, Global.DomainDirectDNSAddress.First());
         var remoteDNSAddress = ParseDnsAddresses(simpleDNSItem?.RemoteDNS, Global.DomainRemoteDNSAddress.First());
@@ -212,6 +252,17 @@ public partial class CoreConfigV2rayService
 
         dnsItem.servers ??= [];
 
+        void AddDnsServers(List<string> dnsAddresses, List<string> domains, List<string>? expectedIPs = null)
+        {
+            if (domains.Count > 0)
+            {
+                foreach (var dnsAddress in dnsAddresses)
+                {
+                    dnsItem.servers.Add(CreateDnsServer(dnsAddress, domains, expectedIPs));
+                }
+            }
+        }
+
         AddDnsServers(remoteDNSAddress, proxyDomainList);
         AddDnsServers(directDNSAddress, directDomainList);
         AddDnsServers(remoteDNSAddress, proxyGeositeList);
@@ -222,73 +273,14 @@ public partial class CoreConfigV2rayService
             AddDnsServers(bootstrapDNSAddress, dnsServerDomains);
         }
 
-        var useDirectDns = false;
-
-        if (rules?.LastOrDefault() is { } lastRule && lastRule.OutboundTag == Global.DirectTag)
-        {
-            var noDomain = lastRule.Domain == null || lastRule.Domain.Count == 0;
-            var noProcess = lastRule.Process == null || lastRule.Process.Count == 0;
-            var isAnyIp = lastRule.Ip == null || lastRule.Ip.Count == 0 || lastRule.Ip.Contains("0.0.0.0/0");
-            var isAnyPort = string.IsNullOrEmpty(lastRule.Port) || lastRule.Port == "0-65535";
-            var isAnyNetwork = string.IsNullOrEmpty(lastRule.Network) || lastRule.Network == "tcp,udp";
-            useDirectDns = noDomain && noProcess && isAnyIp && isAnyPort && isAnyNetwork;
-        }
+        var useDirectDns = rules?.LastOrDefault() is { } lastRule
+            && lastRule.OutboundTag == Global.DirectTag
+            && (lastRule.Port == "0-65535"
+                || lastRule.Network == "tcp,udp"
+                || lastRule.Ip?.Contains("0.0.0.0/0") == true);
 
         var defaultDnsServers = useDirectDns ? directDNSAddress : remoteDNSAddress;
         dnsItem.servers.AddRange(defaultDnsServers);
-        return;
-
-        static List<string> ParseDnsAddresses(string? dnsInput, string defaultAddress)
-        {
-            var addresses = dnsInput?.Split(dnsInput.Contains(',') ? ',' : ';')
-                .Select(addr => addr.Trim())
-                .Where(addr => !string.IsNullOrEmpty(addr))
-                .Select(addr => addr.StartsWith("dhcp", StringComparison.OrdinalIgnoreCase) ? "localhost" : addr)
-                .Distinct()
-                .ToList() ?? [defaultAddress];
-            return addresses.Count > 0 ? addresses : new List<string> { defaultAddress };
-        }
-
-        static object? CreateDnsServer(string dnsAddress, List<string> domains, List<string>? expectedIPs = null)
-        {
-            var (domain, scheme, port, path) = Utils.ParseUrl(dnsAddress);
-            var domainFinal = dnsAddress;
-            int? portFinal = null;
-            if (scheme.IsNullOrEmpty() || scheme.StartsWith("udp", StringComparison.OrdinalIgnoreCase))
-            {
-                domainFinal = domain;
-                portFinal = port > 0 ? port : null;
-            }
-            else if (scheme.StartsWith("tcp", StringComparison.OrdinalIgnoreCase))
-            {
-                domainFinal = scheme + "://" + domain;
-                portFinal = port > 0 ? port : null;
-            }
-            var dnsServer = new DnsServer4Ray
-            {
-                address = domainFinal,
-                port = portFinal,
-                skipFallback = true,
-                domains = domains.Count > 0 ? domains : null,
-                expectedIPs = expectedIPs?.Count > 0 ? expectedIPs : null
-            };
-            return JsonUtils.SerializeToNode(dnsServer, new JsonSerializerOptions
-            {
-                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-            });
-        }
-
-        void AddDnsServers(List<string> dnsAddresses, List<string> domains, List<string>? expectedIPs = null)
-        {
-            if (domains.Count <= 0)
-            {
-                return;
-            }
-            foreach (var dnsAddress in dnsAddresses)
-            {
-                dnsItem.servers.Add(CreateDnsServer(dnsAddress, domains, expectedIPs));
-            }
-        }
     }
 
     private void FillDnsHosts(Dns4Ray dnsItem)

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

@@ -181,28 +181,4 @@ public partial class CoreConfigV2rayService
 
         return tag;
     }
-
-    private RulesItem4Ray BuildFinalRule()
-    {
-        var finalRule = new RulesItem4Ray()
-        {
-            type = "field",
-            network = "tcp,udp",
-            outboundTag = Global.ProxyTag,
-        };
-        var balancer =
-            _coreConfig?.routing?.balancers?.FirstOrDefault(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix, null);
-        var domainStrategy = _coreConfig.routing?.domainStrategy ?? Global.AsIs;
-        if (balancer is not null)
-        {
-            finalRule.outboundTag = null;
-            finalRule.balancerTag = balancer.tag;
-        }
-        if (domainStrategy == Global.IPIfNonMatch)
-        {
-            finalRule.network = null;
-            finalRule.ip = ["0.0.0.0/0", "::/0"];
-        }
-        return finalRule;
-    }
 }

v2rayN/ServiceLib/ViewModels/AddGroupServerViewModel.cs

@@ -234,6 +234,13 @@ public class AddGroupServerViewModel : MyReactiveObject
 
         SelectedSource.SetProtocolExtra(protocolExtra);
 
+        var hasCycle = await GroupProfileManager.HasCycle(SelectedSource.IndexId, protocolExtra);
+        if (hasCycle)
+        {
+            NoticeManager.Instance.Enqueue(string.Format(ResUI.GroupSelfReference, remarks));
+            return;
+        }
+
         if (await ConfigHandler.AddServerCommon(_config, SelectedSource) == 0)
         {
             NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -540,14 +540,7 @@ public class MainWindowViewModel : MyReactiveObject
         {
             SetReloadEnabled(false);
 
-            var profileItem = await ConfigHandler.GetDefaultServer(_config);
-            if (profileItem == null)
-            {
-                NoticeManager.Instance.Enqueue(ResUI.CheckServerSettings);
-                return;
-            }
-            var (context, validatorResult) = await CoreConfigContextBuilder.Build(_config, profileItem);
-            var msgs = new List<string>([..validatorResult.Errors, ..validatorResult.Warnings]);
+            var msgs = await ActionPrecheckManager.Instance.Check(_config.IndexId);
             if (msgs.Count > 0)
             {
                 foreach (var msg in msgs)
@@ -555,15 +548,12 @@ public class MainWindowViewModel : MyReactiveObject
                     NoticeManager.Instance.SendMessage(msg);
                 }
                 NoticeManager.Instance.Enqueue(Utils.List2String(msgs.Take(10).ToList(), true));
-                if (!validatorResult.Success)
-                {
                 return;
             }
-            }
 
             await Task.Run(async () =>
             {
-                await LoadCore(context);
+                await LoadCore();
                 await SysProxyHandler.UpdateSysProxy(_config, false);
                 await Task.Delay(1000);
             });
@@ -604,9 +594,10 @@ public class MainWindowViewModel : MyReactiveObject
         RxApp.MainThreadScheduler.Schedule(() => BlReloadEnabled = enabled);
     }
 
-    private async Task LoadCore(CoreConfigContext? context)
+    private async Task LoadCore()
     {
-        await CoreManager.Instance.LoadCore(context);
+        var node = await ConfigHandler.GetDefaultServer(_config);
+        await CoreManager.Instance.LoadCore(node);
     }
 
     #endregion core job

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -788,8 +788,7 @@ public class ProfilesViewModel : MyReactiveObject
             return;
         }
 
-        var (context, validatorResult) = await CoreConfigContextBuilder.Build(_config, item);
-        var msgs = new List<string>([..validatorResult.Errors, ..validatorResult.Warnings]);
+        var msgs = await ActionPrecheckManager.Instance.Check(item);
         if (msgs.Count > 0)
         {
             foreach (var msg in msgs)
@@ -797,14 +796,12 @@ public class ProfilesViewModel : MyReactiveObject
                 NoticeManager.Instance.SendMessage(msg);
             }
             NoticeManager.Instance.Enqueue(Utils.List2String(msgs.Take(10).ToList(), true));
-            if (!validatorResult.Success)
-            {
             return;
         }
-        }
 
         if (blClipboard)
         {
+            var context = await CoreConfigHandler.BuildCoreConfigContext(_config, item);
             var result = await CoreConfigHandler.GenerateClientConfig(context, null);
             if (result.Success != true)
             {
@@ -828,20 +825,7 @@ public class ProfilesViewModel : MyReactiveObject
         {
             return;
         }
-        var (context, validatorResult) = await CoreConfigContextBuilder.Build(_config, item);
-        var msgs = new List<string>([..validatorResult.Errors, ..validatorResult.Warnings]);
-        if (msgs.Count > 0)
-        {
-            foreach (var msg in msgs)
-            {
-                NoticeManager.Instance.SendMessage(msg);
-            }
-            NoticeManager.Instance.Enqueue(Utils.List2String(msgs.Take(10).ToList(), true));
-            if (!validatorResult.Success)
-            {
-                return;
-            }
-        }
+        var context = await CoreConfigHandler.BuildCoreConfigContext(_config, item);
         var result = await CoreConfigHandler.GenerateClientConfig(context, fileName);
         if (result.Success != true)
         {