livedesk 0.1.368 → 0.1.370

package/hub/src/mode4-atlas-pool.js

@@ -2,23 +2,46 @@ import { Mode4AtlasSession } from './mode4-atlas.js';
 import { randomUUID } from 'node:crypto';
 
 export function buildMode4AtlasSessionKey(config = {}) {
-  const monitorSelections = Object.fromEntries(
-    Object.entries(config.monitorSelections || {})
-      .sort(([left], [right]) => left.localeCompare(right))
-      .map(([deviceId, monitorIndex]) => [deviceId, Number(monitorIndex || 0)])
-  );
   return JSON.stringify({
     deviceIds: Array.isArray(config.deviceIds) ? config.deviceIds : [],
-    inputDeviceIds: Array.isArray(config.inputDeviceIds) ? config.inputDeviceIds : [],
     width: Number(config.width || 1920),
     height: Number(config.height || 1080),
     tileWidth: Number(config.tileWidth || 320),
     tileHeight: Number(config.tileHeight || 180),
-    fps: Number(config.fps || 20),
-    monitorSelections
+    fps: Number(config.fps || 20)
   });
 }
 
+export function planMode4AtlasInputTransitions(previous = {}, next = {}) {
+  const previousIds = new Set(Array.isArray(previous.inputDeviceIds) ? previous.inputDeviceIds : []);
+  const nextIds = new Set(Array.isArray(next.inputDeviceIds) ? next.inputDeviceIds : []);
+  const previousMonitorSelections = previous.monitorSelections || {};
+  const nextMonitorSelections = next.monitorSelections || {};
+  const captureSizeChanged = previousIds.size > 0
+    && (Number(previous.tileWidth || 0) !== Number(next.tileWidth || 0)
+      || Number(previous.tileHeight || 0) !== Number(next.tileHeight || 0));
+  const stop = [...previousIds].filter(deviceId => !nextIds.has(deviceId));
+  const start = [];
+  const restart = [];
+  const unchanged = [];
+
+  for (const deviceId of nextIds) {
+    if (!previousIds.has(deviceId)) {
+      start.push(deviceId);
+      continue;
+    }
+    const previousMonitorIndex = Number(previousMonitorSelections[deviceId] || 0);
+    const nextMonitorIndex = Number(nextMonitorSelections[deviceId] || 0);
+    if (captureSizeChanged || previousMonitorIndex !== nextMonitorIndex) {
+      restart.push(deviceId);
+    } else {
+      unchanged.push(deviceId);
+    }
+  }
+
+  return { stop, start, restart, unchanged };
+}
+
 export class Mode4AtlasPool {
   constructor(options = {}) {
     this.createSession = typeof options.createSession === 'function'

package/hub/src/mode4-atlas.js

@@ -107,7 +107,11 @@ export class Mode4AtlasSession {
     const frame = frameEvent?.frame || {};
     const deviceId = String(frameEvent?.deviceId || frame.deviceId || '').trim();
     const mode = String(frame.frameMode || frame.mode || '').toLowerCase();
-    if (!this.inputDeviceSet.has(deviceId) || mode !== 'mode2-lzo' || !Buffer.isBuffer(frameEvent?.payload)) return;
+    const streamPurpose = String(frame.streamPurpose || '').trim().toLowerCase();
+    if (!this.inputDeviceSet.has(deviceId)
+      || mode !== 'mode2-lzo'
+      || streamPurpose !== 'atlas'
+      || !Buffer.isBuffer(frameEvent?.payload)) return;
     this.pendingFrames.set(deviceId, {
       type: 'frame',
       deviceId,