livedesk 0.1.367 → 0.1.369

package/hub/src/server.js

@@ -9,7 +9,7 @@ import { fileURLToPath } from 'node:url';
 import os from 'node:os';
 import { WebSocketServer } from 'ws';
 import { createRemoteHub } from './remote-hub.js';
-import { buildMode4AtlasSessionKey, Mode4AtlasPool } from './mode4-atlas-pool.js';
+import { buildMode4AtlasSessionKey, Mode4AtlasPool, planMode4AtlasInputTransitions } from './mode4-atlas-pool.js';
 import { createHubFilesystem } from './filesystem/hub-filesystem.js';
 import { createHubTransferJobs } from './filesystem/transfer-jobs.js';
 import { createHubSharedFolders } from './filesystem/shared-folders.js';
@@ -155,8 +155,8 @@ function readPositiveIntegerEnv(name, fallback) {
   return Number.isFinite(value) && value > 0 ? Math.round(value) : fallback;
 }
 
-function handleRemoteHubEvent(type, event) {
-  liveDeskUpdateManager?.handleRemoteEvent(type, event);
+function handleRemoteHubEvent(type, event) {
+  liveDeskUpdateManager?.handleRemoteEvent(type, event);
   if (type === 'RemoteInputApplied') {
     for (const ws of inputClients) {
       sendJson(ws, {
@@ -166,16 +166,16 @@ function handleRemoteHubEvent(type, event) {
     }
     return;
   }
-  if (type === 'RemoteInputError') {
+  if (type === 'RemoteInputError') {
     for (const ws of inputClients) {
       sendJson(ws, {
         type: 'RemoteInputError',
         ...event
       });
-    }
-    return;
-  }
-  if (type === 'RemoteDeviceConnected' || type === 'RemoteDeviceDisconnected') {
+    }
+    return;
+  }
+  if (type === 'RemoteDeviceConnected' || type === 'RemoteDeviceDisconnected') {
     connectedDeviceCount = Number(remoteHub.getStatus({ includeSecrets: false }).connectedDeviceCount || 0);
   }
   if (type !== 'RemoteDeviceConnected') {
@@ -1365,7 +1365,7 @@ function safeWebSocketSend(ws, payload, options = undefined) {
   }
 }
 
-function unregisterFrameClient(ws) {
+function unregisterFrameClient(ws) {
   if (!ws) {
     return;
   }
@@ -1380,10 +1380,11 @@ function unregisterFrameClient(ws) {
     if (clients.size === 0) {
       frameClientsByDeviceId.delete(deviceId);
     }
-  }
-  frameWildcardClients.delete(ws);
-  ws.liveDeskFrameSendLane?.queue?.splice?.(0);
-}
+  }
+  frameWildcardClients.delete(ws);
+  ws.liveDeskExpectedStreamBindingsByDeviceId?.clear?.();
+  ws.liveDeskFrameSendLane?.queue?.splice?.(0);
+}
 
 function hasOtherFrameStreamOwner(ws, deviceId, streamId, streamPurpose = '') {
   if (!streamId) {
@@ -1617,7 +1618,7 @@ function enqueueFramePacketForClient(ws, packet, meta) {
   return true;
 }
 
-function updateFrameSubscription(ws, payload = {}) {
+function updateFrameSubscription(ws, payload = {}) {
   const previousDeviceIds = ws.liveDeskDeviceIds instanceof Set
     ? new Set(ws.liveDeskDeviceIds)
     : new Set();
@@ -1627,14 +1628,18 @@ function updateFrameSubscription(ws, payload = {}) {
   registerFrameClient(ws);
   ws.liveDeskAutoStart = /^(1|true|yes|on|live)$/i.test(String(payload.autoStartLive ?? payload.startLive ?? ''));
   ws.liveDeskLiveOptions = normalizeLiveOptions(payload);
-  if (!(ws.liveDeskStreamIdsByDeviceId instanceof Map)) {
-    ws.liveDeskStreamIdsByDeviceId = new Map();
-  }
-  for (const subscribedDeviceId of ws.liveDeskStreamIdsByDeviceId.keys()) {
-    if (!ws.liveDeskDeviceIds.has(subscribedDeviceId)) {
-      ws.liveDeskStreamIdsByDeviceId.delete(subscribedDeviceId);
-    }
-  }
+  if (!(ws.liveDeskStreamIdsByDeviceId instanceof Map)) {
+    ws.liveDeskStreamIdsByDeviceId = new Map();
+  }
+  if (!(ws.liveDeskExpectedStreamBindingsByDeviceId instanceof Map)) {
+    ws.liveDeskExpectedStreamBindingsByDeviceId = new Map();
+  }
+  for (const subscribedDeviceId of ws.liveDeskStreamIdsByDeviceId.keys()) {
+    if (!ws.liveDeskDeviceIds.has(subscribedDeviceId)) {
+      ws.liveDeskStreamIdsByDeviceId.delete(subscribedDeviceId);
+      ws.liveDeskExpectedStreamBindingsByDeviceId.delete(subscribedDeviceId);
+    }
+  }
   sendJson(ws, {
     type: 'RemoteFrameSubscription',
     timestamp: new Date().toISOString(),
@@ -1688,15 +1693,46 @@ function startFrameSubscriptionLive(ws, reason = 'subscribe', onlyDeviceId = '',
       reuseExisting: liveOptions.forceRestart !== true
         && (liveOptions.reuseExisting === true || reason === 'subscribe' || reason === 'watchdog'),
       silentReuse: reason === 'watchdog' && liveOptions.forceRestart !== true
-    });
-    if (result?.ok) {
-      ws.liveDeskStreamIdsByDeviceId.set(deviceId, result.streamId);
-      cancelPendingFrameStreamStop(deviceId, result.streamId, String(liveOptions.streamPurpose || 'wall'));
-      started.push({ deviceId, streamId: result.streamId, fps: result.fps, reused: result.reused === true });
-    } else {
-      ws.liveDeskStreamIdsByDeviceId.delete(deviceId);
-      skipped.push({ deviceId, reason: result?.error || 'start-failed' });
-    }
+    });
+    if (result?.ok) {
+      const expectedBinding = {
+        deviceId,
+        sessionId: String(result.sessionId || device.sessionId || ''),
+        streamId: String(result.streamId || ''),
+        streamPurpose: String(result.streamPurpose || liveOptions.streamPurpose || 'wall'),
+        commandId: String(result.commandId || ''),
+        captureGeneration: Number(result.captureGeneration || 0),
+        monitorIndex: Number(result.monitorIndex || 0),
+        readySent: false
+      };
+      const activeStream = device?.activeLiveStream;
+      const reusedFrameReady = result.reused === true
+        && result.ready === true
+        && Number(result.framesReceived ?? activeStream?.framesReceived ?? 0) > 0
+        && String(activeStream?.streamId || expectedBinding.streamId) === expectedBinding.streamId
+        && String(activeStream?.commandId || expectedBinding.commandId) === expectedBinding.commandId
+        && Number(activeStream?.captureGeneration || expectedBinding.captureGeneration) === expectedBinding.captureGeneration;
+      expectedBinding.readySent = reusedFrameReady;
+      ws.liveDeskStreamIdsByDeviceId.set(deviceId, result.streamId);
+      ws.liveDeskExpectedStreamBindingsByDeviceId.set(deviceId, expectedBinding);
+      cancelPendingFrameStreamStop(deviceId, result.streamId, String(liveOptions.streamPurpose || 'wall'));
+      started.push({
+        deviceId: expectedBinding.deviceId,
+        sessionId: expectedBinding.sessionId,
+        streamId: expectedBinding.streamId,
+        streamPurpose: expectedBinding.streamPurpose,
+        commandId: expectedBinding.commandId,
+        captureGeneration: expectedBinding.captureGeneration,
+        monitorIndex: expectedBinding.monitorIndex,
+        ready: reusedFrameReady,
+        fps: result.fps,
+        reused: result.reused === true
+      });
+    } else {
+      ws.liveDeskStreamIdsByDeviceId.delete(deviceId);
+      ws.liveDeskExpectedStreamBindingsByDeviceId.delete(deviceId);
+      skipped.push({ deviceId, reason: result?.error || 'start-failed' });
+    }
   }
   if (reason === 'watchdog' && !started.some(item => item.reused !== true)) {
     return;
@@ -1895,15 +1931,36 @@ function broadcastRemoteBinaryFrame(frameEvent) {
   const frameSeq = Number(frame.frameSeq || 0) || 0;
   let sharedPacket = null;
   for (const client of targetClients) {
-    if (client.readyState !== client.OPEN) {
-      continue;
-    }
-    const expectedStreamId = client.liveDeskStreamIdsByDeviceId instanceof Map
-      ? client.liveDeskStreamIdsByDeviceId.get(deviceId)
-      : '';
-    if (expectedStreamId && String(frame.streamId || '') !== expectedStreamId) {
-      continue;
-    }
+    if (client.readyState !== client.OPEN) {
+      continue;
+    }
+    const expectedBinding = client.liveDeskExpectedStreamBindingsByDeviceId instanceof Map
+      ? client.liveDeskExpectedStreamBindingsByDeviceId.get(deviceId)
+      : null;
+    if (!expectedBinding
+      || String(frame.streamId || '') !== expectedBinding.streamId
+      || String(frame.sessionId || '') !== expectedBinding.sessionId
+      || String(frame.commandId || '') !== expectedBinding.commandId
+      || Number(frame.captureGeneration || 0) !== expectedBinding.captureGeneration
+      || String(frame.streamPurpose || '') !== expectedBinding.streamPurpose
+      || Number(frame.monitorIndex || 0) !== expectedBinding.monitorIndex) {
+      continue;
+    }
+    if (!expectedBinding.readySent) {
+      expectedBinding.readySent = sendJson(client, {
+        type: 'RemoteFrameStreamReady',
+        deviceId,
+        sessionId: expectedBinding.sessionId,
+        streamId: expectedBinding.streamId,
+        streamPurpose: expectedBinding.streamPurpose,
+        commandId: expectedBinding.commandId,
+        captureGeneration: expectedBinding.captureGeneration,
+        monitorIndex: expectedBinding.monitorIndex
+      });
+      if (!expectedBinding.readySent) {
+        continue;
+      }
+    }
     const lane = ensureFrameClientSendLane(client);
     if (client.liveDeskFrameBackpressured && isH264 && !isKeyFrame) {
       lane.dropped += 1;
@@ -2032,11 +2089,14 @@ function configureMode4Atlas(ws, payload = {}) {
   const tileHeight = sharpTiles ? 270 : 180;
   const previousInputDeviceIds = ws.liveDeskAtlasInputDeviceIds instanceof Set
     ? new Set(ws.liveDeskAtlasInputDeviceIds)
-    : new Set(deviceIds);
-  const previousMonitorSelections = ws.liveDeskAtlasInputOptions?.monitorSelections || {};
+    : new Set();
+  const previousInputOptions = ws.liveDeskAtlasInputOptions || {};
   const atlasConfig = {
     deviceIds,
-    inputDeviceIds: captureDeviceIds,
+    // Composition ownership is independent from capture ownership. Keeping
+    // every layout device ingestible lets a paused/reused input retain its
+    // latest tile while only the changed device restarts capture.
+    inputDeviceIds: deviceIds,
     width: clampNumber(payload.width, 640, 3840, 1920),
     height: clampNumber(payload.height, 360, 2160, 1080),
     tileWidth,
@@ -2061,22 +2121,32 @@ function configureMode4Atlas(ws, payload = {}) {
   ws.liveDeskAtlasDeviceIds = new Set(deviceIds);
   ws.liveDeskAtlasInputDeviceIds = new Set(captureDeviceIds);
   ws.liveDeskAtlasInputOptions = { tileWidth, tileHeight, monitorSelections };
-  for (const deviceId of previousInputDeviceIds) {
-    if (ws.liveDeskAtlasInputDeviceIds.has(deviceId)) {
-      continue;
-    }
-    stopMode4AtlasInput(ws, deviceId, 'atlas-input-paused');
-  }
-  for (const deviceId of captureDeviceIds) {
-    const previousMonitorIndex = Number(previousMonitorSelections[deviceId] || 0);
-    const nextMonitorIndex = Number(monitorSelections[deviceId] || 0);
-    startMode4AtlasInput(ws, deviceId, 'atlas-configure', {
-      forceRestart: previousInputDeviceIds.has(deviceId) && previousMonitorIndex !== nextMonitorIndex
+  const inputTransitions = planMode4AtlasInputTransitions({
+    inputDeviceIds: [...previousInputDeviceIds],
+    tileWidth: previousInputOptions.tileWidth,
+    tileHeight: previousInputOptions.tileHeight,
+    monitorSelections: previousInputOptions.monitorSelections
+  }, {
+    inputDeviceIds: captureDeviceIds,
+    tileWidth,
+    tileHeight,
+    monitorSelections
+  });
+  for (const deviceId of inputTransitions.stop) {
+    stopMode4AtlasInput(ws, deviceId, 'atlas-input-paused');
+  }
+  for (const deviceId of inputTransitions.start) {
+    startMode4AtlasInput(ws, deviceId, 'atlas-input-started');
+  }
+  for (const deviceId of inputTransitions.restart) {
+    startMode4AtlasInput(ws, deviceId, 'atlas-input-changed', {
+      forceRestart: true
     });
   }
-  sendJson(ws, {
-    type: 'Mode4AtlasSubscription',
-    deviceIds,
+  sendJson(ws, {
+    type: 'Mode4AtlasSubscription',
+    streamId: ws.liveDeskAtlasStreamId,
+    deviceIds,
     captureDeviceIds,
     inputMode: 'mode2-lzo',
     outputMode: 'mode4-h264-atlas',
@@ -3846,11 +3916,12 @@ inputWss.on('connection', ws => {
     } catch {
       sendJson(ws, { type: 'RemoteInputError', error: 'invalid-json' });
       return;
-    }
+    }
     const deviceId = String(payload?.deviceId || '').trim();
+    const inputEventId = String(payload?.requestId || '').trim() || crypto.randomUUID();
     const input = payload?.input && typeof payload.input === 'object'
-      ? { ...payload.input, hubConnectionId: ws.liveDeskInputClientId, hubReceivedAtEpochMs: Date.now() }
-      : { ...payload, hubConnectionId: ws.liveDeskInputClientId, hubReceivedAtEpochMs: Date.now() };
+      ? { ...payload.input, inputEventId, hubConnectionId: ws.liveDeskInputClientId, hubReceivedAtEpochMs: Date.now() }
+      : { ...payload, inputEventId, hubConnectionId: ws.liveDeskInputClientId, hubReceivedAtEpochMs: Date.now() };
     const result = remoteHub.sendInputControl(deviceId, input);
     const inputType = String(input?.type || '').toLowerCase();
     const fireAndForget = payload?.fireAndForget === true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.367",
+  "version": "0.1.369",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
@@ -48,10 +48,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.367",
-    "@livedesk/fast-osx-arm64": "0.1.367",
-    "@livedesk/fast-osx-x64": "0.1.367",
-    "@livedesk/fast-win-x64": "0.1.367"
+    "@livedesk/fast-linux-x64": "0.1.369",
+    "@livedesk/fast-osx-arm64": "0.1.369",
+    "@livedesk/fast-osx-x64": "0.1.369",
+    "@livedesk/fast-win-x64": "0.1.369"
   },
   "publishConfig": {
     "access": "public"