Merge 5414bae069 into 4af528f8e2

* Fix

* Fix

v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs

@@ -227,7 +227,7 @@ public class CoreConfigContextBuilder
     {
         var result = NodeValidatorResult.Empty();
 
-        if (node.Subid.IsNullOrEmpty())
+        if (node.Subid.IsNullOrEmpty() || node.ConfigType == EConfigType.Custom)
         {
             return (null, result);
         }
@@ -269,6 +269,7 @@ public class CoreConfigContextBuilder
             IndexId = $"inner-{Utils.GetGuid(false)}",
             ConfigType = EConfigType.ProxyChain,
             CoreType = AppManager.Instance.GetCoreType(node, node.ConfigType),
+            Remarks = node.Remarks,
         };
         List<string?> childItems = [prevNode?.IndexId, node.IndexId, nextNode?.IndexId];
         var chainExtraItem = chainNode.GetProtocolExtra() with

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -154,6 +154,7 @@ public static class ConfigHandler
             DownMbps = 100
         };
         config.ClashUIItem ??= new();
+        config.ClashUIItem.ConnectionsColumnItem ??= new();
         config.SystemProxyItem ??= new();
         config.WebDavItem ??= new();
         config.CheckUpdateItem ??= new();
@@ -722,8 +723,6 @@ public static class ConfigHandler
         profileItem.SetProtocolExtra(profileItem.GetProtocolExtra() with
         {
             SalamanderPass = profileItem.GetProtocolExtra().SalamanderPass?.TrimEx(),
-            UpMbps = profileItem.GetProtocolExtra().UpMbps is null or < 0 ? config.HysteriaItem.UpMbps : profileItem.GetProtocolExtra().UpMbps,
-            DownMbps = profileItem.GetProtocolExtra().DownMbps is null or < 0 ? config.HysteriaItem.DownMbps : profileItem.GetProtocolExtra().DownMbps,
             HopInterval = profileItem.GetProtocolExtra().HopInterval?.TrimEx(),
         });
 

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -208,6 +208,7 @@ public class ClashUIItem
     public int ProxiesAutoDelayTestInterval { get; set; } = 10;
     public bool ConnectionsAutoRefresh { get; set; }
     public int ConnectionsRefreshInterval { get; set; } = 2;
+    public List<ColumnItem> ConnectionsColumnItem { get; set; }
 }
 
 [Serializable]

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -360,6 +360,7 @@ public class TlsSettings4Ray
     public bool? disableSystemRoot { get; set; }
     public string? echConfigList { get; set; }
     public string? echForceQuery { get; set; }
+    public Sockopt4Ray? echSockopt { get; set; }
 }
 
 public class CertificateSettings4Ray

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

@@ -316,16 +316,24 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
                 SsMethod = Global.None,
             });
 
-            foreach (var outbound in _coreConfig.outbounds.Where(outbound => outbound.streamSettings?.sockopt?.dialerProxy?.IsNullOrEmpty() ?? true))
+            foreach (var outbound in _coreConfig.outbounds
+                .Where(o => o.streamSettings?.sockopt?.dialerProxy?.IsNullOrEmpty() ?? true))
             {
-                outbound.streamSettings ??= new StreamSettings4Ray();
+                outbound.streamSettings ??= new();
-                outbound.streamSettings.sockopt ??= new Sockopt4Ray();
+                outbound.streamSettings.sockopt ??= new();
-                outbound.streamSettings.sockopt.dialerProxy = "tun-project-ss";
+                outbound.streamSettings.sockopt.dialerProxy = "tun-protect-ss";
+            }
+            // ech protected
+            foreach (var outbound in _coreConfig.outbounds
+                .Where(outbound => outbound.streamSettings?.tlsSettings?.echConfigList?.IsNullOrEmpty() == false))
+            {
+                outbound.streamSettings!.tlsSettings!.echSockopt ??= new();
+                outbound.streamSettings.tlsSettings.echSockopt.dialerProxy = "tun-protect-ss";
             }
             _coreConfig.outbounds.Add(new CoreConfigV2rayService(context with
             {
                 Node = protectNode,
-            }).BuildProxyOutbound("tun-project-ss"));
+            }).BuildProxyOutbound("tun-protect-ss"));
 
             _coreConfig.routing.rules ??= [];
             var hasBalancer = _coreConfig.routing.balancers is { Count: > 0 };

