lightman-agent 1.0.1 → 1.0.3

package/bin/cms-agent.js

@@ -24,6 +24,7 @@ Options:
   --slug <value>      Device slug (example: C-AV01)
   --server <url>      Server URL (example: http://192.168.1.100:3401)
   --timezone <tz>     Timezone override (default: Asia/Kolkata)
+  --pair-timeout <s>  Wait time for pairing in seconds (default: 900, 0 = no timeout)
   --no-restart        Skip reboot after successful install/update
   -h, --help          Show help
 `);
@@ -57,6 +58,9 @@ function parseArgs(argv) {
     } else if (part === '--timezone') {
       args.timezone = next.trim();
       i += 1;
+    } else if (part === '--pair-timeout') {
+      args.pairTimeout = next.trim();
+      i += 1;
     }
   }
   return args;
@@ -134,12 +138,15 @@ function resolveInstallScript() {
   throw new Error('install-windows.ps1 not found. Expected in package scripts/ or current folder scripts/.');
 }
 
-function installUsingPowerShell({ scriptPath, slug, server, timezone, noRestart }) {
+function installUsingPowerShell({ scriptPath, slug, server, timezone, pairingTimeoutSeconds, noRestart }) {
   console.log(`powershell -ExecutionPolicy Bypass -File scripts\\install-windows.ps1 -Slug "${slug}" -Server "${server}" -ShellReplace`);
   const args = ['-ExecutionPolicy', 'Bypass', '-File', scriptPath, '-Slug', slug, '-Server', server, '-ShellReplace'];
   if (timezone) {
     args.push('-Timezone', timezone);
   }
+  if (Number.isInteger(pairingTimeoutSeconds) && pairingTimeoutSeconds >= 0) {
+    args.push('-PairingTimeoutSeconds', String(pairingTimeoutSeconds));
+  }
   runOrFail('powershell.exe', args);
 
   if (!noRestart) {
@@ -161,6 +168,7 @@ async function runInstall(opts) {
   const defaultSlug = opts.slug || localConfig.deviceSlug || installedConfig.deviceSlug || '';
   const server = opts.server || DEFAULT_SERVER;
   const timezone = opts.timezone || localConfig?.powerSchedule?.timezone || installedConfig?.powerSchedule?.timezone || 'Asia/Kolkata';
+  const pairingTimeoutSeconds = Number.isFinite(Number(opts.pairTimeout)) ? Number.parseInt(String(opts.pairTimeout), 10) : 900;
   const noRestart = Boolean(opts.noRestart);
 
   console.log('Detected MAC addresses:');
@@ -178,7 +186,7 @@ async function runInstall(opts) {
   const scriptPath = resolveInstallScript();
 
   console.log(`Installing with slug=${slug}, server=${server}, shellReplace=true`);
-  installUsingPowerShell({ scriptPath, slug, server, timezone, noRestart });
+  installUsingPowerShell({ scriptPath, slug, server, timezone, pairingTimeoutSeconds, noRestart });
 }
 
 async function runUpdate(opts) {
@@ -193,6 +201,7 @@ async function runUpdate(opts) {
   const slug = opts.slug || installedConfig.deviceSlug;
   const server = opts.server || DEFAULT_SERVER;
   const timezone = opts.timezone || installedConfig?.powerSchedule?.timezone || 'Asia/Kolkata';
+  const pairingTimeoutSeconds = Number.isFinite(Number(opts.pairTimeout)) ? Number.parseInt(String(opts.pairTimeout), 10) : 900;
   const noRestart = Boolean(opts.noRestart);
   const scriptPath = resolveInstallScript();
 
@@ -201,7 +210,7 @@ async function runUpdate(opts) {
   }
 
   console.log(`Updating with slug=${slug}, server=${server}, shellReplace=true`);
-  installUsingPowerShell({ scriptPath, slug, server, timezone, noRestart });
+  installUsingPowerShell({ scriptPath, slug, server, timezone, pairingTimeoutSeconds, noRestart });
 }
 
 async function main() {

package/package.json

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

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",
+    [string]$Username = "",
+    [switch]$ShellReplace = $false,
+    [int]$PairingTimeoutSeconds = 900
+)
 
 $ErrorActionPreference = "Stop"
 
@@ -68,11 +69,24 @@ 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 processes
+Write-Host "[0c] Killing node.exe and Chrome..." -ForegroundColor Yellow
+# IMPORTANT:
+# If install-windows.ps1 is launched from the npm CLI wrapper (node.exe),
+# killing all node.exe would terminate the installer mid-run.
+$parentPid = $null
+try {
+    $parentPid = (Get-CimInstance Win32_Process -Filter "ProcessId=$PID" -ErrorAction SilentlyContinue).ParentProcessId
+} catch { }
+Get-Process -Name "node" -ErrorAction SilentlyContinue | ForEach-Object {
+    if ($parentPid -and $_.Id -eq $parentPid) {
+        Write-Host "  Keeping installer parent node.exe (PID $($_.Id))" -ForegroundColor DarkGray
+    } else {
+        Stop-Process -Id $_.Id -Force -ErrorAction SilentlyContinue
+    }
+}
+Get-Process -Name "chrome" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
+Start-Sleep -Seconds 2
 
 # Remove old files (keep NSSM and logs)
 Write-Host "[0d] Removing old agent files..." -ForegroundColor Yellow
@@ -287,11 +301,54 @@ for ($i = 0; $i -lt 10; $i++) {
     if ($n) { $portUp = $true; break }
     Start-Sleep -Seconds 2
 }
-if ($portUp) { Write-Host "  Port 3403 LISTENING" -ForegroundColor Green }
-else { Write-Host "  Port 3403 not yet up (may take a moment)" -ForegroundColor Yellow }
-
-# --- 12. Firewall ---
-Write-Host "[12/19] Configuring firewall..." -ForegroundColor Yellow
+if ($portUp) { Write-Host "  Port 3403 LISTENING" -ForegroundColor Green }
+else { Write-Host "  Port 3403 not yet up (may take a moment)" -ForegroundColor Yellow }
+
+# Wait until provisioning is complete (auto-provision or manual pairing)
+Write-Host "[11b/19] Waiting for device provisioning/pairing..." -ForegroundColor Yellow
+$identityPath = Join-Path $InstallDir ".lightman-identity.json"
+$deadline = if ($PairingTimeoutSeconds -gt 0) { (Get-Date).AddSeconds($PairingTimeoutSeconds) } else { $null }
+$paired = $false
+$lastHint = ""
+
+while (-not $paired) {
+    if (Test-Path $identityPath) {
+        try {
+            $identity = Get-Content $identityPath -Raw | ConvertFrom-Json
+            if ($identity.deviceId -and $identity.apiKey) {
+                $paired = $true
+                break
+            }
+        } catch {
+            # File may be mid-write, retry
+        }
+    }
+
+    $logPath = Join-Path $LogDir "service-stdout.log"
+    if (Test-Path $logPath) {
+        try {
+            $hint = Get-Content $logPath -Tail 40 | Where-Object {
+                $_ -match "Pairing required|Waiting for admin to approve pairing|Auto-provisioned|Pairing complete"
+            } | Select-Object -Last 1
+            if ($hint -and $hint -ne $lastHint) {
+                Write-Host "  Agent: $hint" -ForegroundColor DarkGray
+                $lastHint = $hint
+            }
+        } catch { }
+    }
+
+    if ($deadline -and (Get-Date) -ge $deadline) {
+        Write-Host "  FATAL: Pairing timed out after $PairingTimeoutSeconds seconds." -ForegroundColor Red
+        Write-Host "  Check server pairing UI, then re-run installer (or increase -PairingTimeoutSeconds)." -ForegroundColor Yellow
+        exit 1
+    }
+
+    Start-Sleep -Seconds 5
+}
+Write-Host "  Provisioning/pairing complete" -ForegroundColor Green
+
+# --- 12. Firewall ---
+Write-Host "[12/19] Configuring firewall..." -ForegroundColor Yellow
 $ErrorActionPreference = "Continue"
 if (-not (Get-NetFirewallRule -DisplayName "LIGHTMAN Agent WebSocket" -ErrorAction SilentlyContinue)) {
     New-NetFirewallRule -DisplayName "LIGHTMAN Agent WebSocket" -Direction Outbound -Action Allow -Protocol TCP -RemotePort 3001 -Description "LIGHTMAN Agent" | Out-Null