lightman-agent 1.0.16 → 1.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lightman-agent",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "LIGHTMAN Agent - System-level daemon for museum display machines",
   "private": false,
   "type": "module",

package/scripts/guardian.ps1

@@ -2,30 +2,88 @@
 # Runs every 5 minutes via Task Scheduler.
 # Restarts the NSSM service if it's down. Checks Chrome kiosk health.
 
-$LogDir = "C:\ProgramData\Lightman\logs"
-$LogFile = Join-Path $LogDir "guardian.log"
-$ServiceName = "LightmanAgent"
-$NssmExe = "C:\ProgramData\Lightman\nssm\nssm.exe"
-
-function Write-GuardianLog($msg) {
-    $ts = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
-    try {
-        if (-not (Test-Path $LogDir)) { New-Item -ItemType Directory -Force -Path $LogDir | Out-Null }
+$LogDir = "C:\ProgramData\Lightman\logs"
+$LogFile = Join-Path $LogDir "guardian.log"
+$ServiceName = "LightmanAgent"
+$NssmExe = "C:\ProgramData\Lightman\nssm\nssm.exe"
+$InstallDir = "C:\Program Files\Lightman\Agent"
+$ChromeDataDir = "C:\ProgramData\Lightman\chrome-kiosk"
+
+function Write-GuardianLog($msg) {
+    $ts = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
+    try {
+        if (-not (Test-Path $LogDir)) { New-Item -ItemType Directory -Force -Path $LogDir | Out-Null }
         Add-Content -Path $LogFile -Value "[$ts] $msg" -ErrorAction SilentlyContinue
         if ((Get-Item $LogFile -ErrorAction SilentlyContinue).Length -gt 1MB) {
             $rotated = "$LogFile.old"
             if (Test-Path $rotated) { Remove-Item $rotated -Force }
             Rename-Item $LogFile $rotated -Force
         }
-    } catch { }
-}
-
-try {
-    # 1. Check LIGHTMAN service
-    $svc = Get-Service -Name $ServiceName -ErrorAction SilentlyContinue
-    if (-not $svc) {
-        $svc = Get-Service -DisplayName "LIGHTMAN*" -ErrorAction SilentlyContinue | Select-Object -First 1
-    }
+    } catch { }
+}
+
+function Get-LightmanNodeProcesses {
+    try {
+        @(Get-CimInstance Win32_Process -Filter "Name = 'node.exe'" -ErrorAction SilentlyContinue | Where-Object {
+            $_.CommandLine -and (
+                $_.CommandLine -like "*$InstallDir*" -or
+                $_.CommandLine -match 'dist\\index\.js|src\\index\.ts|cms-agent\.js'
+            )
+        })
+    } catch {
+        @()
+    }
+}
+
+function Stop-LightmanNodeProcesses {
+    $procs = Get-LightmanNodeProcesses
+    if (-not $procs -or $procs.Count -eq 0) {
+        Write-GuardianLog "No LIGHTMAN-owned node.exe process found"
+        return
+    }
+
+    foreach ($proc in $procs) {
+        try {
+            Stop-Process -Id $proc.ProcessId -Force -ErrorAction Stop
+            Write-GuardianLog "Stopped LIGHTMAN node.exe PID $($proc.ProcessId)"
+        } catch {
+            Write-GuardianLog "Failed to stop LIGHTMAN node.exe PID $($proc.ProcessId): $_"
+        }
+    }
+}
+
+function Get-LightmanShellMode {
+    $configPath = Join-Path $InstallDir "agent.config.json"
+    try {
+        if (-not (Test-Path $configPath)) { return $false }
+        $config = Get-Content $configPath -Raw | ConvertFrom-Json
+        return [bool]($config.kiosk.shellMode)
+    } catch {
+        return $false
+    }
+}
+
+function Get-LightmanChromeProcesses {
+    try {
+        @(Get-CimInstance Win32_Process -Filter "Name = 'chrome.exe'" -ErrorAction SilentlyContinue | Where-Object {
+            $_.CommandLine -and (
+                $_.CommandLine -like "*$ChromeDataDir*" -or
+                $_.CommandLine -like "*chrome-kiosk*"
+            )
+        })
+    } catch {
+        @()
+    }
+}
+
+try {
+    $shellMode = Get-LightmanShellMode
+
+    # 1. Check LIGHTMAN service
+    $svc = Get-Service -Name $ServiceName -ErrorAction SilentlyContinue
+    if (-not $svc) {
+        $svc = Get-Service -DisplayName "LIGHTMAN*" -ErrorAction SilentlyContinue | Select-Object -First 1
+    }
 
     if (-not $svc) {
         Write-GuardianLog "CRITICAL: Service not found!"
@@ -41,35 +99,51 @@ try {
             } else {
                 Start-Service -Name $svc.Name -ErrorAction SilentlyContinue
             }
-            Start-Sleep -Seconds 5
-            $svc.Refresh()
-            Write-GuardianLog "After restart: $($svc.Status)"
-        }
-        elseif ($svc.Status -in @('StartPending', 'StopPending')) {
-            Write-GuardianLog "Service stuck in $($svc.Status). Force killing node.exe..."
-            Get-Process -Name "node" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
-            Start-Sleep -Seconds 3
-            if (Test-Path $NssmExe) { & $NssmExe start $ServiceName 2>$null }
-            else { Start-Service -Name $svc.Name -ErrorAction SilentlyContinue }
-            Start-Sleep -Seconds 5
-            $svc.Refresh()
-            Write-GuardianLog "After force restart: $($svc.Status)"
-        }
-    }
-
-    # 2. Check Chrome kiosk
-    $chrome = Get-Process -Name "chrome" -ErrorAction SilentlyContinue
-    if (-not $chrome) {
-        $vbsPath = "C:\Program Files\Lightman\Agent\launch-kiosk.vbs"
-        if (Test-Path $vbsPath) {
-            Start-Sleep -Seconds 10
-            $chromeRecheck = Get-Process -Name "chrome" -ErrorAction SilentlyContinue
-            if (-not $chromeRecheck) {
-                Write-GuardianLog "Chrome not running. Launching via VBS..."
-                Start-Process "wscript.exe" -ArgumentList """$vbsPath""" -WindowStyle Hidden
-            }
-        }
-    }
-} catch {
-    Write-GuardianLog "Guardian error: $_"
-}
+            Start-Sleep -Seconds 5
+            $svc.Refresh()
+            Write-GuardianLog "After restart: $($svc.Status)"
+        }
+        elseif ($svc.Status -in @('StartPending', 'StopPending')) {
+            Write-GuardianLog "Service is $($svc.Status). Waiting before targeted restart..."
+            Start-Sleep -Seconds 15
+            $svc.Refresh()
+            if ($svc.Status -in @('StartPending', 'StopPending')) {
+                Write-GuardianLog "Service still stuck in $($svc.Status). Restarting LIGHTMAN service only."
+                Stop-LightmanNodeProcesses
+                Start-Sleep -Seconds 3
+                if (Test-Path $NssmExe) {
+                    & $NssmExe restart $ServiceName 2>$null
+                } else {
+                    Stop-Service -Name $svc.Name -Force -ErrorAction SilentlyContinue
+                    Start-Sleep -Seconds 2
+                    Start-Service -Name $svc.Name -ErrorAction SilentlyContinue
+                }
+                Start-Sleep -Seconds 5
+                $svc.Refresh()
+                Write-GuardianLog "After targeted restart: $($svc.Status)"
+            } else {
+                Write-GuardianLog "Service recovered during wait: $($svc.Status)"
+            }
+        }
+    }
+
+    # 2. Check Chrome kiosk
+    $chrome = Get-LightmanChromeProcesses
+    if (-not $chrome) {
+        if ($shellMode) {
+            Write-GuardianLog "LIGHTMAN kiosk Chrome not running, but shell mode is enabled. Shell will relaunch it."
+        } else {
+            $vbsPath = Join-Path $InstallDir "launch-kiosk.vbs"
+            if (Test-Path $vbsPath) {
+                Start-Sleep -Seconds 10
+                $chromeRecheck = Get-LightmanChromeProcesses
+                if (-not $chromeRecheck) {
+                    Write-GuardianLog "LIGHTMAN Chrome not running. Launching via VBS..."
+                    Start-Process "wscript.exe" -ArgumentList """$vbsPath""" -WindowStyle Hidden
+                }
+            }
+        }
+    }
+} catch {
+    Write-GuardianLog "Guardian error: $_"
+}

