Merge 69d027840e into b5800f7dfc

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 : [];
+        var customOutboundsNode = fullConfigTemplateNode["outbounds"] is JsonArray outbounds ? outbounds : new JsonArray();
         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 : [];
+            var customEndpointsNode = fullConfigTemplateNode["endpoints"] is JsonArray endpoints ? endpoints : new JsonArray();
             foreach (var endpoint in _coreConfig.endpoints)
             {
                 if (endpoint.detour.IsNullOrEmpty() && !fullConfigTemplate.ProxyDetour.IsNullOrEmpty())

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

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