livedesk 0.1.125 → 0.1.126

package/hub/src/remote-hub.js

@@ -1339,7 +1339,9 @@ export function createRemoteHub(options = {}) {
     const inputSockets = new Map();
     const frameSockets = new Map();
     const allSockets = new Set();
+    const agentBinaryIngressLanes = [];
     const duplicateDeviceLogAt = new Map();
+    let agentBinaryIngressDraining = false;
     let server = null;
     let started = false;
     let boundPort = requestedPort;
@@ -3305,29 +3307,56 @@ export function createRemoteHub(options = {}) {
         state.binaryQueueDrops = Number(state.binaryQueueDrops || 0) + 1;
     }
 
-    function drainQueuedAgentBinaryFrames(socket, state) {
-        if (state.binaryQueueDraining || state.closed) {
+    function scheduleAgentBinaryIngress(socket, state) {
+        if (!state || state.closed || !socket || socket.destroyed) {
             return;
         }
-        state.binaryQueueDraining = true;
-        setImmediate(() => {
-            state.binaryQueueDraining = false;
-            if (state.closed || socket.destroyed) {
-                state.binaryQueue.length = 0;
-                return;
-            }
 
+        state.binaryQueueSocket = socket;
+        if (state.binaryQueueScheduled !== true) {
+            state.binaryQueueScheduled = true;
+            agentBinaryIngressLanes.push(state);
+        }
+        drainAgentBinaryIngressRoundRobin();
+    }
+
+    function drainAgentBinaryIngressRoundRobin() {
+        if (agentBinaryIngressDraining) {
+            return;
+        }
+        agentBinaryIngressDraining = true;
+        setImmediate(() => {
+            agentBinaryIngressDraining = false;
             let processed = 0;
-            while (state.binaryQueue.length > 0 && processed < AGENT_BINARY_INGRESS_DRAIN_BUDGET_PACKETS) {
+            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);
+                }
             }
 
-            if (state.binaryQueue.length > 0 && !state.closed && !socket.destroyed) {
-                drainQueuedAgentBinaryFrames(socket, state);
+            if (agentBinaryIngressLanes.length > 0) {
+                drainAgentBinaryIngressRoundRobin();
             }
         });
     }
@@ -3343,7 +3372,7 @@ export function createRemoteHub(options = {}) {
             dropQueuedAgentBinaryFrame(state);
         }
         state.binaryQueue.push({ header, payload });
-        drainQueuedAgentBinaryFrames(socket, state);
+        scheduleAgentBinaryIngress(socket, state);
     }
 
     function handleAgentMessage(socket, state, message) {
@@ -3489,6 +3518,8 @@ export function createRemoteHub(options = {}) {
             frameOnly: false,
             binaryQueue: [],
             binaryQueueDraining: false,
+            binaryQueueScheduled: false,
+            binaryQueueSocket: null,
             binaryQueueDrops: 0,
             closed: false
         };
@@ -3541,6 +3572,8 @@ export function createRemoteHub(options = {}) {
         const detach = reason => {
             state.closed = true;
             state.binaryQueue.length = 0;
+            state.binaryQueueScheduled = false;
+            state.binaryQueueSocket = null;
             allSockets.delete(socket);
             clearTimeout(helloTimer);
             detachInputSocket(socket, reason);
@@ -3640,6 +3673,8 @@ export function createRemoteHub(options = {}) {
             pendingBinaryFrame: null,
             binaryQueue: [],
             binaryQueueDraining: false,
+            binaryQueueScheduled: false,
+            binaryQueueSocket: null,
             binaryQueueDrops: 0,
             closed: false
         };
@@ -3770,6 +3805,8 @@ export function createRemoteHub(options = {}) {
         socket.on('close', () => {
             state.closed = true;
             state.binaryQueue.length = 0;
+            state.binaryQueueScheduled = false;
+            state.binaryQueueSocket = null;
             allSockets.delete(socket);
             clearTimeout(helloTimer);
             detachInputSocket(socket);
@@ -3779,6 +3816,8 @@ export function createRemoteHub(options = {}) {
         socket.on('error', err => {
             state.closed = true;
             state.binaryQueue.length = 0;
+            state.binaryQueueScheduled = false;
+            state.binaryQueueSocket = null;
             allSockets.delete(socket);
             clearTimeout(helloTimer);
             detachInputSocket(socket, err?.message || 'socket-error');

package/hub/src/server.js

@@ -23,7 +23,7 @@ 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', 16 * 1024 * 1024);
 const frameClientQueuePackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_QUEUE_PACKETS', 12);
-const frameClientDrainBudgetPackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_DRAIN_BUDGET_PACKETS', 96);
+const frameClientDrainBudgetPackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_DRAIN_BUDGET_PACKETS', 8);
 const frameClients = new Set();
 const frameClientsByDeviceId = new Map();
 const frameWildcardClients = new Set();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.125",
+  "version": "0.1.126",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {