lightman-agent 1.0.22 → 1.0.23

package/bin/cms-agent.js

@@ -8,30 +8,27 @@ import { spawnSync } from 'child_process';
 import { createInterface } from 'readline/promises';
 import { stdin as input, stdout as output, cwd, platform, exit } from 'process';
 
-const DEFAULT_SERVER = 'http://192.168.10.100:3401';
-const INSTALL_CONFIG_PATH = 'C:\\Program Files\\Lightman\\Agent\\agent.config.json';
-const INSTALL_PACKAGE_PATH = 'C:\\Program Files\\Lightman\\Agent\\package.json';
-
-function printUsage() {
-  console.log(`
-cms-agent <command> [options]
-
-Commands:
-  install             Prompt slug and server IP, install agent with ShellReplace, reboot
-  setup               Alias of install
-  update              Reinstall/update using installed config, reboot
-  version             Show CLI package version and installed agent version
-
-Options:
-  --slug <value>      Device slug (example: C-AV01)
-  --server <url>      Server URL or IP (example: 192.168.10.100 or http://192.168.10.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
-  -v, --version       Show version
-  -h, --help          Show help
-`);
-}
+const DEFAULT_SERVER = 'http://192.168.10.100:3401';
+const INSTALL_CONFIG_PATH = 'C:\\Program Files\\Lightman\\Agent\\agent.config.json';
+
+function printUsage() {
+  console.log(`
+cms-agent <command> [options]
+
+Commands:
+  install             Prompt slug and server IP, install agent with ShellReplace, reboot
+  setup               Alias of install
+  update              Reinstall/update using installed config, reboot
+
+Options:
+  --slug <value>      Device slug (example: C-AV01)
+  --server <url>      Server URL or IP (example: 192.168.10.100 or http://192.168.10.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
+`);
+}
 
 function parseArgs(argv) {
   const args = {};
@@ -180,51 +177,25 @@ async function promptServer(defaultServer) {
   }
 }
 
