lightman-agent 1.0.20 → 1.0.22

package/bin/cms-agent.js

@@ -8,27 +8,30 @@ 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';
-
-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
-`);
-}
+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
+`);
+}
 
 function parseArgs(argv) {
   const args = {};
@@ -177,25 +180,51 @@ 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 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);
+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);
 
   if (!noRestart) {
     console.log('Installation completed. Rebooting now...');
@@ -262,19 +291,24 @@ 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 === '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 === 'version' || command === '--version' || command === '-v') {
+    runVersion();
+    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.20",
+  "version": "1.0.22",
   "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",
+    [string]$Username = "",
+    [switch]$ShellReplace = $false,
+    [int]$PairingTimeoutSeconds = 900
+)
 
 $ErrorActionPreference = "Stop"
 
@@ -25,11 +26,35 @@ $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
+$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
+}
 
 if (-not $Username) { $Username = $env:USERNAME }
 
@@ -91,9 +116,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"
@@ -106,7 +131,19 @@ 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