livedesk 0.1.67 → 0.1.68

package/hub/src/server.js

@@ -28,6 +28,23 @@ let frameClientSeq = 0;
 let inputClientSeq = 0;
 let audioClientSeq = 0;
 
+function handleRemoteHubEvent(type, event) {
+  if (type !== 'RemoteDeviceConnected') {
+    return;
+  }
+  const deviceId = String(event?.deviceId || event?.device?.deviceId || '').trim();
+  if (!deviceId) {
+    return;
+  }
+  for (const ws of frameClients) {
+    if (ws.readyState === 1
+      && ws.liveDeskAutoStart
+      && ws.liveDeskDeviceIds?.has(deviceId)) {
+      startFrameSubscriptionLive(ws, 'device-reconnected', deviceId);
+    }
+  }
+}
+
 const remoteHub = createRemoteHub({
   managerPackage: '@livedesk/hub',
   managerVersion: packageInfo.version,
@@ -38,6 +55,7 @@ const remoteHub = createRemoteHub({
   },
   logEvent: (_scope, message) => console.log(`[LiveDesk Hub] ${message}`),
   logWarn: (_scope, message) => console.warn(`[LiveDesk Hub] ${message}`),
+  emitEvent: handleRemoteHubEvent,
   emitFrame: broadcastRemoteBinaryFrame,
   emitAudio: broadcastRemoteBinaryAudio
 });
@@ -185,41 +203,56 @@ function updateFrameSubscription(ws, payload = {}) {
     autoStartLive: ws.liveDeskAutoStart
   });
 
-  if (ws.liveDeskAutoStart && deviceIds.length > 0) {
-    const lookup = new Map(remoteHub.listDevices({ includeDataUrl: false }).map(device => [device.deviceId, device]));
-    const started = [];
-    const skipped = [];
-    for (const deviceId of deviceIds.slice(0, 80)) {
-      const device = lookup.get(deviceId);
-      const liveCapable = device?.liveStreamEnabled === true
-        || device?.liveStreamCapable === true
-        || device?.capabilities?.liveStream === true
-        || device?.capabilities?.stream === true
-        || device?.capabilities?.screenStream === true;
-      if (!device?.connected || !liveCapable) {
-        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 result = remoteHub.startLiveStream(deviceId, {
-        ...ws.liveDeskLiveOptions,
-        monitorIndex
-      });
-      if (result?.ok) {
-        started.push({ deviceId, streamId: result.streamId, fps: result.fps });
-      } else {
-        skipped.push({ deviceId, reason: result?.error || 'start-failed' });
-      }
+  startFrameSubscriptionLive(ws, 'subscribe');
+}
+
+function startFrameSubscriptionLive(ws, reason = 'subscribe', onlyDeviceId = '') {
+  const subscribedIds = [...(ws.liveDeskDeviceIds || [])];
+  if (!ws.liveDeskAutoStart || subscribedIds.length === 0) {
+    return;
+  }
+
+  const targetIds = onlyDeviceId
+    ? subscribedIds.filter(deviceId => deviceId === onlyDeviceId)
+    : subscribedIds;
+  if (targetIds.length === 0) {
+    return;
+  }
+
+  const lookup = new Map(remoteHub.listDevices({ includeDataUrl: false }).map(device => [device.deviceId, device]));
+  const started = [];
+  const skipped = [];
+  for (const deviceId of targetIds.slice(0, 80)) {
+    const device = lookup.get(deviceId);
+    const liveCapable = device?.liveStreamEnabled === true
+      || device?.liveStreamCapable === true
+      || device?.capabilities?.liveStream === true
+      || device?.capabilities?.stream === true
+      || device?.capabilities?.screenStream === true;
+    if (!device?.connected || !liveCapable) {
+      skipped.push({ deviceId, reason: device?.connected ? 'live-unavailable' : 'not-connected' });
+      continue;
     }
-    sendJson(ws, {
-      type: 'RemoteFrameLiveAutoStart',
-      timestamp: new Date().toISOString(),
-      started,
-      skipped: skipped.slice(0, 24)
+    const monitorIndex = Object.prototype.hasOwnProperty.call(ws.liveDeskLiveOptions.monitorSelections || {}, deviceId)
+      ? ws.liveDeskLiveOptions.monitorSelections[deviceId]
+      : ws.liveDeskLiveOptions.monitorIndex;
+    const result = remoteHub.startLiveStream(deviceId, {
+      ...ws.liveDeskLiveOptions,
+      monitorIndex
     });
+    if (result?.ok) {
+      started.push({ deviceId, streamId: result.streamId, fps: result.fps, reused: result.reused === true });
+    } else {
+      skipped.push({ deviceId, reason: result?.error || 'start-failed' });
+    }
   }
+  sendJson(ws, {
+    type: 'RemoteFrameLiveAutoStart',
+    timestamp: new Date().toISOString(),
+    reason,
+    started,
+    skipped: skipped.slice(0, 24)
+  });
 }
 
 function updateAudioSubscription(ws, payload = {}) {

package/package.json

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