From db6a399ca9b96adbb731434cc92a41540f1014cc Mon Sep 17 00:00:00 2001
From: autumn <lhf939@gmail.com>
Date: Mon, 21 Nov 2022 16:42:47 +0800
Subject: [PATCH] add uTLS settings.

---
 .../Models/Projects/XraySettings.cs           |   4 +
 .../ViewModels/XrayEditorViewModel.cs         |  13 ++
 .../Controls/XraySettingsControl.xaml         | 186 +++++++++---------
 3 files changed, 109 insertions(+), 94 deletions(-)

diff --git a/ProxySuper.Core/Models/Projects/XraySettings.cs b/ProxySuper.Core/Models/Projects/XraySettings.cs
index e1ed4cc..50292a5 100644
--- a/ProxySuper.Core/Models/Projects/XraySettings.cs
+++ b/ProxySuper.Core/Models/Projects/XraySettings.cs
@@ -9,6 +9,10 @@ namespace ProxySuper.Core.Models.Projects
 {
     public class XraySettings : V2raySettings
     {
+        public static List<string> UTLSList = new List<string> { "", "chrome", "firefox", "safari", "randomized" };
+
+        public string UTLS { get; set; } = UTLSList[1];
+
         /// <summary>
         /// vless xtls shareLink
         /// </summary>
diff --git a/ProxySuper.Core/ViewModels/XrayEditorViewModel.cs b/ProxySuper.Core/ViewModels/XrayEditorViewModel.cs
index d9c281d..7b8e5a0 100644
--- a/ProxySuper.Core/ViewModels/XrayEditorViewModel.cs
+++ b/ProxySuper.Core/ViewModels/XrayEditorViewModel.cs
@@ -87,6 +87,19 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
+
+        public List<string> UTLSList { get => XraySettings.UTLSList; }
+
+        public string UTLS
+        {
+            get => Settings.UTLS;
+            set
+            {
+                Settings.UTLS = value;
+                RaisePropertyChanged(nameof(UTLS));
+            }
+        }
+
         public int VLESS_KCP_Port
         {
             get => Settings.VLESS_KCP_Port;
diff --git a/ProxySuper.WPF/Controls/XraySettingsControl.xaml b/ProxySuper.WPF/Controls/XraySettingsControl.xaml
index 86543c9..99890f2 100644
--- a/ProxySuper.WPF/Controls/XraySettingsControl.xaml
+++ b/ProxySuper.WPF/Controls/XraySettingsControl.xaml
@@ -108,23 +108,35 @@
                             Width="260" />
 
                     <Button Margin="5,0,0,0"
-                                Padding="12,3"
-                                Command="{Binding Path=RandomUuid}"
-                                Content="{DynamicResource Random}" />
+                            Padding="12,3"
+                            Command="{Binding Path=RandomUuid}"
+                            Content="{DynamicResource Random}" />
                 </StackPanel>
 
                 <!--xray prot-->
                 <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
-                    <Label Content="{DynamicResource XrayPort}" Foreground="Gray" Width="120"  />
+                    <Label Content="{DynamicResource XrayPort}" Width="120"  />
                     <TextBox Text="{Binding Path=Port}" Width="120"  />
                     <Label Content="{DynamicResource XrayPortDefault}"  Foreground="Red" />
                 </StackPanel>
 
+                <!--xray utls-->
+                <StackPanel Margin="0,15,0,0"
+                            Orientation="Horizontal">
+                    <Label Content="uTLS" Width="120" VerticalAlignment="Bottom"/>
+                    <ComboBox Width="260" 
+                              VerticalAlignment="Bottom"
+                              ItemsSource="{Binding Path=UTLSList}"
+                              SelectedValue="{Binding UTLS,Mode=TwoWay}">
+                    </ComboBox>
+                </StackPanel>
+
                 <!--more params-->
                 <Expander ExpandDirection="Down" Margin="0,10,0,0">
                     <Expander.Header>
                         <TextBlock Text="更多参数" FontWeight="Bold" />
                     </Expander.Header>
+                    
                     <Expander.Content>
                         <StackPanel>
                             <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
@@ -143,33 +155,33 @@
 
                             <!--WebSocket Path-->
                             <StackPanel Margin="0,15,0,0"
-                            Orientation="Horizontal"
-                            Visibility="{
-                                Binding Path=Checked_VLESS_WS,
-                                Converter={StaticResource VisibleConverter}
-                            }">
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_WS,
+                                            Converter={StaticResource VisibleConverter}
+                                        }"> 
                                 <Label Content="{DynamicResource VlessWsPath}" Foreground="LimeGreen" Width="120" />
                                 <TextBox Text="{Binding Path=VLESS_WS_Path}" Width="260" />
                             </StackPanel>
 
                             <!--seed-->
                             <StackPanel Margin="0,15,0,0"
-                            Orientation="Horizontal"
-                            Visibility="{
-                                Binding Path=Checked_VLESS_KCP,
-                                Converter={StaticResource VisibleConverter}
-                            }">
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_KCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
                                 <Label Content="{DynamicResource VlessKcpSeed}" Foreground="LimeGreen" Width="120" />
                                 <TextBox Text="{Binding Path=VLESS_KCP_Seed}" Width="260"  />
                             </StackPanel>
 
                             <!--kcp type-->
                             <StackPanel Margin="0,15,0,0"
-                            Visibility="{
-                                Binding Path=Checked_VLESS_KCP,
-                                Converter={StaticResource VisibleConverter}
-                            }" Orientation="Horizontal">
-
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_KCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }"
+                                        Orientation="Horizontal">
                                 <Label Content="{DynamicResource VlessKcpType}"  Foreground="LimeGreen" Width="120" />
                                 <ComboBox Width="260" 
                                 ItemsSource="{Binding Path=KcpTypes}"
@@ -179,118 +191,104 @@
 
                             <!--kcp port-->
                             <StackPanel Margin="0,15,0,0"
-                            Visibility="{
-                                Binding Path=Checked_VLESS_KCP,
-                                Converter={StaticResource VisibleConverter}
-                            }" 
-                            Orientation="Horizontal">
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_KCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }" 
+                                        Orientation="Horizontal">
                                 <Label Content="{DynamicResource VlessKcpPort}" Width="120"  Foreground="LimeGreen" />
                                 <TextBox Text="{Binding Path=VLESS_KCP_Port}" Width="260"  />
                             </StackPanel>
 
                             <!--gRPC Port-->
                             <StackPanel Margin="0,15,0,0"
-                            Orientation="Horizontal"
-                            Visibility="{
-                                Binding Path=Checked_VLESS_gRPC,
-                                Converter={StaticResource VisibleConverter}
-                            }">
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_gRPC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }"> 
                                 <Label Content="{DynamicResource VlessRPCPort}" Width="120"  Foreground="LimeGreen" />
                                 <TextBox Text="{Binding Path=VLESS_gRPC_Port}" Width="260"  />
                             </StackPanel>
 
                             <StackPanel Margin="0,15,0,0" 
-                            Orientation="Horizontal" 
-                            Visibility="{
-                                Binding Path=Checked_VLESS_gRPC,
-                                Converter={StaticResource VisibleConverter}
-                            }">
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=Checked_VLESS_gRPC,
+                                            Converter={StaticResource VisibleConverter}
+                                        }"> 
                                 <Label Content="{DynamicResource VlessRPCName}" Width="120"  Foreground="LimeGreen" />
                                 <TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="260"  />
                             </StackPanel>
 
-                            <!--Tcp Path
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_TCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="VMESS WS路径" Foreground="Blue"  Width="120" />
-                <TextBox Text="{Binding Path=VMESS_TCP_Path}"
-                        VerticalAlignment="Bottom"
-                        Width="260" />
-            </StackPanel>-->
-
                             <!--WebSocket Path-->
                             <StackPanel Margin="0,15,0,0" 
-                            Orientation="Horizontal"
-                            Visibility="{
-                                Binding Path=Checked_VMESS_WS,
-                                Converter={StaticResource VisibleConverter}
-                            }">
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_WS,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
                                 <Label Content="{DynamicResource VmessWsPath}" Foreground="Blue"  Width="120" />
                                 <TextBox Text="{Binding Path=VMESS_WS_Path}"
-                        VerticalAlignment="Bottom"
-                        Width="260" />
+                                        VerticalAlignment="Bottom"
+                                        Width="260" />
                             </StackPanel>
 
                             <!--seed-->
                             <StackPanel Margin="0,15,0,0"