v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs

@@ -27,10 +27,10 @@ public class AddServerViewModel : MyReactiveObject
     public string Ports { get; set; }
 
     [Reactive]
-    public int UpMbps { get; set; }
+    public int? UpMbps { get; set; }
 
     [Reactive]
-    public int DownMbps { get; set; }
+    public int? DownMbps { get; set; }
 
     [Reactive]
     public string HopInterval { get; set; }
@@ -113,8 +113,8 @@ public class AddServerViewModel : MyReactiveObject
         AlterId = int.TryParse(protocolExtra?.AlterId, out var result) ? result : 0;
         Flow = protocolExtra?.Flow ?? string.Empty;
         SalamanderPass = protocolExtra?.SalamanderPass ?? string.Empty;
-        UpMbps = protocolExtra?.UpMbps ?? _config.HysteriaItem.UpMbps;
+        UpMbps = protocolExtra?.UpMbps;
-        DownMbps = protocolExtra?.DownMbps ?? _config.HysteriaItem.DownMbps;
+        DownMbps = protocolExtra?.DownMbps;
         HopInterval = protocolExtra?.HopInterval.IsNullOrEmpty() ?? true ? Global.Hysteria2DefaultHopInt.ToString() : protocolExtra.HopInterval;
         VmessSecurity = protocolExtra?.VmessSecurity?.IsNullOrEmpty() == false ? protocolExtra.VmessSecurity : Global.DefaultSecurity;
         VlessEncryption = protocolExtra?.VlessEncryption.IsNullOrEmpty() == false ? protocolExtra.VlessEncryption : Global.None;
@@ -175,8 +175,8 @@ public class AddServerViewModel : MyReactiveObject
             AlterId = AlterId > 0 ? AlterId.ToString() : null,
             Flow = Flow.NullIfEmpty(),
             SalamanderPass = SalamanderPass.NullIfEmpty(),
-            UpMbps = UpMbps >= 0 ? UpMbps : null,
+            UpMbps = UpMbps,
-            DownMbps = DownMbps >= 0 ? DownMbps : null,
+            DownMbps = DownMbps,
             HopInterval = HopInterval.NullIfEmpty(),
             VmessSecurity = VmessSecurity.NullIfEmpty(),
             VlessEncryption = VlessEncryption.NullIfEmpty(),

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -22,8 +22,8 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public string defUserAgent { get; set; }
     [Reactive] public string mux4SboxProtocol { get; set; }
     [Reactive] public bool enableCacheFile4Sbox { get; set; }
-    [Reactive] public int hyUpMbps { get; set; }
+    [Reactive] public int? hyUpMbps { get; set; }
-    [Reactive] public int hyDownMbps { get; set; }
+    [Reactive] public int? hyDownMbps { get; set; }
     [Reactive] public bool enableFragment { get; set; }
 
     #endregion Core
@@ -336,8 +336,8 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.CoreBasicItem.DefUserAgent = defUserAgent;
         _config.Mux4SboxItem.Protocol = mux4SboxProtocol;
         _config.CoreBasicItem.EnableCacheFile4Sbox = enableCacheFile4Sbox;
-        _config.HysteriaItem.UpMbps = hyUpMbps;
+        _config.HysteriaItem.UpMbps = hyUpMbps ?? 0;
-        _config.HysteriaItem.DownMbps = hyDownMbps;
+        _config.HysteriaItem.DownMbps = hyDownMbps ?? 0;
         _config.CoreBasicItem.EnableFragment = enableFragment;
 
         _config.GuiItem.AutoRun = AutoRun;

