lightman-agent 1.0.28 → 1.0.29

package/package.json

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

package/scripts/guardian.ps1

@@ -21,7 +21,7 @@ function Write-GuardianLog($msg) {
     } catch { }
 }
 
-function Get-BrowserProcessName {
+function Get-BrowserProcessName {
     try {
         if (Test-Path $ConfigPath) {
             $config = Get-Content $ConfigPath -Raw | ConvertFrom-Json
@@ -35,10 +35,20 @@ function Get-BrowserProcessName {
         }
     } catch { }
 
-    return "chrome"
-}
-
-try {
+    return "chrome"
+}
+
+function Get-ShellModeEnabled {
+    try {
+        if (Test-Path $ConfigPath) {
+            $config = Get-Content $ConfigPath -Raw | ConvertFrom-Json
+            return [bool]($config.kiosk -and $config.kiosk.shellMode)
+        }
+    } catch { }
+    return $false
+}
+
+try {
     # 1. Check LIGHTMAN service
     $svc = Get-Service -Name $ServiceName -ErrorAction SilentlyContinue
     if (-not $svc) {
@@ -75,13 +85,18 @@ try {
         }
     }
 
-    # 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
+    # 2. Check kiosk browser
+    $browserProcess = Get-BrowserProcessName
+    $shellMode = Get-ShellModeEnabled
+    $browser = Get-Process -Name $browserProcess -ErrorAction SilentlyContinue
+    if (-not $browser) {
+        if ($shellMode) {
+            Write-GuardianLog "Browser '$browserProcess' not running in shell mode. Skipping VBS launch; shell will recover."
+            exit 0
+        }
+        $vbsPath = "C:\Program Files\Lightman\Agent\launch-kiosk.vbs"
+        if (Test-Path $vbsPath) {
+            Start-Sleep -Seconds 10
             $browserRecheck = Get-Process -Name $browserProcess -ErrorAction SilentlyContinue
             if (-not $browserRecheck) {
                 Write-GuardianLog "Browser '$browserProcess' not running. Launching via VBS..."

package/scripts/install-windows.ps1

@@ -165,8 +165,9 @@ Start-Sleep -Seconds 2
 
 # Remove old files (keep NSSM and logs)
 Write-Host "[0d] Removing old agent files..." -ForegroundColor Yellow
-Remove-Item -Path $InstallDir -Recurse -Force -ErrorAction SilentlyContinue
-Remove-Item -Path "C:\ProgramData\Lightman\kiosk-url.txt" -Force -ErrorAction SilentlyContinue
+Remove-Item -Path $InstallDir -Recurse -Force -ErrorAction SilentlyContinue
+Remove-Item -Path "C:\ProgramData\Lightman\kiosk-url.txt" -Force -ErrorAction SilentlyContinue
+Remove-Item -Path "C:\ProgramData\Lightman\kiosk-multi.json" -Force -ErrorAction SilentlyContinue
 
 # Remove firewall rule
 Remove-NetFirewallRule -DisplayName "LIGHTMAN Agent WebSocket" -ErrorAction SilentlyContinue
@@ -535,16 +536,6 @@ powercfg /change monitor-timeout-ac 0 2>&1 | Out-Null
 powercfg /change standby-timeout-ac 0 2>&1 | Out-Null
 powercfg /change hibernate-timeout-ac 0 2>&1 | Out-Null
 
-# --- 15b. Display topology ---
-Write-Host "[15b/19] Enforcing display extend mode..." -ForegroundColor Yellow
-if (Test-Path "$env:SystemRoot\System32\DisplaySwitch.exe") {
-    & "$env:SystemRoot\System32\DisplaySwitch.exe" /extend 2>&1 | Out-Null
-    Start-Sleep -Seconds 2
-    Write-Host "  Display mode set to Extend"
-} else {
-    Write-Host "  DisplaySwitch.exe not found - skipped" -ForegroundColor DarkYellow
-}
-
 # --- 16. Harden ---
 Write-Host "[16/19] Hardening Windows..." -ForegroundColor Yellow
 $WU = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU"

package/scripts/launch-kiosk.vbs

@@ -25,8 +25,10 @@ jsonText = objFile.ReadAll
 objFile.Close
 
 browserPath = ExtractJsonValue(jsonText, "browserPath")
-defaultUrl = ExtractJsonValue(jsonText, "defaultUrl")
-browserExeName = LCase(ExtractFileName(browserPath))
+defaultUrl = ExtractJsonValue(jsonText, "defaultUrl")
+defaultUrl = Replace(defaultUrl, "http://localhost:3403", "http://127.0.0.1:3403")
+defaultUrl = Replace(defaultUrl, "https://localhost:3403", "http://127.0.0.1:3403")
+browserExeName = LCase(ExtractFileName(browserPath))
 
 If browserExeName = "" Then
     browserExeName = "chrome.exe"
@@ -77,7 +79,7 @@ Do While waitedMs < (maxWaitSeconds * 1000)
 Loop
 
 ' --- Build Chrome kiosk args ---
-chromeArgs = "--kiosk --noerrdialogs --disable-infobars --disable-session-crashed-bubble --no-first-run --no-default-browser-check --start-fullscreen --disable-translate --disable-extensions --autoplay-policy=no-user-gesture-required"
+chromeArgs = "--kiosk --noerrdialogs --disable-infobars --disable-session-crashed-bubble --no-first-run --no-default-browser-check --start-fullscreen --disable-translate --disable-extensions --autoplay-policy=no-user-gesture-required --proxy-server=direct:// --proxy-bypass-list=*"
 
 userDataDir = ExtractJsonValue(jsonText, "user-data-dir")
 If userDataDir = "" Then

package/scripts/launch-multi-kiosk.ps1

@@ -84,6 +84,8 @@ if (-not (Test-Path $MultiConfigPath)) {
         "--no-default-browser-check",
         "--autoplay-policy=no-user-gesture-required",
         "--disable-features=TranslateUI",
+        "--proxy-server=direct://",
+        "--proxy-bypass-list=*",
         "--user-data-dir=C:\ProgramData\Lightman\chrome-kiosk",
         $FallbackUrl
     ) -PassThru
@@ -104,6 +106,8 @@ if ($entries.Count -le 1) {
         "--no-default-browser-check",
         "--autoplay-policy=no-user-gesture-required",
         "--disable-features=TranslateUI",
+        "--proxy-server=direct://",
+        "--proxy-bypass-list=*",
         "--user-data-dir=C:\ProgramData\Lightman\chrome-kiosk",
         $FallbackUrl
     ) -PassThru
@@ -151,6 +155,8 @@ for ($i = 0; $i -lt $entries.Count; $i++) {
         "--no-default-browser-check",
         "--autoplay-policy=no-user-gesture-required",
         "--disable-features=TranslateUI",
+        "--proxy-server=direct://",
+        "--proxy-bypass-list=*",
         "--window-position=$x,$y",
         "--window-size=$w,$h",
         "--user-data-dir=$userDataDir",
@@ -172,6 +178,8 @@ if ($processes.Count -eq 0) {
         "--no-default-browser-check",
         "--autoplay-policy=no-user-gesture-required",
         "--disable-features=TranslateUI",
+        "--proxy-server=direct://",
+        "--proxy-bypass-list=*",
         "--user-data-dir=C:\ProgramData\Lightman\chrome-kiosk",
         $FallbackUrl
     ) -PassThru

package/scripts/lightman-shell.bat

@@ -63,22 +63,29 @@ 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 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%"
-    )
-)
+if not "%DEVICE_SLUG%"=="" (
+    set URL=http://127.0.0.1:3403/display/%DEVICE_SLUG%
+    echo [%date% %time%] Slug: %DEVICE_SLUG% >> "%LOG_FILE%"
+) else (
+    set URL=http://127.0.0.1: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
+    set USE_SIDE_URL=0
+    if not "%SIDE_URL%"=="" (
+        echo %SIDE_URL% | find /I "127.0.0.1:3403" >nul && set USE_SIDE_URL=1
+        echo %SIDE_URL% | find /I "localhost:3403" >nul && set USE_SIDE_URL=1
+    )
+    if "%USE_SIDE_URL%"=="1" (
+        set URL=%SIDE_URL%
+        echo [%date% %time%] Using sidecar local URL >> "%LOG_FILE%"
+    ) else (
+        if not "%SIDE_URL%"=="" echo [%date% %time%] Ignoring non-local sidecar URL >> "%LOG_FILE%"
+    )
+)
 
 REM Fallback browser
 if "%BROWSER%"=="" (
@@ -118,11 +125,19 @@ set WAIT_COUNT=0
 :agent_ready
 echo [%date% %time%] Agent ready >> "%LOG_FILE%"
 
-REM Force Windows into Extend mode so all connected displays are usable.
-if exist "%SystemRoot%\System32\DisplaySwitch.exe" (
-    "%SystemRoot%\System32\DisplaySwitch.exe" /extend >nul 2>&1
-    timeout /t 2 /nobreak >nul
-)
+REM Wait until local display HTTP endpoint responds before opening browser.
+set HTTP_WAIT=0
+:wait_for_http
+    powershell -NoProfile -Command "try { $r=Invoke-WebRequest -UseBasicParsing -TimeoutSec 2 -Uri 'http://127.0.0.1:3403/'; if ($r.StatusCode -ge 200) { exit 0 } else { exit 1 } } catch { exit 1 }" >nul 2>&1
+    if %errorlevel%==0 goto http_ready
+    set /a HTTP_WAIT+=1
+    set /a HTTP_WAIT_MOD=HTTP_WAIT %% 30
+    if %HTTP_WAIT_MOD%==0 echo [%date% %time%] Still waiting for HTTP on 127.0.0.1:3403... (%HTTP_WAIT%s) >> "%LOG_FILE%"
+    timeout /t 1 /nobreak >nul
+    goto wait_for_http
+
+:http_ready
+echo [%date% %time%] HTTP ready on 127.0.0.1:3403 >> "%LOG_FILE%"
 
 REM ----------------------------------------------------------------
 REM Infinite Chrome loop
@@ -133,16 +148,23 @@ REM ----------------------------------------------------------------
     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
-            )
-        )
-    )
+    if not "%SIDE_URL%"=="" (
+        set USE_SIDE_URL=0
+        echo %SIDE_URL% | find /I "127.0.0.1:3403" >nul && set USE_SIDE_URL=1
+        echo %SIDE_URL% | find /I "localhost:3403" >nul && set USE_SIDE_URL=1
+        if "%USE_SIDE_URL%"=="1" (
+            set URL=%SIDE_URL%
+        ) else (
+            echo [%date% %time%] Ignoring non-local sidecar URL in loop >> "%LOG_FILE%"
+        )
+    ) 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://127.0.0.1:3403/display/%%a
+            )
+        )
+    )
 
     set MULTI_COUNT=0
     if exist "%MULTI_SIDECAR%" (
@@ -154,7 +176,7 @@ REM ----------------------------------------------------------------
         powershell -ExecutionPolicy Bypass -NoProfile -File "%MULTI_LAUNCHER%" -BrowserPath "%BROWSER%" -MultiConfigPath "%MULTI_SIDECAR%" -FallbackUrl "%URL%" -LogFile "%LOG_FILE%"
     ) else (
         echo [%date% %time%] Launching browser: %URL% >> "%LOG_FILE%"
-        start /wait "" "%BROWSER%" --kiosk --noerrdialogs --disable-infobars --disable-session-crashed-bubble --no-first-run --no-default-browser-check --start-fullscreen --disable-translate --disable-extensions --autoplay-policy=no-user-gesture-required --disable-features=TranslateUI --user-data-dir="%CHROME_DATA%" "%URL%"
+        start /wait "" "%BROWSER%" --kiosk --noerrdialogs --disable-infobars --disable-session-crashed-bubble --no-first-run --no-default-browser-check --start-fullscreen --disable-translate --disable-extensions --autoplay-policy=no-user-gesture-required --disable-features=TranslateUI --proxy-server=direct:// --proxy-bypass-list=* --user-data-dir="%CHROME_DATA%" "%URL%"
     )
 
     echo [%date% %time%] Browser exited (code: %errorlevel%). Restarting in 3s... >> "%LOG_FILE%"

