use -Seconds

values with colour codes now returned

README.md

@@ -35,3 +35,19 @@ finally {
     Disconnect-Rcon -rcon $rcon
 }
 ```
+
+## Rcon Class
+
+#### `Send($cmd) | Send($cmd, $timeout)`
+
+```powershell
+$rcon.Send("mapname")
+
+$rcon.Send("g_gametype dm")
+
+$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...)

examples/cli.ps1

@@ -14,12 +14,15 @@ Function Read-HostUntilEmpty {
 
         if ($line -in @("fast_restart", "map_rotate", "map_restart")) {
             $cmd = $line -replace '(?:^|_)(\p{L})', { $_.Groups[1].Value.ToUpper() }
-            $resp = $rcon.$cmd()
+            $rcon.$cmd()
+        }
+        elseif ($line.StartsWith("map mp_")) {
+            $mapname = $line.Split()[1]
+            $rcon.SetMap($mapname)
         }
         else {
-            $resp = $rcon.Send($line) 
+            $rcon.Send($line)
         }
-        $resp | Write-Host
     }
 }
 

examples/commands.ps1

@@ -17,7 +17,7 @@ try {
     "Rotating the map..."
     $rcon.MapRotate()
 
-    Start-Sleep -Milliseconds 3000 # wait for map to rotate
+    Start-Sleep -Seconds 3 # wait for map to rotate
 
     $rcon.Map()
 }

examples/gui.ps1

@@ -10,8 +10,9 @@ $OKB = New-Object System.Windows.Forms.Button
 $OTB = New-Object System.Windows.Forms.TextBox
 $CAB = New-Object System.Windows.Forms.Button
 $Lbl = New-Object System.Windows.Forms.Label
+$RLbl = New-Object System.Windows.Forms.Label
 
