Merge c53d9c118a into 64c7fea2bc

v2rayN/Directory.Packages.props

@@ -12,8 +12,8 @@
     <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.7" />
     <PackageVersion Include="CliWrap" Version="3.9.0" />
     <PackageVersion Include="Downloader" Version="4.0.3" />
-    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
+    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.1" />
-    <PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
+    <PackageVersion Include="MaterialDesignThemes" Version="5.3.0" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
     <PackageVersion Include="QRCoder" Version="1.6.0" />
     <PackageVersion Include="ReactiveUI" Version="20.4.1" />

v2rayN/ServiceLib/Enums/ERuleType.cs

@@ -0,0 +1,8 @@
+namespace ServiceLib.Enums;
+
+public enum ERuleType
+{
+    ALL = 0,
+    Routing = 1,
+    DNS = 2,
+}

v2rayN/ServiceLib/Models/RulesItem.cs

@@ -15,4 +15,5 @@ public class RulesItem
     public List<string>? Process { get; set; }
     public bool Enabled { get; set; } = true;
     public string? Remarks { get; set; }
+    public ERuleType? RuleType { get; set; }
 }

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

@@ -253,6 +253,11 @@ public partial class CoreConfigSingboxService
                 continue;
             }
 
+            if (item.RuleType == ERuleType.Routing)
+            {
+                continue;
+            }
+
             var rule = new Rule4Sbox();
             var validDomains = item.Domain.Count(it => ParseV2Domain(it, rule));
             if (validDomains <= 0)

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

@@ -136,16 +136,24 @@ public partial class CoreConfigSingboxService
                 var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet);
                 foreach (var item1 in rules ?? [])
                 {
-                    if (item1.Enabled)
+                    if (!item1.Enabled)
                     {
+                        continue;
+                    }
+
+                    if (item1.RuleType == ERuleType.DNS)
+                    {
+                        continue;
+                    }
+
                     await GenRoutingUserRule(item1, singboxConfig);
-                        if (item1.Ip != null && item1.Ip.Count > 0)
+
+                    if (item1.Ip?.Count > 0)
                     {
                         ipRules.Add(item1);
                     }
                 }
             }
-            }
             if (_config.RoutingBasicItem.DomainStrategy == Global.IPIfNonMatch)
             {
                 singboxConfig.route.rules.Add(resolveRule);

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

@@ -142,6 +142,11 @@ public partial class CoreConfigV2rayService
                     continue;
                 }
 
+                if (item.RuleType == ERuleType.Routing)
+                {
+                    continue;
+                }
+
                 foreach (var domain in item.Domain)
                 {
                     if (domain.StartsWith('#'))

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

@@ -20,15 +20,22 @@ public partial class CoreConfigV2rayService
                     var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet);
                     foreach (var item in rules)
                     {
-                        if (item.Enabled)
+                        if (!item.Enabled)
                         {
+                            continue;
+                        }
+
+                        if (item.RuleType == ERuleType.DNS)
+                        {
+                            continue;
+                        }
+
                         var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
                         await GenRoutingUserRule(item2, v2rayConfig);
                     }
                 }
             }
         }
-        }
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);

v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -21,6 +21,9 @@ public class RoutingRuleDetailsViewModel : MyReactiveObject
     [Reactive]
     public string Process { get; set; }
 
+    [Reactive]
+    public string? RuleType { get; set; }
+
     [Reactive]
     public bool AutoSort { get; set; }
 
@@ -51,6 +54,7 @@ public class RoutingRuleDetailsViewModel : MyReactiveObject
         Domain = Utils.List2String(SelectedSource.Domain, true);
         IP = Utils.List2String(SelectedSource.Ip, true);
         Process = Utils.List2String(SelectedSource.Process, true);
+        RuleType = SelectedSource.RuleType?.ToString();
     }
 
     private async Task SaveRulesAsync()
@@ -73,6 +77,7 @@ public class RoutingRuleDetailsViewModel : MyReactiveObject
         }
         SelectedSource.Protocol = ProtocolItems?.ToList();
         SelectedSource.InboundTag = InboundTagItems?.ToList();
+        SelectedSource.RuleType = RuleType.IsNullOrEmpty() ? null : (ERuleType)Enum.Parse(typeof(ERuleType), RuleType);
 
         var hasRule = SelectedSource.Domain?.Count > 0
           || SelectedSource.Ip?.Count > 0

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml

@@ -32,13 +32,25 @@
                 Width="300"
                 Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left" />
-            <ToggleSwitch
+            <StackPanel
-                x:Name="togEnabled"
                 Grid.Row="0"
                 Grid.Column="2"
                 Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+                <ToggleSwitch
+                    x:Name="togEnabled"
+                    Margin="{StaticResource Margin4}"
+                    HorizontalAlignment="Left"
                     VerticalAlignment="Center" />
+                <ComboBox
+                    x:Name="cmbRuleType"
+                    Width="300"
+                    Margin="{StaticResource Margin4}"
+                    MaxDropDownHeight="1000" />
+
+            </StackPanel>
 
             <TextBlock
                 Grid.Row="1"

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs

@@ -28,6 +28,7 @@ public partial class RoutingRuleDetailsWindow : WindowBase<RoutingRuleDetailsVie
         clbProtocol.ItemsSource = Global.RuleProtocols;
         clbInboundTag.ItemsSource = Global.InboundTags;
         cmbNetwork.ItemsSource = Global.RuleNetworks;
+        cmbRuleType.ItemsSource = Utils.GetEnumNames<ERuleType>();
 
         if (!rulesItem.Id.IsNullOrEmpty())
         {
@@ -53,6 +54,7 @@ public partial class RoutingRuleDetailsWindow : WindowBase<RoutingRuleDetailsVie
             this.Bind(ViewModel, vm => vm.IP, v => v.txtIP.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Process, v => v.txtProcess.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoSort, v => v.chkAutoSort.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.RuleType, v => v.cmbRuleType.SelectedValue).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml

@@ -48,13 +48,25 @@
                 Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 Style="{StaticResource DefTextBox}" />
-            <ToggleButton
+            <StackPanel
-                x:Name="togEnabled"
                 Grid.Row="0"
                 Grid.Column="2"
                 Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+                <ToggleButton
+                    x:Name="togEnabled"
+                    Margin="{StaticResource Margin4}"
+                    HorizontalAlignment="Left"
                     VerticalAlignment="Center" />
+                <ComboBox
+                    x:Name="cmbRuleType"
+                    Width="200"
+                    Margin="{StaticResource Margin4}"
+                    MaxDropDownHeight="1000"
+                    Style="{StaticResource DefComboBox}" />
+            </StackPanel>
 
             <TextBlock
                 Grid.Row="1"

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs

@@ -21,6 +21,7 @@ public partial class RoutingRuleDetailsWindow
         clbProtocol.ItemsSource = Global.RuleProtocols;
         clbInboundTag.ItemsSource = Global.InboundTags;
         cmbNetwork.ItemsSource = Global.RuleNetworks;
+        cmbRuleType.ItemsSource = Utils.GetEnumNames<ERuleType>();
 
         if (!rulesItem.Id.IsNullOrEmpty())
         {
@@ -45,6 +46,7 @@ public partial class RoutingRuleDetailsWindow
             this.Bind(ViewModel, vm => vm.IP, v => v.txtIP.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Process, v => v.txtProcess.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoSort, v => v.chkAutoSort.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.RuleType, v => v.cmbRuleType.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });