Merge pull request #80 from FN-FAL113/Fix/netsh-and-block-checks

Fix: #79 and chores

Author: FN-FAL113

CS2ServerPicker.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.33328.57
+# Visual Studio Version 17
+VisualStudioVersion = 17.13.35818.85 d17.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CS2ServerPicker", "CS2ServerPicker\CS2ServerPicker.vbproj", "{E7AEBBA1-5F96-40A4-B5ED-0503A6BA4FD5}"
 EndProject

CS2ServerPicker/App.vb

@@ -1,5 +1,11 @@
 Public Class App
 
+#If DEBUG Then
+    Public Debug = True
+#Else
+    Public Debug = False
+#End If
+
     Private serverDictClustered As New Dictionary(Of String, String)
 
     Private serverDictUnclustered As New Dictionary(Of String, String)
@@ -56,6 +62,11 @@
     End Sub
 
     Private Async Sub App_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        ' Append to window title if using debug build
+        If Debug Then
+            Text = Text + " (DEBUG Build)"
+        End If
+
         Version_Check()
 
         Set_Pending_Operation(True)
@@ -131,7 +142,7 @@
             Environment.NewLine +
             "Author: FN-FAL113 (github username)" + Environment.NewLine +
             "License: GNU General Public License V3" + Environment.NewLine +
-            "App Version: 2.4.2",
+            "App Version: " + IIf(Debug, "DEBUG", "2.5.0"),
             "App Info"
         )
     End Sub

CS2ServerPicker/CS2ServerPicker.vbproj

@@ -149,7 +149,7 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Services\DataGridViewService.vb" />
-    <Compile Include="Services\ErrorService.vb" />
+    <Compile Include="Services\LogService.vb" />
     <Compile Include="Services\PingService.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">

CS2ServerPicker/My Project/AssemblyInfo.vb

@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.4.2.0")>
-<Assembly: AssemblyFileVersion("2.4.2.0")>
+<Assembly: AssemblyVersion("2.5.0.0")>
+<Assembly: AssemblyFileVersion("2.5.0.0")>
 <Assembly: NeutralResourcesLanguage("en")>

CS2ServerPicker/My Project/Settings.Designer.vb

@@ -0,0 +1,15 @@
+Imports System.IO
+
+Module LogService
+    Public Sub Log_To_File(text As String, Optional fileName As String = "")
+        File.AppendAllText(AppDomain.CurrentDomain.BaseDirectory +
+                           IIf(Not fileName = "", fileName, "log_" + DateTimeOffset.Now.ToUnixTimeSeconds.ToString()) + ".txt",
+                           text + Environment.NewLine)
+    End Sub
+
+    Public Sub Log_Exception_To_File(exception As Exception, errorFrom As String, Optional fileName As String = "")
+        File.AppendAllText(AppDomain.CurrentDomain.BaseDirectory +
+                           IIf(Not fileName = "", fileName, "error_" + DateTimeOffset.Now.ToUnixTimeSeconds.ToString()) + ".txt",
+                           errorFrom + Environment.NewLine + exception.Message)
+    End Sub
+End Module

CS2ServerPicker/Services/ErrorService.vb

@@ -1,4 +1,5 @@
-Imports System.Net
+Imports System.IO
+Imports System.Net
 Imports Newtonsoft.Json.Linq
 Module ServerService
 
@@ -9,6 +10,8 @@ Module ServerService
         {"India", "Chennai,Mumbai"}
     }
 
+    Private netshPath As String = Path.Combine(Environment.SystemDirectory, "netsh.exe")
+
     Public Async Function Fetch_Server_Data() As Task(Of String)
         Try
             Dim webReq As String = Await New WebClient().DownloadStringTaskAsync("https://api.steampowered.com/ISteamApps/GetSDRConfig/v1/?appid=730")
@@ -106,7 +109,7 @@ Module ServerService
         Await Block_Unblock_All_Servers(False, False)
 
         ' is passed as a reference, should be cloned in case of unwanted modification  
-        Dim serverDIctionary As Dictionary(Of String, String) = IIf(App.Get_Is_Clustered(), App.Get_Server_Dictionary_Clustered(), App.Get_Server_Dictionary_Unclustered())
+        Dim serverDictionary As Dictionary(Of String, String) = IIf(App.Get_Is_Clustered(), App.Get_Server_Dictionary_Clustered(), App.Get_Server_Dictionary_Unclustered())
 
         Dim presetServersDataGridView As DataGridView = Presets.PresetServerListDataGridView
 
