up 7.19.4

https://github.com/2dust/v2rayN/issues/8916

.github/workflows/build-linux.yml

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

.github/workflows/build-osx.yml

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

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

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

.github/workflows/build-windows.yml

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

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.19.1</Version>
+        <Version>7.19.4</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -9,18 +9,18 @@
     <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.12" />
     <PackageVersion Include="Avalonia.Desktop" Version="11.3.12" />
     <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.12" />
-    <PackageVersion Include="ReactiveUI.Avalonia" Version="11.3.8" />
+    <PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.12" />
     <PackageVersion Include="CliWrap" Version="3.10.0" />
-    <PackageVersion Include="Downloader" Version="4.1.1" />
+    <PackageVersion Include="Downloader" Version="5.1.0" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.3.0" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.3.1.1" />
     <PackageVersion Include="QRCoder" Version="1.7.0" />
-    <PackageVersion Include="ReactiveUI" Version="22.3.1" />
+    <PackageVersion Include="ReactiveUI" Version="23.1.8" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
-    <PackageVersion Include="ReactiveUI.WPF" Version="22.3.1" />
+    <PackageVersion Include="ReactiveUI.WPF" Version="23.1.8" />
     <PackageVersion Include="Semi.Avalonia" Version="11.3.7.3" />
-    <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.1" />
+    <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.2" />
     <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.3" />
     <PackageVersion Include="NLog" Version="6.1.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />

v2rayN/ServiceLib/Global.cs

@@ -95,7 +95,7 @@ public class Global
 
     public const string PolicyGroupDefaultAllFilter = $"^(?!.*(?:{PolicyGroupExcludeKeywords})).*$";
 
