livedesk 0.1.142 → 0.1.144

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 = 64;
+const AGENT_BINARY_INGRESS_QUEUE_PACKETS = 256;
 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;
@@ -3314,16 +3312,6 @@ export function createRemoteHub(options = {}) {
         device.activeLiveStream.monitorIndex = device.latestLiveFrame.monitorIndex;
         device.activeLiveStream.monitorCount = device.latestLiveFrame.monitorCount;
         device.counters.liveFramesReceived += 1;
-        emitRemoteEvent('RemoteFrameReceived', device, {
-            streamId,
-            frameSeq,
-            width: device.latestLiveFrame.width,
-            height: device.latestLiveFrame.height,
-            mode: device.latestLiveFrame.mode,
-            transport,
-            contentHash,
-            sameContentStreak
-        });
         return true;
     }
 
@@ -3391,13 +3379,6 @@ export function createRemoteHub(options = {}) {
             mimeType,
             byteLength
         });
-        emitRemoteEvent('RemoteAudioFrameReceived', device, {
-            streamId,
-            frameSeq,
-            mimeType,
-            byteLength,
-            transport
-        });
         return true;
     }
 
@@ -3472,52 +3453,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

@@ -20,9 +20,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 || '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', 64);
-const frameClientDrainBudgetPackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_DRAIN_BUDGET_PACKETS', 8);
+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 frameClients = new Set();
 const frameClientsByDeviceId = new Map();
 const frameWildcardClients = new Set();

package/package.json

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