v2.3.3 + XHTTP support

Author: AKotov-dev

README.md

@@ -8,7 +8,7 @@ A small and nimble GUI for [XRay-core](https://github.com/XTLS/Xray-core): launc
 **Support (without obfs):**
 + Shadowsocks
 + VMESS, + TLS, + WS, + WS + TLS, + KCP, + gRPC
-+ VLESS, + TLS, + WS, + WS + TLS, + gRPC, + gRPC + TLS, + KCP, + REALITY
++ VLESS, + TLS, + WS, + WS + TLS, + gRPC, + gRPC + TLS, + KCP, + REALITY, + XHTTP
 + Trojan, + WS, + gRPC
 
 Starting with `XRayGUI-v1.6`, support for `XTLS-Reality` and a generator of simple but reliable Client-Server configurations have been introduced ("R" button).

xraygui/backup/unit1.lfm

@@ -1,7 +1,7 @@
 object MainForm: TMainForm
   Left = 299
   Height = 722
-  Top = 137
+  Top = 110
   Width = 1003
   ActiveControl = Panel1
   Caption = 'XRayGUI'

xraygui/backup/unit1.pas

@@ -966,12 +966,19 @@ procedure TMainForm.CreateVLESSConfig(VLESSURL, PORT, SAVEPATH: string);
       VlessDecode(VLESSURL, 'encryption') + '",');
     //Deprecate xtls-rprx-direct/xtls-rprx-vision #445: https://github.com/wulabing/Xray_onekey/issues/445
     //Не все серверы перешли на эту опцию, временно оставляем (direct) для совместимости
-    if VlessDecode(VLESSURL, 'security') = 'xtls' then
+   { if VlessDecode(VLESSURL, 'security') = 'xtls' then
       S.Add('                                    "flow": "xtls-rprx-direct",');
     //XRayGUI-v2.2 (update flow)
     if (VlessDecode(VLESSURL, 'security') = 'reality') or
       (VlessDecode(VLESSURL, 'flow') = 'xtls-rprx-vision') then
       S.Add('                                    "flow": "xtls-rprx-vision' + '",');
+   }
+
+    if (VlessDecode(VLESSURL, 'flow') = 'none') then
+      S.Add('                                    "flow": "",')
+    else
+      S.Add('                                    "flow": "' +
+        VlessDecode(VLESSURL, 'flow') + '",');
 
     //ID
     S.Add('                                    "id": "' +
@@ -984,6 +991,16 @@ procedure TMainForm.CreateVLESSConfig(VLESSURL, PORT, SAVEPATH: string);
     S.Add('                },');
     S.Add('                "streamSettings": {');
 
+    //if XHTTP
+    if VlessDecode(VLESSURL, 'type') = 'xhttp' then
+    begin
+      S.Add('                    "xhttpSettings": {');
+      S.Add('                    "path": "' + VlessDecode(VLESSURL, 'path') + '",');
+      S.Add('                    "hostname": "' +
+        VlessDecode(VLESSURL, 'host') + '"');
+      S.Add('                },');
+    end;
+
     //if gRPC
     if VlessDecode(VLESSURL, 'type') = 'grpc' then
     begin

xraygui/backup/xraygui.lpi

@@ -4,7 +4,7 @@
     <Version Value="12"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
-      <Title Value="XRayGUI v2.3.1"/>
+      <Title Value="XRayGUI v2.3.3"/>
       <Scaled Value="True"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>

xraygui/backup/xraygui.lps

@@ -40,7 +40,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="19"/>
-        <UsageCount Value="81"/>
+        <UsageCount Value="82"/>
       </Unit>
       <Unit>
         <Filename Value="unit1.pas"/>
@@ -50,9 +50,9 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="956"/>
-        <CursorPos X="17" Y="962"/>
-        <UsageCount Value="81"/>
+        <TopLine Value="1714"/>
+        <CursorPos X="38" Y="1742"/>
+        <UsageCount Value="82"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit>
@@ -62,21 +62,21 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="14"/>
         <CursorPos X="19"/>
-        <UsageCount Value="80"/>
+        <UsageCount Value="81"/>
       </Unit>
       <Unit>
         <Filename Value="portscan_trd.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="21"/>
-        <UsageCount Value="60"/>
+        <UsageCount Value="61"/>
       </Unit>
       <Unit>
         <Filename Value="update_trd.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="20"/>
-        <UsageCount Value="54"/>
+        <UsageCount Value="55"/>
       </Unit>
       <Unit>
         <Filename Value="reality_gen.pas"/>
@@ -86,18 +86,10 @@
         <ResourceBaseClass Value="Form"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="19"/>
-        <UsageCount Value="31"/>
+        <UsageCount Value="32"/>
       </Unit>
     </Units>
     <JumpHistory HistoryIndex="29">
-      <Position>
-        <Filename Value="unit1.pas"/>
-        <Caret Column="13"/>
-      </Position>
-      <Position>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="1337" Column="37" TopLine="680"/>
-      </Position>
       <Position>
         <Filename Value="unit1.pas"/>
         <Caret Line="1339" Column="37" TopLine="1309"/>
@@ -210,6 +202,14 @@
         <Filename Value="unit1.pas"/>
         <Caret Line="1726" Column="40" TopLine="1654"/>
       </Position>
+      <Position>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="999" Column="43" TopLine="980"/>
+      </Position>
+      <Position>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="1564" Column="3" TopLine="1561"/>
+      </Position>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>