livedesk 0.1.379 → 0.1.381

package/hub/src/server.js

@@ -59,14 +59,14 @@ const runtimeManager = createHubRuntime({
   runtimePid: process.pid
 });
 runtimeManager.emit('runtime.started', { role: runtimeRole, pid: process.pid });
-const frameBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_BACKPRESSURE_BYTES', 64 * 1024 * 1024);
+const frameBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_BACKPRESSURE_BYTES', 8 * 1024 * 1024);
 const frameClientQueuePackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_QUEUE_PACKETS', 4);
 const controlFrameClientQueuePackets = readPositiveIntegerEnv('LIVEDESK_CONTROL_FRAME_WS_QUEUE_PACKETS', 2);
-const frameClientDrainBudgetPackets = readPositiveIntegerEnv('LIVEDESK_FRAME_WS_DRAIN_BUDGET_PACKETS', 64);
-const frameStreamStopGraceMs = readPositiveIntegerEnv('LIVEDESK_FRAME_STREAM_STOP_GRACE_MS', 1500);
-const mode5FrameBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_MODE5_WS_BACKPRESSURE_BYTES', 2 * 1024 * 1024);
-const mode5FrameQueuePackets = readPositiveIntegerEnv('LIVEDESK_MODE5_WS_QUEUE_PACKETS', 2);
-const audioBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_AUDIO_WS_BACKPRESSURE_BYTES', 96 * 1024);
+const frameStreamStopGraceMs = readPositiveIntegerEnv('LIVEDESK_FRAME_STREAM_STOP_GRACE_MS', 1500);
+const mode5FrameBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_MODE5_WS_BACKPRESSURE_BYTES', 2 * 1024 * 1024);
+const mode5FrameQueuePackets = readPositiveIntegerEnv('LIVEDESK_MODE5_WS_QUEUE_PACKETS', 2);
+const audioBackpressureBytes = readPositiveIntegerEnv('LIVEDESK_AUDIO_WS_BACKPRESSURE_BYTES', 96 * 1024);
+const webSocketHeartbeatMs = readPositiveIntegerEnv('LIVEDESK_BROWSER_WS_HEARTBEAT_MS', 15_000);
 const frameClients = new Set();
 const frameClientsByDeviceId = new Map();
 const frameWildcardClients = new Set();
