livedesk 0.1.246 → 0.1.248

package/hub/src/remote-hub.js

@@ -24,6 +24,7 @@ const RECENT_LIVE_FRAME_CACHE_LIMIT = 1;
 const RECENT_THUMBNAIL_FRAME_CACHE_MAX_BYTES = 2 * 1024 * 1024;
 const RECENT_LIVE_FRAME_CACHE_MAX_BYTES = 8 * 1024 * 1024;
 const LIVE_STREAM_PENDING_REUSE_MS = 5000;
+const LIVE_STREAM_REPLACEMENT_PENDING_MS = 7000;
 const LIVE_STREAM_MIN_FRESH_MS = 3000;
 const LIVE_STREAM_MAX_FRESH_MS = 12000;
 const REMOTE_PROTOCOL_VERSION = 2;
@@ -3342,21 +3343,30 @@ export function createRemoteHub(options = {}) {
 
         const commandId = safeString(message.commandId, 128);
         const activeCommandId = safeString(streamState.commandId, 128);
-        if (commandId && activeCommandId && commandId !== activeCommandId) {
+        const pendingCommandId = safeString(streamState.pendingCommandId, 128);
+        const isActiveGeneration = !commandId || !activeCommandId || commandId === activeCommandId;
+        const isPendingGeneration = !!pendingCommandId && commandId === pendingCommandId;
+        if (!isActiveGeneration && !isPendingGeneration) {
             emitRemoteEvent('RemoteLiveStreamOpenIgnored', device, {
                 reason: 'stale-live-stream-generation',
                 streamId,
                 commandId,
                 activeCommandId,
+                pendingCommandId,
                 transport
             });
             return false;
         }
 
+        const activatingPendingGeneration = isPendingGeneration && commandId !== activeCommandId;
         const transfer = buildRemoteFrameTransferDescriptorFromMessage(message, streamState.mode || DEFAULT_REMOTE_FRAME_MODE);
         const openedAt = safeString(message.openedAt, 80) || device.lastSeenAt || new Date().toISOString();
         const nextStreamState = {
             ...streamState,
+            commandId: activatingPendingGeneration ? commandId : streamState.commandId,
+            pendingCommandId: activatingPendingGeneration ? '' : streamState.pendingCommandId,
+            pendingStartedAt: activatingPendingGeneration ? '' : streamState.pendingStartedAt,
+            pendingRestartToken: activatingPendingGeneration ? '' : streamState.pendingRestartToken,
             open: true,
             openedAt,
             openTransport: transport,
@@ -3380,6 +3390,9 @@ export function createRemoteHub(options = {}) {
         setDeviceLiveStream(device, nextStreamState);
         emitRemoteEvent('RemoteLiveStreamOpened', device, {
             streamId,
+            commandId: nextStreamState.commandId,
+            previousCommandId: activatingPendingGeneration ? activeCommandId : '',
+            handoff: activatingPendingGeneration,
             mode: transfer.mode,
             frameMode: transfer.frameMode,
             frameProfile: transfer.frameProfile,
@@ -3409,13 +3422,16 @@ export function createRemoteHub(options = {}) {
             return false;
         }
         const activeCommandId = safeString(streamState.commandId, 128);
-        if (commandId && activeCommandId && commandId !== activeCommandId) {
+        const pendingCommandId = safeString(streamState.pendingCommandId, 128);
+        const isActiveGeneration = !commandId || !activeCommandId || commandId === activeCommandId;
+        if (!isActiveGeneration) {
             device.counters.liveFramesDropped += 1;
             emitRemoteEvent('RemoteFrameDropped', device, {
                 reason: 'stale-live-stream-generation-frame',
                 streamId,
                 commandId,
                 activeCommandId,
+                pendingCommandId,
                 frameSeq: Number.isFinite(frameSeq) ? frameSeq : null,
                 transport
             });
@@ -3965,7 +3981,11 @@ export function createRemoteHub(options = {}) {
                 {
                     const commandId = safeString(message.commandId, 128);
                     const error = safeString(message.error, 500);
-                    const task = applyTaskResult(device, commandId, message.result ?? null, error);
+                    const result = message.result ?? null;
+                    if (error || result?.ok === false || result?.status === 'failed') {
+                        failPendingLiveStream(device, commandId, error || result?.error || 'stream-start-failed');
+                    }
+                    const task = applyTaskResult(device, commandId, result, error);
                     if (task) {
                         emitRemoteEvent('RemoteTaskResult', device, {
                             commandId,
@@ -4842,6 +4862,29 @@ export function createRemoteHub(options = {}) {
         return stream;
     }
 
+    function failPendingLiveStream(device, commandId, error = 'stream-start-failed') {
+        const key = safeString(commandId, 128);
+        if (!device || !key) {
+            return false;
+        }
+        const streams = ensureDeviceLiveStreams(device);
+        for (const stream of streams.values()) {
+            if (safeString(stream?.pendingCommandId, 128) !== key) {
+                continue;
+            }
+            stream.pendingCommandId = '';
+            stream.pendingStartedAt = '';
+            stream.pendingRestartToken = '';
+            emitRemoteEvent('RemoteLiveStreamRestartFailed', device, {
+                streamId: stream.streamId,
+                commandId: key,
+                error: safeString(error, 500) || 'stream-start-failed'
+            });
+            return true;
+        }
+        return false;
+    }
+
     function deactivateDeviceLiveStreams(device, reason, stoppedAt = new Date().toISOString()) {
         const streams = ensureDeviceLiveStreams(device);
         for (const stream of streams.values()) {
@@ -4893,6 +4936,14 @@ export function createRemoteHub(options = {}) {
         return Number.isFinite(startedAt) && Date.now() - startedAt < LIVE_STREAM_PENDING_REUSE_MS;
     }
 
+    function liveStreamReplacementStillPending(activeLiveStream) {
+        if (!activeLiveStream?.active || !safeString(activeLiveStream.pendingCommandId, 128)) {
+            return false;
+        }
+        const startedAt = Date.parse(activeLiveStream.pendingStartedAt || '');
+        return Number.isFinite(startedAt) && Date.now() - startedAt < LIVE_STREAM_REPLACEMENT_PENDING_MS;
+    }
+
     function getLiveStreamFreshWindowMs(activeLiveStream) {
         const fps = Number(activeLiveStream?.fps || 0);
         const frameMs = Number.isFinite(fps) && fps > 0 ? 1000 / fps : 500;
@@ -5026,6 +5077,30 @@ export function createRemoteHub(options = {}) {
         const { fps, maxWidth, maxHeight, quality, monitorIndex, transfer, streamPurpose } = normalized;
         const streamId = safeString(options.streamId, 128) || makeStableLiveStreamId(deviceId, streamPurpose);
         const activeLiveStream = getDeviceLiveStream(device, streamId);
+        if (activeLiveStream?.pendingCommandId) {
+            if (liveStreamReplacementStillPending(activeLiveStream)) {
+                emitRemoteEvent('RemoteLiveStreamRestartPending', device, {
+                    streamId,
+                    commandId: activeLiveStream.pendingCommandId,
+                    activeCommandId: activeLiveStream.commandId,
+                    reason: safeString(options.restartReason || 'duplicate-restart', 128)
+                });
+                return {
+                    ok: true,
+                    commandId: activeLiveStream.pendingCommandId,
+                    streamId,
+                    fps: Number(activeLiveStream.fps || fps),
+                    mode: activeLiveStream.mode || transfer.mode,
+                    frameMode: activeLiveStream.frameMode || transfer.frameMode,
+                    monitorIndex: Number(activeLiveStream.monitorIndex || monitorIndex),
+                    pending: true,
+                    reused: true
+                };
+            }
+            activeLiveStream.pendingCommandId = '';
+            activeLiveStream.pendingStartedAt = '';
+            activeLiveStream.pendingRestartToken = '';
+        }
         const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
         if (activeLiveStream
             && options.forceRestart !== true
@@ -5120,13 +5195,21 @@ export function createRemoteHub(options = {}) {
             return result;
         }
 
+        const previousCommandId = safeString(activeLiveStream?.commandId, 128);
+        const replacingActiveStream = activeLiveStream?.active === true
+            && !!previousCommandId
+            && previousCommandId !== commandId;
         setDeviceLiveStream(device, {
+            ...(activeLiveStream || {}),
             streamId,
-            commandId,
+            commandId: replacingActiveStream ? previousCommandId : commandId,
+            pendingCommandId: replacingActiveStream ? commandId : '',
+            pendingStartedAt: replacingActiveStream ? now : '',
+            pendingRestartToken: replacingActiveStream ? safeString(options.restartToken, 128) : '',
             active: true,
-            open: false,
-            openedAt: '',
-            openTransport: '',
+            open: replacingActiveStream ? activeLiveStream.open === true : false,
+            openedAt: replacingActiveStream ? activeLiveStream.openedAt || '' : '',
+            openTransport: replacingActiveStream ? activeLiveStream.openTransport || '' : '',
             mode: transfer.mode,
             frameMode: transfer.frameMode,
             frameProfile: transfer.frameProfile,
@@ -5142,7 +5225,7 @@ export function createRemoteHub(options = {}) {
             quality,
             monitorIndex,
             monitorCount: 1,
-            startedAt: now,
+            startedAt: replacingActiveStream ? activeLiveStream.startedAt || now : now,
             stoppedAt: '',
             stopReason: '',
             lastFrameAt: '',
@@ -5154,6 +5237,8 @@ export function createRemoteHub(options = {}) {
         emitRemoteEvent('RemoteLiveStreamStarted', device, {
             streamId,
             commandId,
+            previousCommandId,
+            pending: replacingActiveStream,
             fps,
             mode: transfer.mode,
             frameMode: transfer.frameMode,
@@ -5183,6 +5268,9 @@ export function createRemoteHub(options = {}) {
             device.counters.commandsSent += 1;
             if (streamState) {
                 streamState.active = false;
+                streamState.pendingCommandId = '';
+                streamState.pendingStartedAt = '';
+                streamState.pendingRestartToken = '';
                 streamState.stoppedAt = new Date().toISOString();
                 streamState.stopReason = 'manager-request';
             }
@@ -5215,6 +5303,9 @@ export function createRemoteHub(options = {}) {
 
         if (streamState) {
             streamState.active = false;
+            streamState.pendingCommandId = '';
+            streamState.pendingStartedAt = '';
+            streamState.pendingRestartToken = '';
             streamState.stoppedAt = new Date().toISOString();
             streamState.stopReason = 'manager-request';
         }

package/hub/src/server.js

@@ -38,8 +38,9 @@ const webIndexPath = resolve(webDistPath, 'index.html');
 const packageInfo = JSON.parse(readFileSync(resolve(__dirname, '..', 'package.json'), 'utf8'));
 const httpHost = process.env.LIVEDESK_HUB_HTTP_HOST || '127.0.0.1';
 const httpPort = Number(process.env.LIVEDESK_HUB_HTTP_PORT || process.env.PORT || 5179);
-const frameBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_BACKPRESSURE_BYTES', 64 * 1024 * 1024);
-const frameClientQueuePackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_QUEUE_PACKETS', 256);
+const frameBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_BACKPRESSURE_BYTES', 64 * 1024 * 1024);
+const frameClientQueuePackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_QUEUE_PACKETS', 256);
+const controlFrameClientQueuePackets = readPositiveIntegerEnv('LIVEDESK_CONTROL_FRAME_WS_QUEUE_PACKETS', 4);
 const frameClientDrainBudgetPackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_DRAIN_BUDGET_PACKETS', 64);
 const frameStreamStopGraceMs = readPositiveIntegerEnv('LIVEDESK_FRAME_STREAM_STOP_GRACE_MS', 1500);
 const mode5FrameBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_MODE5_WS_BACKPRESSURE_BYTES', 2 * 1024 * 1024);
@@ -1128,7 +1129,7 @@ function registerFrameClient(ws) {
   }
 }
 
-function ensureFrameClientSendLane(ws) {
+function ensureFrameClientSendLane(ws) {
   if (!ws.liveDeskFrameSendLane) {
     ws.liveDeskFrameSendLane = {
       queue: [],
@@ -1137,8 +1138,14 @@ function ensureFrameClientSendLane(ws) {
       awaitingKeyFrames: new Set()
     };
   }
-  return ws.liveDeskFrameSendLane;
-}
+  return ws.liveDeskFrameSendLane;
+}
+
+function frameClientQueueLimit(ws) {
+  return ws?.liveDeskLiveOptions?.streamPurpose === 'control'
+    ? controlFrameClientQueuePackets
+    : frameClientQueuePackets;
+}
 
 function dropQueuedFrameForLane(lane) {
   const deltaIndex = lane.queue.findIndex(item => item?.isKeyFrame !== true);
@@ -1243,7 +1250,7 @@ function enqueueFramePacketForClient(ws, packet, meta) {
       ws.liveDeskFrameBackpressureDrops = Number(ws.liveDeskFrameBackpressureDrops || 0) + 1;
     }
   }
-  while (lane.queue.length >= frameClientQueuePackets) {
+  while (lane.queue.length >= frameClientQueueLimit(ws)) {
     dropQueuedFrameForLane(lane);
     ws.liveDeskFrameBackpressureDrops = Number(ws.liveDeskFrameBackpressureDrops || 0) + 1;
   }
@@ -2866,9 +2873,14 @@ audioWss.on('connection', (ws, req) => {
   });
 });
 
-inputWss.on('connection', ws => {
-  inputClients.add(ws);
-  ws.liveDeskInputClientId = `riws-${++inputClientSeq}`;
+inputWss.on('connection', ws => {
+  inputClients.add(ws);
+  ws.liveDeskInputClientId = `riws-${++inputClientSeq}`;
+  try {
+    ws._socket?.setNoDelay?.(true);
+  } catch {
+    // Best-effort latency hint for browser input sockets.
+  }
   ws.on('message', data => {
     let payload;
     try {
@@ -2882,8 +2894,10 @@ inputWss.on('connection', ws => {
       ? { ...payload.input, hubReceivedAtEpochMs: Date.now() }
       : { ...payload, hubReceivedAtEpochMs: Date.now() };
     const result = remoteHub.sendInputControl(deviceId, input);
-    const fireAndForget = payload?.fireAndForget === true
-      || String(input?.type || '').toLowerCase() === 'pointermove';
+    const inputType = String(input?.type || '').toLowerCase();
+    const fireAndForget = payload?.fireAndForget === true
+      || inputType === 'pointermove'
+      || inputType === 'wheel';
     if (fireAndForget && result?.ok) {
       return;
     }

package/package.json

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