livedesk 0.1.245 → 0.1.246

package/hub/src/server.js

@@ -41,12 +41,14 @@ const httpPort = Number(process.env.LIVEDESK_HUB_HTTP_PORT || process.env.PORT |
 const frameBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_BACKPRESSURE_BYTES', 64 * 1024 * 1024);
 const frameClientQueuePackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_QUEUE_PACKETS', 256);
 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);
 const mode5FrameQueuePackets = readPositiveIntegerEnv('LIVEDESK_MODE5_WS_QUEUE_PACKETS', 2);
 const audioBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_AUDIO_WS_BACKPRESSURE_BYTES', 96 * 1024);
-const frameClients = new Set();
-const frameClientsByDeviceId = new Map();
-const frameWildcardClients = new Set();
+const frameClients = new Set();
+const frameClientsByDeviceId = new Map();
+const frameWildcardClients = new Set();
+const pendingFrameStreamStops = new Map();
 const atlasClients = new Map();
 const inputClients = new Set();
 const audioClients = new Set();
@@ -1056,6 +1058,40 @@ function hasOtherFrameStreamOwner(ws, deviceId, streamId, streamPurpose = '') {
   return false;
 }
 
+function frameStreamStopKey(deviceId, streamId, streamPurpose) {
+  return `${deviceId}\u0000${streamId}\u0000${streamPurpose}`;
+}
+
+function cancelPendingFrameStreamStop(deviceId, streamId, streamPurpose) {
+  const key = frameStreamStopKey(deviceId, streamId, streamPurpose);
+  const pending = pendingFrameStreamStops.get(key);
+  if (!pending) {
+    return;
+  }
+  clearTimeout(pending.timer);
+  pendingFrameStreamStops.delete(key);
+}
+
+function scheduleFrameStreamStop(deviceId, streamId, streamPurpose) {
+  const key = frameStreamStopKey(deviceId, streamId, streamPurpose);
+  cancelPendingFrameStreamStop(deviceId, streamId, streamPurpose);
+  const timer = setTimeout(() => {
+    pendingFrameStreamStops.delete(key);
+    if (hasOtherFrameStreamOwner(null, deviceId, streamId, streamPurpose)) {
+      return;
+    }
+    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}`);
+    }
+  }, frameStreamStopGraceMs);
+  pendingFrameStreamStops.set(key, { timer });
+}
+
 function stopFrameClientStreams(ws) {
   const streams = ws.liveDeskStreamIdsByDeviceId instanceof Map
     ? ws.liveDeskStreamIdsByDeviceId
@@ -1068,14 +1104,7 @@ function stopFrameClientStreams(ws) {
     if (!streamId || hasOtherFrameStreamOwner(ws, deviceId, streamId, streamPurpose)) {
       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}`);
-    }
+    scheduleFrameStreamStop(deviceId, streamId, streamPurpose);
   }
   streams.clear();
 }
@@ -1302,9 +1331,10 @@ function startFrameSubscriptionLive(ws, reason = 'subscribe', onlyDeviceId = '',
         && (liveOptions.reuseExisting === true || reason === 'subscribe' || reason === 'watchdog'),
       silentReuse: reason === 'watchdog' && liveOptions.forceRestart !== true
     });
-    if (result?.ok) {
-      ws.liveDeskStreamIdsByDeviceId.set(deviceId, result.streamId);
-      started.push({ deviceId, streamId: result.streamId, fps: result.fps, reused: result.reused === 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' });

package/package.json

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