README.md

@@ -38,14 +38,16 @@ finally {
 
 ## Rcon Class
 
-#### `Send($cmd)`
+#### `Send($cmd) | Send($cmd, $timeout)`
 
 ```powershell
 $rcon.Send("mapname")
 
 $rcon.Send("g_gametype dm")
 
-$rcon.Send("map_rotate")
+$rcon.Send("map_rotate", 2000)
 ```
 
 If the command returns a response it will be printed to the console.
+
+Pass an optional timeout (ms) for commands that return responses in fragments. (status, map_rotate etc...)

Taskfile.yml

@@ -1,15 +0,0 @@
-version: '3'
-
-tasks:
-  bump:
-    desc: 'Bump the module version in the .psd1 file. Usage: "task bump -- show" or "task bump -- [patch|minor|major]".'
-    preconditions:
-      - sh: 'pwsh -c "if (Get-Command bump) { exit 0 } else { exit 1 }"'
-        msg: "The 'bump' command is not available. Please install the required tools to use this command."
-    cmds:
-      - |
-        {{if eq .CLI_ARGS "show"}}
-          pwsh -c "bump show -f lib/Q3Rcon.psd1 -p \"ModuleVersion\s*=\s'(\d+\.\d+\.\d+)'\""
-        {{else}}
-          pwsh -c "bump {{.CLI_ARGS}} -w -f lib/Q3Rcon.psd1 -p \"ModuleVersion\s*=\s'(\d+\.\d+\.\d+)'\""
-        {{end}}

examples/cli.ps1

@@ -12,15 +12,20 @@ function Read-HostUntilEmpty {
             break
         }
 
-        $resp = $rcon.Send($line)
-        Write-Host (Remove-ColourCodes $resp)
+        if ($line -in @('fast_restart', 'map_rotate', 'map_restart')) {
+            $cmd = $line -replace '(?:^|_)(\p{L})', { $_.Groups[1].Value.ToUpper() }
+            $rcon.$cmd()
+        }
+        elseif ($line.StartsWith('map mp_')) {
+            $mapname = $line.Split()[1]
+            $rcon.SetMap($mapname)
+        }
+        else {
+            $rcon.Send($line)
+        }
     }
 }
 
-function Remove-ColourCodes($str) {
-    return $str -replace '\^[0-9]', ''
-}
-
 function Get-ConnFromPSD1 {
     $configpath = Join-Path $PSScriptRoot 'config.psd1'
     return Import-PowerShellDataFile -Path $configpath

examples/gui.ps1

@@ -75,19 +75,27 @@ function Send-RconCommand() {
     param($rcon)
 
     $line = $OTB.Text
-    Write-Debug "Sending command: $line"
-    $resp = $rcon.Send($line)
+    $line | Write-Debug
+    if ($line -in @('fast_restart', 'map_rotate', 'map_restart')) {
+        $RLbl.Text = ''
+        $cmd = $line -replace '(?:^|_)(\p{L})', { $_.Groups[1].Value.ToUpper() }
+        $rcon.$cmd()
+    }
+    elseif ($line.StartsWith('map mp_')) {
+        $RLbl.Text = ''
+        $mapname = $line.Split()[1]
+        $rcon.SetMap($mapname)
+    }
+    else {
+        $resp = $rcon.Send($line)
+    }
 
     if ($resp -match '^["](?<name>[a-z_]+)["]\sis[:]\s["](?<value>.*?)\^7["]\s') {
-        $RLbl.Text = Remove-ColourCodes "$($Matches.name): $($Matches.value)"
+        $RLbl.Text = $Matches.name + ': ' + $Matches.value
     }
     $OTB.Text = ''
 }
 
-function Remove-ColourCodes($str) {
-    return $str -replace '\^[0-9]', ''
-}
-
 
 function Get-ConnFromPSD1 {
     $configpath = Join-Path $PSScriptRoot 'config.psd1'

examples/messages.ps1

@@ -16,7 +16,7 @@ function Send-Message {
     param($rcon)
 
     $msg = Get-DadJoke
-    Write-Debug "Sending message: $msg"
+    $msg | Write-Debug
     $rcon.Say($msg)
 }
 
@@ -25,7 +25,13 @@ try {
     $conn = Get-ConnFromPSD1
     $rcon = Connect-Rcon -hostname $conn.host -port $conn.port -passwd $conn.passwd
 
-    Send-Message -rcon $rcon
+    $stopWatch = [system.diagnostics.stopwatch]::StartNew()
+    $timeSpan = New-TimeSpan -Seconds 30
+    do {
+        Send-Message -rcon $rcon
+        Start-Sleep -Seconds 10
+    } until ($stopWatch.Elapsed -ge $timeSpan)
+    $stopWatch.Stop()
 }
 finally {
     Disconnect-Rcon -rcon $rcon

lib/base.ps1

@@ -122,7 +122,7 @@ class Base {
                 try {
                     $bytesReceived = $this._socket.Receive($this._receiveBuffer)
                     if ($bytesReceived -gt 0) {
-                        $dataStartIndex = [Math]::Min($headerLength - 1, $bytesReceived)
+                        $dataStartIndex = [Math]::Min($headerLength, $bytesReceived)
                         $responseText = [System.Text.Encoding]::ASCII.GetString($this._receiveBuffer, $dataStartIndex, $bytesReceived - $dataStartIndex)
                         $responseData.Append($responseText) | Out-Null
                     }