livedesk 0.1.80 → 0.1.82

package/hub/src/remote-hub.js

@@ -535,6 +535,8 @@ function normalizeRemoteInputEvent(value = {}) {
     const normalizedY = Number(input.normalizedY ?? input.NormalizedY);
     const deltaX = Number(input.deltaX ?? input.DeltaX);
     const deltaY = Number(input.deltaY ?? input.DeltaY);
+    const keyCode = Number(input.keyCode ?? input.KeyCode);
+    const location = Number(input.location ?? input.Location);
     return {
         type,
         normalizedX: Number.isFinite(normalizedX) ? Math.max(0, Math.min(1, normalizedX)) : undefined,
@@ -544,6 +546,8 @@ function normalizeRemoteInputEvent(value = {}) {
         deltaY: Number.isFinite(deltaY) ? Math.max(-4096, Math.min(4096, deltaY)) : 0,
         key: safeString(input.key || input.Key, 80),
         code: safeString(input.code || input.Code, 80),
+        keyCode: Number.isFinite(keyCode) ? Math.max(0, Math.min(65535, Math.trunc(keyCode))) : 0,
+        location: Number.isFinite(location) ? Math.max(0, Math.min(255, Math.trunc(location))) : 0,
         text: safeText(input.text || input.Text, 256),
         repeat: input.repeat === true || input.Repeat === true,
         controlLeaseId: safeString(input.controlLeaseId || input.ControlLeaseId, 128),
@@ -1201,6 +1205,7 @@ export function createRemoteHub(options = {}) {
     const devices = new Map();
     const taskBatches = new Map();
     const sockets = new Map();
+    const inputSockets = new Map();
     const allSockets = new Set();
     const duplicateDeviceLogAt = new Map();
     let server = null;
@@ -1734,6 +1739,7 @@ export function createRemoteHub(options = {}) {
 
     function closeExistingDeviceSocket(deviceId, nextSessionId) {
         const existing = devices.get(deviceId);
+        closeInputSocket(existing, 'replaced-by-new-session');
         if (!existing?.socket || existing.socket.destroyed) {
             return;
         }
@@ -1748,6 +1754,43 @@ export function createRemoteHub(options = {}) {
         existing.socket.destroy();
     }
 
+    function closeInputSocket(device, reason = 'input-socket-closed') {
+        const socket = device?.inputSocket;
+        if (!socket) {
+            return;
+        }
+
+        device.inputSocket = null;
+        inputSockets.delete(socket);
+        try {
+            writeJsonLine(socket, { type: 'disconnect', reason });
+        } catch {
+            // Best-effort notice before closing the side channel.
+        }
+        try {
+            socket.destroy?.();
+        } catch {
+            // Ignore close failures.
+        }
+    }
+
+    function detachInputSocket(socket, reason = 'input-socket-closed') {
+        const deviceId = inputSockets.get(socket);
+        inputSockets.delete(socket);
+        if (!deviceId) {
+            return;
+        }
+
+        const device = devices.get(deviceId);
+        if (!device || device.inputSocket !== socket) {
+            return;
+        }
+
+        device.inputSocket = null;
+        device.inputLastSeenAt = new Date().toISOString();
+        emitRemoteEvent('RemoteInputSocketDisconnected', device, { reason });
+    }
+
     function getDeviceActivityMs(device) {
         return Math.max(
             Date.parse(device?.lastSeenAt || '') || 0,
@@ -2132,6 +2175,7 @@ export function createRemoteHub(options = {}) {
 
         const device = {
             socket,
+            inputSocket: null,
             deviceId,
             sessionId,
             deviceName: safeString(hello.deviceName || hello.hostname || deviceId, 120),
@@ -2148,6 +2192,8 @@ export function createRemoteHub(options = {}) {
             capabilities,
             connected: true,
             connectedAt: now,
+            inputConnectedAt: '',
+            inputLastSeenAt: '',
             disconnectedAt: '',
             lastSeenAt: now,
             lastStatusAt: '',
@@ -2191,6 +2237,37 @@ export function createRemoteHub(options = {}) {
         return device;
     }
 
+    function attachInputSocket(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;
+        }
+
+        closeInputSocket(device, 'replaced-by-new-input-socket');
+
+        const now = new Date().toISOString();
+        device.inputSocket = socket;
+        device.inputConnectedAt = now;
+        device.inputLastSeenAt = now;
+        inputSockets.set(socket, deviceId);
+
+        writeJsonLine(socket, {
+            type: 'welcome',
+            channel: 'input',
+            protocol: REMOTE_AGENT_PROTOCOL,
+            protocolVersion: REMOTE_PROTOCOL_VERSION,
+            sessionId: device.sessionId,
+            deviceId,
+            serverTime: now
+        });
+
+        emitRemoteEvent('RemoteInputSocketConnected', device);
+        return device;
+    }
+
     function detachSocket(socket, reason = 'socket-closed') {
         const deviceId = sockets.get(socket);
         sockets.delete(socket);
@@ -2205,6 +2282,7 @@ export function createRemoteHub(options = {}) {
 
         device.connected = false;
         device.socket = null;
+        closeInputSocket(device, reason);
         device.disconnectedAt = new Date().toISOString();
         device.lastDisconnectReason = reason;
         if (device.activeLiveStream) {
@@ -2969,6 +3047,12 @@ export function createRemoteHub(options = {}) {
         }
 
         const device = state.device;
+        if (state.inputOnly) {
+            writeJsonLine(socket, { type: 'error', error: 'input-channel-binary-not-supported' });
+            socket.destroy();
+            return;
+        }
+
         device.counters.messagesReceived += 1;
         device.lastSeenAt = new Date().toISOString();
 
@@ -3012,6 +3096,19 @@ export function createRemoteHub(options = {}) {
                 return;
             }
 
+            const channel = safeString(message.channel || message.Channel, 40).toLowerCase();
+            if (channel === 'input') {
+                const device = attachInputSocket(socket, message);
+                if (!device) {
+                    return;
+                }
+
+                state.authenticated = true;
+                state.device = device;
+                state.inputOnly = true;
+                return;
+            }
+
             const device = attachDevice(socket, message);
             if (!device) {
                 return;
@@ -3028,6 +3125,11 @@ export function createRemoteHub(options = {}) {
             return;
         }
 
+        if (state.inputOnly) {
+            device.inputLastSeenAt = new Date().toISOString();
+            return;
+        }
+
         device.counters.messagesReceived += 1;
         device.lastSeenAt = new Date().toISOString();
 
@@ -3099,7 +3201,8 @@ export function createRemoteHub(options = {}) {
 
         const state = {
             authenticated: false,
-            device: null
+            device: null,
+            inputOnly: false
         };
 
         const helloTimer = setTimeout(() => {
@@ -3150,6 +3253,7 @@ export function createRemoteHub(options = {}) {
         const detach = reason => {
             allSockets.delete(socket);
             clearTimeout(helloTimer);
+            detachInputSocket(socket, reason);
             detachSocket(socket, reason);
         };
 
@@ -3239,6 +3343,7 @@ export function createRemoteHub(options = {}) {
         const state = {
             authenticated: false,
             device: null,
+            inputOnly: false,
             buffer: Buffer.alloc(0),
             pendingBinaryFrame: null
         };
@@ -3319,11 +3424,13 @@ export function createRemoteHub(options = {}) {
         socket.on('close', () => {
             allSockets.delete(socket);
             clearTimeout(helloTimer);
+            detachInputSocket(socket);
             detachSocket(socket);
         });
         socket.on('error', err => {
             allSockets.delete(socket);
             clearTimeout(helloTimer);
+            detachInputSocket(socket, err?.message || 'socket-error');
             detachSocket(socket, err?.message || 'socket-error');
         });
     }
@@ -3510,6 +3617,24 @@ export function createRemoteHub(options = {}) {
             return { ok: false, error: 'missing-input-type' };
         }
 
+        const inputSocket = device.inputSocket;
+        if (inputSocket && !inputSocket.destroyed) {
+            const sent = writeJsonLine(inputSocket, {
+                type: 'input.control',
+                payload: {
+                    ...normalized,
+                    issuedAt: normalized.issuedAt || new Date().toISOString()
+                }
+            });
+            if (sent) {
+                device.counters.commandsSent += 1;
+                device.inputLastSeenAt = new Date().toISOString();
+                return { ok: true, inputSocket: true };
+            }
+
+            detachInputSocket(inputSocket, 'input-socket-write-failed');
+        }
+
         return sendCommand(deviceId, {
             command: 'input.control',
             payload: {

package/package.json

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