livedesk 0.1.37 → 0.1.39

package/hub/src/remote-hub.js

@@ -2657,6 +2657,19 @@ export function createRemoteHub(options = {}) {
             return false;
         }
 
+        const commandId = safeString(message.commandId, 128);
+        const activeCommandId = safeString(device.activeLiveStream.commandId, 128);
+        if (commandId && activeCommandId && commandId !== activeCommandId) {
+            emitRemoteEvent('RemoteLiveStreamOpenIgnored', device, {
+                reason: 'stale-live-stream-generation',
+                streamId,
+                commandId,
+                activeCommandId,
+                transport
+            });
+            return false;
+        }
+
         const transfer = buildRemoteFrameTransferDescriptorFromMessage(message, device.activeLiveStream.mode || DEFAULT_REMOTE_FRAME_MODE);
         const openedAt = safeString(message.openedAt, 80) || device.lastSeenAt || new Date().toISOString();
         device.activeLiveStream = {
@@ -2697,6 +2710,7 @@ export function createRemoteHub(options = {}) {
             : safeString(framePayload, MAX_STREAM_BASE64_CHARS + 1);
         const frameSeq = Number(message.frameSeq);
         const streamId = safeString(message.streamId, 128) || 'live';
+        const commandId = safeString(message.commandId, 128);
         if (!device.activeLiveStream?.active || device.activeLiveStream.streamId !== streamId) {
             device.counters.liveFramesDropped += 1;
             emitRemoteEvent('RemoteFrameDropped', device, {
@@ -2707,6 +2721,19 @@ export function createRemoteHub(options = {}) {
             });
             return false;
         }
+        const activeCommandId = safeString(device.activeLiveStream.commandId, 128);
+        if (commandId && activeCommandId && commandId !== activeCommandId) {
+            device.counters.liveFramesDropped += 1;
+            emitRemoteEvent('RemoteFrameDropped', device, {
+                reason: 'stale-live-stream-generation-frame',
+                streamId,
+                commandId,
+                activeCommandId,
+                frameSeq: Number.isFinite(frameSeq) ? frameSeq : null,
+                transport
+            });
+            return false;
+        }
 
         const byteLength = normalizeFrameByteLength(framePayload, frameData);
         if ((!Buffer.isBuffer(framePayload) && !frameData)
@@ -2745,7 +2772,7 @@ export function createRemoteHub(options = {}) {
         device.latestLiveFrame = {
             streamId,
             frameSeq,
-            commandId: safeString(message.commandId, 128),
+            commandId,
             width: Number.isFinite(Number(message.width)) ? Number(message.width) : 0,
             height: Number.isFinite(Number(message.height)) ? Number(message.height) : 0,
             mimeType,
@@ -3659,6 +3686,41 @@ export function createRemoteHub(options = {}) {
         });
     }
 
+    function makeStableLiveStreamId(deviceId) {
+        const hash = crypto.createHash('sha1').update(String(deviceId || 'device')).digest('hex').slice(0, 16);
+        return `live-${hash}`;
+    }
+
+    function normalizeLiveStreamStartOptions(options = {}) {
+        const fps = clampNumber(options.fps, 1, 24, 8);
+        const maxWidth = clampNumber(options.maxWidth, 320, 2560, 640);
+        const maxHeight = clampNumber(options.maxHeight, 180, 1440, 360);
+        const quality = clampNumber(options.quality, 20, 95, 45);
+        const monitorIndex = normalizeMonitorIndex(options.monitorIndex ?? options.screenIndex ?? options.displayIndex);
+        const transfer = buildRemoteFrameTransferDescriptor(options.mode || options.frameMode || DEFAULT_REMOTE_FRAME_MODE);
+        return { fps, maxWidth, maxHeight, quality, monitorIndex, transfer };
+    }
+
+    function liveStreamStartStillPending(activeLiveStream) {
+        if (!activeLiveStream?.active || activeLiveStream.open === true) {
+            return false;
+        }
+        const startedAt = Date.parse(activeLiveStream.startedAt || '');
+        return Number.isFinite(startedAt) && Date.now() - startedAt < 5000;
+    }
+
+    function liveStreamMatchesOptions(activeLiveStream, normalized) {
+        if (!activeLiveStream?.active) {
+            return false;
+        }
+        return activeLiveStream.frameMode === normalized.transfer.frameMode
+            && Number(activeLiveStream.fps || 0) === normalized.fps
+            && Number(activeLiveStream.maxWidth || 0) === normalized.maxWidth
+            && Number(activeLiveStream.maxHeight || 0) === normalized.maxHeight
+            && Number(activeLiveStream.quality || 0) === normalized.quality
+            && Number(activeLiveStream.monitorIndex || 0) === normalized.monitorIndex;
+    }
+
     function startLiveStream(deviceId, options = {}) {
         const device = devices.get(String(deviceId || ''));
         if (device?.synthetic === true && device.connected) {
@@ -3667,11 +3729,25 @@ export function createRemoteHub(options = {}) {
             }
 
             const now = new Date().toISOString();
-            const streamId = safeString(options.streamId, 128) || `live-${Date.now()}`;
-            const fps = clampNumber(options.fps, 1, 24, 2);
-            const monitorIndex = normalizeMonitorIndex(options.monitorIndex ?? options.screenIndex ?? options.displayIndex);
+            const streamId = safeString(options.streamId, 128) || makeStableLiveStreamId(deviceId);
+            const normalized = normalizeLiveStreamStartOptions({ fps: 2, ...options });
+            const { fps, maxWidth, maxHeight, quality, monitorIndex, transfer } = normalized;
             const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
-            const transfer = buildRemoteFrameTransferDescriptor(options.mode || DEFAULT_REMOTE_FRAME_MODE);
+            if (device.activeLiveStream?.streamId === streamId
+                && liveStreamMatchesOptions(device.activeLiveStream, normalized)
+                && (device.activeLiveStream.open === true || liveStreamStartStillPending(device.activeLiveStream))) {
+                return {
+                    ok: true,
+                    commandId: device.activeLiveStream.commandId,
+                    streamId,
+                    fps,
+                    mode: transfer.mode,
+                    frameMode: transfer.frameMode,
+                    monitorIndex,
+                    synthetic: true,
+                    reused: true
+                };
+            }
             device.counters.commandsSent += 1;
             device.activeLiveStream = {
                 streamId,
@@ -3690,6 +3766,9 @@ export function createRemoteHub(options = {}) {
                 transferProtocolVersion: transfer.transferProtocolVersion,
                 handshake: transfer.handshake,
                 fps,
+                maxWidth,
+                maxHeight,
+                quality,
                 monitorIndex,
                 monitorCount: 1,
                 startedAt: now,
@@ -3702,8 +3781,8 @@ export function createRemoteHub(options = {}) {
             device.counters.liveStreamsStarted += 1;
             applySyntheticLiveFrame(device, streamId, {
                 commandId,
-                maxWidth: options.maxWidth,
-                maxHeight: options.maxHeight,
+                maxWidth,
+                maxHeight,
                 monitorIndex,
                 fps
             });
@@ -3725,11 +3804,42 @@ export function createRemoteHub(options = {}) {
         }
 
         const now = new Date().toISOString();
-        const streamId = safeString(options.streamId, 128) || `live-${Date.now()}`;
-        const fps = clampNumber(options.fps, 1, 24, 8);
-        const monitorIndex = normalizeMonitorIndex(options.monitorIndex ?? options.screenIndex ?? options.displayIndex);
+        const streamId = safeString(options.streamId, 128) || makeStableLiveStreamId(deviceId);
+        const normalized = normalizeLiveStreamStartOptions(options);
+        const { fps, maxWidth, maxHeight, quality, monitorIndex, transfer } = normalized;
         const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
-        const transfer = buildRemoteFrameTransferDescriptor(options.mode || DEFAULT_REMOTE_FRAME_MODE);
+        if (device.activeLiveStream?.streamId === streamId
+            && liveStreamMatchesOptions(device.activeLiveStream, normalized)
+            && (device.activeLiveStream.open === true || liveStreamStartStillPending(device.activeLiveStream))) {
+            emitRemoteEvent('RemoteLiveStreamStartReused', device, {
+                streamId,
+                fps,
+                mode: transfer.mode,
+                frameMode: transfer.frameMode,
+                monitorIndex
+            });
+            return {
+                ok: true,
+                commandId: device.activeLiveStream.commandId,
+                streamId,
+                fps,
+                mode: transfer.mode,
+                frameMode: transfer.frameMode,
+                monitorIndex,
+                reused: true
+            };
+        }
+        if (device.activeLiveStream?.active && device.activeLiveStream.streamId && device.activeLiveStream.streamId !== streamId) {
+            sendCommand(deviceId, {
+                command: 'stream.stop',
+                commandId: crypto.randomUUID(),
+                payload: {
+                    streamId: device.activeLiveStream.streamId,
+                    reason: 'live-stream-replaced',
+                    requestedAt: now
+                }
+            });
+        }
         const result = sendCommand(deviceId, {
             command: 'stream.start',
             commandId,
@@ -3745,9 +3855,9 @@ export function createRemoteHub(options = {}) {
                 transferProtocolVersion: transfer.transferProtocolVersion,
                 handshake: transfer.handshake,
                 fps,
-                maxWidth: clampNumber(options.maxWidth, 320, 2560, 640),
-                maxHeight: clampNumber(options.maxHeight, 180, 1440, 360),
-                quality: clampNumber(options.quality, 20, 95, 45),
+                maxWidth,
+                maxHeight,
+                quality,
                 monitorIndex,
                 requestedAt: now
             }
@@ -3774,6 +3884,9 @@ export function createRemoteHub(options = {}) {
             transferProtocolVersion: transfer.transferProtocolVersion,
             handshake: transfer.handshake,
             fps,
+            maxWidth,
+            maxHeight,
+            quality,
             monitorIndex,
             monitorCount: 1,
             startedAt: now,

package/hub/src/server.js

@@ -205,8 +205,7 @@ function updateFrameSubscription(ws, payload = {}) {
         : ws.liveDeskLiveOptions.monitorIndex;
       const result = remoteHub.startLiveStream(deviceId, {
         ...ws.liveDeskLiveOptions,
-        monitorIndex,
-        streamId: `livedesk-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`
+        monitorIndex
       });
       if (result?.ok) {
         started.push({ deviceId, streamId: result.streamId, fps: result.fps });
@@ -245,6 +244,7 @@ function buildRemoteFrameBinaryPacket(frameEvent) {
     deviceId: frameEvent.deviceId || frame.deviceId || '',
     frameSeq: Number(frame.frameSeq || 0) || 0,
     streamId: frame.streamId || '',
+    commandId: frame.commandId || '',
     width: Number(frame.width || 0) || 0,
     height: Number(frame.height || 0) || 0,
     mimeType: frameEvent.mimeType || frame.mimeType || frame.format || 'image/jpeg',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {
@@ -30,7 +30,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@livedesk/client": "0.1.35",
+    "@livedesk/client": "0.1.37",
     "cors": "^2.8.5",
     "express": "^4.21.2",
     "ws": "^8.18.3"