livedesk 0.1.225 → 0.1.227

package/hub/src/mode4-atlas.js

@@ -10,6 +10,8 @@ export class Mode4AtlasSession {
     this.onStatus = typeof options.onStatus === 'function' ? options.onStatus : () => {};
     this.deviceIds = [];
     this.deviceSet = new Set();
+    this.inputDeviceIds = [];
+    this.inputDeviceSet = new Set();
     this.config = null;
     this.closed = false;
     this.worker = null;
@@ -65,7 +67,10 @@ export class Mode4AtlasSession {
     this.deviceIds = [...new Set((Array.isArray(options.deviceIds) ? options.deviceIds : [])
       .map(value => String(value || '').trim()).filter(Boolean))].slice(0, 100);
     this.deviceSet = new Set(this.deviceIds);
-    this.pendingFrames = new Map([...this.pendingFrames].filter(([deviceId]) => this.deviceSet.has(deviceId)));
+    this.inputDeviceIds = [...new Set((Array.isArray(options.inputDeviceIds) ? options.inputDeviceIds : this.deviceIds)
+      .map(value => String(value || '').trim()).filter(value => this.deviceSet.has(value)))].slice(0, 100);
+    this.inputDeviceSet = new Set(this.inputDeviceIds);
+    this.pendingFrames = new Map([...this.pendingFrames].filter(([deviceId]) => this.inputDeviceSet.has(deviceId)));
     this.config = {
       deviceIds: this.deviceIds,
       width: Number(options.width || 1920),
@@ -102,7 +107,7 @@ 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.deviceSet.has(deviceId) || mode !== 'mode2-lzo' || !Buffer.isBuffer(frameEvent?.payload)) return;
+    if (!this.inputDeviceSet.has(deviceId) || mode !== 'mode2-lzo' || !Buffer.isBuffer(frameEvent?.payload)) return;
     this.pendingFrames.set(deviceId, {
       type: 'frame',
       deviceId,

package/hub/src/remote-hub.js

@@ -3474,6 +3474,12 @@ export function createRemoteHub(options = {}) {
             transferProtocolVersion: transfer.transferProtocolVersion,
             handshake: transfer.handshake,
             fps: Number.isFinite(Number(message.fps)) ? Number(message.fps) : streamState.fps,
+            requestedFps: Number.isFinite(Number(message.requestedFps)) ? Number(message.requestedFps) : Number(streamState.fps || 0),
+            effectiveFps: Number.isFinite(Number(message.effectiveFps)) ? Number(message.effectiveFps) : Number(message.fps || streamState.fps || 0),
+            captureAverageMs: readFrameStageMs(message, 'captureAverageMs'),
+            captureP95Ms: readFrameStageMs(message, 'captureP95Ms'),
+            slowFrameCount: Number.isFinite(Number(message.slowFrameCount)) ? Number(message.slowFrameCount) : 0,
+            captureHelperRestarts: Number.isFinite(Number(message.captureHelperRestarts)) ? Number(message.captureHelperRestarts) : 0,
             capturedAt,
             receivedAt: device.lastSeenAt,
             byteLength,
@@ -4809,16 +4815,27 @@ export function createRemoteHub(options = {}) {
         return `${role}-${hash}`;
     }
 
+    function normalizeLivePlatform(value) {
+        const normalized = safeString(value, 32).toLowerCase();
+        if (['macos', 'darwin', 'mac', 'macosx'].includes(normalized)) return 'macos';
+        if (['windows', 'win32', 'win32nt'].includes(normalized)) return 'windows';
+        if (['linux', 'unix'].includes(normalized)) return 'linux';
+        return normalized || 'unknown';
+    }
+
     function normalizeLiveStreamStartOptions(options = {}) {
         const transfer = buildRemoteFrameTransferDescriptor(options.mode || options.frameMode || DEFAULT_REMOTE_FRAME_MODE);
         const streamPurpose = safeString(options.streamPurpose || options.purpose || 'wall', 24) || 'wall';
-        const maxFps = streamPurpose === 'control' ? 60 : 30;
-        const fps = clampNumber(options.fps, 1, maxFps, 8);
-        const maxWidth = clampNumber(options.maxWidth, 320, 3840, 640);
-        const maxHeight = clampNumber(options.maxHeight, 180, 2160, 360);
+        const platform = normalizeLivePlatform(options.platform);
+        const macWallProfile = platform === 'macos' && streamPurpose !== 'control';
+        const maxFps = streamPurpose === 'control' ? 60 : macWallProfile ? 8 : 30;
+        const defaultFps = macWallProfile && options.fps === undefined ? 4 : 8;
+        const maxWidth = clampNumber(options.maxWidth, 320, macWallProfile ? 432 : 3840, macWallProfile ? 432 : 640);
+        const maxHeight = clampNumber(options.maxHeight, 180, macWallProfile ? 243 : 2160, macWallProfile ? 243 : 360);
+        const fps = clampNumber(options.fps, 1, maxFps, defaultFps);
         const quality = clampNumber(options.quality, 20, 95, 45);
         const monitorIndex = normalizeMonitorIndex(options.monitorIndex ?? options.screenIndex ?? options.displayIndex);
-        return { fps, maxWidth, maxHeight, quality, monitorIndex, transfer, streamPurpose };
+        return { fps, maxWidth, maxHeight, quality, monitorIndex, transfer, streamPurpose, platform, macWallProfile };
     }
 
     function liveStreamStartStillPending(activeLiveStream) {
@@ -4879,7 +4896,7 @@ export function createRemoteHub(options = {}) {
             }
 
             const now = new Date().toISOString();
-            const normalized = normalizeLiveStreamStartOptions({ fps: 2, ...options });
+            const normalized = normalizeLiveStreamStartOptions({ fps: 2, ...options, platform: device.platform });
             const { fps, maxWidth, maxHeight, quality, monitorIndex, transfer, streamPurpose } = normalized;
             const streamId = safeString(options.streamId, 128) || makeStableLiveStreamId(deviceId, streamPurpose);
             const activeLiveStream = getDeviceLiveStream(device, streamId);
@@ -4956,7 +4973,7 @@ export function createRemoteHub(options = {}) {
         }
 
         const now = new Date().toISOString();
-        const normalized = normalizeLiveStreamStartOptions(options);
+        const normalized = normalizeLiveStreamStartOptions({ ...options, platform: device.platform });
         const { fps, maxWidth, maxHeight, quality, monitorIndex, transfer, streamPurpose } = normalized;
         const streamId = safeString(options.streamId, 128) || makeStableLiveStreamId(deviceId, streamPurpose);
         const activeLiveStream = getDeviceLiveStream(device, streamId);
@@ -5099,11 +5116,22 @@ export function createRemoteHub(options = {}) {
 
     function stopLiveStream(deviceId, options = {}) {
         const device = devices.get(String(deviceId || ''));
+        const streamPurpose = safeString(options.streamPurpose || options.purpose, 24);
+        const requestedStreamId = safeString(options.streamId, 128);
+        const purposeStreamId = streamPurpose ? makeStableLiveStreamId(deviceId, streamPurpose) : '';
+        const streamId = requestedStreamId || purposeStreamId || device?.activeLiveStream?.streamId || '';
+        const streamState = getDeviceLiveStream(device, streamId);
+        if (streamState && streamState.active !== true) {
+            return {
+                ok: true,
+                commandId: safeString(options.commandId, 128),
+                streamId,
+                alreadyStopped: true
+            };
+        }
         if (device?.synthetic === true && device.connected) {
-            const streamId = safeString(options.streamId, 128) || device.activeLiveStream?.streamId || '';
             const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
             device.counters.commandsSent += 1;
-            const streamState = getDeviceLiveStream(device, streamId);
             if (streamState) {
                 streamState.active = false;
                 streamState.stoppedAt = new Date().toISOString();
@@ -5122,7 +5150,6 @@ export function createRemoteHub(options = {}) {
             return { ok: false, error: 'device-not-connected' };
         }
 
-        const streamId = safeString(options.streamId, 128) || device.activeLiveStream?.streamId || '';
         const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
         const result = sendCommand(deviceId, {
             command: 'stream.stop',
@@ -5137,7 +5164,6 @@ export function createRemoteHub(options = {}) {
             return result;
         }
 
-        const streamState = getDeviceLiveStream(device, streamId);
         if (streamState) {
             streamState.active = false;
             streamState.stoppedAt = new Date().toISOString();

package/hub/src/server.js

@@ -101,11 +101,11 @@ function handleRemoteHubEvent(type, event) {
   if (!deviceId) {
     return;
   }
-  for (const ws of atlasClients.keys()) {
-    if (ws.readyState === 1 && ws.liveDeskAtlasDeviceIds?.has(deviceId)) {
-      startMode4AtlasInput(ws, deviceId, 'device-connected');
-    }
-  }
+  for (const ws of atlasClients.keys()) {
+    if (ws.readyState === 1 && ws.liveDeskAtlasInputDeviceIds?.has(deviceId)) {
+      startMode4AtlasInput(ws, deviceId, 'device-connected');
+    }
+  }
   const clients = new Set([
     ...(frameClientsByDeviceId.get(deviceId) || []),
     ...frameWildcardClients
@@ -976,11 +976,12 @@ function safeWebSocketSend(ws, payload, options = undefined) {
   }
 }
 
-function unregisterFrameClient(ws) {
-  if (!ws) {
-    return;
-  }
-  const ids = ws.liveDeskDeviceIds instanceof Set ? ws.liveDeskDeviceIds : new Set();
+function unregisterFrameClient(ws) {
+  if (!ws) {
+    return;
+  }
+  stopFrameClientStreams(ws);
+  const ids = ws.liveDeskDeviceIds instanceof Set ? ws.liveDeskDeviceIds : new Set();
   for (const deviceId of ids) {
     const clients = frameClientsByDeviceId.get(deviceId);
     if (!clients) {
@@ -991,9 +992,49 @@ function unregisterFrameClient(ws) {
       frameClientsByDeviceId.delete(deviceId);
     }
   }
-  frameWildcardClients.delete(ws);
-  ws.liveDeskFrameSendLane?.queue?.splice?.(0);
-}
+  frameWildcardClients.delete(ws);
+  ws.liveDeskFrameSendLane?.queue?.splice?.(0);
+}
+
+function hasOtherFrameStreamOwner(ws, deviceId, streamId) {
+  if (!streamId) {
+    return false;
+  }
+  for (const candidate of frameClients) {
+    if (candidate === ws || candidate.readyState !== candidate.OPEN) {
+      continue;
+    }
+    if (candidate.liveDeskStreamIdsByDeviceId instanceof Map
+      && candidate.liveDeskStreamIdsByDeviceId.get(deviceId) === streamId) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function stopFrameClientStreams(ws) {
+  const streams = ws.liveDeskStreamIdsByDeviceId instanceof Map
+    ? ws.liveDeskStreamIdsByDeviceId
+    : null;
+  if (!streams) {
+    return;
+  }
+  const streamPurpose = String(ws.liveDeskLiveOptions?.streamPurpose || 'wall');
+  for (const [deviceId, streamId] of streams.entries()) {
+    if (!streamId || hasOtherFrameStreamOwner(ws, deviceId, streamId)) {
+      continue;
+    }
+    const result = remoteHub.stopLiveStream(deviceId, {
+      streamId,
+      streamPurpose,
+      reason: 'frame-client-closed'
+    });
+    if (result?.ok && !result.alreadyStopped) {
+      console.log(`[LiveDesk Hub] stopped ${streamPurpose} stream after frame client closed device=${deviceId} stream=${streamId}`);
+    }
+  }
+  streams.clear();
+}
 
 function registerFrameClient(ws) {
   if (!ws) {
@@ -1322,9 +1363,15 @@ function buildRemoteFrameBinaryPacket(frameEvent, diagnostics = {}) {
     hardwareEncoder: frame.hardwareEncoder || '',
     platformProfile: frame.platformProfile || '',
     monitorIndex: Number.isFinite(Number(frame.monitorIndex)) ? Number(frame.monitorIndex) : 0,
-    monitorCount: Number.isFinite(Number(frame.monitorCount)) ? Number(frame.monitorCount) : 1,
-    fps: Number(frame.fps || 0) || 0,
-    capturedAt: frame.capturedAt || '',
+    monitorCount: Number.isFinite(Number(frame.monitorCount)) ? Number(frame.monitorCount) : 1,
+    fps: Number(frame.fps || 0) || 0,
+    requestedFps: Number(frame.requestedFps || 0) || 0,
+    effectiveFps: Number(frame.effectiveFps || 0) || 0,
+    captureAverageMs: Number(frame.captureAverageMs || 0) || 0,
+    captureP95Ms: Number(frame.captureP95Ms || 0) || 0,
+    slowFrameCount: Number(frame.slowFrameCount || 0) || 0,
+    captureHelperRestarts: Number(frame.captureHelperRestarts || 0) || 0,
+    capturedAt: frame.capturedAt || '',
     receivedAt: frame.receivedAt || '',
     hubPacketAt,
     hubPacketEpochMs,
@@ -1537,28 +1584,42 @@ function sendMode4AtlasFrame(ws, output) {
   }
 }
 
-function configureMode4Atlas(ws, payload = {}) {
-  const deviceIds = normalizeDeviceIds(payload.deviceIds ?? payload.devices ?? payload.deviceId).slice(0, 100);
-  const monitorSelections = normalizeMonitorSelections(payload.monitorSelections);
+function configureMode4Atlas(ws, payload = {}) {
+  const deviceIds = normalizeDeviceIds(payload.deviceIds ?? payload.devices ?? payload.deviceId).slice(0, 100);
+  const captureDeviceIds = normalizeDeviceIds(payload.captureDeviceIds ?? payload.inputDeviceIds ?? deviceIds)
+    .filter(deviceId => deviceIds.includes(deviceId));
+  const monitorSelections = normalizeMonitorSelections(payload.monitorSelections);
   const sharpTiles = Number(payload.tileWidth) >= 480 || Number(payload.tileHeight) >= 270;
   const tileWidth = sharpTiles ? 480 : 320;
   const tileHeight = sharpTiles ? 270 : 180;
-  ws.liveDeskAtlasDeviceIds = new Set(deviceIds);
-  ws.liveDeskAtlasInputOptions = { tileWidth, tileHeight, monitorSelections };
-  ws.liveDeskAtlasSession.configure({
-    deviceIds,
+  const previousInputDeviceIds = ws.liveDeskAtlasInputDeviceIds instanceof Set
+    ? new Set(ws.liveDeskAtlasInputDeviceIds)
+    : new Set(deviceIds);
+  ws.liveDeskAtlasDeviceIds = new Set(deviceIds);
+  ws.liveDeskAtlasInputDeviceIds = new Set(captureDeviceIds);
+  ws.liveDeskAtlasInputOptions = { tileWidth, tileHeight, monitorSelections };
+  ws.liveDeskAtlasSession.configure({
+    deviceIds,
+    inputDeviceIds: captureDeviceIds,
     width: clampNumber(payload.width, 640, 3840, 1920),
     height: clampNumber(payload.height, 360, 2160, 1080),
     tileWidth,
     tileHeight,
     fps: clampNumber(payload.fps, 1, 30, 20)
   });
-  for (const deviceId of deviceIds) {
-    startMode4AtlasInput(ws, deviceId, 'atlas-configure');
-  }
+  for (const deviceId of previousInputDeviceIds) {
+    if (ws.liveDeskAtlasInputDeviceIds.has(deviceId)) {
+      continue;
+    }
+    stopMode4AtlasInput(ws, deviceId, 'atlas-input-paused');
+  }
+  for (const deviceId of captureDeviceIds) {
+    startMode4AtlasInput(ws, deviceId, 'atlas-configure');
+  }
   sendJson(ws, {
-    type: 'Mode4AtlasSubscription',
-    deviceIds,
+    type: 'Mode4AtlasSubscription',
+    deviceIds,
+    captureDeviceIds,
     inputMode: 'mode2-lzo',
     outputMode: 'mode4-h264-atlas',
     tileWidth,
@@ -1567,10 +1628,10 @@ function configureMode4Atlas(ws, payload = {}) {
   });
 }
 
-function startMode4AtlasInput(ws, deviceId, reason = 'atlas-configure') {
-  const options = ws?.liveDeskAtlasInputOptions;
-  if (!options || !ws.liveDeskAtlasDeviceIds?.has(deviceId)) return { ok: false, error: 'atlas-device-not-configured' };
-  return remoteHub.startLiveStream(deviceId, {
+function startMode4AtlasInput(ws, deviceId, reason = 'atlas-configure') {
+  const options = ws?.liveDeskAtlasInputOptions;
+  if (!options || !ws.liveDeskAtlasInputDeviceIds?.has(deviceId)) return { ok: false, error: 'atlas-device-not-configured' };
+  return remoteHub.startLiveStream(deviceId, {
     fps: 8,
     maxWidth: options.tileWidth,
     maxHeight: options.tileHeight,
@@ -1582,8 +1643,30 @@ function startMode4AtlasInput(ws, deviceId, reason = 'atlas-configure') {
     reuseExisting: false,
     silentReuse: true,
     restartReason: reason
-  });
-}
+  });
+}
+
+function hasOtherAtlasInputOwner(ws, deviceId) {
+  for (const candidate of atlasClients.keys()) {
+    if (candidate === ws || candidate.readyState !== candidate.OPEN) {
+      continue;
+    }
+    if (candidate.liveDeskAtlasInputDeviceIds?.has(deviceId)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function stopMode4AtlasInput(ws, deviceId, reason = 'atlas-input-stopped') {
+  if (!deviceId || hasOtherAtlasInputOwner(ws, deviceId)) {
+    return { ok: true, alreadyOwned: true };
+  }
+  return remoteHub.stopLiveStream(deviceId, {
+    streamPurpose: 'atlas',
+    reason
+  });
+}
 
 function wantsBinaryFrame(req) {
   return /^(1|true|yes|on|binary|raw)$/i.test(String(req.query?.binary ?? req.query?.raw ?? ''))
@@ -2457,9 +2540,13 @@ atlasWss.on('connection', ws => {
   });
   ws.liveDeskAtlasSession = session;
   atlasClients.set(ws, session);
-  const cleanup = () => {
-    atlasClients.delete(ws);
-    session.close();
+  const cleanup = () => {
+    atlasClients.delete(ws);
+    for (const deviceId of ws.liveDeskAtlasInputDeviceIds || []) {
+      stopMode4AtlasInput(ws, deviceId, 'atlas-client-closed');
+    }
+    ws.liveDeskAtlasInputDeviceIds = new Set();
+    session.close();
     const lane = ws.liveDeskFrameSendLane;
     if (lane) {
       lane.queue.length = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.225",
+  "version": "0.1.227",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
-    "@livedesk/client": "0.1.128",
+    "@livedesk/client": "0.1.130",
     "@openai/codex-sdk": "0.144.5",
     "cors": "^2.8.5",
     "express": "^4.21.2",