From 332f54224ffea1e92bacf09116c9cf98762d6042 Mon Sep 17 00:00:00 2001
From: MisCusi2023 <mygithub323@gmail.com>
Date: Sun, 7 May 2023 20:17:03 -0700
Subject: [PATCH] update flow control

---
 ProxySuper.Core/Models/Projects/XraySettings.cs      |  8 +++++---
 ProxySuper.Core/Services/ShareLink.cs                |  2 +-
 ProxySuper.Core/Services/XrayConfigBuilder.cs        |  1 +
 ProxySuper.WPF/Controls/VLESS_XTLS_Control.xaml      |  2 +-
 ProxySuper.WPF/Controls/XraySettingsControl.xaml     |  2 +-
 ProxySuper.WPF/MainWindow.xaml                       |  2 +-
 .../xray/server/05_inbounds/VLESS_TCP_XTLS.json      | 12 +++++-------
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/ProxySuper.Core/Models/Projects/XraySettings.cs b/ProxySuper.Core/Models/Projects/XraySettings.cs
index 2abc078..eb72388 100644
--- a/ProxySuper.Core/Models/Projects/XraySettings.cs
+++ b/ProxySuper.Core/Models/Projects/XraySettings.cs
@@ -9,12 +9,14 @@ namespace ProxySuper.Core.Models.Projects
 {
     public class XraySettings : V2raySettings
     {
-        public static List<string> FlowList = new List<string> { "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443", "xtls-rprx-splice", "xtls-rprx-splice-udp443" };
-        public static List<string> UTLSList = new List<string> { "", "chrome", "firefox", "safari", "randomized" };
+        public static List<string> UTLSList = new List<string> { "", "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized" };
+
+        //流控参数在服务端只有两种 "none", "xtls-rprx-vision"，客户端可以选择三种："none", "xtls-rprx-vision", "xtls-rprx-vision-udp443",但是选择了XTLS模式就是默认flow不为空或者"none",所以这里不再填加"none"这一项。
+        public static List<string> FlowList = new List<string> { "xtls-rprx-vision", "xtls-rprx-vision-udp443" };  //{ "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443", "xtls-rprx-splice", "xtls-rprx-splice-udp443" };
 
         public string UTLS { get; set; } = UTLSList[1];
 
-        public string Flow { get; set; } = FlowList[2];
+        public string Flow { get; set; } = FlowList[0];
 
         /// <summary>
         /// vless xtls shareLink
diff --git a/ProxySuper.Core/Services/ShareLink.cs b/ProxySuper.Core/Services/ShareLink.cs
index 4edf80e..f644f76 100644
--- a/ProxySuper.Core/Services/ShareLink.cs
+++ b/ProxySuper.Core/Services/ShareLink.cs
@@ -184,7 +184,7 @@ namespace ProxySuper.Core.Services
                 case RayType.VLESS_TCP_XTLS:
                     _protocol = "vless";
                     _type = "tcp";
-                    _security = "xtls";
+                    _security = "tls";
                     _descriptiveText = "vless-tcp-xtls";
                     break;
                 case RayType.VLESS_WS:
diff --git a/ProxySuper.Core/Services/XrayConfigBuilder.cs b/ProxySuper.Core/Services/XrayConfigBuilder.cs
index 83fd110..87d04a0 100644
--- a/ProxySuper.Core/Services/XrayConfigBuilder.cs
+++ b/ProxySuper.Core/Services/XrayConfigBuilder.cs
@@ -103,6 +103,7 @@ namespace ProxySuper.Core.Services
                 }
                 else
                 {
+                    flow = "xtls-rprx-vision,none";//兼容普通tls与xtls
                     obj = new { id = id, flow = flow };
                 }
 
diff --git a/ProxySuper.WPF/Controls/VLESS_XTLS_Control.xaml b/ProxySuper.WPF/Controls/VLESS_XTLS_Control.xaml
index 290e5e2..6047338 100644
--- a/ProxySuper.WPF/Controls/VLESS_XTLS_Control.xaml
+++ b/ProxySuper.WPF/Controls/VLESS_XTLS_Control.xaml
@@ -58,7 +58,7 @@
 
         <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
             <Label Content="传输安全(tls)" Width="140" />
-            <TextBox Text="xtls" IsReadOnly="True" Width="300" />
+            <TextBox Text="tls" IsReadOnly="True" Width="300" />
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
diff --git a/ProxySuper.WPF/Controls/XraySettingsControl.xaml b/ProxySuper.WPF/Controls/XraySettingsControl.xaml
index 666f892..3632aa6 100644
--- a/ProxySuper.WPF/Controls/XraySettingsControl.xaml
+++ b/ProxySuper.WPF/Controls/XraySettingsControl.xaml
@@ -167,7 +167,7 @@
                                             Binding Path=Checked_VLESS_TCP_XTLS,
                                             Converter={StaticResource VisibleConverter}
                                         }">
-                                <Label Content="{Binding Path=Flow}" Width="120" VerticalAlignment="Bottom"/>
+                                <Label Content="{DynamicResource Flow}" Width="120" VerticalAlignment="Bottom"/>
                                 <ComboBox Width="260" 
                                           VerticalAlignment="Bottom"
                                           ItemsSource="{Binding Path=FlowList}"
diff --git a/ProxySuper.WPF/MainWindow.xaml b/ProxySuper.WPF/MainWindow.xaml
index a5fe412..f19d4dc 100644
--- a/ProxySuper.WPF/MainWindow.xaml
+++ b/ProxySuper.WPF/MainWindow.xaml
@@ -8,7 +8,7 @@
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
         Icon="/Resources/ProxySU.ico"
-        Title="ProxySU v4.1.10" Height="600" Width="1000">
+        Title="ProxySU   v4.1.10" Height="600" Width="1000">
     <Grid>
         
     </Grid>
diff --git a/ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json b/ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json
index eab8363..f996b07 100644
--- a/ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json
+++ b/ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json
@@ -5,7 +5,7 @@
     "clients": [
       {
         "id": "",
-        "flow": "xtls-rprx-direct"
+        "flow": "xtls-rprx-vision,none"
       }
     ],
     "decryption": "none",
@@ -13,15 +13,13 @@
   },
   "streamSettings": {
     "network": "tcp",
-    "security": "xtls",
-    "xtlsSettings": {
-      "allowInsecure": false,
+    "security": "tls",
+    "tlsSettings": {
+      "rejectUnknownSni": true,
       "minVersion": "1.2",
-      "alpn": [
-        "http/1.1"
-      ],
       "certificates": [
         {
+          "ocspStapling": 3600,
           "certificateFile": "/usr/local/etc/xray/ssl/xray_ssl.crt",
           "keyFile": "/usr/local/etc/xray/ssl/xray_ssl.key"
         }