@livedesk/hub 0.1.33 → 0.1.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/hub",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "description": "LiveDesk local Hub API and browser frame bridge",
   "type": "module",
   "main": "src/server.js",

package/src/remote-hub.js

@@ -47,7 +47,7 @@ const RECENT_TASK_LIMIT = 12;
 const RECENT_TASK_BATCH_LIMIT = 16;
 const RECENT_FRAME_CACHE_TTL_MS = 4000;
 const RECENT_THUMBNAIL_FRAME_CACHE_LIMIT = 2;
-const RECENT_LIVE_FRAME_CACHE_LIMIT = 1;
+const RECENT_LIVE_FRAME_CACHE_LIMIT = 2;
 const RECENT_THUMBNAIL_FRAME_CACHE_MAX_BYTES = 2 * 1024 * 1024;
 const RECENT_LIVE_FRAME_CACHE_MAX_BYTES = 8 * 1024 * 1024;
 const LIVE_STREAM_PENDING_REUSE_MS = 5000;
@@ -1478,7 +1478,7 @@ function getRecentFrameCacheMaxBytes(frameKind) {
         : RECENT_LIVE_FRAME_CACHE_MAX_BYTES;
 }
 
-function pruneRecentFrameCache(cache, frameKind, nowMs = Date.now()) {
+export function pruneRecentFrameCache(cache, frameKind, nowMs = Date.now()) {
     if (!Array.isArray(cache)) {
         return;
     }
@@ -1499,6 +1499,20 @@ function pruneRecentFrameCache(cache, frameKind, nowMs = Date.now()) {
         }
     }
 
+    if (frameKind !== 'thumbnail' && cache.length > 1) {
+        // Keep the newest frame plus the newest independently decodable key
+        // frame. A browser can subscribe after capture has already started;
+        // retaining only the latest 30 fps delta makes that browser wait for a
+        // future GOP even though the Hub accepted a current key frame moments
+        // earlier. Exact stream-owner matching below prevents stale replay.
+        const latest = cache[0];
+        const keyFrame = cache.find(entry =>
+            entry !== latest
+            && (entry?.frame?.isKeyFrame === true
+                || safeString(entry?.frame?.chunkType, 20).toLowerCase() === 'key'));
+        cache.splice(0, cache.length, ...[latest, keyFrame].filter(Boolean));
+    }
+
     for (let index = 0; index < cache.length; index += 1) {
         const entry = cache[index];
         const byteLength = Number(entry?.byteLength || entry?.frame?.payload?.length || 0) || 0;
@@ -1510,7 +1524,7 @@ function pruneRecentFrameCache(cache, frameKind, nowMs = Date.now()) {
     }
 }
 
-function rememberRecentFramePayload(device, frameKind, frame) {
+export function rememberRecentFramePayload(device, frameKind, frame) {
     if (!device || !frame || !Buffer.isBuffer(frame.payload)) {
         return;
     }
@@ -1546,7 +1560,7 @@ function rememberRecentFramePayload(device, frameKind, frame) {
     pruneRecentFrameCache(cache, kind, nowMs);
 }
 
-function isFramePayloadRequestMatch(frame, options = {}) {
+export function isFramePayloadRequestMatch(frame, options = {}) {
     if (!frame || !Buffer.isBuffer(frame.payload)) {
         return false;
     }
@@ -1565,10 +1579,37 @@ function isFramePayloadRequestMatch(frame, options = {}) {
         return false;
     }
 
+    if (options.requireKeyFrame === true
+        && frame.isKeyFrame !== true
+        && safeString(frame.chunkType, 20).toLowerCase() !== 'key') {
+        return false;
+    }
+
+    for (const key of ['streamId', 'sessionId', 'commandId', 'streamPurpose']) {
+        const expected = safeString(options[key], 160);
+        if (expected && safeString(frame[key], 160) !== expected) {
+            return false;
+        }
+    }
+
+    const requestedCaptureGeneration = Number(options.captureGeneration);
+    if (Number.isFinite(requestedCaptureGeneration)
+        && requestedCaptureGeneration > 0
+        && Number(frame.captureGeneration || 0) !== requestedCaptureGeneration) {
+        return false;
+    }
+
+    const requestedMonitorIndex = Number(options.monitorIndex);
+    if (Number.isFinite(requestedMonitorIndex)
+        && requestedMonitorIndex >= 0
+        && Number(frame.monitorIndex ?? -1) !== requestedMonitorIndex) {
+        return false;
+    }
+
     return true;
 }
 
-function findRecentFramePayload(device, frameKind, options = {}) {
+export function findRecentFramePayload(device, frameKind, options = {}) {
     const kind = frameKind === 'thumbnail' ? 'thumbnail' : 'live';
     const latest = kind === 'thumbnail'
         ? device?.latestThumbnail
@@ -1579,7 +1620,14 @@ function findRecentFramePayload(device, frameKind, options = {}) {
 
     const token = safeString(options.token, 128);
     const requestedSeq = Number(options.frameSeq);
-    if (!token && !Number.isFinite(requestedSeq)) {
+    const ownerQuery = options.requireKeyFrame === true
+        || ['streamId', 'sessionId', 'commandId', 'streamPurpose']
+            .some(key => safeString(options[key], 160))
+        || (Number.isFinite(Number(options.captureGeneration))
+            && Number(options.captureGeneration) > 0)
+        || (Number.isFinite(Number(options.monitorIndex))
+            && Number(options.monitorIndex) >= 0);
+    if (!token && !Number.isFinite(requestedSeq) && !ownerQuery) {
         return null;
     }
 

package/src/server.js

@@ -2738,6 +2738,11 @@ function replaceExpectedFrameBindingForClient(ws, deviceId, expectedBinding = nu
     && bindingIdentity === frameLaneBindingIdentity(currentExpectedBinding)) {
     expectedBinding.readySent = currentExpectedBinding?.readySent === true
       || expectedBinding.readySent === true;
+    expectedBinding.replayedKeyFrameSeq = Math.max(
+      0,
+      Number(currentExpectedBinding?.replayedKeyFrameSeq || 0),
+      Number(expectedBinding.replayedKeyFrameSeq || 0)
+    );
     ws.liveDeskExpectedStreamBindingsByDeviceId.set(normalizedDeviceId, expectedBinding);
     if (!lane.bindingEpochsByDeviceId.has(normalizedDeviceId)) {
       lane.bindingEpochsByDeviceId.set(normalizedDeviceId, 1);
@@ -2776,6 +2781,50 @@ function replaceExpectedFrameBindingForClient(ws, deviceId, expectedBinding = nu
   return bindingIdentity;
 }
 
+function replayExpectedBindingKeyFrame(ws, expectedBinding) {
+  if (!ws || ws.readyState !== ws.OPEN || !expectedBinding) {
+    return false;
+  }
+  const deviceId = String(expectedBinding.deviceId || '').trim();
+  const currentBinding = ws.liveDeskExpectedStreamBindingsByDeviceId instanceof Map
+    ? ws.liveDeskExpectedStreamBindingsByDeviceId.get(deviceId)
+    : null;
+  const bindingIdentity = frameLaneBindingIdentity(expectedBinding);
+  if (!deviceId
+    || !bindingIdentity
+    || bindingIdentity !== frameLaneBindingIdentity(currentBinding)) {
+    return false;
+  }
+  const cached = remoteHub.getFramePayload(deviceId, 'live', {
+    requireKeyFrame: true,
+    streamId: expectedBinding.streamId,
+    sessionId: expectedBinding.sessionId,
+    commandId: expectedBinding.commandId,
+    captureGeneration: expectedBinding.captureGeneration,
+    streamPurpose: expectedBinding.streamPurpose,
+    monitorIndex: expectedBinding.monitorIndex
+  });
+  const frameSeq = Number(cached?.frame?.frameSeq || 0);
+  if (!cached
+    || cached.frame?.isKeyFrame !== true
+    || !Number.isSafeInteger(frameSeq)
+    || frameSeq <= 0
+    || Number(currentBinding?.replayedKeyFrameSeq || 0) === frameSeq) {
+    return false;
+  }
+  currentBinding.replayedKeyFrameSeq = frameSeq;
+  broadcastRemoteBinaryFrame({
+    kind: 'live',
+    deviceId,
+    frame: cached.frame,
+    payload: cached.payload,
+    mimeType: cached.mimeType,
+    byteLength: cached.byteLength,
+    replayedForBinding: true
+  });
+  return true;
+}
+
 function dropQueuedFrameAtForLane(lane, dropIndex) {
   const droppedBefore = lane.dropped;
   const droppedItem = removeFrameLaneQueueItem(lane, dropIndex);
@@ -3269,6 +3318,7 @@ function startFrameSubscriptionLive(
         continue;
       }
       cancelPendingFrameStreamStop(deviceId, result.streamId, String(liveOptions.streamPurpose || 'wall'));
+      const replayedKeyFrame = replayExpectedBindingKeyFrame(ws, expectedBinding);
       started.push({
         deviceId: expectedBinding.deviceId,
         sessionId: expectedBinding.sessionId,
@@ -3277,7 +3327,8 @@ function startFrameSubscriptionLive(
         commandId: expectedBinding.commandId,
         captureGeneration: expectedBinding.captureGeneration,
         monitorIndex: expectedBinding.monitorIndex,
-        ready: reusedFrameReady,
+        ready: expectedBinding.readySent === true,
+        replayedKeyFrame,
         fps: result.fps,
         reused: result.reused === true
       });