-    public static readonly List<string> PolicyGroupDefaultFilterList = 
+    public static readonly List<string> PolicyGroupDefaultFilterList =
     [
         // All nodes (exclude traffic/expiry info)
         PolicyGroupDefaultAllFilter,

v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs

@@ -227,7 +227,7 @@ public class CoreConfigContextBuilder
     {
         var result = NodeValidatorResult.Empty();
 
-        if (node.Subid.IsNullOrEmpty())
+        if (node.Subid.IsNullOrEmpty() || node.ConfigType == EConfigType.Custom)
         {
             return (null, result);
         }
@@ -268,7 +268,8 @@ public class CoreConfigContextBuilder
         {
             IndexId = $"inner-{Utils.GetGuid(false)}",
             ConfigType = EConfigType.ProxyChain,
-            CoreType = node.CoreType ?? ECoreType.Xray,
+            CoreType = AppManager.Instance.GetCoreType(node, node.ConfigType),
+            Remarks = node.Remarks,
         };
         List<string?> childItems = [prevNode?.IndexId, node.IndexId, nextNode?.IndexId];
         var chainExtraItem = chainNode.GetProtocolExtra() with

v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs

@@ -81,7 +81,9 @@ public class NodeValidator
         {
             var transportError = ValidateSingboxTransport(item.ConfigType, net);
             if (transportError != null)
+            {
                 v.Error(transportError);
+            }
 
             if (!Global.SingboxSupportConfigType.Contains(item.ConfigType))
             {

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -95,10 +95,7 @@ public static class ConfigHandler
         config.GuiItem ??= new();
         config.MsgUIItem ??= new();
 
-        config.UiItem ??= new UIItem()
-        {
-            EnableUpdateSubOnlyRemarksExist = true
-        };
+        config.UiItem ??= new();
         config.UiItem.MainColumnItem ??= new();
         config.UiItem.WindowSizeItem ??= new();
 
@@ -154,6 +151,7 @@ public static class ConfigHandler
             DownMbps = 100
         };
         config.ClashUIItem ??= new();
+        config.ClashUIItem.ConnectionsColumnItem ??= new();
         config.SystemProxyItem ??= new();
         config.WebDavItem ??= new();
         config.CheckUpdateItem ??= new();
@@ -231,6 +229,7 @@ public static class ConfigHandler
             item.Address = profileItem.Address;
             item.Port = profileItem.Port;
 
+            item.Username = profileItem.Username;
             item.Password = profileItem.Password;
 
             item.Network = profileItem.Network;
@@ -721,8 +720,6 @@ public static class ConfigHandler
         profileItem.SetProtocolExtra(profileItem.GetProtocolExtra() with
         {
             SalamanderPass = profileItem.GetProtocolExtra().SalamanderPass?.TrimEx(),
-            UpMbps = profileItem.GetProtocolExtra().UpMbps is null or < 0 ? config.HysteriaItem.UpMbps : profileItem.GetProtocolExtra().UpMbps,
-            DownMbps = profileItem.GetProtocolExtra().DownMbps is null or < 0 ? config.HysteriaItem.DownMbps : profileItem.GetProtocolExtra().DownMbps,
             HopInterval = profileItem.GetProtocolExtra().HopInterval?.TrimEx(),
         });
 
@@ -1040,8 +1037,8 @@ public static class ConfigHandler
 
         if (profileItem.StreamSecurity.IsNotEmpty())
         {
-            if (profileItem.StreamSecurity != Global.StreamSecurity
-                 && profileItem.StreamSecurity != Global.StreamSecurityReality)
+            if (profileItem.StreamSecurity is not Global.StreamSecurity
+                 and not Global.StreamSecurityReality)
             {
                 profileItem.StreamSecurity = string.Empty;
             }
@@ -1132,6 +1129,84 @@ public static class ConfigHandler
         }
     }
 
+    /// <summary>
+    /// Searches the specified collection for a profile item that matches the target profile item based on a series of
+    /// criteria.
+    /// </summary>
+    /// <remarks>The method attempts to find a match by comparing the target's remarks, address, port, and
+    /// password in various combinations. The search is performed in order of specificity, starting with the most
+    /// detailed comparison. If no match is found at any stage, the method returns null.</remarks>
+    /// <param name="source">An enumerable collection of profile items to search. This parameter can be null.</param>
+    /// <param name="target">The profile item to match against items in the source collection. This parameter can be null.</param>
+    /// <returns>A profile item from the source collection that matches the target item according to defined criteria; otherwise,
+    /// null if no match is found or if either parameter is null.</returns>
+    private static ProfileItem? FindMatchedProfileItem(IEnumerable<ProfileItem>? source, ProfileItem? target)
+    {
+        if (source == null || target == null)
+        {
+            return null;
+        }
+
+        var matchedItem = source.FirstOrDefault(t => CompareProfileItem(t, target, true));
+        if (matchedItem != null)
+        {
+            return matchedItem;
+        }
+
+        if (target.Remarks.IsNotEmpty())
+        {
+            matchedItem = source.FirstOrDefault(t => t.Remarks == target.Remarks);
+            if (matchedItem != null)
+            {
+                return matchedItem;
+            }
+        }
+
+        if (target.Address.IsNotEmpty() && target.Port > 0 && target.Password.IsNotEmpty())
+        {
+            matchedItem = source.FirstOrDefault(t =>
+                IsSameText(t.Address, target.Address) &&
+                t.Port == target.Port &&
+                IsSameText(t.Password, target.Password));
+            if (matchedItem != null)
+            {
+                return matchedItem;
+            }
+        }
+
+        if (target.Address.IsNotEmpty() && target.Port > 0)
+        {
+            matchedItem = source.FirstOrDefault(t =>
+                IsSameText(t.Address, target.Address) &&
+                t.Port == target.Port);
+            if (matchedItem != null)
+            {
+                return matchedItem;
+            }
+        }
+
+        if (target.Address.IsNotEmpty())
+        {
+            matchedItem = source.FirstOrDefault(t => IsSameText(t.Address, target.Address));
+            if (matchedItem != null)
+            {
+                return matchedItem;
+            }
+        }
+
+        return null;
+
+        static bool IsSameText(string? left, string? right)
+        {
+            if (left.IsNullOrEmpty() || right.IsNullOrEmpty())
+            {
+                return false;
+            }
+
+            return string.Equals(left.TrimEx(), right.TrimEx(), StringComparison.OrdinalIgnoreCase);
+        }
+    }
+
     /// <summary>
     /// Remove a single server profile by its index ID
     /// Deletes the configuration file if it's a custom config
@@ -1331,6 +1406,7 @@ public static class ConfigHandler
     public static async Task<int> RemoveInvalidServerResult(Config config, string subid)
     {
         var lstModel = await AppManager.Instance.ProfileModels(subid, "");
+        lstModel.RemoveAll(t => t.ConfigType.IsComplexType());
         if (lstModel is { Count: <= 0 })
         {
             return -1;
@@ -1635,7 +1711,7 @@ public static class ConfigHandler
         if (activeProfile != null)
         {
             var lstSub = await AppManager.Instance.ProfileItems(subid);
-            var existItem = lstSub?.FirstOrDefault(t => config.UiItem.EnableUpdateSubOnlyRemarksExist ? t.Remarks == activeProfile.Remarks : CompareProfileItem(t, activeProfile, true));
+            var existItem = FindMatchedProfileItem(lstSub, activeProfile);
             if (existItem != null)
             {
                 await ConfigHandler.SetDefaultServerIndex(config, existItem.IndexId);
@@ -1648,7 +1724,7 @@ public static class ConfigHandler
             var lstSub = await AppManager.Instance.ProfileItems(subid);
             foreach (var item in lstSub)
             {
-                var existItem = lstOriSub?.FirstOrDefault(t => config.UiItem.EnableUpdateSubOnlyRemarksExist ? t.Remarks == item.Remarks : CompareProfileItem(t, item, true));
+                var existItem = FindMatchedProfileItem(lstOriSub, item);
                 if (existItem != null)
                 {
                     await StatisticsManager.Instance.CloneServerStatItem(existItem.IndexId, item.IndexId);

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

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

v2rayN/ServiceLib/Manager/CoreManager.cs

@@ -132,7 +132,7 @@ public class CoreManager
             return null;
         }
 
-        var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
+        var coreType = context.RunCoreType;
         var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
         return await RunProcess(coreInfo, fileName, true, false);
     }

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -87,7 +87,6 @@ public class MsgUIItem
 public class UIItem
 {
     public bool EnableAutoAdjustMainLvColWidth { get; set; }
-    public bool EnableUpdateSubOnlyRemarksExist { get; set; }
     public int MainGirdHeight1 { get; set; }
     public int MainGirdHeight2 { get; set; }
     public EGirdOrientation MainGirdOrientation { get; set; } = EGirdOrientation.Vertical;
@@ -208,6 +207,7 @@ public class ClashUIItem
     public int ProxiesAutoDelayTestInterval { get; set; } = 10;
     public bool ConnectionsAutoRefresh { get; set; }
     public int ConnectionsRefreshInterval { get; set; } = 2;
+    public List<ColumnItem> ConnectionsColumnItem { get; set; }
 }
 
 [Serializable]

v2rayN/ServiceLib/Models/ServerTestItem.cs

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

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -28,6 +28,7 @@ public class Dns4Sbox
     public bool? disable_cache { get; set; }
     public bool? disable_expire { get; set; }
     public bool? independent_cache { get; set; }
+    public int? cache_capacity { get; set; }
     public bool? reverse_mapping { get; set; }
     public string? client_subnet { get; set; }
 }

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -360,6 +360,7 @@ public class TlsSettings4Ray
     public bool? disableSystemRoot { get; set; }
     public string? echConfigList { get; set; }
     public string? echForceQuery { get; set; }
+    public Sockopt4Ray? echSockopt { get; set; }
 }
 
 public class CertificateSettings4Ray

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -3376,7 +3376,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Process (Tun mode) 的本地化字符串。
+        ///   查找类似 Process (Linux/Windows) 的本地化字符串。
         /// </summary>
         public static string TbRoutingRuleProcess {
             get {
@@ -3816,15 +3816,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Updating subscription, only determining if remarks exist 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsEnableUpdateSubOnlyRemarksExist {
-            get {
-                return ResourceManager.GetString("TbSettingsEnableUpdateSubOnlyRemarksExist", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Exception 的本地化字符串。
         /// </summary>

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

@@ -1027,7 +1027,7 @@
     <value>پروتکل sing-box Mux</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process (Tun mode)</value>
+    <value>Process (Linux/Windows)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP or IP CIDR</value>
@@ -1098,9 +1098,6 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>آدرس اینترنتی تست پینگ سرعت</value>
   </data>
-  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>اشتراک در حال به‌روزرسانی، فقط مشخص کنید که ملاحظاتی آیا وجود دارد!</value>
-  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>پایان تست...</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.fr.resx

@@ -1024,7 +1024,7 @@
     <value>Protocole de multiplexage Mux (sing-box)</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process (Tun mode)</value>
+    <value>Process (Linux/Windows)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP ou IP CIDR</value>
@@ -1095,9 +1095,6 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>Adresse de test de connexion réelle</value>
   </data>
-  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>Ne vérifier l’existence de l’alias qu’à la maj. des abonnements</value>
-  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>Arrêt du test en cours...</value>
   </data>
@@ -1668,4 +1665,4 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuGenRegionGroup" xml:space="preserve">
     <value>Group by Region</value>
   </data>
-</root>
+</root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1027,7 +1027,7 @@
     <value>sing-box Mux protokoll</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process (Tun mode)</value>
+    <value>Process (Linux/Windows)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP vagy IP CIDR</value>
@@ -1098,9 +1098,6 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>Sebesség Ping Teszt URL</value>
   </data>
-  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>Előfizetés frissítése, csak a megjegyzések létezésének ellenőrzése</value>
-  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>Teszt megszakítása...</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1027,7 +1027,7 @@
     <value>sing-box Mux Protocol</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process (Tun mode)</value>
+    <value>Process (Linux/Windows)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP or IP CIDR</value>
@@ -1098,9 +1098,6 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>Speed Ping Test URL</value>
   </data>
-  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>Updating subscription, only determining if remarks exist</value>
-  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>Test terminating...</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1027,7 +1027,7 @@
     <value>Протокол Mux для sing-box</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process (Tun mode)</value>
+    <value>Process (Linux/Windows)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP-адрес или сеть CIDR</value>
@@ -1098,9 +1098,6 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>URL для быстрой проверки реальной задержки</value>
   </data>
-  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>Обновляя подписку, проверять лишь наличие примечаний</value>
-  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>Отмена тестирования...</value>
   </data>

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

@@ -1024,7 +1024,7 @@
     <value>sing-box Mux 多路复用协议</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>进程 (Tun 模式)</value>
+    <value>进程 (Linux/Windows)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP 或 IP CIDR</value>
@@ -1095,9 +1095,6 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>真连接测试地址</value>
   </data>
-  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>更新订阅时只判断别名已存在否</value>
-  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>测试终止中...</value>
   </data>

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

@@ -127,7 +127,7 @@
     <value>設定格式不正確</value>
   </data>
   <data name="CustomServerTips" xml:space="preserve">
-    <value>注意，自訂設定完全依賴您自己的設定，不能使用所有設定功能。如需使用系統代理請手動修改偵聽埠。</value>
+    <value>注意，自訂設定完全依賴您自行輸入的內容，部分功能可能無法使用。如需啟用系統代理，請手動調整監聽埠。</value>
   </data>
   <data name="Downloading" xml:space="preserve">
     <value>下載開始...</value>
@@ -139,7 +139,7 @@
     <value>生成預設設定檔失敗</value>
   </data>
   <data name="FailedGetDefaultConfiguration" xml:space="preserve">
-    <value>獲取預設設定失敗</value>
+    <value>取得預設設定失敗</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
     <value>匯入自訂設定失敗</value>
@@ -148,7 +148,7 @@
     <value>讀取設定失敗</value>
   </data>
   <data name="FillCorrectServerPort" xml:space="preserve">
-    <value>請填寫正確格式的埠</value>
+    <value>請填寫有效的埠號</value>
   </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
     <value>請填寫本機偵聽埠</value>
@@ -247,7 +247,7 @@
     <value>非 VMess 或 SS 協定</value>
   </data>
   <data name="NotFoundCore" xml:space="preserve">
-    <value>在資料夾 ({0}) 下未找到 Core 檔案 (檔案名: {1})，請下載後放入資料夾，下載網址: {2}</value>
+    <value>在資料夾 ({0}) 中找不到 Core 檔案（檔名：{1}）。請下載後放入該資料夾。下載網址：{2}</value>
   </data>
   <data name="NoValidQRcodeFound" xml:space="preserve">
     <value>掃描完成，未發現有效二維碼</value>
@@ -304,7 +304,7 @@
     <value>是否確定移除規則？</value>
   </data>
   <data name="RoutingRuleDetailRequiredTips" xml:space="preserve">
-    <value>{0}，必填其中一項.</value>
+    <value>{0}，至少需填寫其中一項。</value>
   </data>
   <data name="LvRemarks" xml:space="preserve">
     <value>別名</value>
@@ -385,7 +385,7 @@
     <value>所有</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
-    <value>請瀏覽匯入設定</value>
+    <value>請選擇要匯入的設定檔</value>
   </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>測試中...</value>
@@ -472,7 +472,7 @@
     <value>語言 (需重啟)</value>
   </data>
   <data name="menuAddServerViaClipboard" xml:space="preserve">
-    <value>從剪貼簿導入分享連結</value>
+    <value>從剪貼簿匯入分享連結</value>
   </data>
   <data name="menuAddServerViaScan" xml:space="preserve">
     <value>掃描螢幕上的二維碼</value>
@@ -616,10 +616,10 @@
     <value>SNI</value>
   </data>
   <data name="TbStreamSecurity" xml:space="preserve">
-    <value>傳輸層安全 (TLS)</value>
+    <value>傳輸層安全性 (TLS)</value>
   </data>
   <data name="TipNetwork" xml:space="preserve">
-    <value>*預設 TCP，選錯會無法連接</value>
+    <value>*預設 TCP，選錯會無法連線</value>
   </data>
   <data name="TbCoreType" xml:space="preserve">
     <value>Core 類型</value>
@@ -652,7 +652,7 @@
     <value>SOCKS 埠</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>*自訂設定的 Socks 埠值，可不設定；當設定此值後，將使用 Xray/sing-box (Tun) 額外啟動一個前置 Socks 服務，提供分流和速度顯示等功能</value>
+    <value>*自訂設定的 Socks 埠值，可留空；當設定此值後，將使用 Xray/sing-box (Tun) 額外啟動一個前置 Socks 服務，提供分流和速度顯示等功能</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>瀏覽</value>
@@ -1024,7 +1024,7 @@
     <value>sing-box Mux 多路復用協定</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>行程 (Tun 模式)</value>
+    <value>行程 (Linux/Windows)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP 或 IP CIDR</value>
@@ -1095,9 +1095,6 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>真連線測試位址</value>
   </data>
-  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>更新訂閱時只判斷別名是否存在</value>
-  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>測試終止中...</value>
   </data>
@@ -1309,7 +1306,7 @@
     <value>安裝字體到系統中，選擇或填入字體名稱，重新啟動後生效</value>
   </data>
   <data name="menuExitTips" xml:space="preserve">
-    <value>是否確定退出？</value>
+    <value>確定要退出嗎？</value>
   </data>
   <data name="LvMemo" xml:space="preserve">
     <value>備註備忘</value>
@@ -1495,13 +1492,13 @@
     <value>策略組類型</value>
   </data>
   <data name="menuAddPolicyGroupServer" xml:space="preserve">
-    <value>添加策略組</value>
+    <value>新增策略組</value>
   </data>
   <data name="menuAddProxyChainServer" xml:space="preserve">
-    <value>添加鏈式代理</value>
+    <value>新增鏈式代理</value>
   </data>
   <data name="menuAddChildServer" xml:space="preserve">
-    <value>添加子配置</value>
+    <value>新增子配置</value>
   </data>
   <data name="menuRemoveChildServer" xml:space="preserve">
     <value>刪除子配置</value>
@@ -1591,81 +1588,81 @@
     <value>EchForceQuery</value>
   </data>
   <data name="TbFullCertTips" xml:space="preserve">
-    <value>Full certificate (chain), PEM format</value>
+    <value>完整憑證（鏈），PEM 格式</value>
   </data>
   <data name="TbCertSha256Tips" xml:space="preserve">
-    <value>Certificate fingerprint (SHA-256)</value>
+    <value>憑證指紋（SHA-256）</value>
   </data>
   <data name="TbServeStale" xml:space="preserve">
-    <value>Serve Stale</value>
+    <value>提供過期快取（Serve Stale）</value>
   </data>
   <data name="TbParallelQuery" xml:space="preserve">
-    <value>Parallel Query</value>
+    <value>并行查詢</value>
   </data>
   <data name="TbDomesticDNSTips" xml:space="preserve">
-    <value>By default, invoked only during routing for resolution</value>
+    <value>預設僅在路由期間進行解析時調用</value>
   </data>
   <data name="TbRemoteDNSTips" xml:space="preserve">
-    <value>By default, invoked only during routing for resolution; ensure the remote server can reach this DNS</value>
+    <value>預設僅在路由期間進行解析時調用；請確保遠端伺服器能連線至此 DNS</value>
   </data>
   <data name="TbDirectResolveStrategyTips" xml:space="preserve">
-    <value>If unset or "AsIs", DNS resolution uses the system DNS; otherwise, the internal DNS module is used.</value>
+    <value>若未設定或為 "AsIs"，使用系統 DNS 解析；否則將使用內建 DNS 模組。</value>
   </data>
   <data name="TbRemoteResolveStrategyTips" xml:space="preserve">
-    <value>If unset or "AsIs", DNS resolution is performed by the remote server's DNS; otherwise, the internal DNS module is used.</value>
+    <value>若未設定或為 "AsIs"，由遠端伺服器的 DNS 解析；否則將使用內建 DNS 模組。</value>
   </data>
   <data name="TbHopInt7" xml:space="preserve">
-    <value>Port hopping interval</value>
+    <value>連接埠跳轉間隔</value>
   </data>
   <data name="menuServerListPreview" xml:space="preserve">
-    <value>Configuration item preview</value>
+    <value>子配置項預覽</value>
   </data>
   <data name="TbFinalmask" xml:space="preserve">
     <value>Finalmask</value>
   </data>
   <data name="MsgRoutingRuleOutboundNodeWarning" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} warning: {2}</value>
+    <value>路由規則 {0} 的出站節點 {1} 發出警告：{2}</value>
   </data>
   <data name="MsgRoutingRuleOutboundNodeError" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} error: {2}. Fallback to proxy node only.</value>
+    <value>路由規則 {0} 的出站節點 {1} 發生錯誤：{2}。已回退為僅使用代理節點。</value>
   </data>
   <data name="MsgGroupCycleDependency" xml:space="preserve">
-    <value>Group {0} has a cycle dependency on child node {1}. Skipping this node.</value>
+    <value>節點組 {0} 與子節點 {1} 存在循環依賴。已跳過此節點。</value>
   </data>
   <data name="MsgGroupChildNodeWarning" xml:space="preserve">
-    <value>Group {0} child node {1} warning: {2}</value>
+    <value>節點組 {0} 的子節點 {1} 發出警告：{2}</value>
   </data>
   <data name="MsgGroupChildNodeError" xml:space="preserve">
-    <value>Group {0} child node {1} error: {2}. Skipping this node.</value>
+    <value>節點組 {0} 的子節點 {1} 發生錯誤：{2}。已跳過此節點。</value>
   </data>
   <data name="MsgGroupChildGroupNodeWarning" xml:space="preserve">
-    <value>Group {0} child group node {1} warning: {2}</value>
+    <value>節點組 {0} 的子節點組 {1} 發出警告：{2}</value>
   </data>
   <data name="MsgGroupChildGroupNodeError" xml:space="preserve">
-    <value>Group {0} child group node {1} error: {2}. Skipping this node.</value>
+    <value>節點組 {0} 的子節點組 {1} 發生錯誤：{2}。已跳過此節點。</value>
   </data>
   <data name="MsgGroupNoValidChildNode" xml:space="preserve">
-    <value>Group {0} has no valid child node.</value>
+    <value>節點組 {0} 沒有可用的有效子節點。</value>
   </data>
   <data name="MsgRoutingRuleEmptyOutboundTag" xml:space="preserve">
-    <value>Routing rule {0} has an empty outbound tag. Fallback to proxy node only.</value>
+    <value>路由規則 {0} 的出站標籤為空。已回退為僅使用代理節點。</value>
   </data>
   <data name="MsgRoutingRuleOutboundNodeNotFound" xml:space="preserve">
-    <value>Routing rule {0} outbound node {1} not found. Fallback to proxy node only.</value>
+    <value>找不到路由規則 {0} 的出站節點 {1}。已回退為僅使用代理節點。</value>
   </data>
   <data name="MsgSubscriptionPrevProfileNotFound" xml:space="preserve">
-    <value>Subscription previous proxy {0} not found. Skipping.</value>
+    <value>找不到訂閱的前一個代理 {0}。已跳過。</value>
   </data>
   <data name="MsgSubscriptionNextProfileNotFound" xml:space="preserve">
-    <value>Subscription next proxy {0} not found. Skipping.</value>
+    <value>找不到訂閱的下一個代理 {0}。已跳過。</value>
   </data>
   <data name="menuGenGroupServer" xml:space="preserve">
-    <value>Generate Policy Group</value>
+    <value>生成策略組</value>
   </data>
   <data name="menuAllServers" xml:space="preserve">
-    <value>All configurations</value>
+    <value>所有配置項</value>
   </data>
   <data name="menuGenRegionGroup" xml:space="preserve">
-    <value>Group by Region</value>
+    <value>按區域分組</value>
   </data>
 </root>

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

@@ -93,7 +93,23 @@ public partial class CoreConfigSingboxService
 
         foreach (var kvp in Utils.ParseHostsToDictionary(simpleDnsItem.Hosts))
         {
-            hostsDns.predefined[kvp.Key] = kvp.Value.Where(Utils.IsIpAddress).ToList();
+            // only allow full match
+            // like example.com and full:example.com,
+            // but not domain:example.com, keyword:example.com or regex:example.com etc.
+            var testRule = new Rule4Sbox();
+            if (!ParseV2Domain(kvp.Key, testRule))
+            {
+                continue;
+            }
+            if (testRule.domain_keyword?.Count > 0 && !kvp.Key.Contains(':'))
+            {
+                testRule.domain = testRule.domain_keyword;
+                testRule.domain_keyword = null;
+            }
+            if (testRule.domain?.Count == 1)
+            {
+                hostsDns.predefined[testRule.domain.First()] = kvp.Value.Where(Utils.IsIpAddress).ToList();
+            }
         }
 
         foreach (var host in hostsDns.predefined)
@@ -179,44 +195,65 @@ public partial class CoreConfigSingboxService
         foreach (var kvp in Utils.ParseHostsToDictionary(simpleDnsItem.Hosts))
         {
             var predefined = kvp.Value.First();
-            if (predefined.IsNullOrEmpty() || Utils.IsIpAddress(predefined))
+            if (predefined.IsNullOrEmpty())
             {
                 continue;
             }
-            if (predefined.StartsWith('#') && int.TryParse(predefined.AsSpan(1), out var rcode))
+            var rule = new Rule4Sbox()
             {
-                // xray syntactic sugar for predefined
-                // etc. #0 -> NOERROR
-                _coreConfig.dns.rules.Add(new()
-                {
-                    query_type = [1, 28],
-                    domain = [kvp.Key],
-                    action = "predefined",
-                    rcode = rcode switch
-                    {
-                        0 => "NOERROR",
-                        1 => "FORMERR",
-                        2 => "SERVFAIL",
-                        3 => "NXDOMAIN",
-                        4 => "NOTIMP",
-                        5 => "REFUSED",
-                        _ => "NOERROR",
-                    },
-                });
-                continue;
-            }
-            // CNAME record
-            Rule4Sbox rule = new()
-            {
-                query_type = [1, 28],
+                query_type = [1, 5, 28], // A, CNAME and AAAA
                 action = "predefined",
                 rcode = "NOERROR",
-                answer = [$"*. IN CNAME {predefined}."],
             };
-            if (ParseV2Domain(kvp.Key, rule))
+            if (!ParseV2Domain(kvp.Key, rule))
             {
-                _coreConfig.dns.rules.Add(rule);
+                continue;
             }
+            // see: https://xtls.github.io/en/config/dns.html#dnsobject
+            // The matching format (domain:, full:, etc.) is the same as the domain
+            // in the commonly used Routing System. The difference is that without a prefix,
+            // it defaults to using the full: prefix (similar to the common hosts file syntax).
+            if (rule.domain_keyword?.Count > 0 && !kvp.Key.Contains(':'))
+            {
+                rule.domain = rule.domain_keyword;
+                rule.domain_keyword = null;
+            }
+            // example.com #0 -> example.com with NOERROR
+            if (predefined.StartsWith('#') && int.TryParse(predefined.AsSpan(1), out var rcode))
+            {
+                rule.rcode = rcode switch
+                {
+                    0 => "NOERROR",
+                    1 => "FORMERR",
+                    2 => "SERVFAIL",
+                    3 => "NXDOMAIN",
+                    4 => "NOTIMP",
+                    5 => "REFUSED",
+                    _ => "NOERROR",
+                };
+            }
+            else if (Utils.IsDomain(predefined))
+            {
+                // example.com CNAME target.com -> example.com with CNAME target.com
+                rule.answer = new List<string> { $"*. IN CNAME {predefined}." };
+            }
+            else if (Utils.IsIpAddress(predefined) && (rule.domain?.Count ?? 0) == 0)
+            {
+                // not full match, but an IP address, treat it as predefined answer
+                if (Utils.IsIpv6(predefined))
+                {
+                    rule.answer = new List<string> { $"*. IN AAAA {predefined}" };
+                }
+                else
+                {
+                    rule.answer = new List<string> { $"*. IN A {predefined}" };
+                }
+            }
+            else
+            {
+                continue;
+            }
+            _coreConfig.dns.rules.Add(rule);
         }
 
         if (simpleDnsItem.BlockBindingQuery == true)

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

@@ -84,11 +84,58 @@ public partial class CoreConfigSingboxService
             }
             if (hostsDomains.Count > 0)
             {
-                _coreConfig.route.rules.Add(new()
+                var hostsResolveRule = new Rule4Sbox
                 {
                     action = "resolve",
-                    domain = hostsDomains,
-                });
+                };
+                var hostsCounter = 0;
+                foreach (var host in hostsDomains)
+                {
+                    var domainRule = new Rule4Sbox();
+                    if (!ParseV2Domain(host, domainRule))
+                    {
+                        continue;
+                    }
+                    if (domainRule.domain_keyword?.Count > 0 && !host.Contains(':'))
+                    {
+                        domainRule.domain = domainRule.domain_keyword;
+                        domainRule.domain_keyword = null;
+                    }
+                    if (domainRule.domain?.Count > 0)
+                    {
+                        hostsResolveRule.domain ??= [];
+                        hostsResolveRule.domain.AddRange(domainRule.domain);
+                        hostsCounter++;
+                    }
+                    else if (domainRule.domain_keyword?.Count > 0)
+                    {
+                        hostsResolveRule.domain_keyword ??= [];
+                        hostsResolveRule.domain_keyword.AddRange(domainRule.domain_keyword);
+                        hostsCounter++;
+                    }
+                    else if (domainRule.domain_suffix?.Count > 0)
+                    {
+                        hostsResolveRule.domain_suffix ??= [];
+                        hostsResolveRule.domain_suffix.AddRange(domainRule.domain_suffix);
+                        hostsCounter++;
+                    }
+                    else if (domainRule.domain_regex?.Count > 0)
+                    {
+                        hostsResolveRule.domain_regex ??= [];
+                        hostsResolveRule.domain_regex.AddRange(domainRule.domain_regex);
+                        hostsCounter++;
+                    }
+                    else if (domainRule.geosite?.Count > 0)
+                    {
+                        hostsResolveRule.geosite ??= [];
+                        hostsResolveRule.geosite.AddRange(domainRule.geosite);
+                        hostsCounter++;
+                    }
+                }
+                if (hostsCounter > 0)
+                {
+                    _coreConfig.route.rules.Add(hostsResolveRule);
+                }
             }
 
             _coreConfig.route.rules.Add(new()
@@ -355,6 +402,11 @@ public partial class CoreConfigSingboxService
             rule.domain_keyword ??= [];
             rule.domain_keyword?.Add(domain.Substring(8));
         }
+        else if (domain.StartsWith("dotless:"))
+        {
+            rule.domain_keyword ??= [];
+            rule.domain_keyword?.Add(domain.Substring(8));
+        }
         else
         {
             rule.domain_keyword ??= [];

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

@@ -301,6 +301,7 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
             GenLog();
             _coreConfig.outbounds.Clear();
             GenOutbounds();
+            GenStatistic();
 
             var protectNode = new ProfileItem()
             {
@@ -315,29 +316,36 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
                 SsMethod = Global.None,
             });
 
-            foreach (var outbound in _coreConfig.outbounds.Where(outbound => outbound.streamSettings?.sockopt?.dialerProxy?.IsNullOrEmpty() ?? true))
+            foreach (var outbound in _coreConfig.outbounds
+                .Where(o => o.streamSettings?.sockopt?.dialerProxy?.IsNullOrEmpty() ?? true))
             {
-                outbound.streamSettings ??= new StreamSettings4Ray();
-                outbound.streamSettings.sockopt ??= new Sockopt4Ray();
-                outbound.streamSettings.sockopt.dialerProxy = "tun-project-ss";
+                outbound.streamSettings ??= new();
+                outbound.streamSettings.sockopt ??= new();
+                outbound.streamSettings.sockopt.dialerProxy = "tun-protect-ss";
+            }
+            // ech protected
+            foreach (var outbound in _coreConfig.outbounds
+                .Where(outbound => outbound.streamSettings?.tlsSettings?.echConfigList?.IsNullOrEmpty() == false))
+            {
+                outbound.streamSettings!.tlsSettings!.echSockopt ??= new();
+                outbound.streamSettings.tlsSettings.echSockopt.dialerProxy = "tun-protect-ss";
             }
             _coreConfig.outbounds.Add(new CoreConfigV2rayService(context with
             {
                 Node = protectNode,
-            }).BuildProxyOutbound("tun-project-ss"));
+            }).BuildProxyOutbound("tun-protect-ss"));
 
+            _coreConfig.routing.rules ??= [];
             var hasBalancer = _coreConfig.routing.balancers is { Count: > 0 };
-            _coreConfig.routing.rules =
-            [
-                new()
-                {
-                    inboundTag = new List<string> { "proxy-relay-ss" },
-                    outboundTag = hasBalancer ? null : Global.ProxyTag,
-                    balancerTag = hasBalancer ? Global.ProxyTag + Global.BalancerTagSuffix: null,
-                    type = "field"
-                }
-            ];
-            _coreConfig.inbounds.Clear();
+            _coreConfig.routing.rules.Add(new()
+            {
+                inboundTag = ["proxy-relay-ss"],
+                outboundTag = hasBalancer ? null : Global.ProxyTag,
+                balancerTag = hasBalancer ? Global.ProxyTag + Global.BalancerTagSuffix : null,
+                type = "field"
+            });
+
+            //_coreConfig.inbounds.Clear();
 
             var configNode = JsonUtils.ParseJson(JsonUtils.Serialize(_coreConfig))!;
             configNode["inbounds"]!.AsArray().Add(new

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

@@ -437,7 +437,7 @@ public partial class CoreConfigV2rayService
 
             FillDnsDomainsCustom(obj);
 
-            _coreConfig.dns = JsonUtils.Deserialize<Dns4Ray>(JsonUtils.Serialize(obj));
+            _coreConfig.dns = obj;
         }
         catch (Exception ex)
         {

v2rayN/ServiceLib/Services/UpdateService.cs

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

v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs

@@ -27,10 +27,10 @@ public class AddServerViewModel : MyReactiveObject
     public string Ports { get; set; }
 
     [Reactive]
-    public int UpMbps { get; set; }
+    public int? UpMbps { get; set; }
 
     [Reactive]
-    public int DownMbps { get; set; }
+    public int? DownMbps { get; set; }
 
     [Reactive]
     public string HopInterval { get; set; }
@@ -113,8 +113,8 @@ public class AddServerViewModel : MyReactiveObject
         AlterId = int.TryParse(protocolExtra?.AlterId, out var result) ? result : 0;
         Flow = protocolExtra?.Flow ?? string.Empty;
         SalamanderPass = protocolExtra?.SalamanderPass ?? string.Empty;
-        UpMbps = protocolExtra?.UpMbps ?? _config.HysteriaItem.UpMbps;
-        DownMbps = protocolExtra?.DownMbps ?? _config.HysteriaItem.DownMbps;
+        UpMbps = protocolExtra?.UpMbps;
+        DownMbps = protocolExtra?.DownMbps;
         HopInterval = protocolExtra?.HopInterval.IsNullOrEmpty() ?? true ? Global.Hysteria2DefaultHopInt.ToString() : protocolExtra.HopInterval;
         VmessSecurity = protocolExtra?.VmessSecurity?.IsNullOrEmpty() == false ? protocolExtra.VmessSecurity : Global.DefaultSecurity;
         VlessEncryption = protocolExtra?.VlessEncryption.IsNullOrEmpty() == false ? protocolExtra.VlessEncryption : Global.None;
@@ -175,8 +175,8 @@ public class AddServerViewModel : MyReactiveObject
             AlterId = AlterId > 0 ? AlterId.ToString() : null,
             Flow = Flow.NullIfEmpty(),
             SalamanderPass = SalamanderPass.NullIfEmpty(),
-            UpMbps = UpMbps >= 0 ? UpMbps : null,
-            DownMbps = DownMbps >= 0 ? DownMbps : null,
+            UpMbps = UpMbps,
+            DownMbps = DownMbps,
             HopInterval = HopInterval.NullIfEmpty(),
             VmessSecurity = VmessSecurity.NullIfEmpty(),
             VlessEncryption = VlessEncryption.NullIfEmpty(),

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

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

v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs

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

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

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

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -228,22 +228,22 @@ public class MainWindowViewModel : MyReactiveObject
 
         AppEvents.ReloadRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await Reload());
 
         AppEvents.AddServerViaScanRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await AddServerViaScanAsync());
 
         AppEvents.AddServerViaClipboardRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await AddServerViaClipboardAsync(null));
 
         AppEvents.SubscriptionsUpdateRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async blProxy => await UpdateSubscriptionProcess("", blProxy));
 
         #endregion AppEvents
