lightman-agent 1.0.12 → 1.0.15

package/scripts/launch-kiosk.vbs

@@ -1,117 +1,101 @@
-' LIGHTMAN Kiosk Launcher
-' Runs at user logon AND at system startup to start the kiosk browser.
-' Waits for the agent service to be ready before launching Chrome.
-' If the agent is already managing Chrome, this script exits gracefully.
-
-Set objShell = CreateObject("WScript.Shell")
-Set objFSO = CreateObject("Scripting.FileSystemObject")
-
-' --- Configuration ---
-configPath = "C:\Program Files\Lightman\Agent\agent.config.json"
-maxWaitSeconds = 120  ' Max time to wait for agent service
-checkIntervalMs = 5000 ' Check every 5 seconds
-
-' --- Wait for config file to exist (agent might still be installing) ---
-If Not objFSO.FileExists(configPath) Then
-    WScript.Sleep 10000
-    If Not objFSO.FileExists(configPath) Then
-        WScript.Quit 1
-    End If
-End If
-
-' --- Read config ---
-Set objFile = objFSO.OpenTextFile(configPath, 1)
-jsonText = objFile.ReadAll
-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
-End If
-
-' --- Wait for network connectivity ---
-' Try to ping the server (extract hostname from URL)
-waitedMs = 0
-Do While waitedMs < (maxWaitSeconds * 1000)
-    ' 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 = '" & browserExeName & "'")
-    If colProcesses.Count > 0 Then
-        ' Browser already running - agent is handling it. Exit gracefully.
-        WScript.Quit 0
-    End If
-
-    ' Check if LIGHTMAN service is running
-    Set colServices = objWMI.ExecQuery("SELECT State FROM Win32_Service WHERE DisplayName LIKE 'LIGHTMAN%'")
-    serviceRunning = False
-    For Each svc In colServices
-        If LCase(svc.State) = "running" Then
-            serviceRunning = True
-        End If
-    Next
-
-    If serviceRunning Then
-        ' Service is running - give it a few more seconds to launch Chrome itself
-        WScript.Sleep 15000
-
-        ' 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 the browser successfully. Exit.
-            WScript.Quit 0
-        End If
-
-        ' Agent is running but hasn't launched the browser yet - we'll do it
-        Exit Do
-    End If
-
-    WScript.Sleep checkIntervalMs
-    waitedMs = waitedMs + checkIntervalMs
-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"
-
-userDataDir = ExtractJsonValue(jsonText, "user-data-dir")
-If userDataDir = "" Then
-    userDataDir = "C:\ProgramData\Lightman\chrome-kiosk"
-End If
-chromeArgs = chromeArgs & " --user-data-dir=""" & userDataDir & """"
-
-' --- Launch Chrome ---
-objShell.Run """" & browserPath & """ " & chromeArgs & " """ & defaultUrl & """", 1, False
-
-' ========================================================
-' Helper: extract a string value from JSON by key
-' ========================================================
-Function ExtractJsonValue(json, key)
-    ExtractJsonValue = ""
-    pos = InStr(json, """" & key & """")
-    If pos = 0 Then Exit Function
-    pos = InStr(pos, json, ":")
-    If pos = 0 Then Exit Function
-    pos = InStr(pos, json, """")
-    If pos = 0 Then Exit Function
-    pos = pos + 1
-    endPos = InStr(pos, json, """")
-    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
+' LIGHTMAN Kiosk Launcher
+' Runs at user logon AND at system startup to start the kiosk browser.
+' Waits for the agent service to be ready before launching Chrome.
+' If the agent is already managing Chrome, this script exits gracefully.
+
+Set objShell = CreateObject("WScript.Shell")
+Set objFSO = CreateObject("Scripting.FileSystemObject")
+
+' --- Configuration ---
+configPath = "C:\Program Files\Lightman\Agent\agent.config.json"
+maxWaitSeconds = 120  ' Max time to wait for agent service
+checkIntervalMs = 5000 ' Check every 5 seconds
+
+' --- Wait for config file to exist (agent might still be installing) ---
+If Not objFSO.FileExists(configPath) Then
+    WScript.Sleep 10000
+    If Not objFSO.FileExists(configPath) Then
+        WScript.Quit 1
+    End If
+End If
+
+' --- Read config ---
+Set objFile = objFSO.OpenTextFile(configPath, 1)
+jsonText = objFile.ReadAll
+objFile.Close
+
+browserPath = ExtractJsonValue(jsonText, "browserPath")
+defaultUrl = ExtractJsonValue(jsonText, "defaultUrl")
+
+If browserPath = "" Or defaultUrl = "" Then
+    WScript.Quit 1
+End If
+
+' --- Wait for network connectivity ---
+' 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)
+    Set objWMI = GetObject("winmgmts:\\.\root\cimv2")
+    Set colProcesses = objWMI.ExecQuery("SELECT ProcessId FROM Win32_Process WHERE Name = 'chrome.exe'")
+    If colProcesses.Count > 0 Then
+        ' Chrome already running - agent is handling it. Exit gracefully.
+        WScript.Quit 0
+    End If
+
+    ' Check if LIGHTMAN service is running
+    Set colServices = objWMI.ExecQuery("SELECT State FROM Win32_Service WHERE DisplayName LIKE 'LIGHTMAN%'")
+    serviceRunning = False
+    For Each svc In colServices
+        If LCase(svc.State) = "running" Then
+            serviceRunning = True
+        End If
+    Next
+
+    If serviceRunning Then
+        ' 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'")
+        If colProcesses2.Count > 0 Then
+            ' Agent launched Chrome successfully. Exit.
+            WScript.Quit 0
+        End If
+
+        ' Agent is running but hasn't launched Chrome yet - we'll do it
+        Exit Do
+    End If
+
+    WScript.Sleep checkIntervalMs
+    waitedMs = waitedMs + checkIntervalMs
+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"
+
+userDataDir = ExtractJsonValue(jsonText, "user-data-dir")
+If userDataDir = "" Then
+    userDataDir = "C:\ProgramData\Lightman\chrome-kiosk"
+End If
+chromeArgs = chromeArgs & " --user-data-dir=""" & userDataDir & """"
+
+' --- Launch Chrome ---
+objShell.Run """" & browserPath & """ " & chromeArgs & " """ & defaultUrl & """", 1, False
+
+' ========================================================
+' Helper: extract a string value from JSON by key
+' ========================================================
+Function ExtractJsonValue(json, key)
+    ExtractJsonValue = ""
+    pos = InStr(json, """" & key & """")
+    If pos = 0 Then Exit Function
+    pos = InStr(pos, json, ":")
+    If pos = 0 Then Exit Function
+    pos = InStr(pos, json, """")
+    If pos = 0 Then Exit Function
+    pos = pos + 1
+    endPos = InStr(pos, json, """")
+    If endPos = 0 Then Exit Function
+    ExtractJsonValue = Mid(json, pos, endPos - pos)
+End Function

package/scripts/lightman-shell.bat

@@ -1,149 +1,128 @@
-@echo off
-REM ================================================================
-REM LIGHTMAN Shell - Replaces explorer.exe as the Windows shell
-REM ================================================================
-REM SINGLE SOURCE OF TRUTH: agent.config.json
-REM
-REM Boot flow:
-REM   1. Auto-login (no password)
-REM   2. This script runs INSTEAD of explorer.exe
-REM   3. Reads slug + browser from agent.config.json (THE ONLY SOURCE)
-REM   4. Waits for agent service (port 3403)
-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 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"
-if not exist "%CHROME_DATA%" mkdir "%CHROME_DATA%"
-
-echo [%date% %time%] ===== LIGHTMAN Shell starting ===== >> "%LOG_FILE%"
-
-REM ----------------------------------------------------------------
-REM Read slug and browser from agent.config.json ONLY
-REM No sidecar files, no hardcoded URLs, no confusion.
-REM ----------------------------------------------------------------
-set DEVICE_SLUG=
-set BROWSER=
-set URL=
-
-REM Wait for node.exe to be available
-set NODE_WAIT=0
-:wait_for_node
-    where node >nul 2>&1
-    if %errorlevel%==0 goto node_ready
-    set /a NODE_WAIT+=1
-    if %NODE_WAIT% geq 30 (
-        echo [%date% %time%] ERROR: node.exe not found after 30s >> "%LOG_FILE%"
-        goto use_fallbacks
-    )
-    timeout /t 1 /nobreak >nul
-    goto wait_for_node
-
-:node_ready
-
-REM Read slug from config
-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 set DEVICE_SLUG=%%a
-)
-
-REM Read browser from config
-if exist "%CONFIG_FILE%" (
-    for /f "delims=" %%a in ('node -e "try{const c=JSON.parse(require('fs').readFileSync(String.raw`%CONFIG_FILE%`,'utf8'));console.log(c.kiosk&&c.kiosk.browserPath||'')}catch(e){console.log('')}" 2^>nul') do set BROWSER=%%a
-)
-
-: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%"
-    )
-)
-
-REM Fallback browser
-if "%BROWSER%"=="" (
-    if exist "C:\Program Files\Google\Chrome\Application\chrome.exe" (
-        set "BROWSER=C:\Program Files\Google\Chrome\Application\chrome.exe"
-    ) else if exist "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe" (
-        set "BROWSER=C:\Program Files (x86)\Google\Chrome\Application\chrome.exe"
-    ) else if exist "C:\Program Files\Microsoft\Edge\Application\msedge.exe" (
-        set "BROWSER=C:\Program Files\Microsoft\Edge\Application\msedge.exe"
-    ) else if exist "C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe" (
-        set "BROWSER=C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe"
-    ) else (
-        echo [%date% %time%] ERROR: No supported kiosk browser found! >> "%LOG_FILE%"
-        start explorer.exe
-        exit /b 1
-    )
-)
-
-echo [%date% %time%] Browser: %BROWSER% >> "%LOG_FILE%"
-echo [%date% %time%] URL: %URL% >> "%LOG_FILE%"
-
-REM ----------------------------------------------------------------
-REM Wait for agent service (port 3403)
-REM ----------------------------------------------------------------
-echo [%date% %time%] Waiting for port 3403... >> "%LOG_FILE%"
-set WAIT_COUNT=0
-set MAX_WAIT=60
-
-:wait_for_agent
-    netstat -an | findstr ":3403.*LISTENING" >nul 2>&1
-    if %errorlevel%==0 goto agent_ready
-    set /a WAIT_COUNT+=1
-    if %WAIT_COUNT% geq %MAX_WAIT% (
-        echo [%date% %time%] Port 3403 not ready after %MAX_WAIT%s, launching anyway >> "%LOG_FILE%"
-        goto agent_ready
-    )
-    timeout /t 1 /nobreak >nul
-    goto wait_for_agent
-
-:agent_ready
-echo [%date% %time%] Agent ready >> "%LOG_FILE%"
-
-REM ----------------------------------------------------------------
-REM Infinite Chrome loop
-REM ----------------------------------------------------------------
-: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 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%"
-
-    echo [%date% %time%] Browser exited (code: %errorlevel%). Restarting in 3s... >> "%LOG_FILE%"
-    timeout /t 3 /nobreak >nul
-
-goto loop
+@echo off
+REM ================================================================
+REM LIGHTMAN Shell - Replaces explorer.exe as the Windows shell
+REM ================================================================
+REM SINGLE SOURCE OF TRUTH: agent.config.json
+REM
+REM Boot flow:
+REM   1. Auto-login (no password)
+REM   2. This script runs INSTEAD of explorer.exe
+REM   3. Reads slug + browser from agent.config.json (THE ONLY SOURCE)
+REM   4. Waits for agent service (port 3403)
+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
+
+REM Ensure directories exist
+if not exist "C:\ProgramData\Lightman\logs" mkdir "C:\ProgramData\Lightman\logs"
+if not exist "%CHROME_DATA%" mkdir "%CHROME_DATA%"
+
+echo [%date% %time%] ===== LIGHTMAN Shell starting ===== >> "%LOG_FILE%"
+
+REM ----------------------------------------------------------------
+REM Read slug and browser from agent.config.json ONLY
+REM No sidecar files, no hardcoded URLs, no confusion.
+REM ----------------------------------------------------------------
+set DEVICE_SLUG=
+set BROWSER=
+set URL=
+
+REM Wait for node.exe to be available
+set NODE_WAIT=0
+:wait_for_node
+    where node >nul 2>&1
+    if %errorlevel%==0 goto node_ready
+    set /a NODE_WAIT+=1
+    if %NODE_WAIT% geq 30 (
+        echo [%date% %time%] ERROR: node.exe not found after 30s >> "%LOG_FILE%"
+        goto use_fallbacks
+    )
+    timeout /t 1 /nobreak >nul
+    goto wait_for_node
+
+:node_ready
+
+REM Read slug from config
+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 set DEVICE_SLUG=%%a
+)
+
+REM Read browser from config
+if exist "%CONFIG_FILE%" (
+    for /f "delims=" %%a in ('node -e "try{const c=JSON.parse(require('fs').readFileSync(String.raw`%CONFIG_FILE%`,'utf8'));console.log(c.kiosk&&c.kiosk.browserPath||'')}catch(e){console.log('')}" 2^>nul') do set BROWSER=%%a
+)
+
+: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 Fallback browser
+if "%BROWSER%"=="" (
+    if exist "C:\Program Files\Google\Chrome\Application\chrome.exe" (
+        set "BROWSER=C:\Program Files\Google\Chrome\Application\chrome.exe"
+    ) else if exist "C:\Program Files (x86)\Google\Chrome\Application\chrome.exe" (
+        set "BROWSER=C:\Program Files (x86)\Google\Chrome\Application\chrome.exe"
+    ) else (
+        echo [%date% %time%] ERROR: Chrome not found! >> "%LOG_FILE%"
+        start explorer.exe
+        exit /b 1
+    )
+)
+
+echo [%date% %time%] Browser: %BROWSER% >> "%LOG_FILE%"
+echo [%date% %time%] URL: %URL% >> "%LOG_FILE%"
+
+REM ----------------------------------------------------------------
+REM Wait for agent service (port 3403)
+REM ----------------------------------------------------------------
+echo [%date% %time%] Waiting for port 3403... >> "%LOG_FILE%"
+set WAIT_COUNT=0
+set MAX_WAIT=60
+
+:wait_for_agent
+    netstat -an | findstr ":3403.*LISTENING" >nul 2>&1
+    if %errorlevel%==0 goto agent_ready
+    set /a WAIT_COUNT+=1
+    if %WAIT_COUNT% geq %MAX_WAIT% (
+        echo [%date% %time%] Port 3403 not ready after %MAX_WAIT%s, launching anyway >> "%LOG_FILE%"
+        goto agent_ready
+    )
+    timeout /t 1 /nobreak >nul
+    goto wait_for_agent
+
+:agent_ready
+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
+        )
+    )
+
+    echo [%date% %time%] Launching Chrome: %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%"
+
+    echo [%date% %time%] Chrome exited (code: %errorlevel%). Restarting in 3s... >> "%LOG_FILE%"
+    timeout /t 3 /nobreak >nul
+
+goto loop