lightman-agent 1.0.3 → 1.0.4

package/package.json

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

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();