lightman-agent 1.0.11 → 1.0.14

package/bin/cms-agent.js

@@ -8,7 +8,7 @@ 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.1.100:3401';
+const DEFAULT_SERVER = 'http://192.168.10.100:3401';
 const INSTALL_CONFIG_PATH = 'C:\\Program Files\\Lightman\\Agent\\agent.config.json';
 
 function printUsage() {
@@ -22,7 +22,7 @@ Commands:
 
 Options:
   --slug <value>      Device slug (example: C-AV01)
-  --server <url>      Server URL or IP (example: 192.168.1.100 or http://192.168.1.100:3401)
+  --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
@@ -92,7 +92,7 @@ function normalizeServer(server) {
   try {
     parsed = new URL(candidate);
   } catch {
-    throw new Error('Invalid server IP/URL. Use an IP like 192.168.1.100 or a URL like http://192.168.1.100:3401.');
+    throw new Error('Invalid server IP/URL. Use an IP like 192.168.10.100 or a URL like http://192.168.10.100:3401.');
   }
 
   if (!parsed.port) {
@@ -162,7 +162,7 @@ async function promptServer(defaultServer) {
     while (true) {
       const prompt = defaultServer
         ? `Enter server IP or URL [${defaultServer}]: `
-        : 'Enter server IP or URL (example 192.168.1.100 or http://192.168.1.100:3401): ';
+        : 'Enter server IP or URL (example 192.168.10.100 or http://192.168.10.100:3401): ';
       const answer = (await rl.question(prompt)).trim();
       const server = answer || defaultServer || '';
 

package/package.json

@@ -1,53 +1,53 @@
-{
-  "name": "lightman-agent",
-  "version": "1.0.11",
-  "description": "LIGHTMAN Agent - System-level daemon for museum display machines",
-  "private": false,
-  "type": "module",
-  "bin": {
-    "cms-agent": "bin/cms-agent.js",
-    "lightman-agent": "bin/cms-agent.js"
-  },
-  "files": [
-    "bin/",
-    "nssm/",
-    "public/",
-    "scripts/",
-    "src/index.ts",
-    "src/commands/",
-    "src/lib/",
-    "src/services/",
-    "agent.config.json",
-    "agent.config.template.json",
-    "package-lock.json",
-    "tsconfig.json"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "dev": "tsx watch src/index.ts",
-    "cms-agent": "node ./bin/cms-agent.js",
-    "sync-display": "node ./scripts/sync-display.mjs",
-    "build": "tsc",
-    "start": "node dist/index.js",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:watch": "vitest"
-  },
-  "dependencies": {
-    "systeminformation": "^5.23.0",
-    "ws": "^8.18.0",
-    "zod": "^3.24.1"
-  },
-  "devDependencies": {
-    "@types/node": "^22.10.0",
-    "@types/ws": "^8.5.13",
-    "tsx": "^4.19.2",
-    "typescript": "^5.7.2",
-    "vitest": "^3.1.1"
-  },
-  "engines": {
-    "node": ">=20.0.0"
-  }
-}
+{
+  "name": "lightman-agent",
+  "version": "1.0.14",
+  "description": "LIGHTMAN Agent - System-level daemon for museum display machines",
+  "private": false,
+  "type": "module",
+  "bin": {
+    "cms-agent": "bin/cms-agent.js",
+    "lightman-agent": "bin/cms-agent.js"
+  },
+  "files": [
+    "bin/",
+    "nssm/",
+    "public/",
+    "scripts/",
+    "src/index.ts",
+    "src/commands/",
+    "src/lib/",
+    "src/services/",
+    "agent.config.json",
+    "agent.config.template.json",
+    "package-lock.json",
+    "tsconfig.json"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "dev": "tsx watch src/index.ts",
+    "cms-agent": "node ./bin/cms-agent.js",
+    "sync-display": "node ./scripts/sync-display.mjs",
+    "build": "tsc",
+    "start": "node dist/index.js",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest"
+  },
+  "dependencies": {
+    "systeminformation": "^5.23.0",
+    "ws": "^8.18.0",
+    "zod": "^3.24.1"
+  },
+  "devDependencies": {
+    "@types/node": "^22.10.0",
+    "@types/ws": "^8.5.13",
+    "tsx": "^4.19.2",
+    "typescript": "^5.7.2",
+    "vitest": "^3.1.1"
+  },
+  "engines": {
+    "node": ">=20.0.0"
+  }
+}

package/scripts/guardian.ps1

@@ -1,94 +1,75 @@
-# LIGHTMAN Guardian - Service Health Monitor
-# Runs every 5 minutes via Task Scheduler.
-# Restarts the NSSM service if it's down. Checks Chrome kiosk health.
-
-$LogDir = "C:\ProgramData\Lightman\logs"
-$LogFile = Join-Path $LogDir "guardian.log"
-$ServiceName = "LightmanAgent"
-$NssmExe = "C:\ProgramData\Lightman\nssm\nssm.exe"
-$ConfigPath = "C:\Program Files\Lightman\Agent\agent.config.json"
-
-function Write-GuardianLog($msg) {
-    $ts = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
-    try {
-        if (-not (Test-Path $LogDir)) { New-Item -ItemType Directory -Force -Path $LogDir | Out-Null }
-        Add-Content -Path $LogFile -Value "[$ts] $msg" -ErrorAction SilentlyContinue
-        if ((Get-Item $LogFile -ErrorAction SilentlyContinue).Length -gt 1MB) {
-            $rotated = "$LogFile.old"
-            if (Test-Path $rotated) { Remove-Item $rotated -Force }
-            Rename-Item $LogFile $rotated -Force
-        }
-    } catch { }
-}
-
-function Get-BrowserProcessName {
-    try {
-        if (Test-Path $ConfigPath) {
-            $config = Get-Content $ConfigPath -Raw | ConvertFrom-Json
-            $browserPath = $config.kiosk.browserPath
-            if ($browserPath) {
-                $browserLeaf = Split-Path $browserPath -Leaf
-                if ($browserLeaf) {
-                    return [System.IO.Path]::GetFileNameWithoutExtension($browserLeaf)
-                }
-            }
-        }
-    } catch { }
-
-    return "chrome"
-}
-
-try {
-    # 1. Check LIGHTMAN service
-    $svc = Get-Service -Name $ServiceName -ErrorAction SilentlyContinue
-    if (-not $svc) {
-        $svc = Get-Service -DisplayName "LIGHTMAN*" -ErrorAction SilentlyContinue | Select-Object -First 1
-    }
-
-    if (-not $svc) {
-        Write-GuardianLog "CRITICAL: Service not found!"
-        exit 1
-    }
-
-    if ($svc.Status -ne 'Running') {
-        Write-GuardianLog "WARNING: Service is $($svc.Status). Restarting..."
-
-        if ($svc.Status -eq 'Stopped') {
-            if (Test-Path $NssmExe) {
-                & $NssmExe start $ServiceName 2>$null
-            } else {
-                Start-Service -Name $svc.Name -ErrorAction SilentlyContinue
-            }
-            Start-Sleep -Seconds 5
-            $svc.Refresh()
-            Write-GuardianLog "After restart: $($svc.Status)"
-        }
-        elseif ($svc.Status -in @('StartPending', 'StopPending')) {
-            Write-GuardianLog "Service stuck in $($svc.Status). Force killing node.exe..."
-            Get-Process -Name "node" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
-            Start-Sleep -Seconds 3
-            if (Test-Path $NssmExe) { & $NssmExe start $ServiceName 2>$null }
-            else { Start-Service -Name $svc.Name -ErrorAction SilentlyContinue }
-            Start-Sleep -Seconds 5
-            $svc.Refresh()
-            Write-GuardianLog "After force restart: $($svc.Status)"
-        }
-    }
-
-    # 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
-            $browserRecheck = Get-Process -Name $browserProcess -ErrorAction SilentlyContinue
-            if (-not $browserRecheck) {
-                Write-GuardianLog "Browser '$browserProcess' not running. Launching via VBS..."
-                Start-Process "wscript.exe" -ArgumentList """$vbsPath""" -WindowStyle Hidden
-            }
-        }
-    }
-} catch {
-    Write-GuardianLog "Guardian error: $_"
-}
+# LIGHTMAN Guardian - Service Health Monitor
+# Runs every 5 minutes via Task Scheduler.
+# Restarts the NSSM service if it's down. Checks Chrome kiosk health.
+
+$LogDir = "C:\ProgramData\Lightman\logs"
+$LogFile = Join-Path $LogDir "guardian.log"
+$ServiceName = "LightmanAgent"
+$NssmExe = "C:\ProgramData\Lightman\nssm\nssm.exe"
+
+function Write-GuardianLog($msg) {
+    $ts = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
+    try {
+        if (-not (Test-Path $LogDir)) { New-Item -ItemType Directory -Force -Path $LogDir | Out-Null }
+        Add-Content -Path $LogFile -Value "[$ts] $msg" -ErrorAction SilentlyContinue
+        if ((Get-Item $LogFile -ErrorAction SilentlyContinue).Length -gt 1MB) {
+            $rotated = "$LogFile.old"
+            if (Test-Path $rotated) { Remove-Item $rotated -Force }
+            Rename-Item $LogFile $rotated -Force
+        }
+    } catch { }
+}
+
+try {
+    # 1. Check LIGHTMAN service
+    $svc = Get-Service -Name $ServiceName -ErrorAction SilentlyContinue
+    if (-not $svc) {
+        $svc = Get-Service -DisplayName "LIGHTMAN*" -ErrorAction SilentlyContinue | Select-Object -First 1
+    }
+
+    if (-not $svc) {
+        Write-GuardianLog "CRITICAL: Service not found!"
+        exit 1
+    }
+
+    if ($svc.Status -ne 'Running') {
+        Write-GuardianLog "WARNING: Service is $($svc.Status). Restarting..."
+
+        if ($svc.Status -eq 'Stopped') {
+            if (Test-Path $NssmExe) {
+                & $NssmExe start $ServiceName 2>$null
+            } else {
+                Start-Service -Name $svc.Name -ErrorAction SilentlyContinue
+            }
+            Start-Sleep -Seconds 5
+            $svc.Refresh()
+            Write-GuardianLog "After restart: $($svc.Status)"
+        }
+        elseif ($svc.Status -in @('StartPending', 'StopPending')) {
+            Write-GuardianLog "Service stuck in $($svc.Status). Force killing node.exe..."
+            Get-Process -Name "node" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
+            Start-Sleep -Seconds 3
+            if (Test-Path $NssmExe) { & $NssmExe start $ServiceName 2>$null }
+            else { Start-Service -Name $svc.Name -ErrorAction SilentlyContinue }
+            Start-Sleep -Seconds 5
+            $svc.Refresh()
+            Write-GuardianLog "After force restart: $($svc.Status)"
+        }
+    }
+
+    # 2. Check Chrome kiosk
+    $chrome = Get-Process -Name "chrome" -ErrorAction SilentlyContinue
+    if (-not $chrome) {
+        $vbsPath = "C:\Program Files\Lightman\Agent\launch-kiosk.vbs"
+        if (Test-Path $vbsPath) {
+            Start-Sleep -Seconds 10
+            $chromeRecheck = Get-Process -Name "chrome" -ErrorAction SilentlyContinue
+            if (-not $chromeRecheck) {
+                Write-GuardianLog "Chrome not running. Launching via VBS..."
+                Start-Process "wscript.exe" -ArgumentList """$vbsPath""" -WindowStyle Hidden
+            }
+        }
+    }
+} catch {
+    Write-GuardianLog "Guardian error: $_"
+}

package/scripts/install-linux.sh

@@ -1,134 +1,134 @@
-#!/usr/bin/env bash
-# LIGHTMAN Agent — Linux Installer
-# Run as root:
-#   sudo bash install-linux.sh --slug f-av01 --server http://192.168.1.100:3401
-set -euo pipefail
-
-INSTALL_DIR="/opt/lightman/agent"
-LOG_DIR="/var/log/lightman"
-SERVICE_NAME="lightman-agent"
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-AGENT_DIR="$(dirname "$SCRIPT_DIR")"
-
-# Defaults
-SLUG=""
-SERVER=""
-TIMEZONE="Asia/Kolkata"
-
-# ── Parse arguments ──
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        --slug)     SLUG="$2";     shift 2 ;;
-        --server)   SERVER="$2";   shift 2 ;;
-        --timezone) TIMEZONE="$2"; shift 2 ;;
-        -h|--help)
-            echo "Usage: sudo bash install-linux.sh --slug f-av01 --server http://192.168.1.100:3401 [--timezone Asia/Kolkata]"
-            exit 0
-            ;;
-        *) echo "Unknown option: $1"; exit 1 ;;
-    esac
-done
-
-# ── Validate required args ──
-if [[ -z "$SLUG" ]]; then
-    echo "Error: --slug is required"
-    echo "Usage: sudo bash install-linux.sh --slug f-av01 --server http://192.168.1.100:3401"
-    exit 1
-fi
-
-if [[ -z "$SERVER" ]]; then
-    echo "Error: --server is required"
-    echo "Usage: sudo bash install-linux.sh --slug f-av01 --server http://192.168.1.100:3401"
-    exit 1
-fi
-
-# ── Pre-checks ──
-if [[ $EUID -ne 0 ]]; then
-    echo "Error: This script must be run as root (use sudo)."
-    exit 1
-fi
-
-if ! command -v node &> /dev/null; then
-    echo "Error: Node.js is not installed. Install Node.js 20+ first."
-    exit 1
-fi
-
-NODE_VERSION=$(node -v | sed 's/v//' | cut -d. -f1)
-if [[ "$NODE_VERSION" -lt 20 ]]; then
-    echo "Error: Node.js 20+ required, found v${NODE_VERSION}."
-    exit 1
-fi
-
-echo ""
-echo "=== LIGHTMAN Agent — Linux Installer ==="
-echo "  Device slug : $SLUG"
-echo "  Server URL  : $SERVER"
-echo ""
-
-# --- Create user/group ---
-if ! id -u lightman &> /dev/null; then
-    echo "[1/7] Creating lightman user and group..."
-    groupadd --system lightman
-    useradd --system --gid lightman --home-dir /opt/lightman --shell /usr/sbin/nologin lightman
-else
-    echo "[1/7] User 'lightman' already exists, skipping."
-fi
-
-# --- Create directories ---
-echo "[2/7] Creating directories..."
-mkdir -p "$INSTALL_DIR"
-mkdir -p "$LOG_DIR"
-
-# --- Copy agent files ---
-echo "[3/7] Copying agent files to ${INSTALL_DIR}..."
-cp -r "$AGENT_DIR/dist"                         "$INSTALL_DIR/"
-cp    "$AGENT_DIR/package.json"                 "$INSTALL_DIR/"
-cp    "$AGENT_DIR/package-lock.json"            "$INSTALL_DIR/" 2>/dev/null || true
-# Copy template so setup.sh can use it post-install
-cp    "$AGENT_DIR/agent.config.template.json"   "$INSTALL_DIR/"
-
-# Install production dependencies
-echo "[4/7] Installing production dependencies..."
-cd "$INSTALL_DIR"
-npm ci --omit=dev --ignore-scripts 2>/dev/null || npm install --omit=dev --ignore-scripts
-
-# --- Configure this device (generates agent.config.json, clears any stale identity) ---
-echo "[5/7] Configuring device '$SLUG'..."
-bash "$SCRIPT_DIR/setup.sh" \
-    --slug     "$SLUG" \
-    --server   "$SERVER" \
-    --timezone "$TIMEZONE" \
-    --dir      "$INSTALL_DIR"
-
-# --- Set permissions ---
-echo "[6/7] Setting permissions..."
-chown -R lightman:lightman "$INSTALL_DIR"
-chown -R lightman:lightman "$LOG_DIR"
-chmod 750 "$INSTALL_DIR"
-chmod 750 "$LOG_DIR"
-
-# --- Install systemd service ---
-echo "[7/7] Installing systemd service..."
-cp "$SCRIPT_DIR/lightman-agent.service" "/etc/systemd/system/${SERVICE_NAME}.service"
-systemctl daemon-reload
-systemctl enable "$SERVICE_NAME"
-
-# --- Install logrotate config ---
-cp "$SCRIPT_DIR/lightman-agent.logrotate" "/etc/logrotate.d/${SERVICE_NAME}" 2>/dev/null || true
-
-echo ""
-echo "=== Installation Complete ==="
-echo ""
-echo "  Device slug : $SLUG"
-echo "  Server      : $SERVER"
-echo "  Install dir : ${INSTALL_DIR}"
-echo "  Log dir     : ${LOG_DIR}"
-echo "  Service     : ${SERVICE_NAME}"
-echo ""
-echo "  Start   :  sudo systemctl start ${SERVICE_NAME}"
-echo "  Status  :  sudo systemctl status ${SERVICE_NAME}"
-echo "  Logs    :  sudo journalctl -u ${SERVICE_NAME} -f"
-echo ""
-echo "The agent will now provision with the LIGHTMAN server."
-echo "If pairing is needed, a 6-digit code will appear in the logs."
-echo ""
+#!/usr/bin/env bash
+# LIGHTMAN Agent — Linux Installer
+# Run as root:
+#   sudo bash install-linux.sh --slug f-av01 --server http://192.168.1.100:3401
+set -euo pipefail
+
+INSTALL_DIR="/opt/lightman/agent"
+LOG_DIR="/var/log/lightman"
+SERVICE_NAME="lightman-agent"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+AGENT_DIR="$(dirname "$SCRIPT_DIR")"
+
+# Defaults
+SLUG=""
+SERVER=""
+TIMEZONE="Asia/Kolkata"
+
+# ── Parse arguments ──
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --slug)     SLUG="$2";     shift 2 ;;
+        --server)   SERVER="$2";   shift 2 ;;
+        --timezone) TIMEZONE="$2"; shift 2 ;;
+        -h|--help)
+            echo "Usage: sudo bash install-linux.sh --slug f-av01 --server http://192.168.1.100:3401 [--timezone Asia/Kolkata]"
+            exit 0
+            ;;
+        *) echo "Unknown option: $1"; exit 1 ;;
+    esac
+done
+
+# ── Validate required args ──
+if [[ -z "$SLUG" ]]; then
+    echo "Error: --slug is required"
+    echo "Usage: sudo bash install-linux.sh --slug f-av01 --server http://192.168.1.100:3401"
+    exit 1
+fi
+
+if [[ -z "$SERVER" ]]; then
+    echo "Error: --server is required"
+    echo "Usage: sudo bash install-linux.sh --slug f-av01 --server http://192.168.1.100:3401"
+    exit 1
+fi
+
+# ── Pre-checks ──
+if [[ $EUID -ne 0 ]]; then
+    echo "Error: This script must be run as root (use sudo)."
+    exit 1
+fi
+
+if ! command -v node &> /dev/null; then
+    echo "Error: Node.js is not installed. Install Node.js 20+ first."
+    exit 1
+fi
+
+NODE_VERSION=$(node -v | sed 's/v//' | cut -d. -f1)
+if [[ "$NODE_VERSION" -lt 20 ]]; then
+    echo "Error: Node.js 20+ required, found v${NODE_VERSION}."
+    exit 1
+fi
+
+echo ""
+echo "=== LIGHTMAN Agent — Linux Installer ==="
+echo "  Device slug : $SLUG"
+echo "  Server URL  : $SERVER"
+echo ""
+
+# --- Create user/group ---
+if ! id -u lightman &> /dev/null; then
+    echo "[1/7] Creating lightman user and group..."
+    groupadd --system lightman
+    useradd --system --gid lightman --home-dir /opt/lightman --shell /usr/sbin/nologin lightman
+else
+    echo "[1/7] User 'lightman' already exists, skipping."
+fi
+
+# --- Create directories ---
+echo "[2/7] Creating directories..."
+mkdir -p "$INSTALL_DIR"
+mkdir -p "$LOG_DIR"
+
+# --- Copy agent files ---
+echo "[3/7] Copying agent files to ${INSTALL_DIR}..."
+cp -r "$AGENT_DIR/dist"                         "$INSTALL_DIR/"
+cp    "$AGENT_DIR/package.json"                 "$INSTALL_DIR/"
+cp    "$AGENT_DIR/package-lock.json"            "$INSTALL_DIR/" 2>/dev/null || true
+# Copy template so setup.sh can use it post-install
+cp    "$AGENT_DIR/agent.config.template.json"   "$INSTALL_DIR/"
+
+# Install production dependencies
+echo "[4/7] Installing production dependencies..."
+cd "$INSTALL_DIR"
+npm ci --omit=dev --ignore-scripts 2>/dev/null || npm install --omit=dev --ignore-scripts
+
+# --- Configure this device (generates agent.config.json, clears any stale identity) ---
+echo "[5/7] Configuring device '$SLUG'..."
+bash "$SCRIPT_DIR/setup.sh" \
+    --slug     "$SLUG" \
+    --server   "$SERVER" \
+    --timezone "$TIMEZONE" \
+    --dir      "$INSTALL_DIR"
+
+# --- Set permissions ---
+echo "[6/7] Setting permissions..."
+chown -R lightman:lightman "$INSTALL_DIR"
+chown -R lightman:lightman "$LOG_DIR"
+chmod 750 "$INSTALL_DIR"
+chmod 750 "$LOG_DIR"
+
+# --- Install systemd service ---
+echo "[7/7] Installing systemd service..."
+cp "$SCRIPT_DIR/lightman-agent.service" "/etc/systemd/system/${SERVICE_NAME}.service"
+systemctl daemon-reload
+systemctl enable "$SERVICE_NAME"
+
+# --- Install logrotate config ---
+cp "$SCRIPT_DIR/lightman-agent.logrotate" "/etc/logrotate.d/${SERVICE_NAME}" 2>/dev/null || true
+
+echo ""
+echo "=== Installation Complete ==="
+echo ""
+echo "  Device slug : $SLUG"
+echo "  Server      : $SERVER"
+echo "  Install dir : ${INSTALL_DIR}"
+echo "  Log dir     : ${LOG_DIR}"
+echo "  Service     : ${SERVICE_NAME}"
+echo ""
+echo "  Start   :  sudo systemctl start ${SERVICE_NAME}"
+echo "  Status  :  sudo systemctl status ${SERVICE_NAME}"
+echo "  Logs    :  sudo journalctl -u ${SERVICE_NAME} -f"
+echo ""
+echo "The agent will now provision with the LIGHTMAN server."
+echo "If pairing is needed, a 6-digit code will appear in the logs."
+echo ""