-function resolveInstallScript() {
-  const here = dirname(fileURLToPath(import.meta.url));
-  const packaged = resolve(here, '../scripts/install-windows.ps1');
-  const localRepo = resolve(cwd(), 'scripts/install-windows.ps1');
-  if (existsSync(packaged)) return packaged;
-  if (existsSync(localRepo)) return localRepo;
-  throw new Error('install-windows.ps1 not found. Expected in package scripts/ or current folder scripts/.');
-}
-
-function scriptSupportsPairingTimeout(scriptPath) {
-  try {
-    const script = readFileSync(scriptPath, 'utf8');
-    return script.includes('PairingTimeoutSeconds');
-  } catch {
-    return false;
-  }
-}
-
-function runVersion() {
-  const here = dirname(fileURLToPath(import.meta.url));
-  const bundledPkg = safeReadJson(resolve(here, '../package.json')) || {};
-  const installedPkg = safeReadJson(INSTALL_PACKAGE_PATH) || {};
-
-  const cliVersion = typeof bundledPkg.version === 'string' ? bundledPkg.version : 'unknown';
-  const installedVersion = typeof installedPkg.version === 'string' ? installedPkg.version : 'not-installed';
-
-  console.log(`lightman-agent cli: ${cliVersion}`);
-  console.log(`lightman-agent installed: ${installedVersion}`);
-  console.log(`node: ${process.version}`);
-}
-
-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
-    && scriptSupportsPairingTimeout(scriptPath)
-  ) {
-    args.push('-PairingTimeoutSeconds', String(pairingTimeoutSeconds));
-  }
-  runOrFail('powershell.exe', args);
+function resolveInstallScript() {
+  const here = dirname(fileURLToPath(import.meta.url));
+  const packaged = resolve(here, '../scripts/install-windows.ps1');
+  const localRepo = resolve(cwd(), 'scripts/install-windows.ps1');
+  if (existsSync(packaged)) return packaged;
+  if (existsSync(localRepo)) return localRepo;
+  throw new Error('install-windows.ps1 not found. Expected in package scripts/ or current folder scripts/.');
+}
+
+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) {
     console.log('Installation completed. Rebooting now...');
@@ -291,24 +262,19 @@ async function runUpdate(opts) {
   installUsingPowerShell({ scriptPath, slug, server, timezone, pairingTimeoutSeconds, noRestart });
 }
 
-async function main() {
-  const [, , commandRaw, ...rest] = process.argv;
-  const command = commandRaw || '';
-  const opts = parseArgs(rest);
-
-  if (!command || opts.help || command === 'help' || command === '--help' || command === '-h') {
-    printUsage();
-    return;
-  }
-
-  if (command === 'version' || command === '--version' || command === '-v') {
-    runVersion();
-    return;
-  }
-
-  if (command === 'install' || command === 'setup') {
-    await runInstall(opts);
-    return;
+async function main() {
+  const [, , commandRaw, ...rest] = process.argv;
+  const command = commandRaw || '';
+  const opts = parseArgs(rest);
+
+  if (!command || opts.help || command === 'help' || command === '--help' || command === '-h') {
+    printUsage();
+    return;
+  }
+
+  if (command === 'install' || command === 'setup') {
+    await runInstall(opts);
+    return;
   }
   if (command === 'update') {
     await runUpdate(opts);

package/package.json

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

package/scripts/guardian.ps1

@@ -6,6 +6,7 @@ $LogDir = "C:\ProgramData\Lightman\logs"
 $LogFile = Join-Path $LogDir "guardian.log"
 $ServiceName = "LightmanAgent"
 $NssmExe = "C:\ProgramData\Lightman\nssm\nssm.exe"
+$ConfigPath = "C:\Program Files\Lightman\Agent\agent.config.json"
 
 function Write-GuardianLog($msg) {
     $ts = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
@@ -20,6 +21,23 @@ function Write-GuardianLog($msg) {
     } catch { }
 }
 
+function Get-BrowserProcessName {
+    try {
+        if (Test-Path $ConfigPath) {
+            $config = Get-Content $ConfigPath -Raw | ConvertFrom-Json
+            $browserPath = $config.kiosk.browserPath
+            if ($browserPath) {
+                $browserLeaf = Split-Path $browserPath -Leaf
+                if ($browserLeaf) {
+                    return [System.IO.Path]::GetFileNameWithoutExtension($browserLeaf)
+                }
+            }
+        }
+    } catch { }
+
+    return "chrome"
+}
+
 try {
     # 1. Check LIGHTMAN service
     $svc = Get-Service -Name $ServiceName -ErrorAction SilentlyContinue
@@ -57,15 +75,16 @@ try {
         }
     }
 
-    # 2. Check Chrome kiosk
-    $chrome = Get-Process -Name "chrome" -ErrorAction SilentlyContinue
-    if (-not $chrome) {
+    # 2. Check kiosk browser
+    $browserProcess = Get-BrowserProcessName
+    $browser = Get-Process -Name $browserProcess -ErrorAction SilentlyContinue
+    if (-not $browser) {
         $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..."
+            $browserRecheck = Get-Process -Name $browserProcess -ErrorAction SilentlyContinue
+            if (-not $browserRecheck) {
+                Write-GuardianLog "Browser '$browserProcess' not running. Launching via VBS..."
                 Start-Process "wscript.exe" -ArgumentList """$vbsPath""" -WindowStyle Hidden
             }
         }

package/scripts/install-linux.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # LIGHTMAN Agent — Linux Installer
 # Run as root:
-#   sudo bash install-linux.sh --slug f-av01 --server http://192.168.1.100:3401
+#   sudo bash install-linux.sh --slug f-av01 --server http://192.168.10.100:3401
 set -euo pipefail
 
 INSTALL_DIR="/opt/lightman/agent"
@@ -22,7 +22,7 @@ while [[ $# -gt 0 ]]; do
         --server)   SERVER="$2";   shift 2 ;;
         --timezone) TIMEZONE="$2"; shift 2 ;;
         -h|--help)
-            echo "Usage: sudo bash install-linux.sh --slug f-av01 --server http://192.168.1.100:3401 [--timezone Asia/Kolkata]"
+            echo "Usage: sudo bash install-linux.sh --slug f-av01 --server http://192.168.10.100:3401 [--timezone Asia/Kolkata]"
             exit 0
             ;;
         *) echo "Unknown option: $1"; exit 1 ;;
@@ -32,13 +32,13 @@ done
 # ── Validate required args ──
 if [[ -z "$SLUG" ]]; then
     echo "Error: --slug is required"
-    echo "Usage: sudo bash install-linux.sh --slug f-av01 --server http://192.168.1.100:3401"
+    echo "Usage: sudo bash install-linux.sh --slug f-av01 --server http://192.168.10.100:3401"
     exit 1
 fi
 
 if [[ -z "$SERVER" ]]; then
     echo "Error: --server is required"
-    echo "Usage: sudo bash install-linux.sh --slug f-av01 --server http://192.168.1.100:3401"
+    echo "Usage: sudo bash install-linux.sh --slug f-av01 --server http://192.168.10.100:3401"
     exit 1
 fi
 

package/scripts/install-windows.ps1

@@ -3,20 +3,20 @@
 # Cleans up any previous installation automatically before installing.
 #
 # Run as Administrator:
-#   powershell -ExecutionPolicy Bypass -File install-windows.ps1 -Slug "F-AV01" -Server "http://192.168.1.180:3401"
+#   powershell -ExecutionPolicy Bypass -File install-windows.ps1 -Slug "F-AV01" -Server "http://192.168.10.100:3401"
 #
 # Shell Replacement mode (RECOMMENDED for kiosk machines):
-#   powershell -ExecutionPolicy Bypass -File install-windows.ps1 -Slug "F-AV01" -Server "http://..." -ShellReplace
+#   powershell -ExecutionPolicy Bypass -File install-windows.ps1 -Slug "F-AV01" -Server "http://192.168.10.100:3401" -ShellReplace
 #Requires -RunAsAdministrator
 
-param(
-    [Parameter(Mandatory=$true)]  [string]$Slug,
-    [Parameter(Mandatory=$true)]  [string]$Server,
-    [string]$Timezone = "Asia/Kolkata",
-    [string]$Username = "",
-    [switch]$ShellReplace = $false,
-    [int]$PairingTimeoutSeconds = 900
-)
+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"
 
@@ -26,38 +26,88 @@ $ChromeData    = "C:\ProgramData\Lightman\chrome-kiosk"
 $NssmDir       = "C:\ProgramData\Lightman\nssm"
 $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
-
-function Ensure-PathContains {
-    param(
-        [Parameter(Mandatory=$true)][ValidateSet('Machine','User')] [string]$Scope,
-        [Parameter(Mandatory=$true)] [string]$Entry
-    )
-    $current = [System.Environment]::GetEnvironmentVariable("Path", $Scope)
-    if (-not $current) { $current = "" }
-    $parts = $current -split ';' | Where-Object { $_ -and $_.Trim() -ne "" }
-    $normalizedEntry = $Entry.TrimEnd('\')
-    $exists = $false
-    foreach ($p in $parts) {
-        if ($p.TrimEnd('\') -ieq $normalizedEntry) {
-            $exists = $true
-            break
-        }
-    }
-    if (-not $exists) {
-        $newPath = if ($current -and $current.Trim() -ne "") { "$current;$Entry" } else { $Entry }
-        [System.Environment]::SetEnvironmentVariable("Path", $newPath, $Scope)
-        return $true
-    }
-    return $false
-}
+$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 }
 
+function Get-ChromePath {
+    $candidates = @(
+        "C:\Program Files\Google\Chrome\Application\chrome.exe",
+        "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe",
+        (Join-Path $env:LOCALAPPDATA "Google\Chrome\Application\chrome.exe")
+    )
+
+    foreach ($candidate in $candidates) {
+        if ($candidate -and (Test-Path $candidate)) {
+            return $candidate
+        }
+    }
+
+    return $null
+}
+
+function Install-ChromeFromMsi {
+    $is64Bit = [Environment]::Is64BitOperatingSystem
+    $downloadUrl = if ($is64Bit) {
+        "https://dl.google.com/dl/chrome/install/googlechromestandaloneenterprise64.msi"
+    } else {
+        "https://dl.google.com/dl/chrome/install/googlechromestandaloneenterprise.msi"
+    }
+    $installerName = if ($is64Bit) { "googlechromestandaloneenterprise64.msi" } else { "googlechromestandaloneenterprise.msi" }
+    $installerPath = Join-Path $env:TEMP $installerName
+
+    Write-Host "  Chrome not found. Downloading official Google Chrome MSI..." -ForegroundColor Yellow
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+    Invoke-WebRequest -Uri $downloadUrl -OutFile $installerPath -UseBasicParsing -TimeoutSec 180
+
+    if (-not (Test-Path $installerPath)) {
+        throw "Chrome MSI was not downloaded."
+    }
+
+    $msiArgs = "/i `"$installerPath`" /qn /norestart"
+    Start-Process msiexec.exe -ArgumentList $msiArgs -Wait -NoNewWindow
+    Remove-Item $installerPath -Force -ErrorAction SilentlyContinue
+}
+
+function Install-ChromeFromWinget {
+    if (-not (Get-Command winget -ErrorAction SilentlyContinue)) {
+        throw "winget is not available."
+    }
+
+    Write-Host "  MSI install failed. Trying winget for Google Chrome..." -ForegroundColor Yellow
+    & winget install --id Google.Chrome --exact --silent --accept-package-agreements --accept-source-agreements 2>&1 | Out-Host
+    if ($LASTEXITCODE -ne 0) {
+        throw "winget install failed with exit code $LASTEXITCODE."
+    }
+}
+
+function Ensure-ChromeInstalled {
+    $existingChrome = Get-ChromePath
+    if ($existingChrome) {
+        Write-Host "  Found Chrome: $existingChrome" -ForegroundColor Green
+        return $existingChrome
+    }
+
+    try {
+        Install-ChromeFromMsi
+    } catch {
+        Write-Host "  Chrome MSI install failed: $($_.Exception.Message)" -ForegroundColor DarkYellow
+        Install-ChromeFromWinget
+    }
+
+    $installedChrome = Get-ChromePath
+    if (-not $installedChrome) {
+        throw "Chrome install did not produce chrome.exe."
+    }
+
+    Write-Host "  Chrome installed: $installedChrome" -ForegroundColor Green
+    return $installedChrome
+}
+
 Write-Host ""
 Write-Host "=============================================" -ForegroundColor Cyan
 Write-Host "  LIGHTMAN Agent - Complete Windows Installer" -ForegroundColor Cyan
@@ -94,9 +144,23 @@ foreach ($tn in @($AgentTask, $KioskTask, $GuardianTask)) {
 }
 
 # Kill processes
-Write-Host "[0c] Killing node.exe and Chrome..." -ForegroundColor Yellow
-Get-Process -Name "node" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
+Write-Host "[0c] Killing node.exe and kiosk browser..." -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
+Get-Process -Name "msedge" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
 Start-Sleep -Seconds 2
 
 # Remove old files (keep NSSM and logs)
@@ -116,9 +180,9 @@ Write-Host ""
 # PART 1: BUILD & INSTALL
 # ============================================================
 
-# --- 1. Node.js ---
-Write-Host "[1/19] Checking Node.js..." -ForegroundColor Yellow
-try {
+# --- 1. Node.js ---
+Write-Host "[1/19] Checking Node.js..." -ForegroundColor Yellow
+try {
     $nodeVersion = (node -v) -replace 'v', ''
     if ([int]($nodeVersion.Split('.')[0]) -lt 20) { throw "old" }
     Write-Host "  Found Node.js v$nodeVersion"
@@ -131,19 +195,7 @@ try {
     $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
     if (-not (Get-Command node -ErrorAction SilentlyContinue)) { Write-Host "  FATAL: Node.js install failed!" -ForegroundColor Red; exit 1 }
     Write-Host "  Node.js installed" -ForegroundColor Green
-}
-
-# Always ensure Node path remains available after kiosk conversion
-$nodePath = (Get-Command node).Source
-$nodeDir = Split-Path -Parent $nodePath
-$addedMachine = Ensure-PathContains -Scope "Machine" -Entry $nodeDir
-$addedUser = Ensure-PathContains -Scope "User" -Entry $nodeDir
-$env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
-if ($addedMachine -or $addedUser) {
-    Write-Host "  Ensured Node.js path in PATH: $nodeDir" -ForegroundColor Green
-} else {
-    Write-Host "  Node.js path already present in PATH"
-}
+}
 
 # --- 2. Build ---
 Write-Host "[2/19] Building agent..." -ForegroundColor Yellow
@@ -167,6 +219,7 @@ Copy-Item "$AgentDir\package.json" "$InstallDir\package.json" -Force
 if (Test-Path "$AgentDir\package-lock.json") { Copy-Item "$AgentDir\package-lock.json" "$InstallDir\package-lock.json" -Force }
 Copy-Item "$AgentDir\agent.config.template.json" "$InstallDir\agent.config.template.json" -Force
 if (Test-Path "$AgentDir\public") { Copy-Item "$AgentDir\public" "$InstallDir\public" -Recurse -Force }
+if (Test-Path "$AgentDir\scripts") { Copy-Item "$AgentDir\scripts" "$InstallDir\scripts" -Recurse -Force }
 
 # --- 5. Install deps ---
 Write-Host "[5/19] Installing dependencies..." -ForegroundColor Yellow
@@ -177,6 +230,16 @@ if ($LASTEXITCODE -ne 0) { & npm install --omit=dev --ignore-scripts 2>&1 | Out-
 $ErrorActionPreference = "Stop"
 Pop-Location
 
+# --- 5b. Chrome ---
+Write-Host "[5b/19] Ensuring Google Chrome is installed..." -ForegroundColor Yellow
+try {
+    $chromePath = Ensure-ChromeInstalled
+} catch {
+    Write-Host "  FATAL: $($_.Exception.Message)" -ForegroundColor Red
+    Write-Host "  Install Google Chrome manually, then re-run the installer." -ForegroundColor Yellow
+    exit 1
+}
+
 # --- 6. Generate config ---
 Write-Host "[6/19] Generating config..." -ForegroundColor Yellow
 if ($ShellReplace) {
@@ -327,6 +390,49 @@ for ($i = 0; $i -lt 10; $i++) {
 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"
@@ -530,7 +636,7 @@ $svcStatus = if ($finalSvc) { "$($finalSvc.Status)" } else { "NOT FOUND" }
 $cfgOk = $false
 try {
     Push-Location $InstallDir
-    $cfgResult = & node -e "const c=JSON.parse(require('fs').readFileSync('agent.config.json','utf8'));console.log(JSON.stringify({slug:c.deviceSlug,shell:c.kiosk&&c.kiosk.shellMode||false}))" 2>&1
+    $cfgResult = & node -e "const c=JSON.parse(require('fs').readFileSync('agent.config.json','utf8'));console.log(JSON.stringify({slug:c.deviceSlug,shell:c.kiosk&&c.kiosk.shellMode||false,browser:c.kiosk&&c.kiosk.browserPath||''}))" 2>&1
     $cfgData = $cfgResult | ConvertFrom-Json
     Pop-Location
     $cfgOk = $true
@@ -551,6 +657,7 @@ Write-Host "  Service    : $svcStatus" -ForegroundColor $(if ($svcStatus -eq 'Ru
 if ($cfgOk) {
     Write-Host "  Config slug: $($cfgData.slug)" -ForegroundColor $(if ($cfgData.slug -eq $Slug) { 'Green' } else { 'Red' })
     Write-Host "  Shell mode : $($cfgData.shell)" -ForegroundColor $(if ($cfgData.shell -eq $ShellReplace.IsPresent) { 'Green' } else { 'Red' })
+    Write-Host "  Browser    : $($cfgData.browser)" -ForegroundColor Green
 }
 Write-Host ""
 Write-Host "  Manage:" -ForegroundColor DarkGray

package/scripts/launch-kiosk.vbs

@@ -26,6 +26,11 @@ objFile.Close
 
 browserPath = ExtractJsonValue(jsonText, "browserPath")
 defaultUrl = ExtractJsonValue(jsonText, "defaultUrl")
+browserExeName = LCase(ExtractFileName(browserPath))
+
+If browserExeName = "" Then
+    browserExeName = "chrome.exe"
+End If
 
 If browserPath = "" Or defaultUrl = "" Then
     WScript.Quit 1
@@ -35,11 +40,11 @@ End If
 ' Try to ping the server (extract hostname from URL)
 waitedMs = 0
 Do While waitedMs < (maxWaitSeconds * 1000)
-    ' Check if Chrome is already running (agent's KioskManager may have launched it)
+    ' Check if the browser is already running (agent's KioskManager may have launched it)
     Set objWMI = GetObject("winmgmts:\\.\root\cimv2")
-    Set colProcesses = objWMI.ExecQuery("SELECT ProcessId FROM Win32_Process WHERE Name = 'chrome.exe'")
+    Set colProcesses = objWMI.ExecQuery("SELECT ProcessId FROM Win32_Process WHERE Name = '" & browserExeName & "'")
     If colProcesses.Count > 0 Then
-        ' Chrome already running - agent is handling it. Exit gracefully.
+        ' Browser already running - agent is handling it. Exit gracefully.
         WScript.Quit 0
     End If
 
@@ -56,14 +61,14 @@ Do While waitedMs < (maxWaitSeconds * 1000)
         ' Service is running - give it a few more seconds to launch Chrome itself
         WScript.Sleep 15000
 
-        ' Re-check if Chrome appeared (agent launched it)
-        Set colProcesses2 = objWMI.ExecQuery("SELECT ProcessId FROM Win32_Process WHERE Name = 'chrome.exe'")
+        ' Re-check if the browser appeared (agent launched it)
+        Set colProcesses2 = objWMI.ExecQuery("SELECT ProcessId FROM Win32_Process WHERE Name = '" & browserExeName & "'")
         If colProcesses2.Count > 0 Then
-            ' Agent launched Chrome successfully. Exit.
+            ' Agent launched the browser successfully. Exit.
             WScript.Quit 0
         End If
 
-        ' Agent is running but hasn't launched Chrome yet - we'll do it
+        ' Agent is running but hasn't launched the browser yet - we'll do it
         Exit Do
     End If
 
@@ -99,3 +104,14 @@ Function ExtractJsonValue(json, key)
     If endPos = 0 Then Exit Function
     ExtractJsonValue = Mid(json, pos, endPos - pos)
 End Function
+
+Function ExtractFileName(path)
+    ExtractFileName = ""
+    If path = "" Then Exit Function
+    On Error Resume Next
+    ExtractFileName = objFSO.GetFileName(path)
+    If ExtractFileName = "" Then
+        ExtractFileName = path
+    End If
+    On Error GoTo 0
+End Function