Merge 1ef2471fa2 into aea7078e95

* Refactor core config gen

* Update tag naming

* Support sing-box 1.11 DNS

* Fix

* Optimize ProfileItem acquisition speed

* Fix

* Fix

v2rayN/ServiceLib/Manager/CertPemManager.cs

@@ -215,7 +215,7 @@ public class CertPemManager
             using var client = new TcpClient();
             await client.ConnectAsync(domain, port > 0 ? port : 443, cts.Token);
 
-            using var ssl = new SslStream(client.GetStream(), false, ValidateServerCertificate);
+            await using var ssl = new SslStream(client.GetStream(), false, ValidateServerCertificate);
 
             var sslOptions = new SslClientAuthenticationOptions
             {
@@ -262,7 +262,7 @@ public class CertPemManager
             using var client = new TcpClient();
             await client.ConnectAsync(domain, port > 0 ? port : 443, cts.Token);
 
-            using var ssl = new SslStream(client.GetStream(), false, ValidateServerCertificate);
+            await using var ssl = new SslStream(client.GetStream(), false, ValidateServerCertificate);
 
             var sslOptions = new SslClientAuthenticationOptions
             {
@@ -280,11 +280,7 @@ public class CertPemManager
             var chain = new X509Chain();
             chain.Build(certChain);
 
-            foreach (var element in chain.ChainElements)
+            pemList.AddRange(chain.ChainElements.Select(element => ExportCertToPem(element.Certificate)));
-            {
-                var pem = ExportCertToPem(element.Certificate);
-                pemList.Add(pem);
-            }
 
             return (pemList, null);
         }

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

@@ -23,7 +23,7 @@ public partial class CoreConfigSingboxService
         }
 
         // Process outbounds
-        var customOutboundsNode = fullConfigTemplateNode["outbounds"] is JsonArray outbounds ? outbounds : new JsonArray();
+        var customOutboundsNode = fullConfigTemplateNode["outbounds"] is JsonArray outbounds ? outbounds : [];
         foreach (var outbound in _coreConfig.outbounds)
         {
             if (outbound.type.ToLower() is "direct" or "block")
@@ -44,7 +44,7 @@ public partial class CoreConfigSingboxService
         // Process endpoints
         if (_coreConfig.endpoints != null && _coreConfig.endpoints.Count > 0)
         {
-            var customEndpointsNode = fullConfigTemplateNode["endpoints"] is JsonArray endpoints ? endpoints : new JsonArray();
+            var customEndpointsNode = fullConfigTemplateNode["endpoints"] is JsonArray endpoints ? endpoints : [];
             foreach (var endpoint in _coreConfig.endpoints)
             {
                 if (endpoint.detour.IsNullOrEmpty() && !fullConfigTemplate.ProxyDetour.IsNullOrEmpty())

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

@@ -433,15 +433,17 @@ public partial class CoreConfigSingboxService
     {
         GenDnsProtectCustom();
 
-        var localDnsServer = _coreConfig.dns?.servers?.FirstOrDefault(s => s.tag == Global.SingboxLocalDNSTag);
+        _coreConfig.dns?.servers?.RemoveAll(s => s.tag == Global.SingboxLocalDNSTag);
-        if (localDnsServer == null)
-        {
-            return;
-        }
-        localDnsServer.type = null;
-        localDnsServer.server = null;
         var dnsItem = context.RawDnsItem;
-        localDnsServer.address = string.IsNullOrEmpty(dnsItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dnsItem?.DomainDNSAddress;
+        var localDnsServer = new Server4Sbox()
+        {
+            address = string.IsNullOrEmpty(dnsItem?.DomainDNSAddress)
+                ? Global.DomainPureIPDNSAddress.FirstOrDefault()
+                : dnsItem?.DomainDNSAddress,
+            tag = Global.SingboxLocalDNSTag,
+            detour = Global.DirectTag,
+        };
+        _coreConfig.dns?.servers?.Add(localDnsServer);
     }
 
     private Rule4Sbox BuildProtectDomainRule()

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

@@ -19,18 +19,22 @@ public partial class CoreConfigV2rayService
         // Handle balancer and rules modifications (for multiple load scenarios)
         if (_coreConfig.routing?.balancers?.Count > 0)
         {
-            var balancer = _coreConfig.routing.balancers.First();
+            var balancer =
+                _coreConfig.routing.balancers.FirstOrDefault(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix, null);
 
             // Modify existing rules in custom config
-            var rulesNode = fullConfigTemplateNode["routing"]?["rules"];
+            if (balancer != null)
-            if (rulesNode != null)
             {
-                foreach (var rule in rulesNode.AsArray())
+                var rulesNode = fullConfigTemplateNode["routing"]?["rules"];
+                if (rulesNode != null)
                 {
-                    if (rule["outboundTag"]?.GetValue<string>() == Global.ProxyTag)
+                    foreach (var rule in rulesNode.AsArray())
                     {
-                        rule.AsObject().Remove("outboundTag");
+                        if (rule["outboundTag"]?.GetValue<string>() == Global.ProxyTag)
-                        rule["balancerTag"] = balancer.tag;
+                        {
+                            rule.AsObject().Remove("outboundTag");
+                            rule["balancerTag"] = balancer.tag;
+                        }
                     }
                 }
             }
@@ -97,8 +101,8 @@ public partial class CoreConfigV2rayService
                     continue;
                 }
             }
-            else if ((!fullConfigTemplate.ProxyDetour.IsNullOrEmpty())
+            else if (!fullConfigTemplate.ProxyDetour.IsNullOrEmpty()
-                && ((outbound.streamSettings?.sockopt?.dialerProxy.IsNullOrEmpty() ?? true) == true))
+                && (outbound.streamSettings?.sockopt?.dialerProxy.IsNullOrEmpty() ?? true))
             {
                 var outboundAddress = outbound.settings?.servers?.FirstOrDefault()?.address
                     ?? outbound.settings?.vnext?.FirstOrDefault()?.address

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

@@ -39,9 +39,9 @@ public partial class CoreConfigV2rayService
                     .ToList() ?? [];
                 if (balancerTagList.Count > 0)
                 {
-                    foreach (var rulesItem in _coreConfig.routing.rules.Where(r => balancerTagList.Contains(r.outboundTag)))
+                    foreach (var rulesItem in _coreConfig.routing.rules.Where(r => balancerTagList.Contains(r.outboundTag + Global.BalancerTagSuffix)))
                     {
-                        rulesItem.balancerTag = rulesItem.outboundTag;
+                        rulesItem.balancerTag = rulesItem.outboundTag + Global.BalancerTagSuffix;
                         rulesItem.outboundTag = null;
                     }
                 }

v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs

@@ -247,11 +247,6 @@ public class AddServerViewModel : MyReactiveObject
         {
             serverName = SelectedSource.Address;
         }
-        if (!Utils.IsDomain(serverName))
-        {
-            UpdateCertTip(ResUI.ServerNameMustBeValidDomain);
-            return;
-        }
         if (SelectedSource.Port > 0)
         {
             domain += $":{SelectedSource.Port}";
@@ -277,11 +272,6 @@ public class AddServerViewModel : MyReactiveObject
         {
             serverName = SelectedSource.Address;
         }
-        if (!Utils.IsDomain(serverName))
-        {
-            UpdateCertTip(ResUI.ServerNameMustBeValidDomain);
-            return;
-        }
         if (SelectedSource.Port > 0)
         {
             domain += $":{SelectedSource.Port}";