up 7.14.12

https://github.com/2dust/v2rayN/pull/7969

.github/workflows/build-linux.yml

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

.github/workflows/build-osx.yml

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

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

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

.github/workflows/build-windows.yml

@@ -30,7 +30,7 @@ jobs:
       uses: actions/checkout@v5.0.0
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.1
+      uses: actions/setup-dotnet@v5.0.0
       with:
         dotnet-version: '8.0.x'
 

package-appimage.sh

@@ -1,14 +1,67 @@
 #!/bin/bash
+set -euo pipefail
 
+# Install deps
 sudo apt update -y
-sudo apt install -y libfuse2
-wget -O pkg2appimage https://github.com/AppImageCommunity/pkg2appimage/releases/download/continuous/pkg2appimage-1eceb30-x86_64.AppImage
-chmod a+x pkg2appimage
-export AppImageOutputArch=$OutputArch
-export OutputPath=$OutputPath64
-./pkg2appimage ./pkg2appimage.yml
-mv out/*.AppImage v2rayN-${AppImageOutputArch}.AppImage
-export AppImageOutputArch=$OutputArchArm
-export OutputPath=$OutputPathArm64
-./pkg2appimage ./pkg2appimage.yml
-mv out/*.AppImage v2rayN-${AppImageOutputArch}.AppImage
+sudo apt install -y libfuse2 wget file
+
+# Get tools
+wget -qO appimagetool https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+chmod +x appimagetool
+
+# x86_64 AppDir
+APPDIR_X64="AppDir-x86_64"
+rm -rf "$APPDIR_X64"
+mkdir -p "$APPDIR_X64/usr/lib/v2rayN" "$APPDIR_X64/usr/bin" "$APPDIR_X64/usr/share/applications" "$APPDIR_X64/usr/share/pixmaps"
+cp -rf "$OutputPath64"/* "$APPDIR_X64/usr/lib/v2rayN" || true
+[ -f "$APPDIR_X64/usr/lib/v2rayN/v2rayN.png" ] && cp "$APPDIR_X64/usr/lib/v2rayN/v2rayN.png" "$APPDIR_X64/usr/share/pixmaps/v2rayN.png" || true
+[ -f "$APPDIR_X64/usr/lib/v2rayN/v2rayN.png" ] && cp "$APPDIR_X64/usr/lib/v2rayN/v2rayN.png" "$APPDIR_X64/v2rayN.png" || true
+
+printf '%s\n' '#!/bin/sh' 'HERE="$(dirname "$(readlink -f "$0")")"' 'cd "$HERE/usr/lib/v2rayN"' 'exec "$HERE/usr/lib/v2rayN/v2rayN" "$@"' > "$APPDIR_X64/AppRun"
+chmod +x "$APPDIR_X64/AppRun"
+ln -sf usr/lib/v2rayN/v2rayN "$APPDIR_X64/usr/bin/v2rayN"
+cat > "$APPDIR_X64/v2rayN.desktop" <<EOF
+[Desktop Entry]
+Name=v2rayN
+Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
+Exec=v2rayN
+Icon=v2rayN
+Terminal=false
+Type=Application
+Categories=Network;
+EOF
+install -Dm644 "$APPDIR_X64/v2rayN.desktop" "$APPDIR_X64/usr/share/applications/v2rayN.desktop"
+
+ARCH=x86_64 ./appimagetool "$APPDIR_X64" "v2rayN-${OutputArch}.AppImage"
+file "v2rayN-${OutputArch}.AppImage" | grep -q 'x86-64'
+
+# aarch64 AppDir
+APPDIR_ARM64="AppDir-aarch64"
+rm -rf "$APPDIR_ARM64"
+mkdir -p "$APPDIR_ARM64/usr/lib/v2rayN" "$APPDIR_ARM64/usr/bin" "$APPDIR_ARM64/usr/share/applications" "$APPDIR_ARM64/usr/share/pixmaps"
+cp -rf "$OutputPathArm64"/* "$APPDIR_ARM64/usr/lib/v2rayN" || true
+[ -f "$APPDIR_ARM64/usr/lib/v2rayN/v2rayN.png" ] && cp "$APPDIR_ARM64/usr/lib/v2rayN/v2rayN.png" "$APPDIR_ARM64/usr/share/pixmaps/v2rayN.png" || true
+[ -f "$APPDIR_ARM64/usr/lib/v2rayN/v2rayN.png" ] && cp "$APPDIR_ARM64/usr/lib/v2rayN/v2rayN.png" "$APPDIR_ARM64/v2rayN.png" || true
+
+printf '%s\n' '#!/bin/sh' 'HERE="$(dirname "$(readlink -f "$0")")"' 'cd "$HERE/usr/lib/v2rayN"' 'exec "$HERE/usr/lib/v2rayN/v2rayN" "$@"' > "$APPDIR_ARM64/AppRun"
+chmod +x "$APPDIR_ARM64/AppRun"
+ln -sf usr/lib/v2rayN/v2rayN "$APPDIR_ARM64/usr/bin/v2rayN"
+cat > "$APPDIR_ARM64/v2rayN.desktop" <<EOF
+[Desktop Entry]
+Name=v2rayN
+Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
+Exec=v2rayN
+Icon=v2rayN
+Terminal=false
+Type=Application
+Categories=Network;
+EOF
+install -Dm644 "$APPDIR_ARM64/v2rayN.desktop" "$APPDIR_ARM64/usr/share/applications/v2rayN.desktop"
+
+# aarch64 runtime
+wget -qO runtime-aarch64 https://github.com/AppImage/AppImageKit/releases/download/continuous/runtime-aarch64
+chmod +x runtime-aarch64
+
+# build aarch64 AppImage
+ARCH=aarch64 ./appimagetool --runtime-file ./runtime-aarch64 "$APPDIR_ARM64" "v2rayN-${OutputArchArm}.AppImage"
+file "v2rayN-${OutputArchArm}.AppImage" | grep -q 'ARM aarch64'

package-debian.sh

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

package-rhel.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# ===== Require Red Hat Enterprise Linux/RockyLinux/AlmaLinux/CentOS OR Ubuntu/Debian ====
+# == Require Red Hat Enterprise Linux/FedoraLinux/RockyLinux/AlmaLinux/CentOS OR Ubuntu/Debian ==
 if [[ -r /etc/os-release ]]; then
   . /etc/os-release
   case "$ID" in
-    rhel|rocky|almalinux|centos|ubuntu|debian)
+    rhel|rocky|almalinux|fedora|centos|ubuntu|debian)
       echo "[OK] Detected supported system: $NAME $VERSION_ID"
       ;;
     *)
@@ -390,25 +390,30 @@ download_mihomo() {
   chmod +x "$outroot/bin/mihomo/mihomo" || true
 }
 
-# Move geo files to a unified path: outroot/bin/xray/
+# Move geo files to a unified path: outroot/bin
 unify_geo_layout() {
   local outroot="$1"
-  mkdir -p "$outroot/bin/xray"
-  local srcs=( \
-    "$outroot/bin/geosite.dat" \
-    "$outroot/bin/geoip.dat" \
-    "$outroot/bin/geoip-only-cn-private.dat" \
-    "$outroot/bin/Country.mmdb" \
-    "$outroot/bin/geoip.metadb" \
+  mkdir -p "$outroot/bin"
+  local names=( \
+    "geosite.dat" \
+    "geoip.dat" \
+    "geoip-only-cn-private.dat" \
+    "Country.mmdb" \
+    "geoip.metadb" \
   )
-  for s in "${srcs[@]}"; do
-    if [[ -f "$s" ]]; then
-      mv -f "$s" "$outroot/bin/xray/$(basename "$s")"
+  for n in "${names[@]}"; do
+    # If file exists under bin/xray/, move it up to bin/
+    if [[ -f "$outroot/bin/xray/$n" ]]; then
+      mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
+    fi
+    # If file already in bin/, leave it as-is
+    if [[ -f "$outroot/bin/$n" ]]; then
+      :
     fi
   done
 }
 
-# Download geo/rule assets; then unify to bin/xray/
+# Download geo/rule assets; then unify to bin/
 download_geo_assets() {
   local outroot="$1"
   local bin_dir="$outroot/bin"
@@ -442,7 +447,7 @@ download_geo_assets() {
       "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
   done
 
-  # Unify to bin/xray/
+  # Unify to bin/
   unify_geo_layout "$outroot"
 }
 
@@ -480,7 +485,7 @@ download_v2rayn_bundle() {
     rm -rf "$nested_dir"
   fi
 
-  # Unify to bin/xray/
+  # Unify to bin/
   unify_geo_layout "$outroot"
 
   echo "[+] Bundle extracted to $outroot"
@@ -610,7 +615,7 @@ Source0:        __PKGROOT__.tar.gz
 
 # Runtime dependencies (Avalonia / X11 / Fonts / GL)
 Requires:       libX11, libXrandr, libXcursor, libXi, libXext, libxcb, libXrender, libXfixes, libXinerama, libxkbcommon
-Requires:       fontconfig, freetype, cairo, pango, mesa-libEGL, mesa-libGL
+Requires:       fontconfig, freetype, cairo, pango, mesa-libEGL, mesa-libGL, xdg-utils
 
 %description
 v2rayN Linux for Red Hat Enterprise Linux
@@ -629,25 +634,13 @@ https://github.com/2dust/v2rayN
 install -dm0755 %{buildroot}/opt/v2rayN
 cp -a * %{buildroot}/opt/v2rayN/
 
-# Launcher (prefer native ELF first, then DLL fallback; also create Geo symlinks for the user)
+# Launcher (prefer native ELF first, then DLL fallback)
 install -dm0755 %{buildroot}%{_bindir}
 cat > %{buildroot}%{_bindir}/v2rayn << 'EOF'
 #!/usr/bin/bash
 set -euo pipefail
 DIR="/opt/v2rayN"
 
-# --- Symlink GEO files into user's XDG dir (first-run convenience) ---
-XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
-USR_GEO_DIR="$XDG_DATA_HOME/v2rayN/bin"
-SYS_XRAY_DIR="$DIR/bin/xray"
-mkdir -p "$USR_GEO_DIR"
-for f in geosite.dat geoip.dat geoip-only-cn-private.dat Country.mmdb; do
-  if [[ -f "$SYS_XRAY_DIR/$f" && ! -e "$USR_GEO_DIR/$f" ]]; then
-    ln -s "$SYS_XRAY_DIR/$f" "$USR_GEO_DIR/$f" || true
-  fi
-done
-# --- end GEO ---
-
 # Prefer native apphost
 if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi
 

pkg2appimage.yml

@@ -1,37 +0,0 @@
-app: v2rayN
-binpatch: true
-
-ingredients:
-  script:
-    - export FileName="v2rayN-${AppImageOutputArch}.zip"
-    - wget -nv -O $FileName "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/${FileName}"
-    - 7z x $FileName -aoa
-    - cp -rf v2rayN-${AppImageOutputArch}/* $OutputPath
-
-script:
-  - mkdir -p usr/bin usr/lib
-  - cp -rf $OutputPath usr/lib/v2rayN
-  - echo "When this file exists, app will not store configs under this folder" > usr/lib/v2rayN/NotStoreConfigHere.txt
-  - ln -sf usr/lib/v2rayN/v2rayN usr/bin/v2rayN
-  - chmod a+x usr/lib/v2rayN/v2rayN
-  - find usr -type f -exec sh -c 'file "{}" | grep -qi "executable" && chmod +x "{}"' \;
-  - install -Dm644 usr/lib/v2rayN/v2rayN.png v2rayN.png
-  - install -Dm644 usr/lib/v2rayN/v2rayN.png usr/share/pixmaps/v2rayN.png
-  - cat > v2rayN.desktop <<EOF
-  - [Desktop Entry]
-  - Name=v2rayN
-  - Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
-  - Exec=v2rayN
-  - Icon=v2rayN
-  - Terminal=false
-  - Type=Application
-  - Categories=Network;
-  - EOF
-  - install -Dm644 v2rayN.desktop usr/share/applications/v2rayN.desktop
-  - cat > AppRun <<\EOF
-  - #!/bin/sh
-  - HERE="$(dirname "$(readlink -f "${0}")")"
-  - cd ${HERE}/usr/lib/v2rayN
-  - exec ${HERE}/usr/lib/v2rayN/v2rayN $@
-  - EOF
-  - chmod a+x AppRun

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.3</Version>
+        <Version>7.14.12</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -5,10 +5,10 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.4" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.4" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.4" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.4" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.6" />
     <PackageVersion Include="CliWrap" Version="3.9.0" />
     <PackageVersion Include="Downloader" Version="4.0.3" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
@@ -18,9 +18,9 @@
     <PackageVersion Include="ReactiveUI" Version="20.4.1" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
     <PackageVersion Include="ReactiveUI.WPF" Version="20.4.1" />
-    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.9" />
-    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.9" />
-    <PackageVersion Include="Splat.NLog" Version="15.5.3" />
+    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.10" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.10" />
+    <PackageVersion Include="Splat.NLog" Version="16.2.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageVersion Include="TaskScheduler" Version="2.12.2" />
     <PackageVersion Include="WebDav.Client" Version="2.9.0" />

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -9,6 +9,31 @@ public class JsonUtils
 {
     private static readonly string _tag = "JsonUtils";
 
+    private static readonly JsonSerializerOptions _defaultDeserializeOptions = new()
+    {
+        PropertyNameCaseInsensitive = true,
+        ReadCommentHandling = JsonCommentHandling.Skip
+    };
+
+    private static readonly JsonSerializerOptions _defaultSerializeOptions = new()
+    {
+        WriteIndented = true,
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+    };
+
+    private static readonly JsonSerializerOptions _nullValueSerializeOptions = new()
+    {
+        WriteIndented = true,
+        DefaultIgnoreCondition = JsonIgnoreCondition.Never,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+    };
+
+    private static readonly JsonDocumentOptions _defaultDocumentOptions = new()
+    {
+        CommentHandling = JsonCommentHandling.Skip
+    };
+
     /// <summary>
     /// DeepCopy
     /// </summary>
@@ -34,11 +59,7 @@ public class JsonUtils
             {
                 return default;
             }
-            var options = new JsonSerializerOptions
-            {
-                PropertyNameCaseInsensitive = true
-            };
-            return JsonSerializer.Deserialize<T>(strJson, options);
+            return JsonSerializer.Deserialize<T>(strJson, _defaultDeserializeOptions);
         }
         catch
         {
@@ -59,7 +80,7 @@ public class JsonUtils
             {
                 return null;
             }
-            return JsonNode.Parse(strJson);
+            return JsonNode.Parse(strJson, nodeOptions: null, _defaultDocumentOptions);
         }
         catch
         {
@@ -84,12 +105,7 @@ public class JsonUtils
             {
                 return result;
             }
-            var options = new JsonSerializerOptions
-            {
-                WriteIndented = indented,
-                DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull,
-                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-            };
+            var options = nullValue ? _nullValueSerializeOptions : _defaultSerializeOptions;
             result = JsonSerializer.Serialize(obj, options);
         }
         catch (Exception ex)

v2rayN/ServiceLib/Common/QRCodeUtils.cs

@@ -1,4 +1,5 @@
 using QRCoder;
+using QRCoder.Exceptions;
 using SkiaSharp;
 using ZXing.SkiaSharp;
 
@@ -8,10 +9,45 @@ public class QRCodeUtils
 {
     public static byte[]? GenQRCode(string? url)
     {
+        if (url.IsNullOrEmpty())
+        {
+            return null;
+        }
         using QRCodeGenerator qrGenerator = new();
-        using var qrCodeData = qrGenerator.CreateQrCode(url ?? string.Empty, QRCodeGenerator.ECCLevel.Q);
-        using PngByteQRCode qrCode = new(qrCodeData);
-        return qrCode.GetGraphic(20);
+        DataTooLongException? lastDtle = null;
+
+        var levels = new[]
+        {
+            QRCodeGenerator.ECCLevel.H,
+            QRCodeGenerator.ECCLevel.Q,
+            QRCodeGenerator.ECCLevel.M,
+            QRCodeGenerator.ECCLevel.L
+        };
+        foreach (var level in levels)
+        {
+            try
+            {
+                using var qrCodeData = qrGenerator.CreateQrCode(url, level);
+                using PngByteQRCode qrCode = new(qrCodeData);
+                return qrCode.GetGraphic(20);
+            }
+            catch (DataTooLongException ex)
+            {
+                lastDtle = ex;
+                continue;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        if (lastDtle != null)
+        {
+            throw lastDtle;
+        }
+
+        return null;
     }
 
     public static string? ParseBarcode(string? fileName)

v2rayN/ServiceLib/Common/Utils.cs

@@ -331,6 +331,32 @@ public class Utils
             .ToList();
     }
 
+    public static Dictionary<string, List<string>> ParseHostsToDictionary(string hostsContent)
+    {
+        var userHostsMap = hostsContent
+            .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+            .Select(line => line.Trim())
+            // skip full-line comments
+            .Where(line => !string.IsNullOrWhiteSpace(line) && !line.StartsWith("#"))
+            // strip inline comments (truncate at '#')
+            .Select(line =>
+            {
+                var index = line.IndexOf('#');
+                return index >= 0 ? line.Substring(0, index).Trim() : line;
+            })
+            // ensure line still contains valid parts
+            .Where(line => !string.IsNullOrWhiteSpace(line) && line.Contains(' '))
+            .Select(line => line.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries))
+            .Where(parts => parts.Length >= 2)
+            .GroupBy(parts => parts[0])
+            .ToDictionary(
+                group => group.Key,
+                group => group.SelectMany(parts => parts.Skip(1)).ToList()
+            );
+
+        return userHostsMap;
+    }
+
     #endregion 转换函数
 
     #region 数据检查
@@ -582,9 +608,9 @@ public class Utils
                     if (host.StartsWith("#"))
                         continue;
                     var hostItem = host.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                    if (hostItem.Length != 2)
+                    if (hostItem.Length < 2)
                         continue;
-                    systemHosts.Add(hostItem.Last(), hostItem.First());
+                    systemHosts.Add(hostItem[1], hostItem[0]);
                 }
             }
         }
@@ -857,6 +883,55 @@ public class Utils
         return false;
     }
 
+    public static bool IsPackagedInstall()
+    {
+        try
+        {
+            if (IsWindows() || IsOSX())
+            {
+                return false;
+            }
+
+            if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("APPIMAGE")))
+            {
+                return true;
+            }
+
+            var exePath = GetExePath();
+            var baseDir = string.IsNullOrEmpty(exePath) ? StartupPath() : Path.GetDirectoryName(exePath) ?? "";
+            var p = baseDir.Replace('\\', '/');
+
+            if (string.IsNullOrEmpty(p))
+            {
+                return false;
+            }
+
+            if (p.Contains("/.mount_", StringComparison.Ordinal))
+            {
+                return true;
+            }
+
+            if (p.StartsWith("/opt/v2rayN", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            if (p.StartsWith("/usr/lib/v2rayN", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            if (p.StartsWith("/usr/share/v2rayN", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+        }
+        catch
+        {
+        }
+        return false;
+    }
+
     private static async Task<string?> GetLinuxUserId()
     {
         var arg = new List<string>() { "-c", "id -u" };

v2rayN/ServiceLib/Enums/ECoreType.cs

@@ -15,5 +15,6 @@ public enum ECoreType
     brook = 27,
     overtls = 28,
     shadowquic = 29,
+    mieru = 30,
     v2rayN = 99
 }

v2rayN/ServiceLib/Enums/EMsgCommand.cs

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

v2rayN/ServiceLib/Enums/EViewAction.cs

@@ -6,7 +6,6 @@ public enum EViewAction
     ShowYesNo,
     SaveFileDialog,
     AddBatchRoutingRulesYesNo,
-    AdjustMainLvColWidth,
     SetClipboardData,
     AddServerViaClipboard,
     ImportRulesFromClipboard,
@@ -16,7 +15,6 @@ public enum EViewAction
     ShowHideWindow,
     ScanScreenTask,
     ScanImageTask,
-    Shutdown,
     BrowseServer,
     ImportRulesFromFile,
     InitSettingFont,
@@ -32,16 +30,7 @@ public enum EViewAction
     FullConfigTemplateWindow,
     GlobalHotkeySettingWindow,
     SubSettingWindow,
-    DispatcherSpeedTest,
-    DispatcherRefreshConnections,
-    DispatcherRefreshProxyGroups,
-    DispatcherProxiesDelayTest,
-    DispatcherStatistics,
-    DispatcherServerAvailability,
-    DispatcherReload,
     DispatcherRefreshServersBiz,
     DispatcherRefreshIcon,
-    DispatcherCheckUpdate,
-    DispatcherCheckUpdateFinished,
     DispatcherShowMsg,
 }

v2rayN/ServiceLib/Global.cs

@@ -40,6 +40,7 @@ public class Global
     public const string ProxySetLinuxShellFileName = NamespaceSample + "proxy_set_linux_sh";
     public const string KillAsSudoOSXShellFileName = NamespaceSample + "kill_as_sudo_osx_sh";
     public const string KillAsSudoLinuxShellFileName = NamespaceSample + "kill_as_sudo_linux_sh";
+    public const string SingboxFakeIPFilterFileName = NamespaceSample + "singbox_fakeip_filter";
 
     public const string DefaultSecurity = "auto";
     public const string DefaultNetwork = "tcp";
@@ -560,6 +561,7 @@ public class Global
             { ECoreType.brook, "txthinking/brook" },
             { ECoreType.overtls, "ShadowsocksR-Live/overtls" },
             { ECoreType.shadowquic, "spongebob888/shadowquic" },
+            { ECoreType.mieru, "enfein/mieru" },
             { ECoreType.v2rayN, "2dust/v2rayN" },
         };
 
@@ -596,6 +598,7 @@ public class Global
             { "cloudflare-dns.com", new List<string> { "104.16.249.249", "104.16.248.249", "2606:4700::6810:f8f9", "2606:4700::6810:f9f9" } },
             { "dns.cloudflare.com", new List<string> { "104.16.132.229", "104.16.133.229", "2606:4700::6810:84e5", "2606:4700::6810:85e5" } },
             { "dot.pub", new List<string> { "1.12.12.12", "120.53.53.53" } },
+            { "doh.pub", new List<string> { "1.12.12.12", "120.53.53.53" } },
             { "dns.quad9.net", new List<string> { "9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9" } },
             { "dns.yandex.net", new List<string> { "77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff" } },
             { "dns.sb", new List<string> { "185.222.222.222", "2a09::" } },

v2rayN/ServiceLib/Handler/AppEvents.cs

@@ -0,0 +1,21 @@
+using System.Reactive;
+using System.Reactive.Subjects;
+
+namespace ServiceLib.Handler;
+
+public static class AppEvents
+{
+    public static readonly Subject<Unit> ProfilesRefreshRequested = new();
+
+    public static readonly Subject<string> SendSnackMsgRequested = new();
+
+    public static readonly Subject<string> SendMsgViewRequested = new();
+
+    public static readonly Subject<Unit> AppExitRequested = new();
+
+    public static readonly Subject<bool> ShutdownRequested = new();
+
+    public static readonly Subject<Unit> AdjustMainLvColWidthRequested = new();
+
+    public static readonly Subject<ServerSpeedItem> DispatcherStatisticsRequested = new();
+}

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -113,6 +113,10 @@ public static class ConfigHandler
         config.ConstItem ??= new ConstItem();
 
         config.SimpleDNSItem ??= InitBuiltinSimpleDNS();
+        if (config.SimpleDNSItem.GlobalFakeIp is null)
+        {
+            config.SimpleDNSItem.GlobalFakeIp = true;
+        }
 
         config.SpeedTestItem ??= new();
         if (config.SpeedTestItem.SpeedTestTimeout < 10)
@@ -1210,11 +1214,11 @@ public static class ConfigHandler
                 CoreType = ECoreType.sing_box,
                 ConfigType = EConfigType.SOCKS,
                 Address = Global.Loopback,
-                Sni = node.Address, //Tun2SocksAddress
+                SpiderX = node.Address, // Tun2SocksAddress
                 Port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks)
             };
         }
-        else if ((node.ConfigType == EConfigType.Custom && node.PreSocksPort > 0))
+        else if (node.ConfigType == EConfigType.Custom && node.PreSocksPort > 0)
         {
             var preCoreType = config.RunningCoreType = config.TunModeItem.EnableTun ? ECoreType.sing_box : ECoreType.Xray;
             itemSocks = new ProfileItem()
@@ -2221,6 +2225,7 @@ public static class ConfigHandler
             UseSystemHosts = false,
             AddCommonHosts = true,
             FakeIP = false,
+            GlobalFakeIp = true,
             BlockBindingQuery = true,
             DirectDNS = Global.DomainDirectDNSAddress.FirstOrDefault(),
             RemoteDNS = Global.DomainRemoteDNSAddress.FirstOrDefault(),
@@ -2321,10 +2326,22 @@ public static class ConfigHandler
                 config.ConstItem.SrsSourceUrl = Global.SingboxRulesetSources[1];
                 config.ConstItem.RouteRulesTemplateSourceUrl = Global.RoutingRulesSources[1];
 
-                await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[1] + "v2ray.json"));
-                await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[1] + "sing_box.json"));
+                var xrayDnsRussia = await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[1] + "v2ray.json");
+                var singboxDnsRussia = await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[1] + "sing_box.json");
+                var simpleDnsRussia = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[1] + "simple_dns.json");
 
-                config.SimpleDNSItem = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[1] + "simple_dns.json") ?? InitBuiltinSimpleDNS();
+                if (simpleDnsRussia == null)
+                {
+                    xrayDnsRussia.Enabled = true;
+                    singboxDnsRussia.Enabled = true;
+                    config.SimpleDNSItem = InitBuiltinSimpleDNS();
+                }
+                else
+                {
+                    config.SimpleDNSItem = simpleDnsRussia;
+                }
+                await SaveDNSItems(config, xrayDnsRussia);
+                await SaveDNSItems(config, singboxDnsRussia);
                 break;
 
             case EPresetType.Iran:
@@ -2332,10 +2349,22 @@ public static class ConfigHandler
                 config.ConstItem.SrsSourceUrl = Global.SingboxRulesetSources[2];
                 config.ConstItem.RouteRulesTemplateSourceUrl = Global.RoutingRulesSources[2];
 
-                await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[2] + "v2ray.json"));
-                await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[2] + "sing_box.json"));
+                var xrayDnsIran = await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[2] + "v2ray.json");
+                var singboxDnsIran = await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[2] + "sing_box.json");
+                var simpleDnsIran = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[2] + "simple_dns.json");
 
-                config.SimpleDNSItem = await GetExternalSimpleDNSItem(Global.DNSTemplateSources[2] + "simple_dns.json") ?? InitBuiltinSimpleDNS();
+                if (simpleDnsIran == null)
+                {
+                    xrayDnsIran.Enabled = true;
+                    singboxDnsIran.Enabled = true;
+                    config.SimpleDNSItem = InitBuiltinSimpleDNS();
+                }
+                else
+                {
+                    config.SimpleDNSItem = simpleDnsIran;
+                }
+                await SaveDNSItems(config, xrayDnsIran);
+                await SaveDNSItems(config, singboxDnsIran);
                 break;
         }
 

v2rayN/ServiceLib/Handler/Fmt/ClashFmt.cs

@@ -4,7 +4,7 @@ public class ClashFmt : BaseFmt
 {
     public static ProfileItem? ResolveFull(string strData, string? subRemarks)
     {
-        if (Contains(strData, "port", "socks-port", "proxies"))
+        if (Contains(strData, "external-controller", "-port", "proxies"))
         {
             var fileName = WriteAllText(strData, "yaml");
 

v2rayN/ServiceLib/Handler/SubscriptionHandler.cs

@@ -2,17 +2,18 @@ namespace ServiceLib.Handler;
 
 public static class SubscriptionHandler
 {
-    public static async Task UpdateProcess(Config config, string subId, bool blProxy, Action<bool, string> updateFunc)
+    public static async Task UpdateProcess(Config config, string subId, bool blProxy, Func<bool, string, Task> updateFunc)
     {
-        updateFunc?.Invoke(false, ResUI.MsgUpdateSubscriptionStart);
+        await updateFunc?.Invoke(false, ResUI.MsgUpdateSubscriptionStart);
         var subItem = await AppManager.Instance.SubItems();
 
         if (subItem is not { Count: > 0 })
         {
-            updateFunc?.Invoke(false, ResUI.MsgNoValidSubscription);
+            await updateFunc?.Invoke(false, ResUI.MsgNoValidSubscription);
             return;
         }
 
+        var successCount = 0;
         foreach (var item in subItem)
         {
             try
@@ -25,32 +26,35 @@ public static class SubscriptionHandler
                 var hashCode = $"{item.Remarks}->";
                 if (item.Enabled == false)
                 {
-                    updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
+                    await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
                     continue;
                 }
 
                 // Create download handler
                 var downloadHandle = CreateDownloadHandler(hashCode, updateFunc);
-                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
+                await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
 
                 // Get all subscription content (main subscription + additional subscriptions)
                 var result = await DownloadAllSubscriptions(config, item, blProxy, downloadHandle);
 
                 // Process download result
-                await ProcessDownloadResult(config, item.Id, result, hashCode, updateFunc);
+                if (await ProcessDownloadResult(config, item.Id, result, hashCode, updateFunc))
+                {
+                    successCount++;
+                }
 
-                updateFunc?.Invoke(false, "-------------------------------------------------------");
+                await updateFunc?.Invoke(false, "-------------------------------------------------------");
             }
             catch (Exception ex)
             {
                 var hashCode = $"{item.Remarks}->";
                 Logging.SaveLog("UpdateSubscription", ex);
-                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgFailedImportSubscription}: {ex.Message}");
-                updateFunc?.Invoke(false, "-------------------------------------------------------");
+                await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgFailedImportSubscription}: {ex.Message}");
+                await updateFunc?.Invoke(false, "-------------------------------------------------------");
             }
         }
 
-        updateFunc?.Invoke(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
+        await updateFunc?.Invoke(successCount > 0, $"{ResUI.MsgUpdateSubscriptionEnd}");
     }
 
     private static bool IsValidSubscription(SubItem item, string subId)
@@ -76,7 +80,7 @@ public static class SubscriptionHandler
         return true;
     }
 
-    private static DownloadService CreateDownloadHandler(string hashCode, Action<bool, string> updateFunc)
+    private static DownloadService CreateDownloadHandler(string hashCode, Func<bool, string, Task> updateFunc)
     {
         var downloadHandle = new DownloadService();
         downloadHandle.Error += (sender2, args) =>
@@ -181,22 +185,24 @@ public static class SubscriptionHandler
         return result;
     }
 
-    private static async Task ProcessDownloadResult(Config config, string id, string result, string hashCode, Action<bool, string> updateFunc)
+    private static async Task<bool> ProcessDownloadResult(Config config, string id, string result, string hashCode, Func<bool, string, Task> updateFunc)
     {
         if (result.IsNullOrEmpty())
         {
-            updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
-            return;
+            await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
+            return false;
         }
 
-        updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
+        await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
 
         // If result is too short, display content directly
         if (result.Length < 99)
         {
-            updateFunc?.Invoke(false, $"{hashCode}{result}");
+            await updateFunc?.Invoke(false, $"{hashCode}{result}");
         }
 
+        await updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartParsingSubscription}");
+
         // Add servers to configuration
         var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
         if (ret <= 0)
@@ -206,9 +212,10 @@ public static class SubscriptionHandler
         }
 
         // Update completion message
-        updateFunc?.Invoke(false,
-            ret > 0
+        await updateFunc?.Invoke(false, ret > 0
                 ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
                 : $"{hashCode}{ResUI.MsgFailedImportSubscription}");
+
+        return ret > 0;
     }
 }

v2rayN/ServiceLib/Helper/SqliteHelper.cs

@@ -26,7 +26,7 @@ public sealed class SQLiteHelper
 
     public async Task<int> InsertAllAsync(IEnumerable models)
     {
-        return await _dbAsync.InsertAllAsync(models);
+        return await _dbAsync.InsertAllAsync(models, runInTransaction: true).ConfigureAwait(false);
     }
 
     public async Task<int> InsertAsync(object model)
@@ -46,7 +46,7 @@ public sealed class SQLiteHelper
 
     public async Task<int> UpdateAllAsync(IEnumerable models)
     {
-        return await _dbAsync.UpdateAllAsync(models);
+        return await _dbAsync.UpdateAllAsync(models, runInTransaction: true).ConfigureAwait(false);
     }
 
     public async Task<int> DeleteAsync(object model)

v2rayN/ServiceLib/Manager/AppManager.cs

@@ -1,3 +1,5 @@
+using System.Reactive;
+
 namespace ServiceLib.Manager;
 
 public sealed class AppManager
@@ -34,7 +36,7 @@ public sealed class AppManager
 
     #endregion Property
 
-    #region Init
+    #region App
 
     public bool InitApp()
     {
@@ -87,7 +89,40 @@ public sealed class AppManager
         return true;
     }
 
-    #endregion Init
+    public async Task AppExitAsync(bool needShutdown)
+    {
+        try
+        {
+            Logging.SaveLog("AppExitAsync Begin");
+
+            await SysProxyHandler.UpdateSysProxy(_config, true);
+            AppEvents.AppExitRequested.OnNext(Unit.Default);
+            await Task.Delay(50); //Wait for AppExitRequested to be processed
+
+            await ConfigHandler.SaveConfig(_config);
+            await ProfileExManager.Instance.SaveTo();
+            await StatisticsManager.Instance.SaveTo();
+            await CoreManager.Instance.CoreStop();
+            StatisticsManager.Instance.Close();
+
+            Logging.SaveLog("AppExitAsync End");
+        }
+        catch { }
+        finally
+        {
+            if (needShutdown)
+            {
+                Shutdown(false);
+            }
+        }
+    }
+
+    public void Shutdown(bool byUser)
+    {
+        AppEvents.ShutdownRequested.OnNext(byUser);
+    }
+
+    #endregion App
 
     #region Config
 

v2rayN/ServiceLib/Manager/ClashApiManager.cs

@@ -35,7 +35,7 @@ public sealed class ClashApiManager
         return null;
     }
 
-    public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Action<ClashProxyModel?, string> updateFunc)
+    public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Func<ClashProxyModel?, string, Task> updateFunc)
     {
         Task.Run(async () =>
         {
@@ -79,12 +79,12 @@ public sealed class ClashApiManager
                 tasks.Add(Task.Run(async () =>
                 {
                     var result = await HttpClientHelper.Instance.TryGetAsync(url);
-                    updateFunc?.Invoke(it, result);
+                    await updateFunc?.Invoke(it, result);
                 }));
             }
             await Task.WhenAll(tasks);
             await Task.Delay(1000);
-            updateFunc?.Invoke(null, "");
+            await updateFunc?.Invoke(null, "");
         });
     }
 

v2rayN/ServiceLib/Manager/CoreAdminManager.cs

@@ -10,11 +10,11 @@ public class CoreAdminManager
     private static readonly Lazy<CoreAdminManager> _instance = new(() => new());
     public static CoreAdminManager Instance => _instance.Value;
     private Config _config;
-    private Action<bool, string>? _updateFunc;
+    private Func<bool, string, Task>? _updateFunc;
     private int _linuxSudoPid = -1;
     private const string _tag = "CoreAdminHandler";
 
-    public async Task Init(Config config, Action<bool, string> updateFunc)
+    public async Task Init(Config config, Func<bool, string, Task> updateFunc)
     {
         if (_config != null)
         {
@@ -26,9 +26,9 @@ public class CoreAdminManager
         await Task.CompletedTask;
     }
 
-    private void UpdateFunc(bool notify, string msg)
+    private async Task UpdateFunc(bool notify, string msg)
     {
-        _updateFunc?.Invoke(notify, msg);
+        await _updateFunc?.Invoke(notify, msg);
     }
 
     public async Task<Process?> RunProcessAsLinuxSudo(string fileName, CoreInfo coreInfo, string configPath)
@@ -60,7 +60,7 @@ public class CoreAdminManager
         {
             if (e.Data.IsNotEmpty())
             {
-                UpdateFunc(false, e.Data + Environment.NewLine);
+                _ = UpdateFunc(false, e.Data + Environment.NewLine);
             }
         }
 
@@ -106,7 +106,7 @@ public class CoreAdminManager
                 .WithStandardInputPipe(PipeSource.FromString(AppManager.Instance.LinuxSudoPwd))
                 .ExecuteBufferedAsync();
 
-            UpdateFunc(false, result.StandardOutput.ToString());
+            await UpdateFunc(false, result.StandardOutput.ToString());
         }
         catch (Exception ex)
         {

v2rayN/ServiceLib/Manager/CoreInfoManager.cs

@@ -80,6 +80,10 @@ public sealed class CoreInfoManager
                     Url = GetCoreUrl(ECoreType.v2fly),
                     Match = "V2Ray",
                     VersionArg = "-version",
+                    Environment = new Dictionary<string, string?>()
+                    {
+                        { Global.V2RayLocalAsset, Utils.GetBinPath("") },
+                    },
                 },
 
                 new CoreInfo
@@ -90,6 +94,10 @@ public sealed class CoreInfoManager
                     Url = GetCoreUrl(ECoreType.v2fly_v5),
                     Match = "V2Ray",
                     VersionArg = "version",
+                    Environment = new Dictionary<string, string?>()
+                    {
+                        { Global.V2RayLocalAsset, Utils.GetBinPath("") },
+                    },
                 },
 
                 new CoreInfo
@@ -107,20 +115,25 @@ public sealed class CoreInfoManager
                     DownloadUrlOSXArm64 = urlXray + "/download/{0}/Xray-macos-arm64-v8a.zip",
                     Match = "Xray",
                     VersionArg = "-version",
+                    Environment = new Dictionary<string, string?>()
+                    {
+                        { Global.XrayLocalAsset, Utils.GetBinPath("") },
+                        { Global.XrayLocalCert, Utils.GetBinPath("") },
+                    },
                 },
 
                 new CoreInfo
                 {
                     CoreType = ECoreType.mihomo,
-                    CoreExes = ["mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-linux-amd64", "clash", "mihomo"],
+                    CoreExes = ["mihomo-windows-amd64-v1", "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-linux-amd64", "clash", "mihomo"],
                     Arguments = "-f {0}" + PortableMode(),
                     Url = GetCoreUrl(ECoreType.mihomo),
                     ReleaseApiUrl = urlMihomo.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                    DownloadUrlWin64 = urlMihomo + "/download/{0}/mihomo-windows-amd64-compatible-{0}.zip",
+                    DownloadUrlWin64 = urlMihomo + "/download/{0}/mihomo-windows-amd64-v1-{0}.zip",
                     DownloadUrlWinArm64 = urlMihomo + "/download/{0}/mihomo-windows-arm64-{0}.zip",
-                    DownloadUrlLinux64 = urlMihomo + "/download/{0}/mihomo-linux-amd64-compatible-{0}.gz",
+                    DownloadUrlLinux64 = urlMihomo + "/download/{0}/mihomo-linux-amd64-v1-{0}.gz",
                     DownloadUrlLinuxArm64 = urlMihomo + "/download/{0}/mihomo-linux-arm64-{0}.gz",
-                    DownloadUrlOSX64 = urlMihomo + "/download/{0}/mihomo-darwin-amd64-compatible-{0}.gz",
+                    DownloadUrlOSX64 = urlMihomo + "/download/{0}/mihomo-darwin-amd64-v1-{0}.gz",
                     DownloadUrlOSXArm64 = urlMihomo + "/download/{0}/mihomo-darwin-arm64-{0}.gz",
                     Match = "Mihomo",
                     VersionArg = "-v",
@@ -205,12 +218,24 @@ public sealed class CoreInfoManager
                 new CoreInfo
                 {
                     CoreType = ECoreType.shadowquic,
-                    CoreExes = [ "shadowquic", "shadowquic"],
+                    CoreExes = [ "shadowquic" ],
                     Arguments = "-c {0}",
                     Url =  GetCoreUrl(ECoreType.shadowquic),
                     AbsolutePath = false,
-                }
+                },
 
+                new CoreInfo
+                {
+                    CoreType = ECoreType.mieru,
+                    CoreExes = [ "mieru" ],
+                    Arguments = "run",
+                    Url =  GetCoreUrl(ECoreType.mieru),
+                    AbsolutePath = false,
+                    Environment = new Dictionary<string, string?>()
+                    {
+                        { "MIERU_CONFIG_JSON_FILE", "{0}" },
+                    },
+                },
         ];
     }
 

v2rayN/ServiceLib/Manager/CoreManager.cs

@@ -14,18 +14,14 @@ public class CoreManager
     private Process? _process;
     private Process? _processPre;
     private bool _linuxSudo = false;
-    private Action<bool, string>? _updateFunc;
+    private Func<bool, string, Task>? _updateFunc;
     private const string _tag = "CoreHandler";
 
-    public async Task Init(Config config, Action<bool, string> updateFunc)
+    public async Task Init(Config config, Func<bool, string, Task> updateFunc)
     {
         _config = config;
         _updateFunc = updateFunc;
 
-        Environment.SetEnvironmentVariable(Global.V2RayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
-        Environment.SetEnvironmentVariable(Global.XrayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
-        Environment.SetEnvironmentVariable(Global.XrayLocalCert, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
-
         //Copy the bin folder to the storage location (for init)
         if (Environment.GetEnvironmentVariable(Global.LocalAppData) == "1")
         {
@@ -67,7 +63,7 @@ public class CoreManager
     {
         if (node == null)
         {
-            UpdateFunc(false, ResUI.CheckServerSettings);
+            await UpdateFunc(false, ResUI.CheckServerSettings);
             return;
         }
 
@@ -75,13 +71,13 @@ public class CoreManager
         var result = await CoreConfigHandler.GenerateClientConfig(node, fileName);
         if (result.Success != true)
         {
-            UpdateFunc(true, result.Msg);
+            await UpdateFunc(true, result.Msg);
             return;
         }
 
-        UpdateFunc(false, $"{node.GetSummary()}");
-        UpdateFunc(false, $"{Utils.GetRuntimeInfo()}");
-        UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
+        await UpdateFunc(false, $"{node.GetSummary()}");
+        await UpdateFunc(false, $"{Utils.GetRuntimeInfo()}");
+        await UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
         await CoreStop();
         await Task.Delay(100);
 
@@ -95,7 +91,7 @@ public class CoreManager
         await CoreStartPreService(node);
         if (_process != null)
         {
-            UpdateFunc(true, $"{node.GetSummary()}");
+            await UpdateFunc(true, $"{node.GetSummary()}");
         }
     }
 
@@ -105,14 +101,14 @@ public class CoreManager
         var fileName = string.Format(Global.CoreSpeedtestConfigFileName, Utils.GetGuid(false));
         var configPath = Utils.GetBinConfigPath(fileName);
         var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType);
-        UpdateFunc(false, result.Msg);
+        await UpdateFunc(false, result.Msg);
         if (result.Success != true)
         {
             return -1;
         }
 
-        UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
-        UpdateFunc(false, configPath);
+        await UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
+        await UpdateFunc(false, configPath);
 
         var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
         var proc = await RunProcess(coreInfo, fileName, true, false);
@@ -220,9 +216,9 @@ public class CoreManager
         }
     }
 
-    private void UpdateFunc(bool notify, string msg)
+    private async Task UpdateFunc(bool notify, string msg)
     {
-        _updateFunc?.Invoke(notify, msg);
+        await _updateFunc?.Invoke(notify, msg);
     }
 
     #endregion Private
@@ -234,7 +230,7 @@ public class CoreManager
         var fileName = CoreInfoManager.Instance.GetCoreExecFile(coreInfo, out var msg);
         if (fileName.IsNullOrEmpty())
         {
-            UpdateFunc(false, msg);
+            await UpdateFunc(false, msg);
             return null;
         }
 
@@ -255,7 +251,7 @@ public class CoreManager
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
-            UpdateFunc(mayNeedSudo, ex.Message);
+            await UpdateFunc(mayNeedSudo, ex.Message);
             return null;
         }
     }
@@ -277,6 +273,10 @@ public class CoreManager
                 StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
             }
         };
+        foreach (var kv in coreInfo.Environment)
+        {
+            proc.StartInfo.Environment[kv.Key] = string.Format(kv.Value, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath).AppendQuotes() : configPath);
+        }
 
         if (displayLog)
         {
@@ -284,7 +284,7 @@ public class CoreManager
             {
                 if (e.Data.IsNotEmpty())
                 {
-                    UpdateFunc(false, e.Data + Environment.NewLine);
+                    _ = UpdateFunc(false, e.Data + Environment.NewLine);
                 }
             }
             proc.OutputDataReceived += dataHandler;

v2rayN/ServiceLib/Manager/NoticeManager.cs

@@ -1,5 +1,3 @@
-using ReactiveUI;
-
 namespace ServiceLib.Manager;
 
 public class NoticeManager
@@ -13,7 +11,7 @@ public class NoticeManager
         {
             return;
         }
-        MessageBus.Current.SendMessage(content, EMsgCommand.SendSnackMsg.ToString());
+        AppEvents.SendSnackMsgRequested.OnNext(content);
     }
 
     public void SendMessage(string? content)
@@ -22,7 +20,7 @@ public class NoticeManager
         {
             return;
         }
-        MessageBus.Current.SendMessage(content, EMsgCommand.SendMsgView.ToString());
+        AppEvents.SendMsgViewRequested.OnNext(content);
     }
 
     public void SendMessageEx(string? content)

v2rayN/ServiceLib/Manager/StatisticsManager.cs

@@ -8,14 +8,14 @@ public class StatisticsManager
     private Config _config;
     private ServerStatItem? _serverStatItem;
     private List<ServerStatItem> _lstServerStat;
-    private Action<ServerSpeedItem>? _updateFunc;
+    private Func<ServerSpeedItem, Task>? _updateFunc;
 
     private StatisticsXrayService? _statisticsXray;
     private StatisticsSingboxService? _statisticsSingbox;
     private static readonly string _tag = "StatisticsHandler";
     public List<ServerStatItem> ServerStat => _lstServerStat;
 
-    public async Task Init(Config config, Action<ServerSpeedItem> updateFunc)
+    public async Task Init(Config config, Func<ServerSpeedItem, Task> updateFunc)
     {
         _config = config;
         _updateFunc = updateFunc;
@@ -97,9 +97,9 @@ public class StatisticsManager
         _lstServerStat = await SQLiteHelper.Instance.TableAsync<ServerStatItem>().ToListAsync();
     }
 
-    private void UpdateServerStatHandler(ServerSpeedItem server)
+    private async Task UpdateServerStatHandler(ServerSpeedItem server)
     {
-        _ = UpdateServerStat(server);
+        await UpdateServerStat(server);
     }
 
     private async Task UpdateServerStat(ServerSpeedItem server)
@@ -123,7 +123,7 @@ public class StatisticsManager
         server.TodayDown = _serverStatItem.TodayDown;
         server.TotalUp = _serverStatItem.TotalUp;
         server.TotalDown = _serverStatItem.TotalDown;
-        _updateFunc?.Invoke(server);
+        await _updateFunc?.Invoke(server);
     }
 
     private async Task GetServerStatItem(string indexId)

v2rayN/ServiceLib/Manager/TaskManager.cs

@@ -4,13 +4,18 @@ public class TaskManager
 {
     private static readonly Lazy<TaskManager> _instance = new(() => new());
     public static TaskManager Instance => _instance.Value;
+    private Config _config;
+    private Func<bool, string, Task>? _updateFunc;
 
-    public void RegUpdateTask(Config config, Action<bool, string> updateFunc)
+    public void RegUpdateTask(Config config, Func<bool, string, Task> updateFunc)
     {
-        Task.Run(() => ScheduledTasks(config, updateFunc));
+        _config = config;
+        _updateFunc = updateFunc;
+
+        Task.Run(ScheduledTasks);
     }
 
-    private async Task ScheduledTasks(Config config, Action<bool, string> updateFunc)
+    private async Task ScheduledTasks()
     {
         Logging.SaveLog("Setup Scheduled Tasks");
 
@@ -21,14 +26,14 @@ public class TaskManager
             await Task.Delay(1000 * 60);
 
             //Execute once 1 minute
-            await UpdateTaskRunSubscription(config, updateFunc);
+            await UpdateTaskRunSubscription();
 
             //Execute once 20 minute
             if (numOfExecuted % 20 == 0)
             {
                 //Logging.SaveLog("Execute save config");
 
-                await ConfigHandler.SaveConfig(config);
+                await ConfigHandler.SaveConfig(_config);
                 await ProfileExManager.Instance.SaveTo();
             }
 
@@ -42,14 +47,14 @@ public class TaskManager
                 FileManager.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
 
                 //Check once 1 hour
-                await UpdateTaskRunGeo(config, numOfExecuted / 60, updateFunc);
+                await UpdateTaskRunGeo(numOfExecuted / 60);
             }
 
             numOfExecuted++;
         }
     }
 
-    private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> updateFunc)
+    private async Task UpdateTaskRunSubscription()
     {
         var updateTime = ((DateTimeOffset)DateTime.Now).ToUnixTimeSeconds();
         var lstSubs = (await AppManager.Instance.SubItems())?
@@ -66,30 +71,30 @@ public class TaskManager
 
         foreach (var item in lstSubs)
         {
-            await SubscriptionHandler.UpdateProcess(config, item.Id, true, (success, msg) =>
+            await SubscriptionHandler.UpdateProcess(_config, item.Id, true, async (success, msg) =>
             {
-                updateFunc?.Invoke(success, msg);
+                await _updateFunc?.Invoke(success, msg);
                 if (success)
                 {
                     Logging.SaveLog($"Update subscription end. {msg}");
                 }
             });
             item.UpdateTime = updateTime;
-            await ConfigHandler.AddSubItem(config, item);
+            await ConfigHandler.AddSubItem(_config, item);
             await Task.Delay(1000);
         }
     }
 
-    private async Task UpdateTaskRunGeo(Config config, int hours, Action<bool, string> updateFunc)
+    private async Task UpdateTaskRunGeo(int hours)
     {
-        if (config.GuiItem.AutoUpdateInterval > 0 && hours > 0 && hours % config.GuiItem.AutoUpdateInterval == 0)
+        if (_config.GuiItem.AutoUpdateInterval > 0 && hours > 0 && hours % _config.GuiItem.AutoUpdateInterval == 0)
         {
             Logging.SaveLog("Execute update geo files");
 
             var updateHandle = new UpdateService();
-            await updateHandle.UpdateGeoFileAll(config, (success, msg) =>
+            await updateHandle.UpdateGeoFileAll(_config, async (success, msg) =>
             {
-                updateFunc?.Invoke(false, msg);
+                await _updateFunc?.Invoke(false, msg);
             });
         }
     }

v2rayN/ServiceLib/Models/CheckUpdateModel.cs

@@ -1,10 +1,13 @@
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
+
 namespace ServiceLib.Models;
 
-public class CheckUpdateModel
+public class CheckUpdateModel : ReactiveObject
 {
     public bool? IsSelected { get; set; }
     public string? CoreType { get; set; }
-    public string? Remarks { get; set; }
+    [Reactive] public string? Remarks { get; set; }
     public string? FileName { get; set; }
     public bool? IsFinished { get; set; }
 }

v2rayN/ServiceLib/Models/ClashProxyModel.cs

@@ -1,7 +1,10 @@
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
+
 namespace ServiceLib.Models;
 
 [Serializable]
-public class ClashProxyModel
+public class ClashProxyModel : ReactiveObject
 {
     public string? Name { get; set; }
 
@@ -9,9 +12,9 @@ public class ClashProxyModel
 
     public string? Now { get; set; }
 
-    public int Delay { get; set; }
+    [Reactive] public int Delay { get; set; }
 
-    public string? DelayName { get; set; }
+    [Reactive] public string? DelayName { get; set; }
 
     public bool IsActive { get; set; }
 }

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -260,6 +260,7 @@ public class SimpleDNSItem
     public bool? UseSystemHosts { get; set; }
     public bool? AddCommonHosts { get; set; }
     public bool? FakeIP { get; set; }
+    public bool? GlobalFakeIp { get; set; }
     public bool? BlockBindingQuery { get; set; }
     public string? DirectDNS { get; set; }
     public string? RemoteDNS { get; set; }

v2rayN/ServiceLib/Models/CoreInfo.cs

@@ -17,4 +17,5 @@ public class CoreInfo
     public string? Match { get; set; }
     public string? VersionArg { get; set; }
     public bool AbsolutePath { get; set; }
+    public IDictionary<string, string?> Environment { get; set; } = new Dictionary<string, string?>();
 }

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

@@ -1455,9 +1455,6 @@
   <data name="TbDNSHostsConfig" xml:space="preserve">
     <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
   </data>
-  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
-    <value>Apply to Proxy Domains Only</value>
-  </data>
   <data name="ThBasicDNSSettings" xml:space="preserve">
     <value>Basic DNS Settings</value>
   </data>
@@ -1509,4 +1506,13 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
-</root>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>Start parsing and processing subscription content</value>
+  </data>
+  <data name="TbSelectProfile" xml:space="preserve">
+    <value>Select Profile</value>
+  </data>
+  <data name="TbFakeIPTips" xml:space="preserve">
+    <value>Applies globally by default, with built-in FakeIP filtering (sing-box only).</value>
+  </data>
+</root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1455,9 +1455,6 @@
   <data name="TbDNSHostsConfig" xml:space="preserve">
     <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
   </data>
-  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
-    <value>Apply to Proxy Domains Only</value>
-  </data>
   <data name="ThBasicDNSSettings" xml:space="preserve">
     <value>Basic DNS Settings</value>
   </data>
@@ -1509,4 +1506,13 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
-</root>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>Start parsing and processing subscription content</value>
+  </data>
+  <data name="TbSelectProfile" xml:space="preserve">
+    <value>Select Profile</value>
+  </data>
+  <data name="TbFakeIPTips" xml:space="preserve">
+    <value>Applies globally by default, with built-in FakeIP filtering (sing-box only).</value>
+  </data>
+</root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1455,9 +1455,6 @@
   <data name="TbDNSHostsConfig" xml:space="preserve">
     <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
   </data>
-  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
-    <value>Apply to Proxy Domains Only</value>
-  </data>
   <data name="ThBasicDNSSettings" xml:space="preserve">
     <value>Basic DNS Settings</value>
   </data>
@@ -1509,4 +1506,13 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
-</root>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>Start parsing and processing subscription content</value>
+  </data>
+  <data name="TbSelectProfile" xml:space="preserve">
+    <value>Select Profile</value>
+  </data>
+  <data name="TbFakeIPTips" xml:space="preserve">
+    <value>Applies globally by default, with built-in FakeIP filtering (sing-box only).</value>
+  </data>
+</root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1455,9 +1455,6 @@
   <data name="TbDNSHostsConfig" xml:space="preserve">
     <value>DNS hosts: (каждая строка в формате "domain1 ip1 ip2")</value>
   </data>
-  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
-    <value>Применять только к доменам через прокси</value>
-  </data>
   <data name="ThBasicDNSSettings" xml:space="preserve">
     <value>Базовые настройки DNS</value>
   </data>
@@ -1509,4 +1506,13 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>Эта функция предназначена для продвинутых пользователей и особых случаев. После включения игнорируются базовые настройки ядра, DNS и маршрутизации. Вы должны самостоятельно корректно задать порт системного прокси, учёт трафика и другие связанные параметры — всё настраивается вручную.</value>
   </data>
-</root>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>Start parsing and processing subscription content</value>
+  </data>
+  <data name="TbSelectProfile" xml:space="preserve">
+    <value>Select Profile</value>
+  </data>
+  <data name="TbFakeIPTips" xml:space="preserve">
+    <value>Applies globally by default, with built-in FakeIP filtering (sing-box only).</value>
+  </data>
+</root>

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

@@ -1452,9 +1452,6 @@
   <data name="TbDNSHostsConfig" xml:space="preserve">
     <value>DNS Hosts：（“域名1 ip1 ip2” 一行一个）</value>
   </data>
-  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
-    <value>仅对代理域名生效</value>
-  </data>
   <data name="ThBasicDNSSettings" xml:space="preserve">
     <value>DNS 基础设置</value>
   </data>
@@ -1506,4 +1503,13 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>此功能供高级用户和有特殊需求的用户使用。 启用此功能后，将忽略 Core 的基础设置，DNS 设置 ，路由设置。你需要保证系统代理的端口和流量统计等功能的配置正确，一切都由你来设置。</value>
   </data>
-</root>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>开始解析和处理订阅内容</value>
+  </data>
+  <data name="TbSelectProfile" xml:space="preserve">
+    <value>选择配置文件</value>
+  </data>
+  <data name="TbFakeIPTips" xml:space="preserve">
+    <value>默认全局生效，内置 FakeIP 过滤，仅在 sing-box 中生效</value>
+  </data>
+</root>

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

@@ -1452,9 +1452,6 @@
   <data name="TbDNSHostsConfig" xml:space="preserve">
     <value>DNS Hosts: ("domain1 ip1 ip2" per line)</value>
   </data>
-  <data name="TbApplyProxyDomainsOnly" xml:space="preserve">
-    <value>Apply to Proxy Domains Only</value>
-  </data>
   <data name="ThBasicDNSSettings" xml:space="preserve">
     <value>Basic DNS Settings</value>
   </data>
@@ -1506,4 +1503,13 @@
   <data name="TbFullConfigTemplateDesc" xml:space="preserve">
     <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
   </data>
-</root>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>開始解析和處理訂閱內容</value>
+  </data>
+  <data name="TbSelectProfile" xml:space="preserve">
+    <value>Select Profile</value>
+  </data>
+  <data name="TbFakeIPTips" xml:space="preserve">
+    <value>Applies globally by default, with built-in FakeIP filtering (sing-box only).</value>
+  </data>
+</root>

v2rayN/ServiceLib/Sample/singbox_fakeip_filter

@@ -0,0 +1,92 @@
+{
+  "domain": [
+    "amobile.music.tc.qq.com",
+    "api-jooxtt.sanook.com",
+    "api.joox.com",
+    "aqqmusic.tc.qq.com",
+    "dl.stream.qqmusic.qq.com",
+    "ff.dorado.sdo.com",
+    "heartbeat.belkin.com",
+    "isure.stream.qqmusic.qq.com",
+    "joox.com",
+    "lens.l.google.com",
+    "localhost.ptlogin2.qq.com",
+    "localhost.sec.qq.com",
+    "mesu.apple.com",
+    "mobileoc.music.tc.qq.com",
+    "music.taihe.com",
+    "musicapi.taihe.com",
+    "na.b.g-tun.com",
+    "proxy.golang.org",
+    "ps.res.netease.com",
+    "shark007.net",
+    "songsearch.kugou.com",
+    "static.adtidy.org",
+    "streamoc.music.tc.qq.com",
+    "swcdn.apple.com",
+    "swdist.apple.com",
+    "swdownload.apple.com",
+    "swquery.apple.com",
+    "swscan.apple.com",
+    "trackercdn.kugou.com",
+    "xnotify.xboxlive.com"
+  ],
+  "domain_keyword": [
+    "ntp",
+    "stun",
+    "time"
+  ],
+  "domain_regex": [
+    "^[^.]+$",
+    "^[^.]+\\.[^.]+\\.xboxlive\\.com$",
+    "^localhost\\.[^.]+\\.weixin\\.qq\\.com$",
+    "^mijia\\scloud$",
+    "^xbox\\.[^.]+\\.microsoft\\.com$",
+    "^xbox\\.[^.]+\\.[^.]+\\.microsoft\\.com$"
+  ],
+  "domain_suffix": [
+    "126.net",
+    "3gppnetwork.org",
+    "battle.net",
+    "battlenet.com.cn",
+    "cdn.nintendo.net",
+    "cmbchina.com",
+    "cmbimg.com",
+    "ff14.sdo.com",
+    "ffxiv.com",
+    "finalfantasyxiv.com",
+    "gcloudcs.com",
+    "home.arpa",
+    "invalid",
+    "kuwo.cn",
+    "lan",
+    "linksys.com",
+    "linksyssmartwifi.com",
+    "local",
+    "localdomain",
+    "localhost",
+    "market.xiaomi.com",
+    "mcdn.bilivideo.cn",
+    "media.dssott.com",
+    "msftconnecttest.com",
+    "msftncsi.com",
+    "music.163.com",
+    "music.migu.cn",
+    "n0808.com",
+    "nflxvideo.net",
+    "oray.com",
+    "orayimg.com",
+    "router.asus.com",
+    "sandai.net",
+    "square-enix.com",
+    "srv.nintendo.net",
+    "steamcontent.com",
+    "uu.163.com",
+    "wargaming.net",
+    "wggames.cn",
+    "wotgame.cn",
+    "wowsgame.cn",
+    "xiami.com",
+    "y.qq.com"
+  ]
+}

v2rayN/ServiceLib/ServiceLib.csproj

@@ -44,6 +44,7 @@
 		<EmbeddedResource Include="Sample\tun_singbox_inbound" />
 		<EmbeddedResource Include="Sample\tun_singbox_rules" />
 		<EmbeddedResource Include="Sample\linux_autostart_config" />
+        <EmbeddedResource Include="Sample\singbox_fakeip_filter" />
 	</ItemGroup>
 
 	<ItemGroup>

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

@@ -33,17 +33,17 @@ public partial class CoreConfigSingboxService
                                    lastRule.Ip?.Contains("0.0.0.0/0") == true);
             }
             singboxConfig.dns.final = useDirectDns ? Global.SingboxDirectDNSTag : Global.SingboxRemoteDNSTag;
-
-            // Tun2SocksAddress
-            if (node != null && Utils.IsDomain(node.Address))
+            if ((!useDirectDns) && simpleDNSItem.FakeIP == true && simpleDNSItem.GlobalFakeIp == false)
             {
-                singboxConfig.dns.rules ??= new List<Rule4Sbox>();
-                singboxConfig.dns.rules.Insert(0, new Rule4Sbox
+                singboxConfig.dns.rules.Add(new()
                 {
-                    server = Global.SingboxOutboundResolverTag,
-                    domain = [node.Address],
+                    server = Global.SingboxFakeDNSTag,
+                    query_type = new List<int> { 1, 28 }, // A and AAAA
+                    rewrite_ttl = 1,
                 });
             }
+
+            await GenOutboundDnsRule(node, singboxConfig, Global.SingboxOutboundResolverTag);
         }
         catch (Exception ex)
         {
@@ -80,25 +80,21 @@ public partial class CoreConfigSingboxService
             hostsDns.predefined = Global.PredefinedHosts;
         }
 
+        if (simpleDNSItem.UseSystemHosts == true)
+        {
+            var systemHosts = Utils.GetSystemHosts();
+            if (systemHosts != null && systemHosts.Count > 0)
+            {
+                foreach (var host in systemHosts)
+                {
+                    hostsDns.predefined.TryAdd(host.Key, new List<string> { host.Value });
+                }
+            }
+        }
+
         if (!simpleDNSItem.Hosts.IsNullOrEmpty())
         {
-            var userHostsMap = simpleDNSItem.Hosts?
-                .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-                .Where(line => !string.IsNullOrWhiteSpace(line))
-                .Where(line => line.Contains(' '))
-                .ToDictionary(
-                    line =>
-                    {
-                        var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                        return parts[0];
-                    },
-                    line =>
-                    {
-                        var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                        var values = parts.Skip(1).ToList();
-                        return values;
-                    }
-                ) ?? new Dictionary<string, List<string>>();
+            var userHostsMap = Utils.ParseHostsToDictionary(simpleDNSItem.Hosts);
 
             foreach (var kvp in userHostsMap)
             {
@@ -106,22 +102,6 @@ public partial class CoreConfigSingboxService
             }
         }
 
-        if (simpleDNSItem.UseSystemHosts == true)
-        {
-            var systemHosts = Utils.GetSystemHosts();
-            if (systemHosts.Count > 0)
-            {
-                foreach (var host in systemHosts)
-                {
-                    if (hostsDns.predefined[host.Key] != null)
-                    {
-                        continue;
-                    }
-                    hostsDns.predefined[host.Key] = new List<string> { host.Value };
-                }
-            }
-        }
-
         foreach (var host in hostsDns.predefined)
         {
             if (finalDns.server == host.Key)
@@ -207,6 +187,28 @@ public partial class CoreConfigSingboxService
             });
         }
 
+        if (simpleDNSItem.FakeIP == true && simpleDNSItem.GlobalFakeIp == true)
+        {
+            var fakeipFilterRule = JsonUtils.Deserialize<Rule4Sbox>(EmbedUtils.GetEmbedText(Global.SingboxFakeIPFilterFileName));
+            fakeipFilterRule.invert = true;
+            var rule4Fake = new Rule4Sbox
+            {
+                server = Global.SingboxFakeDNSTag,
+                type = "logical",
+                mode = "and",
+                rewrite_ttl = 1,
+                rules = new List<Rule4Sbox>
+                {
+                    new() {
+                        query_type = new List<int> { 1, 28 }, // A and AAAA
+                    },
+                    fakeipFilterRule,
+                }
+            };
+
+            singboxConfig.dns.rules.Add(rule4Fake);
+        }
+
         var routing = await ConfigHandler.GetDefaultRouting(_config);
         if (routing == null)
             return 0;
@@ -286,10 +288,12 @@ public partial class CoreConfigSingboxService
             }
             else
             {
-                if (simpleDNSItem.FakeIP == true)
+                if (simpleDNSItem.FakeIP == true && simpleDNSItem.GlobalFakeIp == false)
                 {
                     var rule4Fake = JsonUtils.DeepCopy(rule);
                     rule4Fake.server = Global.SingboxFakeDNSTag;
+                    rule4Fake.query_type = new List<int> { 1, 28 }; // A and AAAA
+                    rule4Fake.rewrite_ttl = 1;
                     singboxConfig.dns.rules.Add(rule4Fake);
                 }
                 rule.server = Global.SingboxRemoteDNSTag;
@@ -333,16 +337,7 @@ public partial class CoreConfigSingboxService
                 await GenDnsDomainsLegacyCompatible(singboxConfig, item);
             }
 
-            // Tun2SocksAddress
-            if (node != null && Utils.IsDomain(node.Address))
-            {
-                singboxConfig.dns.rules ??= new List<Rule4Sbox>();
-                singboxConfig.dns.rules.Insert(0, new Rule4Sbox
-                {
-                    server = Global.SingboxFinalResolverTag,
-                    domain = [node.Address],
-                });
-            }
+            await GenOutboundDnsRule(node, singboxConfig, Global.SingboxFinalResolverTag);
         }
         catch (Exception ex)
         {
@@ -412,6 +407,37 @@ public partial class CoreConfigSingboxService
         return await Task.FromResult(0);
     }
 
+    private async Task<int> GenOutboundDnsRule(ProfileItem? node, SingboxConfig singboxConfig, string? server)
+    {
+        if (node == null)
+        {
+            return 0;
+        }
+
+        var domain = string.Empty;
+        if (Utils.IsDomain(node.Address)) // normal outbound
+        {
+            domain = node.Address;
+        }
+        else if (node.Address == Global.Loopback && node.SpiderX.IsNotEmpty() && Utils.IsDomain(node.SpiderX)) // Tun2SocksAddress
+        {
+            domain = node.SpiderX;
+        }
+        if (domain.IsNullOrEmpty())
+        {
+            return 0;
+        }
+
+        singboxConfig.dns.rules ??= new List<Rule4Sbox>();
+        singboxConfig.dns.rules.Insert(0, new Rule4Sbox
+        {
+            server = server,
+            domain = [domain],
+        });
+
+        return await Task.FromResult(0);
+    }
+
     private static Server4Sbox? ParseDnsAddress(string address)
     {
         var addressFirst = address?.Split(address.Contains(',') ? ',' : ';').FirstOrDefault()?.Trim();

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

@@ -10,7 +10,7 @@ public partial class CoreConfigSingboxService
             singboxConfig.inbounds = [];
 
             if (!_config.TunModeItem.EnableTun
-                || _config.TunModeItem.EnableTun && _config.TunModeItem.EnableExInbound && _config.RunningCoreType == ECoreType.sing_box)
+                || (_config.TunModeItem.EnableTun && _config.TunModeItem.EnableExInbound && _config.RunningCoreType == ECoreType.sing_box))
             {
                 var inbound = new Inbound4Sbox()
                 {
@@ -78,7 +78,7 @@ public partial class CoreConfigSingboxService
         {
             Logging.SaveLog(_tag, ex);
         }
-        return 0;
+        return await Task.FromResult(0);
     }
 
     private Inbound4Sbox GetInbound(Inbound4Sbox inItem, EInboundProtocol protocol, bool bSocks)

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

@@ -71,6 +71,37 @@ public partial class CoreConfigSingboxService
                 });
             }
 
+            var hostsDomains = new List<string>();
+            var dnsItem = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
+            if (dnsItem == null || dnsItem.Enabled == false)
+            {
+                var simpleDNSItem = _config.SimpleDNSItem;
+                if (!simpleDNSItem.Hosts.IsNullOrEmpty())
+                {
+                    var userHostsMap = Utils.ParseHostsToDictionary(simpleDNSItem.Hosts);
+                    foreach (var kvp in userHostsMap)
+                    {
+                        hostsDomains.Add(kvp.Key);
+                    }
+                }
+                if (simpleDNSItem.UseSystemHosts == true)
+                {
+                    var systemHostsMap = Utils.GetSystemHosts();
+                    foreach (var kvp in systemHostsMap)
+                    {
+                        hostsDomains.Add(kvp.Key);
+                    }
+                }
+            }
+            if (hostsDomains.Count > 0)
+            {
+                singboxConfig.route.rules.Add(new()
+                {
+                    action = "resolve",
+                    domain = hostsDomains,
+                });
+            }
+
             singboxConfig.route.rules.Add(new()
             {
                 outbound = Global.DirectTag,
@@ -343,6 +374,13 @@ public partial class CoreConfigSingboxService
             return Global.ProxyTag;
         }
 
+        var tag = Global.ProxyTag + node.IndexId.ToString();
+        if (singboxConfig.outbounds.Any(o => o.tag == tag)
+            || (singboxConfig.endpoints != null && singboxConfig.endpoints.Any(e => e.tag == tag)))
+        {
+            return tag;
+        }
+
         var server = await GenServer(node);
         if (server is null)
         {

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

@@ -248,43 +248,21 @@ public partial class CoreConfigV2rayService
         if (simpleDNSItem.UseSystemHosts == true)
         {
             var systemHosts = Utils.GetSystemHosts();
-            if (systemHosts.Count > 0)
+            var normalHost = v2rayConfig?.dns?.hosts;
+
+            if (normalHost != null && systemHosts?.Count > 0)
             {
-                var normalHost = v2rayConfig.dns.hosts;
-                if (normalHost != null)
+                foreach (var host in systemHosts)
                 {
-                    foreach (var host in systemHosts)
-                    {
-                        if (normalHost[host.Key] != null)
-                        {
-                            continue;
-                        }
-                        normalHost[host.Key] = new List<string> { host.Value };
-                    }
+                    normalHost.TryAdd(host.Key, new List<string> { host.Value });
                 }
             }
         }
 
-        var userHostsMap = simpleDNSItem.Hosts?
-            .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-            .Where(line => !string.IsNullOrWhiteSpace(line))
-            .Where(line => line.Contains(' '))
-            .ToDictionary(
-                line =>
-                {
-                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                    return parts[0];
-                },
-                line =>
-                {
-                    var parts = line.Trim().Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                    var values = parts.Skip(1).ToList();
-                    return values;
-                }
-            );
-
-        if (userHostsMap != null)
+        if (!simpleDNSItem.Hosts.IsNullOrEmpty())
         {
+            var userHostsMap = Utils.ParseHostsToDictionary(simpleDNSItem.Hosts);
+
             foreach (var kvp in userHostsMap)
             {
                 v2rayConfig.dns.hosts[kvp.Key] = kvp.Value;

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

@@ -131,10 +131,16 @@ public partial class CoreConfigV2rayService
             return Global.ProxyTag;
         }
 
+        var tag = Global.ProxyTag + node.IndexId.ToString();
+        if (v2rayConfig.outbounds.Any(p => p.tag == tag))
+        {
+            return tag;
+        }
+
         var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
         var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
         await GenOutbound(node, outbound);
-        outbound.tag = Global.ProxyTag + node.IndexId.ToString();
+        outbound.tag = tag;
         v2rayConfig.outbounds.Add(outbound);
 
         return outbound.tag;

v2rayN/ServiceLib/Services/DownloadService.cs

@@ -15,7 +15,7 @@ public class DownloadService
 
     private static readonly string _tag = "DownloadService";
 
-    public async Task<int> DownloadDataAsync(string url, WebProxy webProxy, int downloadTimeout, Action<bool, string> updateFunc)
+    public async Task<int> DownloadDataAsync(string url, WebProxy webProxy, int downloadTimeout, Func<bool, string, Task> updateFunc)
     {
         try
         {
@@ -31,10 +31,10 @@ public class DownloadService
         }
         catch (Exception ex)
         {
-            updateFunc?.Invoke(false, ex.Message);
+            await updateFunc?.Invoke(false, ex.Message);
             if (ex.InnerException != null)
             {
-                updateFunc?.Invoke(false, ex.InnerException.Message);
+                await updateFunc?.Invoke(false, ex.InnerException.Message);
             }
         }
         return 0;

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -5,26 +5,20 @@ using System.Net.Sockets;
 
 namespace ServiceLib.Services;
 
-public class SpeedtestService
+public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateFunc)
 {
     private static readonly string _tag = "SpeedtestService";
-    private Config? _config;
-    private Action<SpeedTestResult>? _updateFunc;
+    private readonly Config? _config = config;
+    private readonly Func<SpeedTestResult, Task>? _updateFunc = updateFunc;
     private static readonly ConcurrentBag<string> _lstExitLoop = new();
 
-    public SpeedtestService(Config config, Action<SpeedTestResult> updateFunc)
-    {
-        _config = config;
-        _updateFunc = updateFunc;
-    }
-
     public void RunLoop(ESpeedActionType actionType, List<ProfileItem> selecteds)
     {
         Task.Run(async () =>
         {
             await RunAsync(actionType, selecteds);
             await ProfileExManager.Instance.SaveTo();
-            UpdateFunc("", ResUI.SpeedtestingCompleted);
+            await UpdateFunc("", ResUI.SpeedtestingCompleted);
         });
     }
 
@@ -43,7 +37,7 @@ public class SpeedtestService
         var exitLoopKey = Utils.GetGuid(false);
         _lstExitLoop.Add(exitLoopKey);
 
-        var lstSelected = GetClearItem(actionType, selecteds);
+        var lstSelected = await GetClearItem(actionType, selecteds);
 
         switch (actionType)
         {
@@ -65,7 +59,7 @@ public class SpeedtestService
         }
     }
 
-    private List<ServerTestItem> GetClearItem(ESpeedActionType actionType, List<ProfileItem> selecteds)
+    private async Task<List<ServerTestItem>> GetClearItem(ESpeedActionType actionType, List<ProfileItem> selecteds)
     {
         var lstSelected = new List<ServerTestItem>();
         foreach (var it in selecteds)
@@ -97,17 +91,17 @@ public class SpeedtestService
             {
                 case ESpeedActionType.Tcping:
                 case ESpeedActionType.Realping:
-                    UpdateFunc(it.IndexId, ResUI.Speedtesting, "");
+                    await UpdateFunc(it.IndexId, ResUI.Speedtesting, "");
                     ProfileExManager.Instance.SetTestDelay(it.IndexId, 0);
                     break;
 
                 case ESpeedActionType.Speedtest:
-                    UpdateFunc(it.IndexId, "", ResUI.SpeedtestingWait);
+                    await UpdateFunc(it.IndexId, "", ResUI.SpeedtestingWait);
                     ProfileExManager.Instance.SetTestSpeed(it.IndexId, 0);
                     break;
 
                 case ESpeedActionType.Mixedtest:
-                    UpdateFunc(it.IndexId, ResUI.Speedtesting, ResUI.SpeedtestingWait);
+                    await UpdateFunc(it.IndexId, ResUI.Speedtesting, ResUI.SpeedtestingWait);
                     ProfileExManager.Instance.SetTestDelay(it.IndexId, 0);
                     ProfileExManager.Instance.SetTestSpeed(it.IndexId, 0);
                     break;
@@ -133,7 +127,7 @@ public class SpeedtestService
                     var responseTime = await GetTcpingTime(it.Address, it.Port);
 
                     ProfileExManager.Instance.SetTestDelay(it.IndexId, responseTime);
-                    UpdateFunc(it.IndexId, responseTime.ToString());
+                    await UpdateFunc(it.IndexId, responseTime.ToString());
                 }
                 catch (Exception ex)
                 {
@@ -169,11 +163,11 @@ public class SpeedtestService
         {
             if (_lstExitLoop.Any(p => p == exitLoopKey) == false)
             {
-                UpdateFunc("", ResUI.SpeedtestingSkip);
+                await UpdateFunc("", ResUI.SpeedtestingSkip);
                 return;
             }
 
-            UpdateFunc("", string.Format(ResUI.SpeedtestingTestFailedPart, lstFailed.Count));
+            await UpdateFunc("", string.Format(ResUI.SpeedtestingTestFailedPart, lstFailed.Count));
 
             if (pageSizeNext > _config.SpeedTestItem.MixedConcurrencyCount)
             {
@@ -239,7 +233,7 @@ public class SpeedtestService
         {
             if (_lstExitLoop.Any(p => p == exitLoopKey) == false)
             {
-                UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
+                await UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
                 continue;
             }
             if (it.ConfigType == EConfigType.Custom)
@@ -256,7 +250,7 @@ public class SpeedtestService
                     pid = await CoreManager.Instance.LoadCoreConfigSpeedtest(it);
                     if (pid < 0)
                     {
-                        UpdateFunc(it.IndexId, "", ResUI.FailedToRunCore);
+                        await UpdateFunc(it.IndexId, "", ResUI.FailedToRunCore);
                     }
                     else
                     {
@@ -270,7 +264,7 @@ public class SpeedtestService
                             }
                             else
                             {
-                                UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
+                                await UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
                             }
                         }
                     }
@@ -298,25 +292,25 @@ public class SpeedtestService
         var responseTime = await HttpClientHelper.Instance.GetRealPingTime(_config.SpeedTestItem.SpeedPingTestUrl, webProxy, 10);
 
         ProfileExManager.Instance.SetTestDelay(it.IndexId, responseTime);
-        UpdateFunc(it.IndexId, responseTime.ToString());
+        await UpdateFunc(it.IndexId, responseTime.ToString());
         return responseTime;
     }
 
     private async Task DoSpeedTest(DownloadService downloadHandle, ServerTestItem it)
     {
-        UpdateFunc(it.IndexId, "", ResUI.Speedtesting);
+        await UpdateFunc(it.IndexId, "", ResUI.Speedtesting);
 
         var webProxy = new WebProxy($"socks5://{Global.Loopback}:{it.Port}");
         var url = _config.SpeedTestItem.SpeedTestUrl;
         var timeout = _config.SpeedTestItem.SpeedTestTimeout;
-        await downloadHandle.DownloadDataAsync(url, webProxy, timeout, (success, msg) =>
+        await downloadHandle.DownloadDataAsync(url, webProxy, timeout, async (success, msg) =>
         {
             decimal.TryParse(msg, out var dec);
             if (dec > 0)
             {
                 ProfileExManager.Instance.SetTestSpeed(it.IndexId, dec);
             }
-            UpdateFunc(it.IndexId, "", msg);
+            await UpdateFunc(it.IndexId, "", msg);
         });
     }
 
@@ -371,9 +365,9 @@ public class SpeedtestService
         return lstTest;
     }
 
-    private void UpdateFunc(string indexId, string delay, string speed = "")
+    private async Task UpdateFunc(string indexId, string delay, string speed = "")
     {
-        _updateFunc?.Invoke(new() { IndexId = indexId, Delay = delay, Speed = speed });
+        await _updateFunc?.Invoke(new() { IndexId = indexId, Delay = delay, Speed = speed });
         if (indexId.IsNotEmpty() && speed.IsNotEmpty())
         {
             ProfileExManager.Instance.SetTestMessage(indexId, speed);

v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs

@@ -8,11 +8,11 @@ public class StatisticsSingboxService
     private readonly Config _config;
     private bool _exitFlag;
     private ClientWebSocket? webSocket;
-    private Action<ServerSpeedItem>? _updateFunc;
+    private readonly Func<ServerSpeedItem, Task>? _updateFunc;
     private string Url => $"ws://{Global.Loopback}:{AppManager.Instance.StatePort2}/traffic";
     private static readonly string _tag = "StatisticsSingboxService";
 
-    public StatisticsSingboxService(Config config, Action<ServerSpeedItem> updateFunc)
+    public StatisticsSingboxService(Config config, Func<ServerSpeedItem, Task> updateFunc)
     {
         _config = config;
         _updateFunc = updateFunc;
@@ -90,7 +90,7 @@ public class StatisticsSingboxService
                         {
                             ParseOutput(result, out var up, out var down);
 
-                            _updateFunc?.Invoke(new ServerSpeedItem()
+                            await _updateFunc?.Invoke(new ServerSpeedItem()
                             {
                                 ProxyUp = (long)(up / 1000),
                                 ProxyDown = (long)(down / 1000)

v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs

@@ -6,10 +6,10 @@ public class StatisticsXrayService
     private ServerSpeedItem _serverSpeedItem = new();
     private readonly Config _config;
     private bool _exitFlag;
-    private Action<ServerSpeedItem>? _updateFunc;
+    private readonly Func<ServerSpeedItem, Task>? _updateFunc;
     private string Url => $"{Global.HttpProtocol}{Global.Loopback}:{AppManager.Instance.StatePort}/debug/vars";
 
-    public StatisticsXrayService(Config config, Action<ServerSpeedItem> updateFunc)
+    public StatisticsXrayService(Config config, Func<ServerSpeedItem, Task> updateFunc)
     {
         _config = config;
         _updateFunc = updateFunc;
@@ -39,7 +39,7 @@ public class StatisticsXrayService
                 if (result != null)
                 {
                     var server = ParseOutput(result) ?? new ServerSpeedItem();
-                    _updateFunc?.Invoke(server);
+                    await _updateFunc?.Invoke(server);
                 }
             }
             catch

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -5,11 +5,11 @@ namespace ServiceLib.Services;
 
 public class UpdateService
 {
-    private Action<bool, string>? _updateFunc;
+    private Func<bool, string, Task>? _updateFunc;
     private readonly int _timeout = 30;
     private static readonly string _tag = "UpdateService";
 
-    public async Task CheckUpdateGuiN(Config config, Action<bool, string> updateFunc, bool preRelease)
+    public async Task CheckUpdateGuiN(Config config, Func<bool, string, Task> updateFunc, bool preRelease)
     {
         _updateFunc = updateFunc;
         var url = string.Empty;
@@ -20,25 +20,25 @@ public class UpdateService
         {
             if (args.Success)
             {
-                _updateFunc?.Invoke(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
-                _updateFunc?.Invoke(true, Utils.UrlEncode(fileName));
+                UpdateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
+                UpdateFunc(true, Utils.UrlEncode(fileName));
             }
             else
             {
-                _updateFunc?.Invoke(false, args.Msg);
+                UpdateFunc(false, args.Msg);
             }
         };
         downloadHandle.Error += (sender2, args) =>
         {
-            _updateFunc?.Invoke(false, args.GetException().Message);
+            UpdateFunc(false, args.GetException().Message);
         };
 
-        _updateFunc?.Invoke(false, string.Format(ResUI.MsgStartUpdating, ECoreType.v2rayN));
+        await UpdateFunc(false, string.Format(ResUI.MsgStartUpdating, ECoreType.v2rayN));
         var result = await CheckUpdateAsync(downloadHandle, ECoreType.v2rayN, preRelease);
         if (result.Success)
         {
-            _updateFunc?.Invoke(false, string.Format(ResUI.MsgParsingSuccessfully, ECoreType.v2rayN));
-            _updateFunc?.Invoke(false, result.Msg);
+            await UpdateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, ECoreType.v2rayN));
+            await UpdateFunc(false, result.Msg);
 
             url = result.Data?.ToString();
             fileName = Utils.GetTempPath(Utils.GetGuid());
@@ -46,11 +46,11 @@ public class UpdateService
         }
         else
         {
-            _updateFunc?.Invoke(false, result.Msg);
+            await UpdateFunc(false, result.Msg);
         }
     }
 
-    public async Task CheckUpdateCore(ECoreType type, Config config, Action<bool, string> updateFunc, bool preRelease)
+    public async Task CheckUpdateCore(ECoreType type, Config config, Func<bool, string, Task> updateFunc, bool preRelease)
     {
         _updateFunc = updateFunc;
         var url = string.Empty;
@@ -61,34 +61,34 @@ public class UpdateService
         {
             if (args.Success)
             {
-                _updateFunc?.Invoke(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
-                _updateFunc?.Invoke(false, ResUI.MsgUnpacking);
+                UpdateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
+                UpdateFunc(false, ResUI.MsgUnpacking);
 
                 try
                 {
-                    _updateFunc?.Invoke(true, fileName);
+                    UpdateFunc(true, fileName);
                 }
                 catch (Exception ex)
                 {
-                    _updateFunc?.Invoke(false, ex.Message);
+                    UpdateFunc(false, ex.Message);
                 }
             }
             else
             {
-                _updateFunc?.Invoke(false, args.Msg);
+                UpdateFunc(false, args.Msg);
             }
         };
         downloadHandle.Error += (sender2, args) =>
         {
-            _updateFunc?.Invoke(false, args.GetException().Message);
+            UpdateFunc(false, args.GetException().Message);
         };
 
-        _updateFunc?.Invoke(false, string.Format(ResUI.MsgStartUpdating, type));
+        await UpdateFunc(false, string.Format(ResUI.MsgStartUpdating, type));
         var result = await CheckUpdateAsync(downloadHandle, type, preRelease);
         if (result.Success)
         {
-            _updateFunc?.Invoke(false, string.Format(ResUI.MsgParsingSuccessfully, type));
-            _updateFunc?.Invoke(false, result.Msg);
+            await UpdateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, type));
+            await UpdateFunc(false, result.Msg);
 
             url = result.Data?.ToString();
             var ext = url.Contains(".tar.gz") ? ".tar.gz" : Path.GetExtension(url);
@@ -99,17 +99,17 @@ public class UpdateService
         {
             if (!result.Msg.IsNullOrEmpty())
             {
-                _updateFunc?.Invoke(false, result.Msg);
+                await UpdateFunc(false, result.Msg);
             }
         }
     }
 
-    public async Task UpdateGeoFileAll(Config config, Action<bool, string> updateFunc)
+    public async Task UpdateGeoFileAll(Config config, Func<bool, string, Task> updateFunc)
     {
         await UpdateGeoFiles(config, updateFunc);
         await UpdateOtherFiles(config, updateFunc);
         await UpdateSrsFileAll(config, updateFunc);
-        _updateFunc?.Invoke(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
+        await UpdateFunc(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
     }
 
     #region CheckUpdate private
@@ -128,7 +128,7 @@ public class UpdateService
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
-            _updateFunc?.Invoke(false, ex.Message);
+            await UpdateFunc(false, ex.Message);
             return new RetResult(false, ex.Message);
         }
     }
@@ -212,7 +212,7 @@ public class UpdateService
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
-            _updateFunc?.Invoke(false, ex.Message);
+            await UpdateFunc(false, ex.Message);
             return new SemanticVersion("");
         }
     }
@@ -272,7 +272,7 @@ public class UpdateService
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
-            _updateFunc?.Invoke(false, ex.Message);
+            await UpdateFunc(false, ex.Message);
             return new RetResult(false, ex.Message);
         }
     }
@@ -333,7 +333,7 @@ public class UpdateService
 
     #region Geo private
 
-    private async Task UpdateGeoFiles(Config config, Action<bool, string> updateFunc)
+    private async Task UpdateGeoFiles(Config config, Func<bool, string, Task> updateFunc)
     {
         _updateFunc = updateFunc;
 
@@ -352,7 +352,7 @@ public class UpdateService
         }
     }
 
-    private async Task UpdateOtherFiles(Config config, Action<bool, string> updateFunc)
+    private async Task UpdateOtherFiles(Config config, Func<bool, string, Task> updateFunc)
     {
         //If it is not in China area, no update is required
         if (config.ConstItem.GeoSourceUrl.IsNotEmpty())
@@ -371,7 +371,7 @@ public class UpdateService
         }
     }
 
-    private async Task UpdateSrsFileAll(Config config, Action<bool, string> updateFunc)
+    private async Task UpdateSrsFileAll(Config config, Func<bool, string, Task> updateFunc)
     {
         _updateFunc = updateFunc;
 
@@ -426,7 +426,7 @@ public class UpdateService
         }
     }
 
-    private async Task UpdateSrsFile(string type, string srsName, Config config, Action<bool, string> updateFunc)
+    private async Task UpdateSrsFile(string type, string srsName, Config config, Func<bool, string, Task> updateFunc)
     {
         var srsUrl = string.IsNullOrEmpty(config.ConstItem.SrsSourceUrl)
                         ? Global.SingboxRulesetUrl
@@ -439,7 +439,7 @@ public class UpdateService
         await DownloadGeoFile(url, fileName, targetPath, updateFunc);
     }
 
-    private async Task DownloadGeoFile(string url, string fileName, string targetPath, Action<bool, string> updateFunc)
+    private async Task DownloadGeoFile(string url, string fileName, string targetPath, Func<bool, string, Task> updateFunc)
     {
         var tmpFileName = Utils.GetTempPath(Utils.GetGuid());
 
@@ -448,7 +448,7 @@ public class UpdateService
         {
             if (args.Success)
             {
-                _updateFunc?.Invoke(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, fileName));
+                UpdateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, fileName));
 
                 try
                 {
@@ -457,26 +457,31 @@ public class UpdateService
                         File.Copy(tmpFileName, targetPath, true);
 
                         File.Delete(tmpFileName);
-                        //_updateFunc?.Invoke(true, "");
+                        //await    UpdateFunc(true, "");
                     }
                 }
                 catch (Exception ex)
                 {
-                    _updateFunc?.Invoke(false, ex.Message);
+                    UpdateFunc(false, ex.Message);
                 }
             }
             else
             {
-                _updateFunc?.Invoke(false, args.Msg);
+                UpdateFunc(false, args.Msg);
             }
         };
         downloadHandle.Error += (sender2, args) =>
         {
-            _updateFunc?.Invoke(false, args.GetException().Message);
+            UpdateFunc(false, args.GetException().Message);
         };
 
         await downloadHandle.DownloadFileAsync(url, tmpFileName, true, _timeout);
     }
 
     #endregion Geo private
+
+    private async Task UpdateFunc(bool notify, string msg)
+    {
+        await _updateFunc?.Invoke(notify, msg);
+    }
 }

v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs

@@ -1,7 +1,6 @@
 using System.Reactive;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using Splat;
 
 namespace ServiceLib.ViewModels;
 
@@ -136,8 +135,7 @@ public class BackupAndRestoreViewModel : MyReactiveObject
         var result = await CreateZipFileFromDirectory(fileBackup);
         if (result)
         {
-            var service = Locator.Current.GetService<MainWindowViewModel>();
-            await service?.MyAppExitAsync(true);
+            await AppManager.Instance.AppExitAsync(false);
             await SQLiteHelper.Instance.DisposeDbConnectionAsync();
 
             var toPath = Utils.GetConfigPath();
@@ -154,7 +152,7 @@ public class BackupAndRestoreViewModel : MyReactiveObject
                     _ = ProcUtils.ProcessStart(upgradeFileName, Global.RebootAs, Utils.StartupPath());
                 }
             }
-            service?.Shutdown(true);
+            AppManager.Instance.Shutdown(true);
         }
         else
         {

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -1,4 +1,6 @@
 using System.Reactive;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using System.Runtime.InteropServices;
 using DynamicData;
 using DynamicData.Binding;
@@ -11,11 +13,11 @@ namespace ServiceLib.ViewModels;
 public class CheckUpdateViewModel : MyReactiveObject
 {
     private const string _geo = "GeoFiles";
-    private string _v2rayN = ECoreType.v2rayN.ToString();
+    private readonly string _v2rayN = ECoreType.v2rayN.ToString();
     private List<CheckUpdateModel> _lstUpdated = [];
+    private static readonly string _tag = "CheckUpdateViewModel";
 
-    private IObservableCollection<CheckUpdateModel> _checkUpdateModel = new ObservableCollectionExtended<CheckUpdateModel>();
-    public IObservableCollection<CheckUpdateModel> CheckUpdateModels => _checkUpdateModel;
+    public IObservableCollection<CheckUpdateModel> CheckUpdateModels { get; } = new ObservableCollectionExtended<CheckUpdateModel>();
     public ReactiveCommand<Unit, Unit> CheckUpdateCmd { get; }
     [Reactive] public bool EnableCheckPreReleaseUpdate { get; set; }
 
@@ -24,9 +26,11 @@ public class CheckUpdateViewModel : MyReactiveObject
         _config = AppManager.Instance.Config;
         _updateView = updateView;
 
-        CheckUpdateCmd = ReactiveCommand.CreateFromTask(async () =>
+        CheckUpdateCmd = ReactiveCommand.CreateFromTask(CheckUpdate);
+        CheckUpdateCmd.ThrownExceptions.Subscribe(ex =>
         {
-            await CheckUpdate();
+            Logging.SaveLog(_tag, ex);
+            _ = UpdateView(_v2rayN, ex.Message);
         });
 
         EnableCheckPreReleaseUpdate = _config.CheckUpdateItem.CheckPreReleaseUpdate;
@@ -34,31 +38,41 @@ public class CheckUpdateViewModel : MyReactiveObject
         this.WhenAnyValue(
         x => x.EnableCheckPreReleaseUpdate,
         y => y == true)
-            .Subscribe(c => { _config.CheckUpdateItem.CheckPreReleaseUpdate = EnableCheckPreReleaseUpdate; });
+            .Subscribe(c => _config.CheckUpdateItem.CheckPreReleaseUpdate = EnableCheckPreReleaseUpdate);
 
         RefreshCheckUpdateItems();
     }
 
     private void RefreshCheckUpdateItems()
     {
-        _checkUpdateModel.Clear();
+        CheckUpdateModels.Clear();
 
         if (RuntimeInformation.ProcessArchitecture != Architecture.X86)
         {
-            _checkUpdateModel.Add(GetCheckUpdateModel(_v2rayN));
+            CheckUpdateModels.Add(GetCheckUpdateModel(_v2rayN));
             //Not Windows and under Win10
             if (!(Utils.IsWindows() && Environment.OSVersion.Version.Major < 10))
             {
-                _checkUpdateModel.Add(GetCheckUpdateModel(ECoreType.Xray.ToString()));
-                _checkUpdateModel.Add(GetCheckUpdateModel(ECoreType.mihomo.ToString()));
-                _checkUpdateModel.Add(GetCheckUpdateModel(ECoreType.sing_box.ToString()));
+                CheckUpdateModels.Add(GetCheckUpdateModel(ECoreType.Xray.ToString()));
+                CheckUpdateModels.Add(GetCheckUpdateModel(ECoreType.mihomo.ToString()));
+                CheckUpdateModels.Add(GetCheckUpdateModel(ECoreType.sing_box.ToString()));
             }
         }
-        _checkUpdateModel.Add(GetCheckUpdateModel(_geo));
+        CheckUpdateModels.Add(GetCheckUpdateModel(_geo));
     }
 
     private CheckUpdateModel GetCheckUpdateModel(string coreType)
     {
+        if (coreType == _v2rayN && Utils.IsPackagedInstall())
+        {
+            return new()
+            {
+                IsSelected = false,
+                CoreType = coreType,
+                Remarks = ResUI.menuCheckUpdate + " (Not Support)",
+            };
+        }
+
         return new()
         {
             IsSelected = _config.CheckUpdateItem.SelectedCoreTypes?.Contains(coreType) ?? true,
@@ -69,7 +83,7 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     private async Task SaveSelectedCoreTypes()
     {
-        _config.CheckUpdateItem.SelectedCoreTypes = _checkUpdateModel.Where(t => t.IsSelected == true).Select(t => t.CoreType ?? "").ToList();
+        _config.CheckUpdateItem.SelectedCoreTypes = CheckUpdateModels.Where(t => t.IsSelected == true).Select(t => t.CoreType ?? "").ToList();
         await ConfigHandler.SaveConfig(_config);
     }
 
@@ -81,23 +95,30 @@ public class CheckUpdateViewModel : MyReactiveObject
     private async Task CheckUpdateTask()
     {
         _lstUpdated.Clear();
-        _lstUpdated = _checkUpdateModel.Where(x => x.IsSelected == true)
+        _lstUpdated = CheckUpdateModels.Where(x => x.IsSelected == true)
                 .Select(x => new CheckUpdateModel() { CoreType = x.CoreType }).ToList();
         await SaveSelectedCoreTypes();
 
-        for (var k = _checkUpdateModel.Count - 1; k >= 0; k--)
+        for (var k = CheckUpdateModels.Count - 1; k >= 0; k--)
         {
-            var item = _checkUpdateModel[k];
+            var item = CheckUpdateModels[k];
             if (item.IsSelected != true)
+            {
                 continue;
+            }
 
-            UpdateView(item.CoreType, "...");
+            await UpdateView(item.CoreType, "...");
             if (item.CoreType == _geo)
             {
                 await CheckUpdateGeo();
             }
             else if (item.CoreType == _v2rayN)
             {
+                if (Utils.IsPackagedInstall())
+                {
+                    await UpdateView(_v2rayN, "Not Support");
+                    continue;
+                }
                 await CheckUpdateN(EnableCheckPreReleaseUpdate);
             }
             else if (item.CoreType == ECoreType.Xray.ToString())
@@ -129,78 +150,78 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     private async Task CheckUpdateGeo()
     {
-        void _updateUI(bool success, string msg)
+        async Task _updateUI(bool success, string msg)
         {
-            UpdateView(_geo, msg);
+            await UpdateView(_geo, msg);
             if (success)
             {
                 UpdatedPlusPlus(_geo, "");
             }
         }
-        await (new UpdateService()).UpdateGeoFileAll(_config, _updateUI)
-            .ContinueWith(t =>
-            {
-                UpdatedPlusPlus(_geo, "");
-            });
+        await new UpdateService().UpdateGeoFileAll(_config, _updateUI)
+            .ContinueWith(t => UpdatedPlusPlus(_geo, ""));
     }
 
     private async Task CheckUpdateN(bool preRelease)
     {
-        void _updateUI(bool success, string msg)
+        async Task _updateUI(bool success, string msg)
         {
-            UpdateView(_v2rayN, msg);
+            await UpdateView(_v2rayN, msg);
             if (success)
             {
-                UpdateView(_v2rayN, ResUI.OperationSuccess);
+                await UpdateView(_v2rayN, ResUI.OperationSuccess);
                 UpdatedPlusPlus(_v2rayN, msg);
             }
         }
-        await (new UpdateService()).CheckUpdateGuiN(_config, _updateUI, preRelease)
-            .ContinueWith(t =>
-            {
-                UpdatedPlusPlus(_v2rayN, "");
-            });
+        await new UpdateService().CheckUpdateGuiN(_config, _updateUI, preRelease)
+            .ContinueWith(t => UpdatedPlusPlus(_v2rayN, ""));
     }
 
     private async Task CheckUpdateCore(CheckUpdateModel model, bool preRelease)
     {
-        void _updateUI(bool success, string msg)
+        async Task _updateUI(bool success, string msg)
         {
-            UpdateView(model.CoreType, msg);
+            await UpdateView(model.CoreType, msg);
             if (success)
             {
-                UpdateView(model.CoreType, ResUI.MsgUpdateV2rayCoreSuccessfullyMore);
+                await UpdateView(model.CoreType, ResUI.MsgUpdateV2rayCoreSuccessfullyMore);
 
                 UpdatedPlusPlus(model.CoreType, msg);
             }
         }
         var type = (ECoreType)Enum.Parse(typeof(ECoreType), model.CoreType);
-        await (new UpdateService()).CheckUpdateCore(type, _config, _updateUI, preRelease)
-            .ContinueWith(t =>
-            {
-                UpdatedPlusPlus(model.CoreType, "");
-            });
+        await new UpdateService().CheckUpdateCore(type, _config, _updateUI, preRelease)
+            .ContinueWith(t => UpdatedPlusPlus(model.CoreType, ""));
     }
 
     private async Task UpdateFinished()
     {
         if (_lstUpdated.Count > 0 && _lstUpdated.Count(x => x.IsFinished == true) == _lstUpdated.Count)
         {
-            _updateView?.Invoke(EViewAction.DispatcherCheckUpdateFinished, false);
+            await UpdateFinishedSub(false);
             await Task.Delay(2000);
             await UpgradeCore();
 
             if (_lstUpdated.Any(x => x.CoreType == _v2rayN && x.IsFinished == true))
             {
                 await Task.Delay(1000);
-                UpgradeN();
+                await UpgradeN();
             }
             await Task.Delay(1000);
-            _updateView?.Invoke(EViewAction.DispatcherCheckUpdateFinished, true);
+            await UpdateFinishedSub(true);
         }
     }
 
-    public void UpdateFinishedResult(bool blReload)
+    private async Task UpdateFinishedSub(bool blReload)
+    {
+        RxApp.MainThreadScheduler.Schedule(blReload, (scheduler, blReload) =>
+        {
+            _ = UpdateFinishedResult(blReload);
+            return Disposable.Empty;
+        });
+    }
+
+    public async Task UpdateFinishedResult(bool blReload)
     {
         if (blReload)
         {
@@ -212,7 +233,7 @@ public class CheckUpdateViewModel : MyReactiveObject
         }
     }
 
-    private void UpgradeN()
+    private async Task UpgradeN()
     {
         try
         {
@@ -221,16 +242,23 @@ public class CheckUpdateViewModel : MyReactiveObject
             {
                 return;
             }
-            if (!Utils.UpgradeAppExists(out _))
+            if (!Utils.UpgradeAppExists(out var upgradeFileName))
             {
-                UpdateView(_v2rayN, ResUI.UpgradeAppNotExistTip);
+                await UpdateView(_v2rayN, ResUI.UpgradeAppNotExistTip);
+                NoticeManager.Instance.SendMessageAndEnqueue(ResUI.UpgradeAppNotExistTip);
+                Logging.SaveLog("UpgradeApp does not exist");
                 return;
             }
-            Locator.Current.GetService<MainWindowViewModel>()?.UpgradeApp(fileName);
+
+            var id = ProcUtils.ProcessStart(upgradeFileName, fileName, Utils.StartupPath());
+            if (id > 0)
+            {
+                await AppManager.Instance.AppExitAsync(true);
+            }
         }
         catch (Exception ex)
         {
-            UpdateView(_v2rayN, ex.Message);
+            await UpdateView(_v2rayN, ex.Message);
         }
     }
 
@@ -274,14 +302,14 @@ public class CheckUpdateViewModel : MyReactiveObject
 
             if (Utils.IsNonWindows())
             {
-                var filesList = (new DirectoryInfo(toPath)).GetFiles().Select(u => u.FullName).ToList();
+                var filesList = new DirectoryInfo(toPath).GetFiles().Select(u => u.FullName).ToList();
                 foreach (var file in filesList)
                 {
                     await Utils.SetLinuxChmod(Path.Combine(toPath, item.CoreType.ToLower()));
                 }
             }
 
-            UpdateView(item.CoreType, ResUI.MsgUpdateV2rayCoreSuccessfully);
+            await UpdateView(item.CoreType, ResUI.MsgUpdateV2rayCoreSuccessfully);
 
             if (File.Exists(fileName))
             {
@@ -290,23 +318,28 @@ public class CheckUpdateViewModel : MyReactiveObject
         }
     }
 
-    private void UpdateView(string coreType, string msg)
+    private async Task UpdateView(string coreType, string msg)
     {
         var item = new CheckUpdateModel()
         {
             CoreType = coreType,
             Remarks = msg,
         };
-        _updateView?.Invoke(EViewAction.DispatcherCheckUpdate, item);
+
+        RxApp.MainThreadScheduler.Schedule(item, (scheduler, model) =>
+        {
+            _ = UpdateViewResult(model);
+            return Disposable.Empty;
+        });
     }
 
-    public void UpdateViewResult(CheckUpdateModel model)
+    public async Task UpdateViewResult(CheckUpdateModel model)
     {
-        var found = _checkUpdateModel.FirstOrDefault(t => t.CoreType == model.CoreType);
+        var found = CheckUpdateModels.FirstOrDefault(t => t.CoreType == model.CoreType);
         if (found == null)
+        {
             return;
-        var itemCopy = JsonUtils.DeepCopy(found);
-        itemCopy.Remarks = model.Remarks;
-        _checkUpdateModel.Replace(found, itemCopy);
+        }
+        found.Remarks = model.Remarks; 
     }
 }

v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs

@@ -1,4 +1,5 @@
 using System.Reactive;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using DynamicData;
 using DynamicData.Binding;
@@ -9,8 +10,7 @@ namespace ServiceLib.ViewModels;
 
 public class ClashConnectionsViewModel : MyReactiveObject
 {
-    private IObservableCollection<ClashConnectionModel> _connectionItems = new ObservableCollectionExtended<ClashConnectionModel>();
-    public IObservableCollection<ClashConnectionModel> ConnectionItems => _connectionItems;
+    public IObservableCollection<ClashConnectionModel> ConnectionItems { get; } = new ObservableCollectionExtended<ClashConnectionModel>();
 
     [Reactive]
     public ClashConnectionModel SelectedSource { get; set; }
@@ -64,12 +64,16 @@ public class ClashConnectionsViewModel : MyReactiveObject
             return;
         }
 
-        _ = _updateView?.Invoke(EViewAction.DispatcherRefreshConnections, ret?.connections);
+        RxApp.MainThreadScheduler.Schedule(ret?.connections, (scheduler, model) =>
+        {
+            _ = RefreshConnections(model);
+            return Disposable.Empty;
+        });
     }
 
-    public void RefreshConnections(List<ConnectionItem>? connections)
+    public async Task RefreshConnections(List<ConnectionItem>? connections)
     {
-        _connectionItems.Clear();
+        ConnectionItems.Clear();
 
         var dtNow = DateTime.Now;
         var lstModel = new List<ClashConnectionModel>();
@@ -99,7 +103,7 @@ public class ClashConnectionsViewModel : MyReactiveObject
             return;
         }
 
-        _connectionItems.AddRange(lstModel);
+        ConnectionItems.AddRange(lstModel);
     }
 
     public async Task ClashConnectionClose(bool all)
@@ -116,7 +120,7 @@ public class ClashConnectionsViewModel : MyReactiveObject
         }
         else
         {
-            _connectionItems.Clear();
+            ConnectionItems.Clear();
         }
         await ClashApiManager.Instance.ClashConnectionClose(id);
         await GetClashConnections();

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -1,4 +1,6 @@
 using System.Reactive;
+using System.Reactive.Concurrency;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using DynamicData;
 using DynamicData.Binding;
@@ -15,11 +17,8 @@ public class ClashProxiesViewModel : MyReactiveObject
     private Dictionary<string, ProvidersItem>? _providers;
     private readonly int _delayTimeout = 99999999;
 
-    private IObservableCollection<ClashProxyModel> _proxyGroups = new ObservableCollectionExtended<ClashProxyModel>();
-    private IObservableCollection<ClashProxyModel> _proxyDetails = new ObservableCollectionExtended<ClashProxyModel>();
-
-    public IObservableCollection<ClashProxyModel> ProxyGroups => _proxyGroups;
-    public IObservableCollection<ClashProxyModel> ProxyDetails => _proxyDetails;
+    public IObservableCollection<ClashProxyModel> ProxyGroups { get; } = new ObservableCollectionExtended<ClashProxyModel>();
+    public IObservableCollection<ClashProxyModel> ProxyDetails { get; } = new ObservableCollectionExtended<ClashProxyModel>();
 
     [Reactive]
     public ClashProxyModel SelectedGroup { get; set; }
@@ -168,11 +167,11 @@ public class ClashProxiesViewModel : MyReactiveObject
 
         if (refreshUI)
         {
-            _updateView?.Invoke(EViewAction.DispatcherRefreshProxyGroups, null);
+            RxApp.MainThreadScheduler.Schedule(() => _ = RefreshProxyGroups());
         }
     }
 
-    public void RefreshProxyGroups()
+    public async Task RefreshProxyGroups()
     {
         if (_proxies == null)
         {
@@ -180,7 +179,7 @@ public class ClashProxiesViewModel : MyReactiveObject
         }
 
         var selectedName = SelectedGroup?.Name;
-        _proxyGroups.Clear();
+        ProxyGroups.Clear();
 
         var proxyGroups = ClashApiManager.Instance.GetClashProxyGroups();
         if (proxyGroups != null && proxyGroups.Count > 0)
@@ -196,7 +195,7 @@ public class ClashProxiesViewModel : MyReactiveObject
                 {
                     continue;
                 }
-                _proxyGroups.Add(new ClashProxyModel()
+                ProxyGroups.Add(new ClashProxyModel()
                 {
                     Now = item.now,
                     Name = item.name,
@@ -212,12 +211,12 @@ public class ClashProxiesViewModel : MyReactiveObject
             {
                 continue;
             }
-            var item = _proxyGroups.FirstOrDefault(t => t.Name == kv.Key);
+            var item = ProxyGroups.FirstOrDefault(t => t.Name == kv.Key);
             if (item != null && item.Name.IsNotEmpty())
             {
                 continue;
             }
-            _proxyGroups.Add(new ClashProxyModel()
+            ProxyGroups.Add(new ClashProxyModel()
             {
                 Now = kv.Value.now,
                 Name = kv.Key,
@@ -225,15 +224,15 @@ public class ClashProxiesViewModel : MyReactiveObject
             });
         }
 
-        if (_proxyGroups != null && _proxyGroups.Count > 0)
+        if (ProxyGroups != null && ProxyGroups.Count > 0)
         {
-            if (selectedName != null && _proxyGroups.Any(t => t.Name == selectedName))
+            if (selectedName != null && ProxyGroups.Any(t => t.Name == selectedName))
             {
-                SelectedGroup = _proxyGroups.FirstOrDefault(t => t.Name == selectedName);
+                SelectedGroup = ProxyGroups.FirstOrDefault(t => t.Name == selectedName);
             }
             else
             {
-                SelectedGroup = _proxyGroups.First();
+                SelectedGroup = ProxyGroups.First();
             }
         }
         else
@@ -244,7 +243,7 @@ public class ClashProxiesViewModel : MyReactiveObject
 
     private void RefreshProxyDetails(bool c)
     {
-        _proxyDetails.Clear();
+        ProxyDetails.Clear();
         if (!c)
         {
             return;
@@ -297,7 +296,7 @@ public class ClashProxiesViewModel : MyReactiveObject
             default:
                 break;
         }
-        _proxyDetails.AddRange(lstDetails);
+        ProxyDetails.AddRange(lstDetails);
     }
 
     private ProxiesItem? TryGetProxy(string name)
@@ -359,12 +358,12 @@ public class ClashProxiesViewModel : MyReactiveObject
         await ClashApiManager.Instance.ClashSetActiveProxy(name, nameNode);
 
         selectedProxy.now = nameNode;
-        var group = _proxyGroups.FirstOrDefault(it => it.Name == SelectedGroup.Name);
+        var group = ProxyGroups.FirstOrDefault(it => it.Name == SelectedGroup.Name);
         if (group != null)
         {
             group.Now = nameNode;
             var group2 = JsonUtils.DeepCopy(group);
-            _proxyGroups.Replace(group, group2);
+            ProxyGroups.Replace(group, group2);
 
             SelectedGroup = group2;
         }
@@ -373,22 +372,26 @@ public class ClashProxiesViewModel : MyReactiveObject
 
     private async Task ProxiesDelayTest(bool blAll = true)
     {
-        ClashApiManager.Instance.ClashProxiesDelayTest(blAll, _proxyDetails.ToList(), (item, result) =>
+        ClashApiManager.Instance.ClashProxiesDelayTest(blAll, ProxyDetails.ToList(), async (item, result) =>
         {
             if (item == null || result.IsNullOrEmpty())
             {
                 return;
             }
 
-            _updateView?.Invoke(EViewAction.DispatcherProxiesDelayTest, new SpeedTestResult() { IndexId = item.Name, Delay = result });
+            var model = new SpeedTestResult() { IndexId = item.Name, Delay = result };
+            RxApp.MainThreadScheduler.Schedule(model, (scheduler, model) =>
+            {
+                _ = ProxiesDelayTestResult(model);
+                return Disposable.Empty;
+            });
         });
         await Task.CompletedTask;
     }
 
-    public void ProxiesDelayTestResult(SpeedTestResult result)
+    public async Task ProxiesDelayTestResult(SpeedTestResult result)
     {
-        //UpdateHandler(false, $"{item.name}={result}");
-        var detail = _proxyDetails.FirstOrDefault(it => it.Name == result.IndexId);
+        var detail = ProxyDetails.FirstOrDefault(it => it.Name == result.IndexId);
         if (detail == null)
         {
             return;
@@ -410,7 +413,6 @@ public class ClashProxiesViewModel : MyReactiveObject
             detail.Delay = _delayTimeout;
             detail.DelayName = string.Empty;
         }
-        _proxyDetails.Replace(detail, JsonUtils.DeepCopy(detail));
     }
 
     #endregion proxy function

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -1,4 +1,5 @@
 using System.Reactive;
+using System.Reactive.Concurrency;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
@@ -234,6 +235,7 @@ public class MainWindowViewModel : MyReactiveObject
         {
             await StatisticsManager.Instance.Init(_config, UpdateStatisticsHandler);
         }
+        await RefreshServers();
 
         BlReloadEnabled = true;
         await Reload();
@@ -245,7 +247,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     #region Actions
 
-    private void UpdateHandler(bool notify, string msg)
+    private async Task UpdateHandler(bool notify, string msg)
     {
         NoticeManager.Instance.SendMessage(msg);
         if (notify)
@@ -254,86 +256,31 @@ public class MainWindowViewModel : MyReactiveObject
         }
     }
 
-    private void UpdateTaskHandler(bool success, string msg)
+    private async Task UpdateTaskHandler(bool success, string msg)
     {
         NoticeManager.Instance.SendMessageEx(msg);
         if (success)
         {
             var indexIdOld = _config.IndexId;
-            RefreshServers();
+            await RefreshServers();
             if (indexIdOld != _config.IndexId)
             {
-                _ = Reload();
+                await Reload();
             }
             if (_config.UiItem.EnableAutoAdjustMainLvColWidth)
             {
-                _updateView?.Invoke(EViewAction.AdjustMainLvColWidth, null);
+                AppEvents.AdjustMainLvColWidthRequested.OnNext(Unit.Default);
             }
         }
     }
 
-    private void UpdateStatisticsHandler(ServerSpeedItem update)
+    private async Task UpdateStatisticsHandler(ServerSpeedItem update)
     {
         if (!_config.UiItem.ShowInTaskbar)
         {
             return;
         }
-        _updateView?.Invoke(EViewAction.DispatcherStatistics, update);
-    }
-
-    public void SetStatisticsResult(ServerSpeedItem update)
-    {
-        if (_config.GuiItem.DisplayRealTimeSpeed)
-        {
-            Locator.Current.GetService<StatusBarViewModel>()?.UpdateStatistics(update);
-        }
-        if (_config.GuiItem.EnableStatistics && (update.ProxyUp + update.ProxyDown) > 0 && DateTime.Now.Second % 9 == 0)
-        {
-            Locator.Current.GetService<ProfilesViewModel>()?.UpdateStatistics(update);
-        }
-    }
-
-    public async Task MyAppExitAsync(bool blWindowsShutDown)
-    {
-        try
-        {
-            Logging.SaveLog("MyAppExitAsync Begin");
-
-            await SysProxyHandler.UpdateSysProxy(_config, true);
-            MessageBus.Current.SendMessage("", EMsgCommand.AppExit.ToString());
-
-            await ConfigHandler.SaveConfig(_config);
-            await ProfileExManager.Instance.SaveTo();
-            await StatisticsManager.Instance.SaveTo();
-            await CoreManager.Instance.CoreStop();
-            StatisticsManager.Instance.Close();
-
-            Logging.SaveLog("MyAppExitAsync End");
-        }
-        catch { }
-        finally
-        {
-            if (!blWindowsShutDown)
-            {
-                _updateView?.Invoke(EViewAction.Shutdown, false);
-            }
-        }
-    }
-
-    public async Task UpgradeApp(string arg)
-    {
-        if (!Utils.UpgradeAppExists(out var upgradeFileName))
-        {
-            NoticeManager.Instance.SendMessageAndEnqueue(ResUI.UpgradeAppNotExistTip);
-            Logging.SaveLog("UpgradeApp does not exist");
-            return;
-        }
-
-        var id = ProcUtils.ProcessStart(upgradeFileName, arg, Utils.StartupPath());
-        if (id > 0)
-        {
-            await MyAppExitAsync(false);
-        }
+        AppEvents.DispatcherStatisticsRequested.OnNext(update);
     }
 
     public void ShowHideWindow(bool? blShow)
@@ -341,18 +288,15 @@ public class MainWindowViewModel : MyReactiveObject
         _updateView?.Invoke(EViewAction.ShowHideWindow, blShow);
     }
 
-    public void Shutdown(bool byUser)
-    {
-        _updateView?.Invoke(EViewAction.Shutdown, byUser);
-    }
-
     #endregion Actions
 
     #region Servers && Groups
 
-    private void RefreshServers()
+    private async Task RefreshServers()
     {
-        MessageBus.Current.SendMessage("", EMsgCommand.RefreshProfiles.ToString());
+        AppEvents.ProfilesRefreshRequested.OnNext(Unit.Default);
+
+        await Task.Delay(200);
     }
 
     private void RefreshSubscriptions()
@@ -384,7 +328,7 @@ public class MainWindowViewModel : MyReactiveObject
         }
         if (ret == true)
         {
-            RefreshServers();
+            await RefreshServers();
             if (item.IndexId == _config.IndexId)
             {
                 await Reload();
@@ -399,11 +343,11 @@ public class MainWindowViewModel : MyReactiveObject
             await _updateView?.Invoke(EViewAction.AddServerViaClipboard, null);
             return;
         }
-        int ret = await ConfigHandler.AddBatchServers(_config, clipboardData, _config.SubIndexId, false);
+        var ret = await ConfigHandler.AddBatchServers(_config, clipboardData, _config.SubIndexId, false);
         if (ret > 0)
         {
             RefreshSubscriptions();
-            RefreshServers();
+            await RefreshServers();
             NoticeManager.Instance.Enqueue(string.Format(ResUI.SuccessfullyImportedServerViaClipboard, ret));
         }
         else
@@ -449,11 +393,11 @@ public class MainWindowViewModel : MyReactiveObject
         }
         else
         {
-            int ret = await ConfigHandler.AddBatchServers(_config, result, _config.SubIndexId, false);
+            var ret = await ConfigHandler.AddBatchServers(_config, result, _config.SubIndexId, false);
             if (ret > 0)
             {
                 RefreshSubscriptions();
-                RefreshServers();
+                await RefreshServers();
                 NoticeManager.Instance.Enqueue(ResUI.SuccessfullyImportedServerViaScan);
             }
             else
@@ -477,7 +421,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     public async Task UpdateSubscriptionProcess(string subId, bool blProxy)
     {
-        await SubscriptionHandler.UpdateProcess(_config, subId, blProxy, UpdateTaskHandler);
+        await Task.Run(async () => await SubscriptionHandler.UpdateProcess(_config, subId, blProxy, UpdateTaskHandler));
     }
 
     #endregion Subscription
@@ -526,13 +470,13 @@ public class MainWindowViewModel : MyReactiveObject
     public async Task RebootAsAdmin()
     {
         ProcUtils.RebootAsAdmin();
-        await MyAppExitAsync(false);
+        await AppManager.Instance.AppExitAsync(true);
     }
 
     private async Task ClearServerStatistics()
     {
         await StatisticsManager.Instance.ClearAllServerStatistics();
-        RefreshServers();
+        await RefreshServers();
     }
 
     private async Task OpenTheFileLocation()
@@ -544,7 +488,7 @@ public class MainWindowViewModel : MyReactiveObject
         }
         else if (Utils.IsLinux())
         {
-            ProcUtils.ProcessStart("nautilus", path);
+            ProcUtils.ProcessStart("xdg-open", path);
         }
         else if (Utils.IsOSX())
         {
@@ -576,7 +520,7 @@ public class MainWindowViewModel : MyReactiveObject
         });
         Locator.Current.GetService<StatusBarViewModel>()?.TestServerAvailability();
 
-        _updateView?.Invoke(EViewAction.DispatcherReload, null);
+        RxApp.MainThreadScheduler.Schedule(() => _ = ReloadResult());
 
         BlReloadEnabled = true;
         if (_hasNextReloadJob)
@@ -586,7 +530,7 @@ public class MainWindowViewModel : MyReactiveObject
         }
     }
 
-    public void ReloadResult()
+    public async Task ReloadResult()
     {
         // BlReloadEnabled = true;
         //Locator.Current.GetService<StatusBarViewModel>()?.ChangeSystemProxyAsync(_config.systemProxyItem.sysProxyType, false);
@@ -596,7 +540,9 @@ public class MainWindowViewModel : MyReactiveObject
             Locator.Current.GetService<ClashProxiesViewModel>()?.ProxiesReload();
         }
         else
-        { TabMainSelectedIndex = 0; }
+        {
+            TabMainSelectedIndex = 0;
+        }
     }
 
     private async Task LoadCore()
@@ -631,7 +577,7 @@ public class MainWindowViewModel : MyReactiveObject
         Locator.Current.GetService<StatusBarViewModel>()?.RefreshRoutingsMenu();
 
         await ConfigHandler.SaveConfig(_config);
-        await new UpdateService().UpdateGeoFileAll(_config, UpdateHandler);
+        await new UpdateService().UpdateGeoFileAll(_config, UpdateTaskHandler);
         await Reload();
     }
 

v2rayN/ServiceLib/ViewModels/MsgViewModel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using System.Reactive.Linq;
 using System.Text.RegularExpressions;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
@@ -7,8 +8,8 @@ namespace ServiceLib.ViewModels;
 
 public class MsgViewModel : MyReactiveObject
 {
-    private ConcurrentQueue<string> _queueMsg = new();
-    private int _numMaxMsg = 500;
+    private readonly ConcurrentQueue<string> _queueMsg = new();
+    private readonly int _numMaxMsg = 500;
     private bool _lastMsgFilterNotAvailable;
     private bool _blLockShow = false;
 
@@ -34,12 +35,10 @@ public class MsgViewModel : MyReactiveObject
           y => y == true)
               .Subscribe(c => { _config.MsgUIItem.AutoRefresh = AutoRefresh; });
 
-        MessageBus.Current.Listen<string>(EMsgCommand.SendMsgView.ToString()).Subscribe(OnNext);
-    }
-
-    private async void OnNext(string x)
-    {
-        await AppendQueueMsg(x);
+        AppEvents.SendMsgViewRequested
+         .AsObservable()
+         //.ObserveOn(RxApp.MainThreadScheduler)
+         .Subscribe(async content => await AppendQueueMsg(content));
     }
 
     private async Task AppendQueueMsg(string msg)

v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs

@@ -0,0 +1,352 @@
+using System.Reactive.Linq;
+using DynamicData;
+using DynamicData.Binding;
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
+
+namespace ServiceLib.ViewModels;
+
+public class ProfilesSelectViewModel : MyReactiveObject
+{
+    #region private prop
+
+    private string _serverFilter = string.Empty;
+    private Dictionary<string, bool> _dicHeaderSort = new();
+    private string _subIndexId = string.Empty;
+
+    // ConfigType filter state: default include-mode with all types selected
+    private List<EConfigType> _filterConfigTypes = new();
+
+    private bool _filterExclude = false;
+
+    #endregion private prop
+
+    #region ObservableCollection
+
+    public IObservableCollection<ProfileItemModel> ProfileItems { get; } = new ObservableCollectionExtended<ProfileItemModel>();
+
+    public IObservableCollection<SubItem> SubItems { get; } = new ObservableCollectionExtended<SubItem>();
+
+    [Reactive]
+    public ProfileItemModel SelectedProfile { get; set; }
+
+    public IList<ProfileItemModel> SelectedProfiles { get; set; }
+
+    [Reactive]
+    public SubItem SelectedSub { get; set; }
+
+    [Reactive]
+    public string ServerFilter { get; set; }
+
+    // Include/Exclude filter for ConfigType
+    public List<EConfigType> FilterConfigTypes
+    {
+        get => _filterConfigTypes;
+        set => this.RaiseAndSetIfChanged(ref _filterConfigTypes, value);
+    }
+
+    [Reactive]
+    public bool FilterExclude
+    {
+        get => _filterExclude;
+        set => this.RaiseAndSetIfChanged(ref _filterExclude, value);
+    }
+
+    #endregion ObservableCollection
+
+    #region Init
+
+    public ProfilesSelectViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
+    {
+        _config = AppManager.Instance.Config;
+        _updateView = updateView;
+        _subIndexId = _config.SubIndexId ?? string.Empty;
+
+        #region WhenAnyValue && ReactiveCommand
+
+        this.WhenAnyValue(
+            x => x.SelectedSub,
+            y => y != null && !y.Remarks.IsNullOrEmpty() && _subIndexId != y.Id)
+                .Subscribe(async c => await SubSelectedChangedAsync(c));
+
+        this.WhenAnyValue(
+          x => x.ServerFilter,
+          y => y != null && _serverFilter != y)
+              .Subscribe(async c => await ServerFilterChanged(c));
+
+        // React to ConfigType filter changes
+        this.WhenAnyValue(x => x.FilterExclude)
+            .Skip(1)
+            .Subscribe(async _ => await RefreshServersBiz());
+
+        this.WhenAnyValue(x => x.FilterConfigTypes)
+            .Skip(1)
+            .Subscribe(async _ => await RefreshServersBiz());
+
+        #endregion WhenAnyValue && ReactiveCommand
+
+        _ = Init();
+    }
+
+    private async Task Init()
+    {
+        SelectedProfile = new();
+        SelectedSub = new();
+
+        // Default: include mode with all ConfigTypes selected
+        try
+        {
+            FilterExclude = false;
+            FilterConfigTypes = Enum.GetValues(typeof(EConfigType)).Cast<EConfigType>().ToList();
+        }
+        catch
+        {
+            FilterConfigTypes = new();
+        }
+
+        await RefreshSubscriptions();
+        await RefreshServers();
+    }
+
+    #endregion Init
+
+    #region Actions
+
+    public bool CanOk()
+    {
+        return SelectedProfile != null && !SelectedProfile.IndexId.IsNullOrEmpty();
+    }
+
+    public bool SelectFinish()
+    {
+        if (!CanOk())
+        {
+            return false;
+        }
+        _updateView?.Invoke(EViewAction.CloseWindow, null);
+        return true;
+    }
+
+    #endregion Actions
+
+    #region Servers && Groups
+
+    private async Task SubSelectedChangedAsync(bool c)
+    {
+        if (!c)
+        {
+            return;
+        }
+        _subIndexId = SelectedSub?.Id;
+
+        await RefreshServers();
+
+        await _updateView?.Invoke(EViewAction.ProfilesFocus, null);
+    }
+
+    private async Task ServerFilterChanged(bool c)
+    {
+        if (!c)
+        {
+            return;
+        }
+        _serverFilter = ServerFilter;
+        if (_serverFilter.IsNullOrEmpty())
+        {
+            await RefreshServers();
+        }
+    }
+
+    public async Task RefreshServers()
+    {
+        await RefreshServersBiz();
+    }
+
+    private async Task RefreshServersBiz()
+    {
+        var lstModel = await GetProfileItemsEx(_subIndexId, _serverFilter);
+
+        ProfileItems.Clear();
+        ProfileItems.AddRange(lstModel);
+        if (lstModel.Count > 0)
+        {
+            var selected = lstModel.FirstOrDefault(t => t.IndexId == _config.IndexId);
+            if (selected != null)
+            {
+                SelectedProfile = selected;
+            }
+            else
+            {
+                SelectedProfile = lstModel.First();
+            }
+        }
+
+        await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
+    }
+
+    public async Task RefreshSubscriptions()
+    {
+        SubItems.Clear();
+
+        SubItems.Add(new SubItem { Remarks = ResUI.AllGroupServers });
+
+        foreach (var item in await AppManager.Instance.SubItems())
+        {
+            SubItems.Add(item);
+        }
+        if (_subIndexId != null && SubItems.FirstOrDefault(t => t.Id == _subIndexId) != null)
+        {
+            SelectedSub = SubItems.FirstOrDefault(t => t.Id == _subIndexId);
+        }
+        else
+        {
+            SelectedSub = SubItems.First();
+        }
+    }
+
+    private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
+    {
+        var lstModel = await AppManager.Instance.ProfileItems(_subIndexId, filter);
+        lstModel = (from t in lstModel
+                    select new ProfileItemModel
+                    {
+                        IndexId = t.IndexId,
+                        ConfigType = t.ConfigType,
+                        Remarks = t.Remarks,
+                        Address = t.Address,
+                        Port = t.Port,
+                        Security = t.Security,
+                        Network = t.Network,
+                        StreamSecurity = t.StreamSecurity,
+                        Subid = t.Subid,
+                        SubRemarks = t.SubRemarks,
+                        IsActive = t.IndexId == _config.IndexId,
+                    }).OrderBy(t => t.Sort).ToList();
+
+        // Apply ConfigType filter (include or exclude)
+        if (FilterConfigTypes != null && FilterConfigTypes.Count > 0)
+        {
+            if (FilterExclude)
+            {
+                lstModel = lstModel.Where(t => !FilterConfigTypes.Contains(t.ConfigType)).ToList();
+            }
+            else
+            {
+                lstModel = lstModel.Where(t => FilterConfigTypes.Contains(t.ConfigType)).ToList();
+            }
+        }
+
+        return lstModel;
+    }
+
+    public async Task<ProfileItem?> GetProfileItem()
+    {
+        if (string.IsNullOrEmpty(SelectedProfile?.IndexId))
+        {
+            return null;
+        }
+        var indexId = SelectedProfile.IndexId;
+        var item = await AppManager.Instance.GetProfileItem(indexId);
+        if (item is null)
+        {
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectServer);
+            return null;
+        }
+        return item;
+    }
+
+    public async Task<List<ProfileItem>?> GetProfileItems()
+    {
+        if (SelectedProfiles == null || SelectedProfiles.Count == 0)
+        {
+            return null;
+        }
+        var lst = new List<ProfileItem>();
+        foreach (var sp in SelectedProfiles)
+        {
+            if (string.IsNullOrEmpty(sp?.IndexId))
+            {
+                continue;
+            }
+            var item = await AppManager.Instance.GetProfileItem(sp.IndexId);
+            if (item != null)
+            {
+                lst.Add(item);
+            }
+        }
+        if (lst.Count == 0)
+        {
+            NoticeManager.Instance.Enqueue(ResUI.PleaseSelectServer);
+            return null;
+        }
+        return lst;
+    }
+
+    public void SortServer(string colName)
+    {
+        if (colName.IsNullOrEmpty())
+        {
+            return;
+        }
+
+        var prop = typeof(ProfileItemModel).GetProperty(colName);
+        if (prop == null)
+        {
+            return;
+        }
+
+        _dicHeaderSort.TryAdd(colName, true);
+        var asc = _dicHeaderSort[colName];
+
+        var comparer = Comparer<object?>.Create((a, b) =>
+        {
+            if (ReferenceEquals(a, b))
+            {
+                return 0;
+            }
+            if (a is null)
+            {
+                return -1;
+            }
+            if (b is null)
+            {
+                return 1;
+            }
+            if (a.GetType() == b.GetType() && a is IComparable ca)
+            {
+                return ca.CompareTo(b);
+            }
+            return string.Compare(a.ToString(), b.ToString(), StringComparison.OrdinalIgnoreCase);
+        });
+
+        object? KeySelector(ProfileItemModel x)
+        {
+            return prop.GetValue(x);
+        }
+
+        IEnumerable<ProfileItemModel> sorted = asc
+            ? ProfileItems.OrderBy(KeySelector, comparer)
+            : ProfileItems.OrderByDescending(KeySelector, comparer);
+
+        var list = sorted.ToList();
+        ProfileItems.Clear();
+        ProfileItems.AddRange(list);
+
+        _dicHeaderSort[colName] = !asc;
+
+        return;
+    }
+
+    #endregion Servers && Groups
+
+    #region Public API
+
+    // External setter for ConfigType filter
+    public void SetConfigTypeFilter(IEnumerable<EConfigType> types, bool exclude = false)
+    {
+        FilterConfigTypes = types?.Distinct().ToList() ?? new List<EConfigType>();
+        FilterExclude = exclude;
+    }
+
+    #endregion Public API
+}

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -1,4 +1,5 @@
 using System.Reactive;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Text;
 using DynamicData;
@@ -22,13 +23,9 @@ public class ProfilesViewModel : MyReactiveObject
 
     #region ObservableCollection
 
-    private IObservableCollection<ProfileItemModel> _profileItems = new ObservableCollectionExtended<ProfileItemModel>();
-    public IObservableCollection<ProfileItemModel> ProfileItems => _profileItems;
+    public IObservableCollection<ProfileItemModel> ProfileItems { get; } = new ObservableCollectionExtended<ProfileItemModel>();
 
-    private IObservableCollection<SubItem> _subItems = new ObservableCollectionExtended<SubItem>();
-    public IObservableCollection<SubItem> SubItems => _subItems;
-
-    private IObservableCollection<ComboItem> _servers = new ObservableCollectionExtended<ComboItem>();
+    public IObservableCollection<SubItem> SubItems { get; } = new ObservableCollectionExtended<SubItem>();
 
     [Reactive]
     public ProfileItemModel SelectedProfile { get; set; }
@@ -41,15 +38,9 @@ public class ProfilesViewModel : MyReactiveObject
     [Reactive]
     public SubItem SelectedMoveToGroup { get; set; }
 
-    [Reactive]
-    public ComboItem SelectedServer { get; set; }
-
     [Reactive]
     public string ServerFilter { get; set; }
 
-    [Reactive]
-    public bool BlServers { get; set; }
-
     #endregion ObservableCollection
 
     #region Menu
@@ -118,15 +109,10 @@ public class ProfilesViewModel : MyReactiveObject
              y => y != null && !y.Remarks.IsNullOrEmpty())
                  .Subscribe(async c => await MoveToGroup(c));
 
-        this.WhenAnyValue(
-          x => x.SelectedServer,
-          y => y != null && !y.Text.IsNullOrEmpty())
-              .Subscribe(async c => await ServerSelectedChanged(c));
-
         this.WhenAnyValue(
           x => x.ServerFilter,
           y => y != null && _serverFilter != y)
-              .Subscribe(c => ServerFilterChanged(c));
+              .Subscribe(async c => await ServerFilterChanged(c));
 
         //servers delete
         EditServerCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -247,10 +233,19 @@ public class ProfilesViewModel : MyReactiveObject
 
         #endregion WhenAnyValue && ReactiveCommand
 
-        if (_updateView != null)
-        {
-            MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString()).Subscribe(OnNext);
-        }
+        #region AppEvents
+
+        AppEvents.ProfilesRefreshRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async _ => await RefreshServersBiz());
+
+        AppEvents.DispatcherStatisticsRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async result => await UpdateStatistics(result));
+
+        #endregion AppEvents
 
         _ = Init();
     }
@@ -260,27 +255,21 @@ public class ProfilesViewModel : MyReactiveObject
         SelectedProfile = new();
         SelectedSub = new();
         SelectedMoveToGroup = new();
-        SelectedServer = new();
 
         await RefreshSubscriptions();
-        RefreshServers();
+        //await RefreshServers();
     }
 
     #endregion Init
 
     #region Actions
 
-    private async void OnNext(string x)
-    {
-        await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
-    }
-
     private void Reload()
     {
         Locator.Current.GetService<MainWindowViewModel>()?.Reload();
     }
 
-    public void SetSpeedTestResult(SpeedTestResult result)
+    public async Task SetSpeedTestResult(SpeedTestResult result)
     {
         if (result.IndexId.IsNullOrEmpty())
         {
@@ -288,7 +277,7 @@ public class ProfilesViewModel : MyReactiveObject
             NoticeManager.Instance.Enqueue(result.Delay);
             return;
         }
-        var item = _profileItems.FirstOrDefault(it => it.IndexId == result.IndexId);
+        var item = ProfileItems.FirstOrDefault(it => it.IndexId == result.IndexId);
         if (item == null)
         {
             return;
@@ -304,31 +293,26 @@ public class ProfilesViewModel : MyReactiveObject
         {
             item.SpeedVal = result.Speed ?? string.Empty;
         }
-        //_profileItems.Replace(item, JsonUtils.DeepCopy(item));
     }
 
-    public void UpdateStatistics(ServerSpeedItem update)
+    public async Task UpdateStatistics(ServerSpeedItem update)
     {
+        if (!_config.GuiItem.EnableStatistics
+            || (update.ProxyUp + update.ProxyDown) <= 0
+            || DateTime.Now.Second % 3 != 0)
+        {
+            return;
+        }
+
         try
         {
-            var item = _profileItems.FirstOrDefault(it => it.IndexId == update.IndexId);
+            var item = ProfileItems.FirstOrDefault(it => it.IndexId == update.IndexId);
             if (item != null)
             {
                 item.TodayDown = Utils.HumanFy(update.TodayDown);
                 item.TodayUp = Utils.HumanFy(update.TodayUp);
                 item.TotalDown = Utils.HumanFy(update.TotalDown);
                 item.TotalUp = Utils.HumanFy(update.TotalUp);
-
-                //if (SelectedProfile?.IndexId == item.IndexId)
-                //{
-                //    var temp = JsonUtils.DeepCopy(item);
-                //    _profileItems.Replace(item, temp);
-                //    SelectedProfile = temp;
-                //}
-                //else
-                //{
-                //    _profileItems.Replace(item, JsonUtils.DeepCopy(item));
-                //}
             }
         }
         catch
@@ -336,11 +320,6 @@ public class ProfilesViewModel : MyReactiveObject
         }
     }
 
-    public async Task AutofitColumnWidthAsync()
-    {
-        await _updateView?.Invoke(EViewAction.AdjustMainLvColWidth, null);
-    }
-
     #endregion Actions
 
     #region Servers && Groups
@@ -353,12 +332,12 @@ public class ProfilesViewModel : MyReactiveObject
         }
         _config.SubIndexId = SelectedSub?.Id;
 
-        RefreshServers();
+        await RefreshServers();
 
         await _updateView?.Invoke(EViewAction.ProfilesFocus, null);
     }
 
-    private void ServerFilterChanged(bool c)
+    private async Task ServerFilterChanged(bool c)
     {
         if (!c)
         {
@@ -367,22 +346,24 @@ public class ProfilesViewModel : MyReactiveObject
         _serverFilter = ServerFilter;
         if (_serverFilter.IsNullOrEmpty())
         {
-            RefreshServers();
+            await RefreshServers();
         }
     }
 
-    public void RefreshServers()
+    public async Task RefreshServers()
     {
-        MessageBus.Current.SendMessage("", EMsgCommand.RefreshProfiles.ToString());
+        AppEvents.ProfilesRefreshRequested.OnNext(Unit.Default);
+
+        await Task.Delay(200);
     }
 
-    public async Task RefreshServersBiz()
+    private async Task RefreshServersBiz()
     {
         var lstModel = await GetProfileItemsEx(_config.SubIndexId, _serverFilter);
         _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel)) ?? [];
 
-        _profileItems.Clear();
-        _profileItems.AddRange(lstModel);
+        ProfileItems.Clear();
+        ProfileItems.AddRange(lstModel);
         if (lstModel.Count > 0)
         {
             var selected = lstModel.FirstOrDefault(t => t.IndexId == _config.IndexId);
@@ -395,25 +376,27 @@ public class ProfilesViewModel : MyReactiveObject
                 SelectedProfile = lstModel.First();
             }
         }
+
+        await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
     }
 
     public async Task RefreshSubscriptions()
     {
-        _subItems.Clear();
+        SubItems.Clear();
 
-        _subItems.Add(new SubItem { Remarks = ResUI.AllGroupServers });
+        SubItems.Add(new SubItem { Remarks = ResUI.AllGroupServers });
 
         foreach (var item in await AppManager.Instance.SubItems())
         {
-            _subItems.Add(item);
+            SubItems.Add(item);
         }
-        if (_config.SubIndexId != null && _subItems.FirstOrDefault(t => t.Id == _config.SubIndexId) != null)
+        if (_config.SubIndexId != null && SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId) != null)
         {
-            SelectedSub = _subItems.FirstOrDefault(t => t.Id == _config.SubIndexId);
+            SelectedSub = SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId);
         }
         else
         {
-            SelectedSub = _subItems.First();
+            SelectedSub = SubItems.First();
         }
     }
 
@@ -514,7 +497,7 @@ public class ProfilesViewModel : MyReactiveObject
         }
         if (ret == true)
         {
-            RefreshServers();
+            await RefreshServers();
             if (item.IndexId == _config.IndexId)
             {
                 Reload();
@@ -537,11 +520,11 @@ public class ProfilesViewModel : MyReactiveObject
 
         await ConfigHandler.RemoveServers(_config, lstSelected);
         NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
-        if (lstSelected.Count == _profileItems.Count)
+        if (lstSelected.Count == ProfileItems.Count)
         {
-            _profileItems.Clear();
+            ProfileItems.Clear();
         }
-        RefreshServers();
+        await RefreshServers();
         if (exists)
         {
             Reload();
@@ -553,7 +536,7 @@ public class ProfilesViewModel : MyReactiveObject
         var tuple = await ConfigHandler.DedupServerList(_config, _config.SubIndexId);
         if (tuple.Item1 > 0 || tuple.Item2 > 0)
         {
-            RefreshServers();
+            await RefreshServers();
             Reload();
         }
         NoticeManager.Instance.Enqueue(string.Format(ResUI.RemoveDuplicateServerResult, tuple.Item1, tuple.Item2));
@@ -568,7 +551,7 @@ public class ProfilesViewModel : MyReactiveObject
         }
         if (await ConfigHandler.CopyServer(_config, lstSelected) == 0)
         {
-            RefreshServers();
+            await RefreshServers();
             NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
         }
     }
@@ -601,24 +584,11 @@ public class ProfilesViewModel : MyReactiveObject
 
         if (await ConfigHandler.SetDefaultServerIndex(_config, indexId) == 0)
         {
-            RefreshServers();
+            await RefreshServers();
             Reload();
         }
     }
 
-    private async Task ServerSelectedChanged(bool c)
-    {
-        if (!c)
-        {
-            return;
-        }
-        if (SelectedServer == null || SelectedServer.ID.IsNullOrEmpty())
-        {
-            return;
-        }
-        await SetDefaultServer(SelectedServer.ID);
-    }
-
     public async Task ShareServerAsync()
     {
         var item = await AppManager.Instance.GetProfileItem(SelectedProfile.IndexId);
@@ -652,7 +622,7 @@ public class ProfilesViewModel : MyReactiveObject
         }
         if (ret?.Data?.ToString() == _config.IndexId)
         {
-            RefreshServers();
+            await RefreshServers();
             Reload();
         }
         else
@@ -675,13 +645,13 @@ public class ProfilesViewModel : MyReactiveObject
             return;
         }
         _dicHeaderSort[colName] = !asc;
-        RefreshServers();
+        await RefreshServers();
     }
 
     public async Task RemoveInvalidServerResult()
     {
         var count = await ConfigHandler.RemoveInvalidServerResult(_config, _config.SubIndexId);
-        RefreshServers();
+        await RefreshServers();
         NoticeManager.Instance.Enqueue(string.Format(ResUI.RemoveInvalidServerResultTip, count));
     }
 
@@ -702,7 +672,7 @@ public class ProfilesViewModel : MyReactiveObject
         await ConfigHandler.MoveToGroup(_config, lstSelected, SelectedMoveToGroup.Id);
         NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
 
-        RefreshServers();
+        await RefreshServers();
         SelectedMoveToGroup = null;
         SelectedMoveToGroup = new();
     }
@@ -723,18 +693,18 @@ public class ProfilesViewModel : MyReactiveObject
         }
         if (await ConfigHandler.MoveServer(_config, _lstProfile, index, eMove) == 0)
         {
-            RefreshServers();
+            await RefreshServers();
         }
     }
 
     public async Task MoveServerTo(int startIndex, ProfileItemModel targetItem)
     {
-        var targetIndex = _profileItems.IndexOf(targetItem);
+        var targetIndex = ProfileItems.IndexOf(targetItem);
         if (startIndex >= 0 && targetIndex >= 0 && startIndex != targetIndex)
         {
             if (await ConfigHandler.MoveServer(_config, _lstProfile, startIndex, EMove.Position, targetIndex) == 0)
             {
-                RefreshServers();
+                await RefreshServers();
             }
         }
     }
@@ -743,7 +713,7 @@ public class ProfilesViewModel : MyReactiveObject
     {
         if (actionType == ESpeedActionType.Mixedtest)
         {
-            SelectedProfiles = _profileItems;
+            SelectedProfiles = ProfileItems;
         }
         var lstSelected = await GetProfileItems(false);
         if (lstSelected == null)
@@ -751,7 +721,14 @@ public class ProfilesViewModel : MyReactiveObject
             return;
         }
 
-        _speedtestService ??= new SpeedtestService(_config, (SpeedTestResult result) => _updateView?.Invoke(EViewAction.DispatcherSpeedTest, result));
+        _speedtestService ??= new SpeedtestService(_config, async (SpeedTestResult result) =>
+        {
+            RxApp.MainThreadScheduler.Schedule(result, (scheduler, result) =>
+            {
+                _ = SetSpeedTestResult(result);
+                return Disposable.Empty;
+            });
+        });
         _speedtestService?.RunLoop(actionType, lstSelected);
     }
 

v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs

@@ -14,8 +14,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
     [Reactive]
     public RoutingItem SelectedRouting { get; set; }
 
-    private IObservableCollection<RulesItemModel> _rulesItems = new ObservableCollectionExtended<RulesItemModel>();
-    public IObservableCollection<RulesItemModel> RulesItems => _rulesItems;
+    public IObservableCollection<RulesItemModel> RulesItems { get; } = new ObservableCollectionExtended<RulesItemModel>();
 
     [Reactive]
     public RulesItemModel SelectedSource { get; set; }
@@ -101,7 +100,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
 
     public void RefreshRulesItems()
     {
-        _rulesItems.Clear();
+        RulesItems.Clear();
 
         foreach (var item in _rules)
         {
@@ -118,7 +117,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
                 Enabled = item.Enabled,
                 Remarks = item.Remarks,
             };
-            _rulesItems.Add(it);
+            RulesItems.Add(it);
         }
     }
 

v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs

@@ -9,8 +9,7 @@ public class RoutingSettingViewModel : MyReactiveObject
 {
     #region Reactive
 
-    private IObservableCollection<RoutingItemModel> _routingItems = new ObservableCollectionExtended<RoutingItemModel>();
-    public IObservableCollection<RoutingItemModel> RoutingItems => _routingItems;
+    public IObservableCollection<RoutingItemModel> RoutingItems { get; } = new ObservableCollectionExtended<RoutingItemModel>();
 
     [Reactive]
     public RoutingItemModel SelectedSource { get; set; }
@@ -82,7 +81,7 @@ public class RoutingSettingViewModel : MyReactiveObject
 
     public async Task RefreshRoutingItems()
     {
-        _routingItems.Clear();
+        RoutingItems.Clear();
 
         var routings = await AppManager.Instance.RoutingItems();
         foreach (var item in routings)
@@ -98,7 +97,7 @@ public class RoutingSettingViewModel : MyReactiveObject
                 CustomRulesetPath4Singbox = item.CustomRulesetPath4Singbox,
                 Sort = item.Sort,
             };
-            _routingItems.Add(it);
+            RoutingItems.Add(it);
         }
     }
 

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -1,4 +1,6 @@
 using System.Reactive;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using System.Text;
 using DynamicData.Binding;
 using ReactiveUI;
@@ -11,11 +13,9 @@ public class StatusBarViewModel : MyReactiveObject
 {
     #region ObservableCollection
 
-    private IObservableCollection<RoutingItem> _routingItems = new ObservableCollectionExtended<RoutingItem>();
-    public IObservableCollection<RoutingItem> RoutingItems => _routingItems;
+    public IObservableCollection<RoutingItem> RoutingItems { get; } = new ObservableCollectionExtended<RoutingItem>();
 
-    private IObservableCollection<ComboItem> _servers = new ObservableCollectionExtended<ComboItem>();
-    public IObservableCollection<ComboItem> Servers => _servers;
+    public IObservableCollection<ComboItem> Servers { get; } = new ObservableCollectionExtended<ComboItem>();
 
     [Reactive]
     public RoutingItem SelectedRouting { get; set; }
@@ -197,10 +197,20 @@ public class StatusBarViewModel : MyReactiveObject
 
         #endregion WhenAnyValue && ReactiveCommand
 
+        #region AppEvents
+
         if (updateView != null)
         {
             InitUpdateView(updateView);
         }
+
+        AppEvents.DispatcherStatisticsRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async result => await UpdateStatistics(result));
+
+        #endregion AppEvents
+
         _ = Init();
     }
 
@@ -216,15 +226,13 @@ public class StatusBarViewModel : MyReactiveObject
         _updateView = updateView;
         if (_updateView != null)
         {
-            MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString()).Subscribe(OnNext);
+            AppEvents.ProfilesRefreshRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(async _ => await RefreshServersBiz()); //.DisposeWith(_disposables);
         }
     }
 
-    private async void OnNext(string x)
-    {
-        await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
-    }
-
     private async Task CopyProxyCmdToClipboard()
     {
         var cmd = Utils.IsWindows() ? "set" : "export";
@@ -263,7 +271,7 @@ public class StatusBarViewModel : MyReactiveObject
             await service.UpdateSubscriptionProcess("", blProxy);
     }
 
-    public async Task RefreshServersBiz()
+    private async Task RefreshServersBiz()
     {
         await RefreshServersMenu();
 
@@ -285,7 +293,7 @@ public class StatusBarViewModel : MyReactiveObject
     {
         var lstModel = await AppManager.Instance.ProfileItems(_config.SubIndexId, "");
 
-        _servers.Clear();
+        Servers.Clear();
         if (lstModel.Count > _config.GuiItem.TrayMenuServersLimit)
         {
             BlServers = false;
@@ -299,7 +307,7 @@ public class StatusBarViewModel : MyReactiveObject
             string name = it.GetSummary();
 
             var item = new ComboItem() { ID = it.IndexId, Text = name };
-            _servers.Add(item);
+            Servers.Add(item);
             if (_config.IndexId == it.IndexId)
             {
                 SelectedServer = item;
@@ -332,15 +340,24 @@ public class StatusBarViewModel : MyReactiveObject
             return;
         }
 
-        _updateView?.Invoke(EViewAction.DispatcherServerAvailability, ResUI.Speedtesting);
+        await TestServerAvailabilitySub(ResUI.Speedtesting);
 
         var msg = await Task.Run(ConnectionHandler.RunAvailabilityCheck);
 
         NoticeManager.Instance.SendMessageEx(msg);
-        _updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);
+        await TestServerAvailabilitySub(msg);
     }
 
-    public void TestServerAvailabilityResult(string msg)
+    private async Task TestServerAvailabilitySub(string msg)
+    {
+        RxApp.MainThreadScheduler.Schedule(msg, (scheduler, msg) =>
+        {
+            _ = TestServerAvailabilityResult(msg);
+            return Disposable.Empty;
+        });
+    }
+
+    public async Task TestServerAvailabilityResult(string msg)
     {
         RunningInfoDisplay = msg;
     }
@@ -378,13 +395,13 @@ public class StatusBarViewModel : MyReactiveObject
 
     public async Task RefreshRoutingsMenu()
     {
-        _routingItems.Clear();
+        RoutingItems.Clear();
 
         BlRouting = true;
         var routings = await AppManager.Instance.RoutingItems();
         foreach (var item in routings)
         {
-            _routingItems.Add(item);
+            RoutingItems.Add(item);
             if (item.IsActive)
             {
                 SelectedRouting = item;
@@ -509,8 +526,13 @@ public class StatusBarViewModel : MyReactiveObject
         await Task.CompletedTask;
     }
 
-    public void UpdateStatistics(ServerSpeedItem update)
+    public async Task UpdateStatistics(ServerSpeedItem update)
     {
+        if (!_config.GuiItem.DisplayRealTimeSpeed)
+        {
+            return;
+        }
+
         try
         {
             if (_config.IsRunningCore(ECoreType.sing_box))

v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs

@@ -8,8 +8,7 @@ namespace ServiceLib.ViewModels;
 
 public class SubSettingViewModel : MyReactiveObject
 {
-    private IObservableCollection<SubItem> _subItems = new ObservableCollectionExtended<SubItem>();
-    public IObservableCollection<SubItem> SubItems => _subItems;
+    public IObservableCollection<SubItem> SubItems { get; } = new ObservableCollectionExtended<SubItem>();
 
     [Reactive]
     public SubItem SelectedSource { get; set; }
@@ -60,8 +59,8 @@ public class SubSettingViewModel : MyReactiveObject
 
     public async Task RefreshSubItems()
     {
-        _subItems.Clear();
-        _subItems.AddRange(await AppManager.Instance.SubItems());
+        SubItems.Clear();
+        SubItems.AddRange(await AppManager.Instance.SubItems());
     }
 
     public async Task EditSubAsync(bool blNew)

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -1,7 +1,6 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Common;
 using v2rayN.Desktop.Views;
@@ -74,11 +73,7 @@ public partial class App : Application
 
     private async void MenuExit_Click(object? sender, EventArgs e)
     {
-        var service = Locator.Current.GetService<MainWindowViewModel>();
-        if (service != null)
-        {
-            await service.MyAppExitAsync(true);
-        }
-        service?.Shutdown(true);
+        await AppManager.Instance.AppExitAsync(false);
+        AppManager.Instance.Shutdown(true);
     }
 }

v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml

@@ -22,4 +22,8 @@
     <Style Selector="ScrollViewer">
         <Setter Property="AllowAutoHide" Value="False" />
     </Style>
+
+    <Style Selector="TabControl">
+        <Setter Property="Theme" Value="{StaticResource LineTabControl}" />
+    </Style>
 </Styles>

v2rayN/v2rayN.Desktop/Base/WindowBase.cs

@@ -1,7 +1,6 @@
 using Avalonia;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
-using ServiceLib.Manager;
 
 namespace v2rayN.Desktop.Base;
 

v2rayN/v2rayN.Desktop/GlobalUsings.cs

@@ -1,8 +1,9 @@
-global using ServiceLib;
+global using ServiceLib;
 global using ServiceLib.Base;
 global using ServiceLib.Common;
 global using ServiceLib.Enums;
 global using ServiceLib.Handler;
+global using ServiceLib.Manager;
 global using ServiceLib.Models;
 global using ServiceLib.Resx;
-global using ServiceLib.ViewModels;
+global using ServiceLib.ViewModels;

v2rayN/v2rayN.Desktop/Program.cs

@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.ReactiveUI;
-using ServiceLib.Manager;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop;

v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs

@@ -8,7 +8,6 @@ using Avalonia.Styling;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Semi.Avalonia;
-using ServiceLib.Manager;
 
 namespace v2rayN.Desktop.ViewModels;
 

v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml

@@ -23,14 +23,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -23,14 +23,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
@@ -402,7 +400,7 @@
                         Grid.Column="1"
                         Width="400"
                         Margin="{StaticResource Margin4}"
-                        Watermark="1000:2000,3000:4000" />
+                        Watermark="1000-2000,3000,4000" />
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="2"

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

@@ -2,7 +2,6 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
-using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs

@@ -1,6 +1,5 @@
 using System.Reactive.Disposables;
 using Avalonia.ReactiveUI;
-using Avalonia.Threading;
 using ReactiveUI;
 
 namespace v2rayN.Desktop.Views;
@@ -24,25 +23,6 @@ public partial class CheckUpdateView : ReactiveUserControl<CheckUpdateViewModel>
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
     {
-        switch (action)
-        {
-            case EViewAction.DispatcherCheckUpdate:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.UpdateViewResult((CheckUpdateModel)obj),
-                DispatcherPriority.Default);
-                break;
-
-            case EViewAction.DispatcherCheckUpdateFinished:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.UpdateFinishedResult((bool)obj),
-                DispatcherPriority.Default);
-                break;
-        }
-
         return await Task.FromResult(true);
     }
 }

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

@@ -2,7 +2,6 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
-using Avalonia.Threading;
 using ReactiveUI;
 
 namespace v2rayN.Desktop.Views;
@@ -31,17 +30,6 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
     {
-        switch (action)
-        {
-            case EViewAction.DispatcherRefreshConnections:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.RefreshConnections((List<ConnectionItem>?)obj),
-                 DispatcherPriority.Default);
-                break;
-        }
-
         return await Task.FromResult(true);
     }
 

v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml.cs

@@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using Avalonia.Input;
 using Avalonia.ReactiveUI;
-using Avalonia.Threading;
 using DynamicData;
 using ReactiveUI;
 using Splat;
@@ -40,23 +39,6 @@ public partial class ClashProxiesView : ReactiveUserControl<ClashProxiesViewMode
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
     {
-        switch (action)
-        {
-            case EViewAction.DispatcherRefreshProxyGroups:
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.RefreshProxyGroups(),
-                    DispatcherPriority.Default);
-                break;
-
-            case EViewAction.DispatcherProxiesDelayTest:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.ProxiesDelayTestResult((SpeedTestResult)obj),
-                    DispatcherPriority.Default);
-                break;
-        }
-
         return await Task.FromResult(true);
     }
 

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml

@@ -24,14 +24,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 
@@ -61,7 +59,7 @@
                             x:Name="cmbDirectDNS"
                             Grid.Row="1"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin4}"
                             Text="{Binding DirectDNS, Mode=TwoWay}" />
 
@@ -75,7 +73,7 @@
                             x:Name="cmbRemoteDNS"
                             Grid.Row="2"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin4}"
                             Text="{Binding RemoteDNS, Mode=TwoWay}" />
 
@@ -89,7 +87,7 @@
                             x:Name="cmbSBResolverDNS"
                             Grid.Row="3"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin4}"
                             Text="{Binding SingboxOutboundsResolveDNS, Mode=TwoWay}" />
                         <TextBlock
@@ -110,7 +108,7 @@
                             x:Name="cmbSBFinalResolverDNS"
                             Grid.Row="4"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin4}"
                             Text="{Binding SingboxFinalResolveDNS, Mode=TwoWay}" />
                         <TextBlock
@@ -231,7 +229,7 @@
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}"
+                            Text="{x:Static resx:ResUI.TbFakeIPTips}"
                             TextWrapping="Wrap" />
 
                         <TextBlock
@@ -331,8 +329,7 @@
                             <Button
                                 x:Name="btnImportDefConfig4V2rayCompatible"
                                 Margin="{StaticResource Margin4}"
-                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
-                                Cursor="Hand" />
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}" />
                         </StackPanel>
                     </Grid>
 
@@ -415,8 +412,7 @@
                             <Button
                                 x:Name="btnImportDefConfig4SingboxCompatible"
                                 Margin="{StaticResource Margin4}"
-                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
-                                Cursor="Hand" />
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}" />
                         </StackPanel>
                     </Grid>
 

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs

@@ -2,7 +2,6 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
-using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;

v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml

@@ -23,14 +23,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 

v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs

@@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using Avalonia.Interactivity;
 using ReactiveUI;
-using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;
@@ -50,6 +49,7 @@ public partial class FullConfigTemplateWindow : WindowBase<FullConfigTemplateVie
     {
         ProcUtils.ProcessStart("https://github.com/2dust/v2rayN/wiki/Description-of-some-ui#%E5%AE%8C%E6%95%B4%E9%85%8D%E7%BD%AE%E6%A8%A1%E6%9D%BF%E8%AE%BE%E7%BD%AE");
     }
+
     private void Window_Loaded(object? sender, RoutedEventArgs e)
     {
         btnCancel.Focus();

v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml

@@ -28,14 +28,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">

v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml.cs

@@ -135,6 +135,7 @@ public partial class GlobalHotkeySettingWindow : WindowBase<GlobalHotkeySettingV
 
         return res.ToString();
     }
+
     private void Window_Loaded(object? sender, RoutedEventArgs e)
     {
         btnCancel.Focus();

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

@@ -1,4 +1,5 @@
 using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -9,7 +10,6 @@ using Avalonia.Threading;
 using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
-using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
@@ -39,7 +39,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
         menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
         menuClose.Click += MenuClose_Click;
 
-        MessageBus.Current.Listen<string>(EMsgCommand.SendSnackMsg.ToString()).Subscribe(DelegateSnackMsg);
         ViewModel = new MainWindowViewModel(UpdateViewHandler);
         Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));
 
@@ -136,6 +135,24 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
                     this.Bind(ViewModel, vm => vm.TabMainSelectedIndex, v => v.tabMain2.SelectedIndex).DisposeWith(disposables);
                     break;
             }
+
+            AppEvents.SendSnackMsgRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(async content => await DelegateSnackMsg(content))
+              .DisposeWith(disposables);
+
+            AppEvents.AppExitRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(_ => StorageUI())
+              .DisposeWith(disposables);
+
+            AppEvents.ShutdownRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(content => Shutdown(content))
+              .DisposeWith(disposables);
         });
 
         if (Utils.IsWindows())
@@ -156,7 +173,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
         menuAddServerViaScan.IsVisible = false;
 
         AddHelpMenuItem();
-        MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
     }
 
     #region Event
@@ -168,11 +184,9 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
             DispatcherPriority.Default);
     }
 
-    private void DelegateSnackMsg(string content)
+    private async Task DelegateSnackMsg(string content)
     {
-        Dispatcher.UIThread.Post(() =>
-                   _manager?.Show(new Notification(null, content, NotificationType.Information)),
-        DispatcherPriority.Normal);
+        _manager?.Show(new Notification(null, content, NotificationType.Information));
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@@ -213,33 +227,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
                 DispatcherPriority.Default);
                 break;
 
-            case EViewAction.DispatcherStatistics:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.SetStatisticsResult((ServerSpeedItem)obj),
-                DispatcherPriority.Default);
-                break;
-
-            case EViewAction.DispatcherReload:
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.ReloadResult(),
-                DispatcherPriority.Default);
-                break;
-
-            case EViewAction.Shutdown:
-                if (obj != null && _blCloseByUser == false)
-                {
-                    _blCloseByUser = (bool)obj;
-                }
-                StorageUI();
-                if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-                {
-                    HotkeyManager.Instance.Dispose();
-                    desktop.Shutdown();
-                }
-                break;
-
             case EViewAction.ScanScreenTask:
                 await ScanScreenTaskAsync();
                 break;
@@ -255,12 +242,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
                     await ViewModel.AddServerViaClipboardAsync(clipboardData);
                 }
                 break;
-
-            case EViewAction.AdjustMainLvColWidth:
-                Dispatcher.UIThread.Post(() =>
-                   Locator.Current.GetService<ProfilesViewModel>()?.AutofitColumnWidthAsync(),
-                    DispatcherPriority.Default);
-                break;
         }
 
         return await Task.FromResult(true);
@@ -300,10 +281,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
                 break;
 
             case WindowCloseReason.ApplicationShutdown or WindowCloseReason.OSShutdown:
-                if (ViewModel != null)
-                {
-                    await ViewModel.MyAppExitAsync(true);
-                }
+                await AppManager.Instance.AppExitAsync(false);
                 break;
         }
 
@@ -398,9 +376,21 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
 
         _blCloseByUser = true;
         StorageUI();
-        if (ViewModel != null)
+
+        await AppManager.Instance.AppExitAsync(true);
+    }
+
+    private void Shutdown(bool obj)
+    {
+        if (obj is bool b && _blCloseByUser == false)
         {
-            await ViewModel.MyAppExitAsync(false);
+            _blCloseByUser = b;
+        }
+        StorageUI();
+        if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+        {
+            HotkeyManager.Instance.Dispose();
+            desktop.Shutdown();
         }
     }
 
@@ -462,7 +452,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
         }
     }
 
-    private void StorageUI(string? n = null)
+    private void StorageUI()
     {
         ConfigHandler.SaveWindowSizeItem(_config, GetType().Name, Width, Height);
 

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -24,14 +24,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 

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

@@ -2,7 +2,6 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
-using ServiceLib.Manager;
 using v2rayN.Desktop.Base;
 
 namespace v2rayN.Desktop.Views;
@@ -211,6 +210,7 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
             ViewModel.destOverride = clbdestOverride.SelectedItems.Cast<string>().ToList();
         }
     }
+
     private void Window_Loaded(object? sender, RoutedEventArgs e)
     {
         btnCancel.Focus();

v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml

@@ -0,0 +1,128 @@
+<Window
+    x:Class="v2rayN.Desktop.Views.ProfilesSelectWindow"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
+    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
+    Title="{x:Static resx:ResUI.TbSelectProfile}"
+    Width="800"
+    Height="450"
+    x:DataType="vms:ProfilesSelectViewModel"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+
+    <DockPanel Margin="8">
+        <!--  Bottom buttons  -->
+        <StackPanel
+            Margin="4"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnSave"
+                Width="100"
+                Click="BtnSave_Click"
+                Content="{x:Static resx:ResUI.TbConfirm}" />
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Margin="8,0"
+                Content="{x:Static resx:ResUI.TbCancel}" />
+        </StackPanel>
+
+        <Grid>
+            <DockPanel>
+                <!--  Top tools  -->
+                <WrapPanel Margin="4" DockPanel.Dock="Top">
+                    <ListBox
+                        x:Name="lstGroup"
+                        Margin="{StaticResource MarginLr4}"
+                        DisplayMemberBinding="{Binding Remarks}"
+                        ItemsSource="{Binding SubItems}"
+                        Theme="{DynamicResource ButtonRadioGroupListBox}">
+                        <ListBox.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <WrapPanel />
+                            </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                    </ListBox>
+
+                    <Button
+                        x:Name="btnAutofitColumnWidth"
+                        Width="32"
+                        Height="32"
+                        Margin="8,0"
+                        ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
+                        <Button.Content>
+                            <PathIcon Data="{StaticResource building_fit}" />
+                        </Button.Content>
+                    </Button>
+
+                    <TextBox
+                        x:Name="txtServerFilter"
+                        Width="200"
+                        Margin="8,0"
+                        VerticalContentAlignment="Center"
+                        Text="{Binding ServerFilter, Mode=TwoWay}"
+                        Watermark="{x:Static resx:ResUI.MsgServerTitle}" />
+                </WrapPanel>
+
+                <!--  Profiles grid  -->
+                <DataGrid
+                    x:Name="lstProfiles"
+                    AutoGenerateColumns="False"
+                    BorderThickness="1"
+                    CanUserReorderColumns="True"
+                    CanUserResizeColumns="True"
+                    GridLinesVisibility="All"
+                    HeadersVisibility="All"
+                    IsReadOnly="True"
+                    ItemsSource="{Binding ProfileItems}"
+                    SelectionMode="Single">
+                    <DataGrid.KeyBindings>
+                        <KeyBinding Command="{Binding SelectFinish}" Gesture="Enter" />
+                    </DataGrid.KeyBindings>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn
+                            Width="80"
+                            Binding="{Binding ConfigType}"
+                            Header="{x:Static resx:ResUI.LvServiceType}"
+                            Tag="ConfigType" />
+                        <DataGridTextColumn
+                            Width="120"
+                            Binding="{Binding Remarks}"
+                            Header="{x:Static resx:ResUI.LvRemarks}"
+                            Tag="Remarks" />
+                        <DataGridTextColumn
+                            Width="120"
+                            Binding="{Binding Address}"
+                            Header="{x:Static resx:ResUI.LvAddress}"
+                            Tag="Address" />
+                        <DataGridTextColumn
+                            Width="60"
+                            Binding="{Binding Port}"
+                            Header="{x:Static resx:ResUI.LvPort}"
+                            Tag="Port" />
+                        <DataGridTextColumn
+                            Width="100"
+                            Binding="{Binding Network}"
+                            Header="{x:Static resx:ResUI.LvTransportProtocol}"
+                            Tag="Network" />
+                        <DataGridTextColumn
+                            Width="100"
+                            Binding="{Binding StreamSecurity}"
+                            Header="{x:Static resx:ResUI.LvTLS}"
+                            Tag="StreamSecurity" />
+                        <DataGridTextColumn
+                            Width="100"
+                            Binding="{Binding SubRemarks}"
+                            Header="{x:Static resx:ResUI.LvSubscription}"
+                            Tag="SubRemarks" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </DockPanel>
+        </Grid>
+    </DockPanel>
+</Window>

v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs

@@ -0,0 +1,194 @@
+using System.Reactive.Disposables;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.ReactiveUI;
+using Avalonia.VisualTree;
+using ReactiveUI;
+
+namespace v2rayN.Desktop.Views;
+
+public partial class ProfilesSelectWindow : ReactiveWindow<ProfilesSelectViewModel>
+{
+    private static Config _config;
+
+    public Task<ProfileItem?> ProfileItem => GetProfileItem();
+    public Task<List<ProfileItem>?> ProfileItems => GetProfileItems();
+    private bool _allowMultiSelect = false;
+
+    public ProfilesSelectWindow()
+    {
+        InitializeComponent();
+
+        _config = AppManager.Instance.Config;
+
+        btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
+        txtServerFilter.KeyDown += TxtServerFilter_KeyDown;
+        lstProfiles.KeyDown += LstProfiles_KeyDown;
+        lstProfiles.SelectionChanged += LstProfiles_SelectionChanged;
+        lstProfiles.LoadingRow += LstProfiles_LoadingRow;
+        lstProfiles.Sorting += LstProfiles_Sorting;
+        lstProfiles.DoubleTapped += LstProfiles_DoubleTapped;
+
+        ViewModel = new ProfilesSelectViewModel(UpdateViewHandler);
+        DataContext = ViewModel;
+
+        this.WhenActivated(disposables =>
+        {
+            this.OneWayBind(ViewModel, vm => vm.ProfileItems, v => v.lstProfiles.ItemsSource).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SelectedProfile, v => v.lstProfiles.SelectedItem).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.SelectedSub, v => v.lstGroup.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.ServerFilter, v => v.txtServerFilter.Text).DisposeWith(disposables);
+        });
+
+        btnCancel.Click += (s, e) => Close(false);
+    }
+
+    public void AllowMultiSelect(bool allow)
+    {
+        _allowMultiSelect = allow;
+        if (allow)
+        {
+            lstProfiles.SelectionMode = DataGridSelectionMode.Extended;
+            lstProfiles.SelectedItems.Clear();
+        }
+        else
+        {
+            lstProfiles.SelectionMode = DataGridSelectionMode.Single;
+            if (lstProfiles.SelectedItems.Count > 0)
+            {
+                var first = lstProfiles.SelectedItems[0];
+                lstProfiles.SelectedItems.Clear();
+                lstProfiles.SelectedItem = first;
+            }
+        }
+    }
+
+    // Expose ConfigType filter controls to callers
+    public void SetConfigTypeFilter(IEnumerable<EConfigType> types, bool exclude = false)
+        => ViewModel?.SetConfigTypeFilter(types, exclude);
+
+    private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
+    {
+        switch (action)
+        {
+            case EViewAction.CloseWindow:
+                Close(true);
+                break;
+        }
+        return await Task.FromResult(true);
+    }
+
+    private void LstProfiles_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        if (ViewModel != null)
+        {
+            ViewModel.SelectedProfiles = lstProfiles.SelectedItems.Cast<ProfileItemModel>().ToList();
+        }
+    }
+
+    private void LstProfiles_LoadingRow(object? sender, DataGridRowEventArgs e)
+    {
+        e.Row.Header = $" {e.Row.Index + 1}";
+    }
+
+    private void LstProfiles_DoubleTapped(object? sender, TappedEventArgs e)
+    {
+        // 忽略表头区域的双击
+        if (e.Source is Control src)
+        {
+            if (src.FindAncestorOfType<DataGridColumnHeader>() != null)
+            {
+                e.Handled = true;
+                return;
+            }
+
+            // 仅当在数据行或其子元素上双击时才触发选择
+            if (src.FindAncestorOfType<DataGridRow>() != null)
+            {
+                ViewModel?.SelectFinish();
+                e.Handled = true;
+            }
+        }
+    }
+
+    private void LstProfiles_Sorting(object? sender, DataGridColumnEventArgs e)
+    {
+        // 自定义排序，防止默认行为导致误触发
+        e.Handled = true;
+        if (ViewModel != null && e.Column?.Tag?.ToString() != null)
+        {
+            ViewModel.SortServer(e.Column.Tag.ToString());
+        }
+    }
+
+    private void LstProfiles_KeyDown(object? sender, KeyEventArgs e)
+    {
+        if (e.KeyModifiers is KeyModifiers.Control or KeyModifiers.Meta)
+        {
+            if (e.Key == Key.A)
+            {
+                if (_allowMultiSelect)
+                {
+                    lstProfiles.SelectAll();
+                }
+                e.Handled = true;
+            }
+        }
+        else
+        {
+            if (e.Key is Key.Enter or Key.Return)
+            {
+                ViewModel?.SelectFinish();
+                e.Handled = true;
+            }
+        }
+    }
+
+    private void BtnAutofitColumnWidth_Click(object? sender, RoutedEventArgs e)
+    {
+        AutofitColumnWidth();
+    }
+
+    private void AutofitColumnWidth()
+    {
+        try
+        {
+            foreach (var col in lstProfiles.Columns)
+            {
+                col.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
+            }
+        }
+        catch
+        {
+        }
+    }
+
+    private void TxtServerFilter_KeyDown(object? sender, KeyEventArgs e)
+    {
+        if (e.Key is Key.Enter or Key.Return)
+        {
+            ViewModel?.RefreshServers();
+        }
+    }
+
+    public async Task<ProfileItem?> GetProfileItem()
+    {
+        var item = await ViewModel?.GetProfileItem();
+        return item;
+    }
+
+    public async Task<List<ProfileItem>?> GetProfileItems()
+    {
+        var item = await ViewModel?.GetProfileItems();
+        return item;
+    }
+
+    private void BtnSave_Click(object sender, RoutedEventArgs e)
+    {
+        // Trigger selection finalize when Confirm is clicked
+        ViewModel?.SelectFinish();
+    }
+}

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

@@ -1,4 +1,5 @@
 using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -7,7 +8,6 @@ using Avalonia.Threading;
 using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
-using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Common;
 
@@ -96,11 +96,21 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
             this.BindCommand(ViewModel, vm => vm.Export2ClientConfigClipboardCmd, v => v.menuExport2ClientConfigClipboard).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.Export2ShareUrlCmd, v => v.menuExport2ShareUrl).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.Export2ShareUrlBase64Cmd, v => v.menuExport2ShareUrlBase64).DisposeWith(disposables);
+
+            AppEvents.AppExitRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(_ => StorageUI())
+              .DisposeWith(disposables);
+
+            AppEvents.AdjustMainLvColWidthRequested
+                .AsObservable()
+                .ObserveOn(RxApp.MainThreadScheduler)
+                .Subscribe(_ => AutofitColumnWidth())
+                .DisposeWith(disposables);
         });
 
         RestoreUI();
-        ViewModel?.RefreshServers();
-        MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
     }
 
     private async void LstProfiles_Sorting(object? sender, DataGridColumnEventArgs e)
@@ -127,13 +137,6 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
                 await AvaUtils.SetClipboardData(this, (string)obj);
                 break;
 
-            case EViewAction.AdjustMainLvColWidth:
-                Dispatcher.UIThread.Post(() =>
-                     AutofitColumnWidth(),
-               DispatcherPriority.Default);
-
-                break;
-
             case EViewAction.ProfilesFocus:
                 lstProfiles.Focus();
                 break;
@@ -177,21 +180,8 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
                     return false;
                 return await new SubEditWindow((SubItem)obj).ShowDialog<bool>(_window);
 
-            case EViewAction.DispatcherSpeedTest:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.SetSpeedTestResult((SpeedTestResult)obj),
-                DispatcherPriority.Default);
-
-                break;
-
             case EViewAction.DispatcherRefreshServersBiz:
-                Dispatcher.UIThread.Post(() =>
-                {
-                    _ = RefreshServersBiz();
-                },
-                DispatcherPriority.Default);
+                Dispatcher.UIThread.Post(RefreshServersBiz, DispatcherPriority.Default);
                 break;
         }
 
@@ -209,13 +199,8 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
         await DialogHost.Show(dialog);
     }
 
-    public async Task RefreshServersBiz()
+    public void RefreshServersBiz()
     {
-        if (ViewModel != null)
-        {
-            await ViewModel.RefreshServersBiz();
-        }
-
         if (lstProfiles.SelectedIndex >= 0)
         {
             lstProfiles.ScrollIntoView(lstProfiles.SelectedItem, null);
@@ -421,7 +406,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
         }
     }
 
-    private void StorageUI(string? n = null)
+    private void StorageUI()
     {
         List<ColumnItem> lvColumnItem = new();
         foreach (var item2 in lstProfiles.Columns)

v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml

@@ -4,19 +4,25 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="480"
-    d:DesignWidth="400"
+    xmlns:sys="clr-namespace:System;assembly=netstandard"
+    d:DesignHeight="600"
+    d:DesignWidth="600"
     mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <sys:Double x:Key="QrcodeWidth">500</sys:Double>
+    </UserControl.Resources>
+
     <Grid Margin="32" RowDefinitions="Auto,Auto">
         <Image
             Name="imgQrcode"
-            Width="300"
-            Height="300" />
+            Width="{StaticResource QrcodeWidth}"
+            Height="{StaticResource QrcodeWidth}" />
 
         <TextBox
             x:Name="txtContent"
             Grid.Row="1"
-            Width="300"
+            Width="{StaticResource QrcodeWidth}"
             MaxHeight="100"
             Margin="{StaticResource MarginTb8}"
             VerticalAlignment="Center"

v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs

@@ -23,8 +23,16 @@ public partial class QrcodeView : UserControl
 
     private Bitmap? GetQRCode(string? url)
     {
-        var bytes = QRCodeUtils.GenQRCode(url);
-        return ByteToBitmap(bytes);
+        try
+        {
+            var bytes = QRCodeUtils.GenQRCode(url);
+            return ByteToBitmap(bytes);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog("GetQRCode", ex);
+            return null;
+        }
     }
 
     private Bitmap? ByteToBitmap(byte[]? bytes)

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml

@@ -54,13 +54,22 @@
                 Width="300"
                 Margin="{StaticResource Margin4}"
                 Text="{Binding SelectedSource.OutboundTag, Mode=TwoWay}" />
-            <TextBlock
+            <StackPanel
                 Grid.Row="1"
                 Grid.Column="2"
                 Margin="{StaticResource Margin4}"
+                Orientation="Horizontal"
                 HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Text="{x:Static resx:ResUI.TbRuleOutboundTagTip}" />
+                VerticalAlignment="Center">
+                <Button
+                    x:Name="btnSelectProfile"
+                    Margin="0,0,8,0"
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
+                    Click="BtnSelectProfile_Click" />
+                <TextBlock
+                    VerticalAlignment="Center"
+                    Text="{x:Static resx:ResUI.TbRuleOutboundTagTip}" />
+            </StackPanel>
 
             <TextBlock
                 Grid.Row="2"
@@ -167,14 +176,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs

@@ -93,4 +93,19 @@ public partial class RoutingRuleDetailsWindow : WindowBase<RoutingRuleDetailsVie
     {
         ProcUtils.ProcessStart("https://xtls.github.io/config/routing.html#ruleobject");
     }
+
+    private async void BtnSelectProfile_Click(object? sender, RoutedEventArgs e)
+    {
+        var selectWindow = new ProfilesSelectWindow();
+        selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom }, exclude: true);
+        var result = await selectWindow.ShowDialog<bool?>(this);
+        if (result == true)
+        {
+            var profile = await selectWindow.ProfileItem;
+            if (profile != null)
+            {
+                cmbOutboundTag.Text = profile.Remarks;
+            }
+        }
+    }
 }

v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml

@@ -27,22 +27,20 @@
         </StackPanel>
 
         <StackPanel
-            HorizontalAlignment="Right"
             Margin="{StaticResource Margin4}"
+            HorizontalAlignment="Right"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 
@@ -54,8 +52,8 @@
             <TextBlock
                 Grid.Row="0"
                 Grid.Column="0"
-                VerticalAlignment="Center"
                 Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
                 Text="{x:Static resx:ResUI.LvRemarks}" />
             <StackPanel
                 Grid.Row="0"
@@ -67,27 +65,27 @@
                     Grid.Row="0"
                     Grid.Column="1"
                     Width="300"
+                    Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
-                    Margin="{StaticResource Margin4}"
                     TextWrapping="Wrap" />
 
                 <TextBlock
-                    VerticalAlignment="Center"
                     Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
                     Text="{x:Static resx:ResUI.LvSort}" />
                 <TextBox
                     x:Name="txtSort"
                     Width="100"
-                    HorizontalAlignment="Left"
-                    Margin="{StaticResource Margin4}" />
+                    Margin="{StaticResource Margin4}"
+                    HorizontalAlignment="Left" />
             </StackPanel>
 
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="0"
-                VerticalAlignment="Center"
                 Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
                 Text="{x:Static resx:ResUI.TbdomainStrategy}" />
             <StackPanel
                 Grid.Row="1"
@@ -98,8 +96,8 @@
                     Width="200"
                     Margin="{StaticResource Margin4}" />
                 <TextBlock
-                    VerticalAlignment="Center"
                     Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
                     Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
                 <ComboBox
                     x:Name="cmbdomainStrategy4Singbox"
@@ -110,17 +108,17 @@
             <TextBlock
                 Grid.Row="2"
                 Grid.Column="0"
-                VerticalAlignment="Center"
                 Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
                 Text="{x:Static resx:ResUI.LvUrl}" />
             <TextBox
                 x:Name="txtUrl"
                 Grid.Row="2"
                 Grid.Column="1"
                 Width="600"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Margin="{StaticResource Margin4}"
                 TextWrapping="Wrap" />
 
             <!--
@@ -150,8 +148,8 @@
             <TextBlock
                 Grid.Row="4"
                 Grid.Column="0"
-                VerticalAlignment="Center"
-                Margin="{StaticResource Margin4}">
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center">
                 <HyperlinkButton Classes="WithIcon" Click="linkCustomRulesetPath4Singbox">
                     <TextBlock Text="{x:Static resx:ResUI.LvCustomRulesetPath4Singbox}" />
                 </HyperlinkButton>
@@ -161,9 +159,9 @@
                 Grid.Row="4"
                 Grid.Column="1"
                 Width="600"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Margin="{StaticResource Margin4}"
                 TextWrapping="Wrap" />
             <Button
                 x:Name="btnBrowseCustomRulesetPath4Singbox"
@@ -178,6 +176,7 @@
                 <DataGrid
                     x:Name="lstRules"
                     AutoGenerateColumns="False"
+                    Background="Transparent"
                     BorderThickness="1"
                     CanUserResizeColumns="True"
                     GridLinesVisibility="All"

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -35,14 +35,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
 
@@ -94,6 +92,7 @@
                 <DataGrid
                     x:Name="lstRoutings"
                     AutoGenerateColumns="False"
+                    Background="Transparent"
                     BorderThickness="1"
                     CanUserResizeColumns="True"
                     GridLinesVisibility="All"
@@ -132,10 +131,6 @@
                             Width="*"
                             Binding="{Binding Url}"
                             Header="{x:Static resx:ResUI.LvUrl}" />
-                        <DataGridTextColumn
-                            Width="300"
-                            Binding="{Binding CustomIcon}"
-                            Header="{x:Static resx:ResUI.LvCustomIcon}" />
                     </DataGrid.Columns>
                 </DataGrid>
             </TabItem>

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs

@@ -135,6 +135,7 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
             }
         }
     }
+
     private void Window_Loaded(object? sender, RoutedEventArgs e)
     {
         btnCancel.Focus();

v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs

@@ -6,7 +6,6 @@ using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using DialogHostAvalonia;
 using ReactiveUI;
-using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Common;
 
@@ -56,20 +55,6 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
     {
         switch (action)
         {
-            case EViewAction.DispatcherServerAvailability:
-                if (obj is null)
-                    return false;
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.TestServerAvailabilityResult((string)obj),
-                DispatcherPriority.Default);
-                break;
-
-            case EViewAction.DispatcherRefreshServersBiz:
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.RefreshServersBiz(),
-                DispatcherPriority.Default);
-                break;
-
             case EViewAction.DispatcherRefreshIcon:
                 Dispatcher.UIThread.Post(() =>
                 {

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml

@@ -22,14 +22,12 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand"
                 IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="{StaticResource MarginLr8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand"
                 IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
@@ -206,6 +204,12 @@
                     Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
+                <Button
+                    Grid.Row="9"
+                    Grid.Column="2"
+                    Margin="{StaticResource Margin4}"
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
+                    Click="BtnSelectPrevProfile_Click" />
 
                 <TextBlock
                     Grid.Row="10"
@@ -220,6 +224,12 @@
                     Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
+                <Button
+                    Grid.Row="10"
+                    Grid.Column="2"
+                    Margin="{StaticResource Margin4}"
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
+                    Click="BtnSelectNextProfile_Click" />
 
                 <TextBlock
                     Grid.Row="11"

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml.cs

@@ -59,4 +59,34 @@ public partial class SubEditWindow : WindowBase<SubEditViewModel>
     {
         txtRemarks.Focus();
     }
+
+    private async void BtnSelectPrevProfile_Click(object? sender, RoutedEventArgs e)
+    {
+        var selectWindow = new ProfilesSelectWindow();
+        selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom }, exclude: true);
+        var result = await selectWindow.ShowDialog<bool?>(this);
+        if (result == true)
+        {
+            var profile = await selectWindow.ProfileItem;
+            if (profile != null)
+            {
+                txtPrevProfile.Text = profile.Remarks;
+            }
+        }
+    }
+
+    private async void BtnSelectNextProfile_Click(object? sender, RoutedEventArgs e)
+    {
+        var selectWindow = new ProfilesSelectWindow();
+        selectWindow.SetConfigTypeFilter(new[] { EConfigType.Custom }, exclude: true);
+        var result = await selectWindow.ShowDialog<bool?>(this);
+        if (result == true)
+        {
+            var profile = await selectWindow.ProfileItem;
+            if (profile != null)
+            {
+                txtNextProfile.Text = profile.Remarks;
+            }
+        }
+    }
 }