lightman-agent 1.0.15 → 1.0.17

package/agent.config.json

@@ -5,6 +5,7 @@
   "logLevel": "debug",
   "logFile": "agent.log",
   "identityFile": ".lightman-identity.json",
+  "pairingTimeoutSeconds": 900,
   "kiosk": {
     "browserPath": "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe",
     "defaultUrl": "http://localhost:3403/display/a-av03",
@@ -19,4 +20,4 @@
     "timezone": "Asia/Kolkata",
     "shutdownWarningSeconds": 60
   }
-}
+}

package/agent.config.template.json

@@ -5,6 +5,7 @@
   "logLevel": "info",
   "logFile": "agent.log",
   "identityFile": ".lightman-identity.json",
+  "pairingTimeoutSeconds": __PAIRING_TIMEOUT_SECONDS__,
   "localServices": false,
   "kiosk": {
     "browserPath": "__BROWSER_PATH__",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lightman-agent",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "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

@@ -9,13 +9,14 @@
 #   powershell -ExecutionPolicy Bypass -File install-windows.ps1 -Slug "F-AV01" -Server "http://..." -ShellReplace
 #Requires -RunAsAdministrator
 
-param(
-    [Parameter(Mandatory=$true)]  [string]$Slug,
-    [Parameter(Mandatory=$true)]  [string]$Server,
-    [string]$Timezone = "Asia/Kolkata",
-    [string]$Username = "",
-    [switch]$ShellReplace = $false
-)
+param(
+    [Parameter(Mandatory=$true)]  [string]$Slug,
+    [Parameter(Mandatory=$true)]  [string]$Server,
+    [string]$Timezone = "Asia/Kolkata",
+    [int]$PairingTimeoutSeconds = 900,
+    [string]$Username = "",
+    [switch]$ShellReplace = $false
+)
 
 $ErrorActionPreference = "Stop"
 
@@ -27,21 +28,83 @@ $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 Stop-LightmanNodeProcesses {
+    $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) {
+        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
 Write-Host "  LIGHTMAN Agent - Complete Windows Installer" -ForegroundColor Cyan
 Write-Host "=============================================" -ForegroundColor Cyan
-Write-Host "  Device slug : $Slug"
-Write-Host "  Server URL  : $Server"
-Write-Host "  Username    : $Username"
-Write-Host "  Mode        : $(if ($ShellReplace) { 'Shell Replacement' } else { 'Standard' })"
-Write-Host ""
+Write-Host "  Device slug : $Slug"
+Write-Host "  Server URL  : $Server"
+Write-Host "  Username    : $Username"
+Write-Host "  Mode        : $(if ($ShellReplace) { 'Shell Replacement' } else { 'Standard' })"
+Write-Host "  Pair timeout: $(if ($PairingTimeoutSeconds -eq 0) { 'Disabled' } else { "$PairingTimeoutSeconds s" })"
+Write-Host ""
 
 # ============================================================
 # PHASE 0: NUKE EVERYTHING FROM PREVIOUS INSTALLS
@@ -68,11 +131,11 @@ foreach ($tn in @($AgentTask, $KioskTask, $GuardianTask)) {
     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
+Stop-LightmanNodeProcesses
+Stop-LightmanChromeProcesses
+Start-Sleep -Seconds 2
 
 # Remove old files (keep NSSM and logs)
 Write-Host "[0d] Removing old agent files..." -ForegroundColor Yellow
@@ -142,11 +205,11 @@ Pop-Location
 
 # --- 6. Generate config ---
 Write-Host "[6/19] Generating config..." -ForegroundColor Yellow
-if ($ShellReplace) {
-    & "$ScriptDir\setup.ps1" -Slug $Slug -Server $Server -Timezone $Timezone -InstallDir $InstallDir -ShellMode
-} else {
-    & "$ScriptDir\setup.ps1" -Slug $Slug -Server $Server -Timezone $Timezone -InstallDir $InstallDir
-}
+if ($ShellReplace) {
+    & "$ScriptDir\setup.ps1" -Slug $Slug -Server $Server -Timezone $Timezone -PairingTimeoutSeconds $PairingTimeoutSeconds -InstallDir $InstallDir -ShellMode
+} else {
+    & "$ScriptDir\setup.ps1" -Slug $Slug -Server $Server -Timezone $Timezone -PairingTimeoutSeconds $PairingTimeoutSeconds -InstallDir $InstallDir
+}
 
 # --- 7. Fix BOM ---
 Write-Host "[7/19] Fixing config encoding..." -ForegroundColor Yellow

package/scripts/setup.ps1

@@ -15,11 +15,14 @@ param(
     [Parameter(Mandatory=$true)]
     [string]$Server,
 
-    [Parameter(Mandatory=$false)]
-    [string]$Timezone = "Asia/Kolkata",
-
-    [Parameter(Mandatory=$false)]
-    [string]$InstallDir = $null,
+    [Parameter(Mandatory=$false)]
+    [string]$Timezone = "Asia/Kolkata",
+
+    [Parameter(Mandatory=$false)]
+    [int]$PairingTimeoutSeconds = 900,
+
+    [Parameter(Mandatory=$false)]
+    [string]$InstallDir = $null,
 
     [Parameter(Mandatory=$false)]
     [switch]$ShellMode = $false
@@ -36,11 +39,12 @@ if (-not $InstallDir) {
 
 Write-Host ""
 Write-Host "=== LIGHTMAN Agent - Device Setup ===" -ForegroundColor Cyan
-Write-Host "  Slug:        $Slug"
-Write-Host "  Server:      $Server"
-Write-Host "  Install dir: $InstallDir"
-Write-Host "  Timezone:    $Timezone"
-Write-Host ""
+Write-Host "  Slug:        $Slug"
+Write-Host "  Server:      $Server"
+Write-Host "  Install dir: $InstallDir"
+Write-Host "  Timezone:    $Timezone"
+Write-Host "  Pair timeout: $(if ($PairingTimeoutSeconds -eq 0) { 'Disabled' } else { "$PairingTimeoutSeconds s" })"
+Write-Host ""
 
 # 1. Clear cached identity (CRITICAL - prevents old device credentials leaking)
 $IdentityFile = Join-Path $InstallDir ".lightman-identity.json"
@@ -83,13 +87,14 @@ $Template = Get-Content $TemplatePath -Raw
 $BrowserEscaped    = $BrowserPath  -replace '\\', '\\'
 $ChromeDirEscaped  = $ChromeDataDir -replace '\\', '\\'
 
-$Config = $Template `
-    -replace '__SERVER_URL__',    $Server `
-    -replace '__DEVICE_SLUG__',   $Slug `
-    -replace '__KIOSK_URL__',     $KioskUrl `
-    -replace '__BROWSER_PATH__',  $BrowserEscaped `
-    -replace '__CHROME_DATA_DIR__', $ChromeDirEscaped `
-    -replace 'Asia/Kolkata',      $Timezone
+$Config = $Template `
+    -replace '__SERVER_URL__',    $Server `
+    -replace '__DEVICE_SLUG__',   $Slug `
+    -replace '__KIOSK_URL__',     $KioskUrl `
+    -replace '__BROWSER_PATH__',  $BrowserEscaped `
+    -replace '__CHROME_DATA_DIR__', $ChromeDirEscaped `
+    -replace '__PAIRING_TIMEOUT_SECONDS__', $PairingTimeoutSeconds `
+    -replace 'Asia/Kolkata',      $Timezone
 
 # 6. Inject shellMode into kiosk config if requested
 if ($ShellMode) {

package/src/lib/config.ts

@@ -32,8 +32,9 @@ const configSchema = z.object({
   healthIntervalMs: z.number().int().min(5000).default(60000),
   logLevel: z.enum(['debug', 'info', 'warn', 'error']).default('info'),
   logFile: z.string().default('agent.log'),
-  identityFile: z.string().default('.lightman-identity.json'),
-  localServices: z.boolean().default(true),
+  identityFile: z.string().default('.lightman-identity.json'),
+  pairingTimeoutSeconds: z.number().int().min(0).default(900),
+  localServices: z.boolean().default(true),
   kiosk: kioskSchema.optional(),
   screenshot: screenshotSchema.optional(),
   powerSchedule: powerScheduleSchema.optional(),

package/src/lib/types.ts

@@ -6,6 +6,7 @@ export interface AgentConfig {
   logLevel: 'debug' | 'info' | 'warn' | 'error';
   logFile: string;
   identityFile: string;
+  pairingTimeoutSeconds?: number;
   /** When false, agent runs in kiosk-only mode — no local server/display processes. Default: true */
   localServices: boolean;
   kiosk?: KioskConfig;

package/src/services/provisioning.ts

@@ -61,10 +61,12 @@ export async function provision(
     const code = data.code as string;
     logger.warn(`Pairing required. Enter code in admin UI: ${code}`);
     logger.info('Waiting for admin to approve pairing...');
+    const pairingTimeoutMs = Math.max(0, config.pairingTimeoutSeconds ?? 900) * 1000;
 
     const identity = await pollForPairing(
       `${baseUrl}/status?code=${encodeURIComponent(code)}`,
-      logger
+      logger,
+      pairingTimeoutMs
     );
 
     writeIdentity(config.identityFile, identity);
@@ -81,7 +83,7 @@ async function pollForPairing(
   timeoutMs = 600_000,
   intervalMs = 5_000
 ): Promise<Identity> {
-  const deadline = Date.now() + timeoutMs;
+  const deadline = timeoutMs <= 0 ? Number.POSITIVE_INFINITY : Date.now() + timeoutMs;
 
   while (Date.now() < deadline) {
     await sleep(intervalMs);