lightman-agent 1.0.2 → 1.0.4

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.2",
+  "version": "1.0.4",
   "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"
 
@@ -300,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

package/scripts/lightman-shell.bat

@@ -13,10 +13,11 @@ REM   5. Launches Chrome fullscreen
 REM   6. If Chrome crashes, relaunches in 3 seconds (infinite loop)
 REM ================================================================
 
-set INSTALL_DIR=C:\Program Files\Lightman\Agent
-set CONFIG_FILE=%INSTALL_DIR%\agent.config.json
-set CHROME_DATA=C:\ProgramData\Lightman\chrome-kiosk
-set LOG_FILE=C:\ProgramData\Lightman\logs\shell.log
+set INSTALL_DIR=C:\Program Files\Lightman\Agent
+set CONFIG_FILE=%INSTALL_DIR%\agent.config.json
+set URL_SIDECAR=C:\ProgramData\Lightman\kiosk-url.txt
+set CHROME_DATA=C:\ProgramData\Lightman\chrome-kiosk
+set LOG_FILE=C:\ProgramData\Lightman\logs\shell.log
 
 REM Ensure directories exist
 if not exist "C:\ProgramData\Lightman\logs" mkdir "C:\ProgramData\Lightman\logs"
@@ -59,14 +60,23 @@ if exist "%CONFIG_FILE%" (
 
 :use_fallbacks
 
-REM Build URL from slug (ALWAYS from config, never from sidecar)
-if not "%DEVICE_SLUG%"=="" (
-    set URL=http://localhost:3403/display/%DEVICE_SLUG%
-    echo [%date% %time%] Slug: %DEVICE_SLUG% >> "%LOG_FILE%"
-) else (
-    set URL=http://localhost:3403/display
-    echo [%date% %time%] WARNING: No slug in config! >> "%LOG_FILE%"
-)
+REM Build URL from slug (ALWAYS from config, never from sidecar)
+if not "%DEVICE_SLUG%"=="" (
+    set URL=http://localhost:3403/display/%DEVICE_SLUG%
+    echo [%date% %time%] Slug: %DEVICE_SLUG% >> "%LOG_FILE%"
+) else (
+    set URL=http://localhost:3403/display
+    echo [%date% %time%] WARNING: No slug in config! >> "%LOG_FILE%"
+)
+
+REM If agent wrote a URL sidecar (includes deviceId/apiKey), prefer it.
+if exist "%URL_SIDECAR%" (
+    for /f "usebackq delims=" %%u in ("%URL_SIDECAR%") do set SIDE_URL=%%u
+    if not "%SIDE_URL%"=="" (
+        set URL=%SIDE_URL%
+        echo [%date% %time%] Using sidecar URL >> "%LOG_FILE%"
+    )
+)
 
 REM Fallback browser
 if "%BROWSER%"=="" (
@@ -108,15 +118,22 @@ echo [%date% %time%] Agent ready >> "%LOG_FILE%"
 REM ----------------------------------------------------------------
 REM Infinite Chrome loop
 REM ----------------------------------------------------------------
-:loop
-    REM Re-read slug from config on every loop iteration
-    REM This way if someone changes agent.config.json, the next
-    REM Chrome restart picks up the new slug automatically.
-    if exist "%CONFIG_FILE%" (
-        for /f "delims=" %%a in ('node -e "try{console.log(JSON.parse(require('fs').readFileSync(String.raw`%CONFIG_FILE%`,'utf8')).deviceSlug)}catch(e){console.log('')}" 2^>nul') do (
-            if not "%%a"=="" set URL=http://localhost:3403/display/%%a
-        )
-    )
+:loop
+    REM Prefer sidecar URL for auth params/device routing; fallback to slug URL.
+    set SIDE_URL=
+    if exist "%URL_SIDECAR%" (
+        for /f "usebackq delims=" %%u in ("%URL_SIDECAR%") do set SIDE_URL=%%u
+    )
+    if not "%SIDE_URL%"=="" (
+        set URL=%SIDE_URL%
+    ) else (
+        REM Re-read slug from config on every loop iteration.
+        if exist "%CONFIG_FILE%" (
+            for /f "delims=" %%a in ('node -e "try{console.log(JSON.parse(require('fs').readFileSync(String.raw`%CONFIG_FILE%`,'utf8')).deviceSlug)}catch(e){console.log('')}" 2^>nul') do (
+                if not "%%a"=="" set URL=http://localhost:3403/display/%%a
+            )
+        )
+    )
 
     echo [%date% %time%] Launching Chrome: %URL% >> "%LOG_FILE%"
 

package/src/services/kiosk.ts

@@ -169,17 +169,19 @@ export class KioskManager {
   // Shell Mode Methods
   // =====================================================================
 
-  private async shellLaunch(targetUrl: string): Promise<KioskStatus> {
-    this.currentUrl = targetUrl;
-
-    // Shell mode: Chrome is managed by lightman-shell.bat.
-    // Shell reads slug from agent.config.json directly.
-    // Agent NEVER kills Chrome on startup - only on explicit navigate().
-    if (this.isChromeRunning()) {
-      this.logger.info('Shell mode: Chrome already running. Not touching it.');
-    } else {
-      this.logger.info('Shell mode: Chrome not running. Shell BAT will launch it.');
-    }
+  private async shellLaunch(targetUrl: string): Promise<KioskStatus> {
+    this.currentUrl = targetUrl;
+    // Keep shell sidecar updated so shell BAT can launch with auth query params.
+    this.writeUrlSidecar(targetUrl);
+
+    // Shell mode: Chrome is managed by lightman-shell.bat.
+    // Shell prefers sidecar URL (if present), then falls back to slug in config.
+    if (this.isChromeRunning()) {
+      this.logger.info('Shell mode: Chrome already running. Restarting once to apply sidecar URL.');
+      this.killAllChrome();
+    } else {
+      this.logger.info('Shell mode: Chrome not running. Shell BAT will launch it.');
+    }
 
     this.startedAt = this.startedAt || Date.now();
     return this.getStatus();