Merge 11924b545f into 5d6c5da9d9

Based on actual network flow instead of data packets

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -1253,49 +1253,12 @@ public static class ConfigHandler
         ProfileItem? itemSocks = null;
         if (node.ConfigType != EConfigType.Custom && coreType != ECoreType.sing_box && config.TunModeItem.EnableTun)
         {
-            var tun2SocksAddress = node.Address;
-            if (node.ConfigType > EConfigType.Group)
-            {
-                static async Task<List<string>> GetChildNodeAddressesAsync(string parentIndexId)
-                {
-                    var childAddresses = new List<string>();
-                    if (!ProfileGroupItemManager.Instance.TryGet(parentIndexId, out var groupItem) || groupItem.ChildItems.IsNullOrEmpty())
-                        return childAddresses;
-
-                    var childIds = Utils.String2List(groupItem.ChildItems);
-
-                    foreach (var childId in childIds)
-                    {
-                        var childNode = await AppManager.Instance.GetProfileItem(childId);
-                        if (childNode == null)
-                            continue;
-
-                        if (!childNode.IsComplex())
-                        {
-                            childAddresses.Add(childNode.Address);
-                        }
-                        else if (childNode.ConfigType > EConfigType.Group)
-                        {
-                            var subAddresses = await GetChildNodeAddressesAsync(childNode.IndexId);
-                            childAddresses.AddRange(subAddresses);
-                        }
-                    }
-
-                    return childAddresses;
-                }
-
-                var lstAddresses = await GetChildNodeAddressesAsync(node.IndexId);
-                if (lstAddresses.Count > 0)
-                {
-                    tun2SocksAddress = Utils.List2String(lstAddresses);
-                }
-            }
             itemSocks = new ProfileItem()
             {
                 CoreType = ECoreType.sing_box,
                 ConfigType = EConfigType.SOCKS,
                 Address = Global.Loopback,
-                SpiderX = tun2SocksAddress, // Tun2SocksAddress
+                SpiderX = node.Address, // Tun2SocksAddress
                 Port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks)
             };
         }

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -109,42 +109,6 @@ public class ProfileItem : ReactiveObject
         return true;
     }
 
-    public async Task<bool> HasCycle(HashSet<string> visited, HashSet<string> stack)
-    {
-        if (ConfigType < EConfigType.Group)
-            return false;
-
-        if (stack.Contains(IndexId))
-            return true;
-
-        if (visited.Contains(IndexId))
-            return false;
-
-        visited.Add(IndexId);
-        stack.Add(IndexId);
-
-        if (ProfileGroupItemManager.Instance.TryGet(IndexId, out var group)
-            && !group.ChildItems.IsNullOrEmpty())
-        {
-            var childProfiles = (await Task.WhenAll(
-                    Utils.String2List(group.ChildItems)
-                        .Where(p => !p.IsNullOrEmpty())
-                        .Select(AppManager.Instance.GetProfileItem)
-                ))
-                .Where(p => p != null)
-                .ToList();
-
-            foreach (var child in childProfiles)
-            {
-                if (await child.HasCycle(visited, stack))
-                    return true;
-            }
-        }
-
-        stack.Remove(IndexId);
-        return false;
-    }
-
     #endregion function
 
     [PrimaryKey]

v2rayN/ServiceLib/Services/ActionPrecheckService.cs

@@ -123,14 +123,7 @@ public class ActionPrecheckService(Config config)
                 errors.Add(string.Format(ResUI.GroupEmpty, item.Remarks));
                 return errors;
             }
-
+            
-            var hasCycle = await item.HasCycle(new HashSet<string>(), new HashSet<string>());
-            if (hasCycle)
-            {
-                errors.Add(string.Format(ResUI.GroupSelfReference, item.Remarks));
-                return errors;
-            }
-
             foreach (var child in Utils.String2List(group.ChildItems))
             {
                 var childErrors = new List<string>();
@@ -146,6 +139,13 @@ public class ActionPrecheckService(Config config)
                     continue;
                 }
 
+                // self-reference check
+                if (childItem.IndexId == item.IndexId)
+                {
+                    childErrors.Add(string.Format(ResUI.GroupSelfReference, childItem.Remarks));
+                    continue;
+                }
+
                 if (childItem.ConfigType is EConfigType.Custom or EConfigType.ProxyChain)
                 {
                     childErrors.Add(string.Format(ResUI.InvalidProperty, childItem.Remarks));

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

@@ -414,19 +414,16 @@ public partial class CoreConfigSingboxService
             return 0;
         }
 
-        List<string> domain = new();
+        var domain = string.Empty;
         if (Utils.IsDomain(node.Address)) // normal outbound
         {
-            domain.Add(node.Address);
+            domain = node.Address;
         }
-        if (node.Address == Global.Loopback && node.SpiderX.IsNotEmpty()) // Tun2SocksAddress
+        else if (node.Address == Global.Loopback && node.SpiderX.IsNotEmpty() && Utils.IsDomain(node.SpiderX)) // Tun2SocksAddress
         {
-            domain.AddRange(Utils.String2List(node.SpiderX)
+            domain = node.SpiderX;
-                .Where(Utils.IsDomain)
-                .Distinct()
-                .ToList());
         }
-        if (domain.Count == 0)
+        if (domain.IsNullOrEmpty())
         {
             return 0;
         }
@@ -435,7 +432,7 @@ public partial class CoreConfigSingboxService
         singboxConfig.dns.rules.Insert(0, new Rule4Sbox
         {
             server = server,
-            domain = domain,
+            domain = [domain],
         });
 
         return await Task.FromResult(0);

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

@@ -217,15 +217,9 @@ public partial class CoreConfigSingboxService
             {
                 return -1;
             }
-
-            var hasCycle = await node.HasCycle(new HashSet<string>(), new HashSet<string>());
-            if (hasCycle)
-            {
-                return -1;
-            }
-
             // remove custom nodes
             // remove group nodes for proxy chain
+            // avoid self-reference
             var childProfiles = (await Task.WhenAll(
                     Utils.String2List(profileGroupItem.ChildItems)
                         .Where(p => !p.IsNullOrEmpty())
@@ -236,6 +230,7 @@ public partial class CoreConfigSingboxService
                     && p.IsValid()
                     && p.ConfigType != EConfigType.Custom
                     && (node.ConfigType == EConfigType.PolicyGroup || p.ConfigType < EConfigType.Group)
+                    && p.IndexId != node.IndexId
                 )
                 .ToList();
 

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

@@ -493,13 +493,6 @@ public partial class CoreConfigV2rayService
             {
                 return -1;
             }
-
-            var hasCycle = await node.HasCycle(new HashSet<string>(), new HashSet<string>());
-            if (hasCycle)
-            {
-                return -1;
-            }
-
             // remove custom nodes
             // remove group nodes for proxy chain
             var childProfiles = (await Task.WhenAll(