-                            Orientation="Horizontal"
-                            Visibility="{
-                                Binding Path=Checked_VMESS_KCP,
-                                Converter={StaticResource VisibleConverter}
-                            }">
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_KCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
                                 <Label Content="{DynamicResource VmessKcpSeed}"  Foreground="Blue" Width="120" />
                                 <TextBox Text="{Binding Path=VMESS_KCP_Seed}" Width="260" />
                             </StackPanel>
 
                             <!--kcp type-->
                             <StackPanel Margin="0,15,0,0"
-                            Orientation="Horizontal"
-                            Visibility="{
-                                Binding Path=Checked_VMESS_KCP,
-                                Converter={StaticResource VisibleConverter}
-                            }">
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_KCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
                                 <Label Content="{DynamicResource VmessKcpType}" Foreground="Blue" Width="120" VerticalAlignment="Bottom"/>
                                 <ComboBox Width="260" 
-                                VerticalAlignment="Bottom"
-                                ItemsSource="{Binding Path=KcpTypes}"
-                                SelectedValue="{Binding VMESS_KCP_Type,Mode=TwoWay}">
+                                            VerticalAlignment="Bottom"
+                                            ItemsSource="{Binding Path=KcpTypes}"
+                                            SelectedValue="{Binding VMESS_KCP_Type,Mode=TwoWay}">
                                 </ComboBox>
                             </StackPanel>
 
                             <!--kcp port-->
                             <StackPanel Margin="0,15,0,0"
-                            Orientation="Horizontal"
-                            Visibility="{
-                                Binding Path=Checked_VMESS_KCP,
-                                Converter={StaticResource VisibleConverter}
-                            }">
+                                        Orientation="Horizontal"
+                                        Visibility="{
+                                            Binding Path=Checked_VMESS_KCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
                                 <Label Content="{DynamicResource VmessKcpPort}"  Foreground="Blue" Width="120" />
                                 <TextBox Text="{Binding Path=VMESS_KCP_Port}" Width="260" />
                             </StackPanel>
 
                             <!--ss密码-->
                             <StackPanel Margin="0,15,0,0" 
-                            Orientation="Horizontal" 
-                            Visibility="{
-                                Binding Path=CheckedShadowSocks,
-                                Converter={StaticResource VisibleConverter}
-                            }">
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=CheckedShadowSocks,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
                                 <Label Content="{DynamicResource SSPassword}" Foreground="Fuchsia" Width="120" />
-                                <TextBox Text="{Binding Path=ShadowSocksPassword}"
-                        Width="260"/>
+                                <TextBox Text="{Binding Path=ShadowSocksPassword}" Width="260"/>
                             </StackPanel>
 
                             <!--ss加密方式-->
                             <StackPanel Margin="0,15,0,0" 
-                            Orientation="Horizontal" 
-                            Visibility="{
-                                Binding Path=CheckedShadowSocks,
-                                Converter={StaticResource VisibleConverter}
-                            }">
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=CheckedShadowSocks,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
                                 <Label Content="{DynamicResource SSMethods}" Foreground="Fuchsia" Width="120" />
                                 <ComboBox Width="260"
                                 ItemsSource="{Binding ShadowSocksMethods}"
@@ -300,22 +298,22 @@
 
                             <!--ss端口-->
                             <StackPanel Margin="0,15,0,0" 
-                            Orientation="Horizontal" 
-                            Visibility="{
-                                Binding Path=CheckedShadowSocks,
-                                Converter={StaticResource VisibleConverter}
-                            }">
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=CheckedShadowSocks,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
                                 <Label Content="{DynamicResource SSPort}" Foreground="Fuchsia" Width="120" />
                                 <TextBox Text="{Binding Path=ShadowSocksPort}" Width="260"/>
                             </StackPanel>
 
                             <!--Trojan密码-->
                             <StackPanel Margin="0,15,0,0" 
-                            Orientation="Horizontal" 
-                            Visibility="{
-                                Binding Path=Checked_Trojan_TCP,
-                                Converter={StaticResource VisibleConverter}
-                            }">
+                                        Orientation="Horizontal" 
+                                        Visibility="{
+                                            Binding Path=Checked_Trojan_TCP,
+                                            Converter={StaticResource VisibleConverter}
+                                        }">
                                 <Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
                                 <TextBox Text="{Binding Path=TrojanPassword}" Width="260" />
                             </StackPanel>