first steps in RCON test button in configs

Author: maxijabase

UI/MainWindow/MainWindowServerQuery.cs

@@ -29,7 +29,7 @@ private void Server_Query()
 
             try
             {
-                using var server = ServerQuery.GetServerInstance(c.RConIP, c.RConPort, false, 500, 500, 2, true);
+                using var server = ServerQuery.GetServerInstance(c.RConIP, c.RConPort, false, 1000, 1000, 2, true);
                 var serverInfo = server.GetInfo();
 
                 if (serverInfo == null)

UI/Windows/ConfigWindow.xaml

@@ -191,7 +191,7 @@
                 <PasswordBox x:Name="C_FTPPW" PasswordChanged="C_FTPPW_TextChanged" />
                 <TextBlock x:Name="FTPDirBlock" IsHitTestVisible="False" />
                 <TextBox x:Name="C_FTPDir" TextChanged="C_FTPDir_TextChanged" />
-                <Button x:Name="FTPTestConnectionButton" Content="Test Connection" Click="FTPTestConnectionButton_Click" HorizontalAlignment="Left" Margin="0,20,0,-10"/>
+                <Button x:Name="FTPTestConnectionButton" Content="Test Connection" Click="FTPTestConnectionButton_Click" HorizontalAlignment="Left" Margin="0,15,0,-10"/>
               </StackPanel>
             </Grid>
             <Grid Grid.Column="1" Margin="5,0,0,0">
@@ -245,6 +245,11 @@
                 <TextBox Name="C_RConPort" TextChanged="C_RConPort_TextChanged" />
                 <TextBlock Name="RConPWBlock" IsHitTestVisible="False" />
                 <PasswordBox Name="C_RConPW" PasswordChanged="C_RConPW_TextChanged" />
+                <Button x:Name="RCONTestConnectionButton" 
+                        Margin="0,15,0,0" 
+                        HorizontalAlignment="Left" 
+                        Content="Test connection"
+                        Click="RCONTestConnectionButton_Click"/>
               </StackPanel>
             </Grid>
             <Grid Grid.Column="1">

UI/Windows/ConfigWindow.xaml.cs

@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -17,6 +18,7 @@
 using Microsoft.WindowsAPICodePack.Dialogs;
 using SPCode.Interop;
 using SPCode.Utils;
+using ValveQuery.GameServer;
 using static SPCode.Interop.TranslationProvider;
 
 namespace SPCode.UI.Windows
@@ -503,23 +505,23 @@ private void C_FTPDir_TextChanged(object sender, TextChangedEventArgs e)
 
         private async void FTPTestConnectionButton_Click(object sender, RoutedEventArgs e)
         {
-            var result = await this.ShowProgressAsync("Testing the FTP connection with the provided details...", "Please wait...", settings: Program.MainWindow.MetroDialogOptions);
+            var dialog = await this.ShowProgressAsync("Testing the FTP connection with the provided details...", "Please wait...", settings: Program.MainWindow.MetroDialogOptions);
             var ftp = new FTP(C_FTPHost.Text, C_FTPUser.Text, C_FTPPW.Password);
-            result.SetIndeterminate();
-            result.SetCancelable(true);
-            result.Canceled += async delegate
+            dialog.SetIndeterminate();
+            dialog.SetCancelable(true);
+            dialog.Canceled += async delegate
             {
-                await result?.CloseAsync();
+                await dialog?.CloseAsync();
                 return;
             };
             if (await ftp.TestConnection())
             {
-                await result?.CloseAsync();
+                await dialog?.CloseAsync();
                 await this.ShowMessageAsync("Success", "Connection successful!", settings: Program.MainWindow.MetroDialogOptions);
             }
             else
             {
-                await result?.CloseAsync();
+                await dialog?.CloseAsync();
                 await this.ShowMessageAsync("Error", $"The connection could not be made! Message: {ftp.ErrorMessage}", settings: Program.MainWindow.MetroDialogOptions);
             }
         }
@@ -560,6 +562,48 @@ private void C_RConPW_TextChanged(object sender, RoutedEventArgs e)
             Program.Configs[ConfigListBox.SelectedIndex].RConPassword = C_RConPW.Password;
         }
 
+        private async void RCONTestConnectionButton_Click(object sender, RoutedEventArgs e)
+        {
+            var dialog = await this.ShowProgressAsync("Testing RCON connection...", "Please wait...", settings: Program.MainWindow.MetroDialogOptions);
+            dialog.SetIndeterminate();
+            dialog.SetCancelable(true);
+            dialog.Canceled += async delegate
+            {
+                await dialog?.CloseAsync();
+                return;
+            };
+            var success = true;
+            var errorMsg = "";
+            try
+            {
+                await Dispatcher.InvokeAsync(() =>
+                {
+                    var server = ServerQuery.GetServerInstance(C_RConIP.Text, ushort.Parse(C_RConPort.Text));
+                    server.GetInfo();
+                    if (!server.GetControl(C_RConPW.Password, false))
+                    {
+                        success = false;
+                        errorMsg = "Invalid credentials!";
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                success = false;
+                errorMsg = ex.Message;
+            }
+
+            await dialog?.CloseAsync();
+            if (success)
+            {
+                await this.ShowMessageAsync("Success", "The connection was successful!", settings: Program.MainWindow.MetroDialogOptions);
+            }
+            else
+            {
+                await this.ShowMessageAsync("Error", $"The connection could not be made! Message: {errorMsg}", settings: Program.MainWindow.MetroDialogOptions);
+            }
+        }
+
         private void C_RConCmds_TextChanged(object sender, RoutedEventArgs e)
         {
             if (!AllowChange)