Merge 531bdc522d into 29a5abf4d6

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

@@ -338,20 +338,6 @@ public partial class CoreConfigSingboxService
 
         var node = await AppManager.Instance.GetProfileItemViaRemarks(outboundTag);
 
-        if (node == null
-            || (!Global.SingboxSupportConfigType.Contains(node.ConfigType)
-            && node.ConfigType is not (EConfigType.PolicyGroup or EConfigType.ProxyChain)))
-        {
-            return 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)))
-        {
-            return tag;
-        }
-
         if (node.ConfigType is EConfigType.PolicyGroup or EConfigType.ProxyChain)
         {
             ProfileGroupItemManager.Instance.TryGet(node.IndexId, out var profileGroupItem);
@@ -384,13 +370,19 @@ public partial class CoreConfigSingboxService
             return Global.ProxyTag;
         }
 
+        if (node == null
+            || !Global.SingboxSupportConfigType.Contains(node.ConfigType))
+        {
+            return Global.ProxyTag;
+        }
+
         var server = await GenServer(node);
         if (server is null)
         {
             return Global.ProxyTag;
         }
 
-        server.tag = tag;
+        server.tag = Global.ProxyTag + node.IndexId.ToString();
         if (server is Endpoints4Sbox endpoint)
         {
             singboxConfig.endpoints ??= new();

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

@@ -126,19 +126,6 @@ public partial class CoreConfigV2rayService
 
         var node = await AppManager.Instance.GetProfileItemViaRemarks(outboundTag);
 
-        if (node == null
-            || (!Global.XraySupportConfigType.Contains(node.ConfigType)
-            && node.ConfigType is not (EConfigType.PolicyGroup or EConfigType.ProxyChain)))
-        {
-            return Global.ProxyTag;
-        }
-
-        var tag = Global.ProxyTag + node.IndexId.ToString();
-        if (v2rayConfig.outbounds.Any(p => p.tag == tag))
-        {
-            return tag;
-        }
-
         if (node.ConfigType is EConfigType.PolicyGroup or EConfigType.ProxyChain)
         {
             ProfileGroupItemManager.Instance.TryGet(node.IndexId, out var profileGroupItem);
@@ -175,10 +162,16 @@ public partial class CoreConfigV2rayService
             return Global.ProxyTag;
         }
 
+        if (node == null
+            || !Global.XraySupportConfigType.Contains(node.ConfigType))
+        {
+            return Global.ProxyTag;
+        }
+
         var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
         var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
         await GenOutbound(node, outbound);
-        outbound.tag = tag;
+        outbound.tag = Global.ProxyTag + node.IndexId.ToString();
         v2rayConfig.outbounds.Add(outbound);
 
         return outbound.tag;