v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml

@@ -74,23 +74,28 @@
                 <DataGridTextColumn
                     Width="300"
                     Binding="{Binding Host}"
-                    Header="{x:Static resx:ResUI.TbSortingHost}" />
+                    Header="{x:Static resx:ResUI.TbSortingHost}"
+                    Tag="Host" />
                 <DataGridTextColumn
                     Width="500"
                     Binding="{Binding Chain}"
-                    Header="{x:Static resx:ResUI.TbSortingChain}" />
+                    Header="{x:Static resx:ResUI.TbSortingChain}"
+                    Tag="Chain" />
                 <DataGridTextColumn
                     Width="80"
                     Binding="{Binding Network}"
-                    Header="{x:Static resx:ResUI.TbSortingNetwork}" />
+                    Header="{x:Static resx:ResUI.TbSortingNetwork}"
+                    Tag="Network" />
                 <DataGridTextColumn
                     Width="160"
                     Binding="{Binding Type}"
-                    Header="{x:Static resx:ResUI.TbSortingType}" />
+                    Header="{x:Static resx:ResUI.TbSortingType}"
+                    Tag="Type" />
                 <DataGridTextColumn
                     Width="100"
                     Binding="{Binding Elapsed}"
-                    Header="{x:Static resx:ResUI.TbSortingTime}" />
+                    Header="{x:Static resx:ResUI.TbSortingTime}"
+                    Tag="Elapsed" />
             </DataGrid.Columns>
         </DataGrid>
     </DockPanel>

v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs

@@ -2,9 +2,15 @@ namespace v2rayN.Desktop.Views;
 
 public partial class ClashConnectionsView : ReactiveUserControl<ClashConnectionsViewModel>
 {
+    private static Config _config;
+    private static readonly string _tag = "ClashConnectionsView";
+
     public ClashConnectionsView()
     {
         InitializeComponent();
+        
+        _config = AppManager.Instance.Config;
+        
         ViewModel = new ClashConnectionsViewModel(UpdateViewHandler);
         btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
 
@@ -19,7 +25,15 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
             this.Bind(ViewModel, vm => vm.HostFilter, v => v.txtHostFilter.Text).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.ConnectionCloseAllCmd, v => v.btnConnectionCloseAll).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoRefresh, v => v.togAutoRefresh.IsChecked).DisposeWith(disposables);
+
+            AppEvents.AppExitRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(_ => StorageUI())
+              .DisposeWith(disposables);
         });
+
+        RestoreUI();
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@@ -51,4 +65,74 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
     {
         ViewModel?.ClashConnectionClose(false);
     }