package/scripts/setup.ps1

@@ -68,8 +68,8 @@ if (Test-Path $IdentityFile) {
     Write-Host "[OK] No existing identity cache found (clean install)" -ForegroundColor DarkGray
 }
 
-# 2. Kiosk display URL - always localhost since agent runs the static server locally on port 3403
-$KioskUrl  = "http://localhost:3403/display/$Slug"
+# 2. Kiosk display URL - use 127.0.0.1 to avoid localhost/proxy edge-cases
+$KioskUrl  = "http://127.0.0.1:3403/display/$Slug"
 
 # 3. Detect browser path
 try {

package/src/index.ts

@@ -163,10 +163,16 @@ async function main(): Promise<void> {
     crashWindowMs: 300_000,
   };
   // Enforce unmuted autoplay in kiosk mode for video templates with audio tracks.
-  const normalizedExtraArgs = (baseKioskConfig.extraArgs || []).filter((arg) => arg !== '--mute-audio');
-  if (!normalizedExtraArgs.some((arg) => arg.startsWith('--autoplay-policy='))) {
-    normalizedExtraArgs.push('--autoplay-policy=no-user-gesture-required');
-  }
+  const normalizedExtraArgs = (baseKioskConfig.extraArgs || []).filter((arg) => arg !== '--mute-audio');
+  if (!normalizedExtraArgs.some((arg) => arg.startsWith('--autoplay-policy='))) {
+    normalizedExtraArgs.push('--autoplay-policy=no-user-gesture-required');
+  }
+  if (!normalizedExtraArgs.some((arg) => arg.startsWith('--proxy-server='))) {
+    normalizedExtraArgs.push('--proxy-server=direct://');
+  }
+  if (!normalizedExtraArgs.some((arg) => arg.startsWith('--proxy-bypass-list='))) {
+    normalizedExtraArgs.push('--proxy-bypass-list=*');
+  }
   // Inject credentials into the kiosk URL so Chrome auto-provisions without pairing
   const kioskUrl = new URL(baseKioskConfig.defaultUrl);
   kioskUrl.searchParams.set('deviceId', identity.deviceId);

package/src/services/multiScreenKiosk.ts

@@ -222,12 +222,12 @@ export class MultiScreenKioskManager {
   /** Build the full URL with device credentials and screenIndex */
   private buildUrl(path: string, identity: { deviceId: string; apiKey: string }, screenIndex?: number): string {
     let fullUrl: string;
-    if (path.startsWith('http://') || path.startsWith('https://')) {
-      fullUrl = path;
-    } else {
-      const displayPath = path.startsWith('/display/') ? path : `/display/${path.replace(/^\//, '')}`;
-      fullUrl = `http://localhost:3403${displayPath}`;
-    }
+    if (path.startsWith('http://') || path.startsWith('https://')) {
+      fullUrl = path;
+    } else {
+      const displayPath = path.startsWith('/display/') ? path : `/display/${path.replace(/^\//, '')}`;
+      fullUrl = `http://127.0.0.1:3403${displayPath}`;
+    }
 
     const url = new URL(fullUrl);
     url.searchParams.set('deviceId', identity.deviceId);