lightman-agent 1.0.25 → 1.0.28

package/bin/cms-agent.js

@@ -1,24 +1,35 @@
 #!/usr/bin/env node
 
-import { existsSync, readFileSync } from 'fs';
-import { networkInterfaces } from 'os';
-import { resolve, dirname } from 'path';
-import { fileURLToPath } from 'url';
+import { existsSync, readFileSync } from 'fs';
+import { networkInterfaces } from 'os';
+import { resolve, dirname } from 'path';
+import { fileURLToPath } from 'url';
 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
+const DEFAULT_SERVER = 'http://192.168.10.100:3401';
+const INSTALL_CONFIG_PATH = 'C:\\Program Files\\Lightman\\Agent\\agent.config.json';
+const PACKAGE_JSON_PATH = resolve(dirname(fileURLToPath(import.meta.url)), '../package.json');
+
+function getVersion() {
+  try {
+    const pkg = JSON.parse(readFileSync(PACKAGE_JSON_PATH, 'utf8'));
+    return String(pkg.version || '0.0.0');
+  } catch {
+    return '0.0.0';
+  }
+}
+
+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             Print package version
 
 Options:
   --slug <value>      Device slug (example: C-AV01)
@@ -262,28 +273,32 @@ 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);
+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;
-  }
-  if (command === 'update') {
-    await runUpdate(opts);
-    return;
-  }
-
-  printUsage();
-  throw new Error(`Unknown command: ${command}`);
-}
+  if (command === 'install' || command === 'setup') {
+    await runInstall(opts);
+    return;
+  }
+  if (command === 'update') {
+    await runUpdate(opts);
+    return;
+  }
+  if (command === 'version' || command === '--version' || command === '-v') {
+    console.log(`lightman-agent v${getVersion()}`);
+    return;
+  }
+
+  printUsage();
+  throw new Error(`Unknown command: ${command}`);
+}
 
 main().catch((err) => {
   console.error(err instanceof Error ? err.message : String(err));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lightman-agent",
-  "version": "1.0.25",
+  "version": "1.0.28",
   "description": "LIGHTMAN Agent - System-level daemon for museum display machines",
   "private": false,
   "type": "module",

package/scripts/lightman-shell.bat

@@ -100,23 +100,20 @@ if "%BROWSER%"=="" (
 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
+REM ----------------------------------------------------------------
+REM Wait for agent service (port 3403)
+REM ----------------------------------------------------------------
+echo [%date% %time%] Waiting for port 3403... >> "%LOG_FILE%"
+set WAIT_COUNT=0
+
+:wait_for_agent
+    netstat -an | findstr ":3403.*LISTENING" >nul 2>&1
+    if %errorlevel%==0 goto agent_ready
+    set /a WAIT_COUNT+=1
+    set /a WAIT_MOD=WAIT_COUNT %% 30
+    if %WAIT_MOD%==0 echo [%date% %time%] Still waiting for port 3403... (%WAIT_COUNT%s) >> "%LOG_FILE%"
+    timeout /t 1 /nobreak >nul
+    goto wait_for_agent
 
 :agent_ready
 echo [%date% %time%] Agent ready >> "%LOG_FILE%"