lightman-agent 1.0.0 → 1.0.2

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.181:3401';
+const DEFAULT_SERVER = 'http://192.168.1.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 (example: http://192.168.1.181:3401)
+  --server <url>      Server URL (example: http://192.168.1.100:3401)
   --timezone <tz>     Timezone override (default: Asia/Kolkata)
   --no-restart        Skip reboot after successful install/update
   -h, --help          Show help
@@ -143,8 +143,8 @@ function installUsingPowerShell({ scriptPath, slug, server, timezone, noRestart
   runOrFail('powershell.exe', args);
 
   if (!noRestart) {
-    console.log('Installation completed. Rebooting in 10 seconds...');
-    runOrFail('shutdown.exe', ['/r', '/t', '10', '/c', 'CMS Agent installation complete']);
+    console.log('Installation completed. Rebooting now...');
+    runOrFail('shutdown.exe', ['/r', '/t', '0', '/c', 'CMS Agent installation complete']);
   }
 }
 
@@ -159,7 +159,7 @@ async function runInstall(opts) {
   const localConfig = safeReadJson(resolve(cwd(), 'agent.config.json')) || {};
   const installedConfig = safeReadJson(INSTALL_CONFIG_PATH) || {};
   const defaultSlug = opts.slug || localConfig.deviceSlug || installedConfig.deviceSlug || '';
-  const server = opts.server || localConfig.serverUrl || installedConfig.serverUrl || DEFAULT_SERVER;
+  const server = opts.server || DEFAULT_SERVER;
   const timezone = opts.timezone || localConfig?.powerSchedule?.timezone || installedConfig?.powerSchedule?.timezone || 'Asia/Kolkata';
   const noRestart = Boolean(opts.noRestart);
 
@@ -191,7 +191,7 @@ async function runUpdate(opts) {
 
   const installedConfig = safeReadJson(INSTALL_CONFIG_PATH) || {};
   const slug = opts.slug || installedConfig.deviceSlug;
-  const server = opts.server || installedConfig.serverUrl || DEFAULT_SERVER;
+  const server = opts.server || DEFAULT_SERVER;
   const timezone = opts.timezone || installedConfig?.powerSchedule?.timezone || 'Asia/Kolkata';
   const noRestart = Boolean(opts.noRestart);
   const scriptPath = resolveInstallScript();

package/package.json

@@ -1,30 +1,30 @@
 {
   "name": "lightman-agent",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "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.template.json",
-    "package-lock.json",
-    "tsconfig.json"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
+  "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.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 -e \"const{cpSync,rmSync,mkdirSync}=require('fs');rmSync('public',{recursive:true,force:true});mkdirSync('public',{recursive:true});cpSync('../display/dist','public',{recursive:true});console.log('Display synced to agent/public/')\"",

package/scripts/install-windows.ps1

@@ -68,11 +68,24 @@ foreach ($tn in @($AgentTask, $KioskTask, $GuardianTask)) {
     if ($t) { Stop-ScheduledTask -TaskName $tn -ErrorAction SilentlyContinue; Unregister-ScheduledTask -TaskName $tn -Confirm:$false -ErrorAction SilentlyContinue }
 }
 
-# Kill processes
-Write-Host "[0c] Killing node.exe and Chrome..." -ForegroundColor Yellow
-Get-Process -Name "node" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
-Get-Process -Name "chrome" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
-Start-Sleep -Seconds 2
+# Kill processes
+Write-Host "[0c] Killing node.exe and Chrome..." -ForegroundColor Yellow
+# IMPORTANT:
+# If install-windows.ps1 is launched from the npm CLI wrapper (node.exe),
+# killing all node.exe would terminate the installer mid-run.
+$parentPid = $null
+try {
+    $parentPid = (Get-CimInstance Win32_Process -Filter "ProcessId=$PID" -ErrorAction SilentlyContinue).ParentProcessId
+} catch { }
+Get-Process -Name "node" -ErrorAction SilentlyContinue | ForEach-Object {
+    if ($parentPid -and $_.Id -eq $parentPid) {
+        Write-Host "  Keeping installer parent node.exe (PID $($_.Id))" -ForegroundColor DarkGray
+    } else {
+        Stop-Process -Id $_.Id -Force -ErrorAction SilentlyContinue
+    }
+}
+Get-Process -Name "chrome" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
+Start-Sleep -Seconds 2
 
 # Remove old files (keep NSSM and logs)
 Write-Host "[0d] Removing old agent files..." -ForegroundColor Yellow