v2.2 + Fix vless-grpc configuration (serviceName)

Author: AKotov-dev

xraygui/backup/unit1.pas

@@ -973,11 +973,13 @@ procedure TMainForm.CreateVLESSConfig(VLESSURL, PORT, SAVEPATH: string);
     S.Add('                "streamSettings": {');
 
     //if gRPC
-    if Pos('type=grpc', VLESSURL) <> 0 then
+    //if Pos('type=grpc', VLESSURL) <> 0 then
+    if VlessDecode(VLESSURL, 'type') = 'grpc' then
     begin
       S.Add('                    "grpcSettings": {');
       S.Add('                    "multiMode": false,');
-      S.Add('                    "serviceName": "grpc"');
+      //S.Add('                    "serviceName": "vless-grpc"');
+      S.Add('                    "serviceName": "' + VlessDecode(VLESSURL, 'serviceName') + '"');
       S.Add('                },');
     end;
 
@@ -1712,13 +1714,13 @@ procedure TMainForm.FormShow(Sender: TObject);
   FUpdateThread.Priority := tpNormal;
 end;
 
-//Восстанавливаем индекс Check
+//Восстанавливаем индекс Check (если есть) + ItemIndex ставим на Check
 procedure TMainForm.IniPropStorage1RestoreProperties(Sender: TObject);
 begin
   if IniPropStorage1.ReadInteger('findex', 100) <> 100 then
   begin
     ConfigBox.Checked[IniPropStorage1.ReadInteger('findex', 100)] := True;
-    ConfigBox.ItemIndex:=IniPropStorage1.ReadInteger('findex', 100);
+    ConfigBox.ItemIndex := IniPropStorage1.ReadInteger('findex', 100);
   end;
 end;
 

xraygui/backup/xraygui.lps

@@ -50,8 +50,8 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="1706"/>
-        <CursorPos X="68" Y="1721"/>
+        <TopLine Value="966"/>
+        <CursorPos X="44" Y="986"/>
         <UsageCount Value="80"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -89,7 +89,7 @@
         <UsageCount Value="30"/>
       </Unit>
     </Units>
-    <JumpHistory HistoryIndex="27">
+    <JumpHistory HistoryIndex="28">
       <Position>
         <Filename Value="unit1.pas"/>
         <Caret Line="196" TopLine="191"/>
@@ -202,6 +202,10 @@
         <Filename Value="unit1.pas"/>
         <Caret Line="1721" Column="70" TopLine="1715"/>
       </Position>
+      <Position>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="1711" Column="52" TopLine="1670"/>
+      </Position>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>

xraygui/lib/x86_64-linux/unit1.o

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

xraygui/lib/x86_64-linux/unit1.ppu

@@ -973,16 +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": "grpc"');
+      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/package_project/xraygui.prj

@@ -50,8 +50,8 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="1706"/>
-        <CursorPos X="71" Y="1715"/>
+        <TopLine Value="966"/>
+        <CursorPos X="15" Y="975"/>
         <UsageCount Value="80"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -89,7 +89,7 @@
         <UsageCount Value="30"/>
       </Unit>
     </Units>
-    <JumpHistory HistoryIndex="27">
+    <JumpHistory HistoryIndex="28">
       <Position>
         <Filename Value="unit1.pas"/>
         <Caret Line="196" TopLine="191"/>
@@ -202,6 +202,10 @@
         <Filename Value="unit1.pas"/>
         <Caret Line="1721" Column="70" TopLine="1715"/>
       </Position>
+      <Position>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="1711" Column="52" TopLine="1670"/>
+      </Position>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>