v2.2 + Fix vless-grpc/xtls configuration builder

Author: AKotov-dev

xraygui/backup/unit1.pas

@@ -957,7 +957,7 @@ procedure TMainForm.CreateVLESSConfig(VLESSURL, PORT, SAVEPATH: string);
     //Не все серверы перешли на эту опцию, временно оставляем (direct) для совместимости
     if VlessDecode(VLESSURL, 'security') = 'xtls' then
       S.Add('                                    "flow": "xtls-rprx-direct",');
-    if VlessDecode(VLESSURL, 'security') = 'reality' then
+    if (VlessDecode(VLESSURL, 'security') = 'reality') or (VlessDecode(VLESSURL, 'flow') = 'xtls-rprx-vision') then
       S.Add('                                    "flow": "' +
         VlessDecode(VLESSURL, 'flow') + '",');
 
@@ -973,18 +973,17 @@ procedure TMainForm.CreateVLESSConfig(VLESSURL, PORT, SAVEPATH: string);
     S.Add('                "streamSettings": {');
 
     //if gRPC
-    //if Pos('type=grpc', VLESSURL) <> 0 then
     if VlessDecode(VLESSURL, 'type') = 'grpc' then
     begin
       S.Add('                    "grpcSettings": {');
       S.Add('                    "multiMode": false,');
-      //S.Add('                    "serviceName": "vless-grpc"');
-      S.Add('                    "serviceName": "' + VlessDecode(VLESSURL, 'serviceName') + '"');
+      S.Add('                    "serviceName": "' +
+        VlessDecode(VLESSURL, 'serviceName') + '"');
       S.Add('                },');
     end;
 
     //if KCP
-    if Pos('type=kcp', VLESSURL) <> 0 then
+    if VlessDecode(VLESSURL, 'type') = 'kcp' then
     begin
       S.Add('                    "kcpSettings": {');
       S.Add('                    "seed": "' + VlessDecode(VLESSURL, 'seed') + '"');

xraygui/backup/xraygui.lps

@@ -50,8 +50,8 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="966"/>
-        <CursorPos X="44" Y="986"/>
+        <TopLine Value="951"/>
+        <CursorPos X="109" Y="960"/>
         <UsageCount Value="80"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>

xraygui/lib/x86_64-linux/unit1.o

@@ -87,121 +87,122 @@ toolversion=3.2
 [INFO]
 0=v2.2
 1=+ Fix vless-grpc configuration (serviceName)