@@ -583,7 +583,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     private void ReloadResult(bool showClashUI)
     {
-        RxApp.MainThreadScheduler.Schedule(() =>
+        RxSchedulers.MainThreadScheduler.Schedule(() =>
         {
             ShowClashUI = showClashUI;
             TabMainSelectedIndex = showClashUI ? TabMainSelectedIndex : 0;
@@ -592,7 +592,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     private void SetReloadEnabled(bool enabled)
     {
-        RxApp.MainThreadScheduler.Schedule(() => BlReloadEnabled = enabled);
+        RxSchedulers.MainThreadScheduler.Schedule(() => BlReloadEnabled = enabled);
     }
 
     private async Task LoadCore(CoreConfigContext? mainContext, CoreConfigContext? preContext)

v2rayN/ServiceLib/ViewModels/MsgViewModel.cs

@@ -31,7 +31,7 @@ public class MsgViewModel : MyReactiveObject
 
         AppEvents.SendMsgViewRequested
          .AsObservable()
-         //.ObserveOn(RxApp.MainThreadScheduler)
+         //.ObserveOn(RxSchedulers.MainThreadScheduler)
          .Subscribe(content => _ = AppendQueueMsg(content));
     }
 

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -22,8 +22,8 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public string defUserAgent { get; set; }
     [Reactive] public string mux4SboxProtocol { get; set; }
     [Reactive] public bool enableCacheFile4Sbox { get; set; }
-    [Reactive] public int hyUpMbps { get; set; }
-    [Reactive] public int hyDownMbps { get; set; }
+    [Reactive] public int? hyUpMbps { get; set; }
+    [Reactive] public int? hyDownMbps { get; set; }
     [Reactive] public bool enableFragment { get; set; }
 
     #endregion Core
@@ -47,7 +47,6 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public bool KeepOlderDedupl { get; set; }
     [Reactive] public bool DisplayRealTimeSpeed { get; set; }
     [Reactive] public bool EnableAutoAdjustMainLvColWidth { get; set; }
-    [Reactive] public bool EnableUpdateSubOnlyRemarksExist { get; set; }
     [Reactive] public bool AutoHideStartup { get; set; }
     [Reactive] public bool Hide2TrayWhenClose { get; set; }
     [Reactive] public bool MacOSShowInDock { get; set; }
@@ -180,7 +179,6 @@ public class OptionSettingViewModel : MyReactiveObject
         DisplayRealTimeSpeed = _config.GuiItem.DisplayRealTimeSpeed;
         KeepOlderDedupl = _config.GuiItem.KeepOlderDedupl;
         EnableAutoAdjustMainLvColWidth = _config.UiItem.EnableAutoAdjustMainLvColWidth;
-        EnableUpdateSubOnlyRemarksExist = _config.UiItem.EnableUpdateSubOnlyRemarksExist;
         AutoHideStartup = _config.UiItem.AutoHideStartup;
         Hide2TrayWhenClose = _config.UiItem.Hide2TrayWhenClose;
         MacOSShowInDock = _config.UiItem.MacOSShowInDock;
@@ -336,8 +334,8 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.CoreBasicItem.DefUserAgent = defUserAgent;
         _config.Mux4SboxItem.Protocol = mux4SboxProtocol;
         _config.CoreBasicItem.EnableCacheFile4Sbox = enableCacheFile4Sbox;
-        _config.HysteriaItem.UpMbps = hyUpMbps;
-        _config.HysteriaItem.DownMbps = hyDownMbps;
+        _config.HysteriaItem.UpMbps = hyUpMbps ?? 0;
+        _config.HysteriaItem.DownMbps = hyDownMbps ?? 0;
         _config.CoreBasicItem.EnableFragment = enableFragment;
 
         _config.GuiItem.AutoRun = AutoRun;
@@ -345,7 +343,6 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.GuiItem.DisplayRealTimeSpeed = DisplayRealTimeSpeed;
         _config.GuiItem.KeepOlderDedupl = KeepOlderDedupl;
         _config.UiItem.EnableAutoAdjustMainLvColWidth = EnableAutoAdjustMainLvColWidth;
-        _config.UiItem.EnableUpdateSubOnlyRemarksExist = EnableUpdateSubOnlyRemarksExist;
         _config.UiItem.AutoHideStartup = AutoHideStartup;
         _config.UiItem.Hide2TrayWhenClose = Hide2TrayWhenClose;
         _config.UiItem.MacOSShowInDock = MacOSShowInDock;

v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs

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

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -228,22 +228,22 @@ public class ProfilesViewModel : MyReactiveObject
 
         AppEvents.ProfilesRefreshRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await RefreshServersBiz());
 
         AppEvents.SubscriptionsRefreshRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async _ => await RefreshSubscriptions());
 
         AppEvents.DispatcherStatisticsRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async result => await UpdateStatistics(result));
 
         AppEvents.SetDefaultServerRequested
             .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxSchedulers.MainThreadScheduler)
             .Subscribe(async indexId => await SetDefaultServer(indexId));
 
         #endregion AppEvents
