livedesk 0.1.169 → 0.1.170

package/hub/src/remote-hub.js

@@ -150,6 +150,7 @@ 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 = 256;
+const MODE5_AGENT_BINARY_INGRESS_QUEUE_PACKETS = 2;
 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');
@@ -3132,6 +3133,8 @@ export function createRemoteHub(options = {}) {
             compressMs: readFrameStageMs(message, 'compressMs'),
             deltaTileSize: Number.isFinite(Number(message.deltaTileSize)) ? Number(message.deltaTileSize) : 0,
             deltaTileCount: Number.isFinite(Number(message.deltaTileCount)) ? Number(message.deltaTileCount) : 0,
+            deltaVisualTileCount: Number.isFinite(Number(message.deltaVisualTileCount)) ? Number(message.deltaVisualTileCount) : 0,
+            deltaRefreshTileCount: Number.isFinite(Number(message.deltaRefreshTileCount)) ? Number(message.deltaRefreshTileCount) : 0,
             deltaTotalTiles: Number.isFinite(Number(message.deltaTotalTiles)) ? Number(message.deltaTotalTiles) : 0,
             sameContentStreak,
             payload,
@@ -3330,6 +3333,8 @@ export function createRemoteHub(options = {}) {
             compressMs: readFrameStageMs(message, 'compressMs'),
             deltaTileSize: Number.isFinite(Number(message.deltaTileSize)) ? Number(message.deltaTileSize) : 0,
             deltaTileCount: Number.isFinite(Number(message.deltaTileCount)) ? Number(message.deltaTileCount) : 0,
+            deltaVisualTileCount: Number.isFinite(Number(message.deltaVisualTileCount)) ? Number(message.deltaVisualTileCount) : 0,
+            deltaRefreshTileCount: Number.isFinite(Number(message.deltaRefreshTileCount)) ? Number(message.deltaRefreshTileCount) : 0,
             deltaTotalTiles: Number.isFinite(Number(message.deltaTotalTiles)) ? Number(message.deltaTotalTiles) : 0,
             sameContentStreak,
             payload,
@@ -3500,6 +3505,23 @@ export function createRemoteHub(options = {}) {
         state.binaryQueueDrops = Number(state.binaryQueueDrops || 0) + 1;
     }
 
+    function isMode5BinaryHeader(header) {
+        const mode = safeString(header?.frameMode || header?.mode, 40).toLowerCase();
+        return mode === 'mode5-lzo-delta';
+    }
+
+    function dropQueuedMode5AgentBinaryFrame(state, header) {
+        const streamId = safeString(header?.streamId, 160);
+        const dropIndex = state.binaryQueue.findIndex(item => isMode5BinaryHeader(item?.header)
+            && (!streamId || safeString(item?.header?.streamId, 160) === streamId));
+        if (dropIndex < 0) {
+            return false;
+        }
+        state.binaryQueue.splice(dropIndex, 1);
+        state.binaryQueueDrops = Number(state.binaryQueueDrops || 0) + 1;
+        return true;
+    }
+
     function scheduleAgentBinaryIngress(socket, state) {
         if (!state || state.closed || !socket || socket.destroyed) {
             return;
@@ -3545,6 +3567,17 @@ export function createRemoteHub(options = {}) {
         if (!Array.isArray(state.binaryQueue)) {
             state.binaryQueue = [];
         }
+        if (isMode5BinaryHeader(header)) {
+            const streamId = safeString(header?.streamId, 160);
+            let queuedMode5Packets = state.binaryQueue.filter(item => isMode5BinaryHeader(item?.header)
+                && (!streamId || safeString(item?.header?.streamId, 160) === streamId)).length;
+            while (queuedMode5Packets >= MODE5_AGENT_BINARY_INGRESS_QUEUE_PACKETS) {
+                if (!dropQueuedMode5AgentBinaryFrame(state, header)) {
+                    break;
+                }
+                queuedMode5Packets -= 1;
+            }
+        }
         while (state.binaryQueue.length >= AGENT_BINARY_INGRESS_QUEUE_PACKETS) {
             dropQueuedAgentBinaryFrame(state);
         }

package/hub/src/server.js

@@ -24,6 +24,8 @@ const httpPort = Number(process.env.LIVEDESK_HUB_HTTP_PORT || process.env.PORT |
 const frameBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_BACKPRESSURE_BYTES', 64 * 1024 * 1024);
 const frameClientQueuePackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_QUEUE_PACKETS', 256);
 const frameClientDrainBudgetPackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_DRAIN_BUDGET_PACKETS', 64);
+const mode5FrameBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_MODE5_WS_BACKPRESSURE_BYTES', 2 * 1024 * 1024);
+const mode5FrameQueuePackets = readPositiveIntegerEnv('LIVEDESK_MODE5_WS_QUEUE_PACKETS', 2);
 const frameClients = new Set();
 const frameClientsByDeviceId = new Map();
 const frameWildcardClients = new Set();
@@ -538,6 +540,16 @@ function dropQueuedFrameForLane(lane) {
   }
 }
 
+function dropQueuedMode5FrameForLane(lane, deviceId) {
+  const dropIndex = lane.queue.findIndex(item => item?.isMode5 && item.deviceId === deviceId);
+  if (dropIndex < 0) {
+    return false;
+  }
+  lane.queue.splice(dropIndex, 1);
+  lane.dropped += 1;
+  return true;
+}
+
 function drainFrameClientSendLane(ws) {
   const lane = ws.liveDeskFrameSendLane;
   if (!lane || lane.draining) {
@@ -584,7 +596,8 @@ function enqueueFramePacketForClient(ws, packet, meta) {
     ws.liveDeskFrameBackpressureDrops = Number(ws.liveDeskFrameBackpressureDrops || 0) + 1;
     return false;
   }
-  if (ws.bufferedAmount > frameBackpressureBytes) {
+  const backpressureBytes = meta.isMode5 ? mode5FrameBackpressureBytes : frameBackpressureBytes;
+  if (ws.bufferedAmount > backpressureBytes) {
     ws.liveDeskFrameBackpressured = true;
     lane.dropped += 1;
     if (meta.isH264 && meta.deviceId) {
@@ -593,6 +606,16 @@ function enqueueFramePacketForClient(ws, packet, meta) {
     ws.liveDeskFrameBackpressureDrops = Number(ws.liveDeskFrameBackpressureDrops || 0) + 1;
     return false;
   }
+  if (meta.isMode5) {
+    let queuedMode5Packets = lane.queue.filter(item => item?.isMode5 && item.deviceId === meta.deviceId).length;
+    while (queuedMode5Packets >= mode5FrameQueuePackets) {
+      if (!dropQueuedMode5FrameForLane(lane, meta.deviceId)) {
+        break;
+      }
+      queuedMode5Packets -= 1;
+      ws.liveDeskFrameBackpressureDrops = Number(ws.liveDeskFrameBackpressureDrops || 0) + 1;
+    }
+  }
   while (lane.queue.length >= frameClientQueuePackets) {
     dropQueuedFrameForLane(lane);
     ws.liveDeskFrameBackpressureDrops = Number(ws.liveDeskFrameBackpressureDrops || 0) + 1;
@@ -602,6 +625,7 @@ function enqueueFramePacketForClient(ws, packet, meta) {
     deviceId: meta.deviceId,
     frameSeq: meta.frameSeq,
     isH264: meta.isH264,
+    isMode5: meta.isMode5,
     isKeyFrame: meta.isKeyFrame
   });
   drainFrameClientSendLane(ws);
@@ -795,6 +819,8 @@ function buildRemoteFrameBinaryPacket(frameEvent, diagnostics = {}) {
     compressMs: Number(frame.compressMs || 0) || 0,
     deltaTileSize: Number(frame.deltaTileSize || 0) || 0,
     deltaTileCount: Number(frame.deltaTileCount || 0) || 0,
+    deltaVisualTileCount: Number(frame.deltaVisualTileCount || 0) || 0,
+    deltaRefreshTileCount: Number(frame.deltaRefreshTileCount || 0) || 0,
     deltaTotalTiles: Number(frame.deltaTotalTiles || 0) || 0,
     sameContentStreak: Number(frame.sameContentStreak || 0) || 0,
     layoutVersion: Number(frame.layoutVersion || 0) || 0,
@@ -854,6 +880,7 @@ function broadcastRemoteBinaryFrame(frameEvent) {
   const frame = frameEvent.frame || {};
   const isH264 = String(frame.codec || frame.mimeType || frame.format || '').toLowerCase().includes('h264')
     || String(frame.frameMode || frame.mode || '').toLowerCase() === 'mode3-h264-hw';
+  const isMode5 = String(frame.frameMode || frame.mode || '').toLowerCase() === 'mode5-lzo-delta';
   const isKeyFrame = frame.isKeyFrame === true || String(frame.chunkType || '').toLowerCase() === 'key';
   const frameSeq = Number(frame.frameSeq || 0) || 0;
   for (const client of targetClients) {
@@ -879,7 +906,7 @@ function broadcastRemoteBinaryFrame(frameEvent) {
     if (!packet) {
       continue;
     }
-    enqueueFramePacketForClient(client, packet, { deviceId, frameSeq, isH264, isKeyFrame });
+    enqueueFramePacketForClient(client, packet, { deviceId, frameSeq, isH264, isMode5, isKeyFrame });
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.169",
+  "version": "0.1.170",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
-    "@livedesk/client": "0.1.109",
+    "@livedesk/client": "0.1.110",
     "cors": "^2.8.5",
     "express": "^4.21.2",
     "ffmpeg-static": "^5.3.0",