@@ -115,7 +118,7 @@ Module ServerService
         Cancel_Pending_Ping()
 
         ' offload this blocking task into a seperate thread from the thread pool to lessen load in the UI thread
-        Await Task.Run(Sub() Handle_Block_Except_Preset_Servers(presetServersDataGridView, serverDIctionary, exceptPresetServers))
+        Await Task.Run(Sub() Handle_Block_Except_Preset_Servers(presetServersDataGridView, serverDictionary, exceptPresetServers))
 
         App.Set_Pending_Operation(False)
 
@@ -145,7 +148,7 @@ Module ServerService
             End If
 
             Try
-                proc.StartInfo.Arguments = "/c netsh advfirewall firewall add rule " +
+                proc.StartInfo.Arguments = $"/c {netshPath} advfirewall firewall add rule " +
                         "name=CS2ServerPicker_" + serverKvp.Key.Replace(" ", "") + " dir=out action=block protocol=ANY " +
                         "remoteip=" + serverKvp.Value
                 proc.Start()
@@ -168,7 +171,7 @@ Module ServerService
 
     Public Async Sub Block_Unblock_Selected_Servers(block As Boolean)
         Dim mainDataGridView As DataGridView = App.Get_DataGridView_Control()
-        Dim serverDIctionary As Dictionary(Of String, String) = IIf(App.Get_Is_Clustered(), App.Get_Server_Dictionary_Clustered(), App.Get_Server_Dictionary_Unclustered())
+        Dim serverDictionary As Dictionary(Of String, String) = IIf(App.Get_Is_Clustered(), App.Get_Server_Dictionary_Clustered(), App.Get_Server_Dictionary_Unclustered())
 
         Dim selectedRows As DataGridViewSelectedRowCollection = mainDataGridView.SelectedRows
 
@@ -189,14 +192,14 @@ Module ServerService
         Cancel_Pending_Ping()
 
         ' offload this blocking task into a seperate thread from the thread pool to lessen load in the UI thread
-        Await Task.Run(Sub() Handle_Block_Unblock_Selected_Servers(mainDataGridView, serverDIctionary, block))
+        Await Task.Run(Sub() Handle_Block_Unblock_Selected_Servers(mainDataGridView, serverDictionary, block))
 
         App.Set_Pending_Operation(False)
 
         Ping_Servers(selectedRows)
     End Sub
 
-    Private Sub Handle_Block_Unblock_Selected_Servers(mainDataGridView As DataGridView, serverDIctionary As Dictionary(Of String, String), block As Boolean)
+    Private Sub Handle_Block_Unblock_Selected_Servers(mainDataGridView As DataGridView, serverDictionary As Dictionary(Of String, String), block As Boolean)
         Dim proc As Process = Create_Custom_CMD_Process()
 
         ' traverse every datagrid row and block/unblock selected servers
@@ -208,9 +211,9 @@ Module ServerService
             Try
                 Dim region As String = row.Cells(1).Value
 
-                proc.StartInfo.Arguments = "/c netsh advfirewall firewall " + If(block, "add", "delete") + " rule " +
+                proc.StartInfo.Arguments = $"/c {netshPath} advfirewall firewall " + If(block, "add", "delete") + " rule " +
                         "name=CS2ServerPicker_" + region.Replace(" ", "") + If(block, " dir=out action=block protocol=ANY " +
-                        "remoteip=" + serverDIctionary.Item(region), "")
+                        "remoteip=" + serverDictionary.Item(region), "")
                 proc.Start()
                 proc.WaitForExit()
 
@@ -232,7 +235,7 @@ Module ServerService
     Public Async Function Block_Unblock_All_Servers(block As Boolean, Optional pingServers As Boolean = True) As Task
         ' this method was converted async since its invoked by other methods/tasks and
         ' it does not evaluate synchronously due to its async operation that must be awaited
-        Dim serverDIctionary As Dictionary(Of String, String) = IIf(App.Get_Is_Clustered(), App.Get_Server_Dictionary_Clustered(), App.Get_Server_Dictionary_Unclustered())
+        Dim serverDictionary As Dictionary(Of String, String) = IIf(App.Get_Is_Clustered(), App.Get_Server_Dictionary_Clustered(), App.Get_Server_Dictionary_Unclustered())
         Dim mainDataGridView As DataGridView = App.Get_DataGridView_Control()
 
         If App.Get_Pending_Operation() Then