@@ -391,14 +391,9 @@ public class ProfilesViewModel : MyReactiveObject
         {
             SubItems.Add(item);
         }
-        if (_config.SubIndexId != null && SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId) != null)
-        {
-            SelectedSub = SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId);
-        }
-        else
-        {
-            SelectedSub = SubItems.First();
-        }
+        SelectedSub = (_config.SubIndexId.IsNotEmpty()
+                        ? SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId)
+                        : null) ?? SubItems.LastOrDefault();
     }
 
     private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
@@ -732,7 +727,7 @@ public class ProfilesViewModel : MyReactiveObject
 
         _speedtestService ??= new SpeedtestService(_config, async (SpeedTestResult result) =>
         {
-            RxApp.MainThreadScheduler.Schedule(result, (scheduler, result) =>
+            RxSchedulers.MainThreadScheduler.Schedule(result, (scheduler, result) =>
             {
                 _ = SetSpeedTestResult(result);
                 return Disposable.Empty;

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

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

v2rayN/v2rayN.Desktop/Program.cs

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

v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml

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

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

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

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

@@ -128,25 +128,25 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
 
             AppEvents.SendSnackMsgRequested
               .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
               .Subscribe(async content => await DelegateSnackMsg(content))
               .DisposeWith(disposables);
 
             AppEvents.AppExitRequested
               .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
 
             AppEvents.ShutdownRequested
               .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
               .Subscribe(content => Shutdown(content))
               .DisposeWith(disposables);
 
             AppEvents.ShowHideWindowRequested
              .AsObservable()
-             .ObserveOn(RxApp.MainThreadScheduler)
+             .ObserveOn(RxSchedulers.MainThreadScheduler)
              .Subscribe(blShow => ShowHideWindow(blShow))
              .DisposeWith(disposables);
         });

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -410,19 +410,6 @@
                             Margin="{StaticResource Margin4}"
                             HorizontalAlignment="Left" />
 
-                        <TextBlock
-                            Grid.Row="6"
-                            Grid.Column="0"
-                            Margin="{StaticResource Margin4}"
-                            VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbSettingsEnableUpdateSubOnlyRemarksExist}" />
-                        <ToggleSwitch
-                            x:Name="togEnableUpdateSubOnlyRemarksExist"
-                            Grid.Row="6"
-                            Grid.Column="1"
-                            Margin="{StaticResource Margin4}"
-                            HorizontalAlignment="Left" />
-
                         <TextBlock
                             Grid.Row="8"
                             Grid.Column="0"

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

@@ -86,7 +86,6 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
             this.Bind(ViewModel, vm => vm.DisplayRealTimeSpeed, v => v.togDisplayRealTimeSpeed.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.EnableUpdateSubOnlyRemarksExist, v => v.togEnableUpdateSubOnlyRemarksExist.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoHideStartup, v => v.togAutoHideStartup.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Hide2TrayWhenClose, v => v.togHide2TrayWhenClose.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.MacOSShowInDock, v => v.togMacOSShowInDock.IsChecked).DisposeWith(disposables);

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

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

v2rayN/v2rayN/App.xaml.cs

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

v2rayN/v2rayN/GlobalUsings.cs

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

v2rayN/v2rayN/Views/ClashConnectionsView.xaml

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

v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs

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

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -34,8 +34,8 @@ public partial class DNSSettingWindow
             this.Bind(ViewModel, vm => vm.DirectDNS, v => v.cmbDirectDNS.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.RemoteDNS, v => v.cmbRemoteDNS.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.BootstrapDNS, v => v.cmbBootstrapDNS.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.Strategy4Freedom, v => v.cmbDirectDNSStrategy.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.Strategy4Proxy, v => v.cmbRemoteDNSStrategy.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Strategy4Freedom, v => v.cmbDirectDNSStrategy.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Strategy4Proxy, v => v.cmbRemoteDNSStrategy.SelectedItem).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Hosts, v => v.txtHosts.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.DirectExpectedIPs, v => v.cmbDirectExpectedIPs.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.ParallelQuery, v => v.togParallelQuery.IsChecked).DisposeWith(disposables);

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -127,25 +127,25 @@ public partial class MainWindow
 
             AppEvents.SendSnackMsgRequested
               .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
               .Subscribe(async content => await DelegateSnackMsg(content))
               .DisposeWith(disposables);
 
             AppEvents.AppExitRequested
               .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
+              .ObserveOn(RxSchedulers.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
 
             AppEvents.ShutdownRequested
              .AsObservable()
-             .ObserveOn(RxApp.MainThreadScheduler)
+             .ObserveOn(RxSchedulers.MainThreadScheduler)
              .Subscribe(content => Shutdown(content))
              .DisposeWith(disposables);
 
             AppEvents.ShowHideWindowRequested
              .AsObservable()
-             .ObserveOn(RxApp.MainThreadScheduler)
+             .ObserveOn(RxSchedulers.MainThreadScheduler)
              .Subscribe(blShow => ShowHideWindow(blShow))
              .DisposeWith(disposables);
         });

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -630,20 +630,6 @@
                             Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
-                        <TextBlock
-                            Grid.Row="6"
-                            Grid.Column="0"
-                            Margin="{StaticResource Margin8}"
-                            VerticalAlignment="Center"
-                            Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSettingsEnableUpdateSubOnlyRemarksExist}" />
-                        <ToggleButton
-                            x:Name="togEnableUpdateSubOnlyRemarksExist"
-                            Grid.Row="6"
-                            Grid.Column="1"
-                            Margin="{StaticResource Margin8}"
-                            HorizontalAlignment="Left" />
-
                         <TextBlock
                             Grid.Row="8"
                             Grid.Column="0"

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -91,7 +91,6 @@ public partial class OptionSettingWindow
             this.Bind(ViewModel, vm => vm.DisplayRealTimeSpeed, v => v.togDisplayRealTimeSpeed.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.EnableUpdateSubOnlyRemarksExist, v => v.togEnableUpdateSubOnlyRemarksExist.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoHideStartup, v => v.togAutoHideStartup.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.EnableDragDropSort, v => v.togEnableDragDropSort.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.DoubleClick2Activate, v => v.togDoubleClick2Activate.IsChecked).DisposeWith(disposables);

v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs

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

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

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

v2rayN/v2rayN/v2rayN.csproj

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