livedesk 0.1.85 → 0.1.87

package/hub/src/remote-hub.js

@@ -4008,6 +4008,7 @@ export function createRemoteHub(options = {}) {
         const { fps, maxWidth, maxHeight, quality, monitorIndex, transfer } = normalized;
         const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
         if (device.activeLiveStream?.streamId === streamId
+            && options.forceRestart !== true
             && liveStreamMatchesOptions(device.activeLiveStream, normalized)
             && liveStreamIsReusable(device.activeLiveStream)) {
             if (options.silentReuse !== true) {
@@ -4030,6 +4031,16 @@ export function createRemoteHub(options = {}) {
                 reused: true
             };
         }
+        if (options.forceRestart === true && device.activeLiveStream?.streamId === streamId) {
+            emitRemoteEvent('RemoteLiveStreamForcedRestart', device, {
+                streamId,
+                fps,
+                mode: transfer.mode,
+                frameMode: transfer.frameMode,
+                monitorIndex,
+                reason: safeString(options.restartReason || 'browser-stale', 128)
+            });
+        }
         if (device.activeLiveStream?.streamId === streamId
             && liveStreamMatchesOptions(device.activeLiveStream, normalized)
             && device.activeLiveStream.open === true

package/hub/src/server.js

@@ -207,7 +207,7 @@ function updateFrameSubscription(ws, payload = {}) {
   startFrameSubscriptionLive(ws, 'subscribe');
 }
 
-function startFrameSubscriptionLive(ws, reason = 'subscribe', onlyDeviceId = '') {
+function startFrameSubscriptionLive(ws, reason = 'subscribe', onlyDeviceId = '', overrideLiveOptions = null) {
   const subscribedIds = [...(ws.liveDeskDeviceIds || [])];
   if (!ws.liveDeskAutoStart || subscribedIds.length === 0) {
     return;
@@ -220,6 +220,9 @@ function startFrameSubscriptionLive(ws, reason = 'subscribe', onlyDeviceId = '')
     return;
   }
 
+  const liveOptions = overrideLiveOptions && typeof overrideLiveOptions === 'object'
+    ? { ...ws.liveDeskLiveOptions, ...overrideLiveOptions }
+    : ws.liveDeskLiveOptions;
   const lookup = new Map(remoteHub.listDevices({ includeDataUrl: false }).map(device => [device.deviceId, device]));
   const started = [];
   const skipped = [];
@@ -234,13 +237,13 @@ function startFrameSubscriptionLive(ws, reason = 'subscribe', onlyDeviceId = '')
       skipped.push({ deviceId, reason: device?.connected ? 'live-unavailable' : 'not-connected' });
       continue;
     }
-    const monitorIndex = Object.prototype.hasOwnProperty.call(ws.liveDeskLiveOptions.monitorSelections || {}, deviceId)
-      ? ws.liveDeskLiveOptions.monitorSelections[deviceId]
-      : ws.liveDeskLiveOptions.monitorIndex;
+    const monitorIndex = Object.prototype.hasOwnProperty.call(liveOptions.monitorSelections || {}, deviceId)
+      ? liveOptions.monitorSelections[deviceId]
+      : liveOptions.monitorIndex;
     const result = remoteHub.startLiveStream(deviceId, {
-      ...ws.liveDeskLiveOptions,
+      ...liveOptions,
       monitorIndex,
-      silentReuse: reason === 'watchdog'
+      silentReuse: reason === 'watchdog' && liveOptions.forceRestart !== true
     });
     if (result?.ok) {
       started.push({ deviceId, streamId: result.streamId, fps: result.fps, reused: result.reused === true });
@@ -260,6 +263,29 @@ function startFrameSubscriptionLive(ws, reason = 'subscribe', onlyDeviceId = '')
   });
 }
 
+function restartFrameSubscriptionLive(ws, payload = {}) {
+  const requestedIds = normalizeDeviceIds(payload.deviceIds ?? payload.devices ?? payload.deviceId);
+  const targetIds = requestedIds.length > 0
+    ? requestedIds
+    : [...(ws.liveDeskDeviceIds || [])];
+  if (targetIds.length === 0) {
+    sendJson(ws, { type: 'RemoteFrameSubscriptionError', error: 'restart-device-missing' });
+    return;
+  }
+  const restartOptions = {
+    ...normalizeLiveOptions({
+      ...ws.liveDeskLiveOptions,
+      ...payload
+    }),
+    forceRestart: true,
+    restartToken: String(payload.restartToken || `${Date.now()}`).slice(0, 128),
+    restartReason: String(payload.restartReason || payload.reason || 'browser-stale').slice(0, 128)
+  };
+  for (const deviceId of targetIds.slice(0, 16)) {
+    startFrameSubscriptionLive(ws, restartOptions.restartReason, deviceId, restartOptions);
+  }
+}
+
 function updateAudioSubscription(ws, payload = {}) {
   const deviceIds = normalizeDeviceIds(payload.deviceIds ?? payload.devices ?? payload.deviceId);
   ws.liveDeskAudioDeviceIds = new Set(deviceIds);
@@ -728,6 +754,8 @@ frameWss.on('connection', (ws, req) => {
       const payload = JSON.parse(Buffer.isBuffer(data) ? data.toString('utf8') : String(data || ''));
       if (payload?.type === 'subscribe') {
         updateFrameSubscription(ws, payload);
+      } else if (payload?.type === 'restart-live') {
+        restartFrameSubscriptionLive(ws, payload);
       }
     } catch {
       sendJson(ws, { type: 'RemoteFrameSubscriptionError', error: 'invalid-message' });

package/package.json

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