lightman-agent 1.0.23 → 1.0.24

package/package.json

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

package/src/index.ts

@@ -111,10 +111,26 @@ async function main(): Promise<void> {
     serverUrl: config.serverUrl,
     identity,
     logger,
-    onMessage: (msg: WsMessage) => {
-      handleServerMessage(msg, commandExecutor, logger, powerScheduler, startSerialBridge, stopSerialBridge, startOscBridge, stopOscBridge, multiScreenKiosk, getIdentity, kioskManager, watchdog, startPresenceSensor, stopPresenceSensor);
-    },
-  });
+    onMessage: (msg: WsMessage) => {
+      handleServerMessage(
+        msg,
+        commandExecutor,
+        logger,
+        powerScheduler,
+        startSerialBridge,
+        stopSerialBridge,
+        startOscBridge,
+        stopOscBridge,
+        multiScreenKiosk,
+        getIdentity,
+        kioskManager,
+        watchdog,
+        startPresenceSensor,
+        stopPresenceSensor,
+        () => lastKnownTotalScreens
+      );
+    },
+  });
 
   // 4. Start health monitor
   const healthMonitor = new HealthMonitor(
@@ -163,14 +179,15 @@ async function main(): Promise<void> {
   const kioskManager = new KioskManager(kioskConfig, logger);
   registerKioskCommands(commandExecutor.register.bind(commandExecutor), kioskManager, logger);
 
-  // Multi-screen kiosk manager — handles multiple Chrome instances on multi-display devices
-  const multiScreenKiosk = new MultiScreenKioskManager(kioskConfig, logger);
-  const getIdentity = () => identity!;
-  registerMultiScreenKioskCommands(commandExecutor.register.bind(commandExecutor), multiScreenKiosk, getIdentity, logger);
-
-  // Detect physical screens and keep them fresh (multi-display setups can change after boot).
-  let detectedScreens = detectScreens(logger);
-  multiScreenKiosk.setDetectedScreens(detectedScreens);
+  // Multi-screen kiosk manager — handles multiple Chrome instances on multi-display devices
+  const multiScreenKiosk = new MultiScreenKioskManager(kioskConfig, logger);
+  const getIdentity = () => identity!;
+  registerMultiScreenKioskCommands(commandExecutor.register.bind(commandExecutor), multiScreenKiosk, getIdentity, logger);
+
+  // Detect physical screens and keep them fresh (multi-display setups can change after boot).
+  let lastKnownTotalScreens = 0;
+  let detectedScreens = detectScreens(logger);
+  multiScreenKiosk.setDetectedScreens(detectedScreens);
 
   const toScreenPayload = (screens: DetectedScreen[]) => (
     screens.map((s) => ({
@@ -502,24 +519,23 @@ async function main(): Promise<void> {
         // Multi-screen handling:
         // 1) Use explicit screenMap when present.
         // 2) For multi-screen apps without a saved map, auto-create placeholders.
-        const requestedScreenMap = deviceCfg?.screenMap || [];
-        const isMultiScreenApp = !!deviceCfg && deviceCfg.totalScreens > 1;
-        const effectiveRequestedMap = requestedScreenMap.length > 0
-          ? requestedScreenMap
-          : (isMultiScreenApp ? createPlaceholderScreenMap(deviceCfg.totalScreens) : []);
-
-        if (effectiveRequestedMap.length > 0) {
-          const resolved = resolveScreenMap({
-            requestedScreenMap: effectiveRequestedMap,
-            detectedScreens,
-            totalScreens: Math.max(deviceCfg?.totalScreens || 0, effectiveRequestedMap.length),
-          });
-          logger.info(
-            `[MultiKiosk] Effective map ready: requested=${effectiveRequestedMap.length}, mode=${resolved.mode}, totalScreens=${deviceCfg?.totalScreens || 0}`
-          );
-          watchdog.setMultiScreenActive(true);
-          multiScreenKiosk.applyScreenMap(effectiveRequestedMap, identity).catch((err) => {
-            logger.error('[MultiKiosk] Failed to apply effective screenMap from config:', err);
+        const requestedScreenMap = deviceCfg?.screenMap || [];
+        const totalScreens = Math.max(deviceCfg?.totalScreens || 0, requestedScreenMap.length);
+        lastKnownTotalScreens = totalScreens;
+        const effectiveRequestedMap = normalizeScreenMapForTotalScreens(requestedScreenMap, totalScreens);
+
+        if (effectiveRequestedMap.length > 0) {
+          const resolved = resolveScreenMap({
+            requestedScreenMap: effectiveRequestedMap,
+            detectedScreens,
+            totalScreens,
+          });
+          logger.info(
+            `[MultiKiosk] Effective map ready: requested=${requestedScreenMap.length}, effective=${effectiveRequestedMap.length}, mode=${resolved.mode}, totalScreens=${totalScreens}`
+          );
+          watchdog.setMultiScreenActive(true);
+          multiScreenKiosk.applyScreenMap(effectiveRequestedMap, identity).catch((err) => {
+            logger.error('[MultiKiosk] Failed to apply effective screenMap from config:', err);
           });
           return;
         }
@@ -606,10 +622,33 @@ async function main(): Promise<void> {
   logger.info('LIGHTMAN Agent running.');
 }
 
-function createPlaceholderScreenMap(totalScreens: number): ScreenMapping[] {
-  const count = Math.max(0, Math.floor(totalScreens || 0));
-  return Array.from({ length: count }, () => ({ hardwareId: '', url: '' }));
-}
+function createPlaceholderScreenMap(totalScreens: number): ScreenMapping[] {
+  const count = Math.max(0, Math.floor(totalScreens || 0));
+  return Array.from({ length: count }, () => ({ hardwareId: '', url: '' }));
+}
+
+function normalizeScreenMapForTotalScreens(
+  screenMap: ScreenMapping[] | undefined,
+  totalScreens: number
+): ScreenMapping[] {
+  const requested = Array.isArray(screenMap)
+    ? screenMap.map((m) => ({
+      hardwareId: String(m.hardwareId || ''),
+      url: String(m.url || ''),
+      ...(m.label ? { label: String(m.label) } : {}),
+    }))
+    : [];
+
+  const targetCount = Math.max(requested.length, Math.max(0, Math.floor(totalScreens || 0)));
+  if (targetCount === 0) return [];
+
+  if (requested.length >= targetCount) return requested;
+
+  return [
+    ...requested,
+    ...createPlaceholderScreenMap(targetCount - requested.length),
+  ];
+}
 
 function haveScreensChanged(prev: DetectedScreen[], next: DetectedScreen[]): boolean {
   if (prev.length !== next.length) return true;
@@ -631,22 +670,23 @@ function haveScreensChanged(prev: DetectedScreen[], next: DetectedScreen[]): boo
   return false;
 }
 
-function handleServerMessage(
-  msg: WsMessage,
-  commandExecutor: CommandExecutor,
+function handleServerMessage(
+  msg: WsMessage,
+  commandExecutor: CommandExecutor,
   logger: Logger,
   powerScheduler?: PowerScheduler,
   startSerialBridge?: (comPort: string, controllerId: string, baudRate?: number) => void,
   stopSerialBridge?: () => void,
   startOscBridgeFn?: (oscPort: number, oscAddress: string, oscHost?: string) => void,
   stopOscBridgeFn?: () => void,
-  multiScreenKiosk?: MultiScreenKioskManager,
-  getIdentity?: () => Identity,
-  kioskManager?: KioskManager,
-  watchdog?: Watchdog,
-  startPresenceSensorFn?: (port?: string) => void,
-  stopPresenceSensorFn?: () => void
-): void {
+  multiScreenKiosk?: MultiScreenKioskManager,
+  getIdentity?: () => Identity,
+  kioskManager?: KioskManager,
+  watchdog?: Watchdog,
+  startPresenceSensorFn?: (port?: string) => void,
+  stopPresenceSensorFn?: () => void,
+  getTotalScreensHint?: () => number
+): void {
   switch (msg.type) {
     case 'connected':
       logger.info('Server acknowledged connection');
@@ -698,16 +738,25 @@ function handleServerMessage(
         }
 
         // Admin pushed updated screenMap via device config save
-        const screenMap = msg.payload.screenMap as ScreenMapping[] | undefined;
-        if (screenMap && Array.isArray(screenMap) && multiScreenKiosk && getIdentity) {
-          if (screenMap.length > 0) {
-            logger.info(`[MultiKiosk] Received screenMap update: ${screenMap.length} mapping(s) — killing single kiosk`);
-            if (kioskManager) kioskManager.kill().catch(() => {});
-            if (watchdog) watchdog.setMultiScreenActive(true);
-            multiScreenKiosk.applyScreenMap(screenMap, getIdentity()).catch((err) => {
-              logger.error('[MultiKiosk] Failed to apply screenMap:', err);
-            });
-          } else {
+        const screenMap = msg.payload.screenMap as ScreenMapping[] | undefined;
+        if (screenMap && Array.isArray(screenMap) && multiScreenKiosk && getIdentity) {
+          const payloadTotalScreens = Number(msg.payload.totalScreens || 0);
+          const hintTotalScreens = Math.max(
+            Number.isFinite(payloadTotalScreens) ? payloadTotalScreens : 0,
+            getTotalScreensHint ? getTotalScreensHint() : 0
+          );
+          const effectiveScreenMap = screenMap.length > 0
+            ? normalizeScreenMapForTotalScreens(screenMap, hintTotalScreens)
+            : screenMap;
+
+          if (screenMap.length > 0) {
+            logger.info(`[MultiKiosk] Received screenMap update: requested=${screenMap.length}, effective=${effectiveScreenMap.length}, totalScreens=${hintTotalScreens} — killing single kiosk`);
+            if (kioskManager) kioskManager.kill().catch(() => {});
+            if (watchdog) watchdog.setMultiScreenActive(true);
+            multiScreenKiosk.applyScreenMap(effectiveScreenMap, getIdentity()).catch((err) => {
+              logger.error('[MultiKiosk] Failed to apply screenMap:', err);
+            });
+          } else {
             // Empty screenMap — deactivate multi-screen, resume single kiosk
             logger.info('[MultiKiosk] Empty screenMap received — deactivating multi-screen');
             multiScreenKiosk.killAll().catch(() => {});
@@ -719,16 +768,25 @@ function handleServerMessage(
     case 'agent:screenMap':
       // Direct screenMap push from server
       if (msg.payload && multiScreenKiosk && getIdentity) {
-        const screenMap = msg.payload.screenMap as ScreenMapping[] | undefined;
-        if (screenMap && Array.isArray(screenMap)) {
-          if (screenMap.length > 0) {
-            logger.info(`[MultiKiosk] Received agent:screenMap: ${screenMap.length} mapping(s) — killing single kiosk`);
-            if (kioskManager) kioskManager.kill().catch(() => {});
-            if (watchdog) watchdog.setMultiScreenActive(true);
-            multiScreenKiosk.applyScreenMap(screenMap, getIdentity()).catch((err) => {
-              logger.error('[MultiKiosk] Failed to apply screenMap:', err);
-            });
-          } else {
+        const screenMap = msg.payload.screenMap as ScreenMapping[] | undefined;
+        if (screenMap && Array.isArray(screenMap)) {
+          const payloadTotalScreens = Number(msg.payload.totalScreens || 0);
+          const hintTotalScreens = Math.max(
+            Number.isFinite(payloadTotalScreens) ? payloadTotalScreens : 0,
+            getTotalScreensHint ? getTotalScreensHint() : 0
+          );
+          const effectiveScreenMap = screenMap.length > 0
+            ? normalizeScreenMapForTotalScreens(screenMap, hintTotalScreens)
+            : screenMap;
+
+          if (screenMap.length > 0) {
+            logger.info(`[MultiKiosk] Received agent:screenMap: requested=${screenMap.length}, effective=${effectiveScreenMap.length}, totalScreens=${hintTotalScreens} — killing single kiosk`);
+            if (kioskManager) kioskManager.kill().catch(() => {});
+            if (watchdog) watchdog.setMultiScreenActive(true);
+            multiScreenKiosk.applyScreenMap(effectiveScreenMap, getIdentity()).catch((err) => {
+              logger.error('[MultiKiosk] Failed to apply screenMap:', err);
+            });
+          } else {
             logger.info('[MultiKiosk] Empty agent:screenMap — deactivating multi-screen');
             multiScreenKiosk.killAll().catch(() => {});
             if (watchdog) watchdog.setMultiScreenActive(false);