livedesk 0.1.431 → 0.1.433

package/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.189",
+  "version": "0.1.191",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -41,10 +41,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.396",
-    "@livedesk/fast-osx-arm64": "0.1.396",
-    "@livedesk/fast-osx-x64": "0.1.396",
-    "@livedesk/fast-win-x64": "0.1.396"
+    "@livedesk/fast-linux-x64": "0.1.398",
+    "@livedesk/fast-osx-arm64": "0.1.398",
+    "@livedesk/fast-osx-x64": "0.1.398",
+    "@livedesk/fast-win-x64": "0.1.398"
   },
   "publishConfig": {
     "access": "public"

package/client/src/runtime/client-runtime-server.js

@@ -49,7 +49,20 @@ function normalizeAccountAvatarUrl(value) {
   }
 }
 
+function readAccessTokenProfile(accessToken) {
+  const token = normalizeString(accessToken, 8192);
+  const payloadSegment = token.split('.')[1] || '';
+  if (!payloadSegment) return {};
+  try {
+    const payload = JSON.parse(Buffer.from(payloadSegment, 'base64url').toString('utf8'));
+    return payload && typeof payload === 'object' ? payload : {};
+  } catch {
+    return {};
+  }
+}
+
 function readClientAccountProfile(sessionOrUser) {
+  const tokenProfile = readAccessTokenProfile(sessionOrUser?.access_token);
   const user = sessionOrUser?.user && typeof sessionOrUser.user === 'object'
     ? sessionOrUser.user
     : sessionOrUser && typeof sessionOrUser === 'object'
@@ -58,12 +71,19 @@ function readClientAccountProfile(sessionOrUser) {
   const metadata = user.user_metadata && typeof user.user_metadata === 'object'
     ? user.user_metadata
     : {};
-  const email = normalizeString(user.email, 320);
+  const tokenMetadata = tokenProfile.user_metadata && typeof tokenProfile.user_metadata === 'object'
+    ? tokenProfile.user_metadata
+    : {};
+  const email = normalizeString(user.email || tokenProfile.email, 320);
   const name = normalizeString(
     metadata.full_name
       || metadata.name
       || metadata.preferred_username
+      || tokenMetadata.full_name
+      || tokenMetadata.name
+      || tokenMetadata.preferred_username
       || user.name
+      || tokenProfile.name
       || email
       || user.id,
     160
@@ -71,6 +91,8 @@ function readClientAccountProfile(sessionOrUser) {
   const avatarUrl = normalizeAccountAvatarUrl(
     metadata.avatar_url
       || metadata.picture
+      || tokenMetadata.avatar_url
+      || tokenMetadata.picture
       || user.avatar_url
       || user.picture
   );
@@ -79,7 +101,11 @@ function readClientAccountProfile(sessionOrUser) {
 
 function mergeClientAccountProfile(session, sourceUser) {
   const profile = readClientAccountProfile(sourceUser);
+  const existingUserMetadata = session?.user?.user_metadata && typeof session.user.user_metadata === 'object'
+    ? session.user.user_metadata
+    : {};
   const userMetadata = {
+    ...existingUserMetadata,
     ...(profile.name ? { full_name: profile.name } : {}),
     ...(profile.avatarUrl ? { avatar_url: profile.avatarUrl } : {})
   };
@@ -1275,7 +1301,11 @@ export function createClientRuntimeServer(options = {}) {
           setImmediate(() => {
             void (async () => {
               try {
-                const normalizedSession = mergeClientAccountProfile(saved.session, savedSession?.user);
+                // Older persisted sessions kept only id/email on `user`, while
+                // Supabase still carries Google name/avatar claims in the
+                // access-token payload. Recover those display-only claims
+                // locally before any best-effort network hydration.
+                const normalizedSession = mergeClientAccountProfile(saved.session, savedSession);
                 const hydratedSession = await hydrateClientAccountProfile(normalizedSession);
                 if (!writeSavedSession(hydratedSession)) throw new Error('refresh-token-required');
                 state.auth.persisted = true;

package/hub/src/remote-hub.js

@@ -685,7 +685,9 @@ function normalizeRemoteInputEvent(value = {}) {
     const captureGeneration = Number(input.captureGeneration ?? input.CaptureGeneration);
     return {
         type,
-        monitorIndex: Number.isFinite(monitorIndex) ? normalizeMonitorIndex(monitorIndex) : 0,
+        // A missing monitor is not equivalent to the primary display. Control
+        // input must prove the exact monitor owned by its capture generation.
+        monitorIndex: Number.isFinite(monitorIndex) ? normalizeMonitorIndex(monitorIndex) : null,
         normalizedX: Number.isFinite(normalizedX) ? Math.max(0, Math.min(1, normalizedX)) : undefined,
         normalizedY: Number.isFinite(normalizedY) ? Math.max(0, Math.min(1, normalizedY)) : undefined,
         button: safeString(input.button || input.Button, 24),
@@ -2144,9 +2146,12 @@ export function createRemoteHub(options = {}) {
             byteLength: frame.byteLength
         });
         streamState.latestFrame = frame;
-        streamState.lastFrameAt = frame.receivedAt;
-        streamState.lastFrameSeq = frame.frameSeq;
-        streamState.framesReceived = (streamState.framesReceived || 0) + 1;
+        streamState.lastFrameAt = frame.receivedAt;
+        streamState.lastFrameSeq = frame.frameSeq;
+        streamState.framesReceived = (streamState.framesReceived || 0) + 1;
+        // A synthetic PNG is a complete independently decodable surface and
+        // therefore key-frame equivalent for Control readiness.
+        streamState.readyFrameReceived = true;
         device.lastSeenAt = frame.receivedAt;
         device.counters.liveFramesReceived += 1;
         emitRemoteEvent('RemoteFrameReceived', device, {
@@ -3329,6 +3334,20 @@ export function createRemoteHub(options = {}) {
         return {
             deviceId: device.deviceId,
             commandId: safeString(message.commandId || message.CommandId || pending?.commandId, 128),
+            hubConnectionId: safeString(
+                message.hubConnectionId
+                || message.HubConnectionId
+                || result.hubConnectionId
+                || result.HubConnectionId
+                || pending?.hubConnectionId,
+                128),
+            inputEventId: safeString(
+                message.inputEventId
+                || message.InputEventId
+                || result.inputEventId
+                || result.InputEventId
+                || pending?.inputEventId,
+                128),
             inputSeq,
             inputType: safeString(
                 message.inputType
@@ -3337,6 +3356,13 @@ export function createRemoteHub(options = {}) {
                 || result.InputType
                 || pending?.inputType,
                 48),
+            monitorIndex: Number(
+                message.monitorIndex
+                ?? message.MonitorIndex
+                ?? result.monitorIndex
+                ?? result.MonitorIndex
+                ?? pending?.monitorIndex
+                ?? 0) || 0,
             issuedAtEpochMs: Number(
                 message.issuedAtEpochMs
                 ?? message.IssuedAtEpochMs
@@ -3602,13 +3628,35 @@ export function createRemoteHub(options = {}) {
             : 0;
     }
 
-    function readFrameStageMs(message, property) {
-        const value = Number(message?.[property]);
-        return Number.isFinite(value) && value >= 0
-            ? Math.round(value)
-            : 0;
-    }
-
+    function readFrameStageMs(message, property) {
+        const value = Number(message?.[property]);
+        return Number.isFinite(value) && value >= 0
+            ? Math.round(value)
+            : 0;
+    }
+
+    function readOptionalFrameStageMs(message, property) {
+        const rawValue = message?.[property];
+        if (rawValue === undefined || rawValue === null || rawValue === '') {
+            return undefined;
+        }
+        const value = Number(rawValue);
+        return Number.isFinite(value) && value >= 0
+            ? Math.round(value)
+            : undefined;
+    }
+
+    function hasFrameCaptureTiming(message) {
+        if (message?.captureTimingAvailable === false) {
+            return false;
+        }
+        if (message?.captureTimingAvailable === true) {
+            return true;
+        }
+        return ['captureP95Ms', 'captureAverageMs', 'captureStageMs']
+            .some(property => readOptionalFrameStageMs(message, property) !== undefined);
+    }
+
     function computeSameContentStreak(previousFrame, contentHash) {
         if (!contentHash || !previousFrame?.contentHash || previousFrame.contentHash !== contentHash) {
             return 0;
@@ -3682,7 +3730,7 @@ export function createRemoteHub(options = {}) {
             byteLength,
             transport,
             contentHash,
-            captureMs: readFrameCaptureMs(message),
+            captureMs: readFrameCaptureMs(message),
             captureStageMs: readFrameStageMs(message, 'captureStageMs'),
             convertMs: readFrameStageMs(message, 'convertMs'),
             compressMs: readFrameStageMs(message, 'compressMs'),
@@ -3774,6 +3822,7 @@ export function createRemoteHub(options = {}) {
             lastFrameAt: '',
             lastFrameSeq: 0,
             framesReceived: 0,
+            readyFrameReceived: false,
             latestFrame: null,
             stoppedAt: '',
             stopReason: ''
@@ -3991,6 +4040,8 @@ export function createRemoteHub(options = {}) {
             && (activeCaptureGeneration <= 0
                 || (frameCaptureGeneration > 0
                     && frameCaptureGeneration === activeCaptureGeneration));
+        const readyFrameReceivedBeforeFrame = streamState.readyFrameReceived === true;
+        const captureTimingAvailable = hasFrameCaptureTiming(message);
         device.latestLiveFrame = {
             streamId,
             frameSeq,
@@ -4037,10 +4088,11 @@ export function createRemoteHub(options = {}) {
             transferProtocolVersion: transfer.transferProtocolVersion,
             handshake: transfer.handshake,
             fps: Number.isFinite(Number(message.fps)) ? Number(message.fps) : streamState.fps,
-            requestedFps: Number.isFinite(Number(message.requestedFps)) ? Number(message.requestedFps) : Number(streamState.fps || 0),
-            effectiveFps: Number.isFinite(Number(message.effectiveFps)) ? Number(message.effectiveFps) : Number(message.fps || streamState.fps || 0),
-            captureAverageMs: readFrameStageMs(message, 'captureAverageMs'),
-            captureP95Ms: readFrameStageMs(message, 'captureP95Ms'),
+            requestedFps: Number.isFinite(Number(message.requestedFps)) ? Number(message.requestedFps) : Number(streamState.fps || 0),
+            effectiveFps: Number.isFinite(Number(message.effectiveFps)) ? Number(message.effectiveFps) : Number(message.fps || streamState.fps || 0),
+            captureTimingAvailable,
+            captureAverageMs: captureTimingAvailable ? readOptionalFrameStageMs(message, 'captureAverageMs') : undefined,
+            captureP95Ms: captureTimingAvailable ? readOptionalFrameStageMs(message, 'captureP95Ms') : undefined,
             slowFrameCount: Number.isFinite(Number(message.slowFrameCount)) ? Number(message.slowFrameCount) : 0,
             captureHelperRestarts: Number.isFinite(Number(message.captureHelperRestarts)) ? Number(message.captureHelperRestarts) : 0,
             capturedAt,
@@ -4048,8 +4100,8 @@ export function createRemoteHub(options = {}) {
             byteLength,
             transport,
             contentHash,
-            captureMs: readFrameCaptureMs(message),
-            captureStageMs: readFrameStageMs(message, 'captureStageMs'),
+            captureMs: captureTimingAvailable ? readOptionalFrameStageMs(message, 'captureMs') : undefined,
+            captureStageMs: captureTimingAvailable ? readOptionalFrameStageMs(message, 'captureStageMs') : undefined,
             convertMs: readFrameStageMs(message, 'convertMs'),
             compressMs: readFrameStageMs(message, 'compressMs'),
             captureSourceSerial: Number.isFinite(Number(message.captureSourceSerial)) ? Number(message.captureSourceSerial) : 0,
@@ -4073,9 +4125,12 @@ export function createRemoteHub(options = {}) {
             mimeType: device.latestLiveFrame.mimeType,
             byteLength: device.latestLiveFrame.byteLength
         });
-        streamState.lastFrameAt = device.lastSeenAt;
-        streamState.lastFrameSeq = frameSeq;
-        streamState.framesReceived = (streamState.framesReceived || 0) + 1;
+        streamState.lastFrameAt = device.lastSeenAt;
+        streamState.lastFrameSeq = frameSeq;
+        streamState.framesReceived = (streamState.framesReceived || 0) + 1;
+        streamState.readyFrameReceived = readyFrameReceivedBeforeFrame
+            || (currentGenerationVerified
+                && liveFrameSatisfiesReadiness(streamState, device.latestLiveFrame));
         streamState.mode = transfer.mode;
         streamState.frameMode = transfer.frameMode;
         streamState.frameProfile = transfer.frameProfile;
@@ -4093,7 +4148,9 @@ export function createRemoteHub(options = {}) {
         streamState.monitorCount = device.latestLiveFrame.monitorCount;
         ensureDeviceLiveStreams(device).set(streamId, streamState);
         device.counters.liveFramesReceived += 1;
-        if (streamState.framesReceived === 1 && liveStreamHasCurrentFrame(streamState)) {
+        if (!readyFrameReceivedBeforeFrame
+            && streamState.readyFrameReceived === true
+            && liveStreamHasCurrentFrame(streamState)) {
             emitRemoteEvent('RemoteLiveStreamReady', device, {
                 streamId,
                 commandId: streamState.commandId,
@@ -4493,23 +4550,12 @@ export function createRemoteHub(options = {}) {
 
         if (state.inputOnly) {
             device.inputLastSeenAt = new Date().toISOString();
-            if (message.type === 'input.applied') {
+            if (message.type === 'input.applied' || message.type === 'input.error') {
                 handleRemoteInputOutcome(device, {
                     ...message,
                     agentApplyMs: Number(message.agentApplyMs || 0) || 0
                 }, 'input');
             }
-            if (message.type === 'input.error') {
-                const pending = takePendingInputFallback(
-                    device,
-                    message.commandId || message.CommandId,
-                    message.inputSeq ?? message.InputSeq);
-                emitEvent('RemoteInputError', {
-                    ...buildRemoteInputOutcome(device, message, pending),
-                    error: safeString(message.error || message.Error, 600) || 'remote-input-failed',
-                    failedAtEpochMs: Number(message.failedAtEpochMs ?? message.FailedAtEpochMs ?? 0) || 0
-                });
-            }
             return;
         }
         if (state.frameOnly) {
@@ -5292,6 +5338,15 @@ export function createRemoteHub(options = {}) {
                 activeCaptureGeneration: Number(controlStream.captureGeneration || 0)
             };
         }
+        const activeMonitorIndex = normalizeMonitorIndex(controlStream.monitorIndex);
+        if (!Number.isInteger(normalized.monitorIndex)
+            || normalized.monitorIndex !== activeMonitorIndex) {
+            return {
+                ok: false,
+                error: 'STALE_CONTROL_MONITOR',
+                activeMonitorIndex
+            };
+        }
 
         const inputSocket = device.inputSocket;
         if (inputSocket && !inputSocket.destroyed) {
@@ -5311,7 +5366,8 @@ export function createRemoteHub(options = {}) {
                     inputSocket: true,
                     sessionId: device.sessionId,
                     commandId: controlStream.commandId,
-                    captureGeneration: controlStream.captureGeneration
+                    captureGeneration: controlStream.captureGeneration,
+                    monitorIndex: activeMonitorIndex
                 };
             }
 
@@ -5332,6 +5388,9 @@ export function createRemoteHub(options = {}) {
                 commandId: fallback.commandId,
                 inputSeq: normalized.inputSeq,
                 inputType: normalized.type,
+                monitorIndex: normalized.monitorIndex,
+                hubConnectionId: normalized.hubConnectionId,
+                inputEventId: normalized.inputEventId,
                 issuedAtEpochMs: normalized.issuedAtEpochMs,
                 hubReceivedAtEpochMs: normalized.hubReceivedAtEpochMs,
                 hubForwardedAtEpochMs,
@@ -5348,6 +5407,7 @@ export function createRemoteHub(options = {}) {
                 deliveryCommandId: fallback.commandId,
                 commandId: controlStream.commandId,
                 captureGeneration: controlStream.captureGeneration,
+                monitorIndex: activeMonitorIndex,
                 inputSeq: normalized.inputSeq
             }
             : {
@@ -5855,12 +5915,31 @@ export function createRemoteHub(options = {}) {
         return Number.isFinite(startedAt) && Date.now() - startedAt < LIVE_STREAM_REPLACEMENT_PENDING_MS;
     }
 
+    function liveStreamRequiresReadyKeyFrame(activeLiveStream) {
+        if (safeString(activeLiveStream?.streamPurpose, 24).toLowerCase() !== 'control') {
+            return false;
+        }
+        const codec = safeString(activeLiveStream?.codec, 80).toLowerCase();
+        const mode = safeString(activeLiveStream?.frameMode || activeLiveStream?.mode, 80).toLowerCase();
+        return codec.includes('h264') || mode === 'mode3-h264-hw';
+    }
+
+    function liveFrameSatisfiesReadiness(activeLiveStream, frame) {
+        return !liveStreamRequiresReadyKeyFrame(activeLiveStream)
+            || frame?.isKeyFrame === true
+            || safeString(frame?.chunkType, 20).toLowerCase() === 'key';
+    }
+
     function liveStreamHasCurrentFrame(activeLiveStream) {
         if (!activeLiveStream?.active
             || activeLiveStream.open !== true
             || Number(activeLiveStream.framesReceived || 0) < 1) {
             return false;
         }
+        if (liveStreamRequiresReadyKeyFrame(activeLiveStream)
+            && activeLiveStream.readyFrameReceived !== true) {
+            return false;
+        }
         const latestFrame = activeLiveStream.latestFrame;
         if (!latestFrame || latestFrame.currentGenerationVerified !== true) {
             return false;
@@ -5984,6 +6063,7 @@ export function createRemoteHub(options = {}) {
                 lastFrameAt: '',
                 lastFrameSeq: 0,
                 framesReceived: 0,
+                readyFrameReceived: false,
                 streamPurpose,
                 captureGeneration
             });
@@ -6201,8 +6281,9 @@ export function createRemoteHub(options = {}) {
             stoppedAt: '',
             stopReason: '',
             lastFrameAt: '',
-            lastFrameSeq: 0,
+            lastFrameSeq: 0,
             framesReceived: 0,
+            readyFrameReceived: false,
             streamPurpose,
             captureGeneration,
             latestFrame: null,

package/hub/src/server.js

@@ -170,19 +170,27 @@ function readPositiveIntegerEnv(name, fallback) {
 function handleRemoteHubEvent(type, event) {
   liveDeskUpdateManager?.handleRemoteEvent(type, event);
   hubTransferJobs?.handleRemoteEvent(type, event);
-  if (type === 'RemoteInputApplied') {
-    for (const ws of inputClients) {
-      sendJson(ws, {
-        type: 'RemoteInputApplied',
-        ...event
+  if (type === 'RemoteInputApplied') {
+    const targetConnectionId = String(event?.hubConnectionId || '').trim();
+    for (const ws of inputClients) {
+      if (targetConnectionId && ws.liveDeskInputClientId !== targetConnectionId) {
+        continue;
+      }
+      sendJson(ws, {
+        type: 'RemoteInputApplied',
+        ...event
       });
     }
     return;
-  }
+  }
   if (type === 'RemoteInputError') {
-    for (const ws of inputClients) {
-      sendJson(ws, {
-        type: 'RemoteInputError',
+    const targetConnectionId = String(event?.hubConnectionId || '').trim();
+    for (const ws of inputClients) {
+      if (targetConnectionId && ws.liveDeskInputClientId !== targetConnectionId) {
+        continue;
+      }
+      sendJson(ws, {
+        type: 'RemoteInputError',
         ...event
       });
     }
@@ -2045,8 +2053,13 @@ function buildRemoteFrameBinaryPacket(frameEvent, diagnostics = {}) {
     fps: Number(frame.fps || 0) || 0,
     requestedFps: Number(frame.requestedFps || 0) || 0,
     effectiveFps: Number(frame.effectiveFps || 0) || 0,
-    captureAverageMs: Number(frame.captureAverageMs || 0) || 0,
-    captureP95Ms: Number(frame.captureP95Ms || 0) || 0,
+    captureTimingAvailable: frame.captureTimingAvailable === true,
+    captureAverageMs: frame.captureTimingAvailable === true && Number.isFinite(Number(frame.captureAverageMs))
+      ? Number(frame.captureAverageMs)
+      : null,
+    captureP95Ms: frame.captureTimingAvailable === true && Number.isFinite(Number(frame.captureP95Ms))
+      ? Number(frame.captureP95Ms)
+      : null,
     slowFrameCount: Number(frame.slowFrameCount || 0) || 0,
     captureHelperRestarts: Number(frame.captureHelperRestarts || 0) || 0,
     capturedAt: frame.capturedAt || '',
@@ -2055,8 +2068,12 @@ function buildRemoteFrameBinaryPacket(frameEvent, diagnostics = {}) {
     hubPacketEpochMs,
     byteLength: Number(frameEvent.byteLength || payload.length) || payload.length,
     contentHash: frame.contentHash || '',
-    captureMs: Number(frame.captureMs || 0) || 0,
-    captureStageMs: Number(frame.captureStageMs || 0) || 0,
+    captureMs: frame.captureTimingAvailable === true && Number.isFinite(Number(frame.captureMs))
+      ? Number(frame.captureMs)
+      : null,
+    captureStageMs: frame.captureTimingAvailable === true && Number.isFinite(Number(frame.captureStageMs))
+      ? Number(frame.captureStageMs)
+      : null,
     convertMs: Number(frame.convertMs || 0) || 0,
     compressMs: Number(frame.compressMs || 0) || 0,
     captureSourceSerial: Number(frame.captureSourceSerial || 0) || 0,
@@ -2157,7 +2174,8 @@ function broadcastRemoteBinaryFrame(frameEvent) {
       || Number(frame.monitorIndex || 0) !== expectedBinding.monitorIndex) {
       continue;
     }
-    if (!expectedBinding.readySent) {
+    const requiresReadyKeyFrame = String(expectedBinding.streamPurpose || '').toLowerCase() === 'control' && isH264;
+    if (!expectedBinding.readySent && (!requiresReadyKeyFrame || isKeyFrame)) {
       expectedBinding.readySent = sendJson(client, {
         type: 'RemoteFrameStreamReady',
         deviceId,
@@ -4214,11 +4232,14 @@ inputWss.on('connection', ws => {
     if (fireAndForget && result?.ok) {
       return;
     }
-    sendJson(ws, {
-      type: result?.ok ? 'RemoteInputQueued' : 'RemoteInputError',
-      requestId: payload?.requestId || '',
-      deviceId,
-      result,
+    sendJson(ws, {
+      type: result?.ok ? 'RemoteInputQueued' : 'RemoteInputError',
+      requestId: payload?.requestId || '',
+      deviceId,
+      inputSeq: Number(input?.inputSeq || 0) || 0,
+      inputEventId: String(input?.inputEventId || ''),
+      hubConnectionId: ws.liveDeskInputClientId,
+      result,
       timestamp: new Date().toISOString()
     });
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "livedesk",
-  "version": "0.1.431",
-  "livedeskClientVersion": "0.1.189",
+  "version": "0.1.433",
+  "livedeskClientVersion": "0.1.191",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
@@ -50,10 +50,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.396",
-    "@livedesk/fast-osx-arm64": "0.1.396",
-    "@livedesk/fast-osx-x64": "0.1.396",
-    "@livedesk/fast-win-x64": "0.1.396"
+    "@livedesk/fast-linux-x64": "0.1.398",
+    "@livedesk/fast-osx-arm64": "0.1.398",
+    "@livedesk/fast-osx-x64": "0.1.398",
+    "@livedesk/fast-win-x64": "0.1.398"
   },
   "publishConfig": {
     "access": "public"