livedesk 0.1.118 → 0.1.120

package/hub/src/remote-hub.js

@@ -122,6 +122,8 @@ 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_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');
 const SYNTHETIC_FRAME_HASH = crypto.createHash('sha256').update(SYNTHETIC_FRAME_PAYLOAD).digest('hex').slice(0, 16);
@@ -3178,6 +3180,64 @@ export function createRemoteHub(options = {}) {
         });
     }
 
+    function dropQueuedAgentBinaryFrame(state) {
+        if (!Array.isArray(state.binaryQueue) || state.binaryQueue.length === 0) {
+            return;
+        }
+        const deltaIndex = state.binaryQueue.findIndex(item => {
+            const header = item?.header || {};
+            const frameKind = safeString(header.frameKind || header.kind || header.frameType || '', 40).toLowerCase();
+            const chunkType = safeString(header.chunkType, 20).toLowerCase();
+            return (frameKind === 'stream' || frameKind === 'live' || header.type === 'stream.binary')
+                && header.isKeyFrame !== true
+                && chunkType !== 'key';
+        });
+        const index = deltaIndex >= 0 ? deltaIndex : 0;
+        state.binaryQueue.splice(index, 1);
+        state.binaryQueueDrops = Number(state.binaryQueueDrops || 0) + 1;
+    }
+
+    function drainQueuedAgentBinaryFrames(socket, state) {
+        if (state.binaryQueueDraining || state.closed) {
+            return;
+        }
+        state.binaryQueueDraining = true;
+        setImmediate(() => {
+            state.binaryQueueDraining = false;
+            if (state.closed || socket.destroyed) {
+                state.binaryQueue.length = 0;
+                return;
+            }
+
+            let processed = 0;
+            while (state.binaryQueue.length > 0 && processed < AGENT_BINARY_INGRESS_DRAIN_BUDGET_PACKETS) {
+                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) {
+                drainQueuedAgentBinaryFrames(socket, state);
+            }
+        });
+    }
+
+    function enqueueAgentBinaryFrame(socket, state, header, payload) {
+        if (state.closed || socket.destroyed) {
+            return;
+        }
+        if (!Array.isArray(state.binaryQueue)) {
+            state.binaryQueue = [];
+        }
+        while (state.binaryQueue.length >= AGENT_BINARY_INGRESS_QUEUE_PACKETS) {
+            dropQueuedAgentBinaryFrame(state);
+        }
+        state.binaryQueue.push({ header, payload });
+        drainQueuedAgentBinaryFrames(socket, state);
+    }
+
     function handleAgentMessage(socket, state, message) {
         if (!message || typeof message !== 'object') {
             return;
@@ -3318,7 +3378,11 @@ export function createRemoteHub(options = {}) {
             authenticated: false,
             device: null,
             inputOnly: false,
-            frameOnly: false
+            frameOnly: false,
+            binaryQueue: [],
+            binaryQueueDraining: false,
+            binaryQueueDrops: 0,
+            closed: false
         };
 
         const helloTimer = setTimeout(() => {
@@ -3359,7 +3423,7 @@ export function createRemoteHub(options = {}) {
                     return;
                 }
 
-                handleAgentBinaryFrame(socket, state, packet.header, packet.payload);
+                enqueueAgentBinaryFrame(socket, state, packet.header, packet.payload);
             } catch (err) {
                 writeJsonLine(socket, { type: 'error', error: 'invalid-websocket-binary-frame' });
                 logWarn('remote', `invalid websocket binary frame: ${err?.message || err}`);
@@ -3367,6 +3431,8 @@ export function createRemoteHub(options = {}) {
         };
 
         const detach = reason => {
+            state.closed = true;
+            state.binaryQueue.length = 0;
             allSockets.delete(socket);
             clearTimeout(helloTimer);
             detachInputSocket(socket, reason);
@@ -3461,8 +3527,13 @@ export function createRemoteHub(options = {}) {
             authenticated: false,
             device: null,
             inputOnly: false,
+            frameOnly: false,
             buffer: Buffer.alloc(0),
-            pendingBinaryFrame: null
+            pendingBinaryFrame: null,
+            binaryQueue: [],
+            binaryQueueDraining: false,
+            binaryQueueDrops: 0,
+            closed: false
         };
 
         const helloTimer = setTimeout(() => {
@@ -3488,7 +3559,7 @@ export function createRemoteHub(options = {}) {
                     const framePayload = state.buffer.subarray(0, byteLength);
                     state.buffer = state.buffer.subarray(byteLength);
                     state.pendingBinaryFrame = null;
-                    handleAgentBinaryFrame(socket, state, header, framePayload);
+                    enqueueAgentBinaryFrame(socket, state, header, framePayload);
                     continue;
                 }
 
@@ -3539,15 +3610,21 @@ export function createRemoteHub(options = {}) {
         }
 
         socket.on('close', () => {
+            state.closed = true;
+            state.binaryQueue.length = 0;
             allSockets.delete(socket);
             clearTimeout(helloTimer);
             detachInputSocket(socket);
+            detachFrameSocket(socket);
             detachSocket(socket);
         });
         socket.on('error', err => {
+            state.closed = true;
+            state.binaryQueue.length = 0;
             allSockets.delete(socket);
             clearTimeout(helloTimer);
             detachInputSocket(socket, err?.message || 'socket-error');
+            detachFrameSocket(socket, err?.message || 'socket-error');
             detachSocket(socket, err?.message || 'socket-error');
         });
     }

package/hub/src/server.js

@@ -21,9 +21,9 @@ const webIndexPath = resolve(webDistPath, 'index.html');
 const packageInfo = JSON.parse(readFileSync(resolve(__dirname, '..', 'package.json'), 'utf8'));
 const httpHost = process.env.LIVEDESK_HUB_HTTP_HOST || '0.0.0.0';
 const httpPort = Number(process.env.LIVEDESK_HUB_HTTP_PORT || process.env.PORT || 5179);
-const frameBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_BACKPRESSURE_BYTES', 512 * 1024);
-const frameClientQueuePackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_QUEUE_PACKETS', 3);
-const frameClientDrainBudgetPackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_DRAIN_BUDGET_PACKETS', 2);
+const frameBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_BACKPRESSURE_BYTES', 16 * 1024 * 1024);
+const frameClientQueuePackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_QUEUE_PACKETS', 12);
+const frameClientDrainBudgetPackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_DRAIN_BUDGET_PACKETS', 96);
 const frameClients = new Set();
 const frameClientsByDeviceId = new Map();
 const frameWildcardClients = new Set();
@@ -484,6 +484,8 @@ function buildRemoteFrameBinaryPacket(frameEvent) {
     commandId: frame.commandId || '',
     width: Number(frame.width || 0) || 0,
     height: Number(frame.height || 0) || 0,
+    sourceWidth: Number(frame.sourceWidth || 0) || 0,
+    sourceHeight: Number(frame.sourceHeight || 0) || 0,
     mimeType: frameEvent.mimeType || frame.mimeType || frame.format || 'image/jpeg',
     mode: frame.mode || '',
     frameMode: frame.frameMode || frame.mode || '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.118",
+  "version": "0.1.120",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {
@@ -30,7 +30,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@livedesk/client": "0.1.82",
+    "@livedesk/client": "0.1.84",
     "cors": "^2.8.5",
     "express": "^4.21.2",
     "ws": "^8.18.3"