lightman-agent 1.0.14 → 1.0.16

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.14",
+  "version": "1.0.16",
   "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",
+    [int]$PairingTimeoutSeconds = 900,
+    [string]$Username = "",
+    [switch]$ShellReplace = $false
+)
 
 $ErrorActionPreference = "Stop"
 
@@ -37,11 +38,12 @@ 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
@@ -142,11 +144,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);