livedesk 0.1.129 → 0.1.131

package/hub/src/remote-hub.js

@@ -858,6 +858,13 @@ function serializeDevice(device, options = {}) {
         lastDisconnectReason: device.lastDisconnectReason,
         remoteAddress: device.remoteAddress,
         remotePort: device.remotePort,
+        channels: {
+            control: !!device.socket && !device.socket.destroyed,
+            input: !!device.inputSocket && !device.inputSocket.destroyed,
+            frame: !!device.frameSocket && !device.frameSocket.destroyed,
+            audio: !!device.audioSocket && !device.audioSocket.destroyed,
+            file: !!device.fileSocket && !device.fileSocket.destroyed
+        },
         latestThumbnail: serializeRemoteFrame(device.latestThumbnail, device.deviceId, 'thumbnail', options),
         latestLiveFrame: serializeRemoteFrame(device.latestLiveFrame, device.deviceId, 'live', options),
         activeLiveStream: device.activeLiveStream ? { ...device.activeLiveStream } : null,
@@ -1338,6 +1345,8 @@ export function createRemoteHub(options = {}) {
     const sockets = new Map();
     const inputSockets = new Map();
     const frameSockets = new Map();
+    const audioSockets = new Map();
+    const fileSockets = new Map();
     const allSockets = new Set();
     const agentBinaryIngressLanes = [];
     const duplicateDeviceLogAt = new Map();
@@ -1875,6 +1884,8 @@ export function createRemoteHub(options = {}) {
         const existing = devices.get(deviceId);
         closeInputSocket(existing, 'replaced-by-new-session');
         closeFrameSocket(existing, 'replaced-by-new-session');
+        closeAudioSocket(existing, 'replaced-by-new-session');
+        closeFileSocket(existing, 'replaced-by-new-session');
         if (!existing?.socket || existing.socket.destroyed) {
             return;
         }
@@ -1909,6 +1920,46 @@ export function createRemoteHub(options = {}) {
         }
     }
 
+    function closeAudioSocket(device, reason = 'audio-socket-closed') {
+        const socket = device?.audioSocket;
+        if (!socket) {
+            return;
+        }
+
+        device.audioSocket = null;
+        audioSockets.delete(socket);
+        try {
+            writeJsonLine(socket, { type: 'disconnect', channel: 'audio', reason });
+        } catch {
+            // Best-effort notice before closing the side channel.
+        }
+        try {
+            socket.destroy?.();
+        } catch {
+            // Ignore close failures.
+        }
+    }
+
+    function closeFileSocket(device, reason = 'file-socket-closed') {
+        const socket = device?.fileSocket;
+        if (!socket) {
+            return;
+        }
+
+        device.fileSocket = null;
+        fileSockets.delete(socket);
+        try {
+            writeJsonLine(socket, { type: 'disconnect', channel: 'file', reason });
+        } catch {
+            // Best-effort notice before closing the side channel.
+        }
+        try {
+            socket.destroy?.();
+        } catch {
+            // Ignore close failures.
+        }
+    }
+
     function closeInputSocket(device, reason = 'input-socket-closed') {
         const socket = device?.inputSocket;
         if (!socket) {
@@ -1963,6 +2014,40 @@ export function createRemoteHub(options = {}) {
         emitRemoteEvent('RemoteFrameSocketDisconnected', device, { reason });
     }
 
+    function detachAudioSocket(socket, reason = 'audio-socket-closed') {
+        const deviceId = audioSockets.get(socket);
+        audioSockets.delete(socket);
+        if (!deviceId) {
+            return;
+        }
+
+        const device = devices.get(deviceId);
+        if (!device || device.audioSocket !== socket) {
+            return;
+        }
+
+        device.audioSocket = null;
+        device.audioLastSeenAt = new Date().toISOString();
+        emitRemoteEvent('RemoteAudioSocketDisconnected', device, { reason });
+    }
+
+    function detachFileSocket(socket, reason = 'file-socket-closed') {
+        const deviceId = fileSockets.get(socket);
+        fileSockets.delete(socket);
+        if (!deviceId) {
+            return;
+        }
+
+        const device = devices.get(deviceId);
+        if (!device || device.fileSocket !== socket) {
+            return;
+        }
+
+        device.fileSocket = null;
+        device.fileLastSeenAt = new Date().toISOString();
+        emitRemoteEvent('RemoteFileSocketDisconnected', device, { reason });
+    }
+
     function getDeviceActivityMs(device) {
         return Math.max(
             Date.parse(device?.lastSeenAt || '') || 0,
@@ -2349,6 +2434,8 @@ export function createRemoteHub(options = {}) {
             socket,
             inputSocket: null,
             frameSocket: null,
+            audioSocket: null,
+            fileSocket: null,
             deviceId,
             sessionId,
             deviceName: safeString(hello.deviceName || hello.hostname || deviceId, 120),
@@ -2369,6 +2456,10 @@ export function createRemoteHub(options = {}) {
             inputLastSeenAt: '',
             frameConnectedAt: '',
             frameLastSeenAt: '',
+            audioConnectedAt: '',
+            audioLastSeenAt: '',
+            fileConnectedAt: '',
+            fileLastSeenAt: '',
             disconnectedAt: '',
             lastSeenAt: now,
             lastStatusAt: '',
@@ -2476,6 +2567,62 @@ export function createRemoteHub(options = {}) {
         return device;
     }
 
+    function attachAudioSocket(socket, hello) {
+        const deviceId = normalizeDeviceId(hello.deviceId);
+        const device = devices.get(deviceId);
+        if (!device || !device.connected || !device.socket || device.socket.destroyed) {
+            writeJsonLine(socket, { type: 'error', error: 'device-not-connected' });
+            socket.destroy();
+            return null;
+        }
+
+        closeAudioSocket(device, 'replaced-by-new-audio-socket');
+        const now = new Date().toISOString();
+        device.audioSocket = socket;
+        device.audioConnectedAt = now;
+        device.audioLastSeenAt = now;
+        audioSockets.set(socket, deviceId);
+        writeJsonLine(socket, {
+            type: 'welcome',
+            channel: 'audio',
+            protocol: REMOTE_AGENT_PROTOCOL,
+            protocolVersion: REMOTE_PROTOCOL_VERSION,
+            sessionId: device.sessionId,
+            deviceId,
+            serverTime: now
+        });
+        emitRemoteEvent('RemoteAudioSocketConnected', device);
+        return device;
+    }
+
+    function attachFileSocket(socket, hello) {
+        const deviceId = normalizeDeviceId(hello.deviceId);
+        const device = devices.get(deviceId);
+        if (!device || !device.connected || !device.socket || device.socket.destroyed) {
+            writeJsonLine(socket, { type: 'error', error: 'device-not-connected' });
+            socket.destroy();
+            return null;
+        }
+
+        closeFileSocket(device, 'replaced-by-new-file-socket');
+        const now = new Date().toISOString();
+        device.fileSocket = socket;
+        device.fileConnectedAt = now;
+        device.fileLastSeenAt = now;
+        fileSockets.set(socket, deviceId);
+        writeJsonLine(socket, {
+            type: 'welcome',
+            channel: 'file',
+            protocol: REMOTE_AGENT_PROTOCOL,
+            protocolVersion: REMOTE_PROTOCOL_VERSION,
+            sessionId: device.sessionId,
+            deviceId,
+            serverTime: now
+        });
+        emitRemoteEvent('RemoteFileSocketConnected', device);
+        return device;
+    }
+
     function detachSocket(socket, reason = 'socket-closed') {
         const deviceId = sockets.get(socket);
         sockets.delete(socket);
@@ -3260,7 +3407,7 @@ export function createRemoteHub(options = {}) {
         }
 
         const device = state.device;
-        if (state.inputOnly) {
+        if (state.inputOnly || state.fileOnly) {
             writeJsonLine(socket, { type: 'error', error: 'input-channel-binary-not-supported' });
             socket.destroy();
             return;
@@ -3271,6 +3418,9 @@ export function createRemoteHub(options = {}) {
         if (state.frameOnly) {
             device.frameLastSeenAt = device.lastSeenAt;
         }
+        if (state.audioOnly) {
+            device.audioLastSeenAt = device.lastSeenAt;
+        }
 
         const frameKind = safeString(header.frameKind || header.kind || header.frameType || '', 40).toLowerCase();
         if (frameKind === 'thumbnail' || header.type === 'thumbnail.binary') {
@@ -3420,6 +3570,28 @@ export function createRemoteHub(options = {}) {
                 state.frameOnly = true;
                 return;
             }
+            if (channel === 'audio') {
+                const device = attachAudioSocket(socket, message);
+                if (!device) {
+                    return;
+                }
+
+                state.authenticated = true;
+                state.device = device;
+                state.audioOnly = true;
+                return;
+            }
+            if (channel === 'file') {
+                const device = attachFileSocket(socket, message);
+                if (!device) {
+                    return;
+                }
+
+                state.authenticated = true;
+                state.device = device;
+                state.fileOnly = true;
+                return;
+            }
 
             const device = attachDevice(socket, message);
             if (!device) {
@@ -3445,6 +3617,13 @@ export function createRemoteHub(options = {}) {
             device.frameLastSeenAt = new Date().toISOString();
             return;
         }
+        if (state.audioOnly) {
+            device.audioLastSeenAt = new Date().toISOString();
+            return;
+        }
+        if (state.fileOnly) {
+            device.fileLastSeenAt = new Date().toISOString();
+        }
 
         device.counters.messagesReceived += 1;
         device.lastSeenAt = new Date().toISOString();
@@ -3520,6 +3699,8 @@ export function createRemoteHub(options = {}) {
             device: null,
             inputOnly: false,
             frameOnly: false,
+            audioOnly: false,
+            fileOnly: false,
             binaryQueue: [],
             binaryQueueDraining: false,
             binaryQueueScheduled: false,
@@ -3582,6 +3763,8 @@ export function createRemoteHub(options = {}) {
             clearTimeout(helloTimer);
             detachInputSocket(socket, reason);
             detachFrameSocket(socket, reason);
+            detachAudioSocket(socket, reason);
+            detachFileSocket(socket, reason);
             detachSocket(socket, reason);
         };
 
@@ -3673,6 +3856,8 @@ export function createRemoteHub(options = {}) {
             device: null,
             inputOnly: false,
             frameOnly: false,
+            audioOnly: false,
+            fileOnly: false,
             buffer: Buffer.alloc(0),
             pendingBinaryFrame: null,
             binaryQueue: [],
@@ -3710,7 +3895,7 @@ export function createRemoteHub(options = {}) {
                     continue;
                 }
 
-                if (state.authenticated && state.frameOnly && state.buffer.length > 0) {
+                if (state.authenticated && (state.frameOnly || state.audioOnly) && state.buffer.length > 0) {
                     const firstNonWhitespaceIndex = findFirstNonWhitespaceByte(state.buffer);
                     if (firstNonWhitespaceIndex < 0) {
                         state.buffer = Buffer.alloc(0);
@@ -3792,7 +3977,7 @@ export function createRemoteHub(options = {}) {
 
                     handleAgentMessage(socket, state, message);
                 } catch (err) {
-                    if (state.authenticated && state.frameOnly) {
+                    if (state.authenticated && (state.frameOnly || state.audioOnly)) {
                         continue;
                     }
                     writeJsonLine(socket, { type: 'error', error: 'invalid-json' });
@@ -3815,6 +4000,8 @@ export function createRemoteHub(options = {}) {
             clearTimeout(helloTimer);
             detachInputSocket(socket);
             detachFrameSocket(socket);
+            detachAudioSocket(socket);
+            detachFileSocket(socket);
             detachSocket(socket);
         });
         socket.on('error', err => {
@@ -3826,6 +4013,8 @@ export function createRemoteHub(options = {}) {
             clearTimeout(helloTimer);
             detachInputSocket(socket, err?.message || 'socket-error');
             detachFrameSocket(socket, err?.message || 'socket-error');
+            detachAudioSocket(socket, err?.message || 'socket-error');
+            detachFileSocket(socket, err?.message || 'socket-error');
             detachSocket(socket, err?.message || 'socket-error');
         });
     }
@@ -3976,19 +4165,26 @@ export function createRemoteHub(options = {}) {
         }
 
         const commandId = safeString(command?.commandId, 128) || crypto.randomUUID();
+        const commandName = safeString(command?.command || 'ping', 80);
         const payload = {
             type: 'command',
             commandId,
-            command: safeString(command?.command || 'ping', 80),
+            command: commandName,
             payload: command?.payload ?? null,
             issuedAt: new Date().toISOString()
         };
 
-        writeJsonLine(device.socket, payload);
+        const dedicatedFileSocket = commandName === 'file.transfer'
+            && device.fileSocket
+            && !device.fileSocket.destroyed
+            ? device.fileSocket
+            : null;
+        writeJsonLine(dedicatedFileSocket || device.socket, payload);
         device.counters.commandsSent += 1;
         emitRemoteEvent('RemoteCommandQueued', device, {
             commandId,
-            command: payload.command
+            command: payload.command,
+            channel: dedicatedFileSocket ? 'file' : 'control'
         });
         return { ok: true, commandId };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.129",
+  "version": "0.1.131",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {
@@ -30,7 +30,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@livedesk/client": "0.1.88",
+    "@livedesk/client": "0.1.90",
     "cors": "^2.8.5",
     "express": "^4.21.2",
     "ws": "^8.18.3"