@livedesk/hub 0.1.54 → 0.1.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/hub",
-  "version": "0.1.54",
+  "version": "0.1.55",
   "description": "VuvoDesk local Hub API and browser frame bridge",
   "type": "module",
   "main": "src/server.js",
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
-    "@livedesk/runtime-core": "0.1.6",
+    "@livedesk/runtime-core": "0.1.7",
     "@openai/codex-sdk": "0.145.0",
     "cors": "^2.8.5",
     "express": "^4.21.2",

package/src/remote-hub.js

@@ -1,7 +1,14 @@
-import net from 'net';
-import os from 'os';
-import crypto from 'crypto';
-import { createHubRelayControl } from './transport/relay-hub-control.js';
+import net from 'net';
+import os from 'os';
+import crypto from 'crypto';
+import {
+    acceptSecureDirectSocket,
+    isDirectSecureChannel,
+    isLoopbackSocketAddress,
+    isPrivateSocketAddress,
+    isSecureDirectHandshakeStart
+} from '../../runtime-core/src/direct-secure-transport.js';
+import { createHubRelayControl } from './transport/relay-hub-control.js';
 import { parseExactLiveStreamMonitorIndex } from './live-stream-monitor-contract.js';
 import {
     BoundedSegmentedBuffer,
@@ -2397,9 +2404,12 @@ export function createRemoteHub(options = {}) {
     const hostInstanceId = safeString(options.hostInstanceId ?? env.LIVEDESK_HUB_INSTANCE_ID ?? env.MINDEXEC_BRIDGE_INSTANCE_ID ?? crypto.randomUUID(), 128) || crypto.randomUUID();
     const publicEndpoint = safeString(env.LIVEDESK_REMOTE_PUBLIC_ENDPOINT || env.MINDEXEC_REMOTE_PUBLIC_ENDPOINT || env.REMOTE_HUB_PUBLIC_ENDPOINT, 256);
     const publicHost = safeString(env.LIVEDESK_REMOTE_PUBLIC_HOST || env.MINDEXEC_REMOTE_PUBLIC_HOST || env.REMOTE_HUB_PUBLIC_HOST, 128);
-    const pairToken = safeString(
-        options.pairToken || env.REMOTE_HUB_PAIR_TOKEN || env.LIVEDESK_CLIENT_PAIR_TOKEN || env.MINDEXEC_REMOTE_PAIR_TOKEN || crypto.randomBytes(6).toString('hex'),
-        256);
+    const pairToken = safeString(
+        options.pairToken || env.REMOTE_HUB_PAIR_TOKEN || env.LIVEDESK_CLIENT_PAIR_TOKEN || env.MINDEXEC_REMOTE_PAIR_TOKEN || crypto.randomBytes(32).toString('hex'),
+        256);
+    const allowInsecurePrivateDirect = isEnabledValue(
+        options.allowInsecureDirect ?? env.LIVEDESK_ALLOW_INSECURE_DIRECT,
+        false);
     const relayControl = options.relayControl && typeof options.relayControl === 'object'
         ? options.relayControl
         : createHubRelayControl({
@@ -7949,10 +7959,24 @@ export function createRemoteHub(options = {}) {
     function handleAgentMessage(socket, state, message) {
         if (!message || typeof message !== 'object') {
             return;
-        }
-
-        if (!state.authenticated) {
-            if (message.type === 'hello' && socket.__liveDeskRelayControl === true) {
+        }
+
+        if (!state.authenticated) {
+            if (socket.__liveDeskSecureDirect === true) {
+                const applicationChannel = message.type === 'slot.assign'
+                    ? 'control'
+                    : message.type === 'hello'
+                        ? (safeString(message.channel || message.Channel, 40).toLowerCase() || 'control')
+                        : '';
+                if (applicationChannel
+                    && (!isDirectSecureChannel(applicationChannel)
+                        || applicationChannel !== socket.__liveDeskSecureChannel)) {
+                    writeJsonLine(socket, { type: 'error', error: 'direct-secure-channel-mismatch' });
+                    socket.end();
+                    return;
+                }
+            }
+            if (message.type === 'hello' && socket.__liveDeskRelayControl === true) {
                 message = {
                     ...message,
                     capabilities: {
@@ -7988,7 +8012,7 @@ export function createRemoteHub(options = {}) {
                 return;
             }
 
-            const channel = safeString(message.channel || message.Channel, 40).toLowerCase();
+            const channel = safeString(message.channel || message.Channel, 40).toLowerCase() || 'control';
             if (channel === 'input') {
                 const device = attachInputSocket(socket, message);
                 if (!device) {
@@ -8538,18 +8562,60 @@ export function createRemoteHub(options = {}) {
         if (firstChunk) {
             processData(firstChunk);
         }
-    }
-
-    function handleSocket(socket) {
-        socket.once('data', chunk => {
-            const firstChunk = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-            if (isRemoteHubWebSocketUpgradeStart(firstChunk)) {
-                handleWebSocketUpgradeSocket(socket, firstChunk);
-                return;
-            }
-
-            handleTcpAgentSocket(socket, firstChunk);
-        });
+    }
+
+    function handleSocket(socket) {
+        allSockets.add(socket);
+        const prefaceTimer = setTimeout(() => {
+            if (!socket.destroyed) socket.destroy();
+        }, 10_000);
+        prefaceTimer.unref?.();
+        socket.once('close', () => {
+            clearTimeout(prefaceTimer);
+            allSockets.delete(socket);
+        });
+        socket.once('data', chunk => {
+            clearTimeout(prefaceTimer);
+            const firstChunk = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+            if (isSecureDirectHandshakeStart(firstChunk)) {
+                void acceptSecureDirectSocket(socket, firstChunk, pairToken)
+                    .then(secureSocket => {
+                        allSockets.delete(socket);
+                        handleTcpAgentSocket(secureSocket);
+                    })
+                    .catch(error => {
+                        if (socket.destroyed) return;
+                        if (error?.code === 'LIVEDESK_INVALID_PAIR_TOKEN_REJECTED') {
+                            const forcedCloseTimer = setTimeout(() => socket.destroy(), 1_000);
+                            forcedCloseTimer.unref?.();
+                            socket.once('close', () => clearTimeout(forcedCloseTimer));
+                            if (typeof socket.destroySoon === 'function') socket.destroySoon();
+                            else socket.end();
+                            return;
+                        }
+                        socket.destroy();
+                    });
+                return;
+            }
+
+            const remoteAddress = socket.remoteAddress;
+            const allowLegacyPlaintext = isLoopbackSocketAddress(remoteAddress)
+                || (allowInsecurePrivateDirect && isPrivateSocketAddress(remoteAddress));
+            if (isRemoteHubWebSocketUpgradeStart(firstChunk)) {
+                if (!allowLegacyPlaintext) {
+                    socket.destroy();
+                    return;
+                }
+                handleWebSocketUpgradeSocket(socket, firstChunk);
+                return;
+            }
+
+            if (!allowLegacyPlaintext) {
+                socket.destroy();
+                return;
+            }
+            handleTcpAgentSocket(socket, firstChunk);
+        });
 
         socket.once('error', () => {
             // The transport-specific handler owns logging after the first byte.
@@ -8571,10 +8637,10 @@ export function createRemoteHub(options = {}) {
                 started = true;
                 boundPort = candidateServer.address()?.port || port;
                 lastError = '';
-                logEvent('remote', `VuvoDesk Hub client endpoint listening on tcp://${host}:${boundPort}`, 'success');
-                if (host === '0.0.0.0' || host === '::') {
-                    logWarn('remote', 'VuvoDesk Hub client endpoint is externally reachable. Use a strong pairing token and trusted network.');
-                }
+                logEvent('remote', `VuvoDesk Hub client endpoint listening on tcp://${host}:${boundPort}`, 'success');
+                if (host === '0.0.0.0' || host === '::') {
+                    logWarn('remote', 'VuvoDesk Hub client endpoint is externally reachable. Non-loopback Direct connections require authenticated encryption.');
+                }
                 emitRemoteEvent('RemoteHubStarted', null);
                 resolve();
             });