Merge 7c68e8aece into 5d6c5da9d9

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

@@ -640,12 +640,12 @@ public partial class CoreConfigSingboxService
             }
 
             // Merge results: first the selector/urltest/proxies, then other outbounds, and finally prev outbounds
-            var serverList = new List<BaseServer4Sbox>();
-            serverList = serverList.Concat(prevOutbounds)
-                .Concat(resultOutbounds)
-                .Concat(resultEndpoints)
-                .ToList();
-            await AddRangeOutbounds(serverList, singboxConfig, baseTagName == Global.ProxyTag);
+            resultOutbounds.AddRange(prevOutbounds);
+            resultOutbounds.AddRange(singboxConfig.outbounds);
+            singboxConfig.outbounds = resultOutbounds;
+            singboxConfig.endpoints ??= new List<Endpoints4Sbox>();
+            resultEndpoints.AddRange(singboxConfig.endpoints);
+            singboxConfig.endpoints = resultEndpoints;
         }
         catch (Exception ex)
         {
@@ -770,11 +770,12 @@ public partial class CoreConfigSingboxService
             resultOutbounds.Insert(0, outUrltest);
             resultOutbounds.Insert(0, outSelector);
         }
-        var serverList = new List<BaseServer4Sbox>();
-        serverList = serverList.Concat(resultOutbounds)
-            .Concat(resultEndpoints)
-            .ToList();
-        await AddRangeOutbounds(serverList, singboxConfig, baseTagName == Global.ProxyTag);
+        singboxConfig.outbounds ??= new();
+        resultOutbounds.AddRange(singboxConfig.outbounds);
+        singboxConfig.outbounds = resultOutbounds;
+        singboxConfig.endpoints ??= new();
+        resultEndpoints.AddRange(singboxConfig.endpoints);
+        singboxConfig.endpoints = resultEndpoints;
         return await Task.FromResult(0);
     }
 
@@ -817,40 +818,14 @@ public partial class CoreConfigSingboxService
                 resultOutbounds.Add(outbound);
             }
         }
-        var serverList = new List<BaseServer4Sbox>();
-        serverList = serverList.Concat(resultOutbounds)
-            .Concat(resultEndpoints)
-            .ToList();
-        await AddRangeOutbounds(serverList, singboxConfig, baseTagName == Global.ProxyTag);
-        return await Task.FromResult(0);
-    }
+        singboxConfig.outbounds ??= new();
+        resultOutbounds.AddRange(singboxConfig.outbounds);
+        singboxConfig.outbounds = resultOutbounds;
+
+        singboxConfig.endpoints ??= new();
+        resultEndpoints.AddRange(singboxConfig.endpoints);
+        singboxConfig.endpoints = resultEndpoints;
 
-    private async Task<int> AddRangeOutbounds(List<BaseServer4Sbox> servers, SingboxConfig singboxConfig, bool prepend = true)
-    {
-        try
-        {
-            if (servers is null || servers.Count <= 0)
-            {
-                return 0;
-            }
-            var outbounds = servers.Where(s => s is Outbound4Sbox).Cast<Outbound4Sbox>().ToList();
-            var endpoints = servers.Where(s => s is Endpoints4Sbox).Cast<Endpoints4Sbox>().ToList();
-            singboxConfig.endpoints ??= new();
-            if (prepend)
-            {
-                singboxConfig.outbounds.InsertRange(0, outbounds);
-                singboxConfig.endpoints.InsertRange(0, endpoints);
-            }
-            else
-            {
-                singboxConfig.outbounds.AddRange(outbounds);
-                singboxConfig.endpoints.AddRange(endpoints);
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
         return await Task.FromResult(0);
     }
 }

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

@@ -376,7 +376,7 @@ public partial class CoreConfigSingboxService
             return Global.ProxyTag;
         }
 
