up 7.15.0

* Add avaloniaEdit for test

* Adjust avaloniaEdit

* Optimize and improve message function

* Update build-linux.yml

* Update MsgView.axaml

* Update MsgView.axaml.cs

---------

Co-authored-by: 2dust <31833384+2dust@users.noreply.github.com>

.github/workflows/build-linux.yml

@@ -22,7 +22,7 @@ jobs:
       matrix:
         configuration: [Release]
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

package-appimage.sh

@@ -1,14 +1,67 @@
 #!/bin/bash
+set -euo pipefail
 
+# Install deps
 sudo apt update -y
-sudo apt install -y libfuse2
+sudo apt install -y libfuse2 wget file
-wget -O pkg2appimage https://github.com/AppImageCommunity/pkg2appimage/releases/download/continuous/pkg2appimage-1eceb30-x86_64.AppImage
+
-chmod a+x pkg2appimage
+# Get tools
-export AppImageOutputArch=$OutputArch
+wget -qO appimagetool https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
-export OutputPath=$OutputPath64
+chmod +x appimagetool
-./pkg2appimage ./pkg2appimage.yml
+
-mv out/*.AppImage v2rayN-${AppImageOutputArch}.AppImage
+# x86_64 AppDir
-export AppImageOutputArch=$OutputArchArm
+APPDIR_X64="AppDir-x86_64"
-export OutputPath=$OutputPathArm64
+rm -rf "$APPDIR_X64"
-./pkg2appimage ./pkg2appimage.yml
+mkdir -p "$APPDIR_X64/usr/lib/v2rayN" "$APPDIR_X64/usr/bin" "$APPDIR_X64/usr/share/applications" "$APPDIR_X64/usr/share/pixmaps"
-mv out/*.AppImage v2rayN-${AppImageOutputArch}.AppImage
+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
 

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"
+  mkdir -p "$outroot/bin"
-  local srcs=( \
+  local names=( \
-    "$outroot/bin/geosite.dat" \
+    "geosite.dat" \
-    "$outroot/bin/geoip.dat" \
+    "geoip.dat" \
-    "$outroot/bin/geoip-only-cn-private.dat" \
+    "geoip-only-cn-private.dat" \
-    "$outroot/bin/Country.mmdb" \
+    "Country.mmdb" \
-    "$outroot/bin/geoip.metadb" \
+    "geoip.metadb" \
   )
-  for s in "${srcs[@]}"; do
+  for n in "${names[@]}"; do
-    if [[ -f "$s" ]]; then
+    # If file exists under bin/xray/, move it up to bin/
-      mv -f "$s" "$outroot/bin/xray/$(basename "$s")"
+    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.7</Version>
+        <Version>7.15.0</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -5,10 +5,11 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.5" />
+    <PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.5" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.5" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.5" />
+    <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 +19,10 @@
     <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" Version="11.2.1.10" />
-    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.9" />
+    <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.1" />
-    <PackageVersion Include="Splat.NLog" Version="16.2.1" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.10" />
+    <PackageVersion Include="NLog" Version="6.0.4" />
     <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
+            return JsonSerializer.Deserialize<T>(strJson, _defaultDeserializeOptions);
-            {
-                PropertyNameCaseInsensitive = true
-            };
-            return JsonSerializer.Deserialize<T>(strJson, options);
         }
         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
+            var options = nullValue ? _nullValueSerializeOptions : _defaultSerializeOptions;
-            {
-                WriteIndented = indented,
-                DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull,
-                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-            };
             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,11 +9,46 @@ 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);
+        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/EViewAction.cs

@@ -12,7 +12,6 @@ public enum EViewAction
     ProfilesFocus,
     ShareSub,
     ShareServer,
-    ShowHideWindow,
     ScanScreenTask,
     ScanImageTask,
     BrowseServer,

v2rayN/ServiceLib/Events/AppEvents.cs

@@ -0,0 +1,32 @@
+using System.Reactive;
+
+namespace ServiceLib.Events;
+
+public static class AppEvents
+{
+    public static readonly EventChannel<Unit> ReloadRequested = new();
+    public static readonly EventChannel<bool?> ShowHideWindowRequested = new();
+    public static readonly EventChannel<Unit> AddServerViaScanRequested = new();
+    public static readonly EventChannel<Unit> AddServerViaClipboardRequested = new();
+    public static readonly EventChannel<bool> SubscriptionsUpdateRequested = new();
+
+    public static readonly EventChannel<Unit> ProfilesRefreshRequested = new();
+    public static readonly EventChannel<Unit> SubscriptionsRefreshRequested = new();
+    public static readonly EventChannel<Unit> ProxiesReloadRequested = new();
+    public static readonly EventChannel<ServerSpeedItem> DispatcherStatisticsRequested = new();
+
+    public static readonly EventChannel<string> SendSnackMsgRequested = new();
+    public static readonly EventChannel<string> SendMsgViewRequested = new();
+
+    public static readonly EventChannel<Unit> AppExitRequested = new();
+    public static readonly EventChannel<bool> ShutdownRequested = new();
+
+    public static readonly EventChannel<Unit> AdjustMainLvColWidthRequested = new();
+
+    public static readonly EventChannel<string> SetDefaultServerRequested = new();
+
+    public static readonly EventChannel<Unit> RoutingsMenuRefreshRequested = new();
+    public static readonly EventChannel<Unit> TestServerRequested = new();
+    public static readonly EventChannel<Unit> InboundDisplayRequested = new();
+    public static readonly EventChannel<ESysProxyType> SysProxyChangeRequested = new();
+}

v2rayN/ServiceLib/Events/EventChannel.cs

@@ -0,0 +1,29 @@
+using System.Reactive;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+
+namespace ServiceLib.Events;
+
+public sealed class EventChannel<T>
+{
+    private readonly ISubject<T> _subject = Subject.Synchronize(new Subject<T>());
+
+    public IObservable<T> AsObservable()
+    {
+        return _subject.AsObservable();
+    }
+
+    public void Publish(T value)
+    {
+        _subject.OnNext(value);
+    }
+
+    public void Publish()
+    {
+        if (typeof(T) != typeof(Unit))
+        {
+            throw new InvalidOperationException("Publish() without value is only valid for EventChannel<Unit>.");
+        }
+        _subject.OnNext((T)(object)Unit.Default);
+    }
+}

v2rayN/ServiceLib/Global.cs

@@ -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";
@@ -448,6 +449,14 @@ public class Global
             "none"
     ];
 
+    public static readonly Dictionary<string, string> LogLevelColors = new()
+    {
+        { "debug",   "#6C757D" },
+        { "info",    "#2ECC71" },
+        { "warning", "#FFA500" },
+        { "error",   "#E74C3C" },
+    };
+
     public static readonly List<string> InboundTags =
     [
         "socks",
@@ -597,6 +606,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/GlobalUsings.cs

@@ -1,6 +1,7 @@
 global using ServiceLib.Base;
 global using ServiceLib.Common;
 global using ServiceLib.Enums;
+global using ServiceLib.Events;
 global using ServiceLib.Handler;
 global using ServiceLib.Helper;
 global using ServiceLib.Manager;

v2rayN/ServiceLib/Handler/AppEvents.cs

@@ -1,21 +0,0 @@
-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(),

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/Manager/AppManager.cs

@@ -1,5 +1,3 @@
-using System.Reactive;
-
 namespace ServiceLib.Manager;
 
 public sealed class AppManager
@@ -96,7 +94,7 @@ public sealed class AppManager
             Logging.SaveLog("AppExitAsync Begin");
 
             await SysProxyHandler.UpdateSysProxy(_config, true);
-            AppEvents.AppExitRequested.OnNext(Unit.Default);
+            AppEvents.AppExitRequested.Publish();
             await Task.Delay(50); //Wait for AppExitRequested to be processed
 
             await ConfigHandler.SaveConfig(_config);
@@ -119,7 +117,13 @@ public sealed class AppManager
 
     public void Shutdown(bool byUser)
     {
-        AppEvents.ShutdownRequested.OnNext(byUser);
+        AppEvents.ShutdownRequested.Publish(byUser);
+    }
+
+    public async Task RebootAsAdmin()
+    {
+        ProcUtils.RebootAsAdmin();
+        await AppManager.Instance.AppExitAsync(true);
     }
 
     #endregion App

v2rayN/ServiceLib/Manager/NoticeManager.cs

@@ -11,7 +11,7 @@ public class NoticeManager
         {
             return;
         }
-        AppEvents.SendSnackMsgRequested.OnNext(content);
+        AppEvents.SendSnackMsgRequested.Publish(content);
     }
 
     public void SendMessage(string? content)
@@ -20,7 +20,7 @@ public class NoticeManager
         {
             return;
         }
-        AppEvents.SendMsgViewRequested.OnNext(content);
+        AppEvents.SendMsgViewRequested.Publish(content);
     }
 
     public void SendMessageEx(string? content)

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/Resx/ResUI.Designer.cs

@@ -2301,15 +2301,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Apply to Proxy Domains Only 的本地化字符串。
-        /// </summary>
-        public static string TbApplyProxyDomainsOnly {
-            get {
-                return ResourceManager.GetString("TbApplyProxyDomainsOnly", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Auto refresh 的本地化字符串。
         /// </summary>
@@ -2526,6 +2517,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Applies globally by default, with built-in FakeIP filtering (sing-box only). 的本地化字符串。
+        /// </summary>
+        public static string TbFakeIPTips {
+            get {
+                return ResourceManager.GetString("TbFakeIPTips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Fingerprint 的本地化字符串。
         /// </summary>
@@ -3030,6 +3030,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Select Profile 的本地化字符串。
+        /// </summary>
+        public static string TbSelectProfile {
+            get {
+                return ResourceManager.GetString("TbSelectProfile", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Set system proxy 的本地化字符串。
         /// </summary>

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>
@@ -1512,4 +1509,10 @@
   <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>
@@ -1512,4 +1509,10 @@
   <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>
@@ -1512,4 +1509,10 @@
   <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>
@@ -1512,4 +1509,10 @@
   <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>
@@ -1509,4 +1506,10 @@
   <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>
@@ -1509,4 +1506,10 @@
   <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

@@ -11,7 +11,7 @@
 		</PackageReference>
 		<PackageReference Include="ReactiveUI.Fody" />
 		<PackageReference Include="sqlite-net-pcl" />
-		<PackageReference Include="Splat.NLog" />
+		<PackageReference Include="NLog" />
 		<PackageReference Include="WebDav.Client" />
 		<PackageReference Include="YamlDotNet" />
 		<PackageReference Include="QRCoder" />
@@ -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/CoreConfigClashService.cs

@@ -79,6 +79,7 @@ public class CoreConfigClashService
 
             //external-controller
             fileContent["external-controller"] = $"{Global.Loopback}:{AppManager.Instance.StatePort2}";
+            fileContent.Remove("secret");
             //allow-lan
             if (_config.Inbound.First().AllowLANConn)
             {

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;
-
+            if ((!useDirectDns) && simpleDNSItem.FakeIP == true && simpleDNSItem.GlobalFakeIp == false)
-            // Tun2SocksAddress
-            if (node != null && Utils.IsDomain(node.Address))
             {
-                singboxConfig.dns.rules ??= new List<Rule4Sbox>();
+                singboxConfig.dns.rules.Add(new()
-                singboxConfig.dns.rules.Insert(0, new Rule4Sbox
                 {
-                    server = Global.SingboxOutboundResolverTag,
+                    server = Global.SingboxFakeDNSTag,
-                    domain = [node.Address],
+                    query_type = new List<int> { 1, 28 }, // A and AAAA
+                    rewrite_ttl = 1,
                 });
             }
+
+            await GenOutboundDnsRule(node, singboxConfig, Global.SingboxOutboundResolverTag);
         }
         catch (Exception ex)
         {
@@ -94,17 +94,7 @@ public partial class CoreConfigSingboxService
 
         if (!simpleDNSItem.Hosts.IsNullOrEmpty())
         {
-            var userHostsMap = simpleDNSItem.Hosts
+            var userHostsMap = Utils.ParseHostsToDictionary(simpleDNSItem.Hosts);
-                .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(line => line.Trim())
-                .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()
-                );
 
             foreach (var kvp in userHostsMap)
             {
@@ -197,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;
@@ -276,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;
@@ -323,16 +337,7 @@ public partial class CoreConfigSingboxService
                 await GenDnsDomainsLegacyCompatible(singboxConfig, item);
             }
 
-            // Tun2SocksAddress
+            await GenOutboundDnsRule(node, singboxConfig, Global.SingboxFinalResolverTag);
-            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],
-                });
-            }
         }
         catch (Exception ex)
         {
@@ -402,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/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

@@ -261,17 +261,7 @@ public partial class CoreConfigV2rayService
 
         if (!simpleDNSItem.Hosts.IsNullOrEmpty())
         {
-            var userHostsMap = simpleDNSItem.Hosts
+            var userHostsMap = Utils.ParseHostsToDictionary(simpleDNSItem.Hosts);
-                .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(line => line.Trim())
-                .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()
-                );
 
             foreach (var kvp in userHostsMap)
             {

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/ViewModels/BackupAndRestoreViewModel.cs

@@ -1,7 +1,6 @@
 using System.Reactive;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using Splat;
 
 namespace ServiceLib.ViewModels;
 

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -2,11 +2,9 @@ using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Runtime.InteropServices;
-using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using Splat;
 
 namespace ServiceLib.ViewModels;
 
@@ -38,7 +36,7 @@ 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();
     }
@@ -63,6 +61,16 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     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,
@@ -104,6 +112,11 @@ public class CheckUpdateViewModel : MyReactiveObject
             }
             else if (item.CoreType == _v2rayN)
             {
+                if (Utils.IsPackagedInstall())
+                {
+                    await UpdateView(_v2rayN, "Not Support");
+                    continue;
+                }
                 await CheckUpdateN(EnableCheckPreReleaseUpdate);
             }
             else if (item.CoreType == ECoreType.Xray.ToString())
@@ -143,11 +156,8 @@ public class CheckUpdateViewModel : MyReactiveObject
                 UpdatedPlusPlus(_geo, "");
             }
         }
-        await (new UpdateService()).UpdateGeoFileAll(_config, _updateUI)
+        await new UpdateService().UpdateGeoFileAll(_config, _updateUI)
-            .ContinueWith(t =>
+            .ContinueWith(t => UpdatedPlusPlus(_geo, ""));
-            {
-                UpdatedPlusPlus(_geo, "");
-            });
     }
 
     private async Task CheckUpdateN(bool preRelease)
@@ -161,11 +171,8 @@ public class CheckUpdateViewModel : MyReactiveObject
                 UpdatedPlusPlus(_v2rayN, msg);
             }
         }
-        await (new UpdateService()).CheckUpdateGuiN(_config, _updateUI, preRelease)
+        await new UpdateService().CheckUpdateGuiN(_config, _updateUI, preRelease)
-            .ContinueWith(t =>
+            .ContinueWith(t => UpdatedPlusPlus(_v2rayN, ""));
-            {
-                UpdatedPlusPlus(_v2rayN, "");
-            });
     }
 
     private async Task CheckUpdateCore(CheckUpdateModel model, bool preRelease)
@@ -181,11 +188,8 @@ public class CheckUpdateViewModel : MyReactiveObject
             }
         }
         var type = (ECoreType)Enum.Parse(typeof(ECoreType), model.CoreType);
-        await (new UpdateService()).CheckUpdateCore(type, _config, _updateUI, preRelease)
+        await new UpdateService().CheckUpdateCore(type, _config, _updateUI, preRelease)
-            .ContinueWith(t =>
+            .ContinueWith(t => UpdatedPlusPlus(model.CoreType, ""));
-            {
-                UpdatedPlusPlus(model.CoreType, "");
-            });
     }
 
     private async Task UpdateFinished()
@@ -219,11 +223,11 @@ public class CheckUpdateViewModel : MyReactiveObject
     {
         if (blReload)
         {
-            Locator.Current.GetService<MainWindowViewModel>()?.Reload();
+            AppEvents.ReloadRequested.Publish();
         }
         else
         {
-            Locator.Current.GetService<MainWindowViewModel>()?.CloseCore();
+            await CoreManager.Instance.CoreStop();
         }
     }
 
@@ -296,7 +300,7 @@ 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()));
@@ -334,9 +338,6 @@ public class CheckUpdateViewModel : MyReactiveObject
         {
             return;
         }
-
+        found.Remarks = model.Remarks;
-        var itemCopy = JsonUtils.DeepCopy(found);
-        itemCopy.Remarks = model.Remarks;
-        CheckUpdateModels.Replace(found, itemCopy);
     }
 }

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -69,6 +69,8 @@ public class ClashProxiesViewModel : MyReactiveObject
         SortingSelected = _config.ClashUIItem.ProxiesSorting;
         RuleModeSelected = (int)_config.ClashUIItem.RuleMode;
 
+        #region WhenAnyValue && ReactiveCommand
+
         this.WhenAnyValue(
            x => x.SelectedGroup,
            y => y != null && y.Name.IsNotEmpty())
@@ -89,6 +91,17 @@ public class ClashProxiesViewModel : MyReactiveObject
         y => y == true)
             .Subscribe(c => { _config.ClashUIItem.ProxiesAutoRefresh = AutoRefresh; });
 
+        #endregion WhenAnyValue && ReactiveCommand
+
+        #region AppEvents
+
+        AppEvents.ProxiesReloadRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async _ => await ProxiesReload());
+
+        #endregion AppEvents
+
         _ = Init();
     }
 
@@ -391,7 +404,6 @@ public class ClashProxiesViewModel : MyReactiveObject
 
     public async Task ProxiesDelayTestResult(SpeedTestResult result)
     {
-        //UpdateHandler(false, $"{item.name}={result}");
         var detail = ProxyDetails.FirstOrDefault(it => it.Name == result.IndexId);
         if (detail == null)
         {
@@ -414,7 +426,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,8 +1,8 @@
 using System.Reactive;
 using System.Reactive.Concurrency;
+using System.Reactive.Linq;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using Splat;
 
 namespace ServiceLib.ViewModels;
 
@@ -184,7 +184,7 @@ public class MainWindowViewModel : MyReactiveObject
         });
         RebootAsAdminCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            await RebootAsAdmin();
+            await AppManager.Instance.RebootAsAdmin();
         });
         ClearServerStatisticsCmd = ReactiveCommand.CreateFromTask(async () =>
         {
@@ -217,6 +217,30 @@ public class MainWindowViewModel : MyReactiveObject
 
         #endregion WhenAnyValue && ReactiveCommand
 
+        #region AppEvents
+
+        AppEvents.ReloadRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async _ => await Reload());
+
+        AppEvents.AddServerViaScanRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async _ => await AddServerViaScanAsync());
+
+        AppEvents.AddServerViaClipboardRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async _ => await AddServerViaClipboardAsync(null));
+
+        AppEvents.SubscriptionsUpdateRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async blProxy => await UpdateSubscriptionProcess("", blProxy));
+
+        #endregion AppEvents
+
         _ = Init();
     }
 
@@ -224,7 +248,7 @@ public class MainWindowViewModel : MyReactiveObject
     {
         _config.UiItem.ShowInTaskbar = true;
 
-        await ConfigHandler.InitBuiltinRouting(_config);
+        //await ConfigHandler.InitBuiltinRouting(_config);
         await ConfigHandler.InitBuiltinDNS(_config);
         await ConfigHandler.InitBuiltinFullConfigTemplate(_config);
         await ProfileExManager.Instance.Init();
@@ -235,11 +259,11 @@ public class MainWindowViewModel : MyReactiveObject
         {
             await StatisticsManager.Instance.Init(_config, UpdateStatisticsHandler);
         }
+        await RefreshServers();
 
         BlReloadEnabled = true;
         await Reload();
         await AutoHideStartup();
-        Locator.Current.GetService<StatusBarViewModel>()?.RefreshRoutingsMenu();
     }
 
     #endregion Init
@@ -268,7 +292,7 @@ public class MainWindowViewModel : MyReactiveObject
             }
             if (_config.UiItem.EnableAutoAdjustMainLvColWidth)
             {
-                AppEvents.AdjustMainLvColWidthRequested.OnNext(Unit.Default);
+                AppEvents.AdjustMainLvColWidthRequested.Publish();
             }
         }
     }
@@ -279,12 +303,7 @@ public class MainWindowViewModel : MyReactiveObject
         {
             return;
         }
-        AppEvents.DispatcherStatisticsRequested.OnNext(update);
+        AppEvents.DispatcherStatisticsRequested.Publish(update);
-    }
-
-    public void ShowHideWindow(bool? blShow)
-    {
-        _updateView?.Invoke(EViewAction.ShowHideWindow, blShow);
     }
 
     #endregion Actions
@@ -293,14 +312,14 @@ public class MainWindowViewModel : MyReactiveObject
 
     private async Task RefreshServers()
     {
-        AppEvents.ProfilesRefreshRequested.OnNext(Unit.Default);
+        AppEvents.ProfilesRefreshRequested.Publish();
 
         await Task.Delay(200);
     }
 
     private void RefreshSubscriptions()
     {
-        Locator.Current.GetService<ProfilesViewModel>()?.RefreshSubscriptions();
+        AppEvents.SubscriptionsRefreshRequested.Publish();
     }
 
     #endregion Servers && Groups
@@ -432,7 +451,7 @@ public class MainWindowViewModel : MyReactiveObject
         var ret = await _updateView?.Invoke(EViewAction.OptionSettingWindow, null);
         if (ret == true)
         {
-            Locator.Current.GetService<StatusBarViewModel>()?.InboundDisplayStatus();
+            AppEvents.InboundDisplayRequested.Publish();
             await Reload();
         }
     }
@@ -443,7 +462,7 @@ public class MainWindowViewModel : MyReactiveObject
         if (ret == true)
         {
             await ConfigHandler.InitBuiltinRouting(_config);
-            Locator.Current.GetService<StatusBarViewModel>()?.RefreshRoutingsMenu();
+            AppEvents.RoutingsMenuRefreshRequested.Publish();
             await Reload();
         }
     }
@@ -466,12 +485,6 @@ public class MainWindowViewModel : MyReactiveObject
         }
     }
 
-    public async Task RebootAsAdmin()
-    {
-        ProcUtils.RebootAsAdmin();
-        await AppManager.Instance.AppExitAsync(true);
-    }
-
     private async Task ClearServerStatistics()
     {
         await StatisticsManager.Instance.ClearAllServerStatistics();
@@ -487,7 +500,7 @@ public class MainWindowViewModel : MyReactiveObject
         }
         else if (Utils.IsLinux())
         {
-            ProcUtils.ProcessStart("nautilus", path);
+            ProcUtils.ProcessStart("xdg-open", path);
         }
         else if (Utils.IsOSX())
         {
@@ -517,9 +530,15 @@ public class MainWindowViewModel : MyReactiveObject
             await SysProxyHandler.UpdateSysProxy(_config, false);
             await Task.Delay(1000);
         });
-        Locator.Current.GetService<StatusBarViewModel>()?.TestServerAvailability();
+        AppEvents.TestServerRequested.Publish();
 
-        RxApp.MainThreadScheduler.Schedule(() => _ = ReloadResult());
+        var showClashUI = _config.IsRunningCore(ECoreType.sing_box);
+        if (showClashUI)
+        {
+            AppEvents.ProxiesReloadRequested.Publish();
+        }
+
+        RxApp.MainThreadScheduler.Schedule(() => ReloadResult(showClashUI));
 
         BlReloadEnabled = true;
         if (_hasNextReloadJob)
@@ -529,19 +548,11 @@ public class MainWindowViewModel : MyReactiveObject
         }
     }
 
-    public async Task ReloadResult()
+    private void ReloadResult(bool showClashUI)
     {
         // BlReloadEnabled = true;
-        //Locator.Current.GetService<StatusBarViewModel>()?.ChangeSystemProxyAsync(_config.systemProxyItem.sysProxyType, false);
+        ShowClashUI = showClashUI;
-        ShowClashUI = _config.IsRunningCore(ECoreType.sing_box);
+        TabMainSelectedIndex = showClashUI ? TabMainSelectedIndex : 0;
-        if (ShowClashUI)
-        {
-            Locator.Current.GetService<ClashProxiesViewModel>()?.ProxiesReload();
-        }
-        else
-        {
-            TabMainSelectedIndex = 0;
-        }
     }
 
     private async Task LoadCore()
@@ -550,17 +561,11 @@ public class MainWindowViewModel : MyReactiveObject
         await CoreManager.Instance.LoadCore(node);
     }
 
-    public async Task CloseCore()
-    {
-        await ConfigHandler.SaveConfig(_config);
-        await CoreManager.Instance.CoreStop();
-    }
-
     private async Task AutoHideStartup()
     {
         if (_config.UiItem.AutoHideStartup)
         {
-            ShowHideWindow(false);
+            AppEvents.ShowHideWindowRequested.Publish(false);
         }
         await Task.CompletedTask;
     }
@@ -573,7 +578,7 @@ public class MainWindowViewModel : MyReactiveObject
     {
         await ConfigHandler.ApplyRegionalPreset(_config, type);
         await ConfigHandler.InitRouting(_config);
-        Locator.Current.GetService<StatusBarViewModel>()?.RefreshRoutingsMenu();
+        AppEvents.RoutingsMenuRefreshRequested.Publish();
 
         await ConfigHandler.SaveConfig(_config);
         await new UpdateService().UpdateGeoFileAll(_config, UpdateTaskHandler);

v2rayN/ServiceLib/ViewModels/MsgViewModel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Concurrent;
 using System.Reactive.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
@@ -9,9 +10,9 @@ namespace ServiceLib.ViewModels;
 public class MsgViewModel : MyReactiveObject
 {
     private readonly ConcurrentQueue<string> _queueMsg = new();
-    private readonly int _numMaxMsg = 500;
+    private volatile bool _lastMsgFilterNotAvailable;
-    private bool _lastMsgFilterNotAvailable;
+    private int _showLock = 0; // 0 = unlocked, 1 = locked
-    private bool _blLockShow = false;
+    public int NumMaxMsg { get; } = 500;
 
     [Reactive]
     public string MsgFilter { get; set; }
@@ -33,46 +34,52 @@ public class MsgViewModel : MyReactiveObject
         this.WhenAnyValue(
           x => x.AutoRefresh,
           y => y == true)
-              .Subscribe(c => { _config.MsgUIItem.AutoRefresh = AutoRefresh; });
+              .Subscribe(c => _config.MsgUIItem.AutoRefresh = AutoRefresh);
 
         AppEvents.SendMsgViewRequested
          .AsObservable()
          //.ObserveOn(RxApp.MainThreadScheduler)
-         .Subscribe(async content => await AppendQueueMsg(content));
+         .Subscribe(content => _ = AppendQueueMsg(content));
     }
 
     private async Task AppendQueueMsg(string msg)
     {
-        //if (msg == Global.CommandClearMsg)
-        //{
-        //    ClearMsg();
-        //    return;
-        //}
         if (AutoRefresh == false)
         {
             return;
         }
-        _ = EnqueueQueueMsg(msg);
 
-        if (_blLockShow)
+        EnqueueQueueMsg(msg);
-        {
+
-            return;
-        }
         if (!_config.UiItem.ShowInTaskbar)
         {
             return;
         }
 
-        _blLockShow = true;
+        if (Interlocked.CompareExchange(ref _showLock, 1, 0) != 0)
-
+        {
-        await Task.Delay(500);
+            return;
-        var txt = string.Join("", _queueMsg.ToArray());
-        await _updateView?.Invoke(EViewAction.DispatcherShowMsg, txt);
-
-        _blLockShow = false;
         }
 
-    private async Task EnqueueQueueMsg(string msg)
+        try
+        {
+            await Task.Delay(500).ConfigureAwait(false);
+
+            var sb = new StringBuilder();
+            while (_queueMsg.TryDequeue(out var line))
+            {
+                sb.Append(line);
+            }
+
+            await _updateView?.Invoke(EViewAction.DispatcherShowMsg, sb.ToString());
+        }
+        finally
+        {
+            Interlocked.Exchange(ref _showLock, 0);
+        }
+    }
+
+    private void EnqueueQueueMsg(string msg)
     {
         //filter msg
         if (MsgFilter.IsNotEmpty() && !_lastMsgFilterNotAvailable)
@@ -91,26 +98,17 @@ public class MsgViewModel : MyReactiveObject
             }
         }
 
-        //Enqueue
-        if (_queueMsg.Count > _numMaxMsg)
-        {
-            for (int k = 0; k < _queueMsg.Count - _numMaxMsg; k++)
-            {
-                _queueMsg.TryDequeue(out _);
-            }
-        }
         _queueMsg.Enqueue(msg);
         if (!msg.EndsWith(Environment.NewLine))
         {
             _queueMsg.Enqueue(Environment.NewLine);
         }
-        await Task.CompletedTask;
     }
 
-    public void ClearMsg()
+    //public void ClearMsg()
-    {
+    //{
-        _queueMsg.Clear();
+    //    _queueMsg.Clear();
-    }
+    //}
 
     private void DoMsgFilter()
     {

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

@@ -6,7 +6,6 @@ using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using Splat;
 
 namespace ServiceLib.ViewModels;
 
@@ -38,15 +37,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
@@ -115,11 +108,6 @@ 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)
@@ -251,11 +239,21 @@ public class ProfilesViewModel : MyReactiveObject
             .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async _ => await RefreshServersBiz());
 
+        AppEvents.SubscriptionsRefreshRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async _ => await RefreshSubscriptions());
+
         AppEvents.DispatcherStatisticsRequested
             .AsObservable()
             .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async result => await UpdateStatistics(result));
 
+        AppEvents.SetDefaultServerRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async indexId => await SetDefaultServer(indexId));
+
         #endregion AppEvents
 
         _ = Init();
@@ -266,10 +264,9 @@ public class ProfilesViewModel : MyReactiveObject
         SelectedProfile = new();
         SelectedSub = new();
         SelectedMoveToGroup = new();
-        SelectedServer = new();
 
         await RefreshSubscriptions();
-        await RefreshServers();
+        //await RefreshServers();
     }
 
     #endregion Init
@@ -278,7 +275,7 @@ public class ProfilesViewModel : MyReactiveObject
 
     private void Reload()
     {
-        Locator.Current.GetService<MainWindowViewModel>()?.Reload();
+        AppEvents.ReloadRequested.Publish();
     }
 
     public async Task SetSpeedTestResult(SpeedTestResult result)
@@ -305,7 +302,6 @@ public class ProfilesViewModel : MyReactiveObject
         {
             item.SpeedVal = result.Speed ?? string.Empty;
         }
-        //_profileItems.Replace(item, JsonUtils.DeepCopy(item));
     }
 
     public async Task UpdateStatistics(ServerSpeedItem update)
@@ -326,17 +322,6 @@ public class ProfilesViewModel : MyReactiveObject
                 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
@@ -376,7 +361,7 @@ public class ProfilesViewModel : MyReactiveObject
 
     public async Task RefreshServers()
     {
-        AppEvents.ProfilesRefreshRequested.OnNext(Unit.Default);
+        AppEvents.ProfilesRefreshRequested.Publish();
 
         await Task.Delay(200);
     }
@@ -404,7 +389,7 @@ public class ProfilesViewModel : MyReactiveObject
         await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
     }
 
-    public async Task RefreshSubscriptions()
+    private async Task RefreshSubscriptions()
     {
         SubItems.Clear();
 
@@ -589,7 +574,7 @@ public class ProfilesViewModel : MyReactiveObject
         await SetDefaultServer(SelectedProfile.IndexId);
     }
 
-    public async Task SetDefaultServer(string? indexId)
+    private async Task SetDefaultServer(string? indexId)
     {
         if (indexId.IsNullOrEmpty())
         {
@@ -613,19 +598,6 @@ public class ProfilesViewModel : MyReactiveObject
         }
     }
 
-    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);

v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs

@@ -13,6 +13,7 @@ public class RoutingRuleSettingViewModel : MyReactiveObject
 
     [Reactive]
     public RoutingItem SelectedRouting { get; set; }
+
     public IObservableCollection<RulesItemModel> RulesItems { get; } = new ObservableCollectionExtended<RulesItemModel>();
 
     [Reactive]

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -5,12 +5,14 @@ using System.Text;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using Splat;
 
 namespace ServiceLib.ViewModels;
 
 public class StatusBarViewModel : MyReactiveObject
 {
+    private static readonly Lazy<StatusBarViewModel> _instance = new(() => new(null));
+    public static StatusBarViewModel Instance => _instance.Value;
+
     #region ObservableCollection
 
     public IObservableCollection<RoutingItem> RoutingItems { get; } = new ObservableCollectionExtended<RoutingItem>();
@@ -146,17 +148,17 @@ public class StatusBarViewModel : MyReactiveObject
 
         NotifyLeftClickCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            Locator.Current.GetService<MainWindowViewModel>()?.ShowHideWindow(null);
+            AppEvents.ShowHideWindowRequested.Publish(null);
             await Task.CompletedTask;
         });
         ShowWindowCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            Locator.Current.GetService<MainWindowViewModel>()?.ShowHideWindow(true);
+            AppEvents.ShowHideWindowRequested.Publish(true);
             await Task.CompletedTask;
         });
         HideWindowCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            Locator.Current.GetService<MainWindowViewModel>()?.ShowHideWindow(false);
+            AppEvents.ShowHideWindowRequested.Publish(false);
             await Task.CompletedTask;
         });
 
@@ -209,6 +211,26 @@ public class StatusBarViewModel : MyReactiveObject
             .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async result => await UpdateStatistics(result));
 
+        AppEvents.RoutingsMenuRefreshRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async _ => await RefreshRoutingsMenu());
+
+        AppEvents.TestServerRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async _ => await TestServerAvailability());
+
+        AppEvents.InboundDisplayRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async _ => await InboundDisplayStatus());
+
+        AppEvents.SysProxyChangeRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async result => await SetListenerType(result));
+
         #endregion AppEvents
 
         _ = Init();
@@ -216,6 +238,7 @@ public class StatusBarViewModel : MyReactiveObject
 
     private async Task Init()
     {
+        await ConfigHandler.InitBuiltinRouting(_config);
         await RefreshRoutingsMenu();
         await InboundDisplayStatus();
         await ChangeSystemProxyAsync(_config.SystemProxyItem.SysProxyType, true);
@@ -252,23 +275,20 @@ public class StatusBarViewModel : MyReactiveObject
 
     private async Task AddServerViaClipboard()
     {
-        var service = Locator.Current.GetService<MainWindowViewModel>();
+        AppEvents.AddServerViaClipboardRequested.Publish();
-        if (service != null)
+        await Task.Delay(1000);
-            await service.AddServerViaClipboardAsync(null);
     }
 
     private async Task AddServerViaScan()
     {
-        var service = Locator.Current.GetService<MainWindowViewModel>();
+        AppEvents.AddServerViaScanRequested.Publish();
-        if (service != null)
+        await Task.Delay(1000);
-            await service.AddServerViaScanAsync();
     }
 
     private async Task UpdateSubscriptionProcess(bool blProxy)
     {
-        var service = Locator.Current.GetService<MainWindowViewModel>();
+        AppEvents.SubscriptionsUpdateRequested.Publish(blProxy);
-        if (service != null)
+        await Task.Delay(1000);
-            await service.UpdateSubscriptionProcess("", blProxy);
     }
 
     private async Task RefreshServersBiz()
@@ -329,7 +349,7 @@ public class StatusBarViewModel : MyReactiveObject
         {
             return;
         }
-        Locator.Current.GetService<ProfilesViewModel>()?.SetDefaultServer(SelectedServer.ID);
+        AppEvents.SetDefaultServerRequested.Publish(SelectedServer.ID);
     }
 
     public async Task TestServerAvailability()
@@ -364,7 +384,7 @@ public class StatusBarViewModel : MyReactiveObject
 
     #region System proxy and Routings
 
-    public async Task SetListenerType(ESysProxyType type)
+    private async Task SetListenerType(ESysProxyType type)
     {
         if (_config.SystemProxyItem.SysProxyType == type)
         {
@@ -393,7 +413,7 @@ public class StatusBarViewModel : MyReactiveObject
         }
     }
 
-    public async Task RefreshRoutingsMenu()
+    private async Task RefreshRoutingsMenu()
     {
         RoutingItems.Clear();
 
@@ -430,7 +450,7 @@ public class StatusBarViewModel : MyReactiveObject
         if (await ConfigHandler.SetDefaultRouting(_config, item) == 0)
         {
             NoticeManager.Instance.SendMessageEx(ResUI.TipChangeRouting);
-            Locator.Current.GetService<MainWindowViewModel>()?.Reload();
+            AppEvents.ReloadRequested.Publish();
             _updateView?.Invoke(EViewAction.DispatcherRefreshIcon, null);
         }
     }
@@ -463,7 +483,7 @@ public class StatusBarViewModel : MyReactiveObject
             if (Utils.IsWindows())
             {
                 _config.TunModeItem.EnableTun = false;
-                Locator.Current.GetService<MainWindowViewModel>()?.RebootAsAdmin();
+                await AppManager.Instance.RebootAsAdmin();
                 return;
             }
             else
@@ -477,7 +497,7 @@ public class StatusBarViewModel : MyReactiveObject
             }
         }
         await ConfigHandler.SaveConfig(_config);
-        Locator.Current.GetService<MainWindowViewModel>()?.Reload();
+        AppEvents.ReloadRequested.Publish();
     }
 
     private bool AllowEnableTun()
@@ -501,7 +521,7 @@ public class StatusBarViewModel : MyReactiveObject
 
     #region UI
 
-    public async Task InboundDisplayStatus()
+    private async Task InboundDisplayStatus()
     {
         StringBuilder sb = new();
         sb.Append($"[{EInboundProtocol.mixed}:{AppManager.Instance.GetLocalPort(EInboundProtocol.socks)}");

v2rayN/v2rayN.Desktop/App.axaml

@@ -11,6 +11,7 @@
     RequestedThemeVariant="Default">
     <Application.Styles>
         <semi:SemiTheme />
+        <semi:AvaloniaEditSemiTheme />
         <StyleInclude Source="Assets/GlobalStyles.axaml" />
         <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
         <dialogHost:DialogHostStyles />

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -1,9 +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;
 
 namespace v2rayN.Desktop;
@@ -17,9 +14,7 @@ public partial class App : Application
         AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
         TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
 
-        var ViewModel = new StatusBarViewModel(null);
+        DataContext = StatusBarViewModel.Instance;
-        Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(StatusBarViewModel));
-        DataContext = ViewModel;
     }
 
     public override void OnFrameworkInitializationCompleted()
@@ -58,16 +53,8 @@ public partial class App : Application
         {
             if (desktop.MainWindow != null)
             {
-                var clipboardData = await AvaUtils.GetClipboardData(desktop.MainWindow);
+                AppEvents.AddServerViaClipboardRequested.Publish();
-                if (clipboardData.IsNullOrEmpty())
+                await Task.Delay(1000);
-                {
-                    return;
-                }
-                var service = Locator.Current.GetService<MainWindowViewModel>();
-                if (service != null)
-                {
-                    _ = service.AddServerViaClipboardAsync(clipboardData);
-                }
             }
         }
     }

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/Common/TextEditorKeywordHighlighter.cs

@@ -0,0 +1,129 @@
+using Avalonia.Media;
+using AvaloniaEdit;
+using AvaloniaEdit.Document;
+using AvaloniaEdit.Rendering;
+
+namespace v2rayN.Desktop.Common;
+
+public class KeywordColorizer : DocumentColorizingTransformer
+{
+    private readonly string[] _keywords;
+    private readonly Dictionary<string, IBrush> _brushMap;
+
+    public KeywordColorizer(IDictionary<string, IBrush> keywordBrushMap)
+    {
+        if (keywordBrushMap == null || keywordBrushMap.Count == 0)
+        {
+            throw new ArgumentException("keywordBrushMap must not be null or empty", nameof(keywordBrushMap));
+        }
+
+        _brushMap = new Dictionary<string, IBrush>(StringComparer.OrdinalIgnoreCase);
+        foreach (var kvp in keywordBrushMap)
+        {
+            if (string.IsNullOrEmpty(kvp.Key) || kvp.Value == null)
+            {
+                continue;
+            }
+
+            if (!_brushMap.ContainsKey(kvp.Key))
+            {
+                _brushMap[kvp.Key] = kvp.Value;
+            }
+        }
+
+        if (_brushMap.Count == 0)
+        {
+            throw new ArgumentException("keywordBrushMap must contain at least one non-empty key with a non-null brush", nameof(keywordBrushMap));
+        }
+
+        _keywords = _brushMap.Keys.ToArray();
+    }
+
+    protected override void ColorizeLine(DocumentLine line)
+    {
+        var text = CurrentContext.Document.GetText(line);
+        if (string.IsNullOrEmpty(text))
+        {
+            return;
+        }
+
+        foreach (var kw in _keywords)
+        {
+            if (string.IsNullOrEmpty(kw))
+            {
+                continue;
+            }
+
+            var searchStart = 0;
+            while (true)
+            {
+                var idx = text.IndexOf(kw, searchStart, StringComparison.OrdinalIgnoreCase);
+                if (idx < 0)
+                {
+                    break;
+                }
+
+                var kwEndIndex = idx + kw.Length;
+                if (IsWordCharBefore(text, idx) || IsWordCharAfter(text, kwEndIndex))
+                {
+                    searchStart = idx + Math.Max(1, kw.Length);
+                    continue;
+                }
+
+                var start = line.Offset + idx;
+                var end = start + kw.Length;
+
+                if (_brushMap.TryGetValue(kw, out var brush) && brush != null)
+                {
+                    ChangeLinePart(start, end, element => element.TextRunProperties.SetForegroundBrush(brush));
+                }
+
+                searchStart = idx + Math.Max(1, kw.Length);
+            }
+        }
+    }
+
+    private static bool IsWordCharBefore(string text, int idx)
+    {
+        if (idx <= 0)
+        {
+            return false;
+        }
+
+        var c = text[idx - 1];
+        return char.IsLetterOrDigit(c) || c == '_';
+    }
+
+    private static bool IsWordCharAfter(string text, int idx)
+    {
+        if (idx >= text.Length)
+        {
+            return false;
+        }
+
+        var c = text[idx];
+        return char.IsLetterOrDigit(c) || c == '_';
+    }
+}
+
+public static class TextEditorKeywordHighlighter
+{
+    public static void Attach(TextEditor editor, IDictionary<string, IBrush> keywordBrushMap)
+    {
+        ArgumentNullException.ThrowIfNull(editor);
+
+        if (keywordBrushMap == null || keywordBrushMap.Count == 0)
+        {
+            return;
+        }
+
+        if (editor.TextArea?.TextView?.LineTransformers?.OfType<KeywordColorizer>().Any() == true)
+        {
+            return;
+        }
+
+        var colorizer = new KeywordColorizer(keywordBrushMap);
+        editor.TextArea.TextView.LineTransformers.Add(colorizer);
+        editor.TextArea.TextView.InvalidateVisual();
+    }
+}

v2rayN/v2rayN.Desktop/GlobalUsings.cs

@@ -1,8 +1,10 @@
-global using ServiceLib;
+global using ServiceLib;
 global using ServiceLib.Base;
 global using ServiceLib.Common;
 global using ServiceLib.Enums;
+global using ServiceLib.Events;
 global using ServiceLib.Handler;
+global using ServiceLib.Manager;
 global using ServiceLib.Models;
 global using ServiceLib.Resx;
 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

@@ -5,10 +5,10 @@ using Avalonia.Controls.Notifications;
 using Avalonia.Controls.Primitives;
 using Avalonia.Media;
 using Avalonia.Styling;
+using AvaloniaEdit;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Semi.Avalonia;
-using ServiceLib.Manager;
 
 namespace v2rayN.Desktop.ViewModels;
 
@@ -113,7 +113,8 @@ public class ThemeSettingViewModel : MyReactiveObject
             x.OfType<ContextMenu>(),
             x.OfType<DataGridRow>(),
             x.OfType<ListBoxItem>(),
-            x.OfType<HeaderedContentControl>()
+            x.OfType<HeaderedContentControl>(),
+            x.OfType<TextEditor>()
         ));
         style.Add(new Setter()
         {
@@ -154,7 +155,8 @@ public class ThemeSettingViewModel : MyReactiveObject
                 x.OfType<DataGridRow>(),
                 x.OfType<ListBoxItem>(),
                 x.OfType<HeaderedContentControl>(),
-                x.OfType<WindowNotificationManager>()
+                x.OfType<WindowNotificationManager>(),
+                x.OfType<TextEditor>()
             ));
             style.Add(new Setter()
             {

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -400,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/ClashProxiesView.axaml.cs

@@ -3,7 +3,6 @@ using Avalonia.Input;
 using Avalonia.ReactiveUI;
 using DynamicData;
 using ReactiveUI;
-using Splat;
 
 namespace v2rayN.Desktop.Views;
 
@@ -13,7 +12,6 @@ public partial class ClashProxiesView : ReactiveUserControl<ClashProxiesViewMode
     {
         InitializeComponent();
         ViewModel = new ClashProxiesViewModel(UpdateViewHandler);
-        Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(ClashProxiesViewModel));
         lstProxyDetails.DoubleTapped += LstProxyDetails_DoubleTapped;
         this.KeyDown += ClashProxiesView_KeyDown;
 

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml

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

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

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

@@ -10,8 +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;
 using v2rayN.Desktop.Manager;
@@ -21,7 +19,7 @@ namespace v2rayN.Desktop.Views;
 public partial class MainWindow : WindowBase<MainWindowViewModel>
 {
     private static Config _config;
-    private WindowNotificationManager? _manager;
+    private readonly WindowNotificationManager? _manager;
     private CheckUpdateView? _checkUpdateView;
     private BackupAndRestoreView? _backupAndRestoreView;
     private bool _blCloseByUser = false;
@@ -41,7 +39,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
         menuClose.Click += MenuClose_Click;
 
         ViewModel = new MainWindowViewModel(UpdateViewHandler);
-        Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));
 
         switch (_config.UiItem.MainGirdOrientation)
         {
@@ -154,6 +151,12 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
               .ObserveOn(RxApp.MainThreadScheduler)
               .Subscribe(content => Shutdown(content))
               .DisposeWith(disposables);
+
+            AppEvents.ShowHideWindowRequested
+             .AsObservable()
+             .ObserveOn(RxApp.MainThreadScheduler)
+             .Subscribe(blShow => ShowHideWindow(blShow))
+             .DisposeWith(disposables);
         });
 
         if (Utils.IsWindows())
@@ -222,12 +225,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
             case EViewAction.SubSettingWindow:
                 return await new SubSettingWindow().ShowDialog<bool>(this);
 
-            case EViewAction.ShowHideWindow:
-                Dispatcher.UIThread.Post(() =>
-                    ShowHideWindow((bool?)obj),
-                DispatcherPriority.Default);
-                break;
-
             case EViewAction.ScanScreenTask:
                 await ScanScreenTaskAsync();
                 break;
@@ -237,11 +234,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
                 break;
 
             case EViewAction.AddServerViaClipboard:
-                var clipboardData = await AvaUtils.GetClipboardData(this);
+                await AddServerViaClipboardAsync();
-                if (clipboardData.IsNotEmpty() && ViewModel != null)
-                {
-                    await ViewModel.AddServerViaClipboardAsync(clipboardData);
-                }
                 break;
         }
 
@@ -260,7 +253,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
             case EGlobalHotkey.SystemProxySet:
             case EGlobalHotkey.SystemProxyUnchanged:
             case EGlobalHotkey.SystemProxyPac:
-                Locator.Current.GetService<StatusBarViewModel>()?.SetListenerType((ESysProxyType)((int)e - 1));
+                AppEvents.SysProxyChangeRequested.Publish((ESysProxyType)((int)e - 1));
                 break;
         }
     }
@@ -296,11 +289,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
             switch (e.Key)
             {
                 case Key.V:
-                    var clipboardData = await AvaUtils.GetClipboardData(this);
+                    await AddServerViaClipboardAsync();
-                    if (clipboardData.IsNotEmpty() && ViewModel != null)
-                    {
-                        await ViewModel.AddServerViaClipboardAsync(clipboardData);
-                    }
                     break;
 
                 case Key.S:
@@ -327,6 +316,15 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
         ProcUtils.ProcessStart(Utils.GetBinPath("EnableLoopback.exe"));
     }
 
+    public async Task AddServerViaClipboardAsync()
+    {
+        var clipboardData = await AvaUtils.GetClipboardData(this);
+        if (clipboardData.IsNotEmpty() && ViewModel != null)
+        {
+            await ViewModel.AddServerViaClipboardAsync(clipboardData);
+        }
+    }
+
     public async Task ScanScreenTaskAsync()
     {
         //ShowHideWindow(false);

v2rayN/v2rayN.Desktop/Views/MsgView.axaml

@@ -2,6 +2,7 @@
     x:Class="v2rayN.Desktop.Views.MsgView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:avaloniaEdit="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
     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"
@@ -70,16 +71,17 @@
                 Theme="{DynamicResource SimpleToggleSwitch}" />
         </WrapPanel>
 
-        <ScrollViewer x:Name="msgScrollViewer" VerticalScrollBarVisibility="Auto">
+        <avaloniaEdit:TextEditor
-            <SelectableTextBlock
             Name="txtMsg"
             Margin="{StaticResource Margin8}"
-                VerticalAlignment="Stretch"
+            IsReadOnly="True"
-                Classes="TextArea"
+            VerticalScrollBarVisibility="Auto"
-                TextAlignment="Left"
+            WordWrap="True">
-                TextWrapping="Wrap">
+            <avaloniaEdit:TextEditor.Options>
-                <SelectableTextBlock.ContextMenu>
+                <avaloniaEdit:TextEditorOptions AllowScrollBelowDocument="False"/>
-                    <ContextMenu>
+            </avaloniaEdit:TextEditor.Options>
+            <avaloniaEdit:TextEditor.ContextFlyout>
+                <MenuFlyout>
                     <MenuItem
                         x:Name="menuMsgViewSelectAll"
                         Click="menuMsgViewSelectAll_Click"
@@ -96,9 +98,9 @@
                         x:Name="menuMsgViewClear"
                         Click="menuMsgViewClear_Click"
                         Header="{x:Static resx:ResUI.menuMsgViewClear}" />
-                    </ContextMenu>
+                </MenuFlyout>
-                </SelectableTextBlock.ContextMenu>
+            </avaloniaEdit:TextEditor.ContextFlyout>
-            </SelectableTextBlock>
+        </avaloniaEdit:TextEditor>
-        </ScrollViewer>
+
     </DockPanel>
 </UserControl>

v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs

@@ -1,6 +1,6 @@
 using System.Reactive.Disposables;
-using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.Media;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using ReactiveUI;
@@ -10,13 +10,12 @@ namespace v2rayN.Desktop.Views;
 
 public partial class MsgView : ReactiveUserControl<MsgViewModel>
 {
-    private readonly ScrollViewer _scrollViewer;
+    //private const int KeepLines = 30;
 
     public MsgView()
     {
         InitializeComponent();
-        _scrollViewer = this.FindControl<ScrollViewer>("msgScrollViewer");
+        txtMsg.TextArea.TextView.Options.EnableHyperlinks = false;
-
         ViewModel = new MsgViewModel(UpdateViewHandler);
 
         this.WhenActivated(disposables =>
@@ -24,6 +23,11 @@ public partial class MsgView : ReactiveUserControl<MsgViewModel>
             this.Bind(ViewModel, vm => vm.MsgFilter, v => v.cmbMsgFilter.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoRefresh, v => v.togAutoRefresh.IsChecked).DisposeWith(disposables);
         });
+
+        TextEditorKeywordHighlighter.Attach(txtMsg, Global.LogLevelColors.ToDictionary(
+                kv => kv.Key,
+                kv => (IBrush)new SolidColorBrush(Color.Parse(kv.Value))
+            ));
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@@ -34,8 +38,7 @@ public partial class MsgView : ReactiveUserControl<MsgViewModel>
                 if (obj is null)
                     return false;
 
-                Dispatcher.UIThread.Post(() =>
+                Dispatcher.UIThread.Post(() => ShowMsg(obj),
-                    ShowMsg(obj),
                     DispatcherPriority.ApplicationIdle);
                 break;
         }
@@ -44,23 +47,37 @@ public partial class MsgView : ReactiveUserControl<MsgViewModel>
 
     private void ShowMsg(object msg)
     {
-        txtMsg.Text = msg.ToString();
+        //var lineCount = txtMsg.LineCount;
+        //if (lineCount > ViewModel?.NumMaxMsg)
+        //{
+        //    var cutLine = txtMsg.Document.GetLineByNumber(lineCount - KeepLines);
+        //    txtMsg.Document.Remove(0, cutLine.Offset);
+        //}
+        if (txtMsg.LineCount > ViewModel?.NumMaxMsg)
+        {
+            ClearMsg();
+        }
+
+        txtMsg.AppendText(msg.ToString());
         if (togScrollToEnd.IsChecked ?? true)
         {
-            _scrollViewer?.ScrollToEnd();
+            txtMsg.ScrollToEnd();
         }
     }
 
     public void ClearMsg()
     {
-        ViewModel?.ClearMsg();
+        txtMsg.Clear();
-        txtMsg.Text = "";
+        txtMsg.AppendText("----- Message cleared -----\n");
     }
 
     private void menuMsgViewSelectAll_Click(object? sender, RoutedEventArgs e)
     {
-        txtMsg.Focus();
+        Dispatcher.UIThread.Post(() =>
+        {
+            txtMsg.TextArea.Focus();
             txtMsg.SelectAll();
+        }, DispatcherPriority.Render);
     }
 
     private async void menuMsgViewCopy_Click(object? sender, RoutedEventArgs e)

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;

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.VisualTree;
+using ReactiveUI;
+using v2rayN.Desktop.Base;
+
+namespace v2rayN.Desktop.Views;
+
+public partial class ProfilesSelectWindow : WindowBase<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

@@ -8,8 +8,6 @@ using Avalonia.Threading;
 using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
-using ServiceLib.Manager;
-using Splat;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views;
@@ -49,7 +47,6 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
         //}
 
         ViewModel = new ProfilesViewModel(UpdateViewHandler);
-        Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(ProfilesViewModel));
 
         this.WhenActivated(disposables =>
         {
@@ -112,7 +109,6 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
         });
 
         RestoreUI();
-        ViewModel?.RefreshServers();
     }
 
     private async void LstProfiles_Sorting(object? sender, DataGridColumnEventArgs e)

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"
+    xmlns:sys="clr-namespace:System;assembly=netstandard"
-    d:DesignWidth="400"
+    d:DesignHeight="600"
+    d:DesignWidth="600"
     mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <sys:Double x:Key="QrcodeWidth">400</sys:Double>
+    </UserControl.Resources>
+
     <Grid Margin="32" RowDefinitions="Auto,Auto">
         <Image
             Name="imgQrcode"
-            Width="300"
+            Width="{StaticResource QrcodeWidth}"
-            Height="300" />
+            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

@@ -22,10 +22,18 @@ public partial class QrcodeView : UserControl
     }
 
     private Bitmap? GetQRCode(string? url)
+    {
+        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">
+                <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"

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

@@ -176,6 +176,7 @@
                 <DataGrid
                     x:Name="lstRules"
                     AutoGenerateColumns="False"
+                    Background="Transparent"
                     BorderThickness="1"
                     CanUserResizeColumns="True"
                     GridLinesVisibility="All"

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -92,6 +92,7 @@
                 <DataGrid
                     x:Name="lstRoutings"
                     AutoGenerateColumns="False"
+                    Background="Transparent"
                     BorderThickness="1"
                     CanUserResizeColumns="True"
                     GridLinesVisibility="All"

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

@@ -6,8 +6,6 @@ using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using DialogHostAvalonia;
 using ReactiveUI;
-using ServiceLib.Manager;
-using Splat;
 using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop.Views;
@@ -21,9 +19,8 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
         InitializeComponent();
 
         _config = AppManager.Instance.Config;
-        //ViewModel = new StatusBarViewModel(UpdateViewHandler);
+
-        //Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(StatusBarViewModel));
+        ViewModel = StatusBarViewModel.Instance;
-        ViewModel = Locator.Current.GetService<StatusBarViewModel>();
         ViewModel?.InitUpdateView(UpdateViewHandler);
 
         txtRunningServerDisplay.Tapped += TxtRunningServerDisplay_Tapped;

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml

@@ -204,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"
@@ -218,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;
+            }
+        }
+    }
 }

v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs

@@ -2,7 +2,6 @@ using Avalonia.Controls;
 using Avalonia.Threading;
 using CliWrap.Buffered;
 using DialogHostAvalonia;
-using ServiceLib.Manager;
 
 namespace v2rayN.Desktop.Views;
 

v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj

@@ -9,6 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Avalonia.AvaloniaEdit" />
 		<PackageReference Include="Avalonia.Controls.DataGrid">
 			<TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
@@ -17,6 +18,7 @@
 		<PackageReference Include="Avalonia.ReactiveUI" />
 		<PackageReference Include="MessageBox.Avalonia" />
 		<PackageReference Include="Semi.Avalonia" />
+		<PackageReference Include="Semi.Avalonia.AvaloniaEdit" />
 		<PackageReference Include="Semi.Avalonia.DataGrid">
 			<TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>

v2rayN/v2rayN.slnx

@@ -0,0 +1,24 @@
+<Solution>
+  <Folder Name="/GitHub Action/">
+    <File Path="../.github/workflows/build-all.yml" />
+    <File Path="../.github/workflows/build-linux.yml" />
+    <File Path="../.github/workflows/build-osx.yml" />
+    <File Path="../.github/workflows/build-windows-desktop.yml" />
+    <File Path="../.github/workflows/build-windows.yml" />
+    <File Path="../.github/workflows/winget-publish.yml" />
+    <File Path="../package-appimage.sh" />
+    <File Path="../package-debian.sh" />
+    <File Path="../package-osx.sh" />
+    <File Path="../package-release-zip.sh" />
+    <File Path="../pkg2appimage.yml" />
+  </Folder>
+  <Folder Name="/Solution Files/">
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+  </Folder>
+  <Project Path="AmazTool/AmazTool.csproj" />
+  <Project Path="GlobalHotKeys/src/GlobalHotKeys/GlobalHotKeys.csproj" />
+  <Project Path="ServiceLib/ServiceLib.csproj" />
+  <Project Path="v2rayN.Desktop/v2rayN.Desktop.csproj" />
+  <Project Path="v2rayN/v2rayN.csproj" />
+</Solution>

v2rayN/v2rayN/App.xaml.cs

@@ -1,7 +1,6 @@
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Threading;
-using ServiceLib.Manager;
 
 namespace v2rayN;
 

v2rayN/v2rayN/Base/WindowBase.cs

@@ -1,6 +1,5 @@
 using System.Windows;
 using ReactiveUI;
-using ServiceLib.Manager;
 
 namespace v2rayN.Base;
 

v2rayN/v2rayN/Common/QRCodeUtils.cs

@@ -20,8 +20,9 @@ public class QRCodeUtils
             var qrCodeImage = ServiceLib.Common.QRCodeUtils.GenQRCode(strContent);
             return qrCodeImage is null ? null : ByteToImage(qrCodeImage);
         }
-        catch
+        catch (Exception ex)
         {
+            Logging.SaveLog("GetQRCode", ex);
             return null;
         }
     }
@@ -32,8 +33,8 @@ public class QRCodeUtils
         {
             GetDpi(window, out var dpiX, out var dpiY);
 
-            var left = (int)(SystemParameters.WorkArea.Left);
+            var left = (int)SystemParameters.WorkArea.Left;
-            var top = (int)(SystemParameters.WorkArea.Top);
+            var top = (int)SystemParameters.WorkArea.Top;
             var width = (int)(SystemParameters.WorkArea.Width / dpiX);
             var height = (int)(SystemParameters.WorkArea.Height / dpiY);
 

v2rayN/v2rayN/Converters/MaterialDesignFonts.cs

@@ -1,5 +1,4 @@
 using System.Windows.Media;
-using ServiceLib.Manager;
 
 namespace v2rayN.Converters;
 

v2rayN/v2rayN/GlobalUsings.cs

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

v2rayN/v2rayN/Manager/HotkeyManager.cs

@@ -4,7 +4,6 @@ using System.Text;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
-using ServiceLib.Manager;
 
 namespace v2rayN.Manager;
 

v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs

@@ -9,7 +9,6 @@ using MaterialDesignColors.ColorManipulation;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using ServiceLib.Manager;
 
 namespace v2rayN.ViewModels;
 

v2rayN/v2rayN/Views/AddServer2Window.xaml.cs

@@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
-using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -538,7 +538,7 @@
                         Width="400"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
-                        materialDesign:HintAssist.Hint="1000:2000,3000:4000"
+                        materialDesign:HintAssist.Hint="1000-2000,3000,4000"
                         Style="{StaticResource DefTextBox}" />
                     <TextBlock
                         Grid.Row="3"

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

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

v2rayN/v2rayN/Views/ClashProxiesView.xaml.cs

@@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using System.Windows.Input;
 using ReactiveUI;
-using Splat;
 
 namespace v2rayN.Views;
 
@@ -14,7 +13,6 @@ public partial class ClashProxiesView
     {
         InitializeComponent();
         ViewModel = new ClashProxiesViewModel(UpdateViewHandler);
-        Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(ClashProxiesViewModel));
         lstProxyDetails.PreviewMouseDoubleClick += lstProxyDetails_PreviewMouseDoubleClick;
 
         this.WhenActivated(disposables =>

v2rayN/v2rayN/Views/DNSSettingWindow.xaml

@@ -281,7 +281,7 @@
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}"
+                            Text="{x:Static resx:ResUI.TbFakeIPTips}"
                             TextWrapping="Wrap" />
 
                         <TextBlock

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
-using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs

@@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
-using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs

@@ -4,7 +4,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using ReactiveUI;
-using ServiceLib.Manager;
 using v2rayN.Manager;
 
 namespace v2rayN.Views;

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -6,11 +6,8 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
-using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
-using ServiceLib.Manager;
-using Splat;
 using v2rayN.Manager;
 
 namespace v2rayN.Views;
@@ -38,7 +35,6 @@ public partial class MainWindow
         menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
 
         ViewModel = new MainWindowViewModel(UpdateViewHandler);
-        Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));
 
         switch (_config.UiItem.MainGirdOrientation)
         {
@@ -151,6 +147,12 @@ public partial class MainWindow
              .ObserveOn(RxApp.MainThreadScheduler)
              .Subscribe(content => Shutdown(content))
              .DisposeWith(disposables);
+
+            AppEvents.ShowHideWindowRequested
+             .AsObservable()
+             .ObserveOn(RxApp.MainThreadScheduler)
+             .Subscribe(blShow => ShowHideWindow(blShow))
+             .DisposeWith(disposables);
         });
 
         this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
@@ -211,13 +213,6 @@ public partial class MainWindow
             case EViewAction.SubSettingWindow:
                 return (new SubSettingWindow().ShowDialog() ?? false);
 
-            case EViewAction.ShowHideWindow:
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    ShowHideWindow((bool?)obj);
-                }), DispatcherPriority.Normal);
-                break;
-
             case EViewAction.ScanScreenTask:
                 await ScanScreenTaskAsync();
                 break;
@@ -227,11 +222,7 @@ public partial class MainWindow
                 break;
 
             case EViewAction.AddServerViaClipboard:
-                var clipboardData = WindowsUtils.GetClipboardData();
+                await AddServerViaClipboardAsync();
-                if (clipboardData.IsNotEmpty())
-                {
-                    ViewModel?.AddServerViaClipboardAsync(clipboardData);
-                }
                 break;
         }
 
@@ -250,7 +241,7 @@ public partial class MainWindow
             case EGlobalHotkey.SystemProxySet:
             case EGlobalHotkey.SystemProxyUnchanged:
             case EGlobalHotkey.SystemProxyPac:
-                Locator.Current.GetService<StatusBarViewModel>()?.SetListenerType((ESysProxyType)((int)e - 1));
+                AppEvents.SysProxyChangeRequested.Publish((ESysProxyType)((int)e - 1));
                 break;
         }
     }
@@ -284,16 +275,7 @@ public partial class MainWindow
                     {
                         return;
                     }
-
+                    AddServerViaClipboardAsync().ContinueWith(_ => { });
-                    var clipboardData = WindowsUtils.GetClipboardData();
-                    if (clipboardData.IsNotEmpty())
-                    {
-                        var service = Locator.Current.GetService<MainWindowViewModel>();
-                        if (service != null)
-                        {
-                            _ = service.AddServerViaClipboardAsync(clipboardData);
-                        }
-                    }
 
                     break;
 
@@ -327,6 +309,15 @@ public partial class MainWindow
         ProcUtils.ProcessStart(Utils.GetBinPath("EnableLoopback.exe"));
     }
 
+    public async Task AddServerViaClipboardAsync()
+    {
+        var clipboardData = WindowsUtils.GetClipboardData();
+        if (clipboardData.IsNotEmpty() && ViewModel != null)
+        {
+            await ViewModel.AddServerViaClipboardAsync(clipboardData);
+        }
+    }
+
     private async Task ScanScreenTaskAsync()
     {
         ShowHideWindow(false);

v2rayN/v2rayN/Views/MsgView.xaml.cs

@@ -47,19 +47,22 @@ public partial class MsgView
 
     private void ShowMsg(object msg)
     {
-        txtMsg.BeginChange();
+        if (txtMsg.LineCount > ViewModel?.NumMaxMsg)
-        txtMsg.Text = msg.ToString();
+        {
+            ClearMsg();
+        }
+
+        txtMsg.AppendText(msg.ToString());
         if (togScrollToEnd.IsChecked ?? true)
         {
             txtMsg.ScrollToEnd();
         }
-        txtMsg.EndChange();
     }
 
     public void ClearMsg()
     {
-        ViewModel?.ClearMsg();
         txtMsg.Clear();
+        txtMsg.AppendText("----- Message cleared -----\n");
     }
 
     private void menuMsgViewSelectAll_Click(object sender, System.Windows.RoutedEventArgs e)

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -4,7 +4,6 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Media;
 using ReactiveUI;
-using ServiceLib.Manager;
 
 namespace v2rayN.Views;
 

v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml

@@ -0,0 +1,156 @@
+<base:WindowBase
+    x:Class="v2rayN.Views.ProfilesSelectWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:base="clr-namespace:v2rayN.Base"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
+    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:TypeArguments="vms:ProfilesSelectViewModel"
+    Style="{StaticResource WindowGlobal}"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+
+    <DockPanel Margin="{StaticResource Margin8}">
+        <StackPanel
+            Margin="{StaticResource Margin4}"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnSave"
+                Width="100"
+                Click="BtnSave_Click"
+                Content="{x:Static resx:ResUI.TbConfirm}"
+                IsDefault="True"
+                Style="{StaticResource DefButton}" />
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Margin="{StaticResource MarginLeftRight8}"
+                Content="{x:Static resx:ResUI.TbCancel}"
+                IsCancel="true"
+                Style="{StaticResource DefButton}" />
+        </StackPanel>
+        <Grid>
+            <DockPanel>
+                <WrapPanel Margin="{StaticResource Margin4}" DockPanel.Dock="Top">
+                    <ListBox
+                        x:Name="lstGroup"
+                        MaxHeight="200"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuSubscription}"
+                        FontSize="{DynamicResource StdFontSize}"
+                        ItemContainerStyle="{StaticResource MyChipListBoxItem}"
+                        Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Remarks}" />
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+
+                    <Button
+                        x:Name="btnAutofitColumnWidth"
+                        Width="30"
+                        Height="30"
+                        Margin="{StaticResource MarginLeftRight8}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}"
+                        Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                        ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
+                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
+                    </Button>
+                    <TextBox
+                        x:Name="txtServerFilter"
+                        Width="200"
+                        Margin="{StaticResource MarginLeftRight4}"
+                        VerticalContentAlignment="Center"
+                        materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
+                        materialDesign:TextFieldAssist.HasClearButton="True"
+                        AutomationProperties.Name="{x:Static resx:ResUI.MsgServerTitle}"
+                        Style="{StaticResource DefTextBox}" />
+                </WrapPanel>
+                <DataGrid
+                    x:Name="lstProfiles"
+                    materialDesign:DataGridAssist.CellPadding="2,2"
+                    AutoGenerateColumns="False"
+                    BorderThickness="1"
+                    CanUserAddRows="False"
+                    CanUserResizeRows="False"
+                    CanUserSortColumns="False"
+                    EnableRowVirtualization="True"
+                    Focusable="True"
+                    GridLinesVisibility="All"
+                    HeadersVisibility="All"
+                    IsReadOnly="True"
+                    RowHeaderWidth="40"
+                    SelectionMode="Single"
+                    Style="{StaticResource DefDataGrid}">
+                    <DataGrid.InputBindings>
+                        <KeyBinding Command="ApplicationCommands.NotACommand" Gesture="Enter" />
+                    </DataGrid.InputBindings>
+                    <DataGrid.Resources>
+                        <Style BasedOn="{StaticResource MaterialDesignDataGridRow}" TargetType="DataGridRow">
+                            <EventSetter Event="MouseDoubleClick" Handler="LstProfiles_MouseDoubleClick" />
+                        </Style>
+                        <Style BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}" TargetType="DataGridColumnHeader">
+                            <EventSetter Event="Click" Handler="LstProfiles_ColumnHeader_Click" />
+                        </Style>
+
+                        <Style BasedOn="{StaticResource MaterialDesignDataGridCell}" TargetType="DataGridCell">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding IsActive}" Value="True">
+                                    <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
+                                    <Setter Property="Foreground" Value="Black" />
+                                    <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </DataGrid.Resources>
+                    <DataGrid.Columns>
+                        <base:MyDGTextColumn
+                            Width="80"
+                            Binding="{Binding ConfigType}"
+                            ExName="ConfigType"
+                            Header="{x:Static resx:ResUI.LvServiceType}" />
+                        <base:MyDGTextColumn
+                            Width="150"
+                            Binding="{Binding Remarks}"
+                            ExName="Remarks"
+                            Header="{x:Static resx:ResUI.LvRemarks}" />
+                        <base:MyDGTextColumn
+                            Width="120"
+                            Binding="{Binding Address}"
+                            ExName="Address"
+                            Header="{x:Static resx:ResUI.LvAddress}" />
+                        <base:MyDGTextColumn
+                            Width="60"
+                            Binding="{Binding Port}"
+                            ExName="Port"
+                            Header="{x:Static resx:ResUI.LvPort}" />
+                        <base:MyDGTextColumn
+                            Width="100"
+                            Binding="{Binding Network}"
+                            ExName="Network"
+                            Header="{x:Static resx:ResUI.LvTransportProtocol}" />
+                        <base:MyDGTextColumn
+                            Width="100"
+                            Binding="{Binding StreamSecurity}"
+                            ExName="StreamSecurity"
+                            Header="{x:Static resx:ResUI.LvTLS}" />
+                        <base:MyDGTextColumn
+                            Width="100"
+                            Binding="{Binding SubRemarks}"
+                            ExName="SubRemarks"
+                            Header="{x:Static resx:ResUI.LvSubscription}" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </DockPanel>
+        </Grid>
+    </DockPanel>
+</base:WindowBase>

v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs

@@ -0,0 +1,193 @@
+using System.Reactive.Disposables;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using ReactiveUI;
+using v2rayN.Base;
+
+namespace v2rayN.Views;
+
+public partial class ProfilesSelectWindow
+{
+    private static Config _config;
+
+    public Task<ProfileItem?> ProfileItem => GetProfileItem();
+    public Task<List<ProfileItem>?> ProfileItems => GetProfileItems();
+    private bool _allowMultiSelect = false;
+
+    public ProfilesSelectWindow()
+    {
+        InitializeComponent();
+        lstGroup.MaxHeight = Math.Floor(SystemParameters.WorkArea.Height * 0.20 / 40) * 40;
+
+        _config = AppManager.Instance.Config;
+
+        btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
+        txtServerFilter.PreviewKeyDown += TxtServerFilter_PreviewKeyDown;
+        lstProfiles.PreviewKeyDown += LstProfiles_PreviewKeyDown;
+        lstProfiles.SelectionChanged += LstProfiles_SelectionChanged;
+        lstProfiles.LoadingRow += LstProfiles_LoadingRow;
+
+        ViewModel = new ProfilesSelectViewModel(UpdateViewHandler);
+
+        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.OneWayBind(ViewModel, vm => vm.SubItems, v => v.lstGroup.ItemsSource).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);
+        });
+
+        WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
+    }
+
+    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);
+
+    #region Event
+
+    private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
+    {
+        switch (action)
+        {
+            case EViewAction.CloseWindow:
+                this.DialogResult = true;
+                break;
+        }
+        return await Task.FromResult(true);
+    }
+
+    private void LstProfiles_SelectionChanged(object sender, System.Windows.Controls.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.GetIndex() + 1}";
+    }
+
+    private void LstProfiles_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+    {
+        ViewModel?.SelectFinish();
+    }
+
+    private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
+    {
+        var colHeader = sender as DataGridColumnHeader;
+        if (colHeader == null || colHeader.TabIndex < 0 || colHeader.Column == null)
+        {
+            return;
+        }
+
+        var colName = ((MyDGTextColumn)colHeader.Column).ExName;
+        ViewModel?.SortServer(colName);
+    }
+
+    private void menuSelectAll_Click(object sender, RoutedEventArgs e)
+    {
+        if (!_allowMultiSelect)
+        {
+            return;
+        }
+        lstProfiles.SelectAll();
+    }
+
+    private void LstProfiles_PreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
+        {
+            switch (e.Key)
+            {
+                case Key.A:
+                    menuSelectAll_Click(null, null);
+                    e.Handled = true;
+                    break;
+            }
+        }
+        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 it in lstProfiles.Columns)
+            {
+                it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog("ProfilesView", ex);
+        }
+    }
+
+    private void TxtServerFilter_PreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        if (e.Key is Key.Enter or Key.Return)
+        {
+            ViewModel?.RefreshServers();
+            e.Handled = true;
+        }
+    }
+
+    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();
+    }
+
+    #endregion Event
+}

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -8,8 +8,6 @@ using System.Windows.Media;
 using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
-using ServiceLib.Manager;
-using Splat;
 using v2rayN.Base;
 using Point = System.Windows.Point;
 
@@ -29,7 +27,7 @@ public partial class ProfilesView
         btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
         txtServerFilter.PreviewKeyDown += TxtServerFilter_PreviewKeyDown;
         lstProfiles.PreviewKeyDown += LstProfiles_PreviewKeyDown;
-        lstProfiles.SelectionChanged += lstProfiles_SelectionChanged;
+        lstProfiles.SelectionChanged += LstProfiles_SelectionChanged;
         lstProfiles.LoadingRow += LstProfiles_LoadingRow;
         menuSelectAll.Click += menuSelectAll_Click;
 
@@ -43,7 +41,6 @@ public partial class ProfilesView
         }
 
         ViewModel = new ProfilesViewModel(UpdateViewHandler);
-        Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(ProfilesViewModel));
 
         this.WhenActivated(disposables =>
         {
@@ -106,7 +103,6 @@ public partial class ProfilesView
         });
 
         RestoreUI();
-        ViewModel?.RefreshServers();
     }
 
     #region Event
@@ -191,7 +187,7 @@ public partial class ProfilesView
         }
     }
 
-    private void lstProfiles_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+    private void LstProfiles_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
     {
         if (ViewModel != null)
         {