feature(wakeup): only display connection err on last iteration

- move connection check error details to verbose stream

wakeup.ps1

@@ -1,30 +1,37 @@
 <#
 #>
 
+[CmdletBinding()]
 param
 (
 # Array of strings listing computer name(s) to wake up. Names will be matched using RegEx
     [Alias("Computer")]
     [String[]]
     $TargetComputer = "",
-# XML database file containing computer details
+# XML database file containing computer details (Default: WOLDatabase.xml)
-    [Alias("List", "database", "db")]
+    [Alias("List", "Database")]
     [String]
     $WolDatabase = "WOLDatabase.xml",
-# Skip connectivity readiness check
+# Skip connectivity check
     [Alias("NoCheck", "NoReadiness")]
     [Switch]
-    $NoConnectivityCheck = $false,
+    $NoConnectivityCheck,
-# Initial wait period in seconds before first connectivity check
+# Delay before running first connectivity check (Default: 10)
+    [Alias("Delay")]
     [Int]
-    $WaitBeforeConnectivityCheck = 10,
+    $ConnectivityCheckDelay = 10,
-# connectivity readiness check total timeout
+# Seconds before aborting connectivity check (Default: 300)
+    [Alias("Timeout")]
     [Int]
-    $Timeout = 300,
+    $ConnectivityCheckTimeout = 300,
-# connectivity readiness port to check
+# Seconds between connectivity checks (Default: 30)
+    [Alias("Interval")]
+    [Int]
+    $ConnectivityCheckInterval = 30,
+# Port to use for connectivity check (Default: 3389-RDP)
     [Alias("CheckPort")]
     [Int]
-    $ConnectivityPort = 3389
+    $ConnectivityCheckPort = 3389
 )
 
 function exitError($errMessage, $PSItem, $exitCode = 1)
@@ -84,14 +91,14 @@ if ( [String]::IsNullOrWhiteSpace($TargetComputer))
 Write-Host
 
 # read database and assemble list of target computers
-[xml]$db = Get-Content -Path $WolDatabase
+[xml]$wolDb = Get-Content -Path $WolDatabase
-$broadcastIP = $db.WOLDatabase.Configuration.BroadcastAddress
+$broadcastIP = $wolDb.WOLDatabase.Configuration.BroadcastAddress
-$port = $db.WOLDatabase.Configuration.Port
+$port = $wolDb.WOLDatabase.Configuration.Port
-$dnsSuffix = $db.WOLDatabase.Configuration.DnsSuffix
+$dnsSuffix = $wolDb.WOLDatabase.Configuration.DnsSuffix
 $targetComputers = [System.Collections.Generic.List[PSObject]]::new()
 $TargetComputer | ForEach-Object {
     $tgt = $_
-    $db.WOLDatabase.Computers.Computer | Where-Object { $_.name -match $tgt } | ForEach-Object { $targetComputers.Add($_) }
+    $wolDb.WOLDatabase.Computers.Computer | Where-Object { $_.name -match $tgt } | ForEach-Object { $targetComputers.Add($_) }
 }
 $removeFromTargetComputers = [System.Collections.Generic.List[String]]::new()
 
@@ -125,6 +132,7 @@ $targetComputers | ForEach-Object {
     else
     {
         Write-Host -ForegroundColor Red "[ERROR]"
+        # queue for removal from computers on which to run a connectivity check
         $removeFromTargetComputers.Add($name)
     }
 }
@@ -143,41 +151,78 @@ if ($NoConnectivityCheck)
 }
 elseif ($targetComputers.Count -eq 0)
 {
-    exitError "No successful wake-up packets sent" -exitCode 5
+    exitError "No wake-up packets sent successfully" -exitCode 5
 }
 
-# wait for initialWaitTime seconds to let computer(s) wake up
+# wait for initial delay seconds to let computer(s) wake up
-for ($i = $WaitBeforeConnectivityCheck; $i -gt 0; $i--) {
+for ($i = $ConnectivityCheckDelay; $i -gt 0; $i--) {
     Write-Progress -Activity "Waiting for computer(s) to wake-up..." -SecondsRemaining $i
     Start-Sleep 1
 }
 Write-Progress -Activity "Waiting for computer(s) to wake-up..." -Completed
 
 # iterate computers and test connectivity
-$targetComputers | ForEach-Object {
+# TODO: run connectivity test as background job
-    $name = $_.name
+$connCheckTotalTime = 0
-    $friendlyName = $_.friendlyName
+$removeFromTargetComputers.Clear()
-    $fqdn = -join ($name, $dnsSuffix)
+do
-    $connectionError = ""
+{
+    $targetComputers | ForEach-Object {
+        $name = $_.name
+        $friendlyName = $_.friendlyName
+        $fqdn = -join ($name, $dnsSuffix)
+        $connectionError = @()
 
-    if ( [String]::IsNullOrWhiteSpace($friendlyName))
+        if ( [String]::IsNullOrWhiteSpace($friendlyName))
-    {
+        {
-        Write-Host "Testing connection readiness of '$name'... " -NoNewline
+            Write-Host "Testing connection readiness of '$name'... " -NoNewline
+        }
+        else
+        {
+            Write-Host "Testing connection readiness of '$friendlyName'... " -NoNewline
+        }
+        if (!(Test-NetConnection -ComputerName $fqdn -Port $ConnectivityCheckPort -InformationLevel Quiet -WarningAction SilentlyContinue -ErrorAction SilentlyContinue -ErrorVariable +connectionError))
+        {
+            if (($connCheckTotalTime + $ConnectivityCheckInterval) -gt $ConnectivityCheckTimeout)
+            {
+                # last iteration, display 'error'
+                Write-Host -ForegroundColor Red "[ERROR]"
+                $connectionError | ForEach-Object {
+                    $errMsg = $_.ToString()
+                    Write-Verbose "`t(Additional information: $errMsg)"
+                }
+            }
+            else
+            {
+                # more iterations pending, display 'retrying'
+                Write-Host -ForegroundColor Yellow "[RETRYING]"
+            }
+        }
+        else
+        {
+            Write-Host -ForegroundColor Green "[OK]"
+            # queue for removal from computers to check next round
+            $removeFromTargetComputers.Add($name)
+        }
     }
-    else
+
-    {
+    # remove computers from targetComputers if connectivity check already successful
-        Write-Host "Testing connection readiness of '$friendlyName'... " -NoNewline
+    $removeFromTargetComputers | ForEach-Object {
+        $removeName = $_
+        $targetComputers.Remove(($targetComputers | Where-Object { $_.name -eq $removeName })) | Out-Null
     }
-    if (!(Test-NetConnection -ComputerName $fqdn -Port $ConnectivityPort -InformationLevel Quiet -WarningAction SilentlyContinue -ErrorAction SilentlyContinue -ErrorVariable connectionError))
+
+    # sleep until next test interval and increase time counter
+    $connCheckTotalTime += $ConnectivityCheckInterval
+    if ($connCheckTotalTime -le $ConnectivityCheckTimeout -and $targetComputers.Count -gt 0)
     {
-        Write-Host -ForegroundColor Red "[ERROR]"
+        for ($i = $ConnectivityCheckInterval; $i -gt 0; $i--) {
-        Write-Host -ForegroundColor Red "`tAdditional information:", $connectionError[-1].ToString()
+            Write-Progress -Activity "Waiting for next connectivity check..." -SecondsRemaining $i
+            Start-Sleep 1
+        }
+        Write-Progress -Activity "Waiting for next connectivity check..." -Completed
     }
-    else
+} while ($connCheckTotalTime -le $ConnectivityCheckTimeout -and $targetComputers.Count -gt 0)
-    {
-        Write-Host -ForegroundColor Green "[OK]"
-    }
-}
 
 # exit gracefully
 exitGracefully