lightman-agent 1.0.21 → 1.0.22

package/bin/cms-agent.js

@@ -183,12 +183,21 @@ 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;
+  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')) || {};
@@ -202,16 +211,20 @@ function runVersion() {
   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) {
-    args.push('-PairingTimeoutSeconds', String(pairingTimeoutSeconds));
-  }
-  runOrFail('powershell.exe', args);
+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...');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lightman-agent",
-  "version": "1.0.21",
+  "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"