Fix tray health detection and harden backend service startup
All checks were successful
CI / test (push) Successful in 7s
All checks were successful
CI / test (push) Successful in 7s
This commit is contained in:
@@ -28,7 +28,12 @@ function Read-EnvConfig {
|
||||
}
|
||||
$parts = $trimmed.Split("=", 2)
|
||||
if ($parts.Count -eq 2) {
|
||||
$result[$parts[0].Trim()] = $parts[1].Trim()
|
||||
$key = $parts[0].Trim()
|
||||
$value = $parts[1].Trim()
|
||||
if (($value.StartsWith('"') -and $value.EndsWith('"')) -or ($value.StartsWith("'") -and $value.EndsWith("'"))) {
|
||||
$value = $value.Substring(1, $value.Length - 2)
|
||||
}
|
||||
$result[$key] = $value
|
||||
}
|
||||
}
|
||||
return $result
|
||||
@@ -79,17 +84,98 @@ function Get-DashboardUrl {
|
||||
$envFile = Join-Path $scriptDir ".env"
|
||||
$envVars = Read-EnvConfig -EnvFilePath $envFile
|
||||
|
||||
$host = $defaultHost
|
||||
$port = $defaultPort
|
||||
$dashboardHost = $defaultHost
|
||||
$dashboardPort = $defaultPort
|
||||
|
||||
if ($envVars.ContainsKey("SCREENJOB_HOST") -and -not [string]::IsNullOrWhiteSpace($envVars["SCREENJOB_HOST"])) {
|
||||
$host = $envVars["SCREENJOB_HOST"]
|
||||
$dashboardHost = $envVars["SCREENJOB_HOST"]
|
||||
}
|
||||
if ($envVars.ContainsKey("SCREENJOB_PORT") -and -not [string]::IsNullOrWhiteSpace($envVars["SCREENJOB_PORT"])) {
|
||||
$port = $envVars["SCREENJOB_PORT"]
|
||||
$dashboardPort = $envVars["SCREENJOB_PORT"]
|
||||
}
|
||||
|
||||
return "http://{0}:{1}/" -f $host, $port
|
||||
$connectHost = Resolve-ConnectHost -ConfiguredHost $dashboardHost
|
||||
return "http://{0}:{1}/" -f $connectHost, $dashboardPort
|
||||
}
|
||||
|
||||
function Resolve-ConnectHost {
|
||||
param([string]$ConfiguredHost)
|
||||
|
||||
if ([string]::IsNullOrWhiteSpace($ConfiguredHost)) {
|
||||
return "127.0.0.1"
|
||||
}
|
||||
|
||||
switch ($ConfiguredHost.Trim().ToLowerInvariant()) {
|
||||
"0.0.0.0" { return "127.0.0.1" }
|
||||
"::" { return "127.0.0.1" }
|
||||
"*" { return "127.0.0.1" }
|
||||
default { return $ConfiguredHost }
|
||||
}
|
||||
}
|
||||
|
||||
function Get-HealthCheckHosts {
|
||||
param([string]$ConfiguredHost)
|
||||
|
||||
if ([string]::IsNullOrWhiteSpace($ConfiguredHost)) {
|
||||
return @("127.0.0.1", "localhost")
|
||||
}
|
||||
|
||||
$normalized = $ConfiguredHost.Trim().ToLowerInvariant()
|
||||
switch ($normalized) {
|
||||
"0.0.0.0" { return @("127.0.0.1", "localhost", "::1") }
|
||||
"::" { return @("127.0.0.1", "localhost", "::1") }
|
||||
"*" { return @("127.0.0.1", "localhost", "::1") }
|
||||
default { return @($ConfiguredHost) }
|
||||
}
|
||||
}
|
||||
|
||||
function Test-TcpEndpoint {
|
||||
param(
|
||||
[Parameter(Mandatory = $true)][string]$HostName,
|
||||
[Parameter(Mandatory = $true)][int]$Port,
|
||||
[int]$TimeoutMs = 1200
|
||||
)
|
||||
|
||||
$client = New-Object System.Net.Sockets.TcpClient
|
||||
try {
|
||||
$async = $client.BeginConnect($HostName, $Port, $null, $null)
|
||||
$connected = $async.AsyncWaitHandle.WaitOne($TimeoutMs, $false)
|
||||
if (-not $connected) {
|
||||
return $false
|
||||
}
|
||||
$client.EndConnect($async) | Out-Null
|
||||
return $true
|
||||
} catch {
|
||||
return $false
|
||||
} finally {
|
||||
$client.Dispose()
|
||||
}
|
||||
}
|
||||
|
||||
function Get-BackendReachability {
|
||||
$envFile = Join-Path $scriptDir ".env"
|
||||
$envVars = Read-EnvConfig -EnvFilePath $envFile
|
||||
$configuredHost = $defaultHost
|
||||
$configuredPort = $defaultPort
|
||||
|
||||
if ($envVars.ContainsKey("SCREENJOB_HOST") -and -not [string]::IsNullOrWhiteSpace($envVars["SCREENJOB_HOST"])) {
|
||||
$configuredHost = $envVars["SCREENJOB_HOST"]
|
||||
}
|
||||
if ($envVars.ContainsKey("SCREENJOB_PORT") -and -not [string]::IsNullOrWhiteSpace($envVars["SCREENJOB_PORT"])) {
|
||||
$configuredPort = $envVars["SCREENJOB_PORT"]
|
||||
}
|
||||
|
||||
$portNumber = 8787
|
||||
[void][int]::TryParse([string]$configuredPort, [ref]$portNumber)
|
||||
$hostsToTry = Get-HealthCheckHosts -ConfiguredHost $configuredHost
|
||||
|
||||
foreach ($candidateHost in $hostsToTry) {
|
||||
if (Test-TcpEndpoint -HostName $candidateHost -Port $portNumber) {
|
||||
return $true
|
||||
}
|
||||
}
|
||||
|
||||
return $false
|
||||
}
|
||||
|
||||
function Update-TrayState {
|
||||
@@ -100,9 +186,20 @@ function Update-TrayState {
|
||||
)
|
||||
|
||||
$status = Get-ServiceStatusSafe -Name $Name
|
||||
$StatusItem.Text = "Status: $status"
|
||||
$isBackendReachable = Get-BackendReachability
|
||||
|
||||
switch ($status) {
|
||||
$displayStatus = $status
|
||||
if ($status -eq "Running" -and -not $isBackendReachable) {
|
||||
$displayStatus = "Running (Backend Down)"
|
||||
} elseif ($status -eq "Stopped" -and $isBackendReachable) {
|
||||
$displayStatus = "Stopped (Backend Up)"
|
||||
} elseif ($status -eq "NotInstalled" -and $isBackendReachable) {
|
||||
$displayStatus = "NotInstalled (Backend Up)"
|
||||
}
|
||||
|
||||
$StatusItem.Text = "Status: $displayStatus"
|
||||
|
||||
switch ($displayStatus) {
|
||||
"Running" {
|
||||
$NotifyIcon.Icon = [System.Drawing.SystemIcons]::Information
|
||||
}
|
||||
@@ -114,7 +211,7 @@ function Update-TrayState {
|
||||
}
|
||||
}
|
||||
|
||||
$tooltip = "ScreenJob Backend: $status"
|
||||
$tooltip = "ScreenJob Backend: $displayStatus"
|
||||
if ($tooltip.Length -gt 63) {
|
||||
$tooltip = $tooltip.Substring(0, 63)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user