@@ -1064,10 +1064,38 @@ const hubSharedFolders = createHubSharedFolders({
 
 const app = express();
 const httpServer = createServer(app);
-const frameWss = new WebSocketServer({ noServer: true, perMessageDeflate: false });
-const atlasWss = new WebSocketServer({ noServer: true, perMessageDeflate: false });
-const inputWss = new WebSocketServer({ noServer: true, perMessageDeflate: false });
-const audioWss = new WebSocketServer({ noServer: true, perMessageDeflate: false });
+const frameWss = new WebSocketServer({ noServer: true, perMessageDeflate: false });
+const atlasWss = new WebSocketServer({ noServer: true, perMessageDeflate: false });
+const inputWss = new WebSocketServer({ noServer: true, perMessageDeflate: false });
+const audioWss = new WebSocketServer({ noServer: true, perMessageDeflate: false });
+const browserWebSocketServers = [frameWss, atlasWss, inputWss, audioWss];
+
+for (const wss of browserWebSocketServers) {
+  wss.on('connection', ws => {
+    ws.liveDeskHeartbeatAlive = true;
+    ws.on('pong', () => {
+      ws.liveDeskHeartbeatAlive = true;
+    });
+  });
+}
+
+const browserWebSocketHeartbeatTimer = setInterval(() => {
+  for (const wss of browserWebSocketServers) {
+    for (const ws of wss.clients) {
+      if (ws.liveDeskHeartbeatAlive === false) {
+        ws.terminate();
+        continue;
+      }
+      ws.liveDeskHeartbeatAlive = false;
+      try {
+        ws.ping();
+      } catch {
+        ws.terminate();
+      }
+    }
+  }
+}, webSocketHeartbeatMs);
+browserWebSocketHeartbeatTimer.unref?.();
 
 function normalizeHostname(value) {
   return String(value || '').trim().toLowerCase().replace(/^\[|\]$/g, '');
@@ -1347,23 +1375,25 @@ function forgetWebSocketClient(ws) {
   }
 }
 
-function safeWebSocketSend(ws, payload, options = undefined) {
-  if (!ws || ws.readyState !== 1) {
-    return false;
-  }
-
-  try {
-    ws.send(payload, options, err => {
-      if (err) {
-        forgetWebSocketClient(ws);
-      }
-    });
-    return true;
-  } catch {
-    forgetWebSocketClient(ws);
-    return false;
-  }
-}
+function safeWebSocketSend(ws, payload, options = undefined, onComplete = undefined) {
+  if (!ws || ws.readyState !== 1) {
+    return false;
+  }
+
+  try {
+    ws.send(payload, options, err => {
+      if (err) {
+        forgetWebSocketClient(ws);
+      }
+      onComplete?.(err || null);
+    });
+    return true;
+  } catch (error) {
+    forgetWebSocketClient(ws);
+    onComplete?.(error);
+    return false;
+  }
+}
 
 function unregisterFrameClient(ws) {
   if (!ws) {
@@ -1383,7 +1413,12 @@ function unregisterFrameClient(ws) {
   }
   frameWildcardClients.delete(ws);
   ws.liveDeskExpectedStreamBindingsByDeviceId?.clear?.();
-  ws.liveDeskFrameSendLane?.queue?.splice?.(0);
+  const lane = ws.liveDeskFrameSendLane;
+  if (lane) {
+    clearTimeout(lane.retryTimer);
+    lane.retryTimer = null;
+    lane.queue.splice(0);
+  }
 }
 
 function hasOtherFrameStreamOwner(ws, deviceId, streamId, streamPurpose = '') {
@@ -1484,11 +1519,12 @@ function registerFrameClient(ws) {
 function ensureFrameClientSendLane(ws) {
   if (!ws.liveDeskFrameSendLane) {
     ws.liveDeskFrameSendLane = {
-      queue: [],
-      draining: false,
-      dropped: 0,
-      awaitingKeyFrames: new Set()
-    };
+      queue: [],
+      sending: false,
+      retryTimer: null,
+      dropped: 0,
+      awaitingKeyFrames: new Set()
+    };
   }
   return ws.liveDeskFrameSendLane;
 }
@@ -1536,39 +1572,48 @@ function dropQueuedMode5FrameForLane(lane, deviceId) {
   return true;
 }
 
-function drainFrameClientSendLane(ws) {
-  const lane = ws.liveDeskFrameSendLane;
-  if (!lane || lane.draining) {
-    return;
-  }
-  lane.draining = true;
-  setImmediate(() => {
-    lane.draining = false;
-    if (!ws || ws.readyState !== ws.OPEN) {
-      lane.queue.length = 0;
-      return;
-    }
-
-    let sent = 0;
-    while (lane.queue.length > 0 && sent < frameClientDrainBudgetPackets) {
-      if (ws.bufferedAmount > frameBackpressureBytes) {
-        ws.liveDeskFrameBackpressured = true;
-        break;
-      }
-      const item = lane.queue.shift();
-      if (!item) {
-        continue;
-      }
-      ws.liveDeskFrameBackpressured = false;
-      safeWebSocketSend(ws, item.packet, { binary: true });
-      sent += 1;
-    }
-
-    if (lane.queue.length > 0 && ws.readyState === ws.OPEN) {
-      drainFrameClientSendLane(ws);
-    }
-  });
-}
+function drainFrameClientSendLane(ws) {
+  const lane = ws.liveDeskFrameSendLane;
+  if (!lane || lane.sending) {
+    return;
+  }
+  clearTimeout(lane.retryTimer);
+  lane.retryTimer = null;
+  if (!ws || ws.readyState !== ws.OPEN) {
+    lane.queue.length = 0;
+    return;
+  }
+  const item = lane.queue[0];
+  if (!item) {
+    return;
+  }
+  const backpressureBytes = item.isMode5 ? mode5FrameBackpressureBytes : frameBackpressureBytes;
+  if (ws.bufferedAmount > backpressureBytes) {
+    ws.liveDeskFrameBackpressured = true;
+    lane.retryTimer = setTimeout(() => {
+      lane.retryTimer = null;
+      drainFrameClientSendLane(ws);
+    }, 10);
+    lane.retryTimer.unref?.();
+    return;
+  }
+
+  lane.queue.shift();
+  lane.sending = true;
+  ws.liveDeskFrameBackpressured = false;
+  const accepted = safeWebSocketSend(ws, item.packet, { binary: true }, error => {
+    lane.sending = false;
+    if (error || ws.readyState !== ws.OPEN) {
+      lane.queue.length = 0;
+      return;
+    }
+    drainFrameClientSendLane(ws);
+  });
+  if (!accepted) {
+    lane.sending = false;
+    lane.queue.length = 0;
+  }
+}
 
 function enqueueFramePacketForClient(ws, packet, meta) {
   if (!ws || ws.readyState !== ws.OPEN) {
@@ -2227,10 +2272,35 @@ function isCapabilityEnabled(device, key) {
   return /^(1|true|yes|on)$/i.test(String(value || '').trim());
 }
 
-app.get('/api/health', (_req, res) => {
-  noStore(res);
-  res.json({ ok: true, product: 'LiveDesk', timestamp: new Date().toISOString() });
-});
+app.get('/api/health', (_req, res) => {
+  noStore(res);
+  const memory = process.memoryUsage();
+  const webSockets = {
+    frame: frameWss.clients.size,
+    atlas: atlasWss.clients.size,
+    input: inputWss.clients.size,
+    audio: audioWss.clients.size
+  };
+  res.json({
+    ok: true,
+    product: 'LiveDesk',
+    timestamp: new Date().toISOString(),
+    memory: {
+      rssBytes: memory.rss,
+      heapUsedBytes: memory.heapUsed,
+      heapTotalBytes: memory.heapTotal,
+      externalBytes: memory.external,
+      arrayBuffersBytes: memory.arrayBuffers
+    },
+    webSockets: {
+      ...webSockets,
+      total: Object.values(webSockets).reduce((sum, count) => sum + count, 0),
+      bufferedBytes: [...browserWebSocketServers]
+        .flatMap(wss => [...wss.clients])
+        .reduce((sum, ws) => sum + Math.max(0, Number(ws.bufferedAmount || 0)), 0)
+    }
+  });
+});
 
 app.get('/api/settings', async (_req, res) => {
   noStore(res);
@@ -3972,6 +4042,7 @@ for (const signal of ['SIGINT', 'SIGTERM']) {
     if (roleWatchTimer) {
       clearInterval(roleWatchTimer);
     }
+    clearInterval(browserWebSocketHeartbeatTimer);
     liveDeskUpdateManager?.close();
     atlasPool.close();
     atlasClients.clear();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.379",
+  "version": "0.1.381",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
@@ -48,10 +48,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.373",
-    "@livedesk/fast-osx-arm64": "0.1.375",
-    "@livedesk/fast-osx-x64": "0.1.375",
-    "@livedesk/fast-win-x64": "0.1.373"
+    "@livedesk/fast-linux-x64": "0.1.373",
+    "@livedesk/fast-osx-arm64": "0.1.375",
+    "@livedesk/fast-osx-x64": "0.1.375",
+    "@livedesk/fast-win-x64": "0.1.373"
   },
   "publishConfig": {
     "access": "public"