@@ -246,7 +249,7 @@ Module ServerService
         Cancel_Pending_Ping()
 
         ' offload this blocking task into a seperate thread from the thread pool to lessen load in the UI thread
-        Await Task.Run(Sub() Handle_Block_Unblock_All_Servers(mainDataGridView, serverDIctionary, block))
+        Await Task.Run(Sub() Handle_Block_Unblock_All_Servers(mainDataGridView, serverDictionary, block))
 
         App.Set_Pending_Operation(False)
 
@@ -255,7 +258,7 @@ Module ServerService
         End If
     End Function
 
-    Private Sub Handle_Block_Unblock_All_Servers(mainDataGridView As DataGridView, serverDIctionary As Dictionary(Of String, String), block As Boolean)
+    Private Sub Handle_Block_Unblock_All_Servers(mainDataGridView As DataGridView, serverDictionary As Dictionary(Of String, String), block As Boolean)
         Dim proc As Process = Create_Custom_CMD_Process()
 
         ' traverse every datagrid row and block/unblock all servers
@@ -267,9 +270,9 @@ Module ServerService
             End If
 
             Try
-                proc.StartInfo.Arguments = "/c netsh advfirewall firewall " + If(block, "add", "delete") + " rule " +
+                proc.StartInfo.Arguments = $"/c {netshPath} advfirewall firewall " + If(block, "add", "delete") + " rule " +
                 "name=CS2ServerPicker_" + region.Replace(" ", "") + If(block, " dir=out action=block protocol=ANY " +
-                    "remoteip=" + serverDIctionary.Item(region), "")
+                    "remoteip=" + serverDictionary.Item(region), "")
                 proc.Start()
                 proc.WaitForExit()
 
@@ -294,8 +297,7 @@ Module ServerService
         Dim is_rule_exist As Boolean
         Dim region_trimmed As String = region.Replace(" ", "")
 
-        proc.StartInfo.Arguments = "/c netsh advfirewall firewall show rule name=CS2ServerPicker_" +
-                region_trimmed + " | findstr CS2ServerPicker_" + region_trimmed
+        proc.StartInfo.Arguments = $"/c {netshPath} advfirewall firewall show rule name=CS2ServerPicker_" + region_trimmed
         proc.Start()
         proc.WaitForExit()
 

CS2ServerPicker/Services/LogService.vb

@@ -4,7 +4,7 @@ Imports Newtonsoft.Json.Linq
 Module VersionService
     Public Async Sub Version_Check()
         Try
-            If Not My.Settings.VersionCheckOnStartup Then
+            If Not My.Settings.VersionCheckOnStartup Or App.Debug Then
                 Return
             End If
 

CS2ServerPicker/Services/ServerService.vb

@@ -1,4 +1,8 @@
-Public Class Settings
+Imports System.IO
+
+Public Class Settings
+
+    Private netshPath As String = Path.Combine(Environment.SystemDirectory, "netsh.exe")
 
     Private Sub VersionCheckerCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles VersionCheckerCheckBox.CheckedChanged
         My.Settings.VersionCheckOnStartup = VersionCheckerCheckBox.Checked
@@ -20,7 +24,7 @@
         Try
             Dim proc As Process = Create_Custom_CMD_Process()
 
-            proc.StartInfo.Arguments = "/c netsh advfirewall reset"
+            proc.StartInfo.Arguments = $"/c {netshPath} advfirewall reset"
             proc.Start()
             proc.WaitForExit()
 
@@ -48,7 +52,7 @@
         Try
             Dim proc As Process = Create_Custom_CMD_Process()
 
-            proc.StartInfo.Arguments = "/c netsh advfirewall show allprofiles state"
+            proc.StartInfo.Arguments = $"/c {netshPath} advfirewall show allprofiles state"
             proc.Start()
             proc.WaitForExit()
 
@@ -63,7 +67,7 @@
                     Return
                 End If
 
-                proc.StartInfo.Arguments = "/c netsh advfirewall set allprofiles state on"
+                proc.StartInfo.Arguments = $"/c {netshPath} advfirewall set allprofiles state on"
                 proc.Start()
                 proc.WaitForExit()