-        var tag = $"{node.IndexId}-{Global.ProxyTag}";
+        var tag = Global.ProxyTag + node.IndexId.ToString();
         if (singboxConfig.outbounds.Any(o => o.tag == tag)
             || (singboxConfig.endpoints != null && singboxConfig.endpoints.Any(e => e.tag == tag)))
         {
@@ -385,10 +385,11 @@ public partial class CoreConfigSingboxService
 
         if (node.ConfigType is EConfigType.PolicyGroup or EConfigType.ProxyChain)
         {
-            var ret = await GenGroupOutbound(node, singboxConfig, tag);
+            var childBaseTagName = $"{Global.ProxyTag}-{node.IndexId}";
+            var ret = await GenGroupOutbound(node, singboxConfig, childBaseTagName);
             if (ret == 0)
             {
-                return tag;
+                return childBaseTagName;
             }
             return Global.ProxyTag;
         }

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

@@ -1,5 +1,3 @@
-using ServiceLib.Models;
-
 namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigV2rayService
@@ -730,17 +728,9 @@ public partial class CoreConfigV2rayService
             }
 
             // Merge results: first the main chain outbounds, then other outbounds, and finally utility outbounds
-            if (baseTagName == Global.ProxyTag)
-            {
-                resultOutbounds.AddRange(prevOutbounds);
-                resultOutbounds.AddRange(v2rayConfig.outbounds);
-                v2rayConfig.outbounds = resultOutbounds;
-            }
-            else
-            {
-                v2rayConfig.outbounds.AddRange(prevOutbounds);
-                v2rayConfig.outbounds.AddRange(resultOutbounds);
-            }
+            resultOutbounds.AddRange(prevOutbounds);
+            resultOutbounds.AddRange(v2rayConfig.outbounds);
+            v2rayConfig.outbounds = resultOutbounds;
         }
         catch (Exception ex)
         {
@@ -852,19 +842,13 @@ public partial class CoreConfigV2rayService
             outbound.tag = baseTagName + (i + 1).ToString();
             resultOutbounds.Add(outbound);
         }
-        if (baseTagName == Global.ProxyTag)
-        {
-            resultOutbounds.AddRange(v2rayConfig.outbounds);
-            v2rayConfig.outbounds = resultOutbounds;
-        }
-        else
-        {
-            v2rayConfig.outbounds.AddRange(resultOutbounds);
-        }
+        v2rayConfig.outbounds ??= new();
+        resultOutbounds.AddRange(v2rayConfig.outbounds);
+        v2rayConfig.outbounds = resultOutbounds;
         return await Task.FromResult(0);
     }
 
-    private async Task<int> GenChainOutboundsList(List<ProfileItem> nodes, V2rayConfig v2rayConfig, string baseTagName = Global.ProxyTag)
+    private async Task<int> GenChainOutboundsList(List<ProfileItem> nodes, V2rayConfig v2RayConfig, string baseTagName = Global.ProxyTag)
     {
         // Based on actual network flow instead of data packets
         var nodesReverse = nodes.AsEnumerable().Reverse().ToList();
@@ -905,15 +889,9 @@ public partial class CoreConfigV2rayService
 
             resultOutbounds.Add(outbound);
         }
-        if (baseTagName == Global.ProxyTag)
-        {
-            resultOutbounds.AddRange(v2rayConfig.outbounds);
-            v2rayConfig.outbounds = resultOutbounds;
-        }
-        else
-        {
-            v2rayConfig.outbounds.AddRange(resultOutbounds);
-        }
+        v2RayConfig.outbounds ??= new();
+        resultOutbounds.AddRange(v2RayConfig.outbounds);
+        v2RayConfig.outbounds = resultOutbounds;
 
         return await Task.FromResult(0);
     }

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

@@ -133,7 +133,7 @@ public partial class CoreConfigV2rayService
             return Global.ProxyTag;
         }
 
-        var tag = $"{node.IndexId}-{Global.ProxyTag}";
+        var tag = Global.ProxyTag + node.IndexId.ToString();
         if (v2rayConfig.outbounds.Any(p => p.tag == tag))
         {
             return tag;
@@ -141,10 +141,11 @@ public partial class CoreConfigV2rayService
 
         if (node.ConfigType is EConfigType.PolicyGroup or EConfigType.ProxyChain)
         {
-            var ret = await GenGroupOutbound(node, v2rayConfig, tag);
+            var childBaseTagName = $"{Global.ProxyTag}-{node.IndexId}";
+            var ret = await GenGroupOutbound(node, v2rayConfig, childBaseTagName);
             if (ret == 0)
             {
-                return tag;
+                return childBaseTagName;
             }
             return Global.ProxyTag;
         }