up 7.19.3

Code cleanup: pattern matching and minor fixes
Refactor SRS rule collection and add DNS parsing
2026-03-22 16:30:35 +05:00 · 2026-03-10 17:38:03 +08:00 · 2026-03-10 17:19:21 +08:00 · 2026-03-10 15:29:36 +08:00 · 2026-03-10 14:10:23 +08:00 · 2026-03-10 09:16:16 +08:00
31 changed files with 574 additions and 219 deletions
--- a/.github/workflows/build-linux.yml
+++ b/.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'

--- a/.github/workflows/build-osx.yml
+++ b/.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'

--- a/.github/workflows/build-windows-desktop.yml
+++ b/.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'

--- a/.github/workflows/build-windows.yml
+++ b/.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'

--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>

    <PropertyGroup>
-        <Version>7.19.1</Version>
+        <Version>7.19.3</Version>
    </PropertyGroup>

    <PropertyGroup>
--- a/v2rayN/ServiceLib/Global.cs
+++ b/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,
--- a/v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs
+++ b/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
--- a/v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs
+++ b/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))
            {
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -154,6 +154,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 +232,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 +723,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 +1040,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;
            }
@@ -1331,6 +1331,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;
--- a/v2rayN/ServiceLib/Handler/CoreConfigHandler.cs
+++ b/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);
        }
--- a/v2rayN/ServiceLib/Manager/CoreManager.cs
+++ b/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);
    }
--- a/v2rayN/ServiceLib/Models/ConfigItems.cs
+++ b/v2rayN/ServiceLib/Models/ConfigItems.cs
@@ -208,6 +208,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]
--- a/v2rayN/ServiceLib/Models/ServerTestItem.cs
+++ b/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; }
 }
--- a/v2rayN/ServiceLib/Models/SingboxConfig.cs
+++ b/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; }
 }
--- a/v2rayN/ServiceLib/Models/V2rayConfig.cs
+++ b/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
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/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>
@@ -1309,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>
@@ -1495,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>
@@ -1591,81 +1591,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>
--- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
+++ b/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)
--- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs
+++ b/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 ??= [];
--- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs
+++ b/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
--- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs
+++ b/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)
        {
--- a/v2rayN/ServiceLib/Services/UpdateService.cs
+++ b/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)
--- a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs
+++ b/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(),
--- a/v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
+++ b/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
@@ -336,8 +336,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;
--- a/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml
+++ b/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>
--- a/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs
+++ b/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(RxApp.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
 }
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/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()
    {
@@ -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
--- a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
+++ b/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>
--- a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs
+++ b/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(RxApp.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
 }
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
+++ b/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);
--- a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs
+++ b/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;
        }
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
+++ b/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()
    {
@@ -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
Author	SHA1	Message	Date
2dust	06cec89ec9	up 7.19.3	2026-03-10 17:38:03 +08:00
2dust	26f65dd3b2	Code cleanup: pattern matching and minor fixes	2026-03-10 17:19:21 +08:00
2dust	0c2114d2e1	Refactor SRS rule collection and add DNS parsing	2026-03-10 15:29:36 +08:00
DHR60	4af528f8e2	Typo (#8917 )	2026-03-10 14:10:23 +08:00
DHR60	588e82f0d9	Tun ech protect (#8915 )	2026-03-10 09:16:16 +08:00
DHR60	0c13488410	Fix (#8914 ) * Fix * Fix	2026-03-10 09:14:57 +08:00
DHR60	a88396c11d	Fix custom config sub chain (#8913 )	2026-03-10 09:13:52 +08:00
DHR60	ef5fee9975	Fix (#8909 )	2026-03-08 19:00:27 +08:00
2dust	df800a60c2	Persist DataGrid column layout for ClashConnectionsView	2026-03-08 18:59:56 +08:00
2dust	679bd8afcc	Persist DataGrid column layout for ClashConnectionsView https://github.com/2dust/v2rayN/issues/8893	2026-03-08 17:57:09 +08:00
DHR60	66e1aeae1f	Fix speedtest core type (#8900 ) * Fix speedtest core type * Simplify code	2026-03-07 16:36:03 +08:00
dependabot[bot]	e03c22092f	Bump actions/setup-dotnet from 5.0.1 to 5.2.0 (#8891 ) Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 5.0.1 to 5.2.0. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v5.0.1...v5.2.0) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-version: 5.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-03-07 16:33:41 +08:00
2dust	c0aa829abb	up 7.19.2	2026-03-05 09:49:46 +08:00
DHR60	b8f7cc0768	Fix hosts matching (#8890 ) * Fix hosts matching * Fix hosts resolve rule * Fix	2026-03-04 20:13:06 +08:00
2dust	81da72bb39	Fix https://github.com/2dust/v2rayN/issues/8881	2026-03-04 19:11:31 +08:00
2dust	d9201157c8	Bug fix https://github.com/2dust/v2rayN/issues/8875	2026-03-04 18:58:59 +08:00
2dust	e179d5bc42	Fix https://github.com/2dust/v2rayN/issues/8870	2026-03-03 16:03:23 +08:00
2dust	4d2f32099e	Bug fix https://github.com/2dust/v2rayN/issues/8879	2026-03-03 10:07:48 +08:00
2dust	f24a79aa2c	Bug fix https://github.com/2dust/v2rayN/issues/8875	2026-03-02 20:18:07 +08:00
2dust	9a3604e89b	Bug fix https://github.com/2dust/v2rayN/issues/8874	2026-03-02 20:00:02 +08:00
DHR60	fd7cf0d453	Fix xray custom dns (#8872 )	2026-03-02 19:46:01 +08:00
tt2563	65cf782eb0	更新繁體中文翻譯 (#8873 ) Co-authored-by: ertet <sfsa@sdaf.cc>	2026-03-02 19:44:53 +08:00