-2=+ Correction of deleting configurations in Connected mode
-3=+ Correcting the pointer setting in the list of configurations at the first start
-4=+ Packages for Mageia-8/9 and Ubuntu
-5=
-6=v2.1
-7=+ /usr/bin/xray-update: switching to curl
-8=+ Removing wget and fping from dependencies (spec)
-9=+ Packages for Mageia-8/9 and Ubuntu
-10=
-11=v2.0
-12=+ Improved /usr/bin/xray-update
-13=+ Packages for Mageia-8/9 and Ubuntu
-14=
-15=v1.9
-16=+ Recompilation in Lazarus-3.2
-17=+ Added qrencode dependency
-18=+ Display QR code for connections
-19=+ Packages for Mageia-8/9 and Ubuntu
-20=
-21=Note: The QR code simplifies the procedure for connecting your smartphone by scanning it in the client application. Test for LG Q6 + NekoBox-1.3.1 passed.
-22=
-23=v1.8
-24=+ Bypassing domain zones (cn, ru, by, ir, ...)
-25=+ Improved /etc/systemd/user/xray.service
-26=+ Packages for Mageia-9 and Ubuntu
-27=
-28=v1.7
-29=+ Reality generator: SNI list expanded
-30=+ Comsetic edits, code optimization
-31=+ Packages for Mageia-9 and Ubuntu
-32=
-33=v1.6
-34=+ REALITY support
-35=+ Simple REALITY configurator (Client-Server)
-36=+ Packages for Mageia-9 and Ubuntu
-37=
-38=v1.5
-39=+ System-Wide Proxy (SWP)
-40=+ Additional port 8889 (HTTP/HTTPS/FTP)
-41=+ Correction of tags for reading connection logs
-42=+ Dependencies: lib64proxy-gnome lib64proxy-kde
-43=+ Packages for Mageia-9 and Ubuntu
-44=
-45=**Note:** System-Wide Proxy supported in Budgie, GNOME, Cinnamon, MATE, KDE-5.  [Read more...](https://github.com/AKotov-dev/XRayGUI)
-46=
-47=v1.4
-48=+ Support VLESS + KCP
-49=+ Packages for Mageia-9 and Ubuntu
-50=
-51=v1.2
-52=+ Default: "allowInsecure": true
-53=+ Default connection: 127.0.0.1:1080
-54=+ Improved Сonfiguration building
-55=+ Improved startup/update services
-56=+ Switching logging to the "warning" level
-57=+ RPM packages for Mageia-8 and Mageia-9
-58=
-59=v1.1
-60=+ Installing xray-core from the GitHub
-61=+ xray-core installation/update directory ~/.config/xraygui/xray
-62=+ RPM packages for Mageia-8 and Mageia-9
-63=
-64=v1.0
-65=+ Update Xray-core v1.6.0
-66=+ Auto-update Xray-Core at GUI startup
-67=+ RPM packages for Mageia-8 and Mageia-9
-68=
-69=v0.9
-70=+ Improved startup control (xray/port)
-71=+ Prevention the launch of the second copy of the program
-72=
-73=v0.8-1
-74=+ Update: Xray-core v1.5.9
-75=
-76=v0.8
-77=+ Switching to systemd (autostart from the user)
-78=+ Correction of the spec file (rpm/deb)
-79=+ Autostart testing in Mageia/LUbuntu - passed
-80=
-81=v0.7
-82=+ Vless+gRPC and Trojan+gRPC support
-83=+ General test:
-84=VMESS TLS - passed
-85=VMESS non TLS - passed
-86=
-87=VLESS TLS - passed
-88=VLESS non TLS - passed
-89=VLESS + WS TLS - passed
-90=VLESS + WS non TLS - passed
-91=VLESS + gRPC - passed
-92=
-93=Trojan - passed
-94=Trojan + WS - passed
-95=Trojan + gRPC - passed
-96=
-97=v0.6
-98=+ Trojan protocol support
-99=+ Proxy launch control in a separate thread
-100=+ Optimization of Vmess/Vless/SS/Trojan configurations
-101=
-102=v0.5
-103=+ Supported protocols: VMESS/VLESS (ws, ws+tls) and SS (without obfs)
-104=+ Changed the file type of uploading/saving the list of configurations  to *.proxy
-105=+ Excluded URL insertion from PopUp menu to save duplicate search
-106=
-107=v0.4
-108=+ Optimization of log output
-109=+ Optimization of general perception (visual load)
-110=
-111=v0.3
-112=+ Autostart proxy after reboot
-113=+ Disabling xray before updating/deleting rpm/deb (spec)
-114=
-115=v0.2
-116=+ PopUp menu: Paste from clipboard
-117=+ Cosmetic edits, hints, etc...
-118=
-119=v0.1 - initial release
+2=+ Correction of [xtls-rprx-direct/xtls-rprx-vision]( https://github.com/wulabing/Xray_onekey/issues/445)
+3=+ Correction of deleting configurations in Connected mode
+4=+ Correcting the pointer setting in the list of configurations at the first start
+5=+ Packages for Mageia-8/9 and Ubuntu
+6=
+7=v2.1
+8=+ /usr/bin/xray-update: switching to curl
+9=+ Removing wget and fping from dependencies (spec)
+10=+ Packages for Mageia-8/9 and Ubuntu
+11=
+12=v2.0
+13=+ Improved /usr/bin/xray-update
+14=+ Packages for Mageia-8/9 and Ubuntu
+15=
+16=v1.9
+17=+ Recompilation in Lazarus-3.2
+18=+ Added qrencode dependency
+19=+ Display QR code for connections
+20=+ Packages for Mageia-8/9 and Ubuntu
+21=
+22=Note: The QR code simplifies the procedure for connecting your smartphone by scanning it in the client application. Test for LG Q6 + NekoBox-1.3.1 passed.
+23=
+24=v1.8
+25=+ Bypassing domain zones (cn, ru, by, ir, ...)
+26=+ Improved /etc/systemd/user/xray.service
+27=+ Packages for Mageia-9 and Ubuntu
+28=
+29=v1.7
+30=+ Reality generator: SNI list expanded
+31=+ Comsetic edits, code optimization
+32=+ Packages for Mageia-9 and Ubuntu
+33=
+34=v1.6
+35=+ REALITY support
+36=+ Simple REALITY configurator (Client-Server)
+37=+ Packages for Mageia-9 and Ubuntu
+38=
+39=v1.5
+40=+ System-Wide Proxy (SWP)
+41=+ Additional port 8889 (HTTP/HTTPS/FTP)
+42=+ Correction of tags for reading connection logs
+43=+ Dependencies: lib64proxy-gnome lib64proxy-kde
+44=+ Packages for Mageia-9 and Ubuntu
+45=
+46=**Note:** System-Wide Proxy supported in Budgie, GNOME, Cinnamon, MATE, KDE-5.  [Read more...](https://github.com/AKotov-dev/XRayGUI)
+47=
+48=v1.4
+49=+ Support VLESS + KCP
+50=+ Packages for Mageia-9 and Ubuntu
+51=
+52=v1.2
+53=+ Default: "allowInsecure": true
+54=+ Default connection: 127.0.0.1:1080
+55=+ Improved Сonfiguration building
+56=+ Improved startup/update services
+57=+ Switching logging to the "warning" level
+58=+ RPM packages for Mageia-8 and Mageia-9
+59=
+60=v1.1
+61=+ Installing xray-core from the GitHub
+62=+ xray-core installation/update directory ~/.config/xraygui/xray
+63=+ RPM packages for Mageia-8 and Mageia-9
+64=
+65=v1.0
+66=+ Update Xray-core v1.6.0
+67=+ Auto-update Xray-Core at GUI startup
+68=+ RPM packages for Mageia-8 and Mageia-9
+69=
+70=v0.9
+71=+ Improved startup control (xray/port)
+72=+ Prevention the launch of the second copy of the program
+73=
+74=v0.8-1
+75=+ Update: Xray-core v1.5.9
+76=
+77=v0.8
+78=+ Switching to systemd (autostart from the user)
+79=+ Correction of the spec file (rpm/deb)
+80=+ Autostart testing in Mageia/LUbuntu - passed
+81=
+82=v0.7
+83=+ Vless+gRPC and Trojan+gRPC support
+84=+ General test:
+85=VMESS TLS - passed
+86=VMESS non TLS - passed
+87=
+88=VLESS TLS - passed
+89=VLESS non TLS - passed
+90=VLESS + WS TLS - passed
+91=VLESS + WS non TLS - passed
+92=VLESS + gRPC - passed
+93=
+94=Trojan - passed
+95=Trojan + WS - passed
+96=Trojan + gRPC - passed
+97=
+98=v0.6
+99=+ Trojan protocol support
+100=+ Proxy launch control in a separate thread
+101=+ Optimization of Vmess/Vless/SS/Trojan configurations
+102=
+103=v0.5
+104=+ Supported protocols: VMESS/VLESS (ws, ws+tls) and SS (without obfs)
+105=+ Changed the file type of uploading/saving the list of configurations  to *.proxy
+106=+ Excluded URL insertion from PopUp menu to save duplicate search
+107=
+108=v0.4
+109=+ Optimization of log output
+110=+ Optimization of general perception (visual load)
+111=
+112=v0.3
+113=+ Autostart proxy after reboot
+114=+ Disabling xray before updating/deleting rpm/deb (spec)
+115=
+116=v0.2
+117=+ PopUp menu: Paste from clipboard
+118=+ Cosmetic edits, hints, etc...
+119=
+120=v0.1 - initial release

xraygui/lib/x86_64-linux/unit1.ppu

@@ -957,7 +957,9 @@ procedure TMainForm.CreateVLESSConfig(VLESSURL, PORT, SAVEPATH: string);
     //Не все серверы перешли на эту опцию, временно оставляем (direct) для совместимости
     if VlessDecode(VLESSURL, 'security') = 'xtls' then
       S.Add('                                    "flow": "xtls-rprx-direct",');
-    if VlessDecode(VLESSURL, 'security') = 'reality' then
+    //XRayGUI-v2.2 (update flow)
+    if (VlessDecode(VLESSURL, 'security') = 'reality') or
+      (VlessDecode(VLESSURL, 'flow') = 'xtls-rprx-vision') then
       S.Add('                                    "flow": "' +
         VlessDecode(VLESSURL, 'flow') + '",');
 

xraygui/package_project/xraygui.prj

@@ -40,7 +40,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="19"/>
-        <UsageCount Value="80"/>
+        <UsageCount Value="81"/>
       </Unit>
       <Unit>
         <Filename Value="unit1.pas"/>
@@ -50,9 +50,9 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="966"/>
-        <CursorPos X="15" Y="975"/>
-        <UsageCount Value="80"/>
+        <TopLine Value="950"/>
+        <CursorPos X="32" Y="960"/>
+        <UsageCount Value="81"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit>
@@ -62,21 +62,21 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="14"/>
         <CursorPos X="19"/>
-        <UsageCount Value="79"/>
+        <UsageCount Value="80"/>
       </Unit>
       <Unit>
         <Filename Value="portscan_trd.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="21"/>
-        <UsageCount Value="59"/>
+        <UsageCount Value="60"/>
       </Unit>
       <Unit>
         <Filename Value="update_trd.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="20"/>
-        <UsageCount Value="53"/>
+        <UsageCount Value="54"/>
       </Unit>
       <Unit>
         <Filename Value="reality_gen.pas"/>
@@ -86,7 +86,7 @@
         <ResourceBaseClass Value="Form"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="19"/>
-        <UsageCount Value="30"/>
+        <UsageCount Value="31"/>
       </Unit>
     </Units>
     <JumpHistory HistoryIndex="28">