livedesk 0.1.366 → 0.1.368

package/hub/src/remote-hub.js

@@ -5139,59 +5139,6 @@ export function createRemoteHub(options = {}) {
             safeString(stream?.streamPurpose, 24).toLowerCase() === 'control') || null;
     }
 
-    function stopCompetingMacCaptureStreams(deviceId, device, nextStreamId, nextPurpose) {
-        if (normalizeLivePlatform(device?.platform) !== 'macos') {
-            return { ok: true, stopped: [] };
-        }
-
-        const activeControl = getActiveControlStream(device);
-        if (nextPurpose !== 'control'
-            && activeControl
-            && activeControl.streamId !== nextStreamId) {
-            return {
-                ok: true,
-                suppressed: true,
-                reason: 'CONTROL_CAPTURE_OWNS_DEVICE',
-                ownerStreamId: activeControl.streamId,
-                ownerCommandId: activeControl.commandId,
-                captureGeneration: Number(activeControl.captureGeneration || 0)
-            };
-        }
-
-        const stopped = [];
-        for (const stream of getActiveLiveStreams(device)) {
-            if (!stream?.streamId || stream.streamId === nextStreamId) {
-                continue;
-            }
-            const stopCommandId = crypto.randomUUID();
-            const result = sendCommand(deviceId, {
-                command: 'stream.stop',
-                commandId: stopCommandId,
-                payload: {
-                    streamId: stream.streamId,
-                    requestedAt: new Date().toISOString(),
-                    reason: `mac-capture-owner-transition:${nextPurpose}`
-                }
-            });
-            if (!result.ok) {
-                return {
-                    ok: false,
-                    error: 'CAPTURE_TRANSITION_IN_PROGRESS',
-                    streamId: stream.streamId,
-                    detail: result.error || 'stream-stop-dispatch-failed'
-                };
-            }
-            stream.active = false;
-            stream.pendingCommandId = '';
-            stream.pendingStartedAt = '';
-            stream.pendingRestartToken = '';
-            stream.stoppedAt = new Date().toISOString();
-            stream.stopReason = `mac-capture-owner-transition:${nextPurpose}`;
-            stopped.push({ streamId: stream.streamId, commandId: stopCommandId });
-        }
-        return { ok: true, stopped };
-    }
-
     function nextCaptureGeneration(device) {
         const current = Number(device?.captureGenerationCounter || 0);
         const next = Number.isSafeInteger(current) && current > 0 ? current + 1 : 1;
@@ -5208,18 +5155,17 @@ export function createRemoteHub(options = {}) {
     }
 
     function normalizeLiveStreamStartOptions(options = {}) {
-        const transfer = buildRemoteFrameTransferDescriptor(options.mode || options.frameMode || DEFAULT_REMOTE_FRAME_MODE);
-        const streamPurpose = safeString(options.streamPurpose || options.purpose || 'wall', 24) || 'wall';
-        const platform = normalizeLivePlatform(options.platform);
-        const macWallProfile = platform === 'macos' && streamPurpose !== 'control';
-        const maxFps = streamPurpose === 'control' ? 60 : macWallProfile ? 8 : 30;
-        const defaultFps = macWallProfile && options.fps === undefined ? 4 : 8;
-        const maxWidth = clampNumber(options.maxWidth, 320, macWallProfile ? 432 : 3840, macWallProfile ? 432 : 640);
-        const maxHeight = clampNumber(options.maxHeight, 180, macWallProfile ? 243 : 2160, macWallProfile ? 243 : 360);
-        const fps = clampNumber(options.fps, 1, maxFps, defaultFps);
-        const quality = clampNumber(options.quality, 20, 95, 45);
-        const monitorIndex = normalizeMonitorIndex(options.monitorIndex ?? options.screenIndex ?? options.displayIndex);
-        return { fps, maxWidth, maxHeight, quality, monitorIndex, transfer, streamPurpose, platform, macWallProfile };
+        const transfer = buildRemoteFrameTransferDescriptor(options.mode || options.frameMode || DEFAULT_REMOTE_FRAME_MODE);
+        const streamPurpose = safeString(options.streamPurpose || options.purpose || 'wall', 24) || 'wall';
+        const platform = normalizeLivePlatform(options.platform);
+        const maxFps = streamPurpose === 'control' ? 60 : 30;
+        const defaultFps = 8;
+        const maxWidth = clampNumber(options.maxWidth, 320, 3840, 640);
+        const maxHeight = clampNumber(options.maxHeight, 180, 2160, 360);
+        const fps = clampNumber(options.fps, 1, maxFps, defaultFps);
+        const quality = clampNumber(options.quality, 20, 95, 45);
+        const monitorIndex = normalizeMonitorIndex(options.monitorIndex ?? options.screenIndex ?? options.displayIndex);
+        return { fps, maxWidth, maxHeight, quality, monitorIndex, transfer, streamPurpose, platform };
     }
 
     function liveStreamStartStillPending(activeLiveStream) {
@@ -5374,30 +5320,6 @@ export function createRemoteHub(options = {}) {
         const { fps, maxWidth, maxHeight, quality, monitorIndex, transfer, streamPurpose } = normalized;
         const streamId = safeString(options.streamId, 128) || makeStableLiveStreamId(deviceId, streamPurpose);
         const activeLiveStream = getDeviceLiveStream(device, streamId);
-        const macTransition = stopCompetingMacCaptureStreams(deviceId, device, streamId, streamPurpose);
-        if (!macTransition.ok) {
-            return macTransition;
-        }
-        if (macTransition.suppressed) {
-            emitRemoteEvent('RemoteLiveStreamStartSuppressed', device, {
-                streamId,
-                streamPurpose,
-                reason: macTransition.reason,
-                ownerStreamId: macTransition.ownerStreamId,
-                ownerCommandId: macTransition.ownerCommandId,
-                captureGeneration: macTransition.captureGeneration
-            });
-            return {
-                ok: true,
-                suppressed: true,
-                streamId,
-                streamPurpose,
-                reason: macTransition.reason,
-                ownerStreamId: macTransition.ownerStreamId,
-                ownerCommandId: macTransition.ownerCommandId,
-                captureGeneration: macTransition.captureGeneration
-            };
-        }
         if (activeLiveStream?.pendingCommandId) {
             if (liveStreamReplacementStillPending(activeLiveStream)) {
                 emitRemoteEvent('RemoteLiveStreamRestartPending', device, {

package/hub/src/server.js

@@ -1756,10 +1756,13 @@ function buildRemoteFrameBinaryPacket(frameEvent, diagnostics = {}) {
     kind: frameEvent.kind || 'live',
     deviceId: frameEvent.deviceId || frame.deviceId || '',
     frameSeq: Number(frame.frameSeq || 0) || 0,
-    streamFrameSeq: Number(frame.streamFrameSeq || 0) || 0,
-    streamId: frame.streamId || '',
-    commandId: frame.commandId || '',
-    width: Number(frame.width || 0) || 0,
+    streamFrameSeq: Number(frame.streamFrameSeq || 0) || 0,
+    streamId: frame.streamId || '',
+    commandId: frame.commandId || '',
+    sessionId: frame.sessionId || '',
+    captureGeneration: Number(frame.captureGeneration || 0) || 0,
+    streamPurpose: frame.streamPurpose || '',
+    width: Number(frame.width || 0) || 0,
     height: Number(frame.height || 0) || 0,
     sourceWidth: Number(frame.sourceWidth || 0) || 0,
     sourceHeight: Number(frame.sourceHeight || 0) || 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.366",
+  "version": "0.1.368",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
@@ -48,10 +48,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.366",
-    "@livedesk/fast-osx-arm64": "0.1.366",
-    "@livedesk/fast-osx-x64": "0.1.366",
-    "@livedesk/fast-win-x64": "0.1.366"
+    "@livedesk/fast-linux-x64": "0.1.368",
+    "@livedesk/fast-osx-arm64": "0.1.368",
+    "@livedesk/fast-osx-x64": "0.1.368",
+    "@livedesk/fast-win-x64": "0.1.368"
   },
   "publishConfig": {
     "access": "public"