From 0d5a9fcf4a0032500be76b7da7b83ee5961a45b0 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 23 Dec 2023 20:57:31 +0800
Subject: [PATCH 01/62] Previous and next proxy

---
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs |  4 +-
 v2rayN/v2rayN/Handler/CoreConfigV2ray.cs   | 62 +++++++++++++++++++++-
 v2rayN/v2rayN/Handler/LazyConfig.cs        |  9 ++++
 v2rayN/v2rayN/Mode/SubItem.cs              |  4 ++
 4 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index d1e73c4e..c3607e87 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -45,7 +45,7 @@ namespace v2rayN.Handler
 
                 GenInbounds(singboxConfig);
 
-                GenOutbounds(node, singboxConfig);
+                GenOutbound(node, singboxConfig);
 
                 GenRouting(singboxConfig);
 
@@ -202,7 +202,7 @@ namespace v2rayN.Handler
 
         #region outbound private
 
-        private int GenOutbounds(ProfileItem node, SingboxConfig singboxConfig)
+        private int GenOutbound(ProfileItem node, SingboxConfig singboxConfig)
         {
             try
             {
diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
index b592239a..1123cdcc 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
@@ -53,6 +53,8 @@ namespace v2rayN.Handler
 
                 GenOutbound(node, v2rayConfig.outbounds[0]);
 
+                GenMoreOutbounds(node, v2rayConfig);
+
                 GenDns(v2rayConfig);
 
                 GenStatistic(v2rayConfig);
@@ -820,6 +822,64 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        private int GenMoreOutbounds(ProfileItem node, V2rayConfig v2rayConfig)
+        {
+            if (node.subid.IsNullOrEmpty())
+            {
+                return 0;
+            }
+            try
+            {
+                var subItem = LazyConfig.Instance.GetSubItem(node.subid);
+                if (subItem is null)
+                {
+                    return 0;
+                }
+
+                //current proxy
+                var outbound = v2rayConfig.outbounds[0];
+
+                //Previous proxy
+                var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
+                if (prevNode is not null)
+                {
+                    var txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
+                    var prevOutbound = Utils.FromJson<Outbounds4Ray>(txtOutbound);
+                    GenOutbound(prevNode, prevOutbound);
+                    prevOutbound.tag = $"{Global.ProxyTag}2";
+                    v2rayConfig.outbounds.Add(prevOutbound);
+
+                    outbound.streamSettings.sockopt = new()
+                    {
+                        dialerProxy = prevOutbound.tag
+                    };
+                }
+
+                //Next proxy
+                var nextNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.nextProfile!);
+                if (nextNode is not null)
+                {
+                    var txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
+                    var nextOutbound = Utils.FromJson<Outbounds4Ray>(txtOutbound);
+                    GenOutbound(nextNode, nextOutbound);
+                    nextOutbound.tag = Global.ProxyTag;
+                    v2rayConfig.outbounds.Insert(0, nextOutbound);
+
+                    outbound.tag = $"{Global.ProxyTag}1";
+                    nextOutbound.streamSettings.sockopt = new()
+                    {
+                        dialerProxy = outbound.tag
+                    };
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+
+            return 0;
+        }
+
         #region Gen speedtest config
 
         public string GenerateClientSpeedtestConfigString(List<ServerTestItem> selecteds, out string msg)
@@ -833,7 +893,7 @@ namespace v2rayN.Handler
                 }
 
                 msg = ResUI.InitialConfiguration;
-                 
+
                 string result = Utils.GetEmbedText(Global.V2raySampleClient);
                 string txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
                 if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
diff --git a/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayN/v2rayN/Handler/LazyConfig.cs
index b9f259de..6a98f916 100644
--- a/v2rayN/v2rayN/Handler/LazyConfig.cs
+++ b/v2rayN/v2rayN/Handler/LazyConfig.cs
@@ -130,6 +130,15 @@ namespace v2rayN.Handler
             return SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.indexId == indexId);
         }
 
+        public ProfileItem? GetProfileItemViaRemarks(string remarks)
+        {
+            if (Utils.IsNullOrEmpty(remarks))
+            {
+                return null;
+            }
+            return SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.remarks == remarks);
+        }
+
         public List<RoutingItem> RoutingItems()
         {
             return SqliteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).OrderBy(t => t.sort).ToList();
diff --git a/v2rayN/v2rayN/Mode/SubItem.cs b/v2rayN/v2rayN/Mode/SubItem.cs
index 3221e914..c3fe2c21 100644
--- a/v2rayN/v2rayN/Mode/SubItem.cs
+++ b/v2rayN/v2rayN/Mode/SubItem.cs
@@ -27,5 +27,9 @@ namespace v2rayN.Mode
         public long updateTime { get; set; }
 
         public string? convertTarget { get; set; }
+
+        public string? prevProfile { get; set; }
+
+        public string? nextProfile { get; set; }
     }
 }
\ No newline at end of file

From 51576b54c3dc8eae969837433ce4f2e26388db1c Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 24 Dec 2023 10:34:55 +0800
Subject: [PATCH 02/62] Previous and next proxy setting

---
 v2rayN/v2rayN/App.xaml                       |  16 ++-
 v2rayN/v2rayN/Resx/ResUI.Designer.cs         |  27 +++++
 v2rayN/v2rayN/Resx/ResUI.resx                |   9 ++
 v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx        |   9 ++
 v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx        |   9 ++
 v2rayN/v2rayN/ViewModels/SubEditViewModel.cs |   2 +
 v2rayN/v2rayN/Views/AddServer2Window.xaml    |  13 ++-
 v2rayN/v2rayN/Views/SubEditWindow.xaml       | 104 ++++++++++++-------
 v2rayN/v2rayN/Views/SubEditWindow.xaml.cs    |   2 +
 9 files changed, 148 insertions(+), 43 deletions(-)

diff --git a/v2rayN/v2rayN/App.xaml b/v2rayN/v2rayN/App.xaml
index 3fc23de2..791d89da 100644
--- a/v2rayN/v2rayN/App.xaml
+++ b/v2rayN/v2rayN/App.xaml
@@ -1,9 +1,9 @@
 <Application
     x:Class="v2rayN.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     ShutdownMode="OnExplicitShutdown"
     StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
@@ -34,6 +34,12 @@
                 Left="8"
                 Right="8"
                 Top="8" />
+            <Thickness
+                x:Key="OutlinedTextBoxDefaultPadding"
+                Bottom="12"
+                Left="16"
+                Right="12"
+                Top="12" />
             <Style
                 x:Key="ModuleTitle"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
@@ -129,6 +135,7 @@
                 BasedOn="{StaticResource MaterialDesignOutlinedTextBox}"
                 TargetType="{x:Type TextBox}">
                 <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+                <Setter Property="Padding" Value="{StaticResource OutlinedTextBoxDefaultPadding}" />
             </Style>
             <Style
                 x:Key="MyGroupBox"
@@ -142,6 +149,13 @@
                 TargetType="{x:Type ListBoxItem}">
                 <Setter Property="Margin" Value="-2,0" />
             </Style>
+            <Style
+                x:Key="MyOutlinedTextComboBox"
+                BasedOn="{StaticResource MaterialDesignOutlinedComboBox}"
+                TargetType="{x:Type ComboBox}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+                <Setter Property="Padding" Value="{StaticResource OutlinedTextBoxDefaultPadding}" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index ef2bb980..4d7adae7 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -447,6 +447,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Next proxy remarks 的本地化字符串。
+        /// </summary>
+        public static string LvNextProfile {
+            get {
+                return ResourceManager.GetString("LvNextProfile", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Port 的本地化字符串。
         /// </summary>
@@ -456,6 +465,24 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Previous proxy remakrs 的本地化字符串。
+        /// </summary>
+        public static string LvPrevProfile {
+            get {
+                return ResourceManager.GetString("LvPrevProfile", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Please make sure the remarks exists and is unique 的本地化字符串。
+        /// </summary>
+        public static string LvPrevProfileTip {
+            get {
+                return ResourceManager.GetString("LvPrevProfileTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Remarks 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index b99e2368..0756f3f5 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -1153,4 +1153,13 @@
   <data name="TbHeaderType8" xml:space="preserve">
     <value>Congestion control</value>
   </data>
+  <data name="LvPrevProfile" xml:space="preserve">
+    <value>Previous proxy remakrs</value>
+  </data>
+  <data name="LvNextProfile" xml:space="preserve">
+    <value>Next proxy remarks</value>
+  </data>
+  <data name="LvPrevProfileTip" xml:space="preserve">
+    <value>Please make sure the remarks exists and is unique</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index 0432350d..25a7e3f0 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -1150,4 +1150,13 @@
   <data name="TbHeaderType8" xml:space="preserve">
     <value>拥塞控制算法</value>
   </data>
+  <data name="LvPrevProfile" xml:space="preserve">
+    <value>前置代理别名</value>
+  </data>
+  <data name="LvNextProfile" xml:space="preserve">
+    <value>落地代理別名</value>
+  </data>
+  <data name="LvPrevProfileTip" xml:space="preserve">
+    <value>请确保别名存在并唯一</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
index 06120c4f..f68bd3f0 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
@@ -1138,4 +1138,13 @@
   <data name="menuAddTuicServer" xml:space="preserve">
     <value>新增[Tuic]伺服器</value>
   </data>
+  <data name="LvPrevProfile" xml:space="preserve">
+    <value>前置代理別名</value>
+  </data>
+  <data name="LvNextProfile" xml:space="preserve">
+    <value>落地代理別名</value>
+  </data>
+  <data name="LvPrevProfileTip" xml:space="preserve">
+    <value>請確保別名存在並且唯一</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
index dcc30d50..d15e9a78 100644
--- a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
@@ -69,6 +69,8 @@ namespace v2rayN.ViewModels
                 item.sort = SelectedSource.sort;
                 item.filter = SelectedSource.filter;
                 item.convertTarget = SelectedSource.convertTarget;
+                item.prevProfile = SelectedSource.prevProfile;
+                item.nextProfile = SelectedSource.nextProfile;
             }
 
             if (ConfigHandler.AddSubItem(_config, item) == 0)
diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayN/v2rayN/Views/AddServer2Window.xaml
index 9ef69639..20dc079d 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml
@@ -97,17 +97,17 @@
                     Grid.Row="2"
                     Grid.Column="2"
                     VerticalAlignment="Center"
-                    Orientation="Vertical">
+                    Orientation="Horizontal">
                     <Button
                         x:Name="btnBrowse"
-                        Width="100"
-                        Margin="2,0,8,0"
+                        Width="80"
+                        Margin="2,0"
                         Content="{x:Static resx:ResUI.TbBrowse}"
                         Style="{StaticResource DefButton}" />
                     <Button
                         x:Name="btnEdit"
-                        Width="100"
-                        Margin="2,2,8,0"
+                        Width="80"
+                        Margin="2,0"
                         Content="{x:Static resx:ResUI.TbEdit}"
                         Style="{StaticResource DefButton}" />
                 </StackPanel>
@@ -126,9 +126,8 @@
                     Width="200"
                     Margin="4"
                     HorizontalAlignment="Left"
-                    FontSize="{DynamicResource StdFontSize}"
                     MaxDropDownHeight="1000"
-                    Style="{StaticResource MaterialDesignOutlinedComboBox}" />
+                    Style="{StaticResource MyOutlinedTextComboBox}" />
 
                 <TextBlock
                     Grid.Row="4"
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index 3a8c3885..75a69ded 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -30,17 +30,38 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
+    <DockPanel Margin="8">
+        <Grid
+            Margin="8"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="200" />
+            </Grid.ColumnDefinitions>
+            <Button
+                x:Name="btnSave"
+                Grid.Column="0"
+                Margin="4"
+                Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
+                Style="{StaticResource DefButton}" />
+            <Button
+                x:Name="btnCancel"
+                Grid.Column="1"
+                Margin="4"
+                Click="btnCancel_Click"
+                Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
+                IsCancel="true"
+                Style="{StaticResource DefButton}" />
+        </Grid>
+        <ScrollViewer
+            materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
+            HorizontalScrollBarVisibility="Auto"
+            VerticalScrollBarVisibility="Auto">
 
-    <ScrollViewer
-        materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
-        HorizontalScrollBarVisibility="Auto"
-        VerticalScrollBarVisibility="Auto">
-        <Grid Margin="8">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid Grid.Row="0">
+            <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
@@ -51,6 +72,8 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
@@ -209,9 +232,8 @@
                     Grid.Column="1"
                     Margin="4"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvConvertTargetTip}"
-                    FontSize="{DynamicResource StdFontSize}"
                     MaxDropDownHeight="1000"
-                    Style="{StaticResource MaterialDesignOutlinedComboBox}" />
+                    Style="{StaticResource MyOutlinedTextComboBox}" />
 
                 <TextBlock
                     Grid.Row="8"
@@ -229,32 +251,44 @@
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
                     Style="{StaticResource MyOutlinedTextBox}" />
-            </Grid>
-            <Grid
-                Grid.Row="1"
-                Margin="8"
-                HorizontalAlignment="Center">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="200" />
-                    <ColumnDefinition Width="200" />
-                </Grid.ColumnDefinitions>
-                <Button
-                    x:Name="btnSave"
+
+                <TextBlock
+                    Grid.Row="9"
                     Grid.Column="0"
                     Margin="4"
-                    Content="{x:Static resx:ResUI.TbConfirm}"
-                    Cursor="Hand"
-                    Style="{StaticResource DefButton}" />
-                <Button
-                    x:Name="btnCancel"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.LvPrevProfile}" />
+                <TextBox
+                    x:Name="txtPrevProfile"
+                    Grid.Row="9"
                     Grid.Column="1"
+                    Width="400"
                     Margin="4"
-                    Click="btnCancel_Click"
-                    Content="{x:Static resx:ResUI.TbCancel}"
-                    Cursor="Hand"
-                    IsCancel="true"
-                    Style="{StaticResource DefButton}" />
+                    VerticalAlignment="Top"
+                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"
+                    AcceptsReturn="True"
+                    Style="{StaticResource MyOutlinedTextBox}" />
+
+                <TextBlock
+                    Grid.Row="10"
+                    Grid.Column="0"
+                    Margin="4"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.LvNextProfile}" />
+                <TextBox
+                    x:Name="txtNextProfile"
+                    Grid.Row="10"
+                    Grid.Column="1"
+                    Width="400"
+                    Margin="4"
+                    VerticalAlignment="Top"
+                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"
+                    AcceptsReturn="True"
+                    Style="{StaticResource MyOutlinedTextBox}" />
             </Grid>
-        </Grid>
-    </ScrollViewer>
+
+        </ScrollViewer>
+    </DockPanel>
 </reactiveui:ReactiveWindow>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
index 521309d8..b1c35836 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
@@ -43,6 +43,8 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.SelectedSource.sort, v => v.txtSort.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.filter, v => v.txtFilter.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.convertTarget, v => v.cmbConvertTarget.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SelectedSource.prevProfile, v => v.txtPrevProfile.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SelectedSource.nextProfile, v => v.txtNextProfile.Text).DisposeWith(disposables);
 
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
             });

From b74188d90485cfee5a3a3124a9978dc3b70df923 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 25 Dec 2023 16:42:23 +0800
Subject: [PATCH 03/62] Previous and next proxy 4 sing-box

---
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs    | 69 +++++++++++++++----
 v2rayN/v2rayN/Handler/CoreConfigV2ray.cs      | 13 ++--
 v2rayN/v2rayN/Mode/SingboxConfig.cs           |  2 +-
 .../v2rayN/Sample/SingboxSampleClientConfig   | 11 ++-
 v2rayN/v2rayN/Sample/custom_routing_white     |  4 ++
 v2rayN/v2rayN/Sample/tun_singbox_rules        |  4 --
 6 files changed, 81 insertions(+), 22 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index c3607e87..4c396d11 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -45,7 +45,9 @@ namespace v2rayN.Handler
 
                 GenInbounds(singboxConfig);
 
-                GenOutbound(node, singboxConfig);
+                GenOutbound(node, singboxConfig.outbounds[0]);
+
+                GenMoreOutbounds(node, singboxConfig);
 
                 GenRouting(singboxConfig);
 
@@ -202,20 +204,10 @@ namespace v2rayN.Handler
 
         #region outbound private
 
-        private int GenOutbound(ProfileItem node, SingboxConfig singboxConfig)
+        private int GenOutbound(ProfileItem node, Outbound4Sbox outbound)
         {
             try
             {
-                if (_config.tunModeItem.enableTun)
-                {
-                    singboxConfig.outbounds.Add(new()
-                    {
-                        type = "dns",
-                        tag = "dns_out"
-                    });
-                }
-
-                var outbound = singboxConfig.outbounds[0];
                 outbound.server = node.address;
                 outbound.server_port = node.port;
 
@@ -442,6 +434,59 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        private int GenMoreOutbounds(ProfileItem node, SingboxConfig singboxConfig)
+        {
+            if (node.subid.IsNullOrEmpty())
+            {
+                return 0;
+            }
+            try
+            {
+                var subItem = LazyConfig.Instance.GetSubItem(node.subid);
+                if (subItem is null)
+                {
+                    return 0;
+                }
+
+                //current proxy
+                var outbound = singboxConfig.outbounds[0];
+                var txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
+
+                //Previous proxy
+                var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
+                if (prevNode is not null
+                    && prevNode.configType != EConfigType.Custom)
+                {
+                    var prevOutbound = Utils.FromJson<Outbound4Sbox>(txtOutbound);
+                    GenOutbound(prevNode, prevOutbound);
+                    prevOutbound.tag = $"{Global.ProxyTag}2";
+                    singboxConfig.outbounds.Add(prevOutbound);
+
+                    outbound.detour = prevOutbound.tag;
+                }
+
+                //Next proxy
+                var nextNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.nextProfile!);
+                if (nextNode is not null
+                    && nextNode.configType != EConfigType.Custom)
+                {
+                    var nextOutbound = Utils.FromJson<Outbound4Sbox>(txtOutbound);
+                    GenOutbound(nextNode, nextOutbound);
+                    nextOutbound.tag = Global.ProxyTag;
+                    singboxConfig.outbounds.Insert(0, nextOutbound);
+
+                    outbound.tag = $"{Global.ProxyTag}1";
+                    nextOutbound.detour = outbound.tag;
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+
+            return 0;
+        }
+
         #endregion outbound private
 
         #region routing rule private
diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
index 1123cdcc..8121f7a8 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
@@ -838,12 +838,15 @@ namespace v2rayN.Handler
 
                 //current proxy
                 var outbound = v2rayConfig.outbounds[0];
+                var txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
 
                 //Previous proxy
                 var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
-                if (prevNode is not null)
+                if (prevNode is not null
+                    && prevNode.configType != EConfigType.Custom
+                    && prevNode.configType != EConfigType.Hysteria2
+                    && prevNode.configType != EConfigType.Tuic)
                 {
-                    var txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
                     var prevOutbound = Utils.FromJson<Outbounds4Ray>(txtOutbound);
                     GenOutbound(prevNode, prevOutbound);
                     prevOutbound.tag = $"{Global.ProxyTag}2";
@@ -857,9 +860,11 @@ namespace v2rayN.Handler
 
                 //Next proxy
                 var nextNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.nextProfile!);
-                if (nextNode is not null)
+                if (nextNode is not null
+                    && nextNode.configType != EConfigType.Custom
+                    && nextNode.configType != EConfigType.Hysteria2
+                    && nextNode.configType != EConfigType.Tuic)
                 {
-                    var txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
                     var nextOutbound = Utils.FromJson<Outbounds4Ray>(txtOutbound);
                     GenOutbound(nextNode, nextOutbound);
                     nextOutbound.tag = Global.ProxyTag;
diff --git a/v2rayN/v2rayN/Mode/SingboxConfig.cs b/v2rayN/v2rayN/Mode/SingboxConfig.cs
index 99a914a1..8dfd8efd 100644
--- a/v2rayN/v2rayN/Mode/SingboxConfig.cs
+++ b/v2rayN/v2rayN/Mode/SingboxConfig.cs
@@ -105,7 +105,7 @@
         public int? recv_window_conn { get; set; }
         public int? recv_window { get; set; }
         public bool? disable_mtu_discovery { get; set; }
-        public string detour { get; set; }
+        public string? detour { get; set; }
         public string method { get; set; }
         public string username { get; set; }
         public string password { get; set; }
diff --git a/v2rayN/v2rayN/Sample/SingboxSampleClientConfig b/v2rayN/v2rayN/Sample/SingboxSampleClientConfig
index ce3d9305..8e34738f 100644
--- a/v2rayN/v2rayN/Sample/SingboxSampleClientConfig
+++ b/v2rayN/v2rayN/Sample/SingboxSampleClientConfig
@@ -25,9 +25,18 @@
 		{
 			"type": "block",
 			"tag": "block"
+		},
+		{
+			"tag": "dns_out",
+			"type": "dns"
 		}
 	],
 	"route": {
-		"rules": []
+		"rules": [
+			{
+				"protocol": [ "dns" ],
+				"outbound": "dns_out"
+			}
+		]
 	}
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Sample/custom_routing_white b/v2rayN/v2rayN/Sample/custom_routing_white
index 7a139e31..a708ae0d 100644
--- a/v2rayN/v2rayN/Sample/custom_routing_white
+++ b/v2rayN/v2rayN/Sample/custom_routing_white
@@ -24,5 +24,9 @@
       "geoip:private",
       "geoip:cn"
     ]
+  },
+  {
+    "port": "0-65535",
+    "outboundTag": "proxy"
   }
 ]
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Sample/tun_singbox_rules b/v2rayN/v2rayN/Sample/tun_singbox_rules
index 93762e27..528adb76 100644
--- a/v2rayN/v2rayN/Sample/tun_singbox_rules
+++ b/v2rayN/v2rayN/Sample/tun_singbox_rules
@@ -1,8 +1,4 @@
 [
-  {
-    "inbound": [ "dns_in" ],
-    "outbound": "dns_out"
-  },
   {
     "protocol": [ "dns" ],
     "outbound": "dns_out"

From 34f63f900636d34a0a0c58d5f79ac4bf0d7558f5 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 26 Dec 2023 18:13:12 +0800
Subject: [PATCH 04/62] Add ipv6 option for Tun mode

---
 v2rayN/v2rayN/Global.cs                       |  1 +
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs    |  6 +++-
 v2rayN/v2rayN/Mode/ConfigItems.cs             |  1 +
 v2rayN/v2rayN/Mode/SingboxConfig.cs           |  2 +-
 v2rayN/v2rayN/Resx/ResUI.Designer.cs          | 18 +++++++++++
 v2rayN/v2rayN/Resx/ResUI.resx                 |  6 ++++
 v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx         |  6 ++++
 v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx         |  6 ++++
 v2rayN/v2rayN/Sample/SingboxSampleOutbound    |  6 ++++
 .../ViewModels/OptionSettingViewModel.cs      |  6 ++++
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml  | 30 +++++++++++++++++++
 .../v2rayN/Views/OptionSettingWindow.xaml.cs  |  2 ++
 v2rayN/v2rayN/v2rayN.csproj                   |  4 ++-
 13 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 v2rayN/v2rayN/Sample/SingboxSampleOutbound

diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index 007629f6..81858e25 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -39,6 +39,7 @@ namespace v2rayN
         public const string V2raySampleHttpresponseFileName = "v2rayN.Sample.SampleHttpresponse";
         public const string V2raySampleInbound = "v2rayN.Sample.SampleInbound";
         public const string V2raySampleOutbound = "v2rayN.Sample.SampleOutbound";
+        public const string SingboxSampleOutbound = "v2rayN.Sample.SingboxSampleOutbound";
         public const string CustomRoutingFileName = "v2rayN.Sample.custom_routing_";
         public const string TunSingboxDNSFileName = "v2rayN.Sample.tun_singbox_dns";
         public const string TunSingboxInboundFileName = "v2rayN.Sample.tun_singbox_inbound";
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index 4c396d11..7c012342 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -180,6 +180,10 @@ namespace v2rayN.Handler
                     tunInbound.mtu = _config.tunModeItem.mtu;
                     tunInbound.strict_route = _config.tunModeItem.strictRoute;
                     tunInbound.stack = _config.tunModeItem.stack;
+                    if (_config.tunModeItem.enableIPv6Address == false)
+                    {
+                        tunInbound.inet6_address = null;
+                    }
 
                     singboxConfig.inbounds.Add(tunInbound);
                 }
@@ -450,7 +454,7 @@ namespace v2rayN.Handler
 
                 //current proxy
                 var outbound = singboxConfig.outbounds[0];
-                var txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
+                var txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
 
                 //Previous proxy
                 var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
diff --git a/v2rayN/v2rayN/Mode/ConfigItems.cs b/v2rayN/v2rayN/Mode/ConfigItems.cs
index ef83051b..57068635 100644
--- a/v2rayN/v2rayN/Mode/ConfigItems.cs
+++ b/v2rayN/v2rayN/Mode/ConfigItems.cs
@@ -164,6 +164,7 @@ namespace v2rayN.Mode
         public string stack { get; set; }
         public int mtu { get; set; }
         public bool enableExInbound { get; set; }
+        public bool enableIPv6Address { get; set; } = true;
     }
 
     [Serializable]
diff --git a/v2rayN/v2rayN/Mode/SingboxConfig.cs b/v2rayN/v2rayN/Mode/SingboxConfig.cs
index 8dfd8efd..aa0b6b68 100644
--- a/v2rayN/v2rayN/Mode/SingboxConfig.cs
+++ b/v2rayN/v2rayN/Mode/SingboxConfig.cs
@@ -72,7 +72,7 @@
         public string? domain_strategy { get; set; }
         public string interface_name { get; set; }
         public string inet4_address { get; set; }
-        public string inet6_address { get; set; }
+        public string? inet6_address { get; set; }
         public int? mtu { get; set; }
         public bool? auto_route { get; set; }
         public bool? strict_route { get; set; }
diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index 4d7adae7..40c35dfe 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -2554,6 +2554,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable additional Inbound 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableExInbound {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableExInbound", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Enable hardware acceleration(Require restart) 的本地化字符串。
         /// </summary>
@@ -2563,6 +2572,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable IPv6 Address 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableIPv6Address {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableIPv6Address", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Exception 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index 0756f3f5..06e2ea02 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -1162,4 +1162,10 @@
   <data name="LvPrevProfileTip" xml:space="preserve">
     <value>Please make sure the remarks exists and is unique</value>
   </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>Enable additional Inbound</value>
+  </data>
+  <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
+    <value>Enable IPv6 Address</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index 25a7e3f0..5fbeefcc 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -1159,4 +1159,10 @@
   <data name="LvPrevProfileTip" xml:space="preserve">
     <value>请确保别名存在并唯一</value>
   </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>启用额外监听端口</value>
+  </data>
+  <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
+    <value>启用IPv6</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
index f68bd3f0..858e1b71 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
@@ -1147,4 +1147,10 @@
   <data name="LvPrevProfileTip" xml:space="preserve">
     <value>請確保別名存在並且唯一</value>
   </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>啟用額外監聽端口</value>
+  </data>
+  <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
+    <value>啟用IPv6</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Sample/SingboxSampleOutbound b/v2rayN/v2rayN/Sample/SingboxSampleOutbound
new file mode 100644
index 00000000..9c87194f
--- /dev/null
+++ b/v2rayN/v2rayN/Sample/SingboxSampleOutbound
@@ -0,0 +1,6 @@
+{
+	"type": "vless",
+	"tag": "proxy",
+	"server": "",
+	"server_port": 443
+}
\ No newline at end of file
diff --git a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
index afb33fdb..8a49279f 100644
--- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
@@ -83,6 +83,8 @@ namespace v2rayN.ViewModels
         [Reactive] public bool TunStrictRoute { get; set; }
         [Reactive] public string TunStack { get; set; }
         [Reactive] public int TunMtu { get; set; }
+        [Reactive] public bool TunEnableExInbound { get; set; }
+        [Reactive] public bool TunEnableIPv6Address { get; set; }
 
         #endregion Tun mode
 
@@ -174,6 +176,8 @@ namespace v2rayN.ViewModels
             TunStrictRoute = _config.tunModeItem.strictRoute;
             TunStack = _config.tunModeItem.stack;
             TunMtu = _config.tunModeItem.mtu;
+            TunEnableExInbound = _config.tunModeItem.enableExInbound;
+            TunEnableIPv6Address = _config.tunModeItem.enableIPv6Address;
 
             #endregion Tun mode
 
@@ -319,6 +323,8 @@ namespace v2rayN.ViewModels
             _config.tunModeItem.strictRoute = TunStrictRoute;
             _config.tunModeItem.stack = TunStack;
             _config.tunModeItem.mtu = TunMtu;
+            _config.tunModeItem.enableExInbound = TunEnableExInbound;
+            _config.tunModeItem.enableIPv6Address = TunEnableIPv6Address;
 
             //coreType
             SaveCoreType();
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index 7aa5ec35..b94b7a86 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -805,6 +805,8 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -857,6 +859,34 @@
                             Margin="{StaticResource SettingItemMargin}"
                             HorizontalAlignment="Left"
                             Style="{StaticResource DefComboBox}" />
+
+                        <TextBlock
+                            Grid.Row="5"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsEnableExInbound}" />
+                        <ToggleButton
+                            x:Name="togEnableExInbound"
+                            Grid.Row="5"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
+
+                        <TextBlock
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsEnableIPv6Address}" />
+                        <ToggleButton
+                            x:Name="togEnableIPv6Address"
+                            Grid.Row="6"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
                     </Grid>
                 </DockPanel>
             </TabItem>
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
index fb445ebe..45ff0e28 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -186,6 +186,8 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.TunStrictRoute, v => v.togStrictRoute.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunStack, v => v.cmbStack.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunMtu, v => v.cmbMtu.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.TunEnableExInbound, v => v.togEnableExInbound.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.TunEnableIPv6Address, v => v.togEnableIPv6Address.IsChecked).DisposeWith(disposables);
 
                 this.Bind(ViewModel, vm => vm.CoreType1, v => v.cmbCoreType1.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.CoreType2, v => v.cmbCoreType2.Text).DisposeWith(disposables);
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index 87a56ca3..0106c0bc 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -11,7 +11,8 @@
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2023 (GPLv3)</Copyright>
 		<FileVersion>6.31</FileVersion>
-	</PropertyGroup> 
+	</PropertyGroup>
+	
 	<ItemGroup>
 		<PackageReference Include="Downloader" Version="3.0.6" />		
 		<PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
@@ -30,6 +31,7 @@
 	
 	<ItemGroup>       
         <AdditionalFiles Include="app.manifest" />       
+        <EmbeddedResource Include="Sample\SingboxSampleOutbound" />       
         <EmbeddedResource Include="Sample\SingboxSampleClientConfig">
           <CopyToOutputDirectory>Never</CopyToOutputDirectory>
         </EmbeddedResource>

From 83b4ab83d1417eca08d3f9d268e2ce03535bd584 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 29 Dec 2023 09:39:55 +0800
Subject: [PATCH 05/62] =?UTF-8?q?Improve=20speed=20test=EF=BC=8Cadd=20Hy2?=
 =?UTF-8?q?=20and=20Tuic=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 v2rayN/v2rayN/Global.cs                    |   1 +
 v2rayN/v2rayN/Handler/CoreConfigHandler.cs |  22 ++-
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs | 172 +++++++++++++++++++--
 v2rayN/v2rayN/Handler/CoreConfigV2ray.cs   |  20 ++-
 v2rayN/v2rayN/Handler/CoreHandler.cs       |  85 +++-------
 v2rayN/v2rayN/Handler/LazyConfig.cs        |   4 +-
 v2rayN/v2rayN/Handler/SpeedtestHandler.cs  |  13 +-
 7 files changed, 222 insertions(+), 95 deletions(-)

diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index 81858e25..ea7fe878 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -33,6 +33,7 @@ namespace v2rayN
         public const string ConfigDB = "guiNDB.db";
         public const string CoreConfigFileName = "config.json";
         public const string CorePreConfigFileName = "configPre.json";
+        public const string CoreSpeedtestConfigFileName = "configSpeedtest.json";
         public const string V2raySampleClient = "v2rayN.Sample.SampleClientConfig";
         public const string SingboxSampleClient = "v2rayN.Sample.SingboxSampleClientConfig";
         public const string V2raySampleHttprequestFileName = "v2rayN.Sample.SampleHttprequest";
diff --git a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
index 00f4e9ec..2fca828a 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
@@ -150,10 +150,26 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        public static string GenerateClientSpeedtestConfigString(Config config, List<ServerTestItem> selecteds, out string msg)
+        public static int GenerateClientSpeedtestConfig(Config config, string fileName, List<ServerTestItem> selecteds, ECoreType coreType, out string msg)
         {
-            var coreConfigV2ray = new CoreConfigV2ray(config);
-            return coreConfigV2ray.GenerateClientSpeedtestConfigString(selecteds, out msg);
+            if (coreType == ECoreType.sing_box)
+            {
+                if ((new CoreConfigSingbox(config)).GenerateClientSpeedtestConfig(selecteds, out SingboxConfig? singboxConfig, out msg) != 0)
+                {
+                    return -1;
+                }
+                Utils.ToJsonFile(singboxConfig, fileName, false);
+            }
+            else
+            {
+                if ((new CoreConfigV2ray(config)).GenerateClientSpeedtestConfig(selecteds, out V2rayConfig? v2rayConfig, out msg) != 0)
+                {
+                    return -1;
+                }
+
+                Utils.ToJsonFile(v2rayConfig, fileName, false);
+            }
+            return 0;
         }
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index 7c012342..bf8c3f75 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -1,4 +1,6 @@
-using v2rayN.Base;
+using System.Net;
+using System.Net.NetworkInformation;
+using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Resx;
 
@@ -66,6 +68,8 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        #region private gen function
+
         private int GenLog(SingboxConfig singboxConfig)
         {
             try
@@ -102,8 +106,6 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        #region inbound private
-
         private int GenInbounds(SingboxConfig singboxConfig)
         {
             try
@@ -204,10 +206,6 @@ namespace v2rayN.Handler
             return inbound;
         }
 
-        #endregion inbound private
-
-        #region outbound private
-
         private int GenOutbound(ProfileItem node, Outbound4Sbox outbound)
         {
             try
@@ -491,10 +489,6 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        #endregion outbound private
-
-        #region routing rule private
-
         private int GenRouting(SingboxConfig singboxConfig)
         {
             try
@@ -720,10 +714,6 @@ namespace v2rayN.Handler
             }
         }
 
-        #endregion routing rule private
-
-        #region dns private
-
         private int GenDns(ProfileItem node, SingboxConfig singboxConfig)
         {
             try
@@ -780,8 +770,6 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        #endregion dns private
-
         private int GenStatistic(SingboxConfig singboxConfig)
         {
             if (_config.guiItem.enableStatistics)
@@ -805,5 +793,155 @@ namespace v2rayN.Handler
             }
             return 0;
         }
+
+        #endregion private gen function
+
+        #region Gen speedtest config
+
+        public int GenerateClientSpeedtestConfig(List<ServerTestItem> selecteds, out SingboxConfig? singboxConfig, out string msg)
+        {
+            singboxConfig = null;
+            try
+            {
+                if (_config == null)
+                {
+                    msg = ResUI.CheckServerSettings;
+                    return -1;
+                }
+
+                msg = ResUI.InitialConfiguration;
+
+                string result = Utils.GetEmbedText(Global.SingboxSampleClient);
+                string txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
+                if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
+                {
+                    msg = ResUI.FailedGetDefaultConfiguration;
+                    return -1;
+                }
+
+                singboxConfig = Utils.FromJson<SingboxConfig>(result);
+                if (singboxConfig == null)
+                {
+                    msg = ResUI.FailedGenDefaultConfiguration;
+                    return -1;
+                }
+                List<IPEndPoint> lstIpEndPoints = new();
+                List<TcpConnectionInformation> lstTcpConns = new();
+                try
+                {
+                    lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+                    lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
+                    lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
+                }
+                catch (Exception ex)
+                {
+                    Utils.SaveLog(ex.Message, ex);
+                }
+
+                GenLog(singboxConfig);
+                GenDns(new(), singboxConfig);
+                singboxConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
+                singboxConfig.outbounds.RemoveAt(0);
+
+                int httpPort = LazyConfig.Instance.GetLocalPort("speedtest");
+
+                foreach (var it in selecteds)
+                {
+                    if (it.configType == EConfigType.Custom)
+                    {
+                        continue;
+                    }
+                    if (it.port <= 0)
+                    {
+                        continue;
+                    }
+                    if (it.configType is EConfigType.VMess or EConfigType.VLESS)
+                    {
+                        var item2 = LazyConfig.Instance.GetProfileItem(it.indexId);
+                        if (item2 is null || Utils.IsNullOrEmpty(item2.id) || !Utils.IsGuidByParse(item2.id))
+                        {
+                            continue;
+                        }
+                    }
+
+                    //find unuse port
+                    var port = httpPort;
+                    for (int k = httpPort; k < Global.MaxPort; k++)
+                    {
+                        if (lstIpEndPoints?.FindIndex(_it => _it.Port == k) >= 0)
+                        {
+                            continue;
+                        }
+                        if (lstTcpConns?.FindIndex(_it => _it.LocalEndPoint.Port == k) >= 0)
+                        {
+                            continue;
+                        }
+                        //found
+                        port = k;
+                        httpPort = port + 1;
+                        break;
+                    }
+
+                    //Port In Used
+                    if (lstIpEndPoints?.FindIndex(_it => _it.Port == port) >= 0)
+                    {
+                        continue;
+                    }
+                    it.port = port;
+                    it.allowTest = true;
+
+                    //inbound
+                    Inbound4Sbox inbound = new()
+                    {
+                        listen = Global.Loopback,
+                        listen_port = port,
+                        type = Global.InboundHttp
+                    };
+                    inbound.tag = Global.InboundHttp + inbound.listen_port.ToString();
+                    singboxConfig.inbounds.Add(inbound);
+
+                    //outbound
+                    var item = LazyConfig.Instance.GetProfileItem(it.indexId);
+                    if (item is null)
+                    {
+                        continue;
+                    }
+                    if (item.configType == EConfigType.Shadowsocks
+                        && !Global.SsSecuritysInXray.Contains(item.security))
+                    {
+                        continue;
+                    }
+                    if (item.configType == EConfigType.VLESS
+                     && !Global.Flows.Contains(item.flow))
+                    {
+                        continue;
+                    }
+
+                    var outbound = Utils.FromJson<Outbound4Sbox>(txtOutbound);
+                    GenOutbound(item, outbound);
+                    outbound.tag = Global.ProxyTag + inbound.listen_port.ToString();
+                    singboxConfig.outbounds.Add(outbound);
+
+                    //rule
+                    Rule4Sbox rule = new()
+                    {
+                        inbound = new List<string> { inbound.tag },
+                        outbound = outbound.tag
+                    };
+                    singboxConfig.route.rules.Add(rule);
+                }
+
+                //msg = string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                msg = ResUI.FailedGenDefaultConfiguration;
+                return -1;
+            }
+        }
+
+        #endregion Gen speedtest config
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
index 8121f7a8..1f1eb390 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
@@ -70,6 +70,8 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        #region private gen function
+
         private int GenLog(V2rayConfig v2rayConfig)
         {
             try
@@ -885,16 +887,19 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        #endregion private gen function
+
         #region Gen speedtest config
 
-        public string GenerateClientSpeedtestConfigString(List<ServerTestItem> selecteds, out string msg)
+        public int GenerateClientSpeedtestConfig(List<ServerTestItem> selecteds, out V2rayConfig? v2rayConfig, out string msg)
         {
+            v2rayConfig = null;
             try
             {
                 if (_config == null)
                 {
                     msg = ResUI.CheckServerSettings;
-                    return "";
+                    return -1;
                 }
 
                 msg = ResUI.InitialConfiguration;
@@ -904,14 +909,14 @@ namespace v2rayN.Handler
                 if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
                 {
                     msg = ResUI.FailedGetDefaultConfiguration;
-                    return "";
+                    return -1;
                 }
 
-                var v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                v2rayConfig = Utils.FromJson<V2rayConfig>(result);
                 if (v2rayConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
-                    return "";
+                    return -1;
                 }
                 List<IPEndPoint> lstIpEndPoints = new();
                 List<TcpConnectionInformation> lstTcpConns = new();
@@ -928,6 +933,7 @@ namespace v2rayN.Handler
 
                 GenLog(v2rayConfig);
                 v2rayConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
+                v2rayConfig.outbounds.RemoveAt(0);
 
                 int httpPort = LazyConfig.Instance.GetLocalPort("speedtest");
 
@@ -1019,13 +1025,13 @@ namespace v2rayN.Handler
                 }
 
                 //msg = string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
-                return Utils.ToJson(v2rayConfig);
+                return 0;
             }
             catch (Exception ex)
             {
                 Utils.SaveLog(ex.Message, ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
-                return "";
+                return -1;
             }
         }
 
diff --git a/v2rayN/v2rayN/Handler/CoreHandler.cs b/v2rayN/v2rayN/Handler/CoreHandler.cs
index 377b0758..5a85e014 100644
--- a/v2rayN/v2rayN/Handler/CoreHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreHandler.cs
@@ -67,18 +67,19 @@ namespace v2rayN.Handler
             }
         }
 
-        public int LoadCoreConfigString(List<ServerTestItem> _selecteds)
+        public int LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
         {
             int pid = -1;
-            string configStr = CoreConfigHandler.GenerateClientSpeedtestConfigString(_config, _selecteds, out string msg);
-            if (configStr == "")
+            var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic) ? ECoreType.sing_box : ECoreType.Xray;
+            string configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
+            if (CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType, out string msg) != 0)
             {
                 ShowMsg(false, msg);
             }
             else
             {
                 ShowMsg(false, msg);
-                pid = CoreStartViaString(configStr);
+                pid = CoreStartSpeedtest(configPath, coreType);
             }
             return pid;
         }
@@ -115,7 +116,7 @@ namespace v2rayN.Handler
                         }
                         foreach (string vName in it.coreExes)
                         {
-                            Process[] existing = Process.GetProcessesByName(vName);
+                            var existing = Process.GetProcessesByName(vName);
                             foreach (Process p in existing)
                             {
                                 string? path = p.MainModule?.FileName;
@@ -138,7 +139,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                Process _p = Process.GetProcessById(pid);
+                var _p = Process.GetProcessById(pid);
                 KillProcess(_p);
             }
             catch (Exception ex)
@@ -218,62 +219,20 @@ namespace v2rayN.Handler
             }
         }
 
-        private int CoreStartViaString(string configStr)
+        private int CoreStartSpeedtest(string configPath, ECoreType coreType)
         {
             ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
 
             try
             {
-                var coreInfo = LazyConfig.Instance.GetCoreInfo(ECoreType.Xray);
-                string fileName = CoreFindexe(coreInfo);
-                if (fileName == "") return -1;
-
-                Process p = new()
+                var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
+                var proc = RunProcess(new(), coreInfo, $" -c {configPath}", true, ShowMsg);
+                if (proc is null)
                 {
-                    StartInfo = new ProcessStartInfo
-                    {
-                        FileName = fileName,
-                        Arguments = "-config stdin:",
-                        WorkingDirectory = Utils.GetConfigPath(),
-                        UseShellExecute = false,
-                        RedirectStandardInput = true,
-                        RedirectStandardOutput = true,
-                        RedirectStandardError = true,
-                        CreateNoWindow = true,
-                        StandardOutputEncoding = Encoding.UTF8,
-                        StandardErrorEncoding = Encoding.UTF8
-                    }
-                };
-                p.OutputDataReceived += (sender, e) =>
-                {
-                    if (!String.IsNullOrEmpty(e.Data))
-                    {
-                        string msg = e.Data + Environment.NewLine;
-                        ShowMsg(false, msg);
-                    }
-                };
-                p.ErrorDataReceived += (sender, e) =>
-                {
-                    if (!string.IsNullOrEmpty(e.Data))
-                    {
-                        string msg = e.Data + Environment.NewLine;
-                        ShowMsg(false, msg);
-                    }
-                };
-                p.Start();
-                p.BeginOutputReadLine();
-                p.BeginErrorReadLine();
-
-                p.StandardInput.Write(configStr);
-                p.StandardInput.Close();
-
-                if (p.WaitForExit(1000))
-                {
-                    throw new Exception(p.StandardError.ReadToEnd());
+                    return -1;
                 }
 
-                Global.ProcessJob.AddProcess(p.Handle);
-                return p.Id;
+                return proc.Id;
             }
             catch (Exception ex)
             {
@@ -302,7 +261,7 @@ namespace v2rayN.Handler
                 }
                 Process proc = new()
                 {
-                    StartInfo = new ProcessStartInfo
+                    StartInfo = new()
                     {
                         FileName = fileName,
                         Arguments = string.Format(coreInfo.arguments, configPath),
@@ -358,16 +317,20 @@ namespace v2rayN.Handler
             }
         }
 
-        private void KillProcess(Process p)
+        private void KillProcess(Process? proc)
         {
+            if (proc is null)
+            {
+                return;
+            }
             try
             {
-                p.CloseMainWindow();
-                p.WaitForExit(100);
-                if (!p.HasExited)
+                proc.CloseMainWindow();
+                proc.WaitForExit(100);
+                if (!proc.HasExited)
                 {
-                    p.Kill();
-                    p.WaitForExit(100);
+                    proc.Kill();
+                    proc.WaitForExit(100);
                 }
             }
             catch (Exception ex)
diff --git a/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayN/v2rayN/Handler/LazyConfig.cs
index 6a98f916..73040e24 100644
--- a/v2rayN/v2rayN/Handler/LazyConfig.cs
+++ b/v2rayN/v2rayN/Handler/LazyConfig.cs
@@ -277,7 +277,7 @@ namespace v2rayN.Handler
             {
                 coreType = ECoreType.Xray,
                 coreExes = new List<string> { "xray", "wxray" },
-                arguments = "",
+                arguments = "run {0}",
                 coreUrl = Global.XrayCoreUrl,
                 coreReleaseApiUrl = Global.XrayCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
                 coreDownloadUrl32 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
@@ -364,7 +364,7 @@ namespace v2rayN.Handler
             {
                 coreType = ECoreType.sing_box,
                 coreExes = new List<string> { "sing-box-client", "sing-box" },
-                arguments = "run{0}",
+                arguments = "run {0} --disable-color",
                 coreUrl = Global.SingboxCoreUrl,
                 redirectInfo = true,
                 coreReleaseApiUrl = Global.SingboxCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
index 0b828973..dad40271 100644
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -30,7 +30,7 @@ namespace v2rayN.Handler
             _selecteds = new List<ServerTestItem>();
             foreach (var it in selecteds)
             {
-                if (it.configType == EConfigType.Custom || it.configType == EConfigType.Hysteria2 || it.configType == EConfigType.Tuic)
+                if (it.configType == EConfigType.Custom)
                 {
                     continue;
                 }
@@ -150,7 +150,7 @@ namespace v2rayN.Handler
             {
                 string msg = string.Empty;
 
-                pid = _coreHandler.LoadCoreConfigString(_selecteds);
+                pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
                 if (pid < 0)
                 {
                     UpdateFunc("", ResUI.FailedToRunCore);
@@ -196,7 +196,10 @@ namespace v2rayN.Handler
             }
             finally
             {
-                if (pid > 0) _coreHandler.CoreStopPid(pid);
+                if (pid > 0)
+                {
+                    _coreHandler.CoreStopPid(pid);
+                }
                 ProfileExHandler.Instance.SaveTo();
             }
 
@@ -211,7 +214,7 @@ namespace v2rayN.Handler
             //    _selecteds = _selecteds.OrderBy(t => t.delay).ToList();
             //}
 
-            pid = _coreHandler.LoadCoreConfigString(_selecteds);
+            pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
             if (pid < 0)
             {
                 UpdateFunc("", ResUI.FailedToRunCore);
@@ -268,7 +271,7 @@ namespace v2rayN.Handler
         private async Task RunSpeedTestMulti()
         {
             int pid = -1;
-            pid = _coreHandler.LoadCoreConfigString(_selecteds);
+            pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
             if (pid < 0)
             {
                 UpdateFunc("", ResUI.FailedToRunCore);

From f5f944aa50a4804bddf5476a23cd777a27478e52 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 29 Dec 2023 10:02:24 +0800
Subject: [PATCH 06/62] up 6.32

---
 v2rayN/v2rayN/v2rayN.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index 0106c0bc..a1ce67c9 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -10,7 +10,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2023 (GPLv3)</Copyright>
-		<FileVersion>6.31</FileVersion>
+		<FileVersion>6.32</FileVersion>
 	</PropertyGroup>
 	
 	<ItemGroup>

From 2ca34fb9ad1f76af9846c5f1be30862d75125445 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 29 Dec 2023 18:16:02 +0800
Subject: [PATCH 07/62] Bug fix

---
 v2rayN/v2rayN/Handler/CoreHandler.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN/Handler/CoreHandler.cs b/v2rayN/v2rayN/Handler/CoreHandler.cs
index 5a85e014..905c245f 100644
--- a/v2rayN/v2rayN/Handler/CoreHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreHandler.cs
@@ -223,10 +223,11 @@ namespace v2rayN.Handler
         {
             ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
 
+            ShowMsg(false, configPath);
             try
             {
                 var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
-                var proc = RunProcess(new(), coreInfo, $" -c {configPath}", true, ShowMsg);
+                var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true, ShowMsg);
                 if (proc is null)
                 {
                     return -1;

From 78625d82ae498c57ba9b69df1ef79cab70ed00ab Mon Sep 17 00:00:00 2001
From: ShiinaRinne <45081750+ShiinaRinne@users.noreply.github.com>
Date: Tue, 2 Jan 2024 15:03:21 +0800
Subject: [PATCH 08/62] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ico=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9B=BE=E6=A0=87=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
index 8bfe704b..39b8556e 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
@@ -132,10 +132,10 @@ namespace v2rayN.Views
         private void btnBrowse_Click(object sender, System.Windows.RoutedEventArgs e)
         {
             var openFileDialog1 = new OpenFileDialog();
-            openFileDialog1.Filter = "PNG|*.png";
+            openFileDialog1.Filter = "PNG,ICO|*.png;*.ico";
             openFileDialog1.ShowDialog();
 
             txtCustomIcon.Text = openFileDialog1.FileName;
         }
     }
-}
\ No newline at end of file
+}

From 18ce2f7b1c0fb99d510fd1b95dcdeea3a69e0fd5 Mon Sep 17 00:00:00 2001
From: ShiinaRinne <45081750+ShiinaRinne@users.noreply.github.com>
Date: Tue, 2 Jan 2024 15:34:42 +0800
Subject: [PATCH 09/62] =?UTF-8?q?fix:=20=E5=BD=93=E5=85=B3=E9=97=AD"?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=B7=9F=E9=9A=8F=E7=B3=BB=E7=BB=9F=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98"=E6=97=B6=EF=BC=8C=E6=97=A0=E6=B3=95=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8"=E6=9A=97=E9=BB=91=E6=A8=A1=E5=BC=8F"=E7=9A=84?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index 0902d880..ef654fe5 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -1726,6 +1726,10 @@ namespace v2rayN.ViewModels
                             {
                                 ModifyTheme(!Utils.IsLightTheme());
                             }
+                            else
+                            {
+                                ModifyTheme(ColorModeDark);
+                            }
                         }
                     });
 

From 609360a1d058200d1af3722593e6ac2239b7ea65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=8B=E6=A2=A6?=
 <37858783+canmengxian@users.noreply.github.com>
Date: Tue, 2 Jan 2024 23:52:14 +0800
Subject: [PATCH 10/62] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E8=BF=90=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fb66bdc4..54cecbda 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,13 +18,13 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: 删除工作流运行
-      uses: Mattraks/delete-workflow-runs@v2
-      with:
-        token: ${{ github.token }}
-        repository: ${{ github.repository }}
-        retain_days: 0
-        keep_minimum_runs: 1
+    # - name: 删除工作流运行
+    #   uses: Mattraks/delete-workflow-runs@v2
+    #   with:
+    #     token: ${{ github.token }}
+    #     repository: ${{ github.repository }}
+    #     retain_days: 0
+    #     keep_minimum_runs: 1
 
     - name: Build
       run:  cd v2rayN && 
@@ -58,4 +58,4 @@ jobs:
     #         * This is an automated deployment of GitHub Actions, the change log should be updated manually soon
             
     #         ## 更新日志
-    #         * 这是 GitHub Actions 自动化部署，更新日志应该很快会手动更新
\ No newline at end of file
+    #         * 这是 GitHub Actions 自动化部署，更新日志应该很快会手动更新

From a49455f330c86d19fc3821c45775bd1c26822fef Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 5 Jan 2024 13:48:42 +0800
Subject: [PATCH 11/62] Code clean

---
 v2rayN/ProtosLib/ProtosLib.csproj                    |  4 ++--
 v2rayN/v2rayN/App.xaml                               |  2 +-
 v2rayN/v2rayN/Views/MainWindow.xaml                  | 12 ++++++------
 v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs |  2 +-
 v2rayN/v2rayN/Views/SubEditWindow.xaml               |  9 ++++-----
 v2rayN/v2rayN/v2rayN.csproj                          |  6 +++---
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/v2rayN/ProtosLib/ProtosLib.csproj b/v2rayN/ProtosLib/ProtosLib.csproj
index 3beb2fef..3abd78a8 100644
--- a/v2rayN/ProtosLib/ProtosLib.csproj
+++ b/v2rayN/ProtosLib/ProtosLib.csproj
@@ -10,8 +10,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Google.Protobuf" Version="3.25.1" />
-		<PackageReference Include="Grpc.Net.Client" Version="2.59.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.59.0">
+		<PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.60.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/v2rayN/v2rayN/App.xaml b/v2rayN/v2rayN/App.xaml
index 791d89da..e9c027a0 100644
--- a/v2rayN/v2rayN/App.xaml
+++ b/v2rayN/v2rayN/App.xaml
@@ -1,9 +1,9 @@
 <Application
     x:Class="v2rayN.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:conv="clr-namespace:v2rayN.Converters"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     ShutdownMode="OnExplicitShutdown"
     StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 0ae5dcb4..e22a9c3b 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -1,17 +1,17 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tb="clr-namespace:H.NotifyIcon;assembly=H.NotifyIcon.Wpf"
     xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:conv="clr-namespace:v2rayN.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:v2rayN.Views"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:v2rayN.Resx"
-    xmlns:tb="clr-namespace:H.NotifyIcon;assembly=H.NotifyIcon.Wpf"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
+    xmlns:local="clr-namespace:v2rayN.Views"
     Title="v2rayN"
     Width="900"
     Height="700"
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
index 39b8556e..b6ed8a8f 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
@@ -138,4 +138,4 @@ namespace v2rayN.Views
             txtCustomIcon.Text = openFileDialog1.FileName;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index 75a69ded..94c2ee6b 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -1,12 +1,12 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.SubEditWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuSubSetting}"
@@ -288,7 +288,6 @@
                     AcceptsReturn="True"
                     Style="{StaticResource MyOutlinedTextBox}" />
             </Grid>
-
         </ScrollViewer>
     </DockPanel>
 </reactiveui:ReactiveWindow>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index a1ce67c9..5a26da22 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -16,15 +16,15 @@
 	<ItemGroup>
 		<PackageReference Include="Downloader" Version="3.0.6" />		
 		<PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
-		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.123" />
+		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.124" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="QRCoder.Xaml" Version="1.4.3" />
 		<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
 		<PackageReference Include="TaskScheduler" Version="2.10.1" /> 
 		<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
-		<PackageReference Include="ReactiveUI.Fody" Version="19.5.31" />
+		<PackageReference Include="ReactiveUI.Fody" Version="19.5.39" />
 		<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
-		<PackageReference Include="ReactiveUI.WPF" Version="19.5.31" />
+		<PackageReference Include="ReactiveUI.WPF" Version="19.5.39" />
 		<PackageReference Include="Splat.NLog" Version="14.8.12" />
 		<PackageReference Include="System.Reactive" Version="6.0.0" />
 	</ItemGroup>

From 80ed8346be4b3a4efd42a71c75ecc754c8d9700f Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 6 Jan 2024 10:41:07 +0800
Subject: [PATCH 12/62] Bug fix

---
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs |  9 ++++++---
 v2rayN/v2rayN/Handler/StatisticsHandler.cs | 14 ++++++--------
 v2rayN/v2rayN/Handler/StatisticsV2ray.cs   | 19 +++++++++++++------
 v2rayN/v2rayN/Mode/SingboxConfig.cs        | 17 +++++++++++++----
 v2rayN/v2rayN/Tool/Utils.cs                |  4 ++--
 5 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index bf8c3f75..a42fe30c 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -776,18 +776,21 @@ namespace v2rayN.Handler
             {
                 singboxConfig.experimental = new Experimental4Sbox()
                 {
+                    //cache_file = new CacheFile4Sbox()
+                    //{
+                    //    enabled = true
+                    //},
                     //v2ray_api = new V2ray_Api4Sbox()
                     //{
-                    //    listen = $"{Global.Loopback}:{Global.statePort}",
+                    //    listen = $"{Global.Loopback}:{Global.StatePort}",
                     //    stats = new Stats4Sbox()
                     //    {
                     //        enabled = true,
                     //    }
-                    //}
+                    //},
                     clash_api = new Clash_Api4Sbox()
                     {
                         external_controller = $"{Global.Loopback}:{Global.StatePort}",
-                        store_selected = true
                     }
                 };
             }
diff --git a/v2rayN/v2rayN/Handler/StatisticsHandler.cs b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
index 7e3f9dc0..c32a7d74 100644
--- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
@@ -143,14 +143,12 @@ namespace v2rayN.Handler
                 {
                     return defaultPort;
                 }
-                for (int i = 0; i < 3; i++)
-                {
-                    TcpListener l = new(IPAddress.Loopback, 0);
-                    l.Start();
-                    int port = ((IPEndPoint)l.LocalEndpoint).Port;
-                    l.Stop();
-                    return port;
-                }
+
+                TcpListener l = new(IPAddress.Loopback, 0);
+                l.Start();
+                int port = ((IPEndPoint)l.LocalEndpoint).Port;
+                l.Stop();
+                return port;
             }
             catch
             {
diff --git a/v2rayN/v2rayN/Handler/StatisticsV2ray.cs b/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
index d2af9f2b..210e988f 100644
--- a/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
@@ -8,8 +8,8 @@ namespace v2rayN.Handler
     internal class StatisticsV2ray
     {
         private Mode.Config _config;
-        private GrpcChannel _channel;
-        private StatsService.StatsServiceClient _client;
+        private GrpcChannel? _channel;
+        private StatsService.StatsServiceClient? _client;
         private bool _exitFlag;
         private Action<ServerSpeedItem> _updateFunc;
 
@@ -26,10 +26,17 @@ namespace v2rayN.Handler
 
         private void GrpcInit()
         {
-            if (_channel == null)
+            if (_channel is null)
             {
-                _channel = GrpcChannel.ForAddress($"{Global.HttpProtocol}{Global.Loopback}:{Global.StatePort}");
-                _client = new StatsService.StatsServiceClient(_channel);
+                try
+                {
+                    _channel = GrpcChannel.ForAddress($"{Global.HttpProtocol}{Global.Loopback}:{Global.StatePort}");
+                    _client = new StatsService.StatsServiceClient(_channel);
+                }
+                catch (Exception ex)
+                {
+                    Utils.SaveLog(ex.Message, ex);
+                }
             }
         }
 
@@ -44,7 +51,7 @@ namespace v2rayN.Handler
             {
                 try
                 {
-                    if (_channel.State == ConnectivityState.Ready)
+                    if (_channel?.State == ConnectivityState.Ready)
                     {
                         QueryStatsResponse? res = null;
                         try
diff --git a/v2rayN/v2rayN/Mode/SingboxConfig.cs b/v2rayN/v2rayN/Mode/SingboxConfig.cs
index aa0b6b68..07832fb1 100644
--- a/v2rayN/v2rayN/Mode/SingboxConfig.cs
+++ b/v2rayN/v2rayN/Mode/SingboxConfig.cs
@@ -180,8 +180,9 @@
 
     public class Experimental4Sbox
     {
-        public V2ray_Api4Sbox v2ray_api { get; set; }
-        public Clash_Api4Sbox clash_api { get; set; }
+        public CacheFile4Sbox? cache_file { get; set; }
+        public V2ray_Api4Sbox? v2ray_api { get; set; }
+        public Clash_Api4Sbox? clash_api { get; set; }
     }
 
     public class V2ray_Api4Sbox
@@ -192,8 +193,8 @@
 
     public class Clash_Api4Sbox
     {
-        public string external_controller { get; set; }
-        public bool store_selected { get; set; }
+        public string? external_controller { get; set; }
+        public bool? store_selected { get; set; }
     }
 
     public class Stats4Sbox
@@ -210,4 +211,12 @@
         public string inet4_range { get; set; }
         public string inet6_range { get; set; }
     }
+
+    public class CacheFile4Sbox
+    {
+        public bool enabled { get; set; }
+        public string? path { get; set; }
+        public string? cache_id { get; set; }
+        public bool? store_fakeip { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Tool/Utils.cs b/v2rayN/v2rayN/Tool/Utils.cs
index 15e87396..d14fb433 100644
--- a/v2rayN/v2rayN/Tool/Utils.cs
+++ b/v2rayN/v2rayN/Tool/Utils.cs
@@ -880,13 +880,13 @@ namespace v2rayN
                 if (blFull)
                 {
                     return string.Format("v2rayN - V{0} - {1}",
-                            FileVersionInfo.GetVersionInfo(location).FileVersion.ToString(),
+                            FileVersionInfo.GetVersionInfo(location).FileVersion?.ToString(),
                             File.GetLastWriteTime(location).ToString("yyyy/MM/dd"));
                 }
                 else
                 {
                     return string.Format("v2rayN/{0}",
-                        FileVersionInfo.GetVersionInfo(location).FileVersion.ToString());
+                        FileVersionInfo.GetVersionInfo(location).FileVersion?.ToString());
                 }
             }
             catch (Exception ex)

From 559ffcbab56e5a275adc335033cd10f55f325fb3 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 6 Jan 2024 13:47:03 +0800
Subject: [PATCH 13/62] up 6.33

---
 v2rayN/v2rayN/Resx/ResUI.Designer.cs | 2 +-
 v2rayN/v2rayN/Resx/ResUI.resx        | 2 +-
 v2rayN/v2rayN/v2rayN.csproj          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index 40c35dfe..c6d92f74 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -1744,7 +1744,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 {0}:{1}/s↑ | {2}/s↓ 的本地化字符串。
+        ///   查找类似 {0} : {1}/s↑ | {2}/s↓ 的本地化字符串。
         /// </summary>
         public static string SpeedDisplayText {
             get {
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index 06e2ea02..3375e635 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -1097,7 +1097,7 @@
     <value>More urls, separated by commas;Subscription conversion will be invalid</value>
   </data>
   <data name="SpeedDisplayText" xml:space="preserve">
-    <value>{0}:{1}/s↑ | {2}/s↓</value>
+    <value>{0} : {1}/s↑ | {2}/s↓</value>
   </data>
   <data name="LvAutoUpdateInterval" xml:space="preserve">
     <value>Automatic update interval(minutes)</value>
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index 5a26da22..3995f786 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -9,8 +9,8 @@
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
-		<Copyright>Copyright © 2017-2023 (GPLv3)</Copyright>
-		<FileVersion>6.32</FileVersion>
+		<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
+		<FileVersion>6.33</FileVersion>
 	</PropertyGroup>
 	
 	<ItemGroup>

From 063449448ae65d537b8c198ed029c1593ccf3137 Mon Sep 17 00:00:00 2001
From: Allo <yin199909@aliyun.com>
Date: Mon, 8 Jan 2024 21:35:28 +0800
Subject: [PATCH 14/62] build(ci): bump actions/upload-artifact from v3 to v4

---
 .github/workflows/build.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 54cecbda..9e566754 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,13 +36,12 @@ jobs:
     #     7z a -mx9 ..\v2rayN.7z $env:Wap_Project_Directory
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: v2rayN
-        path: 
+        path: |
           .\v2rayN\v2rayN.zip
 
-      
     # - name: Release
     #   uses: softprops/action-gh-release@v1
     #   env:

From 2b4a043a92739aae8b122d2522cf6d8fdb0a32cd Mon Sep 17 00:00:00 2001
From: ShiinaRinne <45081750+ShiinaRinne@users.noreply.github.com>
Date: Tue, 9 Jan 2024 23:20:30 +0800
Subject: [PATCH 15/62] fix https://github.com/2dust/v2rayN/issues/4590

---
 v2rayN/v2rayN/Handler/ShareHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
index 9ac2ae05..f10177c1 100644
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -189,7 +189,7 @@ namespace v2rayN.Handler
             item.id,
             GetIpv6(item.address),
             item.port);
-            url = $"{Global.ProtocolShares[EConfigType.Hysteria2]}{url}{query}{remark}";
+            url = $"{Global.ProtocolShares[EConfigType.Hysteria2]}{url}/{query}{remark}";
             return url;
         }
 

From 4a67e963eda187102ab098df37422d045ea4a05d Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 10 Jan 2024 10:01:59 +0800
Subject: [PATCH 16/62] Up TargetFramework  to net8.0

---
 v2rayN/PacLib/PacLib.csproj             | 2 +-
 v2rayN/ProtosLib/ProtosLib.csproj       | 2 +-
 v2rayN/v2rayN/v2rayN.csproj             | 3 ++-
 v2rayN/v2rayUpgrade/v2rayUpgrade.csproj | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/v2rayN/PacLib/PacLib.csproj b/v2rayN/PacLib/PacLib.csproj
index ed5be34b..606c62e5 100644
--- a/v2rayN/PacLib/PacLib.csproj
+++ b/v2rayN/PacLib/PacLib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
diff --git a/v2rayN/ProtosLib/ProtosLib.csproj b/v2rayN/ProtosLib/ProtosLib.csproj
index 3abd78a8..83a4ce17 100644
--- a/v2rayN/ProtosLib/ProtosLib.csproj
+++ b/v2rayN/ProtosLib/ProtosLib.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>	  
   </PropertyGroup>
 	
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index 3995f786..f6f97e0e 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net6.0-windows</TargetFramework>
+		<TargetFramework>net8.0-windows</TargetFramework>
 		<Nullable>enable</Nullable>
 		<UseWPF>true</UseWPF>  
 		<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -20,6 +20,7 @@
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="QRCoder.Xaml" Version="1.4.3" />
 		<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
+		<PackageReference Include="System.Text.Json" Version="8.0.0" />
 		<PackageReference Include="TaskScheduler" Version="2.10.1" /> 
 		<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
 		<PackageReference Include="ReactiveUI.Fody" Version="19.5.39" />
diff --git a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
index 40ddb328..73349b29 100644
--- a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
+++ b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	<TargetFramework>net6.0-windows</TargetFramework>
+	<TargetFramework>net8.0-windows</TargetFramework>
 	<OutputType>WinExe</OutputType>
 	<UseWindowsForms>true</UseWindowsForms>	    
-	<Copyright>Copyright © 2019-2023 (GPLv3)</Copyright>
+	<Copyright>Copyright © 2019-2024 (GPLv3)</Copyright>
 	<FileVersion>1.1.0.0</FileVersion>
 	<ApplicationManifest>app.manifest</ApplicationManifest>
 	<Nullable>enable</Nullable>

From ea95c6de79cdc72db52727eded8ff7281562fe91 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 10 Jan 2024 10:43:48 +0800
Subject: [PATCH 17/62] Refactor Utils

---
 v2rayN/v2rayN/App.xaml.cs                     |   9 +-
 v2rayN/v2rayN/Base/HttpClientHelper.cs        |   2 +-
 v2rayN/v2rayN/Handler/ConfigHandler.cs        |  46 ++--
 v2rayN/v2rayN/Handler/CoreConfigHandler.cs    |  17 +-
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs    |  54 ++--
 v2rayN/v2rayN/Handler/CoreConfigV2ray.cs      |  54 ++--
 v2rayN/v2rayN/Handler/CoreHandler.cs          |  20 +-
 v2rayN/v2rayN/Handler/DownloadHandle.cs       |  18 +-
 v2rayN/v2rayN/Handler/MainFormHandler.cs      |  10 +-
 v2rayN/v2rayN/Handler/ProfileExHandler.cs     |   2 +-
 v2rayN/v2rayN/Handler/ShareHandler.cs         |   8 +-
 v2rayN/v2rayN/Handler/SpeedtestHandler.cs     |  12 +-
 v2rayN/v2rayN/Handler/StatisticsHandler.cs    |   4 +-
 v2rayN/v2rayN/Handler/StatisticsSingbox.cs    |   4 +-
 v2rayN/v2rayN/Handler/StatisticsV2ray.cs      |   2 +-
 v2rayN/v2rayN/Handler/SysProxyHandle.cs       |   2 +-
 v2rayN/v2rayN/Handler/UpdateHandle.cs         |  16 +-
 v2rayN/v2rayN/Tool/FileManager.cs             |  10 +-
 v2rayN/v2rayN/Tool/Job.cs                     |   2 +-
 v2rayN/v2rayN/Tool/JsonUtils.cs               | 120 +++++++++
 v2rayN/v2rayN/Tool/Logging.cs                 |  25 +-
 v2rayN/v2rayN/Tool/Utils.cs                   | 232 ++----------------
 .../v2rayN/ViewModels/AddServer2ViewModel.cs  |   4 +-
 .../v2rayN/ViewModels/AddServerViewModel.cs   |   2 +-
 .../v2rayN/ViewModels/DNSSettingViewModel.cs  |  10 +-
 .../v2rayN/ViewModels/MainWindowViewModel.cs  |  18 +-
 .../ViewModels/OptionSettingViewModel.cs      |   2 +-
 .../ViewModels/RoutingRuleSettingViewModel.cs |   8 +-
 .../ViewModels/RoutingSettingViewModel.cs     |   4 +-
 v2rayN/v2rayN/ViewModels/SubEditViewModel.cs  |   2 +-
 .../Views/GlobalHotkeySettingWindow.xaml.cs   |   2 +-
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        |   2 +-
 .../v2rayN/Views/OptionSettingWindow.xaml.cs  |   2 +-
 v2rayN/v2rayN/v2rayN.csproj                   |   1 -
 34 files changed, 342 insertions(+), 384 deletions(-)
 create mode 100644 v2rayN/v2rayN/Tool/JsonUtils.cs

diff --git a/v2rayN/v2rayN/App.xaml.cs b/v2rayN/v2rayN/App.xaml.cs
index caa6570c..70147738 100644
--- a/v2rayN/v2rayN/App.xaml.cs
+++ b/v2rayN/v2rayN/App.xaml.cs
@@ -2,7 +2,6 @@
 using System.Windows.Threading;
 using v2rayN.Handler;
 using v2rayN.Mode;
-using v2rayN.Tool;
 
 namespace v2rayN
 {
@@ -45,7 +44,7 @@ namespace v2rayN
             Logging.Setup();
             Init();
             Logging.LoggingEnabled(_config.guiItem.enableLog);
-            Utils.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
+            Logging.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
             Logging.ClearLogs();
 
             Thread.CurrentThread.CurrentUICulture = new(_config.uiItem.currentLanguage);
@@ -70,7 +69,7 @@ namespace v2rayN
 
         private void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
         {
-            Utils.SaveLog("App_DispatcherUnhandledException", e.Exception);
+            Logging.SaveLog("App_DispatcherUnhandledException", e.Exception);
             e.Handled = true;
         }
 
@@ -78,13 +77,13 @@ namespace v2rayN
         {
             if (e.ExceptionObject != null)
             {
-                Utils.SaveLog("CurrentDomain_UnhandledException", (Exception)e.ExceptionObject!);
+                Logging.SaveLog("CurrentDomain_UnhandledException", (Exception)e.ExceptionObject!);
             }
         }
 
         private void TaskScheduler_UnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e)
         {
-            Utils.SaveLog("TaskScheduler_UnobservedTaskException", e.Exception);
+            Logging.SaveLog("TaskScheduler_UnobservedTaskException", e.Exception);
         }
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Base/HttpClientHelper.cs b/v2rayN/v2rayN/Base/HttpClientHelper.cs
index 72d9d3c6..8137c873 100644
--- a/v2rayN/v2rayN/Base/HttpClientHelper.cs
+++ b/v2rayN/v2rayN/Base/HttpClientHelper.cs
@@ -35,7 +35,7 @@ namespace v2rayN.Base
 
         public async Task PutAsync(string url, Dictionary<string, string> headers)
         {
-            var jsonContent = Utils.ToJson(headers);
+            var jsonContent = JsonUtils.ToJson(headers);
             var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
 
             var result = await httpClient.PutAsync(url, content);
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 70f7993d..687a45e2 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -29,13 +29,13 @@ namespace v2rayN.Handler
             if (!Utils.IsNullOrEmpty(result))
             {
                 //转成Json
-                config = Utils.FromJson<Config>(result);
+                config = JsonUtils.FromJson<Config>(result);
             }
             else
             {
                 if (File.Exists(Utils.GetConfigPath(configRes)))
                 {
-                    Utils.SaveLog("LoadConfig Exception");
+                    Logging.SaveLog("LoadConfig Exception");
                     return -1;
                 }
             }
@@ -234,7 +234,7 @@ namespace v2rayN.Handler
                     //save temp file
                     var resPath = Utils.GetConfigPath(configRes);
                     var tempPath = $"{resPath}_temp";
-                    if (Utils.ToJsonFile(config, tempPath) != 0)
+                    if (JsonUtils.ToJsonFile(config, tempPath) != 0)
                     {
                         return;
                     }
@@ -248,7 +248,7 @@ namespace v2rayN.Handler
                 }
                 catch (Exception ex)
                 {
-                    Utils.SaveLog("ToJsonFile", ex);
+                    Logging.SaveLog("ToJsonFile", ex);
                 }
             }
         }
@@ -261,13 +261,13 @@ namespace v2rayN.Handler
                 return -1;
             }
 
-            var configOld = Utils.FromJson<ConfigOld>(result);
+            var configOld = JsonUtils.FromJson<ConfigOld>(result);
             if (configOld == null)
             {
                 return -1;
             }
 
-            var subItem = Utils.FromJson<List<SubItem>>(Utils.ToJson(configOld.subItem));
+            var subItem = JsonUtils.FromJson<List<SubItem>>(JsonUtils.ToJson(configOld.subItem));
             foreach (var it in subItem)
             {
                 if (Utils.IsNullOrEmpty(it.id))
@@ -277,7 +277,7 @@ namespace v2rayN.Handler
                 SqliteHelper.Instance.Replace(it);
             }
 
-            var profileItems = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(configOld.vmess));
+            var profileItems = JsonUtils.FromJson<List<ProfileItem>>(JsonUtils.ToJson(configOld.vmess));
             foreach (var it in profileItems)
             {
                 if (Utils.IsNullOrEmpty(it.indexId))
@@ -293,13 +293,13 @@ namespace v2rayN.Handler
                 {
                     continue;
                 }
-                var routing = Utils.FromJson<RoutingItem>(Utils.ToJson(it));
+                var routing = JsonUtils.FromJson<RoutingItem>(JsonUtils.ToJson(it));
                 foreach (var it2 in it.rules)
                 {
                     it2.id = Utils.GetGUID(false);
                 }
                 routing.ruleNum = it.rules.Count;
-                routing.ruleSet = Utils.ToJson(it.rules, false);
+                routing.ruleSet = JsonUtils.ToJson(it.rules, false);
 
                 if (Utils.IsNullOrEmpty(routing.id))
                 {
@@ -308,7 +308,7 @@ namespace v2rayN.Handler
                 SqliteHelper.Instance.Replace(routing);
             }
 
-            config = Utils.FromJson<Config>(Utils.ToJson(configOld));
+            config = JsonUtils.FromJson<Config>(JsonUtils.ToJson(configOld));
 
             if (config.coreBasicItem == null)
             {
@@ -424,7 +424,7 @@ namespace v2rayN.Handler
                     continue;
                 }
 
-                ProfileItem profileItem = Utils.DeepCopy(item);
+                ProfileItem profileItem = JsonUtils.DeepCopy(item);
                 profileItem.indexId = string.Empty;
                 profileItem.remarks = $"{item.remarks}-clone";
 
@@ -595,7 +595,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return -1;
             }
 
@@ -1007,7 +1007,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("Remove Item", ex);
+                Logging.SaveLog("Remove Item", ex);
             }
 
             return 0;
@@ -1163,7 +1163,7 @@ namespace v2rayN.Handler
 
             ProfileItem profileItem = new();
             //Is v2ray configuration
-            V2rayConfig? v2rayConfig = Utils.FromJson<V2rayConfig>(clipboardData);
+            V2rayConfig? v2rayConfig = JsonUtils.FromJson<V2rayConfig>(clipboardData);
             if (v2rayConfig?.inbounds?.Count > 0
                 && v2rayConfig.outbounds?.Count > 0)
             {
@@ -1254,10 +1254,10 @@ namespace v2rayN.Handler
             }
 
             //SsSIP008
-            var lstSsServer = Utils.FromJson<List<SsServer>>(clipboardData);
+            var lstSsServer = JsonUtils.FromJson<List<SsServer>>(clipboardData);
             if (lstSsServer?.Count <= 0)
             {
-                var ssSIP008 = Utils.FromJson<SsSIP008>(clipboardData);
+                var ssSIP008 = JsonUtils.FromJson<SsSIP008>(clipboardData);
                 if (ssSIP008?.servers?.Count > 0)
                 {
                     lstSsServer = ssSIP008.servers;
@@ -1469,7 +1469,7 @@ namespace v2rayN.Handler
                 return -1;
             }
 
-            var lstRules = Utils.FromJson<List<RulesItem>>(clipboardData);
+            var lstRules = JsonUtils.FromJson<List<RulesItem>>(clipboardData);
             if (lstRules == null)
             {
                 return -1;
@@ -1480,7 +1480,7 @@ namespace v2rayN.Handler
                 item.id = Utils.GetGUID(false);
             }
             routingItem.ruleNum = lstRules.Count;
-            routingItem.ruleSet = Utils.ToJson(lstRules, false);
+            routingItem.ruleSet = JsonUtils.ToJson(lstRules, false);
 
             if (Utils.IsNullOrEmpty(routingItem.id))
             {
@@ -1519,7 +1519,7 @@ namespace v2rayN.Handler
                         {
                             return 0;
                         }
-                        var item = Utils.DeepCopy(rules[index]);
+                        var item = JsonUtils.DeepCopy(rules[index]);
                         rules.RemoveAt(index);
                         rules.Insert(0, item);
 
@@ -1531,7 +1531,7 @@ namespace v2rayN.Handler
                         {
                             return 0;
                         }
-                        var item = Utils.DeepCopy(rules[index]);
+                        var item = JsonUtils.DeepCopy(rules[index]);
                         rules.RemoveAt(index);
                         rules.Insert(index - 1, item);
 
@@ -1544,7 +1544,7 @@ namespace v2rayN.Handler
                         {
                             return 0;
                         }
-                        var item = Utils.DeepCopy(rules[index]);
+                        var item = JsonUtils.DeepCopy(rules[index]);
                         rules.RemoveAt(index);
                         rules.Insert(index + 1, item);
 
@@ -1556,7 +1556,7 @@ namespace v2rayN.Handler
                         {
                             return 0;
                         }
-                        var item = Utils.DeepCopy(rules[index]);
+                        var item = JsonUtils.DeepCopy(rules[index]);
                         rules.RemoveAt(index);
                         rules.Add(item);
 
@@ -1565,7 +1565,7 @@ namespace v2rayN.Handler
                 case EMove.Position:
                     {
                         var removeItem = rules[index];
-                        var item = Utils.DeepCopy(rules[index]);
+                        var item = JsonUtils.DeepCopy(rules[index]);
                         rules.Insert(pos, item);
                         rules.Remove(removeItem);
                         break;
diff --git a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
index 2fca828a..525f1cf5 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
@@ -35,11 +35,11 @@ namespace v2rayN.Handler
                     }
                     if (Utils.IsNullOrEmpty(fileName))
                     {
-                        content = Utils.ToJson(singboxConfig);
+                        content = JsonUtils.ToJson(singboxConfig);
                     }
                     else
                     {
-                        Utils.ToJsonFile(singboxConfig, fileName, false);
+                        JsonUtils.ToJsonFile(singboxConfig, fileName, false);
                     }
                 }
                 else
@@ -51,17 +51,17 @@ namespace v2rayN.Handler
                     }
                     if (Utils.IsNullOrEmpty(fileName))
                     {
-                        content = Utils.ToJson(v2rayConfig);
+                        content = JsonUtils.ToJson(v2rayConfig);
                     }
                     else
                     {
-                        Utils.ToJsonFile(v2rayConfig, fileName, false);
+                        JsonUtils.ToJsonFile(v2rayConfig, fileName, false);
                     }
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("GenerateClientConfig", ex);
+                Logging.SaveLog("GenerateClientConfig", ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
@@ -143,7 +143,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("GenerateClientCustomConfig", ex);
+                Logging.SaveLog("GenerateClientCustomConfig", ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
@@ -158,7 +158,7 @@ namespace v2rayN.Handler
                 {
                     return -1;
                 }
-                Utils.ToJsonFile(singboxConfig, fileName, false);
+                JsonUtils.ToJsonFile(singboxConfig, fileName, false);
             }
             else
             {
@@ -166,8 +166,7 @@ namespace v2rayN.Handler
                 {
                     return -1;
                 }
-
-                Utils.ToJsonFile(v2rayConfig, fileName, false);
+                JsonUtils.ToJsonFile(v2rayConfig, fileName, false);
             }
             return 0;
         }
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index a42fe30c..7e1f24ce 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -36,7 +36,7 @@ namespace v2rayN.Handler
                     return -1;
                 }
 
-                singboxConfig = Utils.FromJson<SingboxConfig>(result);
+                singboxConfig = JsonUtils.FromJson<SingboxConfig>(result);
                 if (singboxConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
@@ -61,7 +61,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("GenerateClientConfig4Singbox", ex);
+                Logging.SaveLog("GenerateClientConfig4Singbox", ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
@@ -101,7 +101,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -178,7 +178,7 @@ namespace v2rayN.Handler
                         _config.tunModeItem.stack = Global.TunStacks[0];
                     }
 
-                    var tunInbound = Utils.FromJson<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName));
+                    var tunInbound = JsonUtils.FromJson<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName));
                     tunInbound.mtu = _config.tunModeItem.mtu;
                     tunInbound.strict_route = _config.tunModeItem.strictRoute;
                     tunInbound.stack = _config.tunModeItem.stack;
@@ -192,14 +192,14 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
         private Inbound4Sbox? GetInbound(Inbound4Sbox inItem, string tag, int offset, bool bSocks)
         {
-            var inbound = Utils.DeepCopy(inItem);
+            var inbound = JsonUtils.DeepCopy(inItem);
             inbound.tag = tag;
             inbound.listen_port = inItem.listen_port + offset;
             inbound.type = bSocks ? Global.InboundSocks : Global.InboundHttp;
@@ -304,7 +304,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -329,7 +329,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -379,7 +379,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -431,7 +431,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -459,7 +459,7 @@ namespace v2rayN.Handler
                 if (prevNode is not null
                     && prevNode.configType != EConfigType.Custom)
                 {
-                    var prevOutbound = Utils.FromJson<Outbound4Sbox>(txtOutbound);
+                    var prevOutbound = JsonUtils.FromJson<Outbound4Sbox>(txtOutbound);
                     GenOutbound(prevNode, prevOutbound);
                     prevOutbound.tag = $"{Global.ProxyTag}2";
                     singboxConfig.outbounds.Add(prevOutbound);
@@ -472,7 +472,7 @@ namespace v2rayN.Handler
                 if (nextNode is not null
                     && nextNode.configType != EConfigType.Custom)
                 {
-                    var nextOutbound = Utils.FromJson<Outbound4Sbox>(txtOutbound);
+                    var nextOutbound = JsonUtils.FromJson<Outbound4Sbox>(txtOutbound);
                     GenOutbound(nextNode, nextOutbound);
                     nextOutbound.tag = Global.ProxyTag;
                     singboxConfig.outbounds.Insert(0, nextOutbound);
@@ -483,7 +483,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
 
             return 0;
@@ -497,7 +497,7 @@ namespace v2rayN.Handler
                 {
                     singboxConfig.route.auto_detect_interface = true;
 
-                    var tunRules = Utils.FromJson<List<Rule4Sbox>>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
+                    var tunRules = JsonUtils.FromJson<List<Rule4Sbox>>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
                     singboxConfig.route.rules.AddRange(tunRules);
 
                     GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe);
@@ -520,7 +520,7 @@ namespace v2rayN.Handler
                     var routing = ConfigHandler.GetDefaultRouting(_config);
                     if (routing != null)
                     {
-                        var rules = Utils.FromJson<List<RulesItem>>(routing.ruleSet);
+                        var rules = JsonUtils.FromJson<List<RulesItem>>(routing.ruleSet);
                         foreach (var item in rules!)
                         {
                             if (item.enabled)
@@ -535,7 +535,7 @@ namespace v2rayN.Handler
                     var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
                     if (lockedItem != null)
                     {
-                        var rules = Utils.FromJson<List<RulesItem>>(lockedItem.ruleSet);
+                        var rules = JsonUtils.FromJson<List<RulesItem>>(lockedItem.ruleSet);
                         foreach (var item in rules!)
                         {
                             GenRoutingUserRule(item, singboxConfig.route.rules);
@@ -545,7 +545,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -609,8 +609,8 @@ namespace v2rayN.Handler
                 {
                     rule.inbound = item.inboundTag;
                 }
-                var rule2 = Utils.DeepCopy(rule);
-                var rule3 = Utils.DeepCopy(rule);
+                var rule2 = JsonUtils.DeepCopy(rule);
+                var rule3 = JsonUtils.DeepCopy(rule);
 
                 var hasDomainIp = false;
                 if (item.domain?.Count > 0)
@@ -647,7 +647,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -727,7 +727,7 @@ namespace v2rayN.Handler
                     {
                         tunDNS = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
                     }
-                    dns4Sbox = Utils.FromJson<Dns4Sbox>(tunDNS);
+                    dns4Sbox = JsonUtils.FromJson<Dns4Sbox>(tunDNS);
                 }
                 else
                 {
@@ -738,7 +738,7 @@ namespace v2rayN.Handler
                         normalDNS = "{\"servers\":[{\"address\":\"tcp://8.8.8.8\"}]}";
                     }
 
-                    dns4Sbox = Utils.FromJson<Dns4Sbox>(normalDNS);
+                    dns4Sbox = JsonUtils.FromJson<Dns4Sbox>(normalDNS);
                 }
                 if (dns4Sbox is null)
                 {
@@ -765,7 +765,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -822,7 +822,7 @@ namespace v2rayN.Handler
                     return -1;
                 }
 
-                singboxConfig = Utils.FromJson<SingboxConfig>(result);
+                singboxConfig = JsonUtils.FromJson<SingboxConfig>(result);
                 if (singboxConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
@@ -838,7 +838,7 @@ namespace v2rayN.Handler
                 }
                 catch (Exception ex)
                 {
-                    Utils.SaveLog(ex.Message, ex);
+                    Logging.SaveLog(ex.Message, ex);
                 }
 
                 GenLog(singboxConfig);
@@ -920,7 +920,7 @@ namespace v2rayN.Handler
                         continue;
                     }
 
-                    var outbound = Utils.FromJson<Outbound4Sbox>(txtOutbound);
+                    var outbound = JsonUtils.FromJson<Outbound4Sbox>(txtOutbound);
                     GenOutbound(item, outbound);
                     outbound.tag = Global.ProxyTag + inbound.listen_port.ToString();
                     singboxConfig.outbounds.Add(outbound);
@@ -939,7 +939,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
index 1f1eb390..8206bd54 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
@@ -38,7 +38,7 @@ namespace v2rayN.Handler
                     return -1;
                 }
 
-                v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                v2rayConfig = JsonUtils.FromJson<V2rayConfig>(result);
                 if (v2rayConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
@@ -63,7 +63,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("GenerateClientConfig4V2ray", ex);
+                Logging.SaveLog("GenerateClientConfig4V2ray", ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
@@ -92,7 +92,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -141,7 +141,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -154,7 +154,7 @@ namespace v2rayN.Handler
                 return null;
             }
 
-            var inbound = Utils.FromJson<Inbounds4Ray>(result);
+            var inbound = JsonUtils.FromJson<Inbounds4Ray>(result);
             if (inbound == null)
             {
                 return null;
@@ -187,12 +187,12 @@ namespace v2rayN.Handler
                             {
                                 v2rayConfig.routing.domainStrategy = routing.domainStrategy;
                             }
-                            var rules = Utils.FromJson<List<RulesItem>>(routing.ruleSet);
+                            var rules = JsonUtils.FromJson<List<RulesItem>>(routing.ruleSet);
                             foreach (var item in rules)
                             {
                                 if (item.enabled)
                                 {
-                                    var item2 = Utils.FromJson<RulesItem4Ray>(Utils.ToJson(item));
+                                    var item2 = JsonUtils.FromJson<RulesItem4Ray>(JsonUtils.ToJson(item));
                                     GenRoutingUserRule(item2, v2rayConfig);
                                 }
                             }
@@ -203,10 +203,10 @@ namespace v2rayN.Handler
                         var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
                         if (lockedItem != null)
                         {
-                            var rules = Utils.FromJson<List<RulesItem>>(lockedItem.ruleSet);
+                            var rules = JsonUtils.FromJson<List<RulesItem>>(lockedItem.ruleSet);
                             foreach (var item in rules)
                             {
-                                var item2 = Utils.FromJson<RulesItem4Ray>(Utils.ToJson(item));
+                                var item2 = JsonUtils.FromJson<RulesItem4Ray>(JsonUtils.ToJson(item));
                                 GenRoutingUserRule(item2, v2rayConfig);
                             }
                         }
@@ -215,7 +215,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -252,7 +252,7 @@ namespace v2rayN.Handler
                 var hasDomainIp = false;
                 if (rules.domain?.Count > 0)
                 {
-                    var it = Utils.DeepCopy(rules);
+                    var it = JsonUtils.DeepCopy(rules);
                     it.ip = null;
                     it.type = "field";
                     for (int k = it.domain.Count - 1; k >= 0; k--)
@@ -268,7 +268,7 @@ namespace v2rayN.Handler
                 }
                 if (rules.ip?.Count > 0)
                 {
-                    var it = Utils.DeepCopy(rules);
+                    var it = JsonUtils.DeepCopy(rules);
                     it.domain = null;
                     it.type = "field";
                     v2rayConfig.routing.rules.Add(it);
@@ -281,7 +281,7 @@ namespace v2rayN.Handler
                         || (rules.inboundTag?.Count > 0)
                         )
                     {
-                        var it = Utils.DeepCopy(rules);
+                        var it = JsonUtils.DeepCopy(rules);
                         it.type = "field";
                         v2rayConfig.routing.rules.Add(it);
                     }
@@ -289,7 +289,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -478,7 +478,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -500,7 +500,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -688,7 +688,7 @@ namespace v2rayN.Handler
                                 pathHttp = string.Join("\",\"", arrPath);
                             }
                             request = request.Replace("$requestPath$", $"\"{pathHttp}\"");
-                            tcpSettings.header.request = Utils.FromJson<object>(request);
+                            tcpSettings.header.request = JsonUtils.FromJson<object>(request);
 
                             streamSettings.tcpSettings = tcpSettings;
                         }
@@ -697,7 +697,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -722,7 +722,7 @@ namespace v2rayN.Handler
                     outbound.settings.userLevel = 0;
                 }
 
-                var obj = Utils.ParseJson(normalDNS) ?? new JObject();
+                var obj = JsonUtils.ParseJson(normalDNS) ?? new JObject();
 
                 if (!obj.ContainsKey("servers"))
                 {
@@ -769,7 +769,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -849,7 +849,7 @@ namespace v2rayN.Handler
                     && prevNode.configType != EConfigType.Hysteria2
                     && prevNode.configType != EConfigType.Tuic)
                 {
-                    var prevOutbound = Utils.FromJson<Outbounds4Ray>(txtOutbound);
+                    var prevOutbound = JsonUtils.FromJson<Outbounds4Ray>(txtOutbound);
                     GenOutbound(prevNode, prevOutbound);
                     prevOutbound.tag = $"{Global.ProxyTag}2";
                     v2rayConfig.outbounds.Add(prevOutbound);
@@ -867,7 +867,7 @@ namespace v2rayN.Handler
                     && nextNode.configType != EConfigType.Hysteria2
                     && nextNode.configType != EConfigType.Tuic)
                 {
-                    var nextOutbound = Utils.FromJson<Outbounds4Ray>(txtOutbound);
+                    var nextOutbound = JsonUtils.FromJson<Outbounds4Ray>(txtOutbound);
                     GenOutbound(nextNode, nextOutbound);
                     nextOutbound.tag = Global.ProxyTag;
                     v2rayConfig.outbounds.Insert(0, nextOutbound);
@@ -881,7 +881,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
 
             return 0;
@@ -912,7 +912,7 @@ namespace v2rayN.Handler
                     return -1;
                 }
 
-                v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                v2rayConfig = JsonUtils.FromJson<V2rayConfig>(result);
                 if (v2rayConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
@@ -928,7 +928,7 @@ namespace v2rayN.Handler
                 }
                 catch (Exception ex)
                 {
-                    Utils.SaveLog(ex.Message, ex);
+                    Logging.SaveLog(ex.Message, ex);
                 }
 
                 GenLog(v2rayConfig);
@@ -1009,7 +1009,7 @@ namespace v2rayN.Handler
                         continue;
                     }
 
-                    var outbound = Utils.FromJson<Outbounds4Ray>(txtOutbound);
+                    var outbound = JsonUtils.FromJson<Outbounds4Ray>(txtOutbound);
                     GenOutbound(item, outbound);
                     outbound.tag = Global.ProxyTag + inbound.port.ToString();
                     v2rayConfig.outbounds.Add(outbound);
@@ -1029,7 +1029,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
diff --git a/v2rayN/v2rayN/Handler/CoreHandler.cs b/v2rayN/v2rayN/Handler/CoreHandler.cs
index 905c245f..f30924e4 100644
--- a/v2rayN/v2rayN/Handler/CoreHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreHandler.cs
@@ -59,7 +59,7 @@ namespace v2rayN.Handler
                             {
                                 CoreStart(node);
                                 ShowMsg(false, "Tun mode restart the core once");
-                                Utils.SaveLog("Tun mode restart the core once");
+                                Logging.SaveLog("Tun mode restart the core once");
                             }
                         }
                     });
@@ -120,7 +120,7 @@ namespace v2rayN.Handler
                             foreach (Process p in existing)
                             {
                                 string? path = p.MainModule?.FileName;
-                                if (path == $"{Utils.GetBinPath(vName, it.coreType)}.exe")
+                                if (path == $"{Utils.GetBinPath(vName, it.coreType.ToString())}.exe")
                                 {
                                     KillProcess(p);
                                 }
@@ -131,7 +131,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -144,7 +144,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -154,7 +154,7 @@ namespace v2rayN.Handler
             foreach (string name in coreInfo.coreExes)
             {
                 string vName = $"{name}.exe";
-                vName = Utils.GetBinPath(vName, coreInfo.coreType);
+                vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
                 if (File.Exists(vName))
                 {
                     fileName = vName;
@@ -163,8 +163,8 @@ namespace v2rayN.Handler
             }
             if (Utils.IsNullOrEmpty(fileName))
             {
-                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
-                Utils.SaveLog(msg);
+                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType.ToString()), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
+                Logging.SaveLog(msg);
                 ShowMsg(false, msg);
             }
             return fileName;
@@ -237,7 +237,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
                 ShowMsg(false, msg);
                 return -1;
@@ -311,7 +311,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
                 update(true, msg);
                 return null;
@@ -336,7 +336,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
diff --git a/v2rayN/v2rayN/Handler/DownloadHandle.cs b/v2rayN/v2rayN/Handler/DownloadHandle.cs
index 54edadf7..fc3aceb7 100644
--- a/v2rayN/v2rayN/Handler/DownloadHandle.cs
+++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs
@@ -84,7 +84,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
 
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
@@ -111,7 +111,7 @@ namespace v2rayN.Handler
             }
             else
             {
-                Utils.SaveLog("StatusCode error: " + url);
+                Logging.SaveLog("StatusCode error: " + url);
                 return null;
             }
         }
@@ -128,7 +128,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -146,7 +146,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -166,7 +166,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -212,7 +212,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -243,7 +243,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -270,13 +270,13 @@ namespace v2rayN.Handler
                 }
                 catch (Exception ex)
                 {
-                    Utils.SaveLog(ex.Message, ex);
+                    Logging.SaveLog(ex.Message, ex);
                     return -1;
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return -1;
             }
         }
diff --git a/v2rayN/v2rayN/Handler/MainFormHandler.cs b/v2rayN/v2rayN/Handler/MainFormHandler.cs
index 24989615..960c6ab9 100644
--- a/v2rayN/v2rayN/Handler/MainFormHandler.cs
+++ b/v2rayN/v2rayN/Handler/MainFormHandler.cs
@@ -42,7 +42,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return Properties.Resources.NotifyIcon1;
             }
         }
@@ -112,7 +112,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return null;
             }
         }
@@ -163,7 +163,7 @@ namespace v2rayN.Handler
         private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> update)
         {
             await Task.Delay(60000);
-            Utils.SaveLog("UpdateTaskRunSubscription");
+            Logging.SaveLog("UpdateTaskRunSubscription");
 
             var updateHandle = new UpdateHandle();
             while (true)
@@ -180,7 +180,7 @@ namespace v2rayN.Handler
                     {
                         update(success, msg);
                         if (success)
-                            Utils.SaveLog("subscription" + msg);
+                            Logging.SaveLog("subscription" + msg);
                     });
                     item.updateTime = updateTime;
                     ConfigHandler.AddSubItem(config, item);
@@ -196,7 +196,7 @@ namespace v2rayN.Handler
             var autoUpdateGeoTime = DateTime.Now;
 
             await Task.Delay(1000 * 120);
-            Utils.SaveLog("UpdateTaskRunGeo");
+            Logging.SaveLog("UpdateTaskRunGeo");
 
             var updateHandle = new UpdateHandle();
             while (true)
diff --git a/v2rayN/v2rayN/Handler/ProfileExHandler.cs b/v2rayN/v2rayN/Handler/ProfileExHandler.cs
index 0b755a06..26d164fc 100644
--- a/v2rayN/v2rayN/Handler/ProfileExHandler.cs
+++ b/v2rayN/v2rayN/Handler/ProfileExHandler.cs
@@ -82,7 +82,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
index f10177c1..79be638b 100644
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -38,7 +38,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return "";
             }
         }
@@ -66,7 +66,7 @@ namespace v2rayN.Handler
                 fp = item.fingerprint
             };
 
-            url = Utils.ToJson(vmessQRCode);
+            url = JsonUtils.ToJson(vmessQRCode);
             url = Utils.Base64Encode(url);
             url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
 
@@ -431,7 +431,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 msg = ResUI.Incorrectconfiguration;
                 return null;
             }
@@ -451,7 +451,7 @@ namespace v2rayN.Handler
             result = Utils.Base64Decode(result);
 
             //转成Json
-            VmessQRCode? vmessQRCode = Utils.FromJson<VmessQRCode>(result);
+            VmessQRCode? vmessQRCode = JsonUtils.FromJson<VmessQRCode>(result);
             if (vmessQRCode == null)
             {
                 msg = ResUI.FailedConversionConfiguration;
diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
index dad40271..9c7bc4ff 100644
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -107,7 +107,7 @@ namespace v2rayN.Handler
                     }
                     catch (Exception ex)
                     {
-                        Utils.SaveLog(ex.Message, ex);
+                        Logging.SaveLog(ex.Message, ex);
                     }
                 }
 
@@ -115,7 +115,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -184,7 +184,7 @@ namespace v2rayN.Handler
                         }
                         catch (Exception ex)
                         {
-                            Utils.SaveLog(ex.Message, ex);
+                            Logging.SaveLog(ex.Message, ex);
                         }
                     }));
                 }
@@ -192,7 +192,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             finally
             {
@@ -371,7 +371,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return responseTime;
         }
@@ -407,7 +407,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return -1;
             }
             return roundtripTime;
diff --git a/v2rayN/v2rayN/Handler/StatisticsHandler.cs b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
index c32a7d74..032069e7 100644
--- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
@@ -44,7 +44,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -63,7 +63,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
diff --git a/v2rayN/v2rayN/Handler/StatisticsSingbox.cs b/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
index 14ee1c62..60519d1d 100644
--- a/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
@@ -51,7 +51,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -113,7 +113,7 @@ namespace v2rayN.Handler
             up = 0; down = 0;
             try
             {
-                var trafficItem = Utils.FromJson<TrafficItem>(source);
+                var trafficItem = JsonUtils.FromJson<TrafficItem>(source);
                 if (trafficItem != null)
                 {
                     up = trafficItem.up;
diff --git a/v2rayN/v2rayN/Handler/StatisticsV2ray.cs b/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
index 210e988f..63cdac41 100644
--- a/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
@@ -35,7 +35,7 @@ namespace v2rayN.Handler
                 }
                 catch (Exception ex)
                 {
-                    Utils.SaveLog(ex.Message, ex);
+                    Logging.SaveLog(ex.Message, ex);
                 }
             }
         }
diff --git a/v2rayN/v2rayN/Handler/SysProxyHandle.cs b/v2rayN/v2rayN/Handler/SysProxyHandle.cs
index ae1b66cf..4bd8fa49 100644
--- a/v2rayN/v2rayN/Handler/SysProxyHandle.cs
+++ b/v2rayN/v2rayN/Handler/SysProxyHandle.cs
@@ -87,7 +87,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return true;
         }
diff --git a/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayN/v2rayN/Handler/UpdateHandle.cs
index 0b677cde..5c9b4e31 100644
--- a/v2rayN/v2rayN/Handler/UpdateHandle.cs
+++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs
@@ -274,8 +274,8 @@ namespace v2rayN.Handler
                         int ret = ConfigHandler.AddBatchServers(config, result, id, true);
                         if (ret <= 0)
                         {
-                            Utils.SaveLog("FailedImportSubscription");
-                            Utils.SaveLog(result);
+                            Logging.SaveLog("FailedImportSubscription");
+                            Logging.SaveLog(result);
                         }
                         _updateFunc(false,
                             ret > 0
@@ -327,13 +327,13 @@ namespace v2rayN.Handler
                 }
                 else
                 {
-                    Utils.SaveLog("StatusCode error: " + url);
+                    Logging.SaveLog("StatusCode error: " + url);
                     return;
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 _updateFunc(false, ex.Message);
             }
         }
@@ -350,7 +350,7 @@ namespace v2rayN.Handler
                 foreach (string name in coreInfo.coreExes)
                 {
                     string vName = $"{name}.exe";
-                    vName = Utils.GetBinPath(vName, coreInfo.coreType);
+                    vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
                     if (File.Exists(vName))
                     {
                         filePath = vName;
@@ -399,7 +399,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 _updateFunc(false, ex.Message);
                 return new SemanticVersion("");
             }
@@ -409,7 +409,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                var gitHubReleases = Utils.FromJson<List<GitHubRelease>>(gitHubReleaseApi);
+                var gitHubReleases = JsonUtils.FromJson<List<GitHubRelease>>(gitHubReleaseApi);
                 var gitHubRelease = preRelease ? gitHubReleases!.First() : gitHubReleases!.First(r => r.Prerelease == false);
                 var version = new SemanticVersion(gitHubRelease!.TagName);
                 var body = gitHubRelease!.Body;
@@ -524,7 +524,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 _updateFunc(false, ex.Message);
             }
         }
diff --git a/v2rayN/v2rayN/Tool/FileManager.cs b/v2rayN/v2rayN/Tool/FileManager.cs
index fa17fde5..bdfa0fd5 100644
--- a/v2rayN/v2rayN/Tool/FileManager.cs
+++ b/v2rayN/v2rayN/Tool/FileManager.cs
@@ -15,7 +15,7 @@ namespace v2rayN.Tool
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return false;
         }
@@ -30,7 +30,7 @@ namespace v2rayN.Tool
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -49,7 +49,7 @@ namespace v2rayN.Tool
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 throw;
             }
         }
@@ -75,13 +75,13 @@ namespace v2rayN.Tool
                     }
                     catch (IOException ex)
                     {
-                        Utils.SaveLog(ex.Message, ex);
+                        Logging.SaveLog(ex.Message, ex);
                     }
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return false;
             }
             return true;
diff --git a/v2rayN/v2rayN/Tool/Job.cs b/v2rayN/v2rayN/Tool/Job.cs
index 78b1a56e..c25a2221 100644
--- a/v2rayN/v2rayN/Tool/Job.cs
+++ b/v2rayN/v2rayN/Tool/Job.cs
@@ -52,7 +52,7 @@ namespace v2rayN
 
             if (!succ)
             {
-                Utils.SaveLog("Failed to call AssignProcessToJobObject! GetLastError=" + Marshal.GetLastWin32Error());
+                Logging.SaveLog("Failed to call AssignProcessToJobObject! GetLastError=" + Marshal.GetLastWin32Error());
             }
 
             return succ;
diff --git a/v2rayN/v2rayN/Tool/JsonUtils.cs b/v2rayN/v2rayN/Tool/JsonUtils.cs
new file mode 100644
index 00000000..9493411e
--- /dev/null
+++ b/v2rayN/v2rayN/Tool/JsonUtils.cs
@@ -0,0 +1,120 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.IO;
+
+namespace v2rayN
+{
+    internal class JsonUtils
+    {
+        /// <summary>
+        /// DeepCopy
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static T DeepCopy<T>(T obj)
+        {
+            return FromJson<T>(ToJson(obj, false))!;
+        }
+
+        /// <summary>
+        /// Deserialize to object
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="strJson"></param>
+        /// <returns></returns>
+        public static T? FromJson<T>(string? strJson)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(strJson))
+                {
+                    return default;
+                }
+                return JsonConvert.DeserializeObject<T>(strJson);
+            }
+            catch
+            {
+                return default;
+            }
+        }
+
+        /// <summary>
+        /// parse
+        /// </summary>
+        /// <param name="strJson"></param>
+        /// <returns></returns>
+        public static JObject? ParseJson(string strJson)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(strJson))
+                {
+                    return null;
+                }
+
+                return JObject.Parse(strJson);
+            }
+            catch
+            {
+                //SaveLog(ex.Message, ex);
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Serialize Object to Json string
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="indented"></param>
+        /// <returns></returns>
+        public static string ToJson(object? obj, bool indented = true)
+        {
+            string result = string.Empty;
+            try
+            {
+                if (obj == null)
+                {
+                    return result;
+                }
+                result = JsonConvert.SerializeObject(obj,
+                                          indented ? Formatting.Indented : Formatting.None,
+                                          new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Save as json file
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="filePath"></param>
+        /// <param name="nullValue"></param>
+        /// <returns></returns>
+        public static int ToJsonFile(object? obj, string filePath, bool nullValue = true)
+        {
+            int result;
+            try
+            {
+                using StreamWriter file = File.CreateText(filePath);
+                var serializer = new JsonSerializer()
+                {
+                    Formatting = Formatting.Indented,
+                    NullValueHandling = nullValue ? NullValueHandling.Include : NullValueHandling.Ignore
+                };
+                serializer.Serialize(file, obj);
+                result = 0;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                result = -1;
+            }
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Tool/Logging.cs b/v2rayN/v2rayN/Tool/Logging.cs
index b390fc99..ba5b97e7 100644
--- a/v2rayN/v2rayN/Tool/Logging.cs
+++ b/v2rayN/v2rayN/Tool/Logging.cs
@@ -3,7 +3,7 @@ using NLog.Config;
 using NLog.Targets;
 using System.IO;
 
-namespace v2rayN.Tool
+namespace v2rayN
 {
     public class Logging
     {
@@ -51,5 +51,28 @@ namespace v2rayN.Tool
                 catch { }
             });
         }
+
+        public static void SaveLog(string strContent)
+        {
+            if (LogManager.IsLoggingEnabled())
+            {
+                var logger = LogManager.GetLogger("Log1");
+                logger.Info(strContent);
+            }
+        }
+
+        public static void SaveLog(string strTitle, Exception ex)
+        {
+            if (LogManager.IsLoggingEnabled())
+            {
+                var logger = LogManager.GetLogger("Log2");
+                logger.Debug($"{strTitle},{ex.Message}");
+                logger.Debug(ex.StackTrace);
+                if (ex?.InnerException != null)
+                {
+                    logger.Error(ex.InnerException);
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Tool/Utils.cs b/v2rayN/v2rayN/Tool/Utils.cs
index d14fb433..1377cb3d 100644
--- a/v2rayN/v2rayN/Tool/Utils.cs
+++ b/v2rayN/v2rayN/Tool/Utils.cs
@@ -1,8 +1,5 @@
 using Microsoft.Win32;
 using Microsoft.Win32.TaskScheduler;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using NLog;
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
@@ -21,8 +18,6 @@ using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using v2rayN.Base;
-using v2rayN.Mode;
 using ZXing;
 using ZXing.Common;
 using ZXing.QrCode;
@@ -53,7 +48,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return result;
         }
@@ -71,111 +66,11 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return null;
         }
 
-        /// <summary>
-        /// 反序列化成对象
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="strJson"></param>
-        /// <returns></returns>
-        public static T? FromJson<T>(string? strJson)
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(strJson))
-                {
-                    return default;
-                }
-                return JsonConvert.DeserializeObject<T>(strJson);
-            }
-            catch
-            {
-                return default;
-            }
-        }
-
-        /// <summary>
-        /// 序列化成Json
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public static string ToJson(object? obj, bool indented = true)
-        {
-            string result = string.Empty;
-            try
-            {
-                if (obj == null)
-                {
-                    return result;
-                }
-                if (indented)
-                {
-                    result = JsonConvert.SerializeObject(obj,
-                                           Formatting.Indented,
-                                           new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-                }
-                else
-                {
-                    result = JsonConvert.SerializeObject(obj, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-                }
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex.Message, ex);
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// 保存成json文件
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <param name="filePath"></param>
-        /// <returns></returns>
-        public static int ToJsonFile(object? obj, string filePath, bool nullValue = true)
-        {
-            int result;
-            try
-            {
-                using StreamWriter file = File.CreateText(filePath);
-                JsonSerializer serializer;
-                if (nullValue)
-                {
-                    serializer = new JsonSerializer() { Formatting = Formatting.Indented };
-                }
-                else
-                {
-                    serializer = new JsonSerializer() { Formatting = Formatting.Indented, NullValueHandling = NullValueHandling.Ignore };
-                }
-
-                serializer.Serialize(file, obj);
-                result = 0;
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex.Message, ex);
-                result = -1;
-            }
-            return result;
-        }
-
-        public static JObject? ParseJson(string strJson)
-        {
-            try
-            {
-                return JObject.Parse(strJson);
-            }
-            catch (Exception ex)
-            {
-                //SaveLog(ex.Message, ex);
-                return null;
-            }
-        }
-
         #endregion 资源Json操作
 
         #region 转换函数
@@ -204,7 +99,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return string.Empty;
             }
         }
@@ -223,7 +118,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return new List<string>();
             }
         }
@@ -244,7 +139,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return new List<string>();
             }
         }
@@ -263,7 +158,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog("Base64Encode", ex);
+                Logging.SaveLog("Base64Encode", ex);
                 return string.Empty;
             }
         }
@@ -277,7 +172,7 @@ namespace v2rayN
         {
             try
             {
-                plainText = plainText.TrimEx()
+                plainText = plainText.Trim()
                   .Replace(Environment.NewLine, "")
                   .Replace("\n", "")
                   .Replace("\r", "")
@@ -295,7 +190,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog("Base64Decode", ex);
+                Logging.SaveLog("Base64Decode", ex);
                 return string.Empty;
             }
         }
@@ -492,7 +387,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return false;
             }
         }
@@ -598,14 +493,14 @@ namespace v2rayN
         /// </summary>
         /// <param name="run"></param>
         /// <returns></returns>
-        public static void SetAutoRun(bool run)
+        public static void SetAutoRun(string AutoRunRegPath, string AutoRunName, bool run)
         {
             try
             {
-                var autoRunName = $"{Global.AutoRunName}_{GetMD5(StartupPath())}";
+                var autoRunName = $"{AutoRunName}_{GetMD5(StartupPath())}";
 
                 //delete first
-                RegWriteValue(Global.AutoRunRegPath, autoRunName, "");
+                RegWriteValue(AutoRunRegPath, autoRunName, "");
                 if (IsAdministrator())
                 {
                     AutoStart(autoRunName, "", "");
@@ -620,43 +515,16 @@ namespace v2rayN
                     }
                     else
                     {
-                        RegWriteValue(Global.AutoRunRegPath, autoRunName, exePath);
+                        RegWriteValue(AutoRunRegPath, autoRunName, exePath);
                     }
                 }
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
-
-        /// <summary>
-        /// 是否已经设置开机自动启动
-        /// </summary>
-        /// <returns></returns>
-        public static bool IsAutoRun()
-        {
-            try
-            {
-                //clear
-                if (!RegReadValue(Global.AutoRunRegPath, Global.AutoRunName, "").IsNullOrEmpty())
-                {
-                    RegWriteValue(Global.AutoRunRegPath, Global.AutoRunName, "");
-                }
-
-                string value = RegReadValue(Global.AutoRunRegPath, Global.AutoRunName, "");
-                string exePath = GetExePath();
-                if (value == exePath || value == $"\"{exePath}\"")
-                {
-                    return true;
-                }
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex.Message, ex);
-            }
-            return false;
-        }
+         
 
         /// <summary>
         /// 获取启动了应用程序的可执行文件的路径
@@ -704,7 +572,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             finally
             {
@@ -730,7 +598,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             finally
             {
@@ -859,7 +727,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return inUse;
         }
@@ -891,34 +759,11 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return string.Empty;
             }
         }
 
-        /// <summary>
-        /// DeepCopy
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public static T DeepCopy<T>(T obj)
-        {
-            return FromJson<T>(ToJson(obj, false))!;
-
-            //            object retval;
-            //            MemoryStream ms = new();
-            //#pragma warning disable SYSLIB0011 // 类型或成员已过时
-            //            BinaryFormatter bf = new();
-            //#pragma warning restore SYSLIB0011 // 类型或成员已过时
-            //                                  //序列化成流
-            //            bf.Serialize(ms, obj);
-            //            ms.Seek(0, SeekOrigin.Begin);
-            //            //反序列化成对象
-            //            retval = bf.Deserialize(ms);
-            //            return (T)retval;
-        }
-
         /// <summary>
         /// 获取剪贴板数
         /// </summary>
@@ -937,7 +782,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return strData;
         }
@@ -976,7 +821,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return string.Empty;
         }
@@ -996,7 +841,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return false;
             }
         }
@@ -1036,7 +881,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -1115,7 +960,7 @@ namespace v2rayN
             }
         }
 
-        public static string GetBinPath(string filename, ECoreType? coreType = null)
+        public static string GetBinPath(string filename, string? coreType = null)
         {
             string _tempPath = Path.Combine(StartupPath(), "bin");
             if (!Directory.Exists(_tempPath))
@@ -1176,33 +1021,6 @@ namespace v2rayN
 
         #endregion TempPath
 
-        #region Log
-
-        public static void SaveLog(string strContent)
-        {
-            if (LogManager.IsLoggingEnabled())
-            {
-                var logger = LogManager.GetLogger("Log1");
-                logger.Info(strContent);
-            }
-        }
-
-        public static void SaveLog(string strTitle, Exception ex)
-        {
-            if (LogManager.IsLoggingEnabled())
-            {
-                var logger = LogManager.GetLogger("Log2");
-                logger.Debug($"{strTitle},{ex.Message}");
-                logger.Debug(ex.StackTrace);
-                if (ex?.InnerException != null)
-                {
-                    logger.Error(ex.InnerException);
-                }
-            }
-        }
-
-        #endregion Log
-
         #region scan screen
 
         public static string ScanScreen(float dpiX, float dpiY)
@@ -1248,7 +1066,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return string.Empty;
         }
diff --git a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
index 137db406..83380bf0 100644
--- a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
@@ -38,7 +38,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                SelectedSource = Utils.DeepCopy(profileItem);
+                SelectedSource = JsonUtils.DeepCopy(profileItem);
             }
 
             _view = view;
@@ -127,7 +127,7 @@ namespace v2rayN.ViewModels
                 _noticeHandler?.Enqueue(ResUI.SuccessfullyImportedCustomServer);
                 if (!Utils.IsNullOrEmpty(item.indexId))
                 {
-                    SelectedSource = Utils.DeepCopy(item);
+                    SelectedSource = JsonUtils.DeepCopy(item);
                 }
                 IsModified = true;
             }
diff --git a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
index a36b0733..6c579567 100644
--- a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
@@ -37,7 +37,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                SelectedSource = Utils.DeepCopy(profileItem);
+                SelectedSource = JsonUtils.DeepCopy(profileItem);
             }
 
             SaveCmd = ReactiveCommand.Create(() =>
diff --git a/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
index 56c5ee45..0192e8fa 100644
--- a/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
@@ -63,7 +63,7 @@ namespace v2rayN.ViewModels
         {
             if (!Utils.IsNullOrEmpty(normalDNS))
             {
-                var obj = Utils.ParseJson(normalDNS);
+                var obj = JsonUtils.ParseJson(normalDNS);
                 if (obj != null && obj.ContainsKey("servers") == true)
                 {
                 }
@@ -78,7 +78,7 @@ namespace v2rayN.ViewModels
             }
             if (!Utils.IsNullOrEmpty(normalDNS2))
             {
-                var obj2 = Utils.FromJson<Dns4Sbox>(normalDNS2);
+                var obj2 = JsonUtils.FromJson<Dns4Sbox>(normalDNS2);
                 if (obj2 == null)
                 {
                     UI.Show(ResUI.FillCorrectDNSText);
@@ -87,7 +87,7 @@ namespace v2rayN.ViewModels
             }
             if (!Utils.IsNullOrEmpty(tunDNS2))
             {
-                var obj2 = Utils.FromJson<Dns4Sbox>(tunDNS2);
+                var obj2 = JsonUtils.FromJson<Dns4Sbox>(tunDNS2);
                 if (obj2 == null)
                 {
                     UI.Show(ResUI.FillCorrectDNSText);
@@ -102,8 +102,8 @@ namespace v2rayN.ViewModels
             ConfigHandler.SaveDNSItems(_config, item);
 
             var item2 = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
-            item2.normalDNS = Utils.ToJson(Utils.ParseJson(normalDNS2));
-            item2.tunDNS = Utils.ToJson(Utils.ParseJson(tunDNS2));
+            item2.normalDNS = JsonUtils.ToJson(JsonUtils.ParseJson(normalDNS2));
+            item2.tunDNS = JsonUtils.ToJson(JsonUtils.ParseJson(tunDNS2));
             ConfigHandler.SaveDNSItems(_config, item2);
 
             _noticeHandler?.Enqueue(ResUI.OperationSuccess);
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index ef654fe5..cb7b8913 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -652,13 +652,13 @@ namespace v2rayN.ViewModels
 
                                 if (SelectedProfile?.indexId == item.indexId)
                                 {
-                                    var temp = Utils.DeepCopy(item);
+                                    var temp = JsonUtils.DeepCopy(item);
                                     _profileItems.Replace(item, temp);
                                     SelectedProfile = temp;
                                 }
                                 else
                                 {
-                                    _profileItems.Replace(item, Utils.DeepCopy(item));
+                                    _profileItems.Replace(item, JsonUtils.DeepCopy(item));
                                 }
                             }
                         }
@@ -667,7 +667,7 @@ namespace v2rayN.ViewModels
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -700,7 +700,7 @@ namespace v2rayN.ViewModels
                 {
                     item.speedVal = $"{speed} {Global.SpeedUnit}";
                 }
-                _profileItems.Replace(item, Utils.DeepCopy(item));
+                _profileItems.Replace(item, JsonUtils.DeepCopy(item));
             }
         }
 
@@ -734,7 +734,7 @@ namespace v2rayN.ViewModels
         {
             try
             {
-                Utils.SaveLog("MyAppExit Begin");
+                Logging.SaveLog("MyAppExit Begin");
 
                 StorageUI();
                 ConfigHandler.SaveConfig(_config);
@@ -755,7 +755,7 @@ namespace v2rayN.ViewModels
                 _statistics?.Close();
 
                 _coreHandler.CoreStop();
-                Utils.SaveLog("MyAppExit End");
+                Logging.SaveLog("MyAppExit End");
             }
             catch { }
             finally
@@ -835,7 +835,7 @@ namespace v2rayN.ViewModels
                             totalDown = t22 == null ? "" : Utils.HumanFy(t22.totalDown),
                             totalUp = t22 == null ? "" : Utils.HumanFy(t22.totalUp)
                         }).OrderBy(t => t.sort).ToList();
-            _lstProfile = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(lstModel));
+            _lstProfile = JsonUtils.FromJson<List<ProfileItem>>(JsonUtils.ToJson(lstModel));
 
             Application.Current.Dispatcher.Invoke((Action)(() =>
             {
@@ -941,7 +941,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                lstSelecteds = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(orderProfiles));
+                lstSelecteds = JsonUtils.FromJson<List<ProfileItem>>(JsonUtils.ToJson(orderProfiles));
             }
 
             return 0;
@@ -1456,7 +1456,7 @@ namespace v2rayN.ViewModels
                     CloseV2ray();
 
                     string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(msg));
-                    string toPath = Utils.GetBinPath("", type);
+                    string toPath = Utils.GetBinPath("", type.ToString());
 
                     FileManager.ZipExtractToFile(fileName, toPath, _config.guiItem.ignoreGeoUpdateCore ? "geo" : "");
 
diff --git a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
index 8a49279f..1c1a2423 100644
--- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
@@ -296,7 +296,7 @@ namespace v2rayN.ViewModels
             //_config.kcpItem.congestion = Kcpcongestion;
 
             //UI
-            Utils.SetAutoRun(AutoRun);
+            Utils.SetAutoRun(Global.AutoRunRegPath, Global.AutoRunName, AutoRun);
             _config.guiItem.autoRun = AutoRun;
             _config.guiItem.enableStatistics = EnableStatistics;
             _config.guiItem.keepOlderDedupl = KeepOlderDedupl;
diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
index c545ef9c..b50005f1 100644
--- a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
@@ -60,7 +60,7 @@ namespace v2rayN.ViewModels
             else
             {
                 SelectedRouting = routingItem;
-                _rules = Utils.FromJson<List<RulesItem>>(SelectedRouting.ruleSet);
+                _rules = JsonUtils.FromJson<List<RulesItem>>(SelectedRouting.ruleSet);
             }
 
             RefreshRulesItems();
@@ -209,7 +209,7 @@ namespace v2rayN.ViewModels
             }
             if (lst.Count > 0)
             {
-                Utils.SetClipboardData(Utils.ToJson(lst));
+                Utils.SetClipboardData(JsonUtils.ToJson(lst));
                 //UI.Show(ResUI.OperationSuccess"));
             }
         }
@@ -248,7 +248,7 @@ namespace v2rayN.ViewModels
                 it.id = Utils.GetGUID(false);
             }
             item.ruleNum = _rules.Count;
-            item.ruleSet = Utils.ToJson(_rules, false);
+            item.ruleSet = JsonUtils.ToJson(_rules, false);
 
             if (ConfigHandler.SaveRoutingItem(_config, item) == 0)
             {
@@ -334,7 +334,7 @@ namespace v2rayN.ViewModels
             {
                 return -1;
             }
-            var lstRules = Utils.FromJson<List<RulesItem>>(clipboardData);
+            var lstRules = JsonUtils.FromJson<List<RulesItem>>(clipboardData);
             if (lstRules == null)
             {
                 return -1;
diff --git a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs
index 7b38712d..9de95aed 100644
--- a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs
@@ -137,7 +137,7 @@ namespace v2rayN.ViewModels
             _lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
             if (_lockedItem != null)
             {
-                _lockedRules = Utils.FromJson<List<RulesItem>>(_lockedItem.ruleSet);
+                _lockedRules = JsonUtils.FromJson<List<RulesItem>>(_lockedItem.ruleSet);
                 ProxyDomain = Utils.List2String(_lockedRules[0].domain, true);
                 ProxyIP = Utils.List2String(_lockedRules[0].ip, true);
 
@@ -162,7 +162,7 @@ namespace v2rayN.ViewModels
                 _lockedRules[2].domain = Utils.String2List(Utils.Convert2Comma(BlockDomain.TrimEx()));
                 _lockedRules[2].ip = Utils.String2List(Utils.Convert2Comma(BlockIP.TrimEx()));
 
-                _lockedItem.ruleSet = Utils.ToJson(_lockedRules, false);
+                _lockedItem.ruleSet = JsonUtils.ToJson(_lockedRules, false);
 
                 ConfigHandler.SaveRoutingItem(_config, _lockedItem);
             }
diff --git a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
index d15e9a78..bab90942 100644
--- a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
@@ -33,7 +33,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                SelectedSource = Utils.DeepCopy(subItem);
+                SelectedSource = JsonUtils.DeepCopy(subItem);
             }
 
             SaveCmd = ReactiveCommand.Create(() =>
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
index a79879ef..5f511320 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
@@ -70,7 +70,7 @@ namespace v2rayN.Views
 
         private KeyEventItem GetKeyEventItemByEGlobalHotkey(List<KeyEventItem> KELsit, EGlobalHotkey eg)
         {
-            return Utils.DeepCopy(KELsit.Find((it) => it.eGlobalHotkey == eg) ?? new()
+            return JsonUtils.DeepCopy(KELsit.Find((it) => it.eGlobalHotkey == eg) ?? new()
             {
                 eGlobalHotkey = eg,
                 Control = false,
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index 0d1944f7..e4f30d56 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -276,7 +276,7 @@ namespace v2rayN.Views
 
         private void Current_SessionEnding(object sender, SessionEndingCancelEventArgs e)
         {
-            Utils.SaveLog("Current_SessionEnding");
+            Logging.SaveLog("Current_SessionEnding");
             StorageUI();
             ViewModel?.MyAppExit(true);
         }
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
index 45ff0e28..f431e4a0 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -128,7 +128,7 @@ namespace v2rayN.Views
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("fill fonts error", ex);
+                Logging.SaveLog("fill fonts error", ex);
             }
             cmbcurrentFontFamily.Items.Add(string.Empty);
 
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index f6f97e0e..fcb7f0da 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -20,7 +20,6 @@
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="QRCoder.Xaml" Version="1.4.3" />
 		<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
-		<PackageReference Include="System.Text.Json" Version="8.0.0" />
 		<PackageReference Include="TaskScheduler" Version="2.10.1" /> 
 		<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
 		<PackageReference Include="ReactiveUI.Fody" Version="19.5.39" />

From 4aae82e0ccf199600658229f71eab91b9a9f826e Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 10 Jan 2024 10:56:10 +0800
Subject: [PATCH 18/62] Adjust Tool code

---
 v2rayN/v2rayN/Handler/ConfigHandler.cs          | 1 -
 v2rayN/v2rayN/Handler/UpdateHandle.cs           | 1 -
 v2rayN/v2rayN/Tool/FileManager.cs               | 2 +-
 v2rayN/v2rayN/Tool/QueryableExtension.cs        | 2 +-
 v2rayN/v2rayN/Tool/SemanticVersion.cs           | 2 +-
 v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs | 1 -
 6 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 687a45e2..3880242b 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -3,7 +3,6 @@ using System.IO;
 using System.Text.RegularExpressions;
 using v2rayN.Base;
 using v2rayN.Mode;
-using v2rayN.Tool;
 
 namespace v2rayN.Handler
 {
diff --git a/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayN/v2rayN/Handler/UpdateHandle.cs
index 5c9b4e31..d325f1ce 100644
--- a/v2rayN/v2rayN/Handler/UpdateHandle.cs
+++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs
@@ -9,7 +9,6 @@ using System.Windows;
 using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Resx;
-using v2rayN.Tool;
 
 namespace v2rayN.Handler
 {
diff --git a/v2rayN/v2rayN/Tool/FileManager.cs b/v2rayN/v2rayN/Tool/FileManager.cs
index bdfa0fd5..4fa627b8 100644
--- a/v2rayN/v2rayN/Tool/FileManager.cs
+++ b/v2rayN/v2rayN/Tool/FileManager.cs
@@ -2,7 +2,7 @@
 using System.IO.Compression;
 using System.Text;
 
-namespace v2rayN.Tool
+namespace v2rayN
 {
     public static class FileManager
     {
diff --git a/v2rayN/v2rayN/Tool/QueryableExtension.cs b/v2rayN/v2rayN/Tool/QueryableExtension.cs
index 218f7273..258456bf 100644
--- a/v2rayN/v2rayN/Tool/QueryableExtension.cs
+++ b/v2rayN/v2rayN/Tool/QueryableExtension.cs
@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace v2rayN.Tool
+namespace v2rayN
 {
     public static class QueryableExtension
     {
diff --git a/v2rayN/v2rayN/Tool/SemanticVersion.cs b/v2rayN/v2rayN/Tool/SemanticVersion.cs
index 5b01242e..c23b7a67 100644
--- a/v2rayN/v2rayN/Tool/SemanticVersion.cs
+++ b/v2rayN/v2rayN/Tool/SemanticVersion.cs
@@ -1,6 +1,6 @@
 using v2rayN.Base;
 
-namespace v2rayN.Tool
+namespace v2rayN
 {
     public class SemanticVersion
     {
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index cb7b8913..898ba6d1 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -19,7 +19,6 @@ using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
-using v2rayN.Tool;
 using v2rayN.Views;
 
 namespace v2rayN.ViewModels

From 5135afcf8f9fada0acaafb1e56f3716ba7ff86f2 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 10 Jan 2024 16:32:26 +0800
Subject: [PATCH 19/62] Refactor

---
 v2rayN/v2rayN/{Base => Common}/DownloaderHelper.cs      | 2 +-
 v2rayN/v2rayN/{Tool => Common}/FileManager.cs           | 0
 v2rayN/v2rayN/{Base => Common}/HttpClientHelper.cs      | 2 +-
 v2rayN/v2rayN/{Tool => Common}/Job.cs                   | 0
 v2rayN/v2rayN/{Tool => Common}/JsonUtils.cs             | 0
 v2rayN/v2rayN/{Tool => Common}/Logging.cs               | 0
 v2rayN/v2rayN/{Tool => Common}/QueryableExtension.cs    | 0
 v2rayN/v2rayN/{Tool => Common}/SemanticVersion.cs       | 4 +---
 v2rayN/v2rayN/{Base => Common}/SqliteHelper.cs          | 2 +-
 v2rayN/v2rayN/{Base => Common}/StringEx.cs              | 2 +-
 v2rayN/v2rayN/{Tool => Common}/UI.cs                    | 0
 v2rayN/v2rayN/{Tool => Common}/Utils.cs                 | 2 +-
 v2rayN/v2rayN/Handler/ConfigHandler.cs                  | 1 -
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs              | 1 -
 v2rayN/v2rayN/Handler/CoreConfigV2ray.cs                | 1 -
 v2rayN/v2rayN/Handler/DownloadHandle.cs                 | 1 -
 v2rayN/v2rayN/Handler/LazyConfig.cs                     | 1 -
 v2rayN/v2rayN/Handler/ProfileExHandler.cs               | 1 -
 v2rayN/v2rayN/Handler/ShareHandler.cs                   | 1 -
 v2rayN/v2rayN/Handler/StatisticsHandler.cs              | 1 -
 v2rayN/v2rayN/Handler/UpdateHandle.cs                   | 1 -
 v2rayN/v2rayN/Mode/ProfileItem.cs                       | 1 -
 v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs         | 1 -
 v2rayN/v2rayN/ViewModels/AddServerViewModel.cs          | 1 -
 v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs         | 1 -
 v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs | 1 -
 v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs | 1 -
 v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs     | 1 -
 v2rayN/v2rayN/ViewModels/SubEditViewModel.cs            | 1 -
 v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs         | 1 -
 v2rayN/v2rayN/Views/AddServerWindow.xaml.cs             | 1 -
 v2rayN/v2rayN/Views/MsgView.xaml.cs                     | 1 -
 v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs    | 1 -
 33 files changed, 6 insertions(+), 29 deletions(-)
 rename v2rayN/v2rayN/{Base => Common}/DownloaderHelper.cs (99%)
 rename v2rayN/v2rayN/{Tool => Common}/FileManager.cs (100%)
 rename v2rayN/v2rayN/{Base => Common}/HttpClientHelper.cs (99%)
 rename v2rayN/v2rayN/{Tool => Common}/Job.cs (100%)
 rename v2rayN/v2rayN/{Tool => Common}/JsonUtils.cs (100%)
 rename v2rayN/v2rayN/{Tool => Common}/Logging.cs (100%)
 rename v2rayN/v2rayN/{Tool => Common}/QueryableExtension.cs (100%)
 rename v2rayN/v2rayN/{Tool => Common}/SemanticVersion.cs (99%)
 rename v2rayN/v2rayN/{Base => Common}/SqliteHelper.cs (99%)
 rename v2rayN/v2rayN/{Base => Common}/StringEx.cs (98%)
 rename v2rayN/v2rayN/{Tool => Common}/UI.cs (100%)
 rename v2rayN/v2rayN/{Tool => Common}/Utils.cs (99%)

diff --git a/v2rayN/v2rayN/Base/DownloaderHelper.cs b/v2rayN/v2rayN/Common/DownloaderHelper.cs
similarity index 99%
rename from v2rayN/v2rayN/Base/DownloaderHelper.cs
rename to v2rayN/v2rayN/Common/DownloaderHelper.cs
index 51a7840b..21e16535 100644
--- a/v2rayN/v2rayN/Base/DownloaderHelper.cs
+++ b/v2rayN/v2rayN/Common/DownloaderHelper.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Net;
 
-namespace v2rayN.Base
+namespace v2rayN
 {
     internal class DownloaderHelper
     {
diff --git a/v2rayN/v2rayN/Tool/FileManager.cs b/v2rayN/v2rayN/Common/FileManager.cs
similarity index 100%
rename from v2rayN/v2rayN/Tool/FileManager.cs
rename to v2rayN/v2rayN/Common/FileManager.cs
diff --git a/v2rayN/v2rayN/Base/HttpClientHelper.cs b/v2rayN/v2rayN/Common/HttpClientHelper.cs
similarity index 99%
rename from v2rayN/v2rayN/Base/HttpClientHelper.cs
rename to v2rayN/v2rayN/Common/HttpClientHelper.cs
index 8137c873..0c6e6ebb 100644
--- a/v2rayN/v2rayN/Base/HttpClientHelper.cs
+++ b/v2rayN/v2rayN/Common/HttpClientHelper.cs
@@ -3,7 +3,7 @@ using System.Net.Http;
 using System.Net.Mime;
 using System.Text;
 
-namespace v2rayN.Base
+namespace v2rayN
 {
     /// <summary>
     /// </summary>
diff --git a/v2rayN/v2rayN/Tool/Job.cs b/v2rayN/v2rayN/Common/Job.cs
similarity index 100%
rename from v2rayN/v2rayN/Tool/Job.cs
rename to v2rayN/v2rayN/Common/Job.cs
diff --git a/v2rayN/v2rayN/Tool/JsonUtils.cs b/v2rayN/v2rayN/Common/JsonUtils.cs
similarity index 100%
rename from v2rayN/v2rayN/Tool/JsonUtils.cs
rename to v2rayN/v2rayN/Common/JsonUtils.cs
diff --git a/v2rayN/v2rayN/Tool/Logging.cs b/v2rayN/v2rayN/Common/Logging.cs
similarity index 100%
rename from v2rayN/v2rayN/Tool/Logging.cs
rename to v2rayN/v2rayN/Common/Logging.cs
diff --git a/v2rayN/v2rayN/Tool/QueryableExtension.cs b/v2rayN/v2rayN/Common/QueryableExtension.cs
similarity index 100%
rename from v2rayN/v2rayN/Tool/QueryableExtension.cs
rename to v2rayN/v2rayN/Common/QueryableExtension.cs
diff --git a/v2rayN/v2rayN/Tool/SemanticVersion.cs b/v2rayN/v2rayN/Common/SemanticVersion.cs
similarity index 99%
rename from v2rayN/v2rayN/Tool/SemanticVersion.cs
rename to v2rayN/v2rayN/Common/SemanticVersion.cs
index c23b7a67..597ed970 100644
--- a/v2rayN/v2rayN/Tool/SemanticVersion.cs
+++ b/v2rayN/v2rayN/Common/SemanticVersion.cs
@@ -1,6 +1,4 @@
-using v2rayN.Base;
-
-namespace v2rayN
+namespace v2rayN
 {
     public class SemanticVersion
     {
diff --git a/v2rayN/v2rayN/Base/SqliteHelper.cs b/v2rayN/v2rayN/Common/SqliteHelper.cs
similarity index 99%
rename from v2rayN/v2rayN/Base/SqliteHelper.cs
rename to v2rayN/v2rayN/Common/SqliteHelper.cs
index 7903f3f1..42ca84f5 100644
--- a/v2rayN/v2rayN/Base/SqliteHelper.cs
+++ b/v2rayN/v2rayN/Common/SqliteHelper.cs
@@ -1,7 +1,7 @@
 using SQLite;
 using System.Collections;
 
-namespace v2rayN.Base
+namespace v2rayN
 {
     public sealed class SqliteHelper
     {
diff --git a/v2rayN/v2rayN/Base/StringEx.cs b/v2rayN/v2rayN/Common/StringEx.cs
similarity index 98%
rename from v2rayN/v2rayN/Base/StringEx.cs
rename to v2rayN/v2rayN/Common/StringEx.cs
index cf0f9106..57ba7795 100644
--- a/v2rayN/v2rayN/Base/StringEx.cs
+++ b/v2rayN/v2rayN/Common/StringEx.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 
-namespace v2rayN.Base
+namespace v2rayN
 {
     internal static class StringEx
     {
diff --git a/v2rayN/v2rayN/Tool/UI.cs b/v2rayN/v2rayN/Common/UI.cs
similarity index 100%
rename from v2rayN/v2rayN/Tool/UI.cs
rename to v2rayN/v2rayN/Common/UI.cs
diff --git a/v2rayN/v2rayN/Tool/Utils.cs b/v2rayN/v2rayN/Common/Utils.cs
similarity index 99%
rename from v2rayN/v2rayN/Tool/Utils.cs
rename to v2rayN/v2rayN/Common/Utils.cs
index 1377cb3d..fd8f9499 100644
--- a/v2rayN/v2rayN/Tool/Utils.cs
+++ b/v2rayN/v2rayN/Common/Utils.cs
@@ -524,7 +524,7 @@ namespace v2rayN
                 Logging.SaveLog(ex.Message, ex);
             }
         }
-         
+
 
         /// <summary>
         /// 获取启动了应用程序的可执行文件的路径
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 3880242b..d034f4de 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -1,7 +1,6 @@
 using System.Data;
 using System.IO;
 using System.Text.RegularExpressions;
-using v2rayN.Base;
 using v2rayN.Mode;
 
 namespace v2rayN.Handler
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index 7e1f24ce..78ac1ece 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using System.Net.NetworkInformation;
-using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Resx;
 
diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
index 8206bd54..c2bb713b 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Net;
 using System.Net.NetworkInformation;
-using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Resx;
 
diff --git a/v2rayN/v2rayN/Handler/DownloadHandle.cs b/v2rayN/v2rayN/Handler/DownloadHandle.cs
index fc3aceb7..0b761cda 100644
--- a/v2rayN/v2rayN/Handler/DownloadHandle.cs
+++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs
@@ -4,7 +4,6 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Sockets;
-using v2rayN.Base;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
diff --git a/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayN/v2rayN/Handler/LazyConfig.cs
index 73040e24..0e16af1e 100644
--- a/v2rayN/v2rayN/Handler/LazyConfig.cs
+++ b/v2rayN/v2rayN/Handler/LazyConfig.cs
@@ -1,5 +1,4 @@
 using System.Runtime.Intrinsics.X86;
-using v2rayN.Base;
 using v2rayN.Mode;
 
 namespace v2rayN.Handler
diff --git a/v2rayN/v2rayN/Handler/ProfileExHandler.cs b/v2rayN/v2rayN/Handler/ProfileExHandler.cs
index 26d164fc..13447e9e 100644
--- a/v2rayN/v2rayN/Handler/ProfileExHandler.cs
+++ b/v2rayN/v2rayN/Handler/ProfileExHandler.cs
@@ -1,6 +1,5 @@
 using System.Collections.Concurrent;
 using System.Reactive.Linq;
-using v2rayN.Base;
 using v2rayN.Mode;
 
 namespace v2rayN.Handler
diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
index 79be638b..dec56779 100644
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -1,7 +1,6 @@
 using System.Collections.Specialized;
 using System.Text.RegularExpressions;
 using System.Web;
-using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Resx;
 
diff --git a/v2rayN/v2rayN/Handler/StatisticsHandler.cs b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
index 032069e7..dd4d9d66 100644
--- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using System.Net.Sockets;
-using v2rayN.Base;
 using v2rayN.Mode;
 
 namespace v2rayN.Handler
diff --git a/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayN/v2rayN/Handler/UpdateHandle.cs
index d325f1ce..fa24247f 100644
--- a/v2rayN/v2rayN/Handler/UpdateHandle.cs
+++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs
@@ -6,7 +6,6 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Resx;
 
diff --git a/v2rayN/v2rayN/Mode/ProfileItem.cs b/v2rayN/v2rayN/Mode/ProfileItem.cs
index 3e1a4e8e..999901db 100644
--- a/v2rayN/v2rayN/Mode/ProfileItem.cs
+++ b/v2rayN/v2rayN/Mode/ProfileItem.cs
@@ -1,5 +1,4 @@
 using SQLite;
-using v2rayN.Base;
 
 namespace v2rayN.Mode
 {
diff --git a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
index 83380bf0..34b3a93f 100644
--- a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
@@ -6,7 +6,6 @@ using Splat;
 using System.IO;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
diff --git a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
index 6c579567..19b7cd2d 100644
--- a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
@@ -3,7 +3,6 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index 898ba6d1..64a219b8 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -15,7 +15,6 @@ using System.Reactive.Linq;
 using System.Text;
 using System.Windows;
 using System.Windows.Media;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs
index aa6663da..c6c9e5f1 100644
--- a/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs
@@ -3,7 +3,6 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
index b50005f1..d1bf0cfe 100644
--- a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
@@ -5,7 +5,6 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
diff --git a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs
index 9de95aed..0a19f4c4 100644
--- a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs
@@ -4,7 +4,6 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
diff --git a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
index bab90942..c6ad0a17 100644
--- a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
@@ -3,7 +3,6 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
diff --git a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs
index cb9e6aea..b5631c38 100644
--- a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs
@@ -6,7 +6,6 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
index aa43f0ab..8ad2605f 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
@@ -2,7 +2,6 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
diff --git a/v2rayN/v2rayN/Views/MsgView.xaml.cs b/v2rayN/v2rayN/Views/MsgView.xaml.cs
index 59276400..e60bb9db 100644
--- a/v2rayN/v2rayN/Views/MsgView.xaml.cs
+++ b/v2rayN/v2rayN/Views/MsgView.xaml.cs
@@ -2,7 +2,6 @@ using ReactiveUI;
 using System.Reactive.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Threading;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
index ac1fb8ec..395b5af4 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
@@ -1,7 +1,6 @@
 using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.ViewModels;
 

From 6762f35adeba7a66ace6cdb589822ae358658477 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 10 Jan 2024 17:44:55 +0800
Subject: [PATCH 20/62] Optimize code

---
 v2rayN/v2rayN/Common/Utils.cs                           | 8 ++++----
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs              | 4 ++--
 v2rayN/v2rayN/Handler/DownloadHandle.cs                 | 2 +-
 v2rayN/v2rayN/Handler/SpeedtestHandler.cs               | 4 ++--
 v2rayN/v2rayN/Handler/UpdateHandle.cs                   | 4 ++--
 v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs         | 2 +-
 v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs | 6 +++---
 v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs         | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/v2rayN/v2rayN/Common/Utils.cs b/v2rayN/v2rayN/Common/Utils.cs
index fd8f9499..4b87d590 100644
--- a/v2rayN/v2rayN/Common/Utils.cs
+++ b/v2rayN/v2rayN/Common/Utils.cs
@@ -206,7 +206,7 @@ namespace v2rayN
             {
                 return Convert.ToInt32(obj);
             }
-            catch (Exception ex)
+            catch //(Exception ex)
             {
                 //SaveLog(ex.Message, ex);
                 return 0;
@@ -219,7 +219,7 @@ namespace v2rayN
             {
                 return Convert.ToBoolean(obj);
             }
-            catch (Exception ex)
+            catch //(Exception ex)
             {
                 //SaveLog(ex.Message, ex);
                 return false;
@@ -232,7 +232,7 @@ namespace v2rayN
             {
                 return obj?.ToString() ?? string.Empty;
             }
-            catch (Exception ex)
+            catch// (Exception ex)
             {
                 //SaveLog(ex.Message, ex);
                 return string.Empty;
@@ -546,7 +546,7 @@ namespace v2rayN
         /// <returns></returns>
         public static string GetExePath()
         {
-            return Environment.ProcessPath;
+            return Environment.ProcessPath ?? string.Empty;
         }
 
         public static string StartupPath()
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index 78ac1ece..629f84bd 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -177,7 +177,7 @@ namespace v2rayN.Handler
                         _config.tunModeItem.stack = Global.TunStacks[0];
                     }
 
-                    var tunInbound = JsonUtils.FromJson<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName));
+                    var tunInbound = JsonUtils.FromJson<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
                     tunInbound.mtu = _config.tunModeItem.mtu;
                     tunInbound.strict_route = _config.tunModeItem.strictRoute;
                     tunInbound.stack = _config.tunModeItem.stack;
@@ -196,7 +196,7 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        private Inbound4Sbox? GetInbound(Inbound4Sbox inItem, string tag, int offset, bool bSocks)
+        private Inbound4Sbox GetInbound(Inbound4Sbox inItem, string tag, int offset, bool bSocks)
         {
             var inbound = JsonUtils.DeepCopy(inItem);
             inbound.tag = tag;
diff --git a/v2rayN/v2rayN/Handler/DownloadHandle.cs b/v2rayN/v2rayN/Handler/DownloadHandle.cs
index 0b761cda..62bb2d62 100644
--- a/v2rayN/v2rayN/Handler/DownloadHandle.cs
+++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs
@@ -298,7 +298,7 @@ namespace v2rayN.Handler
 
                 responseTime = timer.Elapsed.Milliseconds;
             }
-            catch (Exception ex)
+            catch //(Exception ex)
             {
                 //Utils.SaveLog(ex.Message, ex);
             }
diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
index 9c7bc4ff..ba0c39bb 100644
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -103,7 +103,7 @@ namespace v2rayN.Handler
                 {
                     try
                     {
-                        Task.Run(() => updateFun(it));
+                        _ = Task.Run(() => updateFun(it));
                     }
                     catch (Exception ex)
                     {
@@ -349,7 +349,7 @@ namespace v2rayN.Handler
 
             try
             {
-                if (!IPAddress.TryParse(url, out IPAddress ipAddress))
+                if (!IPAddress.TryParse(url, out IPAddress? ipAddress))
                 {
                     IPHostEntry ipHostInfo = System.Net.Dns.GetHostEntry(url);
                     ipAddress = ipHostInfo.AddressList[0];
diff --git a/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayN/v2rayN/Handler/UpdateHandle.cs
index fa24247f..365eb039 100644
--- a/v2rayN/v2rayN/Handler/UpdateHandle.cs
+++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs
@@ -221,7 +221,7 @@ namespace v2rayN.Handler
                     //more url
                     if (Utils.IsNullOrEmpty(item.convertTarget) && !Utils.IsNullOrEmpty(item.moreUrl.TrimEx()))
                     {
-                        if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result))
+                        if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result!))
                         {
                             result = Utils.Base64Decode(result);
                         }
@@ -245,7 +245,7 @@ namespace v2rayN.Handler
                             }
                             if (!Utils.IsNullOrEmpty(result2))
                             {
-                                if (Utils.IsBase64String(result2))
+                                if (Utils.IsBase64String(result2!))
                                 {
                                     result += Utils.Base64Decode(result2);
                                 }
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index 64a219b8..b4f3d234 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -1132,7 +1132,7 @@ namespace v2rayN.ViewModels
                 _noticeHandler?.Enqueue(ResUI.PleaseSelectServer);
                 return;
             }
-            string url = ShareHandler.GetShareUrl(item);
+            var url = ShareHandler.GetShareUrl(item);
             if (Utils.IsNullOrEmpty(url))
             {
                 return;
diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
index d1bf0cfe..0fd7a0c5 100644
--- a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
@@ -80,9 +80,9 @@ namespace v2rayN.ViewModels
             {
                 ImportRulesFromClipboard();
             });
-            ImportRulesFromUrlCmd = ReactiveCommand.Create(() =>
+            ImportRulesFromUrlCmd = ReactiveCommand.CreateFromTask(() =>
             {
-                ImportRulesFromUrl();
+                return ImportRulesFromUrl();
             });
 
             RuleRemoveCmd = ReactiveCommand.Create(() =>
@@ -142,7 +142,7 @@ namespace v2rayN.ViewModels
 
         public void RuleEdit(bool blNew)
         {
-            RulesItem item;
+            RulesItem? item;
             if (blNew)
             {
                 item = new();
diff --git a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs
index b5631c38..0fdf36c2 100644
--- a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs
@@ -103,7 +103,7 @@ namespace v2rayN.ViewModels
 
             foreach (var it in SelectedSources)
             {
-                ConfigHandler.DeleteSubItem(_config, it?.id);
+                ConfigHandler.DeleteSubItem(_config, it.id);
             }
             RefreshSubItems();
             _noticeHandler?.Enqueue(ResUI.OperationSuccess);

From 3c4703ad852992d3797706d9b58eec6b2c37d3c1 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 11 Jan 2024 18:24:32 +0800
Subject: [PATCH 21/62] Optimize code

---
 .../{Handler => Common}/QRCodeHelper.cs       |  8 +++++--
 v2rayN/v2rayN/Common/UI.cs                    | 22 ++++++++++++++++++-
 .../v2rayN/ViewModels/AddServer2ViewModel.cs  | 11 +++-------
 .../v2rayN/ViewModels/MainWindowViewModel.cs  | 10 ++-------
 .../ViewModels/RoutingRuleSettingViewModel.cs | 11 +++-------
 .../v2rayN/Views/OptionSettingWindow.xaml.cs  | 11 +---------
 .../Views/RoutingRuleSettingWindow.xaml.cs    | 13 ++++++-----
 7 files changed, 43 insertions(+), 43 deletions(-)
 rename v2rayN/v2rayN/{Handler => Common}/QRCodeHelper.cs (78%)

diff --git a/v2rayN/v2rayN/Handler/QRCodeHelper.cs b/v2rayN/v2rayN/Common/QRCodeHelper.cs
similarity index 78%
rename from v2rayN/v2rayN/Handler/QRCodeHelper.cs
rename to v2rayN/v2rayN/Common/QRCodeHelper.cs
index 07af8856..0c4fbdb2 100644
--- a/v2rayN/v2rayN/Handler/QRCodeHelper.cs
+++ b/v2rayN/v2rayN/Common/QRCodeHelper.cs
@@ -2,15 +2,19 @@
 using QRCoder.Xaml;
 using System.Windows.Media;
 
-namespace v2rayN.Handler
+namespace v2rayN
 {
     /// <summary>
     /// 含有QR码的描述类和包装编码和渲染
     /// </summary>
     public class QRCodeHelper
     {
-        public static DrawingImage? GetQRCode(string strContent)
+        public static DrawingImage? GetQRCode(string? strContent)
         {
+            if (strContent is null)
+            {
+                return null;
+            }
             try
             {
                 QRCodeGenerator qrGenerator = new();
diff --git a/v2rayN/v2rayN/Common/UI.cs b/v2rayN/v2rayN/Common/UI.cs
index dccbeee1..226757c4 100644
--- a/v2rayN/v2rayN/Common/UI.cs
+++ b/v2rayN/v2rayN/Common/UI.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 
 namespace v2rayN
 {
@@ -20,5 +21,24 @@ namespace v2rayN
         {
             return MessageBox.Show(msg, caption, MessageBoxButton.YesNo, MessageBoxImage.Question);
         }
+
+        public static bool? OpenFileDialog(out string fileName, string filter)
+        {
+            fileName = string.Empty;
+
+            var fileDialog = new OpenFileDialog
+            {
+                Multiselect = false,
+                Filter = filter
+            };
+
+            if (fileDialog.ShowDialog() != true)
+            {
+                return false;
+            }
+            fileName = fileDialog.FileName;
+
+            return true;
+        }
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
index 34b3a93f..f4a5796c 100644
--- a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
@@ -1,4 +1,3 @@
-using Microsoft.Win32;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using ReactiveUI.Validation.Helpers;
@@ -104,20 +103,16 @@ namespace v2rayN.ViewModels
         {
             UI.Show(ResUI.CustomServerTips);
 
-            OpenFileDialog fileDialog = new()
-            {
-                Multiselect = false,
-                Filter = "Config|*.json|YAML|*.yaml;*.yml|All|*.*"
-            };
-            if (fileDialog.ShowDialog() != true)
+            if (UI.OpenFileDialog(out string fileName,
+                "Config|*.json|YAML|*.yaml;*.yml|All|*.*") != true)
             {
                 return;
             }
-            string fileName = fileDialog.FileName;
             if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
+
             var item = LazyConfig.Instance.GetProfileItem(SelectedSource.indexId);
             item ??= SelectedSource;
             item.address = fileName;
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index b4f3d234..52f581bc 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -3,7 +3,6 @@ using DynamicData.Binding;
 using MaterialDesignColors;
 using MaterialDesignColors.ColorManipulation;
 using MaterialDesignThemes.Wpf;
-using Microsoft.Win32;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
@@ -1397,16 +1396,11 @@ namespace v2rayN.ViewModels
 
         private void ImportOldGuiConfig()
         {
-            OpenFileDialog fileDialog = new()
-            {
-                Multiselect = false,
-                Filter = "guiNConfig|*.json|All|*.*"
-            };
-            if (fileDialog.ShowDialog() != true)
+            if (UI.OpenFileDialog(out string fileName,
+                "guiNConfig|*.json|All|*.*") != true)
             {
                 return;
             }
-            string fileName = fileDialog.FileName;
             if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
index 0fd7a0c5..52f08ba4 100644
--- a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
@@ -1,5 +1,4 @@
 using DynamicData.Binding;
-using Microsoft.Win32;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
@@ -264,20 +263,16 @@ namespace v2rayN.ViewModels
 
         private void ImportRulesFromFile()
         {
-            OpenFileDialog fileDialog = new OpenFileDialog
-            {
-                Multiselect = false,
-                Filter = "Rules|*.json|All|*.*"
-            };
-            if (fileDialog.ShowDialog() != true)
+            if (UI.OpenFileDialog(out string fileName,
+                "Rules|*.json|All|*.*") != true)
             {
                 return;
             }
-            string fileName = fileDialog.FileName;
             if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
+
             string result = Utils.LoadResource(fileName);
             if (Utils.IsNullOrEmpty(result))
             {
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
index f431e4a0..c7f13a8c 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -1,5 +1,4 @@
-using Microsoft.Win32;
-using ReactiveUI;
+using ReactiveUI;
 using System.Globalization;
 using System.IO;
 using System.Reactive.Disposables;
@@ -205,13 +204,5 @@ namespace v2rayN.Views
             this.Close();
         }
 
-        private void btnBrowse_Click(object sender, System.Windows.RoutedEventArgs e)
-        {
-            var openFileDialog1 = new OpenFileDialog();
-            openFileDialog1.Filter = "tunConfig|*.json|All|*.*";
-            openFileDialog1.ShowDialog();
-
-            // txtCustomTemplate.Text = openFileDialog1.FileName;
-        }
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
index b6ed8a8f..740231bd 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
@@ -1,5 +1,4 @@
-using Microsoft.Win32;
-using ReactiveUI;
+using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
@@ -131,11 +130,13 @@ namespace v2rayN.Views
 
         private void btnBrowse_Click(object sender, System.Windows.RoutedEventArgs e)
         {
-            var openFileDialog1 = new OpenFileDialog();
-            openFileDialog1.Filter = "PNG,ICO|*.png;*.ico";
-            openFileDialog1.ShowDialog();
+            if (UI.OpenFileDialog(out string fileName,
+                "PNG,ICO|*.png;*.ico") != true)
+            {
+                return;
+            }
 
-            txtCustomIcon.Text = openFileDialog1.FileName;
+            txtCustomIcon.Text = fileName;
         }
     }
 }
\ No newline at end of file

From 02225ad0b8e5cd392643aacb019d8deebf5f0593 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 11 Jan 2024 18:34:33 +0800
Subject: [PATCH 22/62] Refactor

---
 v2rayN/v2rayN/Common/HttpClientHelper.cs      |  2 +-
 v2rayN/v2rayN/Common/JsonUtils.cs             |  8 +++---
 v2rayN/v2rayN/Handler/ConfigHandler.cs        | 26 +++++++++----------
 v2rayN/v2rayN/Handler/CoreConfigHandler.cs    | 12 ++++-----
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs    | 22 ++++++++--------
 v2rayN/v2rayN/Handler/CoreConfigV2ray.cs      | 22 ++++++++--------
 v2rayN/v2rayN/Handler/ProxySetting.cs         | 22 ----------------
 v2rayN/v2rayN/Handler/ShareHandler.cs         |  4 +--
 v2rayN/v2rayN/Handler/StatisticsSingbox.cs    |  2 +-
 v2rayN/v2rayN/Handler/UpdateHandle.cs         |  2 +-
 .../v2rayN/ViewModels/DNSSettingViewModel.cs  |  8 +++---
 .../v2rayN/ViewModels/MainWindowViewModel.cs  |  4 +--
 .../ViewModels/RoutingRuleSettingViewModel.cs |  8 +++---
 .../ViewModels/RoutingSettingViewModel.cs     |  4 +--
 14 files changed, 62 insertions(+), 84 deletions(-)

diff --git a/v2rayN/v2rayN/Common/HttpClientHelper.cs b/v2rayN/v2rayN/Common/HttpClientHelper.cs
index 0c6e6ebb..7a635e29 100644
--- a/v2rayN/v2rayN/Common/HttpClientHelper.cs
+++ b/v2rayN/v2rayN/Common/HttpClientHelper.cs
@@ -35,7 +35,7 @@ namespace v2rayN
 
         public async Task PutAsync(string url, Dictionary<string, string> headers)
         {
-            var jsonContent = JsonUtils.ToJson(headers);
+            var jsonContent = JsonUtils.Serialize(headers);
             var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
 
             var result = await httpClient.PutAsync(url, content);
diff --git a/v2rayN/v2rayN/Common/JsonUtils.cs b/v2rayN/v2rayN/Common/JsonUtils.cs
index 9493411e..b627d426 100644
--- a/v2rayN/v2rayN/Common/JsonUtils.cs
+++ b/v2rayN/v2rayN/Common/JsonUtils.cs
@@ -14,7 +14,7 @@ namespace v2rayN
         /// <returns></returns>
         public static T DeepCopy<T>(T obj)
         {
-            return FromJson<T>(ToJson(obj, false))!;
+            return Deserialize<T>(Serialize(obj, false))!;
         }
 
         /// <summary>
@@ -23,7 +23,7 @@ namespace v2rayN
         /// <typeparam name="T"></typeparam>
         /// <param name="strJson"></param>
         /// <returns></returns>
-        public static T? FromJson<T>(string? strJson)
+        public static T? Deserialize<T>(string? strJson)
         {
             try
             {
@@ -68,7 +68,7 @@ namespace v2rayN
         /// <param name="obj"></param>
         /// <param name="indented"></param>
         /// <returns></returns>
-        public static string ToJson(object? obj, bool indented = true)
+        public static string Serialize(object? obj, bool indented = true)
         {
             string result = string.Empty;
             try
@@ -95,7 +95,7 @@ namespace v2rayN
         /// <param name="filePath"></param>
         /// <param name="nullValue"></param>
         /// <returns></returns>
-        public static int ToJsonFile(object? obj, string filePath, bool nullValue = true)
+        public static int ToFile(object? obj, string filePath, bool nullValue = true)
         {
             int result;
             try
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index d034f4de..7fa52b9d 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -27,7 +27,7 @@ namespace v2rayN.Handler
             if (!Utils.IsNullOrEmpty(result))
             {
                 //转成Json
-                config = JsonUtils.FromJson<Config>(result);
+                config = JsonUtils.Deserialize<Config>(result);
             }
             else
             {
@@ -232,7 +232,7 @@ namespace v2rayN.Handler
                     //save temp file
                     var resPath = Utils.GetConfigPath(configRes);
                     var tempPath = $"{resPath}_temp";
-                    if (JsonUtils.ToJsonFile(config, tempPath) != 0)
+                    if (JsonUtils.ToFile(config, tempPath) != 0)
                     {
                         return;
                     }
@@ -259,13 +259,13 @@ namespace v2rayN.Handler
                 return -1;
             }
 
-            var configOld = JsonUtils.FromJson<ConfigOld>(result);
+            var configOld = JsonUtils.Deserialize<ConfigOld>(result);
             if (configOld == null)
             {
                 return -1;
             }
 
-            var subItem = JsonUtils.FromJson<List<SubItem>>(JsonUtils.ToJson(configOld.subItem));
+            var subItem = JsonUtils.Deserialize<List<SubItem>>(JsonUtils.Serialize(configOld.subItem));
             foreach (var it in subItem)
             {
                 if (Utils.IsNullOrEmpty(it.id))
@@ -275,7 +275,7 @@ namespace v2rayN.Handler
                 SqliteHelper.Instance.Replace(it);
             }
 
-            var profileItems = JsonUtils.FromJson<List<ProfileItem>>(JsonUtils.ToJson(configOld.vmess));
+            var profileItems = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(configOld.vmess));
             foreach (var it in profileItems)
             {
                 if (Utils.IsNullOrEmpty(it.indexId))
@@ -291,13 +291,13 @@ namespace v2rayN.Handler
                 {
                     continue;
                 }
-                var routing = JsonUtils.FromJson<RoutingItem>(JsonUtils.ToJson(it));
+                var routing = JsonUtils.Deserialize<RoutingItem>(JsonUtils.Serialize(it));
                 foreach (var it2 in it.rules)
                 {
                     it2.id = Utils.GetGUID(false);
                 }
                 routing.ruleNum = it.rules.Count;
-                routing.ruleSet = JsonUtils.ToJson(it.rules, false);
+                routing.ruleSet = JsonUtils.Serialize(it.rules, false);
 
                 if (Utils.IsNullOrEmpty(routing.id))
                 {
@@ -306,7 +306,7 @@ namespace v2rayN.Handler
                 SqliteHelper.Instance.Replace(routing);
             }
 
-            config = JsonUtils.FromJson<Config>(JsonUtils.ToJson(configOld));
+            config = JsonUtils.Deserialize<Config>(JsonUtils.Serialize(configOld));
 
             if (config.coreBasicItem == null)
             {
@@ -1161,7 +1161,7 @@ namespace v2rayN.Handler
 
             ProfileItem profileItem = new();
             //Is v2ray configuration
-            V2rayConfig? v2rayConfig = JsonUtils.FromJson<V2rayConfig>(clipboardData);
+            V2rayConfig? v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(clipboardData);
             if (v2rayConfig?.inbounds?.Count > 0
                 && v2rayConfig.outbounds?.Count > 0)
             {
@@ -1252,10 +1252,10 @@ namespace v2rayN.Handler
             }
 
             //SsSIP008
-            var lstSsServer = JsonUtils.FromJson<List<SsServer>>(clipboardData);
+            var lstSsServer = JsonUtils.Deserialize<List<SsServer>>(clipboardData);
             if (lstSsServer?.Count <= 0)
             {
-                var ssSIP008 = JsonUtils.FromJson<SsSIP008>(clipboardData);
+                var ssSIP008 = JsonUtils.Deserialize<SsSIP008>(clipboardData);
                 if (ssSIP008?.servers?.Count > 0)
                 {
                     lstSsServer = ssSIP008.servers;
@@ -1467,7 +1467,7 @@ namespace v2rayN.Handler
                 return -1;
             }
 
-            var lstRules = JsonUtils.FromJson<List<RulesItem>>(clipboardData);
+            var lstRules = JsonUtils.Deserialize<List<RulesItem>>(clipboardData);
             if (lstRules == null)
             {
                 return -1;
@@ -1478,7 +1478,7 @@ namespace v2rayN.Handler
                 item.id = Utils.GetGUID(false);
             }
             routingItem.ruleNum = lstRules.Count;
-            routingItem.ruleSet = JsonUtils.ToJson(lstRules, false);
+            routingItem.ruleSet = JsonUtils.Serialize(lstRules, false);
 
             if (Utils.IsNullOrEmpty(routingItem.id))
             {
diff --git a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
index 525f1cf5..8c61f69f 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
@@ -35,11 +35,11 @@ namespace v2rayN.Handler
                     }
                     if (Utils.IsNullOrEmpty(fileName))
                     {
-                        content = JsonUtils.ToJson(singboxConfig);
+                        content = JsonUtils.Serialize(singboxConfig);
                     }
                     else
                     {
-                        JsonUtils.ToJsonFile(singboxConfig, fileName, false);
+                        JsonUtils.ToFile(singboxConfig, fileName, false);
                     }
                 }
                 else
@@ -51,11 +51,11 @@ namespace v2rayN.Handler
                     }
                     if (Utils.IsNullOrEmpty(fileName))
                     {
-                        content = JsonUtils.ToJson(v2rayConfig);
+                        content = JsonUtils.Serialize(v2rayConfig);
                     }
                     else
                     {
-                        JsonUtils.ToJsonFile(v2rayConfig, fileName, false);
+                        JsonUtils.ToFile(v2rayConfig, fileName, false);
                     }
                 }
             }
@@ -158,7 +158,7 @@ namespace v2rayN.Handler
                 {
                     return -1;
                 }
-                JsonUtils.ToJsonFile(singboxConfig, fileName, false);
+                JsonUtils.ToFile(singboxConfig, fileName, false);
             }
             else
             {
@@ -166,7 +166,7 @@ namespace v2rayN.Handler
                 {
                     return -1;
                 }
-                JsonUtils.ToJsonFile(v2rayConfig, fileName, false);
+                JsonUtils.ToFile(v2rayConfig, fileName, false);
             }
             return 0;
         }
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index 629f84bd..7b8c4438 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -35,7 +35,7 @@ namespace v2rayN.Handler
                     return -1;
                 }
 
-                singboxConfig = JsonUtils.FromJson<SingboxConfig>(result);
+                singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
                 if (singboxConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
@@ -177,7 +177,7 @@ namespace v2rayN.Handler
                         _config.tunModeItem.stack = Global.TunStacks[0];
                     }
 
-                    var tunInbound = JsonUtils.FromJson<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
+                    var tunInbound = JsonUtils.Deserialize<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
                     tunInbound.mtu = _config.tunModeItem.mtu;
                     tunInbound.strict_route = _config.tunModeItem.strictRoute;
                     tunInbound.stack = _config.tunModeItem.stack;
@@ -458,7 +458,7 @@ namespace v2rayN.Handler
                 if (prevNode is not null
                     && prevNode.configType != EConfigType.Custom)
                 {
-                    var prevOutbound = JsonUtils.FromJson<Outbound4Sbox>(txtOutbound);
+                    var prevOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
                     GenOutbound(prevNode, prevOutbound);
                     prevOutbound.tag = $"{Global.ProxyTag}2";
                     singboxConfig.outbounds.Add(prevOutbound);
@@ -471,7 +471,7 @@ namespace v2rayN.Handler
                 if (nextNode is not null
                     && nextNode.configType != EConfigType.Custom)
                 {
-                    var nextOutbound = JsonUtils.FromJson<Outbound4Sbox>(txtOutbound);
+                    var nextOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
                     GenOutbound(nextNode, nextOutbound);
                     nextOutbound.tag = Global.ProxyTag;
                     singboxConfig.outbounds.Insert(0, nextOutbound);
@@ -496,7 +496,7 @@ namespace v2rayN.Handler
                 {
                     singboxConfig.route.auto_detect_interface = true;
 
-                    var tunRules = JsonUtils.FromJson<List<Rule4Sbox>>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
+                    var tunRules = JsonUtils.Deserialize<List<Rule4Sbox>>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
                     singboxConfig.route.rules.AddRange(tunRules);
 
                     GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe);
@@ -519,7 +519,7 @@ namespace v2rayN.Handler
                     var routing = ConfigHandler.GetDefaultRouting(_config);
                     if (routing != null)
                     {
-                        var rules = JsonUtils.FromJson<List<RulesItem>>(routing.ruleSet);
+                        var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.ruleSet);
                         foreach (var item in rules!)
                         {
                             if (item.enabled)
@@ -534,7 +534,7 @@ namespace v2rayN.Handler
                     var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
                     if (lockedItem != null)
                     {
-                        var rules = JsonUtils.FromJson<List<RulesItem>>(lockedItem.ruleSet);
+                        var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
                         foreach (var item in rules!)
                         {
                             GenRoutingUserRule(item, singboxConfig.route.rules);
@@ -726,7 +726,7 @@ namespace v2rayN.Handler
                     {
                         tunDNS = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
                     }
-                    dns4Sbox = JsonUtils.FromJson<Dns4Sbox>(tunDNS);
+                    dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(tunDNS);
                 }
                 else
                 {
@@ -737,7 +737,7 @@ namespace v2rayN.Handler
                         normalDNS = "{\"servers\":[{\"address\":\"tcp://8.8.8.8\"}]}";
                     }
 
-                    dns4Sbox = JsonUtils.FromJson<Dns4Sbox>(normalDNS);
+                    dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(normalDNS);
                 }
                 if (dns4Sbox is null)
                 {
@@ -821,7 +821,7 @@ namespace v2rayN.Handler
                     return -1;
                 }
 
-                singboxConfig = JsonUtils.FromJson<SingboxConfig>(result);
+                singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
                 if (singboxConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
@@ -919,7 +919,7 @@ namespace v2rayN.Handler
                         continue;
                     }
 
-                    var outbound = JsonUtils.FromJson<Outbound4Sbox>(txtOutbound);
+                    var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
                     GenOutbound(item, outbound);
                     outbound.tag = Global.ProxyTag + inbound.listen_port.ToString();
                     singboxConfig.outbounds.Add(outbound);
diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
index c2bb713b..a77e94bc 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
@@ -37,7 +37,7 @@ namespace v2rayN.Handler
                     return -1;
                 }
 
-                v2rayConfig = JsonUtils.FromJson<V2rayConfig>(result);
+                v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
                 if (v2rayConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
@@ -153,7 +153,7 @@ namespace v2rayN.Handler
                 return null;
             }
 
-            var inbound = JsonUtils.FromJson<Inbounds4Ray>(result);
+            var inbound = JsonUtils.Deserialize<Inbounds4Ray>(result);
             if (inbound == null)
             {
                 return null;
@@ -186,12 +186,12 @@ namespace v2rayN.Handler
                             {
                                 v2rayConfig.routing.domainStrategy = routing.domainStrategy;
                             }
-                            var rules = JsonUtils.FromJson<List<RulesItem>>(routing.ruleSet);
+                            var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.ruleSet);
                             foreach (var item in rules)
                             {
                                 if (item.enabled)
                                 {
-                                    var item2 = JsonUtils.FromJson<RulesItem4Ray>(JsonUtils.ToJson(item));
+                                    var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
                                     GenRoutingUserRule(item2, v2rayConfig);
                                 }
                             }
@@ -202,10 +202,10 @@ namespace v2rayN.Handler
                         var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
                         if (lockedItem != null)
                         {
-                            var rules = JsonUtils.FromJson<List<RulesItem>>(lockedItem.ruleSet);
+                            var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
                             foreach (var item in rules)
                             {
-                                var item2 = JsonUtils.FromJson<RulesItem4Ray>(JsonUtils.ToJson(item));
+                                var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
                                 GenRoutingUserRule(item2, v2rayConfig);
                             }
                         }
@@ -687,7 +687,7 @@ namespace v2rayN.Handler
                                 pathHttp = string.Join("\",\"", arrPath);
                             }
                             request = request.Replace("$requestPath$", $"\"{pathHttp}\"");
-                            tcpSettings.header.request = JsonUtils.FromJson<object>(request);
+                            tcpSettings.header.request = JsonUtils.Deserialize<object>(request);
 
                             streamSettings.tcpSettings = tcpSettings;
                         }
@@ -848,7 +848,7 @@ namespace v2rayN.Handler
                     && prevNode.configType != EConfigType.Hysteria2
                     && prevNode.configType != EConfigType.Tuic)
                 {
-                    var prevOutbound = JsonUtils.FromJson<Outbounds4Ray>(txtOutbound);
+                    var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                     GenOutbound(prevNode, prevOutbound);
                     prevOutbound.tag = $"{Global.ProxyTag}2";
                     v2rayConfig.outbounds.Add(prevOutbound);
@@ -866,7 +866,7 @@ namespace v2rayN.Handler
                     && nextNode.configType != EConfigType.Hysteria2
                     && nextNode.configType != EConfigType.Tuic)
                 {
-                    var nextOutbound = JsonUtils.FromJson<Outbounds4Ray>(txtOutbound);
+                    var nextOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                     GenOutbound(nextNode, nextOutbound);
                     nextOutbound.tag = Global.ProxyTag;
                     v2rayConfig.outbounds.Insert(0, nextOutbound);
@@ -911,7 +911,7 @@ namespace v2rayN.Handler
                     return -1;
                 }
 
-                v2rayConfig = JsonUtils.FromJson<V2rayConfig>(result);
+                v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
                 if (v2rayConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
@@ -1008,7 +1008,7 @@ namespace v2rayN.Handler
                         continue;
                     }
 
-                    var outbound = JsonUtils.FromJson<Outbounds4Ray>(txtOutbound);
+                    var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                     GenOutbound(item, outbound);
                     outbound.tag = Global.ProxyTag + inbound.port.ToString();
                     v2rayConfig.outbounds.Add(outbound);
diff --git a/v2rayN/v2rayN/Handler/ProxySetting.cs b/v2rayN/v2rayN/Handler/ProxySetting.cs
index e728f3f4..1e7c17c9 100644
--- a/v2rayN/v2rayN/Handler/ProxySetting.cs
+++ b/v2rayN/v2rayN/Handler/ProxySetting.cs
@@ -320,27 +320,5 @@ namespace v2rayN.Handler
                 ref int lpcEntries        // Number of entries written to the buffer
             );
         }
-
-        //判断是否使用代理
-        public static bool UsedProxy()
-        {
-            using RegistryKey? rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
-            if (rk?.GetValue("ProxyEnable")?.ToString() == "1")
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        //获得代理的IP和端口
-        public static string? GetProxyProxyServer()
-        {
-            using RegistryKey? rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
-            string ProxyServer = rk.GetValue("ProxyServer").ToString();
-            return ProxyServer;
-        }
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
index dec56779..6ad7f506 100644
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -65,7 +65,7 @@ namespace v2rayN.Handler
                 fp = item.fingerprint
             };
 
-            url = JsonUtils.ToJson(vmessQRCode);
+            url = JsonUtils.Serialize(vmessQRCode);
             url = Utils.Base64Encode(url);
             url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
 
@@ -450,7 +450,7 @@ namespace v2rayN.Handler
             result = Utils.Base64Decode(result);
 
             //转成Json
-            VmessQRCode? vmessQRCode = JsonUtils.FromJson<VmessQRCode>(result);
+            VmessQRCode? vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
             if (vmessQRCode == null)
             {
                 msg = ResUI.FailedConversionConfiguration;
diff --git a/v2rayN/v2rayN/Handler/StatisticsSingbox.cs b/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
index 60519d1d..7db85996 100644
--- a/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
@@ -113,7 +113,7 @@ namespace v2rayN.Handler
             up = 0; down = 0;
             try
             {
-                var trafficItem = JsonUtils.FromJson<TrafficItem>(source);
+                var trafficItem = JsonUtils.Deserialize<TrafficItem>(source);
                 if (trafficItem != null)
                 {
                     up = trafficItem.up;
diff --git a/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayN/v2rayN/Handler/UpdateHandle.cs
index 365eb039..6236c58f 100644
--- a/v2rayN/v2rayN/Handler/UpdateHandle.cs
+++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs
@@ -407,7 +407,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                var gitHubReleases = JsonUtils.FromJson<List<GitHubRelease>>(gitHubReleaseApi);
+                var gitHubReleases = JsonUtils.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
                 var gitHubRelease = preRelease ? gitHubReleases!.First() : gitHubReleases!.First(r => r.Prerelease == false);
                 var version = new SemanticVersion(gitHubRelease!.TagName);
                 var body = gitHubRelease!.Body;
diff --git a/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
index 0192e8fa..a5cb132e 100644
--- a/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
@@ -78,7 +78,7 @@ namespace v2rayN.ViewModels
             }
             if (!Utils.IsNullOrEmpty(normalDNS2))
             {
-                var obj2 = JsonUtils.FromJson<Dns4Sbox>(normalDNS2);
+                var obj2 = JsonUtils.Deserialize<Dns4Sbox>(normalDNS2);
                 if (obj2 == null)
                 {
                     UI.Show(ResUI.FillCorrectDNSText);
@@ -87,7 +87,7 @@ namespace v2rayN.ViewModels
             }
             if (!Utils.IsNullOrEmpty(tunDNS2))
             {
-                var obj2 = JsonUtils.FromJson<Dns4Sbox>(tunDNS2);
+                var obj2 = JsonUtils.Deserialize<Dns4Sbox>(tunDNS2);
                 if (obj2 == null)
                 {
                     UI.Show(ResUI.FillCorrectDNSText);
@@ -102,8 +102,8 @@ namespace v2rayN.ViewModels
             ConfigHandler.SaveDNSItems(_config, item);
 
             var item2 = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
-            item2.normalDNS = JsonUtils.ToJson(JsonUtils.ParseJson(normalDNS2));
-            item2.tunDNS = JsonUtils.ToJson(JsonUtils.ParseJson(tunDNS2));
+            item2.normalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(normalDNS2));
+            item2.tunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(tunDNS2));
             ConfigHandler.SaveDNSItems(_config, item2);
 
             _noticeHandler?.Enqueue(ResUI.OperationSuccess);
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index 52f581bc..eb622188 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -832,7 +832,7 @@ namespace v2rayN.ViewModels
                             totalDown = t22 == null ? "" : Utils.HumanFy(t22.totalDown),
                             totalUp = t22 == null ? "" : Utils.HumanFy(t22.totalUp)
                         }).OrderBy(t => t.sort).ToList();
-            _lstProfile = JsonUtils.FromJson<List<ProfileItem>>(JsonUtils.ToJson(lstModel));
+            _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel));
 
             Application.Current.Dispatcher.Invoke((Action)(() =>
             {
@@ -938,7 +938,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                lstSelecteds = JsonUtils.FromJson<List<ProfileItem>>(JsonUtils.ToJson(orderProfiles));
+                lstSelecteds = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(orderProfiles));
             }
 
             return 0;
diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
index 52f08ba4..23dcc2e4 100644
--- a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
@@ -58,7 +58,7 @@ namespace v2rayN.ViewModels
             else
             {
                 SelectedRouting = routingItem;
-                _rules = JsonUtils.FromJson<List<RulesItem>>(SelectedRouting.ruleSet);
+                _rules = JsonUtils.Deserialize<List<RulesItem>>(SelectedRouting.ruleSet);
             }
 
             RefreshRulesItems();
@@ -207,7 +207,7 @@ namespace v2rayN.ViewModels
             }
             if (lst.Count > 0)
             {
-                Utils.SetClipboardData(JsonUtils.ToJson(lst));
+                Utils.SetClipboardData(JsonUtils.Serialize(lst));
                 //UI.Show(ResUI.OperationSuccess"));
             }
         }
@@ -246,7 +246,7 @@ namespace v2rayN.ViewModels
                 it.id = Utils.GetGUID(false);
             }
             item.ruleNum = _rules.Count;
-            item.ruleSet = JsonUtils.ToJson(_rules, false);
+            item.ruleSet = JsonUtils.Serialize(_rules, false);
 
             if (ConfigHandler.SaveRoutingItem(_config, item) == 0)
             {
@@ -328,7 +328,7 @@ namespace v2rayN.ViewModels
             {
                 return -1;
             }
-            var lstRules = JsonUtils.FromJson<List<RulesItem>>(clipboardData);
+            var lstRules = JsonUtils.Deserialize<List<RulesItem>>(clipboardData);
             if (lstRules == null)
             {
                 return -1;
diff --git a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs
index 0a19f4c4..dfcfddc4 100644
--- a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs
@@ -136,7 +136,7 @@ namespace v2rayN.ViewModels
             _lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
             if (_lockedItem != null)
             {
-                _lockedRules = JsonUtils.FromJson<List<RulesItem>>(_lockedItem.ruleSet);
+                _lockedRules = JsonUtils.Deserialize<List<RulesItem>>(_lockedItem.ruleSet);
                 ProxyDomain = Utils.List2String(_lockedRules[0].domain, true);
                 ProxyIP = Utils.List2String(_lockedRules[0].ip, true);
 
@@ -161,7 +161,7 @@ namespace v2rayN.ViewModels
                 _lockedRules[2].domain = Utils.String2List(Utils.Convert2Comma(BlockDomain.TrimEx()));
                 _lockedRules[2].ip = Utils.String2List(Utils.Convert2Comma(BlockIP.TrimEx()));
 
-                _lockedItem.ruleSet = JsonUtils.ToJson(_lockedRules, false);
+                _lockedItem.ruleSet = JsonUtils.Serialize(_lockedRules, false);
 
                 ConfigHandler.SaveRoutingItem(_config, _lockedItem);
             }

From 40748d6e42611906c9793086f707eb83064461b5 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 12 Jan 2024 18:06:35 +0800
Subject: [PATCH 23/62] Update ResUI.zh-Hant.resx

---
 v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
index 858e1b71..ae5d167e 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
@@ -929,7 +929,7 @@
     <value>新增規則</value>
   </data>
   <data name="menuRuleExportSelected" xml:space="preserve">
-    <value>到處所選規則至剪貼簿</value>
+    <value>匯出所選規則至剪貼簿</value>
   </data>
   <data name="menuRuleList" xml:space="preserve">
     <value>規則列表</value>

From ee2a61bb6194449fd0b88d67c994395b0ded52db Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 12 Jan 2024 18:22:23 +0800
Subject: [PATCH 24/62] bug fix

---
 v2rayN/v2rayN/Views/MainWindow.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index e4f30d56..f1a51b0c 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -482,7 +482,7 @@ namespace v2rayN.Views
             for (int i = 0; i < lvColumnItem.Count; i++)
             {
                 var item = lvColumnItem[i];
-                for (int k = 1; k < lstProfiles.Columns.Count; k++)
+                for (int k = 0; k < lstProfiles.Columns.Count; k++)
                 {
                     var item2 = (MyDGTextColumn)lstProfiles.Columns[k];
                     if (item2.ExName == item.Name)

From 726d9d410f1e21bb11bd2edf248f9f8722ab3203 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 13 Jan 2024 16:52:42 +0800
Subject: [PATCH 25/62] Refactor

---
 v2rayN/v2rayN/Common/Utils.cs            | 1 -
 v2rayN/v2rayN/Handler/ConfigHandler.cs   | 2 +-
 v2rayN/v2rayN/Handler/CoreConfigV2ray.cs | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/v2rayN/v2rayN/Common/Utils.cs b/v2rayN/v2rayN/Common/Utils.cs
index 4b87d590..c74ade7d 100644
--- a/v2rayN/v2rayN/Common/Utils.cs
+++ b/v2rayN/v2rayN/Common/Utils.cs
@@ -525,7 +525,6 @@ namespace v2rayN
             }
         }
 
-
         /// <summary>
         /// 获取启动了应用程序的可执行文件的路径
         /// </summary>
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 7fa52b9d..50e8c4a3 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -253,7 +253,7 @@ namespace v2rayN.Handler
 
         public static int ImportOldGuiConfig(Config config, string fileName)
         {
-            string result = Utils.LoadResource(fileName);
+            var result = Utils.LoadResource(fileName);
             if (Utils.IsNullOrEmpty(result))
             {
                 return -1;
diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
index a77e94bc..18b8a6f8 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
@@ -721,11 +721,11 @@ namespace v2rayN.Handler
                     outbound.settings.userLevel = 0;
                 }
 
-                var obj = JsonUtils.ParseJson(normalDNS) ?? new JObject();
+                var obj = JsonUtils.ParseJson(normalDNS) ?? [];
 
                 if (!obj.ContainsKey("servers"))
                 {
-                    List<string> servers = new();
+                    List<string> servers = [];
                     string[] arrDNS = normalDNS.Split(',');
                     foreach (string str in arrDNS)
                     {

From 6d7385788e1058280316c47e9ebc2189243eb727 Mon Sep 17 00:00:00 2001
From: John Edwerd <EdwerdJohn@163.com>
Date: Sat, 13 Jan 2024 21:54:03 +0800
Subject: [PATCH 26/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=9D=9E=E7=AE=A1=E7=90=86=E5=91=98=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?tun=E6=A8=A1=E5=BC=8F=E5=90=AF=E5=8A=A8=E9=80=BB=E8=BE=91;?=
 =?UTF-8?q?=E7=BC=A9=E7=9F=AD=E8=87=AA=E5=8A=A8=E9=9A=90=E8=97=8F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 v2rayN/v2rayN/Sample/tun_singbox_rules          | 11 -----------
 v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs | 12 +++++++++---
 v2rayN/v2rayN/Views/MainWindow.xaml.cs          |  2 --
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/v2rayN/v2rayN/Sample/tun_singbox_rules b/v2rayN/v2rayN/Sample/tun_singbox_rules
index 528adb76..df1dc4ec 100644
--- a/v2rayN/v2rayN/Sample/tun_singbox_rules
+++ b/v2rayN/v2rayN/Sample/tun_singbox_rules
@@ -1,8 +1,4 @@
 [
-  {
-    "protocol": [ "dns" ],
-    "outbound": "dns_out"
-  },
   {
     "network": "udp",
     "port": [
@@ -20,12 +16,5 @@
       "ff00::/8"
     ],
     "outbound": "block"
-  },
-  {
-    "source_ip_cidr": [
-      "224.0.0.0/3",
-      "ff00::/8"
-    ],
-    "outbound": "block"
   }
 ]
\ No newline at end of file
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index eb622188..e1052645 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -1390,8 +1390,7 @@ namespace v2rayN.ViewModels
             {
                 Process.Start(startInfo);
                 MyAppExit(false);
-            }
-            catch { }
+            } catch { }
         }
 
         private void ImportOldGuiConfig()
@@ -1621,6 +1620,13 @@ namespace v2rayN.ViewModels
             if (_config.tunModeItem.enableTun != EnableTun)
             {
                 _config.tunModeItem.enableTun = EnableTun;
+                // �ǹ���Ա����ʱtunģʽ�����߼��޸�
+                if (EnableTun && !Utils.IsAdministrator())
+                {
+                    RebootAsAdmin();
+                    _config.tunModeItem.enableTun = EnableTun = false;
+                    return;
+                }
                 Reload();
             }
         }
@@ -1839,7 +1845,7 @@ namespace v2rayN.ViewModels
             if (_config.uiItem.autoHideStartup)
             {
                 Observable.Range(1, 1)
-                 .Delay(TimeSpan.FromSeconds(2))
+                 .Delay(TimeSpan.FromSeconds(0.5))
                  .Subscribe(x =>
                  {
                      Application.Current.Dispatcher.Invoke(() =>
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index e4f30d56..6edd6a18 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -212,8 +212,6 @@ namespace v2rayN.Views
             var IsAdministrator = Utils.IsAdministrator();
             this.Title = $"{Utils.GetVersion()} - {(IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
 
-            spEnableTun.Visibility = IsAdministrator ? Visibility.Visible : Visibility.Collapsed;
-
             //if (_config.uiItem.autoHideStartup)
             //{
             //    WindowState = WindowState.Minimized;

From a1dc0c81048ad0a7bc8a13e2dff49a905768347b Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 14 Jan 2024 10:04:02 +0800
Subject: [PATCH 27/62] Update ResUI.resx

---
 v2rayN/v2rayN/Resx/ResUI.resx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index 3375e635..e33aebf0 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -1139,7 +1139,7 @@
     <value>Domain</value>
   </data>
   <data name="menuAddHysteria2Server" xml:space="preserve">
-    <value>Add [Trojan] server</value>
+    <value>Add [Hysteria2] server</value>
   </data>
   <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
     <value>Hysteria Max bandwidth (Up/Dw)</value>

From 005f26ba7c22b24675cde8b51328c45982b050b0 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 14 Jan 2024 10:23:46 +0800
Subject: [PATCH 28/62] bug fix

---
 v2rayN/v2rayN/Resx/ResUI.Designer.cs            | 2 +-
 v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index c6d92f74..0502e160 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -619,7 +619,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [Trojan] server 的本地化字符串。
+        ///   查找类似 Add [Hysteria2] server 的本地化字符串。
         /// </summary>
         public static string menuAddHysteria2Server {
             get {
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index e1052645..51adc658 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -1620,11 +1620,11 @@ namespace v2rayN.ViewModels
             if (_config.tunModeItem.enableTun != EnableTun)
             {
                 _config.tunModeItem.enableTun = EnableTun;
-                // �ǹ���Ա����ʱtunģʽ�����߼��޸�
+                // When running as a non-administrator, reboot to administrator mode
                 if (EnableTun && !Utils.IsAdministrator())
                 {
+                    _config.tunModeItem.enableTun = false;
                     RebootAsAdmin();
-                    _config.tunModeItem.enableTun = EnableTun = false;
                     return;
                 }
                 Reload();

From 69cbdbd20e3b4f11994166df932d3cba98676909 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 14 Jan 2024 17:33:41 +0800
Subject: [PATCH 29/62] Added Wireguard support (using sing-box)

---
 v2rayN/v2rayN/Global.cs                       |  6 +-
 v2rayN/v2rayN/Handler/ConfigHandler.cs        | 32 ++++++++
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs    | 13 +++
 v2rayN/v2rayN/Handler/CoreConfigV2ray.cs      |  6 +-
 v2rayN/v2rayN/Handler/CoreHandler.cs          |  2 +-
 v2rayN/v2rayN/Handler/ProxySetting.cs         |  3 +-
 v2rayN/v2rayN/Mode/EConfigType.cs             |  3 +-
 v2rayN/v2rayN/Mode/ProfileItem.cs             | 12 +--
 v2rayN/v2rayN/Mode/SingboxConfig.cs           |  7 +-
 v2rayN/v2rayN/Resx/ResUI.Designer.cs          | 36 +++++++++
 v2rayN/v2rayN/Resx/ResUI.resx                 | 12 +++
 v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx         | 12 +++
 .../v2rayN/ViewModels/AddServerViewModel.cs   |  4 +
 .../v2rayN/ViewModels/MainWindowViewModel.cs  |  8 +-
 .../ViewModels/OptionSettingViewModel.cs      |  3 +-
 v2rayN/v2rayN/Views/AddServerWindow.xaml      | 79 ++++++++++++++++++-
 v2rayN/v2rayN/Views/AddServerWindow.xaml.cs   | 17 ++++
 v2rayN/v2rayN/Views/MainWindow.xaml           |  5 ++
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        |  1 +
 .../v2rayN/Views/OptionSettingWindow.xaml.cs  |  1 -
 20 files changed, 239 insertions(+), 23 deletions(-)

diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index ea7fe878..70f6a3af 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -138,7 +138,8 @@ namespace v2rayN
             {EConfigType.VLESS,"vless://"},
             {EConfigType.Trojan,"trojan://"},
             {EConfigType.Hysteria2,"hysteria2://"},
-            {EConfigType.Tuic,"tuic://"}
+            {EConfigType.Tuic,"tuic://"},
+            {EConfigType.Wireguard,"wireguard://"}
         };
 
         public static readonly Dictionary<EConfigType, string> ProtocolTypes = new()
@@ -149,7 +150,8 @@ namespace v2rayN
             {EConfigType.VLESS,"vless"},
             {EConfigType.Trojan,"trojan"},
             {EConfigType.Hysteria2,"hysteria2"},
-            {EConfigType.Tuic,"tuic"}
+            {EConfigType.Tuic,"tuic"},
+            {EConfigType.Wireguard,"wireguard"}
         };
 
         public static readonly List<string> VmessSecuritys = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 50e8c4a3..8185d0e5 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -768,6 +768,34 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        /// <summary>
+        /// Add or edit server
+        /// </summary>
+        /// <param name="config"></param>
+        /// <param name="profileItem"></param>
+        /// <returns></returns>
+        public static int AddWireguardServer(Config config, ProfileItem profileItem, bool toFile = true)
+        {
+            profileItem.configType = EConfigType.Wireguard;
+            profileItem.coreType = ECoreType.sing_box;
+
+            profileItem.address = profileItem.address.TrimEx();
+            profileItem.id = profileItem.id.TrimEx();
+            profileItem.publicKey = profileItem.publicKey.TrimEx();
+            profileItem.path = profileItem.path.TrimEx();
+            profileItem.requestHost = profileItem.requestHost.TrimEx();
+            profileItem.network = string.Empty;
+
+            if (profileItem.id.IsNullOrEmpty())
+            {
+                return -1;
+            }
+
+            AddServerCommon(config, profileItem, toFile);
+
+            return 0;
+        }
+
         public static int SortServers(Config config, string subId, string colName, bool asc)
         {
             var lstModel = LazyConfig.Instance.ProfileItems(subId, "");
@@ -1125,6 +1153,10 @@ namespace v2rayN.Handler
                 {
                     addStatus = AddTuicServer(config, profileItem, false);
                 }
+                else if (profileItem.configType == EConfigType.Wireguard)
+                {
+                    addStatus = AddWireguardServer(config, profileItem, false);
+                }
 
                 if (addStatus == 0)
                 {
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index 7b8c4438..efe86502 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -181,6 +181,8 @@ namespace v2rayN.Handler
                     tunInbound.mtu = _config.tunModeItem.mtu;
                     tunInbound.strict_route = _config.tunModeItem.strictRoute;
                     tunInbound.stack = _config.tunModeItem.stack;
+                    tunInbound.sniff = _config.inbound[0].sniffingEnabled;
+                    tunInbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
                     if (_config.tunModeItem.enableIPv6Address == false)
                     {
                         tunInbound.inet6_address = null;
@@ -296,6 +298,17 @@ namespace v2rayN.Handler
 
                     GenOutboundMux(node, outbound);
                 }
+                else if (node.configType == EConfigType.Wireguard)
+                {
+                    outbound.type = Global.ProtocolTypes[EConfigType.Wireguard];
+
+                    outbound.private_key = node.id;
+                    outbound.peer_public_key = node.publicKey;
+                    outbound.reserved = Utils.String2List(node.path).Select(int.Parse).ToArray();
+                    outbound.local_address = [.. Utils.String2List(node.requestHost)];
+
+                    GenOutboundMux(node, outbound);
+                }
 
                 GenOutboundTls(node, outbound);
 
diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
index 18b8a6f8..d32e3440 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
@@ -846,7 +846,8 @@ namespace v2rayN.Handler
                 if (prevNode is not null
                     && prevNode.configType != EConfigType.Custom
                     && prevNode.configType != EConfigType.Hysteria2
-                    && prevNode.configType != EConfigType.Tuic)
+                    && prevNode.configType != EConfigType.Tuic
+                    && prevNode.configType != EConfigType.Wireguard)
                 {
                     var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                     GenOutbound(prevNode, prevOutbound);
@@ -864,7 +865,8 @@ namespace v2rayN.Handler
                 if (nextNode is not null
                     && nextNode.configType != EConfigType.Custom
                     && nextNode.configType != EConfigType.Hysteria2
-                    && nextNode.configType != EConfigType.Tuic)
+                    && nextNode.configType != EConfigType.Tuic
+                    && nextNode.configType != EConfigType.Wireguard)
                 {
                     var nextOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                     GenOutbound(nextNode, nextOutbound);
diff --git a/v2rayN/v2rayN/Handler/CoreHandler.cs b/v2rayN/v2rayN/Handler/CoreHandler.cs
index f30924e4..ff30ab8b 100644
--- a/v2rayN/v2rayN/Handler/CoreHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreHandler.cs
@@ -70,7 +70,7 @@ namespace v2rayN.Handler
         public int LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
         {
             int pid = -1;
-            var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic) ? ECoreType.sing_box : ECoreType.Xray;
+            var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic || t.configType == EConfigType.Wireguard) ? ECoreType.sing_box : ECoreType.Xray;
             string configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
             if (CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType, out string msg) != 0)
             {
diff --git a/v2rayN/v2rayN/Handler/ProxySetting.cs b/v2rayN/v2rayN/Handler/ProxySetting.cs
index 1e7c17c9..9f01c31f 100644
--- a/v2rayN/v2rayN/Handler/ProxySetting.cs
+++ b/v2rayN/v2rayN/Handler/ProxySetting.cs
@@ -1,5 +1,4 @@
-using Microsoft.Win32;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using static v2rayN.Handler.ProxySetting.InternetConnectionOption;
 
 namespace v2rayN.Handler
diff --git a/v2rayN/v2rayN/Mode/EConfigType.cs b/v2rayN/v2rayN/Mode/EConfigType.cs
index 090250ab..aff401aa 100644
--- a/v2rayN/v2rayN/Mode/EConfigType.cs
+++ b/v2rayN/v2rayN/Mode/EConfigType.cs
@@ -9,6 +9,7 @@
         VLESS = 5,
         Trojan = 6,
         Hysteria2 = 7,
-        Tuic = 8
+        Tuic = 8,
+        Wireguard = 9
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Mode/ProfileItem.cs b/v2rayN/v2rayN/Mode/ProfileItem.cs
index 999901db..797587e5 100644
--- a/v2rayN/v2rayN/Mode/ProfileItem.cs
+++ b/v2rayN/v2rayN/Mode/ProfileItem.cs
@@ -47,18 +47,12 @@ namespace v2rayN.Mode
             }
             switch (configType)
             {
-                case EConfigType.VMess:
-                case EConfigType.Shadowsocks:
-                case EConfigType.Socks:
-                case EConfigType.VLESS:
-                case EConfigType.Trojan:
-                case EConfigType.Hysteria2:
-                case EConfigType.Tuic:
-                    summary += string.Format("{0}({1}:{2})", remarks, addr, port);
+                case EConfigType.Custom:
+                    summary += string.Format("{0}", remarks);
                     break;
 
                 default:
-                    summary += string.Format("{0}", remarks);
+                    summary += string.Format("{0}({1}:{2})", remarks, addr, port);
                     break;
             }
             return summary;
diff --git a/v2rayN/v2rayN/Mode/SingboxConfig.cs b/v2rayN/v2rayN/Mode/SingboxConfig.cs
index 07832fb1..8253f4ed 100644
--- a/v2rayN/v2rayN/Mode/SingboxConfig.cs
+++ b/v2rayN/v2rayN/Mode/SingboxConfig.cs
@@ -112,7 +112,12 @@
         public string congestion_control { get; set; }
         public string? version { get; set; }
         public string? network { get; set; }
-        public string packet_encoding { get; set; }
+        public string? packet_encoding { get; set; }
+        public string[]? local_address { get; set; }
+        public string? private_key { get; set; }
+        public string? peer_public_key { get; set; }
+        public int[]? reserved { get; set; }
+        public int? mtu { get; set; }
         public Tls4Sbox tls { get; set; }
         public Multiplex4Sbox multiplex { get; set; }
         public Transport4Sbox transport { get; set; }
diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index 0502e160..35d926d5 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -699,6 +699,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Add [Wireguard] server 的本地化字符串。
+        /// </summary>
+        public static string menuAddWireguardServer {
+            get {
+                return ResourceManager.GetString("menuAddWireguardServer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Check Update 的本地化字符串。
         /// </summary>
@@ -2140,6 +2149,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Address(Ip,Ipv6) 的本地化字符串。
+        /// </summary>
+        public static string TbLocalAddress {
+            get {
+                return ResourceManager.GetString("TbLocalAddress", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Transport protocol(network) 的本地化字符串。
         /// </summary>
@@ -2185,6 +2203,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 PrivateKey 的本地化字符串。
+        /// </summary>
+        public static string TbPrivateKey {
+            get {
+                return ResourceManager.GetString("TbPrivateKey", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 PublicKey 的本地化字符串。
         /// </summary>
@@ -2212,6 +2239,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Reserved(2,3,4) 的本地化字符串。
+        /// </summary>
+        public static string TbReserved {
+            get {
+                return ResourceManager.GetString("TbReserved", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Reset 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index e33aebf0..962c9de4 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -1168,4 +1168,16 @@
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>Enable IPv6 Address</value>
   </data>
+  <data name="menuAddWireguardServer" xml:space="preserve">
+    <value>Add [Wireguard] server</value>
+  </data>
+  <data name="TbPrivateKey" xml:space="preserve">
+    <value>PrivateKey</value>
+  </data>
+  <data name="TbReserved" xml:space="preserve">
+    <value>Reserved(2,3,4)</value>
+  </data>
+  <data name="TbLocalAddress" xml:space="preserve">
+    <value>Address(Ip,Ipv6)</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index 5fbeefcc..e9fd31bf 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -1165,4 +1165,16 @@
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>启用IPv6</value>
   </data>
+  <data name="menuAddWireguardServer" xml:space="preserve">
+    <value>添加[Wireguard]服务器</value>
+  </data>
+  <data name="TbPrivateKey" xml:space="preserve">
+    <value>PrivateKey</value>
+  </data>
+  <data name="TbReserved" xml:space="preserve">
+    <value>Reserved(2,3,4)</value>
+  </data>
+  <data name="TbLocalAddress" xml:space="preserve">
+    <value>Address(Ip,Ipv6)</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
index 19b7cd2d..6660bc2e 100644
--- a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
@@ -152,6 +152,10 @@ namespace v2rayN.ViewModels
                 case EConfigType.Tuic:
                     ret = ConfigHandler.AddTuicServer(_config, item);
                     break;
+
+                case EConfigType.Wireguard:
+                    ret = ConfigHandler.AddWireguardServer(_config, item);
+                    break;
             }
 
             if (ret == 0)
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index 51adc658..c0122284 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -88,6 +88,7 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> AddTrojanServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddHysteria2ServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddTuicServerCmd { get; }
+        public ReactiveCommand<Unit, Unit> AddWireguardServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddCustomServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddServerViaClipboardCmd { get; }
         public ReactiveCommand<Unit, Unit> AddServerViaScanCmd { get; }
@@ -347,6 +348,10 @@ namespace v2rayN.ViewModels
             {
                 EditServer(true, EConfigType.Tuic);
             });
+            AddWireguardServerCmd = ReactiveCommand.Create(() =>
+            {
+                EditServer(true, EConfigType.Wireguard);
+            });
             AddCustomServerCmd = ReactiveCommand.Create(() =>
             {
                 EditServer(true, EConfigType.Custom);
@@ -1390,7 +1395,8 @@ namespace v2rayN.ViewModels
             {
                 Process.Start(startInfo);
                 MyAppExit(false);
-            } catch { }
+            }
+            catch { }
         }
 
         private void ImportOldGuiConfig()
diff --git a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
index 1c1a2423..da871a2f 100644
--- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
@@ -372,8 +372,7 @@ namespace v2rayN.ViewModels
                         type = CoreType6;
                         break;
 
-                    case 7:
-                    case 8:
+                    default:
                         continue;
                 }
                 item.coreType = (ECoreType)Enum.Parse(typeof(ECoreType), type);
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index 86bbe10e..c6be3abc 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -510,6 +510,83 @@
                         Margin="{StaticResource ServerItemMargin}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
+                <Grid
+                    x:Name="gridWireguard"
+                    Grid.Row="2"
+                    Visibility="Hidden">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="{StaticResource ServerItemMargin}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbPrivateKey}" />
+                    <TextBox
+                        x:Name="txtId9"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource ServerItemMargin}"
+                        Style="{StaticResource DefTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="{StaticResource ServerItemMargin}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbPublicKey}" />
+                    <TextBox
+                        x:Name="txtPublicKey9"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource ServerItemMargin}"
+                        HorizontalAlignment="Left"
+                        Style="{StaticResource DefTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="{StaticResource ServerItemMargin}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbReserved}" />
+                    <TextBox
+                        x:Name="txtPath9"
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource ServerItemMargin}"
+                        Style="{StaticResource DefTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Margin="{StaticResource ServerItemMargin}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbLocalAddress}" />
+                    <TextBox
+                        x:Name="txtRequestHost9"
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource ServerItemMargin}"
+                        Style="{StaticResource DefTextBox}" />
+                </Grid>
 
                 <Separator
                     x:Name="sepa2"
@@ -639,7 +716,7 @@
                     Margin="0,2"
                     Style="{DynamicResource MaterialDesignSeparator}" />
 
-                <Grid Grid.Row="6">
+                <Grid x:Name="gridTls" Grid.Row="6">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
index 8ad2605f..efc0a2e1 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
@@ -139,6 +139,16 @@ namespace v2rayN.Views
                         cmbHeaderType8.Items.Add(it);
                     });
                     break;
+
+                case EConfigType.Wireguard:
+                    gridWireguard.Visibility = Visibility.Visible;
+
+                    sepa2.Visibility = Visibility.Collapsed;
+                    gridTransport.Visibility = Visibility.Collapsed;
+                    gridTls.Visibility = Visibility.Collapsed;
+                    cmbCoreType.IsEnabled = false;
+
+                    break;
             }
 
             gridTlsMore.Visibility = Visibility.Hidden;
@@ -188,6 +198,13 @@ namespace v2rayN.Views
                         this.Bind(ViewModel, vm => vm.SelectedSource.security, v => v.txtSecurity8.Text).DisposeWith(disposables);
                         this.Bind(ViewModel, vm => vm.SelectedSource.headerType, v => v.cmbHeaderType8.Text).DisposeWith(disposables);
                         break;
+
+                    case EConfigType.Wireguard:
+                        this.Bind(ViewModel, vm => vm.SelectedSource.id, v => v.txtId9.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.publicKey, v => v.txtPublicKey9.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.path, v => v.txtPath9.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.requestHost, v => v.txtRequestHost9.Text).DisposeWith(disposables);
+                        break;
                 }
                 this.Bind(ViewModel, vm => vm.SelectedSource.network, v => v.cmbNetwork.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.headerType, v => v.cmbHeaderType.Text).DisposeWith(disposables);
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index e22a9c3b..1644b640 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -83,6 +83,7 @@
                                     x:Name="menuAddTrojanServer"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuAddTrojanServer}" />
+                                <Separator Margin="-40,5" />
                                 <MenuItem
                                     x:Name="menuAddHysteria2Server"
                                     Height="{StaticResource MenuItemHeight}"
@@ -91,6 +92,10 @@
                                     x:Name="menuAddTuicServer"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuAddTuicServer}" />
+                                <MenuItem
+                                    x:Name="menuAddWireguardServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuAddWireguardServer}" />
                                 <Separator Margin="-40,5" />
                                 <MenuItem
                                     x:Name="menuAddServerViaClipboard"
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index a363d8e6..3ba6feb1 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -88,6 +88,7 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.AddTrojanServerCmd, v => v.menuAddTrojanServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddHysteria2ServerCmd, v => v.menuAddHysteria2Server).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddTuicServerCmd, v => v.menuAddTuicServer).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.AddWireguardServerCmd, v => v.menuAddWireguardServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddCustomServerCmd, v => v.menuAddCustomServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddServerViaClipboardCmd, v => v.menuAddServerViaClipboard).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddServerViaScanCmd, v => v.menuAddServerViaScan).DisposeWith(disposables);
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
index c7f13a8c..f4822b42 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -203,6 +203,5 @@ namespace v2rayN.Views
         {
             this.Close();
         }
-
     }
 }
\ No newline at end of file

From 08c73964044f239e24bd06a432fc71fdab65b78e Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 15 Jan 2024 17:11:00 +0800
Subject: [PATCH 30/62] Add mtu setting 4 Wireguard

---
 v2rayN/v2rayN/Common/Utils.cs               |  4 ++--
 v2rayN/v2rayN/Global.cs                     |  2 +-
 v2rayN/v2rayN/Handler/ConfigHandler.cs      |  4 ++++
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs  |  2 +-
 v2rayN/v2rayN/Views/AddServerWindow.xaml    | 25 +++++++++++++++++----
 v2rayN/v2rayN/Views/AddServerWindow.xaml.cs |  1 +
 6 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/v2rayN/v2rayN/Common/Utils.cs b/v2rayN/v2rayN/Common/Utils.cs
index c74ade7d..daa66c8b 100644
--- a/v2rayN/v2rayN/Common/Utils.cs
+++ b/v2rayN/v2rayN/Common/Utils.cs
@@ -200,11 +200,11 @@ namespace v2rayN
         /// </summary>
         /// <param name="obj"></param>
         /// <returns></returns>
-        public static int ToInt(object obj)
+        public static int ToInt(object? obj)
         {
             try
             {
-                return Convert.ToInt32(obj);
+                return Convert.ToInt32(obj ?? string.Empty);
             }
             catch //(Exception ex)
             {
diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index 70f6a3af..7328cf50 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -176,7 +176,7 @@ namespace v2rayN
         public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
         public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
         public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };
-        public static readonly List<string> TunMtus = new() { "9000", "1500" };
+        public static readonly List<string> TunMtus = new() { "1280", "1408", "1500", "9000" };
         public static readonly List<string> TunStacks = new() { "gvisor", "system" };
         public static readonly List<string> PresetMsgFilters = new() { "proxy", "direct", "block", "" };
         public static readonly List<string> SingboxMuxs = new() { "h2mux", "smux", "yamux", "" };
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 8185d0e5..d0177f28 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -785,6 +785,10 @@ namespace v2rayN.Handler
             profileItem.path = profileItem.path.TrimEx();
             profileItem.requestHost = profileItem.requestHost.TrimEx();
             profileItem.network = string.Empty;
+            if (profileItem.shortId.IsNullOrEmpty())
+            {
+                profileItem.shortId = Global.TunMtus.FirstOrDefault();
+            }
 
             if (profileItem.id.IsNullOrEmpty())
             {
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index efe86502..4e05a140 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -306,7 +306,7 @@ namespace v2rayN.Handler
                     outbound.peer_public_key = node.publicKey;
                     outbound.reserved = Utils.String2List(node.path).Select(int.Parse).ToArray();
                     outbound.local_address = [.. Utils.String2List(node.requestHost)];
-
+                    outbound.mtu = Utils.ToInt(node.shortId.IsNullOrEmpty() ? Global.TunMtus.FirstOrDefault() : node.shortId);
                     GenOutboundMux(node, outbound);
                 }
 
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index c6be3abc..be1d03cf 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -1,12 +1,12 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.AddServerWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuServers}"
@@ -520,6 +520,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="180" />
@@ -586,6 +587,22 @@
                         Width="400"
                         Margin="{StaticResource ServerItemMargin}"
                         Style="{StaticResource DefTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="{StaticResource ServerItemMargin}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="Mtu" />
+                    <TextBox
+                        x:Name="txtShortId9"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Width="100"
+                        Margin="{StaticResource ServerItemMargin}"
+                        HorizontalAlignment="Left"
+                        Style="{StaticResource DefTextBox}" />
                 </Grid>
 
                 <Separator
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
index efc0a2e1..e9aa78c8 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
@@ -204,6 +204,7 @@ namespace v2rayN.Views
                         this.Bind(ViewModel, vm => vm.SelectedSource.publicKey, v => v.txtPublicKey9.Text).DisposeWith(disposables);
                         this.Bind(ViewModel, vm => vm.SelectedSource.path, v => v.txtPath9.Text).DisposeWith(disposables);
                         this.Bind(ViewModel, vm => vm.SelectedSource.requestHost, v => v.txtRequestHost9.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.shortId, v => v.txtShortId9.Text).DisposeWith(disposables);
                         break;
                 }
                 this.Bind(ViewModel, vm => vm.SelectedSource.network, v => v.cmbNetwork.Text).DisposeWith(disposables);

From e2f9aac1c967f7db661c130a8f1b5c9a1bfc9ebd Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 16 Jan 2024 11:05:02 +0800
Subject: [PATCH 31/62] remove System.Web

---
 v2rayN/v2rayN/Common/Utils.cs   | 30 ++++++++++++++++++++++++++++--
 v2rayN/v2rayUpgrade/MainForm.cs |  3 +--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/v2rayN/v2rayN/Common/Utils.cs b/v2rayN/v2rayN/Common/Utils.cs
index daa66c8b..4b4e5b46 100644
--- a/v2rayN/v2rayN/Common/Utils.cs
+++ b/v2rayN/v2rayN/Common/Utils.cs
@@ -1,5 +1,6 @@
 using Microsoft.Win32;
 using Microsoft.Win32.TaskScheduler;
+using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
@@ -13,7 +14,6 @@ using System.Security.Cryptography;
 using System.Security.Principal;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Web;
 using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media;
@@ -302,7 +302,33 @@ namespace v2rayN
 
         public static string UrlDecode(string url)
         {
-            return HttpUtility.UrlDecode(url);
+            return Uri.UnescapeDataString(url);
+            //return HttpUtility.UrlDecode(url);
+        }
+
+        public static NameValueCollection ParseQueryString(string query)
+        {
+            var result = new NameValueCollection(StringComparer.OrdinalIgnoreCase);
+            if (IsNullOrEmpty(query))
+            {
+                return result;
+            }
+
+            var parts = query[1..].Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries);
+            foreach (var part in parts)
+            {
+                var keyValue = part.Split(['=']);
+                if (keyValue.Length != 2)
+                {
+                    continue;
+                }
+                var key = Uri.UnescapeDataString(keyValue[0]);
+                var val = Uri.UnescapeDataString(keyValue[1]);
+
+                result.Add(key, val);
+            }
+
+            return result;
         }
 
         public static string GetMD5(string str)
diff --git a/v2rayN/v2rayUpgrade/MainForm.cs b/v2rayN/v2rayUpgrade/MainForm.cs
index 02f0e933..39f8196c 100644
--- a/v2rayN/v2rayUpgrade/MainForm.cs
+++ b/v2rayN/v2rayUpgrade/MainForm.cs
@@ -3,7 +3,6 @@ using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
 using System.Text;
-using System.Web;
 using System.Windows.Forms;
 
 namespace v2rayUpgrade
@@ -18,7 +17,7 @@ namespace v2rayUpgrade
             InitializeComponent();
             if (args.Length > 0)
             {
-                fileName = HttpUtility.UrlDecode(string.Join(" ", args));
+                fileName = Uri.UnescapeDataString(string.Join(" ", args));
             }
             else
             {

From 8a3eb41314fb8a040de8c55eb1e7b7e0463772e3 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 16 Jan 2024 11:05:51 +0800
Subject: [PATCH 32/62] Add Wireguard uri

---
 v2rayN/v2rayN/Handler/ShareHandler.cs | 98 ++++++++++++++++++++++-----
 1 file changed, 81 insertions(+), 17 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
index 6ad7f506..e4481457 100644
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -1,6 +1,5 @@
 using System.Collections.Specialized;
 using System.Text.RegularExpressions;
-using System.Web;
 using v2rayN.Mode;
 using v2rayN.Resx;
 
@@ -30,6 +29,7 @@ namespace v2rayN.Handler
                     EConfigType.VLESS => ShareVLESS(item),
                     EConfigType.Hysteria2 => ShareHysteria2(item),
                     EConfigType.Tuic => ShareTuic(item),
+                    EConfigType.Wireguard => ShareWireguard(item),
                     _ => null,
                 };
 
@@ -221,6 +221,42 @@ namespace v2rayN.Handler
             return url;
         }
 
+        private static string ShareWireguard(ProfileItem item)
+        {
+            string url = string.Empty;
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.publicKey))
+            {
+                dicQuery.Add("publickey", Utils.UrlEncode(item.publicKey));
+            }
+            if (!Utils.IsNullOrEmpty(item.path))
+            {
+                dicQuery.Add("reserved", Utils.UrlEncode(item.path));
+            }
+            if (!Utils.IsNullOrEmpty(item.requestHost))
+            {
+                dicQuery.Add("address", Utils.UrlEncode(item.requestHost));
+            }
+            if (!Utils.IsNullOrEmpty(item.shortId))
+            {
+                dicQuery.Add("mtu", Utils.UrlEncode(item.shortId));
+            }
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            Utils.UrlEncode(item.id),
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
+            return url;
+        }
+
         private static string GetIpv6(string address)
         {
             return Utils.IsIpv6(address) ? $"[{address}]" : address;
@@ -346,7 +382,7 @@ namespace v2rayN.Handler
         {
             msg = string.Empty;
 
-            ProfileItem profileItem = new();
+            ProfileItem? profileItem;
 
             try
             {
@@ -422,6 +458,10 @@ namespace v2rayN.Handler
                 {
                     profileItem = ResolveTuic(result);
                 }
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Wireguard]))
+                {
+                    profileItem = ResolveWireguard(result);
+                }
                 else
                 {
                     msg = ResUI.NonvmessOrssProtocol;
@@ -539,7 +579,7 @@ namespace v2rayN.Handler
             i.address = u.IdnHost;
             i.port = u.Port;
             i.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            var q = HttpUtility.ParseQueryString(u.Query);
+            var query = Utils.ParseQueryString(u.Query);
 
             var m = StdVmessUserInfo.Match(u.UserInfo);
             if (!m.Success) return null;
@@ -565,17 +605,17 @@ namespace v2rayN.Handler
             switch (i.network)
             {
                 case "tcp":
-                    string t1 = q["type"] ?? "none";
+                    string t1 = query["type"] ?? "none";
                     i.headerType = t1;
                     break;
 
                 case "kcp":
-                    i.headerType = q["type"] ?? "none";
+                    i.headerType = query["type"] ?? "none";
                     break;
 
                 case "ws":
-                    string p1 = q["path"] ?? "/";
-                    string h1 = q["host"] ?? "";
+                    string p1 = query["path"] ?? "/";
+                    string h1 = query["host"] ?? "";
                     i.requestHost = Utils.UrlDecode(h1);
                     i.path = p1;
                     break;
@@ -583,16 +623,16 @@ namespace v2rayN.Handler
                 case "http":
                 case "h2":
                     i.network = "h2";
-                    string p2 = q["path"] ?? "/";
-                    string h2 = q["host"] ?? "";
+                    string p2 = query["path"] ?? "/";
+                    string h2 = query["host"] ?? "";
                     i.requestHost = Utils.UrlDecode(h2);
                     i.path = p2;
                     break;
 
                 case "quic":
-                    string s = q["security"] ?? "none";
-                    string k = q["key"] ?? "";
-                    string t3 = q["type"] ?? "none";
+                    string s = query["security"] ?? "none";
+                    string k = query["key"] ?? "";
+                    string t3 = query["type"] ?? "none";
                     i.headerType = t3;
                     i.requestHost = Utils.UrlDecode(s);
                     i.path = k;
@@ -647,7 +687,7 @@ namespace v2rayN.Handler
                 server.id = userInfoParts[1];
             }
 
-            NameValueCollection queryParameters = HttpUtility.ParseQueryString(parsedUrl.Query);
+            var queryParameters = Utils.ParseQueryString(parsedUrl.Query);
             if (queryParameters["plugin"] != null)
             {
                 //obfs-host exists
@@ -798,7 +838,7 @@ namespace v2rayN.Handler
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
             item.id = url.UserInfo;
 
-            var query = HttpUtility.ParseQueryString(url.Query);
+            var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);
 
             return item;
@@ -819,7 +859,7 @@ namespace v2rayN.Handler
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
             item.id = url.UserInfo;
 
-            var query = HttpUtility.ParseQueryString(url.Query);
+            var query = Utils.ParseQueryString(url.Query);
             item.security = query["encryption"] ?? "none";
             item.streamSecurity = query["security"] ?? "";
             ResolveStdTransport(query, ref item);
@@ -841,7 +881,7 @@ namespace v2rayN.Handler
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
             item.id = url.UserInfo;
 
-            var query = HttpUtility.ParseQueryString(url.Query);
+            var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);
             item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
 
@@ -867,13 +907,37 @@ namespace v2rayN.Handler
                 item.security = userInfoParts[1];
             }
 
-            var query = HttpUtility.ParseQueryString(url.Query);
+            var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);
             item.headerType = query["congestion_control"] ?? "";
 
             return item;
         }
 
+        private static ProfileItem ResolveWireguard(string result)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Wireguard
+            };
+
+            Uri url = new(result);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+
+            item.publicKey = Utils.UrlDecode(query["publickey"] ?? "");
+            item.path = Utils.UrlDecode(query["reserved"] ?? "");
+            item.requestHost = Utils.UrlDecode(query["address"] ?? "");
+            item.shortId = Utils.UrlDecode(query["mtu"] ?? "");
+
+            return item;
+        }
+
         private static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
         {
             item.flow = query["flow"] ?? "";

From d7cb88f0a49ee5d12bc4933a37387eb466898c83 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 20 Jan 2024 09:45:00 +0800
Subject: [PATCH 33/62] Bug fix

---
 v2rayN/v2rayN/Handler/ShareHandler.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
index e4481457..0a42ee7c 100644
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -836,7 +836,7 @@ namespace v2rayN.Handler
             item.address = url.IdnHost;
             item.port = url.Port;
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = url.UserInfo;
+            item.id = Utils.UrlDecode(url.UserInfo);
 
             var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);
@@ -857,7 +857,7 @@ namespace v2rayN.Handler
             item.address = url.IdnHost;
             item.port = url.Port;
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = url.UserInfo;
+            item.id = Utils.UrlDecode(url.UserInfo);
 
             var query = Utils.ParseQueryString(url.Query);
             item.security = query["encryption"] ?? "none";
@@ -879,7 +879,7 @@ namespace v2rayN.Handler
             item.address = url.IdnHost;
             item.port = url.Port;
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = url.UserInfo;
+            item.id = Utils.UrlDecode(url.UserInfo); 
 
             var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);

From d76679c2b6636a57abd8dd76d4a2ccf58b5fad39 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 20 Jan 2024 17:43:42 +0800
Subject: [PATCH 34/62] Fill alpns & bug fix

---
 v2rayN/v2rayN/Global.cs                    |  2 +-
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs | 14 +++++++-------
 v2rayN/v2rayN/Handler/CoreConfigV2ray.cs   |  2 +-
 v2rayN/v2rayN/Handler/ShareHandler.cs      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index 7328cf50..bfd07739 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -172,7 +172,7 @@ namespace v2rayN
         public static readonly List<string> AllowInsecures = new() { "true", "false", "" };
         public static readonly List<string> DomainStrategy4Freedoms = new() { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
         public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru" };
-        public static readonly List<string> Alpns = new() { "h2", "http/1.1", "h2,http/1.1", "h3", "" };
+        public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2,http/1.1", "h3,h2", "h2,http/1.1",  "" };
         public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
         public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
         public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index 4e05a140..c51fc8e8 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -672,34 +672,34 @@ namespace v2rayN.Handler
             }
             else if (domain.StartsWith("geosite:"))
             {
-                if (rule.geosite is null) { rule.geosite = new(); }
+                rule.geosite ??= [];
                 rule.geosite?.Add(domain.Substring(8));
             }
             else if (domain.StartsWith("regexp:"))
             {
-                if (rule.domain_regex is null) { rule.domain_regex = new(); }
+                rule.domain_regex ??= [];
                 rule.domain_regex?.Add(domain.Replace(Global.RoutingRuleComma, ",").Substring(7));
             }
             else if (domain.StartsWith("domain:"))
             {
-                if (rule.domain is null) { rule.domain = new(); }
-                if (rule.domain_suffix is null) { rule.domain_suffix = new(); }
+                rule.domain ??= [];
+                rule.domain_suffix ??= [];
                 rule.domain?.Add(domain.Substring(7));
                 rule.domain_suffix?.Add("." + domain.Substring(7));
             }
             else if (domain.StartsWith("full:"))
             {
-                if (rule.domain is null) { rule.domain = new(); }
+                rule.domain ??= [];
                 rule.domain?.Add(domain.Substring(5));
             }
             else if (domain.StartsWith("keyword:"))
             {
-                if (rule.domain_keyword is null) { rule.domain_keyword = new(); }
+                rule.domain_keyword ??= [];
                 rule.domain_keyword?.Add(domain.Substring(8));
             }
             else
             {
-                if (rule.domain_keyword is null) { rule.domain_keyword = new(); }
+                rule.domain_keyword ??= [];
                 rule.domain_keyword?.Add(domain);
             }
         }
diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
index d32e3440..440932de 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
@@ -219,7 +219,7 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        private int GenRoutingUserRule(RulesItem4Ray rules, V2rayConfig v2rayConfig)
+        private int GenRoutingUserRule(RulesItem4Ray? rules, V2rayConfig v2rayConfig)
         {
             try
             {
diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
index 0a42ee7c..ce965154 100644
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -879,7 +879,7 @@ namespace v2rayN.Handler
             item.address = url.IdnHost;
             item.port = url.Port;
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utils.UrlDecode(url.UserInfo); 
+            item.id = Utils.UrlDecode(url.UserInfo);
 
             var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);

From ff91a5dad9165539d962f46e3de56e8c8e76a8c4 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 22 Jan 2024 18:45:22 +0800
Subject: [PATCH 35/62] Add obfs  4 hysteria2

---
 v2rayN/v2rayN/Handler/ConfigHandler.cs      |  1 +
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs  |  9 +++++++++
 v2rayN/v2rayN/Handler/ShareHandler.cs       |  6 ++++++
 v2rayN/v2rayN/Mode/SingboxConfig.cs         |  7 +++++++
 v2rayN/v2rayN/Resx/ResUI.Designer.cs        |  9 +++++++++
 v2rayN/v2rayN/Resx/ResUI.resx               |  3 +++
 v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx       |  3 +++
 v2rayN/v2rayN/Views/AddServerWindow.xaml    | 16 ++++++++++++++++
 v2rayN/v2rayN/Views/AddServerWindow.xaml.cs |  1 +
 9 files changed, 55 insertions(+)

diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index d0177f28..4844c1f3 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -713,6 +713,7 @@ namespace v2rayN.Handler
 
             profileItem.address = profileItem.address.TrimEx();
             profileItem.id = profileItem.id.TrimEx();
+            profileItem.path = profileItem.path.TrimEx();
             profileItem.network = string.Empty;
 
             if (Utils.IsNullOrEmpty(profileItem.streamSecurity))
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index c51fc8e8..e44ffe7e 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -283,6 +283,15 @@ namespace v2rayN.Handler
 
                     outbound.password = node.id;
 
+                    if (!Utils.IsNullOrEmpty(node.path))
+                    {
+                        outbound.obfs = new()
+                        {
+                            type = "salamander",
+                            password = node.path.TrimEx(),
+                        };
+                    }
+
                     outbound.up_mbps = _config.hysteriaItem.up_mbps > 0 ? _config.hysteriaItem.up_mbps : null;
                     outbound.down_mbps = _config.hysteriaItem.down_mbps > 0 ? _config.hysteriaItem.down_mbps : null;
 
diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
index ce965154..16508c93 100644
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -180,6 +180,11 @@ namespace v2rayN.Handler
             {
                 dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
             }
+            if (!Utils.IsNullOrEmpty(item.path))
+            {
+                dicQuery.Add("obfs", "salamander");
+                dicQuery.Add("obfs-password", Utils.UrlEncode(item.path));
+            }
             dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
 
             string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
@@ -883,6 +888,7 @@ namespace v2rayN.Handler
 
             var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);
+            item.path = Utils.UrlDecode(query["obfs-password"] ?? "");
             item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
 
             return item;
diff --git a/v2rayN/v2rayN/Mode/SingboxConfig.cs b/v2rayN/v2rayN/Mode/SingboxConfig.cs
index 8253f4ed..ecde1b68 100644
--- a/v2rayN/v2rayN/Mode/SingboxConfig.cs
+++ b/v2rayN/v2rayN/Mode/SingboxConfig.cs
@@ -121,6 +121,7 @@
         public Tls4Sbox tls { get; set; }
         public Multiplex4Sbox multiplex { get; set; }
         public Transport4Sbox transport { get; set; }
+        public HyObfs4Sbox obfs { get; set; }
     }
 
     public class Tls4Sbox
@@ -174,6 +175,12 @@
         public string? Host { get; set; }
     }
 
+    public class HyObfs4Sbox
+    {
+        public string? type { get; set; }
+        public string? password { get; set; }
+    }
+
     public class Server4Sbox
     {
         public string tag { get; set; }
diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index 35d926d5..256c941b 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -2185,6 +2185,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 obfs password 的本地化字符串。
+        /// </summary>
+        public static string TbPath7 {
+            get {
+                return ResourceManager.GetString("TbPath7", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Port 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index 962c9de4..c8045e40 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -1180,4 +1180,7 @@
   <data name="TbLocalAddress" xml:space="preserve">
     <value>Address(Ip,Ipv6)</value>
   </data>
+  <data name="TbPath7" xml:space="preserve">
+    <value>obfs password</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index e9fd31bf..0eb0bc73 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -1177,4 +1177,7 @@
   <data name="TbLocalAddress" xml:space="preserve">
     <value>Address(Ip,Ipv6)</value>
   </data>
+  <data name="TbPath7" xml:space="preserve">
+    <value>混淆密码(obfs password)</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index be1d03cf..8da7df19 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -429,6 +429,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="180" />
@@ -449,6 +450,21 @@
                         Width="400"
                         Margin="{StaticResource ServerItemMargin}"
                         Style="{StaticResource DefTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="{StaticResource ServerItemMargin}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbPath7}" />
+                    <TextBox
+                        x:Name="txtPath7"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource ServerItemMargin}"
+                        Style="{StaticResource DefTextBox}" />
                 </Grid>
                 <Grid
                     x:Name="gridTuic"
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
index e9aa78c8..56f0d89d 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
@@ -191,6 +191,7 @@ namespace v2rayN.Views
 
                     case EConfigType.Hysteria2:
                         this.Bind(ViewModel, vm => vm.SelectedSource.id, v => v.txtId7.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.path, v => v.txtPath7.Text).DisposeWith(disposables);
                         break;
 
                     case EConfigType.Tuic:

From d7c1516ec29c1734042102f7d677ae0ce06cd39d Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 23 Jan 2024 12:30:11 +0800
Subject: [PATCH 36/62] bug fix for test shadowsocks

---
 v2rayN/v2rayN/Global.cs                    |  3 ++-
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs |  2 +-
 v2rayN/v2rayN/Handler/LazyConfig.cs        | 17 ++++++++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index bfd07739..52e090e4 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -158,6 +158,7 @@ namespace v2rayN
         public static readonly List<string> SsSecuritys = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
         public static readonly List<string> SsSecuritysInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
         public static readonly List<string> SsSecuritysInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
+        public static readonly List<string> SsSecuritysInSingbox = new() { "aes-256-gcm", "aes-192-gcm", "aes-128-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "rc4-md5", "chacha20-ietf", "xchacha20" };
         public static readonly List<string> Flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
         public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "h2", "quic", "grpc" };
         public static readonly List<string> KcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
@@ -172,7 +173,7 @@ namespace v2rayN
         public static readonly List<string> AllowInsecures = new() { "true", "false", "" };
         public static readonly List<string> DomainStrategy4Freedoms = new() { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
         public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru" };
-        public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2,http/1.1", "h3,h2", "h2,http/1.1",  "" };
+        public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2,http/1.1", "h3,h2", "h2,http/1.1", "" };
         public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
         public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
         public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index e44ffe7e..195b1757 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -931,7 +931,7 @@ namespace v2rayN.Handler
                         continue;
                     }
                     if (item.configType == EConfigType.Shadowsocks
-                        && !Global.SsSecuritysInXray.Contains(item.security))
+                        && !Global.SsSecuritysInSingbox.Contains(item.security))
                     {
                         continue;
                     }
diff --git a/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayN/v2rayN/Handler/LazyConfig.cs
index 0e16af1e..26d68863 100644
--- a/v2rayN/v2rayN/Handler/LazyConfig.cs
+++ b/v2rayN/v2rayN/Handler/LazyConfig.cs
@@ -164,15 +164,18 @@ namespace v2rayN.Handler
 
         public List<string> GetShadowsocksSecuritys(ProfileItem profileItem)
         {
-            if (GetCoreType(profileItem, EConfigType.Shadowsocks) == ECoreType.v2fly)
+            var coreType = GetCoreType(profileItem, EConfigType.Shadowsocks);
+            switch (coreType)
             {
-                return Global.SsSecuritys;
-            }
-            if (GetCoreType(profileItem, EConfigType.Shadowsocks) == ECoreType.Xray)
-            {
-                return Global.SsSecuritysInXray;
-            }
+                case ECoreType.v2fly:
+                    return Global.SsSecuritys;
 
+                case ECoreType.Xray:
+                    return Global.SsSecuritysInXray;
+
+                case ECoreType.sing_box:
+                    return Global.SsSecuritysInSingbox;
+            }
             return Global.SsSecuritysInSagerNet;
         }
 

From e71525db0e46d8d6d86375b20b5129b3f2784860 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 25 Jan 2024 17:28:06 +0800
Subject: [PATCH 37/62] Refactor

---
 v2rayN/v2rayN/Views/AddServer2Window.xaml     | 329 +++++++++---------
 v2rayN/v2rayN/Views/AddServerWindow.xaml      |  13 +-
 v2rayN/v2rayN/Views/AddServerWindow.xaml.cs   |   5 -
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml     |   5 +-
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs  |   5 -
 .../Views/GlobalHotkeySettingWindow.xaml      | 305 ++++++++--------
 .../Views/GlobalHotkeySettingWindow.xaml.cs   |   5 -
 v2rayN/v2rayN/Views/MainWindow.xaml           |  14 +-
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml  |   5 +-
 .../v2rayN/Views/OptionSettingWindow.xaml.cs  |   5 -
 .../Views/RoutingRuleDetailsWindow.xaml       |   4 +-
 .../Views/RoutingRuleDetailsWindow.xaml.cs    |   5 -
 .../Views/RoutingRuleSettingWindow.xaml       |   4 +-
 v2rayN/v2rayN/Views/RoutingSettingWindow.xaml |   4 +-
 v2rayN/v2rayN/Views/SubEditWindow.xaml        |  10 +-
 v2rayN/v2rayN/Views/SubEditWindow.xaml.cs     |   5 -
 16 files changed, 340 insertions(+), 383 deletions(-)

diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayN/v2rayN/Views/AddServer2Window.xaml
index 20dc079d..86aba9b9 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml
@@ -2,10 +2,8 @@
     x:Class="v2rayN.Views.AddServer2Window"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Views="clr-namespace:v2rayN.Views"
     xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:v2rayN"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
@@ -25,182 +23,181 @@
     TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <ScrollViewer
-        materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
-        HorizontalScrollBarVisibility="Auto"
-        VerticalScrollBarVisibility="Auto">
-        <Grid Margin="8">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid Grid.Row="0">
+    <DockPanel Margin="8">
+        <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="150" />
+                <ColumnDefinition Width="150" />
+            </Grid.ColumnDefinitions>
+            <Button
+                x:Name="btnSave"
+                Grid.Column="0"
+                Margin="4"
+                Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
+                Style="{StaticResource DefButton}" />
+            <Button
+                x:Name="btnCancel"
+                Grid.Column="1"
+                Margin="4"
+                Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
+                IsCancel="true"
+                Style="{StaticResource DefButton}" />
+        </Grid>
+        <ScrollViewer
+            materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
+            HorizontalScrollBarVisibility="Auto"
+            VerticalScrollBarVisibility="Auto">
+            <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
+                <Grid Grid.Row="0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
 
-                <TextBlock
-                    Grid.Row="0"
-                    Grid.Column="0"
-                    Margin="4"
-                    Style="{StaticResource ModuleTitle}"
-                    Text="{x:Static resx:ResUI.menuServers}" />
-
-                <TextBlock
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbRemarks}" />
-
-                <TextBox
-                    x:Name="txtRemarks"
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Width="400"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
-
-                <TextBlock
-                    Grid.Row="2"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbAddress}" />
-                <TextBox
-                    x:Name="txtAddress"
-                    Grid.Row="2"
-                    Grid.Column="1"
-                    Width="400"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    IsReadOnly="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
-                <StackPanel
-                    Grid.Row="2"
-                    Grid.Column="2"
-                    VerticalAlignment="Center"
-                    Orientation="Horizontal">
-                    <Button
-                        x:Name="btnBrowse"
-                        Width="80"
-                        Margin="2,0"
-                        Content="{x:Static resx:ResUI.TbBrowse}"
-                        Style="{StaticResource DefButton}" />
-                    <Button
-                        x:Name="btnEdit"
-                        Width="80"
-                        Margin="2,0"
-                        Content="{x:Static resx:ResUI.TbEdit}"
-                        Style="{StaticResource DefButton}" />
-                </StackPanel>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbCoreType}" />
-                <ComboBox
-                    x:Name="cmbCoreType"
-                    Grid.Row="3"
-                    Grid.Column="1"
-                    Width="200"
-                    Margin="4"
-                    HorizontalAlignment="Left"
-                    MaxDropDownHeight="1000"
-                    Style="{StaticResource MyOutlinedTextComboBox}" />
-
-                <TextBlock
-                    Grid.Row="4"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbDisplayLog}" />
-                <StackPanel
-                    Grid.Row="4"
-                    Grid.Column="1"
-                    Margin="4"
-                    Orientation="Horizontal">
-                    <ToggleButton x:Name="togDisplayLog" HorizontalAlignment="Left" />
                     <TextBlock
-                        Margin="8,0"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="4"
+                        Style="{StaticResource ModuleTitle}"
+                        Text="{x:Static resx:ResUI.menuServers}" />
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="4"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TipDisplayLog}" />
-                </StackPanel>
+                        Text="{x:Static resx:ResUI.TbRemarks}" />
+
+                    <TextBox
+                        x:Name="txtRemarks"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        Style="{StaticResource MyOutlinedTextBox}" />
 
-                <TextBlock
-                    Grid.Row="5"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbPreSocksPort}" />
-                <TextBox
-                    x:Name="txtPreSocksPort"
-                    Grid.Row="5"
-                    Grid.Column="1"
-                    Width="200"
-                    Margin="4"
-                    HorizontalAlignment="Left"
-                    AcceptsReturn="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
-                <StackPanel
-                    Grid.Row="6"
-                    Grid.Column="1"
-                    Grid.ColumnSpan="2">
                     <TextBlock
-                        Width="500"
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="4"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TipPreSocksPort}"
-                        TextWrapping="Wrap" />
-                </StackPanel>
-            </Grid>
+                        Text="{x:Static resx:ResUI.TbAddress}" />
+                    <TextBox
+                        x:Name="txtAddress"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        IsReadOnly="True"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+                    <StackPanel
+                        Grid.Row="2"
+                        Grid.Column="2"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <Button
+                            x:Name="btnBrowse"
+                            Width="80"
+                            Margin="2,0"
+                            Content="{x:Static resx:ResUI.TbBrowse}"
+                            Style="{StaticResource DefButton}" />
+                        <Button
+                            x:Name="btnEdit"
+                            Width="80"
+                            Margin="2,0"
+                            Content="{x:Static resx:ResUI.TbEdit}"
+                            Style="{StaticResource DefButton}" />
+                    </StackPanel>
 
-            <Grid
-                Grid.Row="1"
-                Margin="8"
-                HorizontalAlignment="Center">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="200" />
-                    <ColumnDefinition Width="200" />
-                </Grid.ColumnDefinitions>
-                <Button
-                    x:Name="btnSave"
-                    Grid.Column="0"
-                    Margin="4"
-                    Content="{x:Static resx:ResUI.TbConfirm}"
-                    Style="{StaticResource DefButton}" />
-                <Button
-                    x:Name="btnCancel"
-                    Grid.Column="1"
-                    Margin="4"
-                    Click="btnCancel_Click"
-                    Content="{x:Static resx:ResUI.TbCancel}"
-                    IsCancel="true"
-                    Style="{StaticResource DefButton}" />
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbCoreType}" />
+                    <ComboBox
+                        x:Name="cmbCoreType"
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="4"
+                        HorizontalAlignment="Left"
+                        MaxDropDownHeight="1000"
+                        Style="{StaticResource MyOutlinedTextComboBox}" />
+
+                    <TextBlock
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbDisplayLog}" />
+                    <StackPanel
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Margin="4"
+                        Orientation="Horizontal">
+                        <ToggleButton x:Name="togDisplayLog" HorizontalAlignment="Left" />
+                        <TextBlock
+                            Margin="8,0"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TipDisplayLog}" />
+                    </StackPanel>
+
+                    <TextBlock
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbPreSocksPort}" />
+                    <TextBox
+                        x:Name="txtPreSocksPort"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="4"
+                        HorizontalAlignment="Left"
+                        AcceptsReturn="True"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+                    <StackPanel
+                        Grid.Row="6"
+                        Grid.Column="1"
+                        Grid.ColumnSpan="2">
+                        <TextBlock
+                            Width="500"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TipPreSocksPort}"
+                            TextWrapping="Wrap" />
+                    </StackPanel>
+                </Grid>
             </Grid>
-        </Grid>
-    </ScrollViewer>
+        </ScrollViewer>
+    </DockPanel>
 </reactiveui:ReactiveWindow>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index 8da7df19..e7371755 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -1,12 +1,12 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.AddServerWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuServers}"
@@ -26,8 +26,8 @@
     <DockPanel Margin="8">
         <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="200" />
-                <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="150" />
+                <ColumnDefinition Width="150" />
             </Grid.ColumnDefinitions>
             <Button
                 x:Name="btnSave"
@@ -40,7 +40,6 @@
                 x:Name="btnCancel"
                 Grid.Column="1"
                 Margin="4"
-                Click="btnCancel_Click"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
index 56f0d89d..d89e9dde 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
@@ -351,10 +351,5 @@ namespace v2rayN.Views
                     break;
             }
         }
-
-        private void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close();
-        }
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
index c6bf65da..07b3060f 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
@@ -26,8 +26,8 @@
     <DockPanel Margin="8">
         <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="200" />
-                <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="150" />
+                <ColumnDefinition Width="150" />
             </Grid.ColumnDefinitions>
             <Button
                 x:Name="btnSave"
@@ -40,7 +40,6 @@
                 x:Name="btnCancel"
                 Grid.Column="1"
                 Margin="4"
-                Click="btnCancel_Click"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
index 49c31285..93db3816 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
@@ -58,10 +58,5 @@ namespace v2rayN.Views
         {
             Utils.ProcessStart("https://sing-box.sagernet.org/zh/configuration/dns/");
         }
-
-        private void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close();
-        }
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
index 9e20c6ea..0ae481c7 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
@@ -1,17 +1,16 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.GlobalHotkeySettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Views="clr-namespace:v2rayN.Views"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuSetting}"
-    Width="600"
+    Width="700"
     Height="500"
     x:TypeArguments="vms:SubEditViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
@@ -25,165 +24,163 @@
     TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <ScrollViewer
-        materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
-        HorizontalScrollBarVisibility="Auto"
-        VerticalScrollBarVisibility="Auto">
-        <Grid Margin="8">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid x:Name="gridText" Grid.Row="0">
+    <DockPanel Margin="8">
+        <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="150" />
+                <ColumnDefinition Width="150" />
+                <ColumnDefinition Width="150" />
+            </Grid.ColumnDefinitions>
+            <Button
+                x:Name="btnReset"
+                Grid.Column="0"
+                Margin="4"
+                Click="btnReset_Click"
+                Content="{x:Static resx:ResUI.TbReset}"
+                Style="{StaticResource DefButton}" />
+            <Button
+                x:Name="btnSave"
+                Grid.Column="1"
+                Margin="4"
+                Click="btnSave_Click"
+                Content="{x:Static resx:ResUI.TbConfirm}"
+                Style="{StaticResource DefButton}" />
+            <Button
+                x:Name="btnCancel"
+                Grid.Column="2"
+                Margin="4"
+                Content="{x:Static resx:ResUI.TbCancel}"
+                IsCancel="true"
+                Style="{StaticResource DefButton}" />
+        </Grid>
+        <ScrollViewer
+            materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
+            HorizontalScrollBarVisibility="Auto"
+            VerticalScrollBarVisibility="Auto">
+            <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="300" />
-                </Grid.ColumnDefinitions>
+                <Grid x:Name="gridText" Grid.Row="0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="400" />
+                    </Grid.ColumnDefinitions>
 
-                <TextBlock
-                    Grid.Row="0"
-                    Grid.Column="0"
-                    Margin="4"
-                    Style="{StaticResource ModuleTitle}"
-                    Text="{x:Static resx:ResUI.TbGlobalHotkeySetting}" />
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="4"
+                        Style="{StaticResource ModuleTitle}"
+                        Text="{x:Static resx:ResUI.TbGlobalHotkeySetting}" />
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbDisplayGUI}" />
+
+                    <TextBox
+                        x:Name="txtGlobalHotkey0"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        IsReadOnly="True"
+                        PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbClearSystemProxy}" />
+                    <TextBox
+                        x:Name="txtGlobalHotkey1"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        IsReadOnly="True"
+                        PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbSetSystemProxy}" />
+                    <TextBox
+                        x:Name="txtGlobalHotkey2"
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        IsReadOnly="True"
+                        PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+                    <TextBlock
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbNotChangeSystemProxy}" />
+                    <TextBox
+                        x:Name="txtGlobalHotkey3"
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        IsReadOnly="True"
+                        PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+                    <TextBlock
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbSystemProxyPac}" />
+                    <TextBox
+                        x:Name="txtGlobalHotkey4"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        IsReadOnly="True"
+                        PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+                </Grid>
 
                 <TextBlock
                     Grid.Row="1"
-                    Grid.Column="0"
                     Margin="4"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbDisplayGUI}" />
-
-                <TextBox
-                    x:Name="txtGlobalHotkey0"
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    IsReadOnly="True"
-                    Style="{StaticResource MyOutlinedTextBox}"
-                    PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown" />
-
-                <TextBlock
-                    Grid.Row="2"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbClearSystemProxy}" />
-                <TextBox
-                    x:Name="txtGlobalHotkey1"
-                    Grid.Row="2"
-                    Grid.Column="1"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    IsReadOnly="True"
-                    Style="{StaticResource MyOutlinedTextBox}"
-                    PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown" />
-
-                <TextBlock
-                    Grid.Row="3"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbSetSystemProxy}" />
-                <TextBox
-                    x:Name="txtGlobalHotkey2"
-                    Grid.Row="3"
-                    Grid.Column="1"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    IsReadOnly="True"
-                    Style="{StaticResource MyOutlinedTextBox}"
-                    PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown" />
-                <TextBlock
-                    Grid.Row="4"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbNotChangeSystemProxy}" />
-                <TextBox
-                    x:Name="txtGlobalHotkey3"
-                    Grid.Row="4"
-                    Grid.Column="1"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    IsReadOnly="True"
-                    Style="{StaticResource MyOutlinedTextBox}"
-                    PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown" />
-                <TextBlock
-                    Grid.Row="5"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbSystemProxyPac}" />
-                <TextBox
-                    x:Name="txtGlobalHotkey4"
-                    Grid.Row="5"
-                    Grid.Column="1"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    IsReadOnly="True"
-                    Style="{StaticResource MyOutlinedTextBox}"
-                    PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown" />
+                    Text="{x:Static resx:ResUI.TbGlobalHotkeySettingTip}" />
             </Grid>
-
-            <TextBlock
-                Grid.Row="1"
-                Margin="4"
-                VerticalAlignment="Center"
-                Style="{StaticResource ToolbarTextBlock}"
-                Text="{x:Static resx:ResUI.TbGlobalHotkeySettingTip}" />
-
-            <Grid
-                Grid.Row="2"
-                Margin="8"
-                HorizontalAlignment="Center">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="150" />
-                    <ColumnDefinition Width="150" />
-                    <ColumnDefinition Width="150" />
-                </Grid.ColumnDefinitions>
-                <Button
-                    x:Name="btnReset"
-                    Grid.Column="0"
-                    Margin="4"
-                    Click="btnReset_Click"
-                    Content="{x:Static resx:ResUI.TbReset}"
-                    Style="{StaticResource DefButton}" />
-                <Button
-                    x:Name="btnSave"
-                    Grid.Column="1"
-                    Margin="4"
-                    Click="btnSave_Click"
-                    Content="{x:Static resx:ResUI.TbConfirm}"
-                    Style="{StaticResource DefButton}" />
-                <Button
-                    x:Name="btnCancel"
-                    Grid.Column="2"
-                    Margin="4"
-                    Click="btnCancel_Click"
-                    Content="{x:Static resx:ResUI.TbCancel}"
-                    Style="{StaticResource DefButton}" />
-            </Grid>
-        </Grid>
-    </ScrollViewer>
+        </ScrollViewer>
+    </DockPanel>
 </reactiveui:ReactiveWindow>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
index 5f511320..f4c936c5 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
@@ -123,11 +123,6 @@ namespace v2rayN.Views
             }
         }
 
-        private void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close();
-        }
-
         private void btnReset_Click(object sender, RoutedEventArgs e)
         {
             foreach (var k in _TextBoxKeyEventItem.Keys)
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 1644b640..a37084e8 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -1,17 +1,17 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tb="clr-namespace:H.NotifyIcon;assembly=H.NotifyIcon.Wpf"
     xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:conv="clr-namespace:v2rayN.Converters"
-    xmlns:resx="clr-namespace:v2rayN.Resx"
-    xmlns:vms="clr-namespace:v2rayN.ViewModels"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:v2rayN.Views"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:resx="clr-namespace:v2rayN.Resx"
+    xmlns:tb="clr-namespace:H.NotifyIcon;assembly=H.NotifyIcon.Wpf"
+    xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="v2rayN"
     Width="900"
     Height="700"
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index b94b7a86..e3672783 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -26,8 +26,8 @@
     <DockPanel Margin="8">
         <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="200" />
-                <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="150" />
+                <ColumnDefinition Width="150" />
             </Grid.ColumnDefinitions>
             <Button
                 x:Name="btnSave"
@@ -40,7 +40,6 @@
                 x:Name="btnCancel"
                 Grid.Column="1"
                 Margin="4"
-                Click="btnCancel_Click"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
index f4822b42..e1deb7d8 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -198,10 +198,5 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
             });
         }
-
-        private void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close();
-        }
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
index bbce43c4..4db91dd2 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -139,8 +139,8 @@
             DockPanel.Dock="Bottom">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="600" />
-                <ColumnDefinition Width="100" />
-                <ColumnDefinition Width="100" />
+                <ColumnDefinition Width="150" />
+                <ColumnDefinition Width="150" />
             </Grid.ColumnDefinitions>
             <StackPanel
                 Grid.Column="0"
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
index 395b5af4..1c4eff6f 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
@@ -81,11 +81,6 @@ namespace v2rayN.Views
             ViewModel.InboundTagItems = clbInboundTag.SelectedItems.Cast<string>().ToList();
         }
 
-        private void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close();
-        }
-
         private void linkRuleobjectDoc_Click(object sender, RoutedEventArgs e)
         {
             Utils.ProcessStart("https://www.v2fly.org/config/routing.html#ruleobject");
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
index b10ae720..40f4d13f 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -78,8 +78,8 @@
             DockPanel.Dock="Bottom">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="600" />
-                <ColumnDefinition Width="100" />
-                <ColumnDefinition Width="100" />
+                <ColumnDefinition Width="150" />
+                <ColumnDefinition Width="150" />
             </Grid.ColumnDefinitions>
             <Button
                 x:Name="btnSave"
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
index efbb4c65..b72528c9 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -131,8 +131,8 @@
             DockPanel.Dock="Bottom">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="600" />
-                <ColumnDefinition Width="100" />
-                <ColumnDefinition Width="100" />
+                <ColumnDefinition Width="150" />
+                <ColumnDefinition Width="150" />
             </Grid.ColumnDefinitions>
             <StackPanel
                 Grid.Column="0"
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index 94c2ee6b..6c972dbb 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -31,13 +31,10 @@
         </ResourceDictionary>
     </Window.Resources>
     <DockPanel Margin="8">
-        <Grid
-            Margin="8"
-            HorizontalAlignment="Center"
-            DockPanel.Dock="Bottom">
+        <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="200" />
-                <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="150" />
+                <ColumnDefinition Width="150" />
             </Grid.ColumnDefinitions>
             <Button
                 x:Name="btnSave"
@@ -50,7 +47,6 @@
                 x:Name="btnCancel"
                 Grid.Column="1"
                 Margin="4"
-                Click="btnCancel_Click"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
index b1c35836..c3874734 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
@@ -54,10 +54,5 @@ namespace v2rayN.Views
         {
             txtRemarks.Focus();
         }
-
-        private void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close();
-        }
     }
 }
\ No newline at end of file

From 6f22b7415470c93f3d616d35bd179c2ffb21a6e3 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 27 Jan 2024 10:57:40 +0800
Subject: [PATCH 38/62] Improve

---
 v2rayN/v2rayN/Resx/ResUI.Designer.cs          | 18 ++++++++++
 v2rayN/v2rayN/Resx/ResUI.resx                 |  6 ++++
 v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx         |  6 ++++
 v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx         |  6 ++++
 .../v2rayN/ViewModels/AddServer2ViewModel.cs  |  2 +-
 v2rayN/v2rayN/Views/AddServer2Window.xaml     |  7 ++++
 v2rayN/v2rayN/Views/MsgView.xaml              | 12 +++++--
 v2rayN/v2rayN/Views/MsgView.xaml.cs           | 10 ++++--
 .../Views/RoutingRuleDetailsWindow.xaml       | 35 +++++++++++--------
 9 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index 256c941b..fb9e9175 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -1906,6 +1906,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Auto ScrollToEnd 的本地化字符串。
+        /// </summary>
+        public static string TbAutoScrollToEnd {
+            get {
+                return ResourceManager.GetString("TbAutoScrollToEnd", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Domain, ip, process are auto sorted when saving 的本地化字符串。
         /// </summary>
@@ -2338,6 +2347,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 (Domain or IP or ProcName) and Port and Protocol and InboundTag =&gt; OutboundTag 的本地化字符串。
+        /// </summary>
+        public static string TbRuleMatchingTips {
+            get {
+                return ResourceManager.GetString("TbRuleMatchingTips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Ruleobject Doc 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index c8045e40..a6ada925 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -1183,4 +1183,10 @@
   <data name="TbPath7" xml:space="preserve">
     <value>obfs password</value>
   </data>
+  <data name="TbRuleMatchingTips" xml:space="preserve">
+    <value>(Domain or IP or ProcName) and Port and Protocol and InboundTag =&gt; OutboundTag</value>
+  </data>
+  <data name="TbAutoScrollToEnd" xml:space="preserve">
+    <value>Auto ScrollToEnd</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index 0eb0bc73..079af3ea 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -1180,4 +1180,10 @@
   <data name="TbPath7" xml:space="preserve">
     <value>混淆密码(obfs password)</value>
   </data>
+  <data name="TbRuleMatchingTips" xml:space="preserve">
+    <value>(Domain 或 IP 或 进程名) 与 Port 与 Protocol 与 InboundTag =&gt; OutboundTag</value>
+  </data>
+  <data name="TbAutoScrollToEnd" xml:space="preserve">
+    <value>自动滚动到末尾</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
index ae5d167e..f2cd572c 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
@@ -1153,4 +1153,10 @@
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>啟用IPv6</value>
   </data>
+  <data name="TbRuleMatchingTips" xml:space="preserve">
+    <value>(Domain 或 IP 或 进程名) 与 Port 与 Protocol 与 InboundTag =&gt; OutboundTag</value>
+  </data>
+  <data name="TbAutoScrollToEnd" xml:space="preserve">
+    <value>自动滚动到末尾</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
index f4a5796c..ffe448d9 100644
--- a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
@@ -101,7 +101,7 @@ namespace v2rayN.ViewModels
 
         private void BrowseServer()
         {
-            UI.Show(ResUI.CustomServerTips);
+            //UI.Show(ResUI.CustomServerTips);
 
             if (UI.OpenFileDialog(out string fileName,
                 "Config|*.json|YAML|*.yaml;*.yml|All|*.*") != true)
diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayN/v2rayN/Views/AddServer2Window.xaml
index 86aba9b9..34ea9df3 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml
@@ -195,6 +195,13 @@
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TipPreSocksPort}"
                             TextWrapping="Wrap" />
+                        <TextBlock
+                            Width="500"
+                            Margin="8,0"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.CustomServerTips}"
+                            TextWrapping="Wrap" />
                     </StackPanel>
                 </Grid>
             </Grid>
diff --git a/v2rayN/v2rayN/Views/MsgView.xaml b/v2rayN/v2rayN/Views/MsgView.xaml
index eea12849..440b77ab 100644
--- a/v2rayN/v2rayN/Views/MsgView.xaml
+++ b/v2rayN/v2rayN/Views/MsgView.xaml
@@ -3,11 +3,9 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:v2rayN.Views"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:v2rayN.Resx"
-    xmlns:vms="clr-namespace:v2rayN.ViewModels"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
@@ -41,6 +39,16 @@
                 Margin="8,0"
                 HorizontalAlignment="Left"
                 IsChecked="True" />
+            <TextBlock
+                Margin="8,0"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}"
+                Text="{x:Static resx:ResUI.TbAutoScrollToEnd}" />
+            <ToggleButton
+                x:Name="togScrollToEnd"
+                Margin="8,0"
+                HorizontalAlignment="Left"
+                IsChecked="True" />
         </StackPanel>
         <TextBox
             Name="txtMsg"
diff --git a/v2rayN/v2rayN/Views/MsgView.xaml.cs b/v2rayN/v2rayN/Views/MsgView.xaml.cs
index e60bb9db..eb78a011 100644
--- a/v2rayN/v2rayN/Views/MsgView.xaml.cs
+++ b/v2rayN/v2rayN/Views/MsgView.xaml.cs
@@ -9,9 +9,9 @@ namespace v2rayN.Views
 {
     public partial class MsgView
     {
-        private static Config _config;
+        private static Config? _config;
 
-        private string lastMsgFilter;
+        private string lastMsgFilter = string.Empty;
         private bool lastMsgFilterNotAvailable;
 
         public MsgView()
@@ -65,6 +65,11 @@ namespace v2rayN.Views
             lastMsgFilter = MsgFilter;
 
             ShowMsg(msg);
+
+            if (togScrollToEnd.IsChecked ?? true)
+            {
+                txtMsg.ScrollToEnd();
+            }
         }
 
         private void ShowMsg(string msg)
@@ -78,7 +83,6 @@ namespace v2rayN.Views
             {
                 this.txtMsg.AppendText(Environment.NewLine);
             }
-            txtMsg.ScrollToEnd();
         }
 
         public void ClearMsg()
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
index 4db91dd2..30121bcf 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -4,7 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:v2rayN.Resx"
@@ -36,6 +35,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <TextBlock
                 Grid.Row="0"
@@ -52,6 +52,13 @@
                 Margin="4"
                 MaxDropDownHeight="1000"
                 Style="{StaticResource DefComboBox}" />
+            <TextBlock
+                Grid.Row="0"
+                Grid.Column="2"
+                Margin="4"
+                HorizontalAlignment="Left"
+                Style="{StaticResource ToolbarTextBlock}"
+                Text="{x:Static resx:ResUI.TbRuleMatchingTips}" />
 
             <TextBlock
                 Grid.Row="1"
@@ -68,6 +75,16 @@
                 Margin="4"
                 HorizontalAlignment="Left"
                 Style="{StaticResource DefTextBox}" />
+            <TextBlock
+                Grid.Row="1"
+                Grid.Column="2"
+                Margin="4"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}">
+                <Hyperlink Click="linkRuleobjectDoc_Click">
+                    <TextBlock Text="{x:Static resx:ResUI.TbRuleobjectDoc}" />
+                </Hyperlink>
+            </TextBlock>
 
             <TextBlock
                 Grid.Row="2"
@@ -115,18 +132,8 @@
                 HorizontalAlignment="Left" />
 
             <TextBlock
-                Grid.Row="5"
-                Grid.Column="0"
-                Margin="4"
-                VerticalAlignment="Center"
-                Style="{StaticResource ToolbarTextBlock}">
-                <Hyperlink Click="linkRuleobjectDoc_Click">
-                    <TextBlock Text="{x:Static resx:ResUI.TbRuleobjectDoc}" />
-                </Hyperlink>
-            </TextBlock>
-            <TextBlock
-                Grid.Row="5"
-                Grid.Column="1"
+                Grid.Row="4"
+                Grid.Column="2"
                 Margin="4"
                 HorizontalAlignment="Left"
                 Style="{StaticResource ToolbarTextBlock}"
@@ -144,7 +151,7 @@
             </Grid.ColumnDefinitions>
             <StackPanel
                 Grid.Column="0"
-                HorizontalAlignment="Left"
+                HorizontalAlignment="Center"
                 VerticalAlignment="Center">
                 <CheckBox x:Name="chkAutoSort">
                     <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.TbAutoSort}" />

From bd838094cd411d0f1bbc5f739e7d3f4d83ef8538 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 27 Jan 2024 18:29:17 +0800
Subject: [PATCH 39/62] bug fix

---
 v2rayN/v2rayN/Common/StringEx.cs                | 10 ++++++++++
 v2rayN/v2rayN/Handler/UpdateHandle.cs           |  4 ++--
 v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/v2rayN/v2rayN/Common/StringEx.cs b/v2rayN/v2rayN/Common/StringEx.cs
index 57ba7795..9a751ce9 100644
--- a/v2rayN/v2rayN/Common/StringEx.cs
+++ b/v2rayN/v2rayN/Common/StringEx.cs
@@ -80,5 +80,15 @@ namespace v2rayN
 
             return char.ToUpper(value[0]) + value.Substring(1);
         }
+
+        public static string AppendQuotes(this string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return string.Empty;
+            }
+
+            return $"\"{value}\"";
+        }
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayN/v2rayN/Handler/UpdateHandle.cs
index 6236c58f..d7d977a2 100644
--- a/v2rayN/v2rayN/Handler/UpdateHandle.cs
+++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs
@@ -54,7 +54,7 @@ namespace v2rayN.Handler
                             StartInfo = new ProcessStartInfo
                             {
                                 FileName = "v2rayUpgrade.exe",
-                                Arguments = $"\"{fileName}\"",
+                                Arguments = fileName.AppendQuotes(),                                
                                 WorkingDirectory = Utils.StartupPath()
                             }
                         };
@@ -364,7 +364,7 @@ namespace v2rayN.Handler
                 }
 
                 using Process p = new();
-                p.StartInfo.FileName = filePath;
+                p.StartInfo.FileName = filePath.AppendQuotes();
                 p.StartInfo.Arguments = coreInfo.versionArg;
                 p.StartInfo.WorkingDirectory = Utils.StartupPath();
                 p.StartInfo.UseShellExecute = false;
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index c0122284..96c26562 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -1388,7 +1388,7 @@ namespace v2rayN.ViewModels
                 UseShellExecute = true,
                 Arguments = Global.RebootAs,
                 WorkingDirectory = Utils.StartupPath(),
-                FileName = Utils.GetExePath(),
+                FileName = Utils.GetExePath().AppendQuotes(),
                 Verb = "runas",
             };
             try

From 2e30c04238832013be1069d3c7e0717f2c61fb19 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 28 Jan 2024 19:53:20 +0800
Subject: [PATCH 40/62] Migrate from Newtonsoft.Json to System.Text.Json

---
 v2rayN/v2rayN/Common/JsonUtils.cs             | 42 ++++++++-----
 v2rayN/v2rayN/Common/Utils.cs                 | 31 ++++++++++
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs    |  2 +-
 v2rayN/v2rayN/Handler/CoreConfigV2ray.cs      | 45 +++++---------
 v2rayN/v2rayN/Mode/GitHubRelease.cs           | 60 +++++++++----------
 v2rayN/v2rayN/Mode/V2rayConfig.cs             |  4 +-
 .../v2rayN/ViewModels/DNSSettingViewModel.cs  |  2 +-
 7 files changed, 108 insertions(+), 78 deletions(-)

diff --git a/v2rayN/v2rayN/Common/JsonUtils.cs b/v2rayN/v2rayN/Common/JsonUtils.cs
index b627d426..2ee9ceb2 100644
--- a/v2rayN/v2rayN/Common/JsonUtils.cs
+++ b/v2rayN/v2rayN/Common/JsonUtils.cs
@@ -1,6 +1,7 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System.IO;
+using System.IO;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 
 namespace v2rayN
 {
@@ -31,7 +32,7 @@ namespace v2rayN
                 {
                     return default;
                 }
-                return JsonConvert.DeserializeObject<T>(strJson);
+                return JsonSerializer.Deserialize<T>(strJson);
             }
             catch
             {
@@ -44,7 +45,7 @@ namespace v2rayN
         /// </summary>
         /// <param name="strJson"></param>
         /// <returns></returns>
-        public static JObject? ParseJson(string strJson)
+        public static JsonNode? ParseJson(string strJson)
         {
             try
             {
@@ -52,8 +53,7 @@ namespace v2rayN
                 {
                     return null;
                 }
-
-                return JObject.Parse(strJson);
+                return JsonNode.Parse(strJson);
             }
             catch
             {
@@ -77,9 +77,12 @@ namespace v2rayN
                 {
                     return result;
                 }
-                result = JsonConvert.SerializeObject(obj,
-                                          indented ? Formatting.Indented : Formatting.None,
-                                          new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+                var options = new JsonSerializerOptions
+                {
+                    WriteIndented = indented ? true : false,
+                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+                };
+                result = JsonSerializer.Serialize(obj, options);
             }
             catch (Exception ex)
             {
@@ -88,6 +91,13 @@ namespace v2rayN
             return result;
         }
 
+        /// <summary>
+        /// SerializeToNode
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static JsonNode? SerializeToNode(object? obj) => JsonSerializer.SerializeToNode(obj);
+
         /// <summary>
         /// Save as json file
         /// </summary>
@@ -100,13 +110,15 @@ namespace v2rayN
             int result;
             try
             {
-                using StreamWriter file = File.CreateText(filePath);
-                var serializer = new JsonSerializer()
+                using FileStream file = File.Create(filePath);
+
+                var options = new JsonSerializerOptions
                 {
-                    Formatting = Formatting.Indented,
-                    NullValueHandling = nullValue ? NullValueHandling.Include : NullValueHandling.Ignore
+                    WriteIndented = true,
+                    DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull
                 };
-                serializer.Serialize(file, obj);
+
+                JsonSerializer.Serialize(file, obj, options);
                 result = 0;
             }
             catch (Exception ex)
diff --git a/v2rayN/v2rayN/Common/Utils.cs b/v2rayN/v2rayN/Common/Utils.cs
index 4b4e5b46..79b91be6 100644
--- a/v2rayN/v2rayN/Common/Utils.cs
+++ b/v2rayN/v2rayN/Common/Utils.cs
@@ -927,6 +927,37 @@ namespace v2rayN
             return value is int i && i > 0;
         }
 
+        /// <summary>
+        /// 获取系统hosts
+        /// </summary>
+        /// <returns></returns>
+        public static Dictionary<string, string> GetSystemHosts()
+        {
+            var systemHosts = new Dictionary<string, string>();
+            var hostfile = @"C:\Windows\System32\drivers\etc\hosts";
+            try
+            {
+                if (File.Exists(hostfile))
+                {
+                    var hosts = File.ReadAllText(hostfile).Replace("\r", "");
+                    var hostsList = hosts.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+
+                    foreach (var host in hostsList)
+                    {
+                        if (host.StartsWith("#")) continue;
+                        var hostItem = host.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                        if (hostItem.Length < 2) continue;
+                        systemHosts.Add(hostItem[1], hostItem[0]);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return systemHosts;
+        }
+
         #endregion 杂项
 
         #region TempPath
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index 195b1757..0f75131f 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -675,7 +675,7 @@ namespace v2rayN.Handler
 
         private void ParseV2Domain(string domain, Rule4Sbox rule)
         {
-            if (domain.StartsWith("ext:") || domain.StartsWith("ext-domain:"))
+            if (domain.StartsWith("#") || domain.StartsWith("ext:") || domain.StartsWith("ext-domain:"))
             {
                 return;
             }
diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
index 440932de..1538d8ce 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
@@ -1,6 +1,4 @@
-using Newtonsoft.Json.Linq;
-using System.IO;
-using System.Net;
+using System.Net;
 using System.Net.NetworkInformation;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -721,9 +719,8 @@ namespace v2rayN.Handler
                     outbound.settings.userLevel = 0;
                 }
 
-                var obj = JsonUtils.ParseJson(normalDNS) ?? [];
-
-                if (!obj.ContainsKey("servers"))
+                var obj = JsonUtils.ParseJson(normalDNS);
+                if (obj is null)
                 {
                     List<string> servers = [];
                     string[] arrDNS = normalDNS.Split(',');
@@ -731,36 +728,26 @@ namespace v2rayN.Handler
                     {
                         servers.Add(str);
                     }
-                    obj["servers"] = JArray.FromObject(servers);
+                    obj = JsonUtils.ParseJson("{}");
+                    obj["servers"] = JsonUtils.SerializeToNode(servers);
                 }
 
+                // 追加至 dns 设置
                 if (item.useSystemHosts)
                 {
-                    var hostfile = @"C:\Windows\System32\drivers\etc\hosts";
-
-                    if (File.Exists(hostfile))
+                    var systemHosts = Utils.GetSystemHosts();
+                    if (systemHosts.Count > 0)
                     {
-                        var hosts = File.ReadAllText(hostfile).Replace("\r", "");
-                        var hostsList = hosts.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
-
-                        // 获取系统hosts
-                        var systemHosts = new Dictionary<string, string>();
-                        foreach (var host in hostsList)
+                        var normalHost = obj["hosts"];
+                        if (normalHost != null)
                         {
-                            if (host.StartsWith("#")) continue;
-                            var hostItem = host.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                            if (hostItem.Length < 2) continue;
-                            systemHosts.Add(hostItem[1], hostItem[0]);
+                            foreach (var host in systemHosts)
+                            {
+                                if (normalHost[host.Key] != null)
+                                    continue;
+                                normalHost[host.Key] = host.Value;
+                            }
                         }
-
-                        // 追加至 dns 设置
-                        var normalHost = obj["hosts"] ?? new JObject();
-                        foreach (var host in systemHosts)
-                        {
-                            if (normalHost[host.Key] != null) continue;
-                            normalHost[host.Key] = host.Value;
-                        }
-                        obj["hosts"] = normalHost;
                     }
                 }
 
diff --git a/v2rayN/v2rayN/Mode/GitHubRelease.cs b/v2rayN/v2rayN/Mode/GitHubRelease.cs
index e509b10f..ddcb2582 100644
--- a/v2rayN/v2rayN/Mode/GitHubRelease.cs
+++ b/v2rayN/v2rayN/Mode/GitHubRelease.cs
@@ -1,68 +1,68 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace v2rayN.Mode
 {
     public class GitHubReleaseAsset
     {
-        [JsonProperty("url")] public string Url { get; set; }
+        [JsonPropertyName("url")] public string Url { get; set; }
 
-        [JsonProperty("id")] public int Id { get; set; }
+        [JsonPropertyName("id")] public int Id { get; set; }
 
-        [JsonProperty("node_id")] public string NodeId { get; set; }
+        [JsonPropertyName("node_id")] public string NodeId { get; set; }
 
-        [JsonProperty("name")] public string Name { get; set; }
+        [JsonPropertyName("name")] public string Name { get; set; }
 
-        [JsonProperty("label")] public object Label { get; set; }
+        [JsonPropertyName("label")] public object Label { get; set; }
 
-        [JsonProperty("content_type")] public string ContentType { get; set; }
+        [JsonPropertyName("content_type")] public string ContentType { get; set; }
 
-        [JsonProperty("state")] public string State { get; set; }
+        [JsonPropertyName("state")] public string State { get; set; }
 
-        [JsonProperty("size")] public int Size { get; set; }
+        [JsonPropertyName("size")] public int Size { get; set; }
 
-        [JsonProperty("download_count")] public int DownloadCount { get; set; }
+        [JsonPropertyName("download_count")] public int DownloadCount { get; set; }
 
-        [JsonProperty("created_at")] public DateTime CreatedAt { get; set; }
+        [JsonPropertyName("created_at")] public DateTime CreatedAt { get; set; }
 
-        [JsonProperty("updated_at")] public DateTime UpdatedAt { get; set; }
+        [JsonPropertyName("updated_at")] public DateTime UpdatedAt { get; set; }
 
-        [JsonProperty("browser_download_url")] public string BrowserDownloadUrl { get; set; }
+        [JsonPropertyName("browser_download_url")] public string BrowserDownloadUrl { get; set; }
     }
 
     public class GitHubRelease
     {
-        [JsonProperty("url")] public string Url { get; set; }
+        [JsonPropertyName("url")] public string Url { get; set; }
 
-        [JsonProperty("assets_url")] public string AssetsUrl { get; set; }
+        [JsonPropertyName("assets_url")] public string AssetsUrl { get; set; }
 
-        [JsonProperty("upload_url")] public string UploadUrl { get; set; }
+        [JsonPropertyName("upload_url")] public string UploadUrl { get; set; }
 
-        [JsonProperty("html_url")] public string HtmlUrl { get; set; }
+        [JsonPropertyName("html_url")] public string HtmlUrl { get; set; }
 
-        [JsonProperty("id")] public int Id { get; set; }
+        [JsonPropertyName("id")] public int Id { get; set; }
 
-        [JsonProperty("node_id")] public string NodeId { get; set; }
+        [JsonPropertyName("node_id")] public string NodeId { get; set; }
 
-        [JsonProperty("tag_name")] public string TagName { get; set; }
+        [JsonPropertyName("tag_name")] public string TagName { get; set; }
 
-        [JsonProperty("target_commitish")] public string TargetCommitish { get; set; }
+        [JsonPropertyName("target_commitish")] public string TargetCommitish { get; set; }
 
-        [JsonProperty("name")] public string Name { get; set; }
+        [JsonPropertyName("name")] public string Name { get; set; }
 
-        [JsonProperty("draft")] public bool Draft { get; set; }
+        [JsonPropertyName("draft")] public bool Draft { get; set; }
 
-        [JsonProperty("prerelease")] public bool Prerelease { get; set; }
+        [JsonPropertyName("prerelease")] public bool Prerelease { get; set; }
 
-        [JsonProperty("created_at")] public DateTime CreatedAt { get; set; }
+        [JsonPropertyName("created_at")] public DateTime CreatedAt { get; set; }
 
-        [JsonProperty("published_at")] public DateTime PublishedAt { get; set; }
+        [JsonPropertyName("published_at")] public DateTime PublishedAt { get; set; }
 
-        [JsonProperty("assets")] public List<GitHubReleaseAsset> Assets { get; set; }
+        [JsonPropertyName("assets")] public List<GitHubReleaseAsset> Assets { get; set; }
 
-        [JsonProperty("tarball_url")] public string TarballUrl { get; set; }
+        [JsonPropertyName("tarball_url")] public string TarballUrl { get; set; }
 
-        [JsonProperty("zipball_url")] public string ZipballUrl { get; set; }
+        [JsonPropertyName("zipball_url")] public string ZipballUrl { get; set; }
 
-        [JsonProperty("body")] public string Body { get; set; }
+        [JsonPropertyName("body")] public string Body { get; set; }
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Mode/V2rayConfig.cs b/v2rayN/v2rayN/Mode/V2rayConfig.cs
index d19040ad..957af112 100644
--- a/v2rayN/v2rayN/Mode/V2rayConfig.cs
+++ b/v2rayN/v2rayN/Mode/V2rayConfig.cs
@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace v2rayN.Mode
 {
@@ -580,7 +580,7 @@ namespace v2rayN.Mode
         /// <summary>
         /// 用户代理
         /// </summary>
-        [JsonProperty("User-Agent")]
+        [JsonPropertyName("User-Agent")]
         public string UserAgent { get; set; }
     }
 
diff --git a/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
index a5cb132e..8eb7df1b 100644
--- a/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
@@ -64,7 +64,7 @@ namespace v2rayN.ViewModels
             if (!Utils.IsNullOrEmpty(normalDNS))
             {
                 var obj = JsonUtils.ParseJson(normalDNS);
-                if (obj != null && obj.ContainsKey("servers") == true)
+                if (obj != null && obj["servers"] != null)
                 {
                 }
                 else

From fdddf901f3ad71050f8706449f8363a4511b9d84 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 29 Jan 2024 11:15:11 +0800
Subject: [PATCH 41/62] Remove the main interface Encryption Method

---
 v2rayN/v2rayN/Handler/ConfigHandler.cs |  1 -
 v2rayN/v2rayN/Mode/EServerColName.cs   |  1 -
 v2rayN/v2rayN/Views/MainWindow.xaml    |  5 -----
 v2rayN/v2rayN/Views/MainWindow.xaml.cs | 11 +++++------
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 4844c1f3..131bd9ae 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -835,7 +835,6 @@ namespace v2rayN.Handler
                 case EServerColName.remarks:
                 case EServerColName.address:
                 case EServerColName.port:
-                case EServerColName.security:
                 case EServerColName.network:
                 case EServerColName.streamSecurity:
                     propertyName = name.ToString();
diff --git a/v2rayN/v2rayN/Mode/EServerColName.cs b/v2rayN/v2rayN/Mode/EServerColName.cs
index be49c2cb..0323df30 100644
--- a/v2rayN/v2rayN/Mode/EServerColName.cs
+++ b/v2rayN/v2rayN/Mode/EServerColName.cs
@@ -7,7 +7,6 @@
         remarks,
         address,
         port,
-        security,
         network,
         streamSecurity,
         subRemarks,
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index a37084e8..71e3eb72 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -688,11 +688,6 @@
                                 Binding="{Binding port}"
                                 ExName="port"
                                 Header="{x:Static resx:ResUI.LvPort}" />
-                            <base:MyDGTextColumn
-                                Width="100"
-                                Binding="{Binding security}"
-                                ExName="security"
-                                Header="{x:Static resx:ResUI.LvEncryptionMethod}" />
                             <base:MyDGTextColumn
                                 Width="100"
                                 Binding="{Binding network}"
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index 3ba6feb1..503e9bc2 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -478,12 +478,11 @@ namespace v2rayN.Views
             }
 
             var lvColumnItem = _config.uiItem.mainColumnItem.OrderBy(t => t.Index).ToList();
-            for (int i = 0; i < lvColumnItem.Count; i++)
+            var displayIndex = 0;
+            foreach(var item in lvColumnItem)
             {
-                var item = lvColumnItem[i];
-                for (int k = 0; k < lstProfiles.Columns.Count; k++)
-                {
-                    var item2 = (MyDGTextColumn)lstProfiles.Columns[k];
+                foreach (MyDGTextColumn item2 in lstProfiles.Columns) 
+                { 
                     if (item2.ExName == item.Name)
                     {
                         if (item.Width < 0)
@@ -493,7 +492,7 @@ namespace v2rayN.Views
                         else
                         {
                             item2.Width = item.Width;
-                            item2.DisplayIndex = i;
+                            item2.DisplayIndex = displayIndex++;
                         }
                     }
                 }

From 11106937a35308b7a9f59ba54a95458d715a5f2c Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 29 Jan 2024 11:50:24 +0800
Subject: [PATCH 42/62] Improve

---
 v2rayN/v2rayN/Handler/CoreHandler.cs            | 6 ++++++
 v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/CoreHandler.cs b/v2rayN/v2rayN/Handler/CoreHandler.cs
index ff30ab8b..bbd8cd2e 100644
--- a/v2rayN/v2rayN/Handler/CoreHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreHandler.cs
@@ -45,6 +45,12 @@ namespace v2rayN.Handler
                 ShowMsg(false, msg);
                 ShowMsg(true, $"{node.GetSummary()}");
                 CoreStop();
+
+                if (_config.tunModeItem.enableTun)
+                {
+                    Thread.Sleep(1000);
+                }
+
                 CoreStart(node);
 
                 //In tun mode, do a delay check and restart the core
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index 96c26562..78278658 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -862,13 +862,12 @@ namespace v2rayN.ViewModels
                 var running = ConfigHandler.GetDefaultServer(_config);
                 if (running != null)
                 {
-                    var runningSummary = running.GetSummary();
-                    RunningServerDisplay = $"{ResUI.menuServers}:{runningSummary}";
-                    RunningServerToolTipText = runningSummary;
+                    RunningServerDisplay =
+                    RunningServerToolTipText = running.GetSummary();
                 }
                 else
                 {
-                    RunningServerDisplay = ResUI.CheckServerSettings;
+                    RunningServerDisplay =
                     RunningServerToolTipText = ResUI.CheckServerSettings;
                 }
             }));

From 405436961134a05e58444bcfa4d276a30f3aa454 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 29 Jan 2024 17:20:15 +0800
Subject: [PATCH 43/62] Up PackageReference

---
 v2rayN/ProtosLib/ProtosLib.csproj | 2 +-
 v2rayN/v2rayN/v2rayN.csproj       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/v2rayN/ProtosLib/ProtosLib.csproj b/v2rayN/ProtosLib/ProtosLib.csproj
index 83a4ce17..6c1f9c2e 100644
--- a/v2rayN/ProtosLib/ProtosLib.csproj
+++ b/v2rayN/ProtosLib/ProtosLib.csproj
@@ -9,7 +9,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.25.1" />
+		<PackageReference Include="Google.Protobuf" Version="3.25.2" />
 		<PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
 		<PackageReference Include="Grpc.Tools" Version="2.60.0">
 			<PrivateAssets>all</PrivateAssets>
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index fcb7f0da..cb3e275c 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net8.0-windows</TargetFramework>
+		<TargetFramework>net8.0-windows10.0.17763</TargetFramework>
 		<Nullable>enable</Nullable>
 		<UseWPF>true</UseWPF>  
 		<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -11,13 +11,13 @@
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
 		<FileVersion>6.33</FileVersion>
+		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 	
 	<ItemGroup>
 		<PackageReference Include="Downloader" Version="3.0.6" />		
 		<PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
 		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.124" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="QRCoder.Xaml" Version="1.4.3" />
 		<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
 		<PackageReference Include="TaskScheduler" Version="2.10.1" /> 

From c466ea100aa91451f091f33936ab8024def82e97 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 30 Jan 2024 17:18:00 +0800
Subject: [PATCH 44/62] Refactor

---
 v2rayN/v2rayN/Handler/ConfigHandler.cs        | 47 +++++--------------
 v2rayN/v2rayN/Handler/ShareHandler.cs         | 14 +-----
 v2rayN/v2rayN/Handler/UpdateHandle.cs         | 16 +++++--
 .../v2rayN/ViewModels/AddServerViewModel.cs   | 45 +++++-------------
 .../v2rayN/ViewModels/MainWindowViewModel.cs  | 24 +++++-----
 .../ViewModels/RoutingRuleSettingViewModel.cs |  4 +-
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        |  2 +-
 7 files changed, 51 insertions(+), 101 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 131bd9ae..2432e8ce 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -1089,8 +1089,8 @@ namespace v2rayN.Handler
                     }
                     continue;
                 }
-                ProfileItem profileItem = ShareHandler.ImportFromClipboardConfig(str, out string msg);
-                if (profileItem == null)
+                var profileItem = ShareHandler.ImportFromClipboardConfig(str, out string msg);
+                if (profileItem is null)
                 {
                     continue;
                 }
@@ -1127,40 +1127,19 @@ namespace v2rayN.Handler
                 }
                 profileItem.subid = subid;
                 profileItem.isSub = isSub;
-                var addStatus = -1;
 
-                if (profileItem.configType == EConfigType.VMess)
+                var addStatus = profileItem.configType switch
                 {
-                    addStatus = AddServer(config, profileItem, false);
-                }
-                else if (profileItem.configType == EConfigType.Shadowsocks)
-                {
-                    addStatus = AddShadowsocksServer(config, profileItem, false);
-                }
-                else if (profileItem.configType == EConfigType.Socks)
-                {
-                    addStatus = AddSocksServer(config, profileItem, false);
-                }
-                else if (profileItem.configType == EConfigType.Trojan)
-                {
-                    addStatus = AddTrojanServer(config, profileItem, false);
-                }
-                else if (profileItem.configType == EConfigType.VLESS)
-                {
-                    addStatus = AddVlessServer(config, profileItem, false);
-                }
-                else if (profileItem.configType == EConfigType.Hysteria2)
-                {
-                    addStatus = AddHysteria2Server(config, profileItem, false);
-                }
-                else if (profileItem.configType == EConfigType.Tuic)
-                {
-                    addStatus = AddTuicServer(config, profileItem, false);
-                }
-                else if (profileItem.configType == EConfigType.Wireguard)
-                {
-                    addStatus = AddWireguardServer(config, profileItem, false);
-                }
+                    EConfigType.VMess => AddServer(config, profileItem, false),
+                    EConfigType.Shadowsocks => AddShadowsocksServer(config, profileItem, false),
+                    EConfigType.Socks => AddSocksServer(config, profileItem, false),
+                    EConfigType.Trojan => AddTrojanServer(config, profileItem, false),
+                    EConfigType.VLESS => AddVlessServer(config, profileItem, false),
+                    EConfigType.Hysteria2 => AddHysteria2Server(config, profileItem, false),
+                    EConfigType.Tuic => AddTuicServer(config, profileItem, false),
+                    EConfigType.Wireguard => AddWireguardServer(config, profileItem, false),
+                    _ => -1,
+                };
 
                 if (addStatus == 0)
                 {
diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
index 16508c93..d68895d8 100644
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -385,14 +385,12 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static ProfileItem? ImportFromClipboardConfig(string clipboardData, out string msg)
         {
-            msg = string.Empty;
-
+            msg = ResUI.ConfigurationFormatIncorrect;
             ProfileItem? profileItem;
 
             try
             {
-                //载入配置文件
-                string result = clipboardData.TrimEx();// Utils.GetClipboardData();
+                string result = clipboardData.TrimEx();
                 if (Utils.IsNullOrEmpty(result))
                 {
                     msg = ResUI.FailedReadConfiguration;
@@ -413,8 +411,6 @@ namespace v2rayN.Handler
                 }
                 else if (result.StartsWith(Global.ProtocolShares[EConfigType.Shadowsocks]))
                 {
-                    msg = ResUI.ConfigurationFormatIncorrect;
-
                     profileItem = ResolveSSLegacy(result) ?? ResolveSip002(result);
                     if (profileItem == null)
                     {
@@ -429,8 +425,6 @@ namespace v2rayN.Handler
                 }
                 else if (result.StartsWith(Global.ProtocolShares[EConfigType.Socks]))
                 {
-                    msg = ResUI.ConfigurationFormatIncorrect;
-
                     profileItem = ResolveSocksNew(result) ?? ResolveSocks(result);
                     if (profileItem == null)
                     {
@@ -445,8 +439,6 @@ namespace v2rayN.Handler
                 }
                 else if (result.StartsWith(Global.ProtocolShares[EConfigType.Trojan]))
                 {
-                    msg = ResUI.ConfigurationFormatIncorrect;
-
                     profileItem = ResolveTrojan(result);
                 }
                 else if (result.StartsWith(Global.ProtocolShares[EConfigType.VLESS]))
@@ -455,8 +447,6 @@ namespace v2rayN.Handler
                 }
                 else if (result.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2]) || result.StartsWith(Global.Hysteria2ProtocolShare))
                 {
-                    msg = ResUI.ConfigurationFormatIncorrect;
-
                     profileItem = ResolveHysteria2(result);
                 }
                 else if (result.StartsWith(Global.ProtocolShares[EConfigType.Tuic]))
diff --git a/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayN/v2rayN/Handler/UpdateHandle.cs
index d7d977a2..bf541c0b 100644
--- a/v2rayN/v2rayN/Handler/UpdateHandle.cs
+++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs
@@ -86,7 +86,10 @@ namespace v2rayN.Handler
                     _updateFunc(false, args.Msg);
 
                     url = args.Url;
-                    _ = askToDownload(downloadHandle, url, true);
+                    AskToDownload(downloadHandle, url, true).ContinueWith(task =>
+                    {
+                        _updateFunc(false, url);
+                    });
                 }
                 else
                 {
@@ -139,7 +142,10 @@ namespace v2rayN.Handler
                     _updateFunc(false, args.Msg);
 
                     url = args.Url;
-                    _ = askToDownload(downloadHandle, url, true);
+                    AskToDownload(downloadHandle, url, true).ContinueWith(task =>
+                    {
+                        _updateFunc(false, url);
+                    });
                 }
                 else
                 {
@@ -527,7 +533,7 @@ namespace v2rayN.Handler
             }
         }
 
-        private async Task askToDownload(DownloadHandle downloadHandle, string url, bool blAsk)
+        private async Task AskToDownload(DownloadHandle downloadHandle, string url, bool blAsk)
         {
             bool blDownload = false;
             if (blAsk)
@@ -591,7 +597,7 @@ namespace v2rayN.Handler
             {
                 _updateFunc(false, args.GetException().Message);
             };
-            await askToDownload(downloadHandle, url, false);
+            await AskToDownload(downloadHandle, url, false);
         }
 
         private async Task UpdateGeoFile4Singbox(string geoName, Config config, bool needStop, Action<bool, string> update)
@@ -639,7 +645,7 @@ namespace v2rayN.Handler
             {
                 _updateFunc(false, args.GetException().Message);
             };
-            await askToDownload(downloadHandle, url, false);
+            await AskToDownload(downloadHandle, url, false);
         }
 
         #endregion private
diff --git a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
index 6660bc2e..a81a2dc0 100644
--- a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
@@ -122,41 +122,18 @@ namespace v2rayN.ViewModels
                 item.spiderX = SelectedSource.spiderX;
             }
 
-            int ret = -1;
-            switch (item.configType)
+            var ret = item.configType switch
             {
-                case EConfigType.VMess:
-                    ret = ConfigHandler.AddServer(_config, item);
-                    break;
-
-                case EConfigType.Shadowsocks:
-                    ret = ConfigHandler.AddShadowsocksServer(_config, item);
-                    break;
-
-                case EConfigType.Socks:
-                    ret = ConfigHandler.AddSocksServer(_config, item);
-                    break;
-
-                case EConfigType.VLESS:
-                    ret = ConfigHandler.AddVlessServer(_config, item);
-                    break;
-
-                case EConfigType.Trojan:
-                    ret = ConfigHandler.AddTrojanServer(_config, item);
-                    break;
-
-                case EConfigType.Hysteria2:
-                    ret = ConfigHandler.AddHysteria2Server(_config, item);
-                    break;
-
-                case EConfigType.Tuic:
-                    ret = ConfigHandler.AddTuicServer(_config, item);
-                    break;
-
-                case EConfigType.Wireguard:
-                    ret = ConfigHandler.AddWireguardServer(_config, item);
-                    break;
-            }
+                EConfigType.VMess => ConfigHandler.AddServer(_config, item),
+                EConfigType.Shadowsocks => ConfigHandler.AddShadowsocksServer(_config, item),
+                EConfigType.Socks => ConfigHandler.AddSocksServer(_config, item),
+                EConfigType.Trojan => ConfigHandler.AddTrojanServer(_config, item),
+                EConfigType.VLESS => ConfigHandler.AddVlessServer(_config, item),
+                EConfigType.Hysteria2 => ConfigHandler.AddHysteria2Server(_config, item),
+                EConfigType.Tuic => ConfigHandler.AddTuicServer(_config, item),
+                EConfigType.Wireguard => ConfigHandler.AddWireguardServer(_config, item),
+                _ => -1,
+            };
 
             if (ret == 0)
             {
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index 78278658..52419d19 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -1482,16 +1482,21 @@ namespace v2rayN.ViewModels
 
         public void Reload()
         {
-            _ = LoadV2ray();
+            BlReloadEnabled = false;
+
+            LoadV2ray().ContinueWith(task =>
+            {
+                TestServerAvailability();
+
+                Application.Current.Dispatcher.Invoke((Action)(() =>
+                {
+                    BlReloadEnabled = true;
+                }));
+            });
         }
 
         private async Task LoadV2ray()
         {
-            Application.Current.Dispatcher.Invoke((Action)(() =>
-            {
-                BlReloadEnabled = false;
-            }));
-
             await Task.Run(() =>
             {
                 _coreHandler.LoadCore();
@@ -1500,13 +1505,6 @@ namespace v2rayN.ViewModels
 
                 ChangeSystemProxyStatus(_config.sysProxyType, false);
             });
-
-            TestServerAvailability();
-
-            Application.Current.Dispatcher.Invoke((Action)(() =>
-            {
-                BlReloadEnabled = true;
-            }));
         }
 
         private void CloseV2ray()
diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
index 23dcc2e4..a35dafb2 100644
--- a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
@@ -306,7 +306,7 @@ namespace v2rayN.ViewModels
             }
 
             DownloadHandle downloadHandle = new DownloadHandle();
-            string result = await downloadHandle.TryDownloadString(url, true, "");
+            var result = await downloadHandle.TryDownloadString(url, true, "");
             if (AddBatchRoutingRules(SelectedRouting, result) == 0)
             {
                 Application.Current.Dispatcher.Invoke((Action)(() =>
@@ -317,7 +317,7 @@ namespace v2rayN.ViewModels
             }
         }
 
-        private int AddBatchRoutingRules(RoutingItem routingItem, string clipboardData)
+        private int AddBatchRoutingRules(RoutingItem routingItem, string? clipboardData)
         {
             bool blReplace = false;
             if (UI.ShowYesNo(ResUI.AddBatchRoutingRulesYesNo) == MessageBoxResult.No)
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index 503e9bc2..e5745e8b 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -342,7 +342,7 @@ namespace v2rayN.Views
                         break;
 
                     case Key.S:
-                        _ = ViewModel?.ScanScreenTaskAsync();
+                        ViewModel?.ScanScreenTaskAsync().ContinueWith(_ => { });
                         break;
 
                     case Key.T:

From fc52870431a229d9017cfb8f009c131c0c8b3480 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 30 Jan 2024 18:04:10 +0800
Subject: [PATCH 45/62] Add setting 4 SpeedPingTestUrl

---
 v2rayN/v2rayN/Global.cs                       |  3 ++
 v2rayN/v2rayN/Mode/ConfigItems.cs             |  1 -
 v2rayN/v2rayN/Resx/ResUI.Designer.cs          |  9 ++++
 v2rayN/v2rayN/Resx/ResUI.resx                 |  3 ++
 v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx         |  3 ++
 v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx         |  3 ++
 .../v2rayN/ViewModels/MainWindowViewModel.cs  |  1 -
 .../ViewModels/OptionSettingViewModel.cs      |  3 ++
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml  | 53 ++++++++++++-------
 .../v2rayN/Views/OptionSettingWindow.xaml.cs  |  5 ++
 10 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index 52e090e4..bf449a45 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -118,6 +118,9 @@ namespace v2rayN
             @"http://cachefly.cachefly.net/100mb.test",
             @"http://cachefly.cachefly.net/10mb.test"
         };
+        public static readonly List<string> SpeedPingTestUrls = new() {
+            @"https://www.google.com/generate_204",
+        };
 
         public static readonly Dictionary<string, string> UserAgentTxts = new()
         {
diff --git a/v2rayN/v2rayN/Mode/ConfigItems.cs b/v2rayN/v2rayN/Mode/ConfigItems.cs
index 57068635..8c1fdafe 100644
--- a/v2rayN/v2rayN/Mode/ConfigItems.cs
+++ b/v2rayN/v2rayN/Mode/ConfigItems.cs
@@ -123,7 +123,6 @@ namespace v2rayN.Mode
         public bool doubleClick2Activate { get; set; }
         public bool autoHideStartup { get; set; } = true;
         public string mainMsgFilter { get; set; }
-        public bool showTrayTip { get; set; }
         public List<ColumnItem> mainColumnItem { get; set; }
     }
 
diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index fb9e9175..1e749021 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -2851,6 +2851,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Speed Ping Test Url 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsSpeedPingTestUrl {
+            get {
+                return ResourceManager.GetString("TbSettingsSpeedPingTestUrl", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 SpeedTest Single Timeout Value 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index a6ada925..8de9d591 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -1189,4 +1189,7 @@
   <data name="TbAutoScrollToEnd" xml:space="preserve">
     <value>Auto ScrollToEnd</value>
   </data>
+  <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
+    <value>Speed Ping Test Url</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index 079af3ea..d98faff9 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -1186,4 +1186,7 @@
   <data name="TbAutoScrollToEnd" xml:space="preserve">
     <value>自动滚动到末尾</value>
   </data>
+  <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
+    <value>真连接测试地址</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
index f2cd572c..1e40e8e7 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
@@ -1159,4 +1159,7 @@
   <data name="TbAutoScrollToEnd" xml:space="preserve">
     <value>自动滚动到末尾</value>
   </data>
+  <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
+    <value>真連接測試地址</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index 52419d19..a0935c36 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -1700,7 +1700,6 @@ namespace v2rayN.ViewModels
             }
             CurrentFontSize = _config.uiItem.currentFontSize;
             CurrentLanguage = _config.uiItem.currentLanguage;
-            //BlShowTrayTip = _config.uiItem.showTrayTip;
 
             this.WhenAnyValue(
                   x => x.ColorModeDark,
diff --git a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
index da871a2f..18139d8b 100644
--- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
@@ -66,6 +66,7 @@ namespace v2rayN.ViewModels
         [Reactive] public string currentFontFamily { get; set; }
         [Reactive] public int SpeedTestTimeout { get; set; }
         [Reactive] public string SpeedTestUrl { get; set; }
+        [Reactive] public string SpeedPingTestUrl { get; set; }
         [Reactive] public bool EnableHWA { get; set; }
         [Reactive] public string SubConvertUrl { get; set; }
 
@@ -159,6 +160,7 @@ namespace v2rayN.ViewModels
             currentFontFamily = _config.uiItem.currentFontFamily;
             SpeedTestTimeout = _config.speedTestItem.speedTestTimeout;
             SpeedTestUrl = _config.speedTestItem.speedTestUrl;
+            SpeedPingTestUrl = _config.speedTestItem.speedPingTestUrl;
             EnableHWA = _config.guiItem.enableHWA;
             SubConvertUrl = _config.constItem.subConvertUrl;
 
@@ -312,6 +314,7 @@ namespace v2rayN.ViewModels
             _config.uiItem.currentFontFamily = currentFontFamily;
             _config.speedTestItem.speedTestTimeout = SpeedTestTimeout;
             _config.speedTestItem.speedTestUrl = SpeedTestUrl;
+            _config.speedTestItem.speedPingTestUrl = SpeedPingTestUrl;
             _config.guiItem.enableHWA = EnableHWA;
             _config.constItem.subConvertUrl = SubConvertUrl;
 
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index e3672783..9999b282 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -482,6 +482,7 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -643,10 +644,24 @@
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsEnableHWA}" />
+                        <ToggleButton
+                            x:Name="togEnableHWA"
+                            Grid.Row="12"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
+
+                        <TextBlock
+                            Grid.Row="14"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsAutoUpdateInterval}" />
                         <TextBox
                             x:Name="txtautoUpdateInterval"
-                            Grid.Row="12"
+                            Grid.Row="14"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource SettingItemMargin}"
@@ -654,7 +669,7 @@
                             Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
-                            Grid.Row="14"
+                            Grid.Row="15"
                             Grid.Column="0"
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
@@ -662,7 +677,7 @@
                             Text="{x:Static resx:ResUI.TbSettingsTrayMenuServersLimit}" />
                         <TextBox
                             x:Name="txttrayMenuServersLimit"
-                            Grid.Row="14"
+                            Grid.Row="15"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource SettingItemMargin}"
@@ -670,7 +685,7 @@
                             Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
-                            Grid.Row="15"
+                            Grid.Row="16"
                             Grid.Column="0"
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
@@ -678,14 +693,14 @@
                             Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamily}" />
                         <ComboBox
                             x:Name="cmbcurrentFontFamily"
-                            Grid.Row="15"
+                            Grid.Row="16"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource SettingItemMargin}"
                             MaxDropDownHeight="1000"
                             Style="{StaticResource DefComboBox}" />
                         <TextBlock
-                            Grid.Row="15"
+                            Grid.Row="16"
                             Grid.Column="2"
                             Margin="{StaticResource ServerItemMargin}"
                             VerticalAlignment="Center"
@@ -694,7 +709,7 @@
                             TextWrapping="Wrap" />
 
                         <TextBlock
-                            Grid.Row="16"
+                            Grid.Row="17"
                             Grid.Column="0"
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
@@ -702,14 +717,14 @@
                             Text="{x:Static resx:ResUI.TbSettingsSpeedTestTimeout}" />
                         <ComboBox
                             x:Name="cmbSpeedTestTimeout"
-                            Grid.Row="16"
+                            Grid.Row="17"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource SettingItemMargin}"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
-                            Grid.Row="17"
+                            Grid.Row="18"
                             Grid.Column="0"
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
@@ -717,7 +732,7 @@
                             Text="{x:Static resx:ResUI.TbSettingsSpeedTestUrl}" />
                         <ComboBox
                             x:Name="cmbSpeedTestUrl"
-                            Grid.Row="17"
+                            Grid.Row="18"
                             Grid.Column="1"
                             Width="300"
                             Margin="{StaticResource SettingItemMargin}"
@@ -725,21 +740,23 @@
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
-                            Grid.Row="18"
+                            Grid.Row="19"
                             Grid.Column="0"
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSettingsEnableHWA}" />
-                        <ToggleButton
-                            x:Name="togEnableHWA"
-                            Grid.Row="18"
+                            Text="{x:Static resx:ResUI.TbSettingsSpeedPingTestUrl}" />
+                        <ComboBox
+                            x:Name="cmbSpeedPingTestUrl"
+                            Grid.Row="19"
                             Grid.Column="1"
+                            Width="300"
                             Margin="{StaticResource SettingItemMargin}"
-                            HorizontalAlignment="Left" />
+                            IsEditable="True"
+                            Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
-                            Grid.Row="19"
+                            Grid.Row="20"
                             Grid.Column="0"
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
@@ -747,7 +764,7 @@
                             Text="{x:Static resx:ResUI.TbSettingsSubConvert}" />
                         <ComboBox
                             x:Name="cmbSubConvertUrl"
-                            Grid.Row="19"
+                            Grid.Row="20"
                             Grid.Column="1"
                             Width="300"
                             Margin="{StaticResource SettingItemMargin}"
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
index e1deb7d8..089433ae 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -80,6 +80,10 @@ namespace v2rayN.Views
             {
                 cmbSpeedTestUrl.Items.Add(it);
             });
+            Global.SpeedPingTestUrls.ForEach(it =>
+            {
+                cmbSpeedPingTestUrl.Items.Add(it);
+            });
             Global.SubConvertUrls.ForEach(it =>
             {
                 cmbSubConvertUrl.Items.Add(it);
@@ -176,6 +180,7 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.currentFontFamily, v => v.cmbcurrentFontFamily.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SpeedTestTimeout, v => v.cmbSpeedTestTimeout.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SpeedTestUrl, v => v.cmbSpeedTestUrl.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableHWA, v => v.togEnableHWA.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.Text).DisposeWith(disposables);
 

From 9d43465eabc73d8356cefaed2b56ff05b0f97108 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 30 Jan 2024 18:29:52 +0800
Subject: [PATCH 46/62] Improve

---
 v2rayN/v2rayN/Views/AddServer2Window.xaml     | 21 +++++------
 v2rayN/v2rayN/Views/AddServer2Window.xaml.cs  | 14 +-------
 v2rayN/v2rayN/Views/AddServerWindow.xaml      | 27 +++++++-------
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml     | 19 +++++-----
 .../Views/GlobalHotkeySettingWindow.xaml      | 35 +++++++++----------
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml  | 19 +++++-----
 .../Views/RoutingRuleDetailsWindow.xaml       | 23 +++++-------
 .../Views/RoutingRuleSettingWindow.xaml       | 21 +++++------
 v2rayN/v2rayN/Views/RoutingSettingWindow.xaml | 23 +++++-------
 v2rayN/v2rayN/Views/SubEditWindow.xaml        | 27 +++++++-------
 10 files changed, 97 insertions(+), 132 deletions(-)

diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayN/v2rayN/Views/AddServer2Window.xaml
index 34ea9df3..7c522e11 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml
@@ -24,27 +24,26 @@
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="8">
-        <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="150" />
-                <ColumnDefinition Width="150" />
-            </Grid.ColumnDefinitions>
+        <StackPanel
+            Margin="4"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
             <Button
                 x:Name="btnSave"
-                Grid.Column="0"
-                Margin="4"
+                Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
-                Grid.Column="1"
-                Margin="4"
+                Width="100"
+                Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
-        </Grid>
+        </StackPanel>
         <ScrollViewer
             materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
             HorizontalScrollBarVisibility="Auto"
@@ -120,13 +119,11 @@
                         Orientation="Horizontal">
                         <Button
                             x:Name="btnBrowse"
-                            Width="80"
                             Margin="2,0"
                             Content="{x:Static resx:ResUI.TbBrowse}"
                             Style="{StaticResource DefButton}" />
                         <Button
                             x:Name="btnEdit"
-                            Width="80"
                             Margin="2,0"
                             Content="{x:Static resx:ResUI.TbEdit}"
                             Style="{StaticResource DefButton}" />
diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs b/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
index 4fd1be1a..3b33566d 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
@@ -51,18 +51,6 @@ namespace v2rayN.Views
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             txtRemarks.Focus();
-        }
-
-        private void btnCancel_Click(object sender, System.Windows.RoutedEventArgs e)
-        {
-            if (ViewModel?.IsModified == true)
-            {
-                this.DialogResult = true;
-            }
-            else
-            {
-                this.Close();
-            }
-        }
+        }         
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index e7371755..f85f3afb 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -1,12 +1,12 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.AddServerWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuServers}"
@@ -24,27 +24,26 @@
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="8">
-        <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="150" />
-                <ColumnDefinition Width="150" />
-            </Grid.ColumnDefinitions>
+        <StackPanel
+            Margin="4"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
             <Button
                 x:Name="btnSave"
-                Grid.Column="0"
-                Margin="4"
+                Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
-                Grid.Column="1"
-                Margin="4"
+                Width="100"
+                Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
-        </Grid>
+        </StackPanel>
         <ScrollViewer
             materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
             HorizontalScrollBarVisibility="Auto"
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
index 07b3060f..ddc5de75 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
@@ -24,27 +24,26 @@
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="8">
-        <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="150" />
-                <ColumnDefinition Width="150" />
-            </Grid.ColumnDefinitions>
+        <StackPanel
+            Margin="4"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
             <Button
                 x:Name="btnSave"
-                Grid.Column="0"
-                Margin="4"
+                Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
-                Grid.Column="1"
-                Margin="4"
+                Width="100"
+                Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
-        </Grid>
+        </StackPanel>
 
         <TabControl HorizontalContentAlignment="Left">
 
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
index 0ae481c7..dab2157a 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
@@ -1,12 +1,12 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.GlobalHotkeySettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuSetting}"
@@ -25,34 +25,33 @@
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="8">
-        <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="150" />
-                <ColumnDefinition Width="150" />
-                <ColumnDefinition Width="150" />
-            </Grid.ColumnDefinitions>
+        <StackPanel
+            Margin="4"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
             <Button
                 x:Name="btnReset"
-                Grid.Column="0"
-                Margin="4"
+                Width="100"
+                Margin="8,0"
                 Click="btnReset_Click"
                 Content="{x:Static resx:ResUI.TbReset}"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnSave"
-                Grid.Column="1"
-                Margin="4"
-                Click="btnSave_Click"
+                Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
-                Grid.Column="2"
-                Margin="4"
+                Width="100"
+                Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
-        </Grid>
+        </StackPanel>
         <ScrollViewer
             materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
             HorizontalScrollBarVisibility="Auto"
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index 9999b282..4edf5d25 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -24,27 +24,26 @@
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="8">
-        <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="150" />
-                <ColumnDefinition Width="150" />
-            </Grid.ColumnDefinitions>
+        <StackPanel
+            Margin="4"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
             <Button
                 x:Name="btnSave"
-                Grid.Column="0"
-                Margin="4"
+                Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
-                Grid.Column="1"
-                Margin="4"
+                Width="100"
+                Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
-        </Grid>
+        </StackPanel>
 
         <TabControl HorizontalContentAlignment="Left">
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCore}">
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
index 30121bcf..774cd80d 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -140,17 +140,13 @@
                 Text="{x:Static resx:ResUI.TbRoutingTips}" />
         </Grid>
 
-        <Grid
+        <StackPanel
             Margin="8"
-            HorizontalAlignment="Center"
-            DockPanel.Dock="Bottom">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="600" />
-                <ColumnDefinition Width="150" />
-                <ColumnDefinition Width="150" />
-            </Grid.ColumnDefinitions>
+            HorizontalAlignment="Right"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
             <StackPanel
-                Grid.Column="0"
+                Width="600"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center">
                 <CheckBox x:Name="chkAutoSort">
@@ -159,20 +155,19 @@
             </StackPanel>
             <Button
                 x:Name="btnSave"
-                Grid.Column="1"
-                Margin="4"
+                Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
-                Grid.Column="2"
-                Margin="4"
+                Width="100"
+                Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
-        </Grid>
+        </StackPanel>
 
         <Grid Margin="{StaticResource SettingItemMargin}">
             <Grid.ColumnDefinitions>
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
index 40f4d13f..a869b762 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -72,31 +72,26 @@
             </ToolBar>
         </ToolBarTray>
 
-        <Grid
+        <StackPanel
             Margin="8"
-            HorizontalAlignment="Center"
-            DockPanel.Dock="Bottom">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="600" />
-                <ColumnDefinition Width="150" />
-                <ColumnDefinition Width="150" />
-            </Grid.ColumnDefinitions>
+            HorizontalAlignment="Right"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
             <Button
                 x:Name="btnSave"
-                Grid.Column="1"
-                Margin="4"
+                Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
-                Grid.Column="2"
-                Margin="4"
+                Width="100"
+                Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
-        </Grid>
+        </StackPanel>
 
         <Grid Margin="8" DockPanel.Dock="Top">
             <Grid.RowDefinitions>
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
index b72528c9..65e48559 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -125,38 +125,33 @@
             </ToolBar>
         </ToolBarTray>
 
-        <Grid
+        <StackPanel
             Margin="8"
-            HorizontalAlignment="Center"
-            DockPanel.Dock="Bottom">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="600" />
-                <ColumnDefinition Width="150" />
-                <ColumnDefinition Width="150" />
-            </Grid.ColumnDefinitions>
+            HorizontalAlignment="Right"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
             <StackPanel
-                Grid.Column="0"
+                Width="600"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center">
                 <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.TbRoutingTips}" />
             </StackPanel>
             <Button
                 x:Name="btnSave"
-                Grid.Column="1"
-                Margin="4"
+                Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
-                Grid.Column="2"
-                Margin="4"
+                Width="100"
+                Margin="8,0"
                 Click="btnCancel_Click"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
-        </Grid>
+        </StackPanel>
 
         <DockPanel>
             <TabControl x:Name="tabAdvanced">
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index 6c972dbb..ef22c501 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -1,12 +1,12 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.SubEditWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuSubSetting}"
@@ -31,27 +31,26 @@
         </ResourceDictionary>
     </Window.Resources>
     <DockPanel Margin="8">
-        <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="150" />
-                <ColumnDefinition Width="150" />
-            </Grid.ColumnDefinitions>
+        <StackPanel
+            Margin="4"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
             <Button
                 x:Name="btnSave"
-                Grid.Column="0"
-                Margin="4"
+                Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
-                Grid.Column="1"
-                Margin="4"
+                Width="100"
+                Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
-        </Grid>
+        </StackPanel>
         <ScrollViewer
             materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
             HorizontalScrollBarVisibility="Auto"

From 9b579be2be05501a031d8a3b940f790b2ec54330 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 31 Jan 2024 09:56:47 +0800
Subject: [PATCH 47/62] Try to remove the tun device when turning on

---
 v2rayN/v2rayN/Common/Utils.cs        | 375 ++++++++++++++-------------
 v2rayN/v2rayN/Handler/CoreHandler.cs |   6 +-
 2 files changed, 198 insertions(+), 183 deletions(-)

diff --git a/v2rayN/v2rayN/Common/Utils.cs b/v2rayN/v2rayN/Common/Utils.cs
index 79b91be6..c0df6c8d 100644
--- a/v2rayN/v2rayN/Common/Utils.cs
+++ b/v2rayN/v2rayN/Common/Utils.cs
@@ -512,187 +512,6 @@ namespace v2rayN
 
         #endregion 数据检查
 
-        #region 开机自动启动
-
-        /// <summary>
-        /// 开机自动启动
-        /// </summary>
-        /// <param name="run"></param>
-        /// <returns></returns>
-        public static void SetAutoRun(string AutoRunRegPath, string AutoRunName, bool run)
-        {
-            try
-            {
-                var autoRunName = $"{AutoRunName}_{GetMD5(StartupPath())}";
-
-                //delete first
-                RegWriteValue(AutoRunRegPath, autoRunName, "");
-                if (IsAdministrator())
-                {
-                    AutoStart(autoRunName, "", "");
-                }
-
-                if (run)
-                {
-                    string exePath = $"\"{GetExePath()}\"";
-                    if (IsAdministrator())
-                    {
-                        AutoStart(autoRunName, exePath, "");
-                    }
-                    else
-                    {
-                        RegWriteValue(AutoRunRegPath, autoRunName, exePath);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-        }
-
-        /// <summary>
-        /// 获取启动了应用程序的可执行文件的路径
-        /// </summary>
-        /// <returns></returns>
-        public static string GetPath(string fileName)
-        {
-            string startupPath = StartupPath();
-            if (IsNullOrEmpty(fileName))
-            {
-                return startupPath;
-            }
-            return Path.Combine(startupPath, fileName);
-        }
-
-        /// <summary>
-        /// 获取启动了应用程序的可执行文件的路径及文件名
-        /// </summary>
-        /// <returns></returns>
-        public static string GetExePath()
-        {
-            return Environment.ProcessPath ?? string.Empty;
-        }
-
-        public static string StartupPath()
-        {
-            return AppDomain.CurrentDomain.BaseDirectory;
-        }
-
-        public static string? RegReadValue(string path, string name, string def)
-        {
-            RegistryKey? regKey = null;
-            try
-            {
-                regKey = Registry.CurrentUser.OpenSubKey(path, false);
-                string? value = regKey?.GetValue(name) as string;
-                if (IsNullOrEmpty(value))
-                {
-                    return def;
-                }
-                else
-                {
-                    return value;
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            finally
-            {
-                regKey?.Close();
-            }
-            return def;
-        }
-
-        public static void RegWriteValue(string path, string name, object value)
-        {
-            RegistryKey? regKey = null;
-            try
-            {
-                regKey = Registry.CurrentUser.CreateSubKey(path);
-                if (IsNullOrEmpty(value.ToString()))
-                {
-                    regKey?.DeleteValue(name, false);
-                }
-                else
-                {
-                    regKey?.SetValue(name, value);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            finally
-            {
-                regKey?.Close();
-            }
-        }
-
-        /// <summary>
-        /// 判断.Net Framework的Release是否符合
-        /// (.Net Framework 版本在4.0及以上)
-        /// </summary>
-        /// <param name="release">需要的版本4.6.2=394802;4.8=528040</param>
-        /// <returns></returns>
-        public static bool CheckForDotNetVersion(int release = 528040)
-        {
-            const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
-            using RegistryKey? ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey);
-            if (ndpKey?.GetValue("Release") != null)
-            {
-                return (int)ndpKey.GetValue("Release") >= release;
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Auto Start via TaskService
-        /// </summary>
-        /// <param name="taskName"></param>
-        /// <param name="fileName"></param>
-        /// <param name="description"></param>
-        /// <exception cref="ArgumentNullException"></exception>
-        public static void AutoStart(string taskName, string fileName, string description)
-        {
-            if (string.IsNullOrEmpty(taskName))
-            {
-                return;
-            }
-            string TaskName = taskName;
-            var logonUser = WindowsIdentity.GetCurrent().Name;
-            string taskDescription = description;
-            string deamonFileName = fileName;
-
-            using var taskService = new TaskService();
-            var tasks = taskService.RootFolder.GetTasks(new Regex(TaskName));
-            foreach (var t in tasks)
-            {
-                taskService.RootFolder.DeleteTask(t.Name);
-            }
-            if (string.IsNullOrEmpty(fileName))
-            {
-                return;
-            }
-
-            var task = taskService.NewTask();
-            task.RegistrationInfo.Description = taskDescription;
-            task.Settings.DisallowStartIfOnBatteries = false;
-            task.Settings.StopIfGoingOnBatteries = false;
-            task.Settings.RunOnlyIfIdle = false;
-            task.Settings.IdleSettings.StopOnIdleEnd = false;
-            task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
-            task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(10) });
-            task.Principal.RunLevel = TaskRunLevel.Highest;
-            task.Actions.Add(new ExecAction(deamonFileName));
-
-            taskService.RootFolder.RegisterTaskDefinition(TaskName, task);
-        }
-
-        #endregion 开机自动启动
-
         #region 测速
 
         /// <summary>
@@ -962,7 +781,34 @@ namespace v2rayN
 
         #region TempPath
 
-        // return path to store temporary files
+        /// <summary>
+        /// 获取启动了应用程序的可执行文件的路径
+        /// </summary>
+        /// <returns></returns>
+        public static string GetPath(string fileName)
+        {
+            string startupPath = StartupPath();
+            if (IsNullOrEmpty(fileName))
+            {
+                return startupPath;
+            }
+            return Path.Combine(startupPath, fileName);
+        }
+
+        /// <summary>
+        /// 获取启动了应用程序的可执行文件的路径及文件名
+        /// </summary>
+        /// <returns></returns>
+        public static string GetExePath()
+        {
+            return Environment.ProcessPath ?? string.Empty;
+        }
+
+        public static string StartupPath()
+        {
+            return AppDomain.CurrentDomain.BaseDirectory;
+        }
+
         public static string GetTempPath(string filename = "")
         {
             string _tempPath = Path.Combine(StartupPath(), "guiTemps");
@@ -1137,6 +983,171 @@ namespace v2rayN
 
         #endregion scan screen
 
+        #region 开机自动启动等
+
+        /// <summary>
+        /// 开机自动启动
+        /// </summary>
+        /// <param name="run"></param>
+        /// <returns></returns>
+        public static void SetAutoRun(string AutoRunRegPath, string AutoRunName, bool run)
+        {
+            try
+            {
+                var autoRunName = $"{AutoRunName}_{GetMD5(StartupPath())}";
+
+                //delete first
+                RegWriteValue(AutoRunRegPath, autoRunName, "");
+                if (IsAdministrator())
+                {
+                    AutoStart(autoRunName, "", "");
+                }
+
+                if (run)
+                {
+                    string exePath = $"\"{GetExePath()}\"";
+                    if (IsAdministrator())
+                    {
+                        AutoStart(autoRunName, exePath, "");
+                    }
+                    else
+                    {
+                        RegWriteValue(AutoRunRegPath, autoRunName, exePath);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public static string? RegReadValue(string path, string name, string def)
+        {
+            RegistryKey? regKey = null;
+            try
+            {
+                regKey = Registry.CurrentUser.OpenSubKey(path, false);
+                string? value = regKey?.GetValue(name) as string;
+                if (IsNullOrEmpty(value))
+                {
+                    return def;
+                }
+                else
+                {
+                    return value;
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            finally
+            {
+                regKey?.Close();
+            }
+            return def;
+        }
+
+        public static void RegWriteValue(string path, string name, object value)
+        {
+            RegistryKey? regKey = null;
+            try
+            {
+                regKey = Registry.CurrentUser.CreateSubKey(path);
+                if (IsNullOrEmpty(value.ToString()))
+                {
+                    regKey?.DeleteValue(name, false);
+                }
+                else
+                {
+                    regKey?.SetValue(name, value);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            finally
+            {
+                regKey?.Close();
+            }
+        }
+
+        /// <summary>
+        /// Auto Start via TaskService
+        /// </summary>
+        /// <param name="taskName"></param>
+        /// <param name="fileName"></param>
+        /// <param name="description"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public static void AutoStart(string taskName, string fileName, string description)
+        {
+            if (string.IsNullOrEmpty(taskName))
+            {
+                return;
+            }
+            string TaskName = taskName;
+            var logonUser = WindowsIdentity.GetCurrent().Name;
+            string taskDescription = description;
+            string deamonFileName = fileName;
+
+            using var taskService = new TaskService();
+            var tasks = taskService.RootFolder.GetTasks(new Regex(TaskName));
+            foreach (var t in tasks)
+            {
+                taskService.RootFolder.DeleteTask(t.Name);
+            }
+            if (string.IsNullOrEmpty(fileName))
+            {
+                return;
+            }
+
+            var task = taskService.NewTask();
+            task.RegistrationInfo.Description = taskDescription;
+            task.Settings.DisallowStartIfOnBatteries = false;
+            task.Settings.StopIfGoingOnBatteries = false;
+            task.Settings.RunOnlyIfIdle = false;
+            task.Settings.IdleSettings.StopOnIdleEnd = false;
+            task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
+            task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(10) });
+            task.Principal.RunLevel = TaskRunLevel.Highest;
+            task.Actions.Add(new ExecAction(deamonFileName));
+
+            taskService.RootFolder.RegisterTaskDefinition(TaskName, task);
+        }
+
+        public static void RemoveTunDevice()
+        {
+            try
+            {
+                string pnputilPath = @"C:\Windows\System32\pnputil.exe";
+                string arg = $" /remove-device /deviceid \"wintun\"";
+
+                // Try to remove the device
+                Process proc = new()
+                {
+                    StartInfo = new()
+                    {
+                        FileName = pnputilPath,
+                        Arguments = arg,
+                        RedirectStandardOutput = true,
+                        UseShellExecute = false,
+                        CreateNoWindow = true
+                    }
+                };
+
+                proc.Start();
+                var output = proc.StandardOutput.ReadToEnd();
+                proc.WaitForExit();
+            }
+            catch
+            {
+            }
+        }
+
+        #endregion 开机自动启动等
+
         #region Windows API
 
         [Flags]
diff --git a/v2rayN/v2rayN/Handler/CoreHandler.cs b/v2rayN/v2rayN/Handler/CoreHandler.cs
index bbd8cd2e..b7fa62b4 100644
--- a/v2rayN/v2rayN/Handler/CoreHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreHandler.cs
@@ -45,10 +45,10 @@ namespace v2rayN.Handler
                 ShowMsg(false, msg);
                 ShowMsg(true, $"{node.GetSummary()}");
                 CoreStop();
-
                 if (_config.tunModeItem.enableTun)
                 {
                     Thread.Sleep(1000);
+                    Utils.RemoveTunDevice();
                 }
 
                 CoreStart(node);
@@ -154,6 +154,8 @@ namespace v2rayN.Handler
             }
         }
 
+        #region Private
+
         private string CoreFindexe(CoreInfo coreInfo)
         {
             string fileName = string.Empty;
@@ -255,6 +257,8 @@ namespace v2rayN.Handler
             _updateFunc(updateToTrayTooltip, msg);
         }
 
+        #endregion Private
+
         #region Process
 
         private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog, Action<bool, string> update)

From f76b1a5363b85d422991e3af3f260c4bfcc85b99 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 31 Jan 2024 10:16:21 +0800
Subject: [PATCH 48/62] Add editing subscription in the main interface

---
 .../v2rayN/ViewModels/MainWindowViewModel.cs  | 23 ++++++++++++++++---
 v2rayN/v2rayN/Views/MainWindow.xaml           | 12 +++++++++-
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        |  1 +
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index a0935c36..299fc9e3 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -128,6 +128,7 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> SubSettingCmd { get; }
 
         public ReactiveCommand<Unit, Unit> AddSubCmd { get; }
+        public ReactiveCommand<Unit, Unit> EditSubCmd { get; }
         public ReactiveCommand<Unit, Unit> SubUpdateCmd { get; }
         public ReactiveCommand<Unit, Unit> SubUpdateViaProxyCmd { get; }
         public ReactiveCommand<Unit, Unit> SubGroupUpdateCmd { get; }
@@ -453,7 +454,11 @@ namespace v2rayN.ViewModels
             });
             AddSubCmd = ReactiveCommand.Create(() =>
             {
-                AddSub();
+                EditSub(true);
+            });
+            EditSubCmd = ReactiveCommand.Create(() =>
+            {
+                EditSub(false);
             });
             SubUpdateCmd = ReactiveCommand.Create(() =>
             {
@@ -1329,9 +1334,21 @@ namespace v2rayN.ViewModels
             }
         }
 
-        private void AddSub()
+        private void EditSub(bool blNew)
         {
-            SubItem item = new();
+            SubItem item;
+            if (blNew)
+            {
+                item = new();
+            }
+            else
+            {
+                item = LazyConfig.Instance.GetSubItem(_subId);
+                if (item is null)
+                {
+                    return;
+                }
+            }
             var ret = (new SubEditWindow(item)).ShowDialog();
             if (ret == true)
             {
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 71e3eb72..faf41410 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -407,6 +407,15 @@
                             </DataTemplate>
                         </ListBox.ItemTemplate>
                     </ListBox>
+
+                    <Button
+                        x:Name="btnEditSub"
+                        Width="30"
+                        Height="30"
+                        Margin="4,0"
+                        Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
+                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="Edit" />
+                    </Button>
                     <Button
                         x:Name="btnAddSub"
                         Width="30"
@@ -415,11 +424,12 @@
                         Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
                         <materialDesign:PackIcon VerticalAlignment="Center" Kind="Plus" />
                     </Button>
+
                     <Button
                         x:Name="btnAutofitColumnWidth"
                         Width="30"
                         Height="30"
-                        Margin="4,0"
+                        Margin="20,0"
                         Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
                         <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
                     </Button>
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index e5745e8b..a5617b09 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -79,6 +79,7 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.SelectedSub, v => v.lstGroup.SelectedItem).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.ServerFilter, v => v.txtServerFilter.Text).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddSubCmd, v => v.btnAddSub).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.EditSubCmd, v => v.btnEditSub).DisposeWith(disposables);
 
                 //servers
                 this.BindCommand(ViewModel, vm => vm.AddVmessServerCmd, v => v.menuAddVmessServer).DisposeWith(disposables);

From 57d9d8ddb9d41652f05de57e13d79152e6ccfa8e Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 1 Feb 2024 12:44:47 +0800
Subject: [PATCH 49/62] Improve

---
 .../v2rayN/ViewModels/MainWindowViewModel.cs  | 24 +++++++++++--------
 .../Views/RoutingRuleSettingWindow.xaml       |  1 -
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index 299fc9e3..da9a3747 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -259,8 +259,6 @@ namespace v2rayN.ViewModels
             Locator.CurrentMutable.RegisterLazySingleton(() => new NoticeHandler(snackbarMessageQueue), typeof(NoticeHandler));
             _noticeHandler = Locator.Current.GetService<NoticeHandler>();
             _config = LazyConfig.Instance.GetConfig();
-            //ThreadPool.RegisterWaitForSingleObject(App.ProgramStarted, OnProgramStarted, null, -1, false);
-            Init();
 
             SelectedProfile = new();
             SelectedSub = new();
@@ -273,9 +271,11 @@ namespace v2rayN.ViewModels
             }
             _subId = _config.subIndexId;
 
-            InitSubscriptionView();
-            RefreshRoutingsMenu();
-            RefreshServers();
+            Init();
+            BindingUI();
+            RestoreUI();
+
+            #region WhenAnyValue && ReactiveCommand
 
             var canEditRemove = this.WhenAnyValue(
                x => x.SelectedProfile,
@@ -316,10 +316,6 @@ namespace v2rayN.ViewModels
                y => y == true)
                   .Subscribe(c => DoEnableTun(c));
 
-            BindingUI();
-            RestoreUI();
-            AutoHideStartup();
-
             //servers
             AddVmessServerCmd = ReactiveCommand.Create(() =>
             {
@@ -573,6 +569,10 @@ namespace v2rayN.ViewModels
                 SetListenerType(ESysProxyType.Pac);
             });
 
+            #endregion WhenAnyValue && ReactiveCommand
+
+            AutoHideStartup();
+
             Global.ShowInTaskbar = true;
         }
 
@@ -591,6 +591,10 @@ namespace v2rayN.ViewModels
             MainFormHandler.Instance.UpdateTask(_config, UpdateTaskHandler);
             MainFormHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, UpdateTaskHandler);
 
+            InitSubscriptionView();
+            RefreshRoutingsMenu();
+            RefreshServers();
+
             Reload();
             ChangeSystemProxyStatus(_config.sysProxyType, true);
         }
@@ -1864,7 +1868,7 @@ namespace v2rayN.ViewModels
             if (_config.uiItem.autoHideStartup)
             {
                 Observable.Range(1, 1)
-                 .Delay(TimeSpan.FromSeconds(0.5))
+                 .Delay(TimeSpan.FromSeconds(1))
                  .Subscribe(x =>
                  {
                      Application.Current.Dispatcher.Invoke(() =>
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
index a869b762..0332cac0 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -193,7 +193,6 @@
                 x:Name="btnBrowse"
                 Grid.Row="3"
                 Grid.Column="2"
-                Width="100"
                 Margin="2,0,8,0"
                 Click="btnBrowse_Click"
                 Content="{x:Static resx:ResUI.TbBrowse}"

From e1cadc878ab749bc73a79c5ae50609b9d09e36c7 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 2 Feb 2024 10:21:13 +0800
Subject: [PATCH 50/62]  Improve VmessQRCode json

---
 v2rayN/v2rayN/Handler/ShareHandler.cs |  6 +--
 v2rayN/v2rayN/Mode/VmessQRCode.cs     | 58 +++++----------------------
 2 files changed, 12 insertions(+), 52 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
index d68895d8..aa66eb5a 100644
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -48,12 +48,12 @@ namespace v2rayN.Handler
 
             VmessQRCode vmessQRCode = new()
             {
-                v = item.configVersion.ToString(),
+                v = item.configVersion,
                 ps = item.remarks.TrimEx(),
                 add = item.address,
-                port = item.port.ToString(),
+                port = item.port,
                 id = item.id,
-                aid = item.alterId.ToString(),
+                aid = item.alterId,
                 scy = item.security,
                 net = item.network,
                 type = item.headerType,
diff --git a/v2rayN/v2rayN/Mode/VmessQRCode.cs b/v2rayN/v2rayN/Mode/VmessQRCode.cs
index fec376d9..89697b59 100644
--- a/v2rayN/v2rayN/Mode/VmessQRCode.cs
+++ b/v2rayN/v2rayN/Mode/VmessQRCode.cs
@@ -1,4 +1,6 @@
-namespace v2rayN.Mode
+using System.Text.Json.Serialization;
+
+namespace v2rayN.Mode
 {
     /// <summary>
     /// https://github.com/2dust/v2rayN/wiki/
@@ -6,79 +8,37 @@
     [Serializable]
     internal class VmessQRCode
     {
-        /// <summary>
-        ///
-        /// </summary>
-        public string v { get; set; } = string.Empty;
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+        public int v { get; set; } = 2;
 
-        /// <summary>
-        ///
-        /// </summary>
         public string ps { get; set; } = string.Empty;
 
-        /// <summary>
-        ///
-        /// </summary>
         public string add { get; set; } = string.Empty;
 
-        /// <summary>
-        ///
-        /// </summary>
-        public string port { get; set; } = string.Empty;
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+        public int port { get; set; } = 0;
 
-        /// <summary>
-        ///
-        /// </summary>
         public string id { get; set; } = string.Empty;
 
-        /// <summary>
-        ///
-        /// </summary>
-        public string aid { get; set; } = string.Empty;
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+        public int aid { get; set; } = 0;
 
-        /// <summary>
-        ///
-        /// </summary>
         public string scy { get; set; } = string.Empty;
 
-        /// <summary>
-        ///
-        /// </summary>
         public string net { get; set; } = string.Empty;
 
-        /// <summary>
-        ///
-        /// </summary>
         public string type { get; set; } = string.Empty;
 
-        /// <summary>
-        ///
-        /// </summary>
         public string host { get; set; } = string.Empty;
 
-        /// <summary>
-        ///
-        /// </summary>
         public string path { get; set; } = string.Empty;
 
-        /// <summary>
-        /// TLS
-        /// </summary>
         public string tls { get; set; } = string.Empty;
 
-        /// <summary>
-        /// TLS SNI
-        /// </summary>
         public string sni { get; set; } = string.Empty;
 
-        /// <summary>
-        /// TLS alpn
-        /// </summary>
         public string alpn { get; set; } = string.Empty;
 
-        /// <summary>
-        /// TLS fingerprint
-        /// </summary>
         public string fp { get; set; } = string.Empty;
     }
 }
\ No newline at end of file

From ff215bc9aa29fa65a253b8ba7a86895445d2a913 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 2 Feb 2024 10:39:07 +0800
Subject: [PATCH 51/62] Remove ping test

---
 v2rayN/v2rayN/Handler/SpeedtestHandler.cs     | 102 +++++-------------
 v2rayN/v2rayN/Mode/ESpeedActionType.cs        |   1 -
 v2rayN/v2rayN/Resx/ResUI.Designer.cs          |   9 --
 v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx           |   3 -
 v2rayN/v2rayN/Resx/ResUI.resx                 |   3 -
 v2rayN/v2rayN/Resx/ResUI.ru.resx              |   5 +-
 v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx         |   3 -
 v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx         |   3 -
 .../v2rayN/ViewModels/MainWindowViewModel.cs  |   5 -
 v2rayN/v2rayN/Views/MainWindow.xaml           |   4 -
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        |   5 -
 11 files changed, 27 insertions(+), 116 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
index ba0c39bb..e4b660d0 100644
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Net;
-using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -9,7 +8,7 @@ namespace v2rayN.Handler
 {
     internal class SpeedtestHandler
     {
-        private Config _config;
+        private Config? _config;
         private CoreHandler _coreHandler;
         private List<ServerTestItem> _selecteds;
         private ESpeedActionType _actionType;
@@ -51,7 +50,6 @@ namespace v2rayN.Handler
             {
                 switch (actionType)
                 {
-                    case ESpeedActionType.Ping:
                     case ESpeedActionType.Tcping:
                     case ESpeedActionType.Realping:
                         UpdateFunc(it.indexId, ResUI.Speedtesting, "");
@@ -73,10 +71,6 @@ namespace v2rayN.Handler
 
             switch (actionType)
             {
-                case ESpeedActionType.Ping:
-                    Task.Run(RunPing);
-                    break;
-
                 case ESpeedActionType.Tcping:
                     Task.Run(RunTcping);
                     break;
@@ -95,52 +89,45 @@ namespace v2rayN.Handler
             }
         }
 
-        private async Task RunPingSubAsync(Action<ServerTestItem> updateFun)
+        private Task RunTcping()
         {
             try
             {
-                foreach (var it in _selecteds.Where(it => it.configType != EConfigType.Custom))
+                List<Task> tasks = [];
+                foreach (var it in _selecteds)
                 {
-                    try
+                    if (it.configType == EConfigType.Custom)
                     {
-                        _ = Task.Run(() => updateFun(it));
+                        continue;
                     }
-                    catch (Exception ex)
+                    tasks.Add(Task.Run(() =>
                     {
-                        Logging.SaveLog(ex.Message, ex);
-                    }
-                }
+                        try
+                        {
+                            int time = GetTcpingTime(it.address, it.port);
+                            var output = FormatOut(time, Global.DelayUnit);
 
-                await Task.Delay(10);
+                            ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
+                            UpdateFunc(it.indexId, output);
+                        }
+                        catch (Exception ex)
+                        {
+                            Logging.SaveLog(ex.Message, ex);
+                        }
+                    }));
+                }
+                Task.WaitAll([.. tasks]);
             }
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
             }
-        }
-
-        private async void RunPing()
-        {
-            await RunPingSubAsync((ServerTestItem it) =>
-             {
-                 long time = Ping(it.address);
-                 var output = FormatOut(time, Global.DelayUnit);
-
-                 ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
-                 UpdateFunc(it.indexId, output);
-             });
-        }
-
-        private async void RunTcping()
-        {
-            await RunPingSubAsync((ServerTestItem it) =>
+            finally
             {
-                int time = GetTcpingTime(it.address, it.port);
-                var output = FormatOut(time, Global.DelayUnit);
+                ProfileExHandler.Instance.SaveTo();
+            }
 
-                ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
-                UpdateFunc(it.indexId, output);
-            });
+            return Task.CompletedTask;
         }
 
         private Task RunRealPing()
@@ -336,7 +323,7 @@ namespace v2rayN.Handler
             await RunSpeedTestMulti();
         }
 
-        public async Task<string> GetRealPingTime(DownloadHandle downloadHandle, IWebProxy webProxy)
+        private async Task<string> GetRealPingTime(DownloadHandle downloadHandle, IWebProxy webProxy)
         {
             int responseTime = await downloadHandle.GetRealPingTime(_config.speedTestItem.speedPingTestUrl, webProxy, 10);
             //string output = Utils.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : status;
@@ -376,43 +363,6 @@ namespace v2rayN.Handler
             return responseTime;
         }
 
-        /// <summary>
-        /// Ping
-        /// </summary>
-        /// <param name="host"></param>
-        /// <returns></returns>
-        public long Ping(string host)
-        {
-            long roundtripTime = -1;
-            try
-            {
-                int timeout = 30;
-                int echoNum = 2;
-                using Ping pingSender = new();
-                for (int i = 0; i < echoNum; i++)
-                {
-                    PingReply reply = pingSender.Send(host, timeout);
-                    if (reply.Status == IPStatus.Success)
-                    {
-                        if (reply.RoundtripTime < 0)
-                        {
-                            continue;
-                        }
-                        if (roundtripTime < 0 || reply.RoundtripTime < roundtripTime)
-                        {
-                            roundtripTime = reply.RoundtripTime;
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-                return -1;
-            }
-            return roundtripTime;
-        }
-
         private string FormatOut(object time, string unit)
         {
             //if (time.ToString().Equals("-1"))
diff --git a/v2rayN/v2rayN/Mode/ESpeedActionType.cs b/v2rayN/v2rayN/Mode/ESpeedActionType.cs
index 4864061b..c8068f78 100644
--- a/v2rayN/v2rayN/Mode/ESpeedActionType.cs
+++ b/v2rayN/v2rayN/Mode/ESpeedActionType.cs
@@ -2,7 +2,6 @@
 {
     public enum ESpeedActionType
     {
-        Ping,
         Tcping,
         Realping,
         Speedtest,
diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index 1e749021..9c4abe99 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -969,15 +969,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Test servers ping (Ctrl+P) 的本地化字符串。
-        /// </summary>
-        public static string menuPingServer {
-            get {
-                return ResourceManager.GetString("menuPingServer", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Promotion 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx b/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx
index e0d7993c..4f4202d8 100644
--- a/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx
@@ -529,9 +529,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>تمام آمار خدمات را پاک کنید</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>تست پینگ سرورها (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>آزمایش سرورها با تاخیر واقعی (Ctrl+R)</value>
   </data>
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index 8de9d591..60614513 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -532,9 +532,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>Clear all service statistics</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>Test servers ping (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>Test servers real delay (Ctrl+R)</value>
   </data>
diff --git a/v2rayN/v2rayN/Resx/ResUI.ru.resx b/v2rayN/v2rayN/Resx/ResUI.ru.resx
index c1b3c928..1dcfded4 100644
--- a/v2rayN/v2rayN/Resx/ResUI.ru.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.ru.resx
@@ -532,9 +532,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>Очистить всю статистику</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>Тест на задержку сервера (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>Тест на реальную задержку сервера (Ctrl+R)</value>
   </data>
@@ -1072,4 +1069,4 @@
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
     <value>URL спидтеста</value>
   </data>
-</root>
+</root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index d98faff9..214d1675 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -532,9 +532,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>清除所有服务统计数据</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>测试服务器延迟Ping(多选) (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>测试服务器真连接延迟(多选) (Ctrl+R)</value>
   </data>
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
index 1e40e8e7..34c66557 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
@@ -531,9 +531,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>清除所有服務統計資料</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>測試伺服器延遲Ping(多選) (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>測試伺服器真連接延遲(多選) (Ctrl+R)</value>
   </data>
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index da9a3747..289830f3 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -112,7 +112,6 @@ namespace v2rayN.ViewModels
         //servers ping
         public ReactiveCommand<Unit, Unit> MixedTestServerCmd { get; }
 
-        public ReactiveCommand<Unit, Unit> PingServerCmd { get; }
         public ReactiveCommand<Unit, Unit> TcpingServerCmd { get; }
         public ReactiveCommand<Unit, Unit> RealPingServerCmd { get; }
         public ReactiveCommand<Unit, Unit> SpeedServerCmd { get; }
@@ -409,10 +408,6 @@ namespace v2rayN.ViewModels
             {
                 ServerSpeedtest(ESpeedActionType.Mixedtest);
             });
-            PingServerCmd = ReactiveCommand.Create(() =>
-            {
-                ServerSpeedtest(ESpeedActionType.Ping);
-            }, canEditRemove);
             TcpingServerCmd = ReactiveCommand.Create(() =>
             {
                 ServerSpeedtest(ESpeedActionType.Tcping);
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index faf41410..ecaa9416 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -581,10 +581,6 @@
                                     x:Name="menuMixedTestServer"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuMixedTestServer}" />
-                                <MenuItem
-                                    x:Name="menuPingServer"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuPingServer}" />
                                 <MenuItem
                                     x:Name="menuTcpingServer"
                                     Height="{StaticResource MenuItemHeight}"
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index a5617b09..fa328075 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -113,7 +113,6 @@ namespace v2rayN.Views
 
                 //servers ping
                 this.BindCommand(ViewModel, vm => vm.MixedTestServerCmd, v => v.menuMixedTestServer).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.PingServerCmd, v => v.menuPingServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.TcpingServerCmd, v => v.menuTcpingServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.RealPingServerCmd, v => v.menuRealPingServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SpeedServerCmd, v => v.menuSpeedServer).DisposeWith(disposables);
@@ -330,10 +329,6 @@ namespace v2rayN.Views
                         ViewModel?.AddServerViaClipboard();
                         break;
 
-                    case Key.P:
-                        ViewModel?.ServerSpeedtest(ESpeedActionType.Ping);
-                        break;
-
                     case Key.O:
                         ViewModel?.ServerSpeedtest(ESpeedActionType.Tcping);
                         break;

From 4d0ee652d8b61a77e3c708ec6d0b1484b068e7f8 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 3 Feb 2024 10:26:37 +0800
Subject: [PATCH 52/62] Bug fix

---
 v2rayN/v2rayN/Mode/V2rayConfig.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/v2rayN/v2rayN/Mode/V2rayConfig.cs b/v2rayN/v2rayN/Mode/V2rayConfig.cs
index 957af112..9f1d7050 100644
--- a/v2rayN/v2rayN/Mode/V2rayConfig.cs
+++ b/v2rayN/v2rayN/Mode/V2rayConfig.cs
@@ -3,8 +3,7 @@
 namespace v2rayN.Mode
 {
     /// <summary>
-    /// v2ray配置文件实体类
-    /// 例子SampleConfig.txt
+    /// v2ray配置文件实体类 例子SampleConfig.txt
     /// </summary>
     public class V2rayConfig
     {
@@ -32,7 +31,7 @@ namespace v2rayN.Mode
         public API4Ray api { get; set; }
 
         /// </summary>
-        public Policy4Ray policy;
+        public Policy4Ray policy { get; set; }
 
         /// <summary>
         /// DNS 配置
@@ -56,13 +55,13 @@ namespace v2rayN.Mode
 
     public class Policy4Ray
     {
-        public SystemPolicy4Ray system;
+        public SystemPolicy4Ray system { get; set; }
     }
 
     public class SystemPolicy4Ray
     {
-        public bool statsOutboundUplink;
-        public bool statsOutboundDownlink;
+        public bool statsOutboundUplink { get; set; }
+        public bool statsOutboundDownlink { get; set; }
     }
 
     public class Log4Ray

From 1fa2d55e1df03a2c8c917208c031c03c937bc1c1 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 3 Feb 2024 10:27:40 +0800
Subject: [PATCH 53/62] Up PackageReference

---
 v2rayN/PacLib/PacLib.csproj       | 2 +-
 v2rayN/ProtosLib/ProtosLib.csproj | 4 ++--
 v2rayN/v2rayN/v2rayN.csproj       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/v2rayN/PacLib/PacLib.csproj b/v2rayN/PacLib/PacLib.csproj
index 606c62e5..feb6e55d 100644
--- a/v2rayN/PacLib/PacLib.csproj
+++ b/v2rayN/PacLib/PacLib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
diff --git a/v2rayN/ProtosLib/ProtosLib.csproj b/v2rayN/ProtosLib/ProtosLib.csproj
index 6c1f9c2e..74f5428d 100644
--- a/v2rayN/ProtosLib/ProtosLib.csproj
+++ b/v2rayN/ProtosLib/ProtosLib.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>	  
   </PropertyGroup>
 	
@@ -11,7 +11,7 @@
 	<ItemGroup>
 		<PackageReference Include="Google.Protobuf" Version="3.25.2" />
 		<PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.60.0">
+		<PackageReference Include="Grpc.Tools" Version="2.61.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index cb3e275c..88b75cd9 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -22,9 +22,9 @@
 		<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
 		<PackageReference Include="TaskScheduler" Version="2.10.1" /> 
 		<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
-		<PackageReference Include="ReactiveUI.Fody" Version="19.5.39" />
+		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
 		<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
-		<PackageReference Include="ReactiveUI.WPF" Version="19.5.39" />
+		<PackageReference Include="ReactiveUI.WPF" Version="19.5.41" />
 		<PackageReference Include="Splat.NLog" Version="14.8.12" />
 		<PackageReference Include="System.Reactive" Version="6.0.0" />
 	</ItemGroup>

From 52e9d30b46c9ad94b8c8c866a922568a46a5c2e9 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 4 Feb 2024 10:02:02 +0800
Subject: [PATCH 54/62] Improve

---
 v2rayN/v2rayN/Views/SubEditWindow.xaml | 97 +++++++++++++-------------
 1 file changed, 48 insertions(+), 49 deletions(-)

diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index ef22c501..37a6bc59 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -72,7 +72,7 @@
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="400" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
 
@@ -95,7 +95,6 @@
                     x:Name="txtRemarks"
                     Grid.Row="1"
                     Grid.Column="1"
-                    Width="400"
                     Margin="4"
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
@@ -113,7 +112,6 @@
                     x:Name="txtUrl"
                     Grid.Row="2"
                     Grid.Column="1"
-                    Width="400"
                     Margin="4"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
@@ -153,61 +151,46 @@
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvEnabled}" />
-                <ToggleButton
-                    x:Name="togEnable"
+
+                <DockPanel
                     Grid.Row="3"
                     Grid.Column="1"
-                    Margin="4"
-                    HorizontalAlignment="Left" />
+                    Margin="4">
+                    <ToggleButton
+                        x:Name="togEnable"
+                        Margin="4"
+                        HorizontalAlignment="Left"
+                        DockPanel.Dock="Left" />
 
-                <TextBlock
-                    Grid.Row="4"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.LvAutoUpdateInterval}" />
-                <TextBox
-                    x:Name="txtAutoUpdateInterval"
-                    Grid.Row="4"
-                    Grid.Column="1"
-                    Width="400"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
-                    AcceptsReturn="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
+                    <TextBox
+                        x:Name="txtAutoUpdateInterval"
+                        Width="200"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
+                        AcceptsReturn="True"
+                        DockPanel.Dock="Right"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+
+                    <TextBlock
+                        Margin="4"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.LvAutoUpdateInterval}" />
+                </DockPanel>
 
                 <TextBlock
                     Grid.Row="5"
                     Grid.Column="0"
                     Margin="4"
                     VerticalAlignment="Center"
-                    Text="{x:Static resx:ResUI.LvUserAgent}" />
-                <TextBox
-                    x:Name="txtUserAgent"
-                    Grid.Row="5"
-                    Grid.Column="1"
-                    Width="400"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
-                    AcceptsReturn="True"
-                    Style="{StaticResource MyOutlinedTextBox}"
-                    TextWrapping="Wrap" />
-
-                <TextBlock
-                    Grid.Row="6"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvFilter}" />
                 <TextBox
                     x:Name="txtFilter"
-                    Grid.Row="6"
+                    Grid.Row="5"
                     Grid.Column="1"
-                    Width="400"
                     Margin="4"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
@@ -215,7 +198,7 @@
                     Style="{StaticResource MyOutlinedTextBox}" />
 
                 <TextBlock
-                    Grid.Row="7"
+                    Grid.Row="6"
                     Grid.Column="0"
                     Margin="4"
                     VerticalAlignment="Center"
@@ -223,13 +206,30 @@
                     Text="{x:Static resx:ResUI.LvConvertTarget}" />
                 <ComboBox
                     x:Name="cmbConvertTarget"
-                    Grid.Row="7"
+                    Grid.Row="6"
                     Grid.Column="1"
                     Margin="4"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvConvertTargetTip}"
                     MaxDropDownHeight="1000"
                     Style="{StaticResource MyOutlinedTextComboBox}" />
 
+                <TextBlock
+                    Grid.Row="7"
+                    Grid.Column="0"
+                    Margin="4"
+                    VerticalAlignment="Center"
+                    Text="{x:Static resx:ResUI.LvUserAgent}" />
+                <TextBox
+                    x:Name="txtUserAgent"
+                    Grid.Row="7"
+                    Grid.Column="1"
+                    Margin="4"
+                    VerticalAlignment="Top"
+                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
+                    AcceptsReturn="True"
+                    Style="{StaticResource MyOutlinedTextBox}"
+                    TextWrapping="Wrap" />
+
                 <TextBlock
                     Grid.Row="8"
                     Grid.Column="0"
@@ -241,8 +241,9 @@
                     x:Name="txtSort"
                     Grid.Row="8"
                     Grid.Column="1"
-                    Width="400"
+                    Width="100"
                     Margin="4"
+                    HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
                     Style="{StaticResource MyOutlinedTextBox}" />
@@ -258,7 +259,6 @@
                     x:Name="txtPrevProfile"
                     Grid.Row="9"
                     Grid.Column="1"
-                    Width="400"
                     Margin="4"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"
@@ -276,7 +276,6 @@
                     x:Name="txtNextProfile"
                     Grid.Row="10"
                     Grid.Column="1"
-                    Width="400"
                     Margin="4"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"

From bf30819a4a0feaa19faafa1f8750cf113ae6e61c Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 5 Feb 2024 20:24:30 +0800
Subject: [PATCH 55/62] Bug fix

https://github.com/2dust/v2rayN/issues/4334
---
 v2rayN/v2rayN/Handler/SysProxyHandle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN/Handler/SysProxyHandle.cs b/v2rayN/v2rayN/Handler/SysProxyHandle.cs
index 4bd8fa49..a840d011 100644
--- a/v2rayN/v2rayN/Handler/SysProxyHandle.cs
+++ b/v2rayN/v2rayN/Handler/SysProxyHandle.cs
@@ -50,7 +50,7 @@ namespace v2rayN.Handler
                 }
                 if (type == ESysProxyType.ForcedChange)
                 {
-                    var strExceptions = $"{config.constItem.defIEProxyExceptions};{config.systemProxyExceptions}";
+                    var strExceptions = $"<local>;{config.constItem.defIEProxyExceptions};{config.systemProxyExceptions}";
 
                     var strProxy = string.Empty;
                     if (Utils.IsNullOrEmpty(config.systemProxyAdvancedProtocol))

From 05e424f8053558f729134f699316e46f59eaf302 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 8 Feb 2024 09:32:01 +0800
Subject: [PATCH 56/62] Bug fix

---
 v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index 289830f3..a8478e1b 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -1618,6 +1618,8 @@ namespace v2rayN.ViewModels
             {
                 _noticeHandler?.SendMessage(ResUI.TipChangeRouting, true);
                 Reload();
+                NotifyIcon = MainFormHandler.Instance.GetNotifyIcon(_config);
+                AppIcon = MainFormHandler.Instance.GetAppIcon(_config);
             }
         }
 

From e2c836794be9dda9928f040502e06ca0666e7b6e Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 8 Feb 2024 14:01:33 +0800
Subject: [PATCH 57/62] Refactor

---
 v2rayN/v2rayN/App.xaml.cs                     |  6 ++---
 v2rayN/v2rayN/Common/Utils.cs                 | 22 +++++++++++++++++++
 v2rayN/v2rayN/Global.cs                       | 10 +--------
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs    |  2 +-
 v2rayN/v2rayN/Handler/CoreConfigV2ray.cs      |  2 +-
 v2rayN/v2rayN/Handler/CoreHandler.cs          |  2 +-
 v2rayN/v2rayN/Handler/LazyConfig.cs           | 17 +++++++++++++-
 v2rayN/v2rayN/Handler/StatisticsHandler.cs    | 21 +++++++++---------
 v2rayN/v2rayN/Handler/StatisticsSingbox.cs    |  2 +-
 v2rayN/v2rayN/Handler/StatisticsV2ray.cs      |  2 +-
 .../v2rayN/ViewModels/MainWindowViewModel.cs  | 11 +++++-----
 11 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/v2rayN/v2rayN/App.xaml.cs b/v2rayN/v2rayN/App.xaml.cs
index 70147738..78199e70 100644
--- a/v2rayN/v2rayN/App.xaml.cs
+++ b/v2rayN/v2rayN/App.xaml.cs
@@ -27,10 +27,10 @@ namespace v2rayN
         /// <param name="e"></param>
         protected override void OnStartup(StartupEventArgs e)
         {
-            Global.ExePathKey = Utils.GetMD5(Utils.GetExePath());
+            var exePathKey = Utils.GetMD5(Utils.GetExePath());
 
             var rebootas = (e.Args ?? new string[] { }).Any(t => t == Global.RebootAs);
-            ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, Global.ExePathKey, out bool bCreatedNew);
+            ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
             if (!rebootas && !bCreatedNew)
             {
                 ProgramStarted.Set();
@@ -39,8 +39,6 @@ namespace v2rayN
                 return;
             }
 
-            Global.ProcessJob = new Job();
-
             Logging.Setup();
             Init();
             Logging.LoggingEnabled(_config.guiItem.enableLog);
diff --git a/v2rayN/v2rayN/Common/Utils.cs b/v2rayN/v2rayN/Common/Utils.cs
index c0df6c8d..a56e814e 100644
--- a/v2rayN/v2rayN/Common/Utils.cs
+++ b/v2rayN/v2rayN/Common/Utils.cs
@@ -576,6 +576,28 @@ namespace v2rayN
             return inUse;
         }
 
+        public static int GetFreePort()
+        {
+            try
+            {
+                int defaultPort = 9090;
+                if (!Utils.PortInUse(defaultPort))
+                {
+                    return defaultPort;
+                }
+
+                TcpListener l = new(IPAddress.Loopback, 0);
+                l.Start();
+                int port = ((IPEndPoint)l.LocalEndpoint).Port;
+                l.Stop();
+                return port;
+            }
+            catch
+            {
+            }
+            return 69090;
+        }
+
         #endregion 测速
 
         #region 杂项
diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index bf449a45..5e299609 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -118,6 +118,7 @@ namespace v2rayN
             @"http://cachefly.cachefly.net/100mb.test",
             @"http://cachefly.cachefly.net/10mb.test"
         };
+
         public static readonly List<string> SpeedPingTestUrls = new() {
             @"https://www.google.com/generate_204",
         };
@@ -187,14 +188,5 @@ namespace v2rayN
         public static readonly List<string> TuicCongestionControls = new() { "cubic", "new_reno", "bbr" };
 
         #endregion const
-
-        #region global variable
-
-        public static int StatePort { get; set; }
-        public static Job ProcessJob { get; set; }
-        public static bool ShowInTaskbar { get; set; }
-        public static string ExePathKey { get; set; }
-
-        #endregion global variable
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index 0f75131f..a1505e2e 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -811,7 +811,7 @@ namespace v2rayN.Handler
                     //},
                     clash_api = new Clash_Api4Sbox()
                     {
-                        external_controller = $"{Global.Loopback}:{Global.StatePort}",
+                        external_controller = $"{Global.Loopback}:{LazyConfig.Instance.StatePort}",
                     }
                 };
             }
diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
index 1538d8ce..8a650a73 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
@@ -788,7 +788,7 @@ namespace v2rayN.Handler
                     Inboundsettings4Ray apiInboundSettings = new();
                     apiInbound.tag = tag;
                     apiInbound.listen = Global.Loopback;
-                    apiInbound.port = Global.StatePort;
+                    apiInbound.port = LazyConfig.Instance.StatePort;
                     apiInbound.protocol = Global.InboundAPIProtocal;
                     apiInboundSettings.address = Global.Loopback;
                     apiInbound.settings = apiInboundSettings;
diff --git a/v2rayN/v2rayN/Handler/CoreHandler.cs b/v2rayN/v2rayN/Handler/CoreHandler.cs
index b7fa62b4..c78f05da 100644
--- a/v2rayN/v2rayN/Handler/CoreHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreHandler.cs
@@ -316,7 +316,7 @@ namespace v2rayN.Handler
                     throw new Exception(displayLog ? proc.StandardError.ReadToEnd() : "启动进程失败并退出 (Failed to start the process and exited)");
                 }
 
-                Global.ProcessJob.AddProcess(proc.Handle);
+                LazyConfig.Instance.AddProcess(proc.Handle);
                 return proc;
             }
             catch (Exception ex)
diff --git a/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayN/v2rayN/Handler/LazyConfig.cs
index 26d68863..51231eba 100644
--- a/v2rayN/v2rayN/Handler/LazyConfig.cs
+++ b/v2rayN/v2rayN/Handler/LazyConfig.cs
@@ -11,8 +11,14 @@ namespace v2rayN.Handler
 
         public static LazyConfig Instance => _instance.Value;
 
+        private int _statePort;
+        public int StatePort { get => _statePort; }
+        private Job _processJob  = new();
+
         public LazyConfig()
         {
+            _statePort = Utils.GetFreePort();
+
             SqliteHelper.Instance.CreateTable<SubItem>();
             SqliteHelper.Instance.CreateTable<ProfileItem>();
             SqliteHelper.Instance.CreateTable<ServerStatItem>();
@@ -62,6 +68,15 @@ namespace v2rayN.Handler
             }
             return localPort;
         }
+        
+        public void AddProcess(IntPtr processHandle)
+        {
+            _processJob.AddProcess(processHandle);
+        }
+
+        #endregion Config
+
+        #region SqliteHelper
 
         public List<SubItem> SubItems()
         {
@@ -158,7 +173,7 @@ namespace v2rayN.Handler
             return SqliteHelper.Instance.Table<DNSItem>().FirstOrDefault(it => it.coreType == eCoreType);
         }
 
-        #endregion Config
+        #endregion SqliteHelper
 
         #region Core Type
 
diff --git a/v2rayN/v2rayN/Handler/StatisticsHandler.cs b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
index dd4d9d66..27071f01 100644
--- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
@@ -28,7 +28,6 @@ namespace v2rayN.Handler
             _updateFunc = update;
 
             Init();
-            Global.StatePort = GetFreePort();
 
             _statisticsV2Ray = new StatisticsV2ray(config, UpdateServerStat);
             _statisticsSingbox = new StatisticsSingbox(config, UpdateServerStat);
@@ -80,6 +79,10 @@ namespace v2rayN.Handler
         {
             GetServerStatItem(_config.indexId);
 
+            if (_serverStatItem is null)
+            {
+                return;
+            }
             if (server.proxyUp != 0 || server.proxyDown != 0)
             {
                 _serverStatItem.todayUp += server.proxyUp;
@@ -87,15 +90,13 @@ namespace v2rayN.Handler
                 _serverStatItem.totalUp += server.proxyUp;
                 _serverStatItem.totalDown += server.proxyDown;
             }
-            if (Global.ShowInTaskbar)
-            {
-                server.indexId = _config.indexId;
-                server.todayUp = _serverStatItem.todayUp;
-                server.todayDown = _serverStatItem.todayDown;
-                server.totalUp = _serverStatItem.totalUp;
-                server.totalDown = _serverStatItem.totalDown;
-                _updateFunc(server);
-            }
+
+            server.indexId = _config.indexId;
+            server.todayUp = _serverStatItem.todayUp;
+            server.todayDown = _serverStatItem.todayDown;
+            server.totalUp = _serverStatItem.totalUp;
+            server.totalDown = _serverStatItem.totalDown;
+            _updateFunc(server);
         }
 
         private void GetServerStatItem(string indexId)
diff --git a/v2rayN/v2rayN/Handler/StatisticsSingbox.cs b/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
index 7db85996..fc559e54 100644
--- a/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
@@ -27,7 +27,7 @@ namespace v2rayN.Handler
 
             try
             {
-                url = $"ws://{Global.Loopback}:{Global.StatePort}/traffic";
+                url = $"ws://{Global.Loopback}:{LazyConfig.Instance.StatePort}/traffic";
 
                 if (webSocket == null)
                 {
diff --git a/v2rayN/v2rayN/Handler/StatisticsV2ray.cs b/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
index 63cdac41..128895fc 100644
--- a/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
@@ -30,7 +30,7 @@ namespace v2rayN.Handler
             {
                 try
                 {
-                    _channel = GrpcChannel.ForAddress($"{Global.HttpProtocol}{Global.Loopback}:{Global.StatePort}");
+                    _channel = GrpcChannel.ForAddress($"{Global.HttpProtocol}{Global.Loopback}:{LazyConfig.Instance.StatePort}");
                     _client = new StatsService.StatsServiceClient(_channel);
                 }
                 catch (Exception ex)
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index a8478e1b..2168b316 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -35,6 +35,7 @@ namespace v2rayN.ViewModels
         private readonly PaletteHelper _paletteHelper = new();
         private Dictionary<string, bool> _dicHeaderSort = new();
         private Action<EViewAction> _updateView;
+        private bool _showInTaskbar;
 
         #endregion private prop
 
@@ -568,7 +569,7 @@ namespace v2rayN.ViewModels
 
             AutoHideStartup();
 
-            Global.ShowInTaskbar = true;
+            _showInTaskbar = true;
         }
 
         private void Init()
@@ -635,7 +636,7 @@ namespace v2rayN.ViewModels
             {
                 Application.Current.Dispatcher.Invoke((Action)(() =>
                 {
-                    if (!Global.ShowInTaskbar)
+                    if (!_showInTaskbar)
                     {
                         return;
                     }
@@ -1183,7 +1184,7 @@ namespace v2rayN.ViewModels
                 _noticeHandler?.SendMessage(msg, true);
                 Application.Current.Dispatcher.Invoke((Action)(() =>
                 {
-                    if (!Global.ShowInTaskbar)
+                    if (!_showInTaskbar)
                     {
                         return;
                     }
@@ -1658,7 +1659,7 @@ namespace v2rayN.ViewModels
 
         public void ShowHideWindow(bool? blShow)
         {
-            var bl = blShow ?? !Global.ShowInTaskbar;
+            var bl = blShow ?? !_showInTaskbar;
             if (bl)
             {
                 //Application.Current.MainWindow.ShowInTaskbar = true;
@@ -1677,7 +1678,7 @@ namespace v2rayN.ViewModels
                 //IntPtr windowHandle = new WindowInteropHelper(Application.Current.MainWindow).Handle;
                 //Utils.RegWriteValue(Global.MyRegPath, Utils.WindowHwndKey, Convert.ToString((long)windowHandle));
             }
-            Global.ShowInTaskbar = bl;
+            _showInTaskbar = bl;
         }
 
         private void RestoreUI()

From ce94e0ba4db302e61312b85a2bdd9f7053bf15df Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 8 Feb 2024 16:22:38 +0800
Subject: [PATCH 58/62] Refactor

---
 v2rayN/v2rayN/Common/SqliteHelper.cs | 3 ++-
 v2rayN/v2rayN/Global.cs              | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2rayN/v2rayN/Common/SqliteHelper.cs b/v2rayN/v2rayN/Common/SqliteHelper.cs
index 42ca84f5..e8a2930e 100644
--- a/v2rayN/v2rayN/Common/SqliteHelper.cs
+++ b/v2rayN/v2rayN/Common/SqliteHelper.cs
@@ -11,10 +11,11 @@ namespace v2rayN
         private SQLiteConnection _db;
         private SQLiteAsyncConnection _dbAsync;
         private static readonly object objLock = new();
+        public const string _configDB = "guiNDB.db";
 
         public SqliteHelper()
         {
-            _connstr = Utils.GetConfigPath(Global.ConfigDB);
+            _connstr = Utils.GetConfigPath(_configDB);
             _db = new SQLiteConnection(_connstr, false);
             _dbAsync = new SQLiteAsyncConnection(_connstr, false);
         }
diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index 5e299609..08dddfea 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -30,7 +30,6 @@ namespace v2rayN
 
         public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
         public const string ConfigFileName = "guiNConfig.json";
-        public const string ConfigDB = "guiNDB.db";
         public const string CoreConfigFileName = "config.json";
         public const string CorePreConfigFileName = "configPre.json";
         public const string CoreSpeedtestConfigFileName = "configSpeedtest.json";

From 4a72e63d1c103fe94b99bdc10d44439f17900666 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 9 Feb 2024 09:57:28 +0800
Subject: [PATCH 59/62] When updating a subscription, only determine whether
 the alias already exists

---
 v2rayN/v2rayN/Handler/ConfigHandler.cs        |  3 ++-
 v2rayN/v2rayN/Mode/ConfigItems.cs             |  1 +
 v2rayN/v2rayN/Resx/ResUI.Designer.cs          |  9 +++++++
 v2rayN/v2rayN/Resx/ResUI.resx                 |  3 +++
 v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx         |  3 +++
 v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx         |  3 +++
 .../ViewModels/OptionSettingViewModel.cs      |  3 +++
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml  | 24 +++++++++++++++----
 .../v2rayN/Views/OptionSettingWindow.xaml.cs  |  1 +
 9 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 2432e8ce..ee8fc7dc 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -1098,7 +1098,8 @@ namespace v2rayN.Handler
                 //exist sub items
                 if (isSub && !Utils.IsNullOrEmpty(subid))
                 {
-                    var existItem = lstOriSub?.FirstOrDefault(t => t.isSub == isSub && CompareProfileItem(t, profileItem, true));
+                    var existItem = lstOriSub?.FirstOrDefault(t => t.isSub == isSub
+                                                && config.uiItem.enableUpdateSubOnlyRemarksExist ? t.remarks == profileItem.remarks : CompareProfileItem(t, profileItem, true));
                     if (existItem != null)
                     {
                         //Check for duplicate indexId
diff --git a/v2rayN/v2rayN/Mode/ConfigItems.cs b/v2rayN/v2rayN/Mode/ConfigItems.cs
index 8c1fdafe..dbe062ca 100644
--- a/v2rayN/v2rayN/Mode/ConfigItems.cs
+++ b/v2rayN/v2rayN/Mode/ConfigItems.cs
@@ -109,6 +109,7 @@ namespace v2rayN.Mode
     public class UIItem
     {
         public bool enableAutoAdjustMainLvColWidth { get; set; }
+        public bool enableUpdateSubOnlyRemarksExist { get; set; }
         public double mainWidth { get; set; }
         public double mainHeight { get; set; }
         public double mainGirdHeight1 { get; set; }
diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index 9c4abe99..0ef7edd9 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -2635,6 +2635,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Updating subscription, only determine remarks exists 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableUpdateSubOnlyRemarksExist {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableUpdateSubOnlyRemarksExist", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Exception 的本地化字符串。
         /// </summary>
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index 60614513..cfad9b06 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -1189,4 +1189,7 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>Speed Ping Test Url</value>
   </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>Updating subscription, only determine remarks exists</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index 214d1675..f1a1fb7f 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -1186,4 +1186,7 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>真连接测试地址</value>
   </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>更新订阅时只判断别名已存在否</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
index 34c66557..95c6adbc 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx
@@ -1159,4 +1159,7 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>真連接測試地址</value>
   </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>更新订阅时只判断别名已存在否</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
index 18139d8b..0fb17877 100644
--- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
@@ -56,6 +56,7 @@ namespace v2rayN.ViewModels
         [Reactive] public bool KeepOlderDedupl { get; set; }
         [Reactive] public bool IgnoreGeoUpdateCore { get; set; }
         [Reactive] public bool EnableAutoAdjustMainLvColWidth { get; set; }
+        [Reactive] public bool EnableUpdateSubOnlyRemarksExist { get; set; }
         [Reactive] public bool EnableSecurityProtocolTls13 { get; set; }
         [Reactive] public bool AutoHideStartup { get; set; }
         [Reactive] public bool EnableCheckPreReleaseUpdate { get; set; }
@@ -150,6 +151,7 @@ namespace v2rayN.ViewModels
             KeepOlderDedupl = _config.guiItem.keepOlderDedupl;
             IgnoreGeoUpdateCore = _config.guiItem.ignoreGeoUpdateCore;
             EnableAutoAdjustMainLvColWidth = _config.uiItem.enableAutoAdjustMainLvColWidth;
+            EnableUpdateSubOnlyRemarksExist = _config.uiItem.enableUpdateSubOnlyRemarksExist;
             EnableSecurityProtocolTls13 = _config.guiItem.enableSecurityProtocolTls13;
             AutoHideStartup = _config.uiItem.autoHideStartup;
             EnableCheckPreReleaseUpdate = _config.guiItem.checkPreReleaseUpdate;
@@ -304,6 +306,7 @@ namespace v2rayN.ViewModels
             _config.guiItem.keepOlderDedupl = KeepOlderDedupl;
             _config.guiItem.ignoreGeoUpdateCore = IgnoreGeoUpdateCore;
             _config.uiItem.enableAutoAdjustMainLvColWidth = EnableAutoAdjustMainLvColWidth;
+            _config.uiItem.enableUpdateSubOnlyRemarksExist = EnableUpdateSubOnlyRemarksExist;
             _config.guiItem.enableSecurityProtocolTls13 = EnableSecurityProtocolTls13;
             _config.uiItem.autoHideStartup = AutoHideStartup;
             _config.guiItem.autoUpdateInterval = autoUpdateInterval;
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index 4edf5d25..6601637f 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -526,7 +526,7 @@
                             HorizontalAlignment="Left" />
 
                         <TextBlock
-                            Grid.Row="4"
+                            Grid.Row="3"
                             Grid.Column="0"
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
@@ -534,6 +534,20 @@
                             Text="{x:Static resx:ResUI.TbSettingsKeepOlderDedupl}" />
                         <ToggleButton
                             x:Name="togKeepOlderDedupl"
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
+
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsIgnoreGeoUpdateCore}" />
+                        <ToggleButton
+                            x:Name="togIgnoreGeoUpdateCore"
                             Grid.Row="4"
                             Grid.Column="1"
                             Margin="{StaticResource SettingItemMargin}"
@@ -545,9 +559,9 @@
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSettingsIgnoreGeoUpdateCore}" />
+                            Text="{x:Static resx:ResUI.TbSettingsEnableAutoAdjustMainLvColWidth}" />
                         <ToggleButton
-                            x:Name="togIgnoreGeoUpdateCore"
+                            x:Name="togEnableAutoAdjustMainLvColWidth"
                             Grid.Row="5"
                             Grid.Column="1"
                             Margin="{StaticResource SettingItemMargin}"
@@ -559,9 +573,9 @@
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSettingsEnableAutoAdjustMainLvColWidth}" />
+                            Text="{x:Static resx:ResUI.TbSettingsEnableUpdateSubOnlyRemarksExist}" />
                         <ToggleButton
-                            x:Name="togEnableAutoAdjustMainLvColWidth"
+                            x:Name="togEnableUpdateSubOnlyRemarksExist"
                             Grid.Row="6"
                             Grid.Column="1"
                             Margin="{StaticResource SettingItemMargin}"
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
index 089433ae..57871e5b 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -170,6 +170,7 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.IgnoreGeoUpdateCore, v => v.togIgnoreGeoUpdateCore.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.EnableUpdateSubOnlyRemarksExist, v => v.togEnableUpdateSubOnlyRemarksExist.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableSecurityProtocolTls13, v => v.togEnableSecurityProtocolTls13.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.AutoHideStartup, v => v.togAutoHideStartup.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableCheckPreReleaseUpdate, v => v.togEnableCheckPreReleaseUpdate.IsChecked).DisposeWith(disposables);

From fbb00c0f8560d7df8aabb656976f405095ab6106 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 10 Feb 2024 16:57:26 +0800
Subject: [PATCH 60/62] Improve

---
 v2rayN/v2rayN/Common/SqliteHelper.cs | 2 +-
 v2rayN/v2rayN/Handler/CoreHandler.cs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN/Common/SqliteHelper.cs b/v2rayN/v2rayN/Common/SqliteHelper.cs
index e8a2930e..5daab53c 100644
--- a/v2rayN/v2rayN/Common/SqliteHelper.cs
+++ b/v2rayN/v2rayN/Common/SqliteHelper.cs
@@ -11,7 +11,7 @@ namespace v2rayN
         private SQLiteConnection _db;
         private SQLiteAsyncConnection _dbAsync;
         private static readonly object objLock = new();
-        public const string _configDB = "guiNDB.db";
+        public readonly string _configDB = "guiNDB.db";
 
         public SqliteHelper()
         {
diff --git a/v2rayN/v2rayN/Handler/CoreHandler.cs b/v2rayN/v2rayN/Handler/CoreHandler.cs
index c78f05da..34c41954 100644
--- a/v2rayN/v2rayN/Handler/CoreHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreHandler.cs
@@ -180,6 +180,7 @@ namespace v2rayN.Handler
 
         private void CoreStart(ProfileItem node)
         {
+            ShowMsg(false, $"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
             ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
 
             ECoreType coreType;

From 1c94b5d5f025e44e21d284bd49f6375b62bd26f6 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 10 Feb 2024 17:07:30 +0800
Subject: [PATCH 61/62] Up 6.35

---
 v2rayN/v2rayN/v2rayN.csproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index 88b75cd9..76948d86 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -10,7 +10,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
-		<FileVersion>6.33</FileVersion>
+		<FileVersion>6.35</FileVersion>
 		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 	
@@ -26,7 +26,6 @@
 		<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
 		<PackageReference Include="ReactiveUI.WPF" Version="19.5.41" />
 		<PackageReference Include="Splat.NLog" Version="14.8.12" />
-		<PackageReference Include="System.Reactive" Version="6.0.0" />
 	</ItemGroup>
 	
 	<ItemGroup>       

From af3c1dc039478e1b6f8e4669375cd0c9d6781993 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 12 Feb 2024 08:49:22 +0800
Subject: [PATCH 62/62] Bug fix

https://github.com/2dust/v2rayN/issues/4707
---
 v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
index dab2157a..10b45f06 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
@@ -40,6 +40,7 @@
             <Button
                 x:Name="btnSave"
                 Width="100"
+                Click="btnSave_Click"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
                 Style="{StaticResource DefButton}" />