Avoid duplicate tags

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.10</Version>
+        <Version>7.14.9</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -5,10 +5,10 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.5" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.5" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.5" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.5" />
     <PackageVersion Include="CliWrap" Version="3.9.0" />
     <PackageVersion Include="Downloader" Version="4.0.3" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -9,31 +9,6 @@ public class JsonUtils
 {
     private static readonly string _tag = "JsonUtils";
 
-    private static readonly JsonSerializerOptions _defaultDeserializeOptions = new()
-    {
-        PropertyNameCaseInsensitive = true,
-        ReadCommentHandling = JsonCommentHandling.Skip
-    };
-
-    private static readonly JsonSerializerOptions _defaultSerializeOptions = new()
-    {
-        WriteIndented = true,
-        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-    };
-
-    private static readonly JsonSerializerOptions _nullValueSerializeOptions = new()
-    {
-        WriteIndented = true,
-        DefaultIgnoreCondition = JsonIgnoreCondition.Never,
-        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-    };
-
-    private static readonly JsonDocumentOptions _defaultDocumentOptions = new()
-    {
-        CommentHandling = JsonCommentHandling.Skip
-    };
-
     /// <summary>
     /// DeepCopy
     /// </summary>
@@ -59,7 +34,11 @@ public class JsonUtils
             {
                 return default;
             }
-            return JsonSerializer.Deserialize<T>(strJson, _defaultDeserializeOptions);
+            var options = new JsonSerializerOptions
+            {
+                PropertyNameCaseInsensitive = true
+            };
+            return JsonSerializer.Deserialize<T>(strJson, options);
         }
         catch
         {
@@ -80,7 +59,7 @@ public class JsonUtils
             {
                 return null;
             }
-            return JsonNode.Parse(strJson, nodeOptions: null, _defaultDocumentOptions);
+            return JsonNode.Parse(strJson);
         }
         catch
         {
@@ -105,7 +84,12 @@ public class JsonUtils
             {
                 return result;
             }
-            var options = nullValue ? _nullValueSerializeOptions : _defaultSerializeOptions;
+            var options = new JsonSerializerOptions
+            {
+                WriteIndented = indented,
+                DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull,
+                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+            };
             result = JsonSerializer.Serialize(obj, options);
         }
         catch (Exception ex)

v2rayN/ServiceLib/Handler/Fmt/ClashFmt.cs

@@ -4,7 +4,7 @@ public class ClashFmt : BaseFmt
 {
     public static ProfileItem? ResolveFull(string strData, string? subRemarks)
     {
-        if (Contains(strData, "external-controller", "-port", "proxies"))
+        if (Contains(strData, "port", "socks-port", "proxies"))
         {
             var fileName = WriteAllText(strData, "yaml");
 

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

@@ -451,7 +451,7 @@ public partial class CoreConfigSingboxService(Config config)
                 ret.Msg = ResUI.FailedGenDefaultConfiguration;
                 return ret;
             }
-            await GenOutboundsListWithChain(proxyProfiles, singboxConfig, multipleLoad);
+            await GenOutboundsList(proxyProfiles, singboxConfig, multipleLoad);
 
             await GenDns(null, singboxConfig);
             await ConvertGeo2Ruleset(singboxConfig);

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

@@ -179,21 +179,13 @@ public partial class CoreConfigSingboxService
             if (node.ConfigType == EConfigType.WireGuard)
             {
                 var endpoint = JsonUtils.Deserialize<Endpoints4Sbox>(txtOutbound);
-                var ret = await GenEndpoint(node, endpoint);
+                await GenEndpoint(node, endpoint);
-                if (ret != 0)
-                {
-                    return null;
-                }
                 return endpoint;
             }
             else
             {
                 var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
-                var ret = await GenOutbound(node, outbound);
+                await GenOutbound(node, outbound);
-                if (ret != 0)
-                {
-                    return null;
-                }
                 return outbound;
             }
         }
@@ -418,7 +410,7 @@ public partial class CoreConfigSingboxService
         return 0;
     }
 
-    private async Task<int> GenOutboundsListWithChain(List<ProfileItem> nodes, SingboxConfig singboxConfig, EMultipleLoad multipleLoad, string baseTagName = Global.ProxyTag)
+    private async Task<int> GenOutboundsList(List<ProfileItem> nodes, SingboxConfig singboxConfig, EMultipleLoad multipleLoad, string baseTagName = Global.ProxyTag)
     {
         try
         {
@@ -466,7 +458,7 @@ public partial class CoreConfigSingboxService
                     var ret = node.ConfigType switch
                     {
                         EConfigType.PolicyGroup =>
-                            await GenOutboundsListWithChain(childProfiles, singboxConfig, profileGroupItem.MultipleLoad, childBaseTagName),
+                            await GenOutboundsList(childProfiles, singboxConfig, profileGroupItem.MultipleLoad, childBaseTagName),
                         EConfigType.ProxyChain =>
                             await GenChainOutboundsList(childProfiles, singboxConfig, childBaseTagName),
                         _ => throw new NotImplementedException()
@@ -620,66 +612,6 @@ public partial class CoreConfigSingboxService
         return null;
     }
 
-    private async Task<int> GenOutboundsList(List<ProfileItem> nodes, SingboxConfig singboxConfig, EMultipleLoad multipleLoad, string baseTagName = Global.ProxyTag)
-    {
-        var resultOutbounds = new List<Outbound4Sbox>();
-        var resultEndpoints = new List<Endpoints4Sbox>(); // For endpoints
-        var proxyTags = new List<string>(); // For selector and urltest outbounds
-        for (var i = 0; i < nodes.Count; i++)
-        {
-            var node = nodes[i];
-            var server = await GenServer(node);
-            if (server is null)
-            {
-                break;
-            }
-            server.tag = baseTagName + (i + 1).ToString();
-            if (server is Endpoints4Sbox endpoint)
-            {
-                resultEndpoints.Add(endpoint);
-            }
-            else if (server is Outbound4Sbox outbound)
-            {
-                resultOutbounds.Add(outbound);
-            }
-            proxyTags.Add(server.tag);
-        }
-        // Add urltest outbound (auto selection based on latency)
-        if (proxyTags.Count > 0)
-        {
-            var outUrltest = new Outbound4Sbox
-            {
-                type = "urltest",
-                tag = $"{baseTagName}-auto",
-                outbounds = proxyTags,
-                interrupt_exist_connections = false,
-            };
-            if (multipleLoad == EMultipleLoad.Fallback)
-            {
-                outUrltest.tolerance = 5000;
-            }
-            // Add selector outbound (manual selection)
-            var outSelector = new Outbound4Sbox
-            {
-                type = "selector",
-                tag = baseTagName,
-                outbounds = JsonUtils.DeepCopy(proxyTags),
-                interrupt_exist_connections = false,
-            };
-            outSelector.outbounds.Insert(0, outUrltest.tag);
-            // Insert these at the beginning
-            resultOutbounds.Insert(0, outUrltest);
-            resultOutbounds.Insert(0, outSelector);
-        }
-        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);
-    }
-
     private async Task<int> GenChainOutboundsList(List<ProfileItem> nodes, SingboxConfig singboxConfig, string baseTagName = Global.ProxyTag)
     {
         var resultOutbounds = new List<Outbound4Sbox>();

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

@@ -397,7 +397,7 @@ public partial class CoreConfigSingboxService
             var ret = node.ConfigType switch
             {
                 EConfigType.PolicyGroup =>
-                    await GenOutboundsListWithChain(childProfiles, singboxConfig, profileGroupItem.MultipleLoad, childBaseTagName),
+                    await GenOutboundsList(childProfiles, singboxConfig, profileGroupItem.MultipleLoad, childBaseTagName),
                 EConfigType.ProxyChain =>
                     await GenChainOutboundsList(childProfiles, singboxConfig, childBaseTagName),
                 _ => throw new NotImplementedException()

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

@@ -180,7 +180,7 @@ public partial class CoreConfigV2rayService(Config config)
                 ret.Msg = ResUI.FailedGenDefaultConfiguration;
                 return ret;
             }
-            await GenOutboundsListWithChain(proxyProfiles, v2rayConfig);
+            await GenOutboundsList(proxyProfiles, v2rayConfig);
 
             //add balancers
             await GenObservatory(v2rayConfig, multipleLoad);

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

@@ -2,13 +2,13 @@ namespace ServiceLib.Services.CoreConfig;
 
 public partial class CoreConfigV2rayService
 {
-    private async Task<int> GenObservatory(V2rayConfig v2rayConfig, EMultipleLoad multipleLoad, string baseTagName = Global.ProxyTag)
+    private async Task<int> GenObservatory(V2rayConfig v2rayConfig, EMultipleLoad multipleLoad)
     {
         if (multipleLoad == EMultipleLoad.LeastPing)
         {
             var observatory = new Observatory4Ray
             {
-                subjectSelector = [baseTagName],
+                subjectSelector = [Global.ProxyTag],
                 probeUrl = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl,
                 probeInterval = "3m",
                 enableConcurrency = true,
@@ -19,7 +19,7 @@ public partial class CoreConfigV2rayService
         {
             var burstObservatory = new BurstObservatory4Ray
             {
-                subjectSelector = [baseTagName],
+                subjectSelector = [Global.ProxyTag],
                 pingConfig = new()
                 {
                     destination = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl,

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

@@ -552,7 +552,7 @@ public partial class CoreConfigV2rayService
         return 0;
     }
 
-    private async Task<int> GenOutboundsListWithChain(List<ProfileItem> nodes, V2rayConfig v2rayConfig, string baseTagName = Global.ProxyTag)
+    private async Task<int> GenOutboundsList(List<ProfileItem> nodes, V2rayConfig v2rayConfig, string baseTagName = Global.ProxyTag)
     {
         try
         {
@@ -597,7 +597,7 @@ public partial class CoreConfigV2rayService
                     var ret = node.ConfigType switch
                     {
                         EConfigType.PolicyGroup =>
-                            await GenOutboundsListWithChain(childProfiles, v2rayConfig, childBaseTagName),
+                            await GenOutboundsList(childProfiles, v2rayConfig, childBaseTagName),
                         EConfigType.ProxyChain =>
                             await GenChainOutboundsList(childProfiles, v2rayConfig, childBaseTagName),
                         _ => throw new NotImplementedException()
@@ -721,32 +721,6 @@ public partial class CoreConfigV2rayService
         return null;
     }
 
-    private async Task<int> GenOutboundsList(List<ProfileItem> nodes, V2rayConfig v2rayConfig, string baseTagName = Global.ProxyTag)
-    {
-        var resultOutbounds = new List<Outbounds4Ray>();
-        for (var i = 0; i < nodes.Count; i++)
-        {
-            var node = nodes[i];
-            var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
-            if (txtOutbound.IsNullOrEmpty())
-            {
-                break;
-            }
-            var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
-            var result = await GenOutbound(node, outbound);
-            if (result != 0)
-            {
-                break;
-            }
-            outbound.tag = baseTagName + (i + 1).ToString();
-            resultOutbounds.Add(outbound);
-        }
-        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)
     {
         var resultOutbounds = new List<Outbounds4Ray>();

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

@@ -159,7 +159,7 @@ public partial class CoreConfigV2rayService
             var ret = node.ConfigType switch
             {
                 EConfigType.PolicyGroup =>
-                    await GenOutboundsListWithChain(childProfiles, v2rayConfig, childBaseTagName),
+                    await GenOutboundsList(childProfiles, v2rayConfig, childBaseTagName),
                 EConfigType.ProxyChain =>
                     await GenChainOutboundsList(childProfiles, v2rayConfig, childBaseTagName),
                 _ => throw new NotImplementedException()

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -400,7 +400,7 @@
                         Grid.Column="1"
                         Width="400"
                         Margin="{StaticResource Margin4}"
-                        Watermark="1000-2000,3000,4000" />
+                        Watermark="1000:2000,3000:4000" />
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="2"

v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml

@@ -176,7 +176,6 @@
                 <DataGrid
                     x:Name="lstRules"
                     AutoGenerateColumns="False"
-                    Background="Transparent"
                     BorderThickness="1"
                     CanUserResizeColumns="True"
                     GridLinesVisibility="All"

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -92,7 +92,6 @@
                 <DataGrid
                     x:Name="lstRoutings"
                     AutoGenerateColumns="False"
-                    Background="Transparent"
                     BorderThickness="1"
                     CanUserResizeColumns="True"
                     GridLinesVisibility="All"

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -538,7 +538,7 @@
                         Width="400"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
-                        materialDesign:HintAssist.Hint="1000-2000,3000,4000"
+                        materialDesign:HintAssist.Hint="1000:2000,3000:4000"
                         Style="{StaticResource DefTextBox}" />
                     <TextBlock
                         Grid.Row="3"

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

@@ -122,8 +122,6 @@ public partial class RoutingRuleSettingWindow
 
     private void RoutingRuleSettingWindow_PreviewKeyDown(object sender, KeyEventArgs e)
     {
-        if (!lstRules.IsKeyboardFocusWithin)
-            return;
         if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
         {
             if (e.Key == Key.A)