+    
+    #region UI
+
+    private void RestoreUI()
+    {
+        try
+        {
+            var lvColumnItem = _config.ClashUIItem?.ConnectionsColumnItem?.OrderBy(t => t.Index).ToList();
+            if (lvColumnItem == null)
+            {
+                return;
+            }
+
+            var displayIndex = 0;
+            foreach (var item in lvColumnItem)
+            {
+                foreach (var item2 in lstConnections.Columns)
+                {
+                    if (item2.Tag == null)
+                    {
+                        continue;
+                    }
+                    if (item2.Tag.Equals(item.Name))
+                    {
+                        if (item.Width < 0)
+                        {
+                            item2.IsVisible = false;
+                        }
+                        else
+                        {
+                            item2.Width = new DataGridLength(item.Width, DataGridLengthUnitType.Pixel);
+                            item2.DisplayIndex = displayIndex++;
+                        }
+                    }
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private void StorageUI()
+    {
+        try
+        {
+            List<ColumnItem> lvColumnItem = new();
+            foreach (var item2 in lstConnections.Columns)
+            {
+                if (item2.Tag == null)
+                {
+                    continue;
+                }
+                lvColumnItem.Add(new()
+                {
+                    Name = (string)item2.Tag,
+                    Width = (int)(item2.IsVisible == true ? item2.ActualWidth : -1),
+                    Index = item2.DisplayIndex
+                });
+            }
+            _config.ClashUIItem.ConnectionsColumnItem = lvColumnItem;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    #endregion UI
 }

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -7,6 +7,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
 {
     private static Config _config;
     private Window? _window;
+    private static readonly string _tag = "ProfilesView";
 
     public ProfilesView()
     {
@@ -381,7 +382,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
         }
         catch (Exception ex)
         {
-            Logging.SaveLog("ProfilesView", ex);
+            Logging.SaveLog(_tag, ex);
         }
     }
 
@@ -398,6 +399,8 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
     #region UI
 
     private void RestoreUI()
+    {
+        try
         {
             var lvColumnItem = _config.UiItem.MainColumnItem.OrderBy(t => t.Index).ToList();
             var displayIndex = 0;
@@ -428,8 +431,15 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
                 }
             }
         }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
 
     private void StorageUI()
+    {
+        try
         {
             List<ColumnItem> lvColumnItem = new();
             foreach (var item2 in lstProfiles.Columns)
@@ -447,6 +457,11 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
             }
             _config.UiItem.MainColumnItem = lvColumnItem;
         }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
 
     #endregion UI
 

v2rayN/v2rayN/Views/ClashConnectionsView.xaml

@@ -2,6 +2,7 @@
     x:Class="v2rayN.Views.ClashConnectionsView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:base="clr-namespace:v2rayN.Base"
     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"
@@ -78,25 +79,30 @@
                 </ContextMenu>
             </DataGrid.ContextMenu>
             <DataGrid.Columns>
-                <DataGridTextColumn
+                <base:MyDGTextColumn
                     Width="300"
                     Binding="{Binding Host}"
+                    ExName="Host"
                     Header="{x:Static resx:ResUI.TbSortingHost}" />
-                <DataGridTextColumn
+                <base:MyDGTextColumn
                     Width="500"
                     Binding="{Binding Chain}"
+                    ExName="Chain"
                     Header="{x:Static resx:ResUI.TbSortingChain}" />
-                <DataGridTextColumn
+                <base:MyDGTextColumn
                     Width="80"
                     Binding="{Binding Network}"
+                    ExName="Network"
                     Header="{x:Static resx:ResUI.TbSortingNetwork}" />
-                <DataGridTextColumn
+                <base:MyDGTextColumn
                     Width="160"
                     Binding="{Binding Type}"
+                    ExName="Type"
                     Header="{x:Static resx:ResUI.TbSortingType}" />
-                <DataGridTextColumn
+                <base:MyDGTextColumn
                     Width="100"
                     Binding="{Binding Elapsed}"
+                    ExName="Elapsed"
                     Header="{x:Static resx:ResUI.TbSortingTime}" />
             </DataGrid.Columns>
         </DataGrid>

v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs

@@ -1,4 +1,5 @@
 using System.Windows.Controls;
+using v2rayN.Base;
 
 namespace v2rayN.Views;
 
@@ -7,9 +8,14 @@ namespace v2rayN.Views;
 /// </summary>
 public partial class ClashConnectionsView
 {
+    private static Config _config;
+    private static readonly string _tag = "ClashConnectionsView";
+
     public ClashConnectionsView()
     {
         InitializeComponent();
+        _config = AppManager.Instance.Config;
+
         ViewModel = new ClashConnectionsViewModel(UpdateViewHandler);
         btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
 
@@ -24,7 +30,15 @@ public partial class ClashConnectionsView
             this.Bind(ViewModel, vm => vm.HostFilter, v => v.txtHostFilter.Text).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.ConnectionCloseAllCmd, v => v.btnConnectionCloseAll).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoRefresh, v => v.togAutoRefresh.IsChecked).DisposeWith(disposables);
+
+            AppEvents.AppExitRequested
+                .AsObservable()
+                .ObserveOn(RxApp.MainThreadScheduler)
+                .Subscribe(_ => StorageUI())
+                .DisposeWith(disposables);
         });
+
+        RestoreUI();
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@@ -48,7 +62,7 @@ public partial class ClashConnectionsView
         }
         catch (Exception ex)
         {
-            Logging.SaveLog("ClashConnectionsView", ex);
+            Logging.SaveLog(_tag, ex);
         }
     }
 
