livedesk 0.1.141 → 0.1.143

package/hub/src/remote-hub.js

@@ -124,7 +124,7 @@ const DEFAULT_PUBLIC_IP_TIMEOUT_MS = 1800;
 const DUPLICATE_DEVICE_ACTIVE_REJECT_MS = 15000;
 const DUPLICATE_DEVICE_LOG_THROTTLE_MS = 60000;
 const DUPLICATE_DEVICE_RETRY_AFTER_MS = 30000;
-const AGENT_BINARY_INGRESS_QUEUE_PACKETS = 18;
+const AGENT_BINARY_INGRESS_QUEUE_PACKETS = 64;
 const AGENT_BINARY_INGRESS_DRAIN_BUDGET_PACKETS = 64;
 const SYNTHETIC_FRAME_DATA_URL = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAABCAYAAAD0In+KAAAADElEQVR42mP8z8AAAAMBAQDJ/pLvAAAAAElFTkSuQmCC';
 const SYNTHETIC_FRAME_PAYLOAD = Buffer.from(SYNTHETIC_FRAME_DATA_URL.split(',')[1], 'base64');
@@ -1348,9 +1348,7 @@ export function createRemoteHub(options = {}) {
     const audioSockets = new Map();
     const fileSockets = new Map();
     const allSockets = new Set();
-    const agentBinaryIngressLanes = [];
     const duplicateDeviceLogAt = new Map();
-    let agentBinaryIngressDraining = false;
     let server = null;
     let started = false;
     let boundPort = requestedPort;
@@ -3239,6 +3237,7 @@ export function createRemoteHub(options = {}) {
         device.latestLiveFrame = {
             streamId,
             frameSeq,
+            streamFrameSeq: Number.isFinite(Number(message.streamFrameSeq)) ? Number(message.streamFrameSeq) : frameSeq,
             commandId,
             width: Number.isFinite(Number(message.width)) ? Number(message.width) : 0,
             height: Number.isFinite(Number(message.height)) ? Number(message.height) : 0,
@@ -3266,6 +3265,7 @@ export function createRemoteHub(options = {}) {
             agentSendDurationFrameSeq: Number.isFinite(Number(message.agentSendDurationFrameSeq)) ? Number(message.agentSendDurationFrameSeq) : 0,
             agentPaceMs: Number.isFinite(Number(message.agentPaceMs)) ? Number(message.agentPaceMs) : 0,
             droppedByAgent: Number.isFinite(Number(message.droppedByAgent)) ? Number(message.droppedByAgent) : 0,
+            hubIngressDropped: Number.isFinite(Number(message.hubIngressDropped)) ? Number(message.hubIngressDropped) : 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),
@@ -3429,7 +3429,10 @@ export function createRemoteHub(options = {}) {
         }
 
         if (frameKind === 'stream' || frameKind === 'live' || header.type === 'stream.binary') {
-            applyLiveFrame(device, header, framePayload, 'binary');
+            applyLiveFrame(device, {
+                ...header,
+                hubIngressDropped: Number(state.binaryQueueDrops || 0)
+            }, framePayload, 'binary');
             return;
         }
 
@@ -3467,52 +3470,36 @@ export function createRemoteHub(options = {}) {
         }
 
         state.binaryQueueSocket = socket;
-        if (state.binaryQueueScheduled !== true) {
-            state.binaryQueueScheduled = true;
-            agentBinaryIngressLanes.push(state);
+        if (state.binaryQueueScheduled === true) {
+            return;
         }
-        drainAgentBinaryIngressRoundRobin();
+        state.binaryQueueScheduled = true;
+        setImmediate(() => drainAgentBinaryIngressLane(state));
     }
 
-    function drainAgentBinaryIngressRoundRobin() {
-        if (agentBinaryIngressDraining) {
+    function drainAgentBinaryIngressLane(state) {
+        state.binaryQueueScheduled = false;
+        const socket = state.binaryQueueSocket;
+        if (state.closed || !socket || socket.destroyed) {
+            if (Array.isArray(state.binaryQueue)) {
+                state.binaryQueue.length = 0;
+            }
             return;
         }
-        agentBinaryIngressDraining = true;
-        setImmediate(() => {
-            agentBinaryIngressDraining = false;
-            let processed = 0;
-            while (agentBinaryIngressLanes.length > 0 && processed < AGENT_BINARY_INGRESS_DRAIN_BUDGET_PACKETS) {
-                const state = agentBinaryIngressLanes.shift();
-                if (!state) {
-                    continue;
-                }
-
-                state.binaryQueueScheduled = false;
-                const socket = state.binaryQueueSocket;
-                if (state.closed || !socket || socket.destroyed) {
-                    if (Array.isArray(state.binaryQueue)) {
-                        state.binaryQueue.length = 0;
-                    }
-                    continue;
-                }
 
-                const item = state.binaryQueue.shift();
-                if (item) {
-                    handleAgentBinaryFrame(socket, state, item.header, item.payload);
-                    processed += 1;
-                }
-
-                if (state.binaryQueue.length > 0 && !state.closed && !socket.destroyed) {
-                    state.binaryQueueScheduled = true;
-                    agentBinaryIngressLanes.push(state);
-                }
+        let processed = 0;
+        while (state.binaryQueue.length > 0 && processed < AGENT_BINARY_INGRESS_DRAIN_BUDGET_PACKETS) {
+            const item = state.binaryQueue.shift();
+            if (!item) {
+                continue;
             }
+            handleAgentBinaryFrame(socket, state, item.header, item.payload);
+            processed += 1;
+        }
 
-            if (agentBinaryIngressLanes.length > 0) {
-                drainAgentBinaryIngressRoundRobin();
-            }
-        });
+        if (state.binaryQueue.length > 0 && !state.closed && !socket.destroyed) {
+            scheduleAgentBinaryIngress(socket, state);
+        }
     }
 
     function enqueueAgentBinaryFrame(socket, state, header, payload) {

package/hub/src/server.js

@@ -21,7 +21,7 @@ const packageInfo = JSON.parse(readFileSync(resolve(__dirname, '..', 'package.js
 const httpHost = process.env.LIVEDESK_HUB_HTTP_HOST || '127.0.0.1';
 const httpPort = Number(process.env.LIVEDESK_HUB_HTTP_PORT || process.env.PORT || 5179);
 const frameBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_BACKPRESSURE_BYTES', 16 * 1024 * 1024);
-const frameClientQueuePackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_QUEUE_PACKETS', 12);
+const frameClientQueuePackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_QUEUE_PACKETS', 64);
 const frameClientDrainBudgetPackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_DRAIN_BUDGET_PACKETS', 8);
 const frameClients = new Set();
 const frameClientsByDeviceId = new Map();
@@ -572,6 +572,10 @@ function enqueueFramePacketForClient(ws, packet, meta) {
   }
   if (ws.bufferedAmount > frameBackpressureBytes) {
     ws.liveDeskFrameBackpressured = true;
+    lane.dropped += 1;
+    if (meta.isH264 && meta.deviceId) {
+      lane.awaitingKeyFrames.add(meta.deviceId);
+    }
     ws.liveDeskFrameBackpressureDrops = Number(ws.liveDeskFrameBackpressureDrops || 0) + 1;
     return false;
   }
@@ -709,7 +713,7 @@ function updateAudioSubscription(ws, payload = {}) {
   });
 }
 
-function buildRemoteFrameBinaryPacket(frameEvent) {
+function buildRemoteFrameBinaryPacket(frameEvent, diagnostics = {}) {
   const payload = frameEvent?.payload;
   if (!Buffer.isBuffer(payload) || payload.length === 0) {
     return null;
@@ -722,6 +726,7 @@ function buildRemoteFrameBinaryPacket(frameEvent) {
     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,
@@ -749,6 +754,8 @@ function buildRemoteFrameBinaryPacket(frameEvent) {
     agentSendDurationFrameSeq: Number(frame.agentSendDurationFrameSeq || 0) || 0,
     agentPaceMs: Number(frame.agentPaceMs || 0) || 0,
     droppedByAgent: Number(frame.droppedByAgent || 0) || 0,
+    hubIngressDropped: Number(frame.hubIngressDropped || 0) || 0,
+    hubClientDropped: Number(diagnostics.hubClientDropped || 0) || 0,
     hardwareEncoder: frame.hardwareEncoder || '',
     platformProfile: frame.platformProfile || '',
     fps: Number(frame.fps || 0) || 0,
@@ -810,19 +817,24 @@ function broadcastRemoteBinaryFrame(frameEvent) {
   const isH264 = String(frame.codec || frame.mimeType || frame.format || '').toLowerCase().includes('h264')
     || String(frame.frameMode || frame.mode || '').toLowerCase() === 'mode3-h264-hw';
   const isKeyFrame = frame.isKeyFrame === true || String(frame.chunkType || '').toLowerCase() === 'key';
-  const packet = buildRemoteFrameBinaryPacket(frameEvent);
-  if (!packet) {
-    return;
-  }
   const frameSeq = Number(frame.frameSeq || 0) || 0;
   for (const client of targetClients) {
     if (client.readyState !== client.OPEN) {
       continue;
     }
+    const lane = ensureFrameClientSendLane(client);
     if (client.liveDeskFrameBackpressured && isH264 && !isKeyFrame) {
+      lane.dropped += 1;
+      lane.awaitingKeyFrames.add(deviceId);
       client.liveDeskFrameBackpressureDrops = Number(client.liveDeskFrameBackpressureDrops || 0) + 1;
       continue;
     }
+    const packet = buildRemoteFrameBinaryPacket(frameEvent, {
+      hubClientDropped: lane.dropped
+    });
+    if (!packet) {
+      continue;
+    }
     enqueueFramePacketForClient(client, packet, { deviceId, frameSeq, isH264, isKeyFrame });
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.141",
+  "version": "0.1.143",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {
@@ -30,7 +30,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@livedesk/client": "0.1.96",
+    "@livedesk/client": "0.1.97",
     "cors": "^2.8.5",
     "express": "^4.21.2",
     "path-to-regexp": "0.1.13",