-Function InitForm {
+Function New-Form {
     $form = New-Object System.Windows.Forms.Form
     $form.Text = "Q3Rcon Client"
     $form.Size = New-Object System.Drawing.Size(275, 200)
@@ -19,17 +20,17 @@ Function InitForm {
     return $form  
 }
 
-Function AddOkButton {
+Function Add-OkButton {
     param($form, $rcon)
 
     $OKB.Location = New-Object System.Drawing.Size(65, 100)
     $OKB.Size = New-Object System.Drawing.Size(65, 23)
     $OKB.Text = "Send"
-    $OKB.Add_Click({ SendRconCommand -rcon $rcon })
+    $OKB.Add_Click({ Send-RconCommand -rcon $rcon })
     $form.Controls.Add($OKB)
 }
 
-Function AddCloseButton($form) {
+Function Add-CloseButton($form) {
     $CAB.Location = New-Object System.Drawing.Size(140, 100)
     $CAB.Size = New-Object System.Drawing.Size(65, 23)
     $CAB.Text = "Close"
@@ -37,35 +38,61 @@ Function AddCloseButton($form) {
     $form.Controls.Add($CAB)    
 }
 
-Function AddLabel($form) {
+Function Add-Label($form) {
     $Lbl.Location = New-Object System.Drawing.Size(10, 20)
     $Lbl.Size = New-Object System.Drawing.Size(260, 20)
     $Lbl.Text = "Input Rcon Command:"
     $form.Controls.Add($Lbl)    
 }
 
-Function AddTextBox {
+Function Add-TextBox {
     param($form, $rcon)
 
     $OTB.Location = New-Object System.Drawing.Size(10, 50)
     $OTB.Size = New-Object System.Drawing.Size(240, 20)
     $OTB.Add_KeyDown({
             if ($_.KeyCode -eq [System.Windows.Forms.Keys]::Enter) {
-                SendRconCommand -rcon $rcon
+                Send-RconCommand -rcon $rcon
             }
         })
     $form.Controls.Add($OTB)    
 }
 
-Function FinalizeForm($form) {
-    $form.Topmost = $true
-    $form.Add_Shown({ $form.Activate() })    
+Function Add-ResponseLabel($form) {
+    $RLbl.Location = New-Object System.Drawing.Size(10, 75)
+    $RLbl.Size = New-Object System.Drawing.Size(260, 20)
+    $RLbl.Text = ""
+    $form.Controls.Add($RLbl) 
 }
 
-Function SendRconCommand() {
+Function Start-Form($form) {
+    $form.Topmost = $true
+    $form.Add_Shown({ $form.Activate() })
+    [void] $form.ShowDialog()
+}
+
+Function Send-RconCommand() {
     param($rcon)
 
-    $rcon.Send($OTB.Text)
+    $line = $OTB.Text
+    $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 = $Matches.name + ": " + $Matches.value
+    }
     $OTB.Text = ""
 }
 
@@ -76,21 +103,22 @@ Function Get-ConnFromPSD1 {
 }
 
 Function Main {
-    try {
+    BEGIN {
         $conn = Get-ConnFromPSD1
         $rcon = Connect-Rcon -hostname $conn.host -port $conn.port -passwd $conn.passwd
         Write-Host $rcon.base.ToString() -ForegroundColor Green
 
-        $form = InitForm
-        AddOkButton -form $form -rcon $rcon
-        AddCloseButton($form)
-        AddLabel($form)
-        AddTextBox -form $form -rcon $rcon
-        FinalizeForm($form)
-
-        [void] $form.ShowDialog()
+        $form = New-Form
+        Add-OkButton -form $form -rcon $rcon
+        Add-CloseButton($form)
+        Add-Label($form)
+        Add-ResponseLabel($form)
+        Add-TextBox -form $form -rcon $rcon
     }
-    finally {
+    PROCESS {
+        Start-Form($form)
+    }
+    END {
         Disconnect-Rcon -rcon $rcon
     }    
 }

examples/messages.ps1

@@ -0,0 +1,38 @@
+[cmdletbinding()]
+param()
+
+Import-Module ../lib/Q3Rcon.psm1
+
+Function Get-ConnFromPSD1 {
+    $configpath = Join-Path $PSScriptRoot "config.psd1"
+    return Import-PowerShellDataFile -Path $configpath
+}
+
+Function Get-DadJoke {
+    Invoke-WebRequest -Uri "https://icanhazdadjoke.com" -Headers @{accept = "application/json" } | Select-Object -ExpandProperty Content | ConvertFrom-Json | Select-Object -ExpandProperty Joke
+}
+
+Function Send-Message {
+    param($rcon)
+
+    $msg = Get-DadJoke
+    $msg | Write-Debug
+    $rcon.Say($msg)
+}
+
+
+try {
+    $conn = Get-ConnFromPSD1
+    $rcon = Connect-Rcon -hostname $conn.host -port $conn.port -passwd $conn.passwd
+
+    $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/Q3Rcon.psm1

@@ -1,5 +1,10 @@
-. $PSScriptRoot\packet.ps1
-. $PSScriptRoot\base.ps1    
+try {
+    . (Join-Path $PSScriptRoot packet.ps1)
+    . (Join-Path $PSScriptRoot base.ps1)     
+}
+catch {
+    throw "unable to dot source module files"
+}
 
 
 class Rcon {
@@ -9,8 +14,8 @@ class Rcon {
         $this.base = New-Base -hostname $hostname -port $port -passwd $passwd
     }
 
-    [Rcon] Login() {
-        $resp = $this.base._send("login")
+    [Rcon] _login() {
+        $resp = $this.Send("login")
         if ($resp -in @("Bad rcon", "Bad rconpassword.", "Invalid password.")) {
             throw "invalid rcon password"
         }
@@ -18,55 +23,59 @@ class Rcon {
         return $this
     }
 
-    [string] Send($msg) {
+    [string] Send([string]$msg) {
         return $this.base._send($msg)
     }
 
+    [string] Send([string]$msg, [int]$timeout) {
+        return $this.base._send($msg, $timeout)
+    }
+
     [void] Say($msg) {
-        $this.base._send($msg)
+        $this.Send("say $msg")
     }
 
     [void] FastRestart() {
-        $this.base._send("fast_restart", 2000)
+        $this.Send("fast_restart", 2000)
     }
 
     [void] MapRotate() {
-        $this.base._send("map_rotate", 2000)
+        $this.Send("map_rotate", 2000)
     }
 
     [void] MapRestart() {
-        $this.base._send("map_restart", 2000)
+        $this.Send("map_restart", 2000)
     }
 
     [string] Map() {
-        return $this.base._send("mapname")
+        return $this.Send("mapname")
     }
 
     [void] SetMap($mapname) {
-        $this.base._send("map mp_$mapname")
+        $this.Send("map mp_" + $mapname.TrimStart("mp_"), 2000)
     }
 
     [string] Gametype() {
-        return $this.base._send("g_gametype")
+        return $this.Send("g_gametype")
     }
 
     [void] SetGametype($gametype) {
-        $this.base._send("g_gametype $gametype")
+        $this.Send("g_gametype $gametype")
     }
 
     [string] HostName() {
-        return $this.base._send("sv_hostname")
+        return $this.Send("sv_hostname")
     }
 
     [void] SetHostName($hostname) {
-        $this.base._send("sv_hostname $hostname")
+        $this.Send("sv_hostname $hostname")
     }
 }
 
 Function Connect-Rcon {
     param([string]$hostname, [int]$port, [string]$passwd)
 
-    [Rcon]::new($hostname, $port, $passwd).Login()
+    [Rcon]::new($hostname, $port, $passwd)._login()
 }
 
 Function Disconnect-Rcon {

lib/base.ps1

@@ -38,22 +38,16 @@ class Base {
     [string] _send([string]$msg) {
         $this._socket.Send($this.request.Payload($msg))
 
-        [string[]]$data = @()
-        $sw = [Diagnostics.Stopwatch]::StartNew()
-        While ($sw.ElapsedMilliseconds -lt 50) {
-            try {
-                $buf = New-Object System.Byte[] 4096
-                $this._socket.Receive($buf)
-                $data += [System.Text.Encoding]::ASCII.GetString($($buf | Select-Object -Skip $($this.response.Header().Length - 1)))
-            }
-            catch [System.Net.Sockets.SocketException] {
-                if ( $_.Exception.SocketErrorCode -eq 'TimedOut' ) {
-                    "finished waiting for fragment" | Write-Debug
-                }
+        $buf = New-Object System.Byte[] 4096
+        try {
+            $this._socket.Receive($buf)
+        }
+        catch [System.Net.Sockets.SocketException] {
+            if ( $_.Exception.SocketErrorCode -eq 'TimedOut' ) {
+                "finished waiting for fragment" | Write-Debug
             }
         }
-        $sw.Stop()
-        return [string]::Join("", $data)
+        return [System.Text.Encoding]::ASCII.GetString($($buf | Select-Object -Skip $($this.response.Header().Length - 1)))
     }
 
     [string] _send([string]$msg, [int]$timeout) {
@@ -73,6 +67,7 @@ class Base {
                 }
             }
         }
+        $sw.Stop()
         return [string]::Join("", $data)
     }