@@ -56,4 +70,71 @@ public partial class ClashConnectionsView
     {
         ViewModel?.ClashConnectionClose(false);
     }
+
+    #region UI
+
+    private void RestoreUI()
+    {
+        try
+        {
+            var lvColumnItem = _config.ClashUIItem?.ConnectionsColumnItem?.OrderBy(t => t.Index).ToList();
+            if (lvColumnItem == null)
+            {
+                return;
+            }
+
+            var displayIndex = 0;
+            foreach (var item in lvColumnItem)
+            {
+                foreach (var col in lstConnections.Columns.Cast<MyDGTextColumn>())
+                {
+                    if (col.ExName == item.Name)
+                    {
+                        if (item.Width > 0)
+                        {
+                            col.Width = item.Width;
+                        }
+
+                        col.DisplayIndex = displayIndex++;
+                        break;
+                    }
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private void StorageUI()
+    {
+        try
+        {
+            List<ColumnItem> lvColumnItem = new();
+            foreach (var col in lstConnections.Columns.Cast<MyDGTextColumn>())
+            {
+                var name = col.ExName;
+                if (string.IsNullOrWhiteSpace(name))
+                {
+                    continue;
+                }
+
+                lvColumnItem.Add(new()
+                {
+                    Name = name,
+                    Width = (int)col.ActualWidth,
+                    Index = col.DisplayIndex
+                });
+            }
+
+            _config.ClashUIItem.ConnectionsColumnItem = lvColumnItem;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    #endregion UI
 }

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -10,6 +10,7 @@ namespace v2rayN.Views;
 public partial class ProfilesView
 {
     private static Config _config;
+    private static readonly string _tag = "ProfilesView";
 
     public ProfilesView()
     {
@@ -339,7 +340,7 @@ public partial class ProfilesView
         }
         catch (Exception ex)
         {
-            Logging.SaveLog("ProfilesView", ex);
+            Logging.SaveLog(_tag, ex);
         }
     }
 
@@ -356,12 +357,14 @@ public partial class ProfilesView
     #region UI
 
     private void RestoreUI()
+    {
+        try
         {
             var lvColumnItem = _config.UiItem.MainColumnItem.OrderBy(t => t.Index).ToList();
             var displayIndex = 0;
             foreach (var item in lvColumnItem)
             {
-            foreach (MyDGTextColumn item2 in lstProfiles.Columns)
+                foreach (var item2 in lstProfiles.Columns.Cast<MyDGTextColumn>())
                 {
                     if (item2.ExName == item.Name)
                     {
@@ -382,13 +385,19 @@ public partial class ProfilesView
                 }
             }
         }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
 
     private void StorageUI()
     {
-        List<ColumnItem> lvColumnItem = new();
+        try
-        foreach (var t in lstProfiles.Columns)
+        {
+            List<ColumnItem> lvColumnItem = new();
+            foreach (var item2 in lstProfiles.Columns.Cast<MyDGTextColumn>())
             {
-            var item2 = (MyDGTextColumn)t;
                 lvColumnItem.Add(new()
                 {
                     Name = item2.ExName,
@@ -398,6 +407,11 @@ public partial class ProfilesView
             }
             _config.UiItem.MainColumnItem = lvColumnItem;
         }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
 
     #endregion UI
 
@@ -405,7 +419,7 @@ public partial class ProfilesView
 
     private Point startPoint = new();
     private int startIndex = -1;
-    private string formatData = "ProfileItemModel";
+    private readonly string formatData = "ProfileItemModel";
 
     /// <summary>
     /// Helper to search up the VisualTree