livedesk 0.1.28 → 0.1.30

package/hub/src/remote-hub.js

@@ -474,6 +474,10 @@ function normalizeSlotNumber(value) {
     return Number.isInteger(number) && number >= 1 && number <= 999 ? number : 0;
 }
 
+function normalizeMonitorIndex(value) {
+    return clampNumber(value, 0, 63, 0);
+}
+
 function parseManagerEndpoint(value) {
     const endpoint = safeString(value, 256);
     const match = endpoint.match(/^(\[[^\]]+\]|[^:\s]+):(\d{1,5})$/);
@@ -1636,6 +1640,8 @@ export function createRemoteHub(options = {}) {
             contentHash: SYNTHETIC_FRAME_HASH,
             captureMs: 0,
             sameContentStreak: 0,
+            monitorIndex: normalizeMonitorIndex(options.monitorIndex ?? 0),
+            monitorCount: clampNumber(options.monitorCount, 1, 64, 1),
             dataUrl: SYNTHETIC_FRAME_DATA_URL,
             payload: SYNTHETIC_FRAME_PAYLOAD,
             accessToken: createFrameAccessToken()
@@ -1676,6 +1682,8 @@ export function createRemoteHub(options = {}) {
             commandId: options.commandId || device.activeLiveStream.commandId,
             width: options.maxWidth || 960,
             height: options.maxHeight || 540,
+            monitorIndex: options.monitorIndex ?? device.activeLiveStream.monitorIndex ?? 0,
+            monitorCount: options.monitorCount ?? device.activeLiveStream.monitorCount ?? 1,
             fps: options.fps || device.activeLiveStream.fps
         });
         device.latestLiveFrame = frame;
@@ -2667,6 +2675,8 @@ export function createRemoteHub(options = {}) {
             handshake: transfer.handshake,
             width: Number.isFinite(Number(message.width)) ? Number(message.width) : Number(device.activeLiveStream.width || 0),
             height: Number.isFinite(Number(message.height)) ? Number(message.height) : Number(device.activeLiveStream.height || 0),
+            monitorIndex: Number.isFinite(Number(message.monitorIndex)) ? normalizeMonitorIndex(message.monitorIndex) : Number(device.activeLiveStream.monitorIndex || 0),
+            monitorCount: Number.isFinite(Number(message.monitorCount)) ? clampNumber(message.monitorCount, 1, 64, 1) : Number(device.activeLiveStream.monitorCount || 1),
             openedFrameSeq: Number.isFinite(Number(message.frameSeq)) ? Number(message.frameSeq) : Number(device.activeLiveStream.openedFrameSeq || 0)
         };
         emitRemoteEvent('RemoteLiveStreamOpened', device, {
@@ -2756,6 +2766,8 @@ export function createRemoteHub(options = {}) {
             durationUs: Number.isFinite(Number(message.durationUs)) ? Number(message.durationUs) : 0,
             hardwareEncoder: safeString(message.hardwareEncoder, 80),
             platformProfile: safeString(message.platformProfile, 80),
+            monitorIndex: Number.isFinite(Number(message.monitorIndex)) ? normalizeMonitorIndex(message.monitorIndex) : Number(device.activeLiveStream.monitorIndex || 0),
+            monitorCount: Number.isFinite(Number(message.monitorCount)) ? clampNumber(message.monitorCount, 1, 64, 1) : Number(device.activeLiveStream.monitorCount || 1),
             transferProtocol: transfer.transferProtocol,
             transferProtocolVersion: transfer.transferProtocolVersion,
             handshake: transfer.handshake,
@@ -2791,6 +2803,8 @@ export function createRemoteHub(options = {}) {
         device.activeLiveStream.transferProtocol = transfer.transferProtocol;
         device.activeLiveStream.transferProtocolVersion = transfer.transferProtocolVersion;
         device.activeLiveStream.handshake = transfer.handshake;
+        device.activeLiveStream.monitorIndex = device.latestLiveFrame.monitorIndex;
+        device.activeLiveStream.monitorCount = device.latestLiveFrame.monitorCount;
         device.counters.liveFramesReceived += 1;
         emitRemoteEvent('RemoteFrameReceived', device, {
             streamId,
@@ -3655,6 +3669,7 @@ export function createRemoteHub(options = {}) {
             const now = new Date().toISOString();
             const streamId = safeString(options.streamId, 128) || `live-${Date.now()}`;
             const fps = clampNumber(options.fps, 1, 24, 2);
+            const monitorIndex = normalizeMonitorIndex(options.monitorIndex ?? options.screenIndex ?? options.displayIndex);
             const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
             const transfer = buildRemoteFrameTransferDescriptor(options.mode || DEFAULT_REMOTE_FRAME_MODE);
             device.counters.commandsSent += 1;
@@ -3675,6 +3690,8 @@ export function createRemoteHub(options = {}) {
                 transferProtocolVersion: transfer.transferProtocolVersion,
                 handshake: transfer.handshake,
                 fps,
+                monitorIndex,
+                monitorCount: 1,
                 startedAt: now,
                 stoppedAt: '',
                 stopReason: '',
@@ -3687,6 +3704,7 @@ export function createRemoteHub(options = {}) {
                 commandId,
                 maxWidth: options.maxWidth,
                 maxHeight: options.maxHeight,
+                monitorIndex,
                 fps
             });
             emitRemoteEvent('RemoteLiveStreamStarted', device, {
@@ -3696,7 +3714,7 @@ export function createRemoteHub(options = {}) {
                 mode: transfer.mode,
                 synthetic: true
             });
-            return { ok: true, commandId, streamId, fps, mode: transfer.mode, frameMode: transfer.frameMode, synthetic: true };
+            return { ok: true, commandId, streamId, fps, mode: transfer.mode, frameMode: transfer.frameMode, monitorIndex, synthetic: true };
         }
 
         if (!device?.socket || device.socket.destroyed || !device.connected) {
@@ -3709,6 +3727,7 @@ export function createRemoteHub(options = {}) {
         const now = new Date().toISOString();
         const streamId = safeString(options.streamId, 128) || `live-${Date.now()}`;
         const fps = clampNumber(options.fps, 1, 24, 8);
+        const monitorIndex = normalizeMonitorIndex(options.monitorIndex ?? options.screenIndex ?? options.displayIndex);
         const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
         const transfer = buildRemoteFrameTransferDescriptor(options.mode || DEFAULT_REMOTE_FRAME_MODE);
         const result = sendCommand(deviceId, {
@@ -3729,6 +3748,7 @@ export function createRemoteHub(options = {}) {
                 maxWidth: clampNumber(options.maxWidth, 320, 2560, 640),
                 maxHeight: clampNumber(options.maxHeight, 180, 1440, 360),
                 quality: clampNumber(options.quality, 20, 95, 45),
+                monitorIndex,
                 requestedAt: now
             }
         });
@@ -3754,6 +3774,8 @@ export function createRemoteHub(options = {}) {
             transferProtocolVersion: transfer.transferProtocolVersion,
             handshake: transfer.handshake,
             fps,
+            monitorIndex,
+            monitorCount: 1,
             startedAt: now,
             stoppedAt: '',
             stopReason: '',
@@ -3767,10 +3789,11 @@ export function createRemoteHub(options = {}) {
             commandId,
             fps,
             mode: transfer.mode,
-            frameMode: transfer.frameMode
+            frameMode: transfer.frameMode,
+            monitorIndex
         });
 
-        return { ok: true, commandId, streamId, fps, mode: transfer.mode, frameMode: transfer.frameMode };
+        return { ok: true, commandId, streamId, fps, mode: transfer.mode, frameMode: transfer.frameMode, monitorIndex };
     }
 
     function stopLiveStream(deviceId, options = {}) {

package/hub/src/server.js

@@ -79,6 +79,24 @@ function clampNumber(value, min, max, fallback) {
   return Math.max(min, Math.min(max, Math.round(number)));
 }
 
+function normalizeMonitorIndex(value, fallback = 0) {
+  return clampNumber(value, 0, 63, fallback);
+}
+
+function normalizeMonitorSelections(value) {
+  const result = {};
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return result;
+  }
+  for (const [deviceId, monitorIndex] of Object.entries(value)) {
+    const id = String(deviceId || '').trim();
+    if (id) {
+      result[id] = normalizeMonitorIndex(monitorIndex);
+    }
+  }
+  return result;
+}
+
 function normalizeDeviceIds(value) {
   const raw = Array.isArray(value)
     ? value
@@ -140,6 +158,8 @@ function normalizeLiveOptions(payload = {}) {
     maxWidth: clampNumber(payload.maxWidth, 320, 2560, 640),
     maxHeight: clampNumber(payload.maxHeight, 180, 1440, 360),
     quality: clampNumber(payload.quality, 20, 95, 45),
+    monitorIndex: normalizeMonitorIndex(payload.monitorIndex ?? payload.screenIndex ?? payload.displayIndex),
+    monitorSelections: normalizeMonitorSelections(payload.monitorSelections),
     mode,
     frameMode: mode
   };
@@ -180,8 +200,12 @@ function updateFrameSubscription(ws, payload = {}) {
         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,
         streamId: `livedesk-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`
       });
       if (result?.ok) {

package/package.json

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