package/scripts/install-windows.ps1

@@ -28,11 +28,100 @@ $NssmExe       = "$NssmDir\nssm.exe"
 $ServiceName   = "LightmanAgent"
 $GuardianTask  = "LIGHTMAN Guardian"
 $KioskTask     = "LIGHTMAN Kiosk Browser"
-$AgentTask     = "LIGHTMAN Agent"
-$ScriptDir     = Split-Path -Parent $MyInvocation.MyCommand.Path
-$AgentDir      = Split-Path -Parent $ScriptDir
-
-if (-not $Username) { $Username = $env:USERNAME }
+$AgentTask     = "LIGHTMAN Agent"
+$ScriptDir     = Split-Path -Parent $MyInvocation.MyCommand.Path
+$AgentDir      = Split-Path -Parent $ScriptDir
+
+if (-not $Username) { $Username = $env:USERNAME }
+
+function Get-LightmanNodeProcesses {
+    try {
+        @(Get-CimInstance Win32_Process -Filter "Name = 'node.exe'" -ErrorAction SilentlyContinue | Where-Object {
+            $_.CommandLine -and (
+                $_.CommandLine -like "*$InstallDir*" -or
+                $_.CommandLine -like "*$AgentDir*" -or
+                $_.CommandLine -match 'dist\\index\.js|src\\index\.ts|cms-agent\.js'
+            )
+        })
+    } catch {
+        @()
+    }
+}
+
+function Get-InstallerParentNodePid {
+    try {
+        $self = Get-CimInstance Win32_Process -Filter "ProcessId=$PID" -ErrorAction SilentlyContinue
+        if (-not $self) { return $null }
+
+        $parentPid = $self.ParentProcessId
+        if (-not $parentPid) { return $null }
+
+        $parent = Get-CimInstance Win32_Process -Filter "ProcessId=$parentPid" -ErrorAction SilentlyContinue
+        if ($parent -and $parent.Name -eq "node.exe") {
+            return [int]$parent.ProcessId
+        }
+    } catch {
+        return $null
+    }
+
+    return $null
+}
+
+function Stop-LightmanNodeProcesses {
+    param(
+        [int]$ExcludePid = 0
+    )
+
+    $procs = Get-LightmanNodeProcesses
+    if (-not $procs -or $procs.Count -eq 0) {
+        Write-Host "  No LIGHTMAN-owned node.exe processes found" -ForegroundColor DarkGray
+        return
+    }
+
+    foreach ($proc in $procs) {
+        if ($ExcludePid -gt 0 -and $proc.ProcessId -eq $ExcludePid) {
+            Write-Host "  Keeping installer parent node.exe PID $($proc.ProcessId)" -ForegroundColor DarkGray
+            continue
+        }
+
+        try {
+            Stop-Process -Id $proc.ProcessId -Force -ErrorAction Stop
+            Write-Host "  Stopped LIGHTMAN node.exe PID $($proc.ProcessId)" -ForegroundColor DarkGray
+        } catch {
+            Write-Host "  Failed to stop LIGHTMAN node.exe PID $($proc.ProcessId): $_" -ForegroundColor Yellow
+        }
+    }
+}
+
+function Get-LightmanChromeProcesses {
+    try {
+        @(Get-CimInstance Win32_Process -Filter "Name = 'chrome.exe'" -ErrorAction SilentlyContinue | Where-Object {
+            $_.CommandLine -and (
+                $_.CommandLine -like "*$ChromeData*" -or
+                $_.CommandLine -like "*chrome-kiosk*"
+            )
+        })
+    } catch {
+        @()
+    }
+}
+
+function Stop-LightmanChromeProcesses {
+    $procs = Get-LightmanChromeProcesses
+    if (-not $procs -or $procs.Count -eq 0) {
+        Write-Host "  No LIGHTMAN kiosk Chrome processes found" -ForegroundColor DarkGray
+        return
+    }
+
+    foreach ($proc in $procs) {
+        try {
+            Stop-Process -Id $proc.ProcessId -Force -ErrorAction Stop
+            Write-Host "  Stopped LIGHTMAN Chrome PID $($proc.ProcessId)" -ForegroundColor DarkGray
+        } catch {
+            Write-Host "  Failed to stop LIGHTMAN Chrome PID $($proc.ProcessId): $_" -ForegroundColor Yellow
+        }
+    }
+}
 
 Write-Host ""
 Write-Host "=============================================" -ForegroundColor Cyan
@@ -69,12 +158,13 @@ foreach ($tn in @($AgentTask, $KioskTask, $GuardianTask)) {
     $t = Get-ScheduledTask -TaskName $tn -ErrorAction SilentlyContinue
     if ($t) { Stop-ScheduledTask -TaskName $tn -ErrorAction SilentlyContinue; Unregister-ScheduledTask -TaskName $tn -Confirm:$false -ErrorAction SilentlyContinue }
 }
-
-# Kill processes
-Write-Host "[0c] Killing node.exe and Chrome..." -ForegroundColor Yellow
-Get-Process -Name "node" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
-Get-Process -Name "chrome" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
-Start-Sleep -Seconds 2
+
+# Kill only LIGHTMAN-owned processes
+Write-Host "[0c] Stopping LIGHTMAN node/chrome processes only..." -ForegroundColor Yellow
+$installerParentNodePid = Get-InstallerParentNodePid
+Stop-LightmanNodeProcesses -ExcludePid $installerParentNodePid
+Stop-LightmanChromeProcesses
+Start-Sleep -Seconds 2
 
 # Remove old files (keep NSSM and logs)
 Write-Host "[0d] Removing old agent files..." -ForegroundColor Yellow