@livedesk/hub 0.1.14 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/hub",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "LiveDesk local Hub API and browser frame bridge",
   "type": "module",
   "main": "src/server.js",

package/src/transport/relay-hub-control.js

@@ -21,6 +21,7 @@ const DEFAULT_MAX_PEER_QUEUE_BYTES = 1024 * 1024;
 const DEFAULT_MAX_PEER_QUEUE_MESSAGES = 64;
 const DEFAULT_RECONNECT_MIN_MS = 1_000;
 const DEFAULT_RECONNECT_MAX_MS = 30_000;
+const DEFAULT_CONNECT_TIMEOUT_MS = 5_000;
 
 function isEnabled(value, fallback = false) {
     if (value === undefined || value === null || value === '') return fallback;
@@ -429,6 +430,11 @@ export function createHubRelayControl({
         reconnectMinMs,
         5 * 60_000,
         DEFAULT_RECONNECT_MAX_MS);
+    const connectTimeoutMs = boundedInteger(
+        env.LIVEDESK_RELAY_CONNECT_TIMEOUT_MS,
+        250,
+        30_000,
+        DEFAULT_CONNECT_TIMEOUT_MS);
     const peers = new Map();
     const retiredPeerIds = new Map();
     const sendQueue = [];
@@ -449,6 +455,7 @@ export function createHubRelayControl({
     let connection = null;
     let connectionGeneration = 0;
     let reconnectTimer = null;
+    let connectAttemptTimer = null;
     let reconnectAttempt = 0;
     let receiveBuffer = Buffer.alloc(0);
     let queuedBytes = 0;
@@ -477,7 +484,8 @@ export function createHubRelayControl({
     function releaseQueuedItem(item) {
         queuedBytes = Math.max(0, queuedBytes - item.buffer.length);
         if (!item.peerId) return;
-        const stats = queueStats(item.peerId);
+        const stats = peerQueueStats.get(item.peerId);
+        if (!stats) return;
         stats.messages = Math.max(0, stats.messages - 1);
         stats.bytes = Math.max(0, stats.bytes - item.buffer.length);
     }
@@ -566,7 +574,7 @@ export function createHubRelayControl({
             roomId,
             peerId,
             reason: safeText(reason, 80) || 'relay-peer-closed'
-        }, peerId);
+        });
     }
 
     function closePeer(peerId, reason = 'relay-peer-closed', {
@@ -786,6 +794,24 @@ export function createHubRelayControl({
 
     function handleRelayEnvelope(message) {
         if (!message || typeof message !== 'object' || Array.isArray(message)) return;
+        if (message.type === 'relay.registered') {
+            if (message.protocol !== RELAY_CONTROL_PROTOCOL
+                || message.roomId !== roomId
+                || message.role !== 'hub'
+                || safeText(message.peerId, 64) !== ''
+                || state !== 'registering') {
+                lastError = 'relay-registration-invalid';
+                connection?.destroy();
+                return;
+            }
+            clearConnectAttemptTimer();
+            reconnectAttempt = 0;
+            lastConnectedAt = new Date().toISOString();
+            lastError = '';
+            transition('registered');
+            logEvent('relay', `Encrypted relay control registered at ${host}:${port}`);
+            return;
+        }
         const peerId = safeText(message.peerId, 64);
         if (message.protocol !== RELAY_CONTROL_PROTOCOL || message.roomId !== roomId) {
             if (peerId) rejectPeer(peerId, 'relay-routing-mismatch');
@@ -859,8 +885,14 @@ export function createHubRelayControl({
         reconnectTimer.unref?.();
     }
 
+    function clearConnectAttemptTimer() {
+        if (connectAttemptTimer) clearTimeout(connectAttemptTimer);
+        connectAttemptTimer = null;
+    }
+
     function handleConnectionClosed(socket, generation) {
         if (connection !== socket || generation !== connectionGeneration) return;
+        clearConnectAttemptTimer();
         connection = null;
         receiveBuffer = Buffer.alloc(0);
         clearQueue();
@@ -887,20 +919,17 @@ export function createHubRelayControl({
         socket.once('connect', () => {
             if (connection !== socket || generation !== connectionGeneration || !desired) return;
             counters.connections += 1;
-            reconnectAttempt = 0;
-            lastConnectedAt = new Date().toISOString();
-            lastError = '';
-            transition('registered');
+            transition('registering');
             const registered = enqueueEnvelope({
                 type: 'relay.register',
                 protocol: RELAY_CONTROL_PROTOCOL,
                 roomId,
                 role: 'hub',
                 peerId: '',
+                ack: true,
                 token: registrationToken
             });
             if (!registered) socket.destroy();
-            else logEvent('relay', `Encrypted relay control registered at ${host}:${port}`);
         });
         socket.on('data', onConnectionData);
         socket.on('drain', () => {
@@ -914,6 +943,16 @@ export function createHubRelayControl({
             logWarn('relay', `Encrypted relay control connection failed code=${lastError}`);
         });
         socket.once('close', () => handleConnectionClosed(socket, generation));
+        connectAttemptTimer = setTimeout(() => {
+            if (connection !== socket
+                || generation !== connectionGeneration
+                || socket.destroyed
+                || (state !== 'connecting' && state !== 'registering')) return;
+            lastError = 'relay-connect-timeout';
+            logWarn('relay', `Encrypted relay control connection failed code=${lastError}`);
+            socket.destroy();
+        }, connectTimeoutMs);
+        connectAttemptTimer.unref?.();
     }
 
     async function start() {
@@ -931,6 +970,7 @@ export function createHubRelayControl({
         closing = true;
         if (reconnectTimer) clearTimeout(reconnectTimer);
         reconnectTimer = null;
+        clearConnectAttemptTimer();
         closeAllPeers('hub-shutdown');
         clearQueue();
         const socket = connection;
@@ -975,6 +1015,7 @@ export function createHubRelayControl({
             host,
             port,
             peerCount: peers.size,
+            peerQueueCount: peerQueueStats.size,
             queuedMessages: sendQueue.length,
             queuedBytes,
             maxPeers,