Fix

.github/workflows/build-linux.yml

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

v2rayN/Directory.Build.props

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

v2rayN/Directory.Packages.props

@@ -9,20 +9,20 @@
     <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.4.12" />
+    <PackageVersion Include="ReactiveUI.Avalonia" Version="11.3.8" />
     <PackageVersion Include="CliWrap" Version="3.10.0" />
-    <PackageVersion Include="Downloader" Version="5.1.0" />
+    <PackageVersion Include="Downloader" Version="4.1.1" />
     <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="23.1.8" />
+    <PackageVersion Include="ReactiveUI" Version="22.3.1" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
-    <PackageVersion Include="ReactiveUI.WPF" Version="23.1.8" />
+    <PackageVersion Include="ReactiveUI.WPF" Version="22.3.1" />
     <PackageVersion Include="Semi.Avalonia" Version="11.3.7.3" />
-    <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.2" />
+    <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.1" />
     <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.3" />
-    <PackageVersion Include="NLog" Version="6.1.1" />
+    <PackageVersion Include="NLog" Version="6.1.0" />
     <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/Handler/Builder/CoreConfigContextBuilder.cs

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

v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs

@@ -81,9 +81,7 @@ 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,7 +95,10 @@ public static class ConfigHandler
         config.GuiItem ??= new();
         config.MsgUIItem ??= new();
 
-        config.UiItem ??= new();
+        config.UiItem ??= new UIItem()
+        {
+            EnableUpdateSubOnlyRemarksExist = true
+        };
         config.UiItem.MainColumnItem ??= new();
         config.UiItem.WindowSizeItem ??= new();
 
@@ -151,7 +154,6 @@ public static class ConfigHandler
             DownMbps = 100
         };
         config.ClashUIItem ??= new();
-        config.ClashUIItem.ConnectionsColumnItem ??= new();
         config.SystemProxyItem ??= new();
         config.WebDavItem ??= new();
         config.CheckUpdateItem ??= new();
@@ -721,6 +723,8 @@ 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(),
         });
 
@@ -1067,8 +1071,8 @@ public static class ConfigHandler
 
         if (profileItem.StreamSecurity.IsNotEmpty())
         {
-            if (profileItem.StreamSecurity is not Global.StreamSecurity
+            if (profileItem.StreamSecurity != Global.StreamSecurity
-                 and not Global.StreamSecurityReality)
+                 && profileItem.StreamSecurity != Global.StreamSecurityReality)
             {
                 profileItem.StreamSecurity = string.Empty;
             }
@@ -1161,84 +1165,6 @@ 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
@@ -1438,7 +1364,6 @@ 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;
@@ -1744,7 +1669,7 @@ public static class ConfigHandler
         if (activeProfile != null)
         {
             var lstSub = await AppManager.Instance.ProfileItems(subid);
-            var existItem = FindMatchedProfileItem(lstSub, activeProfile);
+            var existItem = lstSub?.FirstOrDefault(t => config.UiItem.EnableUpdateSubOnlyRemarksExist ? t.Remarks == activeProfile.Remarks : CompareProfileItem(t, activeProfile, true));
             if (existItem != null)
             {
                 await ConfigHandler.SetDefaultServerIndex(config, existItem.IndexId);
@@ -1757,7 +1682,7 @@ public static class ConfigHandler
             var lstSub = await AppManager.Instance.ProfileItems(subid);
             foreach (var item in lstSub)
             {
-                var existItem = FindMatchedProfileItem(lstOriSub, item);
+                var existItem = lstOriSub?.FirstOrDefault(t => config.UiItem.EnableUpdateSubOnlyRemarksExist ? t.Remarks == item.Remarks : CompareProfileItem(t, item, true));
                 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 (context.RunCoreType == ECoreType.sing_box)
+        else if (AppManager.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
         {
             result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
         }
@@ -128,11 +128,12 @@ 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 (context.RunCoreType == ECoreType.sing_box)
+        if (AppManager.Instance.GetCoreType(node, node.ConfigType) == 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 = context.RunCoreType;
+        var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
         var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
         return await RunProcess(coreInfo, fileName, true, false);
     }

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -87,6 +87,7 @@ 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;
@@ -207,7 +208,6 @@ 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 ProfileItem Profile { get; set; }
+    public required ProfileItem Profile { get; set; }
     public ECoreType CoreType { get; set; }
 }

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -28,7 +28,6 @@ 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

@@ -362,7 +362,6 @@ 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

@@ -3394,7 +3394,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Process (Linux/Windows) 的本地化字符串。
+        ///   查找类似 Process (Tun mode) 的本地化字符串。
         /// </summary>
         public static string TbRoutingRuleProcess {
             get {
@@ -3834,6 +3834,15 @@ 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 (Linux/Windows)</value>
+    <value>Process (Tun mode)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP or IP CIDR</value>
@@ -1098,6 +1098,9 @@
   <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 (Linux/Windows)</value>
+    <value>Process (Tun mode)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP ou IP CIDR</value>
@@ -1095,6 +1095,9 @@
   <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>

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 (Linux/Windows)</value>
+    <value>Process (Tun mode)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP vagy IP CIDR</value>
@@ -1098,6 +1098,9 @@
   <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 (Linux/Windows)</value>
+    <value>Process (Tun mode)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP or IP CIDR</value>
@@ -1098,6 +1098,9 @@
   <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 (Linux/Windows)</value>
+    <value>Process (Tun mode)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP-адрес или сеть CIDR</value>
@@ -1098,6 +1098,9 @@
   <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>进程 (Linux/Windows)</value>
+    <value>进程 (Tun 模式)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP 或 IP CIDR</value>
@@ -1095,6 +1095,9 @@
   <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>行程 (Linux/Windows)</value>
+    <value>行程 (Tun 模式)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP 或 IP CIDR</value>
@@ -1095,6 +1095,9 @@
   <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>
@@ -1306,7 +1309,7 @@
     <value>安裝字體到系統中，選擇或填入字體名稱，重新啟動後生效</value>
   </data>
   <data name="menuExitTips" xml:space="preserve">
-    <value>確定要退出嗎？</value>
+    <value>是否確定退出？</value>
   </data>
   <data name="LvMemo" xml:space="preserve">
     <value>備註備忘</value>
@@ -1492,13 +1495,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>
@@ -1588,82 +1591,82 @@
     <value>EchForceQuery</value>
   </data>
   <data name="TbFullCertTips" xml:space="preserve">
-    <value>完整憑證（鏈），PEM 格式</value>
+    <value>Full certificate (chain), PEM format</value>
   </data>
   <data name="TbCertSha256Tips" xml:space="preserve">
-    <value>憑證指紋（SHA-256）</value>
+    <value>Certificate fingerprint (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>并行查詢</value>
+    <value>Parallel Query</value>
   </data>
   <data name="TbDomesticDNSTips" xml:space="preserve">
-    <value>預設僅在路由期間進行解析時調用</value>
+    <value>By default, invoked only during routing for resolution</value>
   </data>
   <data name="TbRemoteDNSTips" xml:space="preserve">
-    <value>預設僅在路由期間進行解析時調用；請確保遠端伺服器能連線至此 DNS</value>
+    <value>By default, invoked only during routing for resolution; ensure the remote server can reach this DNS</value>
   </data>
   <data name="TbDirectResolveStrategyTips" xml:space="preserve">
-    <value>若未設定或為 "AsIs"，使用系統 DNS 解析；否則將使用內建 DNS 模組。</value>
+    <value>If unset or "AsIs", DNS resolution uses the system DNS; otherwise, the internal DNS module is used.</value>
   </data>
   <data name="TbRemoteResolveStrategyTips" xml:space="preserve">
-    <value>若未設定或為 "AsIs"，由遠端伺服器的 DNS 解析；否則將使用內建 DNS 模組。</value>
+    <value>If unset or "AsIs", DNS resolution is performed by the remote server's DNS; otherwise, the internal DNS module is used.</value>
   </data>
   <data name="TbHopInt7" xml:space="preserve">
-    <value>連接埠跳轉間隔</value>
+    <value>Port hopping interval</value>
   </data>
   <data name="menuServerListPreview" xml:space="preserve">
-    <value>子配置項預覽</value>
+    <value>Configuration item preview</value>
   </data>
   <data name="TbFinalmask" xml:space="preserve">
     <value>Finalmask</value>
   </data>
   <data name="MsgRoutingRuleOutboundNodeWarning" xml:space="preserve">
-    <value>路由規則 {0} 的出站節點 {1} 發出警告：{2}</value>
+    <value>Routing rule {0} outbound node {1} warning: {2}</value>
   </data>
   <data name="MsgRoutingRuleOutboundNodeError" xml:space="preserve">
-    <value>路由規則 {0} 的出站節點 {1} 發生錯誤：{2}。已回退為僅使用代理節點。</value>
+    <value>Routing rule {0} outbound node {1} error: {2}. Fallback to proxy node only.</value>
   </data>
   <data name="MsgGroupCycleDependency" xml:space="preserve">
-    <value>節點組 {0} 與子節點 {1} 存在循環依賴。已跳過此節點。</value>
+    <value>Group {0} has a cycle dependency on child node {1}. Skipping this node.</value>
   </data>
   <data name="MsgGroupChildNodeWarning" xml:space="preserve">
-    <value>節點組 {0} 的子節點 {1} 發出警告：{2}</value>
+    <value>Group {0} child node {1} warning: {2}</value>
   </data>
   <data name="MsgGroupChildNodeError" xml:space="preserve">
-    <value>節點組 {0} 的子節點 {1} 發生錯誤：{2}。已跳過此節點。</value>
+    <value>Group {0} child node {1} error: {2}. Skipping this node.</value>
   </data>
   <data name="MsgGroupChildGroupNodeWarning" xml:space="preserve">
-    <value>節點組 {0} 的子節點組 {1} 發出警告：{2}</value>
+    <value>Group {0} child group node {1} warning: {2}</value>
   </data>
   <data name="MsgGroupChildGroupNodeError" xml:space="preserve">
-    <value>節點組 {0} 的子節點組 {1} 發生錯誤：{2}。已跳過此節點。</value>
+    <value>Group {0} child group node {1} error: {2}. Skipping this node.</value>
   </data>
   <data name="MsgGroupNoValidChildNode" xml:space="preserve">
-    <value>節點組 {0} 沒有可用的有效子節點。</value>
+    <value>Group {0} has no valid child node.</value>
   </data>
   <data name="MsgRoutingRuleEmptyOutboundTag" xml:space="preserve">
-    <value>路由規則 {0} 的出站標籤為空。已回退為僅使用代理節點。</value>
+    <value>Routing rule {0} has an empty outbound tag. Fallback to proxy node only.</value>
   </data>
   <data name="MsgRoutingRuleOutboundNodeNotFound" xml:space="preserve">
-    <value>找不到路由規則 {0} 的出站節點 {1}。已回退為僅使用代理節點。</value>
+    <value>Routing rule {0} outbound node {1} not found. Fallback to proxy node only.</value>
   </data>
   <data name="MsgSubscriptionPrevProfileNotFound" xml:space="preserve">
-    <value>找不到訂閱的前一個代理 {0}。已跳過。</value>
+    <value>Subscription previous proxy {0} not found. Skipping.</value>
   </data>
   <data name="MsgSubscriptionNextProfileNotFound" xml:space="preserve">
-    <value>找不到訂閱的下一個代理 {0}。已跳過。</value>
+    <value>Subscription next proxy {0} not found. Skipping.</value>
   </data>
   <data name="menuGenGroupServer" xml:space="preserve">
-    <value>生成策略組</value>
+    <value>Generate Policy Group</value>
   </data>
   <data name="menuAllServers" xml:space="preserve">
-    <value>所有配置項</value>
+    <value>All configurations</value>
   </data>
   <data name="menuGenRegionGroup" xml:space="preserve">
-    <value>按區域分組</value>
+    <value>Group by Region</value>
   </data>
   <data name="TbUot" xml:space="preserve">
     <value>UDP over TCP</value>

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

@@ -93,23 +93,7 @@ public partial class CoreConfigSingboxService
 
         foreach (var kvp in Utils.ParseHostsToDictionary(simpleDnsItem.Hosts))
         {
-            // only allow full match
+            hostsDns.predefined[kvp.Key] = kvp.Value.Where(Utils.IsIpAddress).ToList();
-            // 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)
@@ -195,33 +179,20 @@ public partial class CoreConfigSingboxService
         foreach (var kvp in Utils.ParseHostsToDictionary(simpleDnsItem.Hosts))
         {
             var predefined = kvp.Value.First();
-            if (predefined.IsNullOrEmpty())
+            if (predefined.IsNullOrEmpty() || Utils.IsIpAddress(predefined))
             {
                 continue;
             }
-            var rule = new Rule4Sbox()
-            {
-                query_type = [1, 5, 28], // A, CNAME and AAAA
-                action = "predefined",
-                rcode = "NOERROR",
-            };
-            if (!ParseV2Domain(kvp.Key, 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
+                // 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",
@@ -230,31 +201,23 @@ public partial class CoreConfigSingboxService
                         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;
             }
+            // CNAME record
+            Rule4Sbox rule = new()
+            {
+                query_type = [1, 28],
+                action = "predefined",
+                rcode = "NOERROR",
+                answer = [$"*. IN CNAME {predefined}."],
+            };
+            if (ParseV2Domain(kvp.Key, rule))
+            {
                 _coreConfig.dns.rules.Add(rule);
             }
+        }
 
         if (simpleDnsItem.BlockBindingQuery == true)
         {
@@ -470,11 +433,7 @@ public partial class CoreConfigSingboxService
         localDnsServer.tag = tag;
 
         dns4Sbox.servers.Add(localDnsServer);
-        var protectDomainRule = BuildProtectDomainRule();
+        dns4Sbox.rules.Insert(0, BuildProtectDomainRule());
-        if (protectDomainRule != null)
-        {
-            dns4Sbox.rules.Insert(0, protectDomainRule);
-        }
 
         _coreConfig.dns = dns4Sbox;
     }
@@ -496,12 +455,8 @@ public partial class CoreConfigSingboxService
         _coreConfig.dns?.servers?.Add(localDnsServer);
     }
 
-    private Rule4Sbox? BuildProtectDomainRule()
+    private Rule4Sbox BuildProtectDomainRule()
     {
-        if (context.ProtectDomainList.Count == 0)
-        {
-            return null;
-        }
         return new()
         {
             server = Global.SingboxLocalDNSTag,

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

@@ -84,58 +84,11 @@ public partial class CoreConfigSingboxService
             }
             if (hostsDomains.Count > 0)
             {
-                var hostsResolveRule = new Rule4Sbox
+                _coreConfig.route.rules.Add(new()
                 {
                     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()
@@ -402,11 +355,6 @@ 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,7 +301,6 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
             GenLog();
             _coreConfig.outbounds.Clear();
             GenOutbounds();
-            GenStatistic();
 
             var protectNode = new ProfileItem()
             {
@@ -316,36 +315,29 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
                 SsMethod = Global.None,
             });
 
-            foreach (var outbound in _coreConfig.outbounds
+            foreach (var outbound in _coreConfig.outbounds.Where(outbound => outbound.streamSettings?.sockopt?.dialerProxy?.IsNullOrEmpty() ?? true))
-                .Where(o => o.streamSettings?.sockopt?.dialerProxy?.IsNullOrEmpty() ?? true))
             {
-                outbound.streamSettings ??= new();
+                outbound.streamSettings ??= new StreamSettings4Ray();
-                outbound.streamSettings.sockopt ??= new();
+                outbound.streamSettings.sockopt ??= new Sockopt4Ray();
-                outbound.streamSettings.sockopt.dialerProxy = "tun-protect-ss";
+                outbound.streamSettings.sockopt.dialerProxy = "tun-project-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-protect-ss"));
+            }).BuildProxyOutbound("tun-project-ss"));
 
-            _coreConfig.routing.rules ??= [];
             var hasBalancer = _coreConfig.routing.balancers is { Count: > 0 };
-            _coreConfig.routing.rules.Add(new()
+            _coreConfig.routing.rules =
+            [
+                new()
                 {
-                inboundTag = ["proxy-relay-ss"],
+                    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.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 = obj;
+            _coreConfig.dns = JsonUtils.Deserialize<Dns4Ray>(JsonUtils.Serialize(obj));
         }
         catch (Exception ex)
         {

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -363,36 +363,44 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         var geoipFiles = new List<string>();
         var geoSiteFiles = new List<string>();
 
-        // Collect from routing rules
+        //Collect used files list
         var routingItems = await AppManager.Instance.RoutingItems();
         foreach (var routing in routingItems)
         {
             var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet);
             foreach (var item in rules ?? [])
             {
-                AddPrefixedItems(item.Ip, "geoip:", geoipFiles);
+                foreach (var ip in item.Ip ?? [])
-                AddPrefixedItems(item.Domain, "geosite:", geoSiteFiles);
-            }
-        }
-
-        // Collect from DNS configuration
-        var dnsItem = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
-        if (dnsItem != null)
                 {
-            ExtractDnsRuleSets(dnsItem.NormalDNS, geoipFiles, geoSiteFiles);
+                    var prefix = "geoip:";
-            ExtractDnsRuleSets(dnsItem.TunDNS, geoipFiles, geoSiteFiles);
+                    if (ip.StartsWith(prefix))
+                    {
+                        geoipFiles.Add(ip.Substring(prefix.Length));
+                    }
                 }
 
-        // Append default items
+                foreach (var domain in item.Domain ?? [])
-        geoSiteFiles.AddRange(["google", "cn", "geolocation-cn", "category-ads-all"]);
+                {
+                    var prefix = "geosite:";
+                    if (domain.StartsWith(prefix))
+                    {
+                        geoSiteFiles.Add(domain.Substring(prefix.Length));
+                    }
+                }
+            }
+        }
+
+        //append dns items TODO
+        geoSiteFiles.Add("google");
+        geoSiteFiles.Add("cn");
+        geoSiteFiles.Add("geolocation-cn");
+        geoSiteFiles.Add("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);
@@ -404,63 +412,6 @@ 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; }
@@ -122,8 +122,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;
+        UpMbps = protocolExtra?.UpMbps ?? _config.HysteriaItem.UpMbps;
-        DownMbps = protocolExtra?.DownMbps;
+        DownMbps = protocolExtra?.DownMbps ?? _config.HysteriaItem.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;
@@ -187,8 +187,8 @@ public class AddServerViewModel : MyReactiveObject
             AlterId = AlterId > 0 ? AlterId.ToString() : null,
             Flow = Flow.NullIfEmpty(),
             SalamanderPass = SalamanderPass.NullIfEmpty(),
-            UpMbps = UpMbps,
+            UpMbps = UpMbps >= 0 ? UpMbps : null,
-            DownMbps = DownMbps,
+            DownMbps = DownMbps >= 0 ? DownMbps : null,
             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)
     {
-        RxSchedulers.MainThreadScheduler.Schedule(blReload, (scheduler, blReload) =>
+        RxApp.MainThreadScheduler.Schedule(blReload, (scheduler, blReload) =>
         {
             _ = UpdateFinishedResult(blReload);
             return Disposable.Empty;
@@ -317,7 +317,7 @@ public class CheckUpdateViewModel : MyReactiveObject
             Remarks = msg,
         };
 
-        RxSchedulers.MainThreadScheduler.Schedule(item, (scheduler, model) =>
+        RxApp.MainThreadScheduler.Schedule(item, (scheduler, model) =>
         {
             _ = UpdateViewResult(model);
             return Disposable.Empty;

v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs

@@ -56,7 +56,7 @@ public class ClashConnectionsViewModel : MyReactiveObject
             return;
         }
 
-        RxSchedulers.MainThreadScheduler.Schedule(ret?.connections, (scheduler, model) =>
+        RxApp.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(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async _ => await ProxiesReload());
 
         #endregion AppEvents
@@ -173,7 +173,7 @@ public class ClashProxiesViewModel : MyReactiveObject
 
         if (refreshUI)
         {
-            RxSchedulers.MainThreadScheduler.Schedule(() => _ = RefreshProxyGroups());
+            RxApp.MainThreadScheduler.Schedule(() => _ = RefreshProxyGroups());
         }
     }
 
@@ -387,7 +387,7 @@ public class ClashProxiesViewModel : MyReactiveObject
             }
 
             var model = new SpeedTestResult() { IndexId = item.Name, Delay = result };
-            RxSchedulers.MainThreadScheduler.Schedule(model, (scheduler, model) =>
+            RxApp.MainThreadScheduler.Schedule(model, (scheduler, model) =>
             {
                 _ = ProxiesDelayTestResult(model);
                 return Disposable.Empty;

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -233,22 +233,22 @@ public class MainWindowViewModel : MyReactiveObject
 
         AppEvents.ReloadRequested
             .AsObservable()
-            .ObserveOn(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async _ => await Reload());
 
         AppEvents.AddServerViaScanRequested
             .AsObservable()
-            .ObserveOn(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async _ => await AddServerViaScanAsync());
 
         AppEvents.AddServerViaClipboardRequested
             .AsObservable()
-            .ObserveOn(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async _ => await AddServerViaClipboardAsync(null));
 
         AppEvents.SubscriptionsUpdateRequested
             .AsObservable()
-            .ObserveOn(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async blProxy => await UpdateSubscriptionProcess("", blProxy));
 
         #endregion AppEvents
@@ -588,7 +588,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     private void ReloadResult(bool showClashUI)
     {
-        RxSchedulers.MainThreadScheduler.Schedule(() =>
+        RxApp.MainThreadScheduler.Schedule(() =>
         {
             ShowClashUI = showClashUI;
             TabMainSelectedIndex = showClashUI ? TabMainSelectedIndex : 0;
@@ -597,7 +597,7 @@ public class MainWindowViewModel : MyReactiveObject
 
     private void SetReloadEnabled(bool enabled)
     {
-        RxSchedulers.MainThreadScheduler.Schedule(() => BlReloadEnabled = enabled);
+        RxApp.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(RxSchedulers.MainThreadScheduler)
+         //.ObserveOn(RxApp.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 hyUpMbps { get; set; }
-    [Reactive] public int? hyDownMbps { get; set; }
+    [Reactive] public int hyDownMbps { get; set; }
     [Reactive] public bool enableFragment { get; set; }
 
     #endregion Core
@@ -47,6 +47,7 @@ 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; }
@@ -179,6 +180,7 @@ 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;
@@ -334,8 +336,8 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.CoreBasicItem.DefUserAgent = defUserAgent;
         _config.Mux4SboxItem.Protocol = mux4SboxProtocol;
         _config.CoreBasicItem.EnableCacheFile4Sbox = enableCacheFile4Sbox;
-        _config.HysteriaItem.UpMbps = hyUpMbps ?? 0;
+        _config.HysteriaItem.UpMbps = hyUpMbps;
-        _config.HysteriaItem.DownMbps = hyDownMbps ?? 0;
+        _config.HysteriaItem.DownMbps = hyDownMbps;
         _config.CoreBasicItem.EnableFragment = enableFragment;
 
         _config.GuiItem.AutoRun = AutoRun;
@@ -343,6 +345,7 @@ 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,9 +188,14 @@ public class ProfilesSelectViewModel : MyReactiveObject
         {
             SubItems.Add(item);
         }
-        SelectedSub = (_config.SubIndexId.IsNotEmpty()
+        if (_subIndexId != null && SubItems.FirstOrDefault(t => t.Id == _subIndexId) != null)
-                        ? SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId)
+        {
-                        : null) ?? SubItems.LastOrDefault();
+            SelectedSub = SubItems.FirstOrDefault(t => t.Id == _subIndexId);
+        }
+        else
+        {
+            SelectedSub = SubItems.First();
+        }
     }
 
     private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -228,22 +228,22 @@ public class ProfilesViewModel : MyReactiveObject
 
         AppEvents.ProfilesRefreshRequested
             .AsObservable()
-            .ObserveOn(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async _ => await RefreshServersBiz());
 
         AppEvents.SubscriptionsRefreshRequested
             .AsObservable()
-            .ObserveOn(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async _ => await RefreshSubscriptions());
 
         AppEvents.DispatcherStatisticsRequested
             .AsObservable()
-            .ObserveOn(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async result => await UpdateStatistics(result));
 
         AppEvents.SetDefaultServerRequested
             .AsObservable()
-            .ObserveOn(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async indexId => await SetDefaultServer(indexId));
 
         #endregion AppEvents
@@ -391,9 +391,14 @@ public class ProfilesViewModel : MyReactiveObject
         {
             SubItems.Add(item);
         }
-        SelectedSub = (_config.SubIndexId.IsNotEmpty()
+        if (_config.SubIndexId != null && SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId) != null)
-                        ? SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId)
+        {
-                        : null) ?? SubItems.LastOrDefault();
+            SelectedSub = SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId);
+        }
+        else
+        {
+            SelectedSub = SubItems.First();
+        }
     }
 
     private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
@@ -727,7 +732,7 @@ public class ProfilesViewModel : MyReactiveObject
 
         _speedtestService ??= new SpeedtestService(_config, async (SpeedTestResult result) =>
         {
-            RxSchedulers.MainThreadScheduler.Schedule(result, (scheduler, result) =>
+            RxApp.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(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async result => await UpdateStatistics(result));
 
         AppEvents.RoutingsMenuRefreshRequested
             .AsObservable()
-            .ObserveOn(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async _ => await RefreshRoutingsMenu());
 
         AppEvents.TestServerRequested
             .AsObservable()
-            .ObserveOn(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async _ => await TestServerAvailability());
 
         AppEvents.InboundDisplayRequested
             .AsObservable()
-            .ObserveOn(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async _ => await InboundDisplayStatus());
 
         AppEvents.SysProxyChangeRequested
             .AsObservable()
-            .ObserveOn(RxSchedulers.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
             .Subscribe(async result => await SetListenerType(result));
 
         #endregion AppEvents
@@ -243,7 +243,7 @@ public class StatusBarViewModel : MyReactiveObject
         {
             AppEvents.ProfilesRefreshRequested
               .AsObservable()
-              .ObserveOn(RxSchedulers.MainThreadScheduler)
+              .ObserveOn(RxApp.MainThreadScheduler)
               .Subscribe(async _ => await RefreshServersBiz()); //.DisposeWith(_disposables);
         }
     }
@@ -362,7 +362,7 @@ public class StatusBarViewModel : MyReactiveObject
 
     private async Task TestServerAvailabilitySub(string msg)
     {
-        RxSchedulers.MainThreadScheduler.Schedule(msg, (scheduler, msg) =>
+        RxApp.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,28 +74,23 @@
                 <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,15 +2,9 @@ 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;
 
@@ -25,15 +19,7 @@ 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)
@@ -65,74 +51,4 @@ 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

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

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -410,6 +410,19 @@
                             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,6 +86,7 @@ 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,7 +7,6 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
 {
     private static Config _config;
     private Window? _window;
-    private static readonly string _tag = "ProfilesView";
 
     public ProfilesView()
     {
@@ -90,13 +89,13 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
 
             AppEvents.AppExitRequested
               .AsObservable()
-              .ObserveOn(RxSchedulers.MainThreadScheduler)
+              .ObserveOn(RxApp.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
 
             AppEvents.AdjustMainLvColWidthRequested
                 .AsObservable()
-                .ObserveOn(RxSchedulers.MainThreadScheduler)
+                .ObserveOn(RxApp.MainThreadScheduler)
                 .Subscribe(_ => AutofitColumnWidth())
                 .DisposeWith(disposables);
         });
@@ -382,7 +381,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
         }
         catch (Exception ex)
         {
-            Logging.SaveLog(_tag, ex);
+            Logging.SaveLog("ProfilesView", ex);
         }
     }
 
@@ -399,8 +398,6 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
     #region UI
 
     private void RestoreUI()
-    {
-        try
     {
         var lvColumnItem = _config.UiItem.MainColumnItem.OrderBy(t => t.Index).ToList();
         var displayIndex = 0;
@@ -431,15 +428,8 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
             }
         }
     }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-    }
 
     private void StorageUI()
-    {
-        try
     {
         List<ColumnItem> lvColumnItem = new();
         foreach (var item2 in lstProfiles.Columns)
@@ -457,11 +447,6 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
         }
         _config.UiItem.MainColumnItem = lvColumnItem;
     }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-    }
 
     #endregion UI
 

v2rayN/v2rayN/App.xaml.cs

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

v2rayN/v2rayN/GlobalUsings.cs

@@ -20,7 +20,6 @@ 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,7 +2,6 @@
     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"
@@ -79,30 +78,25 @@
                 </ContextMenu>
             </DataGrid.ContextMenu>
             <DataGrid.Columns>
-                <base:MyDGTextColumn
+                <DataGridTextColumn
                     Width="300"
                     Binding="{Binding Host}"
-                    ExName="Host"
                     Header="{x:Static resx:ResUI.TbSortingHost}" />
-                <base:MyDGTextColumn
+                <DataGridTextColumn
                     Width="500"
                     Binding="{Binding Chain}"
-                    ExName="Chain"
                     Header="{x:Static resx:ResUI.TbSortingChain}" />
-                <base:MyDGTextColumn
+                <DataGridTextColumn
                     Width="80"
                     Binding="{Binding Network}"
-                    ExName="Network"
                     Header="{x:Static resx:ResUI.TbSortingNetwork}" />
-                <base:MyDGTextColumn
+                <DataGridTextColumn
                     Width="160"
                     Binding="{Binding Type}"
-                    ExName="Type"
                     Header="{x:Static resx:ResUI.TbSortingType}" />
-                <base:MyDGTextColumn
+                <DataGridTextColumn
                     Width="100"
                     Binding="{Binding Elapsed}"
-                    ExName="Elapsed"
                     Header="{x:Static resx:ResUI.TbSortingTime}" />
             </DataGrid.Columns>
         </DataGrid>

v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs

@@ -1,5 +1,4 @@
 using System.Windows.Controls;
-using v2rayN.Base;
 
 namespace v2rayN.Views;
 
@@ -8,14 +7,9 @@ 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;
 
@@ -30,15 +24,7 @@ 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)
@@ -62,7 +48,7 @@ public partial class ClashConnectionsView
         }
         catch (Exception ex)
         {
-            Logging.SaveLog(_tag, ex);
+            Logging.SaveLog("ClashConnectionsView", ex);
         }
     }
 
@@ -70,71 +56,4 @@ 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.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Strategy4Freedom, v => v.cmbDirectDNSStrategy.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.Strategy4Proxy, v => v.cmbRemoteDNSStrategy.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.Strategy4Proxy, v => v.cmbRemoteDNSStrategy.Text).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

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

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

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

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -10,7 +10,6 @@ namespace v2rayN.Views;
 public partial class ProfilesView
 {
     private static Config _config;
-    private static readonly string _tag = "ProfilesView";
 
     public ProfilesView()
     {
@@ -84,13 +83,13 @@ public partial class ProfilesView
 
             AppEvents.AppExitRequested
               .AsObservable()
-              .ObserveOn(RxSchedulers.MainThreadScheduler)
+              .ObserveOn(RxApp.MainThreadScheduler)
               .Subscribe(_ => StorageUI())
               .DisposeWith(disposables);
 
             AppEvents.AdjustMainLvColWidthRequested
                 .AsObservable()
-                .ObserveOn(RxSchedulers.MainThreadScheduler)
+                .ObserveOn(RxApp.MainThreadScheduler)
                 .Subscribe(_ => AutofitColumnWidth())
                 .DisposeWith(disposables);
         });
@@ -233,7 +232,8 @@ public partial class ProfilesView
 
     private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
     {
-        if (sender is not DataGridColumnHeader colHeader || colHeader.TabIndex < 0 || colHeader.Column == null)
+        var colHeader = sender as DataGridColumnHeader;
+        if (colHeader == null || colHeader.TabIndex < 0 || colHeader.Column == null)
         {
             return;
         }
@@ -339,7 +339,7 @@ public partial class ProfilesView
         }
         catch (Exception ex)
         {
-            Logging.SaveLog(_tag, ex);
+            Logging.SaveLog("ProfilesView", ex);
         }
     }
 
@@ -356,14 +356,12 @@ public partial class ProfilesView
     #region UI
 
     private void RestoreUI()
-    {
-        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.Cast<MyDGTextColumn>())
+            foreach (MyDGTextColumn item2 in lstProfiles.Columns)
             {
                 if (item2.ExName == item.Name)
                 {
@@ -384,19 +382,13 @@ public partial class ProfilesView
             }
         }
     }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-    }
 
     private void StorageUI()
-    {
-        try
     {
         List<ColumnItem> lvColumnItem = new();
-            foreach (var item2 in lstProfiles.Columns.Cast<MyDGTextColumn>())
+        foreach (var t in lstProfiles.Columns)
         {
+            var item2 = (MyDGTextColumn)t;
             lvColumnItem.Add(new()
             {
                 Name = item2.ExName,
@@ -406,11 +398,6 @@ public partial class ProfilesView
         }
         _config.UiItem.MainColumnItem = lvColumnItem;
     }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-    }
 
     #endregion UI
 
@@ -418,7 +405,7 @@ public partial class ProfilesView
 
     private Point startPoint = new();
     private int startIndex = -1;
-    private readonly string formatData = "ProfileItemModel";
+    private 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.19041.0</TargetFramework>
+		<TargetFramework>net8.0-windows10.0.17763</TargetFramework>
 		<GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
 		<UseWPF>true</UseWPF>
 		<ApplicationIcon>Resources\v2rayN.ico</ApplicationIcon>