livedesk 0.1.82 → 0.1.84

package/hub/src/remote-hub.js

@@ -22,6 +22,9 @@ const RECENT_THUMBNAIL_FRAME_CACHE_LIMIT = 4;
 const RECENT_LIVE_FRAME_CACHE_LIMIT = 80;
 const RECENT_THUMBNAIL_FRAME_CACHE_MAX_BYTES = 3 * 1024 * 1024;
 const RECENT_LIVE_FRAME_CACHE_MAX_BYTES = 24 * 1024 * 1024;
+const LIVE_STREAM_PENDING_REUSE_MS = 5000;
+const LIVE_STREAM_MIN_FRESH_MS = 3000;
+const LIVE_STREAM_MAX_FRESH_MS = 12000;
 const REMOTE_PROTOCOL_VERSION = 2;
 const REMOTE_AGENT_PROTOCOL = 'mindexec.remote.agent';
 const REMOTE_FRAME_PROTOCOL = 'mindexec.remote.frame.v2';
@@ -3872,7 +3875,37 @@ export function createRemoteHub(options = {}) {
             return false;
         }
         const startedAt = Date.parse(activeLiveStream.startedAt || '');
-        return Number.isFinite(startedAt) && Date.now() - startedAt < 5000;
+        return Number.isFinite(startedAt) && Date.now() - startedAt < LIVE_STREAM_PENDING_REUSE_MS;
+    }
+
+    function getLiveStreamFreshWindowMs(activeLiveStream) {
+        const fps = Number(activeLiveStream?.fps || 0);
+        const frameMs = Number.isFinite(fps) && fps > 0 ? 1000 / fps : 500;
+        return Math.max(
+            LIVE_STREAM_MIN_FRESH_MS,
+            Math.min(LIVE_STREAM_MAX_FRESH_MS, Math.round(frameMs * 20))
+        );
+    }
+
+    function getLiveStreamIdleMs(activeLiveStream) {
+        const lastFrameAt = Date.parse(activeLiveStream?.lastFrameAt || activeLiveStream?.openedAt || activeLiveStream?.startedAt || '');
+        if (!Number.isFinite(lastFrameAt)) {
+            return Infinity;
+        }
+        return Math.max(0, Date.now() - lastFrameAt);
+    }
+
+    function liveStreamIsReusable(activeLiveStream) {
+        if (!activeLiveStream?.active) {
+            return false;
+        }
+        if (liveStreamStartStillPending(activeLiveStream)) {
+            return true;
+        }
+        if (activeLiveStream.open !== true) {
+            return false;
+        }
+        return getLiveStreamIdleMs(activeLiveStream) <= getLiveStreamFreshWindowMs(activeLiveStream);
     }
 
     function liveStreamMatchesOptions(activeLiveStream, normalized) {
@@ -3976,14 +4009,16 @@ export function createRemoteHub(options = {}) {
         const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
         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
-            });
+            && liveStreamIsReusable(device.activeLiveStream)) {
+            if (options.silentReuse !== true) {
+                emitRemoteEvent('RemoteLiveStreamStartReused', device, {
+                    streamId,
+                    fps,
+                    mode: transfer.mode,
+                    frameMode: transfer.frameMode,
+                    monitorIndex
+                });
+            }
             return {
                 ok: true,
                 commandId: device.activeLiveStream.commandId,
@@ -3995,6 +4030,21 @@ export function createRemoteHub(options = {}) {
                 reused: true
             };
         }
+        if (device.activeLiveStream?.streamId === streamId
+            && liveStreamMatchesOptions(device.activeLiveStream, normalized)
+            && device.activeLiveStream.open === true
+            && !liveStreamIsReusable(device.activeLiveStream)) {
+            emitRemoteEvent('RemoteLiveStreamStaleRestart', device, {
+                streamId,
+                fps,
+                mode: transfer.mode,
+                frameMode: transfer.frameMode,
+                monitorIndex,
+                idleMs: getLiveStreamIdleMs(device.activeLiveStream),
+                staleAfterMs: getLiveStreamFreshWindowMs(device.activeLiveStream),
+                lastFrameAt: device.activeLiveStream.lastFrameAt || ''
+            });
+        }
         if (device.activeLiveStream?.active && device.activeLiveStream.streamId && device.activeLiveStream.streamId !== streamId) {
             sendCommand(deviceId, {
                 command: 'stream.stop',

package/hub/src/server.js

@@ -27,6 +27,7 @@ const audioClients = new Set();
 let frameClientSeq = 0;
 let inputClientSeq = 0;
 let audioClientSeq = 0;
+const FRAME_LIVE_WATCHDOG_MS = 2500;
 
 function handleRemoteHubEvent(type, event) {
   if (type !== 'RemoteDeviceConnected') {
@@ -238,7 +239,8 @@ function startFrameSubscriptionLive(ws, reason = 'subscribe', onlyDeviceId = '')
       : ws.liveDeskLiveOptions.monitorIndex;
     const result = remoteHub.startLiveStream(deviceId, {
       ...ws.liveDeskLiveOptions,
-      monitorIndex
+      monitorIndex,
+      silentReuse: reason === 'watchdog'
     });
     if (result?.ok) {
       started.push({ deviceId, streamId: result.streamId, fps: result.fps, reused: result.reused === true });
@@ -246,6 +248,9 @@ function startFrameSubscriptionLive(ws, reason = 'subscribe', onlyDeviceId = '')
       skipped.push({ deviceId, reason: result?.error || 'start-failed' });
     }
   }
+  if (reason === 'watchdog' && !started.some(item => item.reused !== true)) {
+    return;
+  }
   sendJson(ws, {
     type: 'RemoteFrameLiveAutoStart',
     timestamp: new Date().toISOString(),
@@ -702,6 +707,16 @@ httpServer.on('upgrade', (req, socket, head) => {
 frameWss.on('connection', (ws, req) => {
   frameClients.add(ws);
   ws.liveDeskFrameClientId = `rfws-${++frameClientSeq}`;
+  const liveWatchdog = setInterval(() => {
+    if (ws.readyState === 1) {
+      startFrameSubscriptionLive(ws, 'watchdog');
+    }
+  }, FRAME_LIVE_WATCHDOG_MS);
+  liveWatchdog.unref?.();
+  const cleanup = () => {
+    clearInterval(liveWatchdog);
+    frameClients.delete(ws);
+  };
   try {
     const parsed = new URL(req.url || '/', `http://${req.headers.host || '127.0.0.1'}`);
     updateFrameSubscription(ws, { deviceIds: parsed.searchParams.get('devices') || '' });
@@ -718,8 +733,8 @@ frameWss.on('connection', (ws, req) => {
       sendJson(ws, { type: 'RemoteFrameSubscriptionError', error: 'invalid-message' });
     }
   });
-  ws.on('close', () => frameClients.delete(ws));
-  ws.on('error', () => frameClients.delete(ws));
+  ws.on('close', cleanup);
+  ws.on('error', cleanup);
   sendJson(ws, {
     type: 'RemoteFrameSocketReady',
     protocol: 'livedesk.remote.frames.binary.v1',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.82",
+  "version": "0.1.84",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {