livedesk 0.1.102 → 0.1.103

package/hub/src/remote-hub.js

@@ -1211,6 +1211,7 @@ export function createRemoteHub(options = {}) {
     const taskBatches = new Map();
     const sockets = new Map();
     const inputSockets = new Map();
+    const frameSockets = new Map();
     const allSockets = new Set();
     const duplicateDeviceLogAt = new Map();
     let server = null;
@@ -1745,6 +1746,7 @@ export function createRemoteHub(options = {}) {
     function closeExistingDeviceSocket(deviceId, nextSessionId) {
         const existing = devices.get(deviceId);
         closeInputSocket(existing, 'replaced-by-new-session');
+        closeFrameSocket(existing, 'replaced-by-new-session');
         if (!existing?.socket || existing.socket.destroyed) {
             return;
         }
@@ -1759,6 +1761,26 @@ export function createRemoteHub(options = {}) {
         existing.socket.destroy();
     }
 
+    function closeFrameSocket(device, reason = 'frame-socket-closed') {
+        const socket = device?.frameSocket;
+        if (!socket) {
+            return;
+        }
+
+        device.frameSocket = null;
+        frameSockets.delete(socket);
+        try {
+            writeJsonLine(socket, { type: 'disconnect', channel: 'frame', 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) {
@@ -1796,6 +1818,23 @@ export function createRemoteHub(options = {}) {
         emitRemoteEvent('RemoteInputSocketDisconnected', device, { reason });
     }
 
+    function detachFrameSocket(socket, reason = 'frame-socket-closed') {
+        const deviceId = frameSockets.get(socket);
+        frameSockets.delete(socket);
+        if (!deviceId) {
+            return;
+        }
+
+        const device = devices.get(deviceId);
+        if (!device || device.frameSocket !== socket) {
+            return;
+        }
+
+        device.frameSocket = null;
+        device.frameLastSeenAt = new Date().toISOString();
+        emitRemoteEvent('RemoteFrameSocketDisconnected', device, { reason });
+    }
+
     function getDeviceActivityMs(device) {
         return Math.max(
             Date.parse(device?.lastSeenAt || '') || 0,
@@ -2181,6 +2220,7 @@ export function createRemoteHub(options = {}) {
         const device = {
             socket,
             inputSocket: null,
+            frameSocket: null,
             deviceId,
             sessionId,
             deviceName: safeString(hello.deviceName || hello.hostname || deviceId, 120),
@@ -2199,6 +2239,8 @@ export function createRemoteHub(options = {}) {
             connectedAt: now,
             inputConnectedAt: '',
             inputLastSeenAt: '',
+            frameConnectedAt: '',
+            frameLastSeenAt: '',
             disconnectedAt: '',
             lastSeenAt: now,
             lastStatusAt: '',
@@ -2273,6 +2315,39 @@ export function createRemoteHub(options = {}) {
         return device;
     }
 
+    function attachFrameSocket(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;
+        }
+
+        closeFrameSocket(device, 'replaced-by-new-frame-socket');
+
+        const now = new Date().toISOString();
+        device.frameSocket = socket;
+        device.frameConnectedAt = now;
+        device.frameLastSeenAt = now;
+        frameSockets.set(socket, deviceId);
+
+        writeJsonLine(socket, {
+            type: 'welcome',
+            channel: 'frame',
+            protocol: REMOTE_AGENT_PROTOCOL,
+            protocolVersion: REMOTE_PROTOCOL_VERSION,
+            sessionId: device.sessionId,
+            deviceId,
+            frameProtocol: buildRemoteFrameProtocolDescriptor(),
+            frameModes: getSupportedRemoteFrameModeProfiles(),
+            serverTime: now
+        });
+
+        emitRemoteEvent('RemoteFrameSocketConnected', device);
+        return device;
+    }
+
     function detachSocket(socket, reason = 'socket-closed') {
         const deviceId = sockets.get(socket);
         sockets.delete(socket);
@@ -2288,6 +2363,7 @@ export function createRemoteHub(options = {}) {
         device.connected = false;
         device.socket = null;
         closeInputSocket(device, reason);
+        closeFrameSocket(device, reason);
         device.disconnectedAt = new Date().toISOString();
         device.lastDisconnectReason = reason;
         if (device.activeLiveStream) {
@@ -3060,6 +3136,9 @@ export function createRemoteHub(options = {}) {
 
         device.counters.messagesReceived += 1;
         device.lastSeenAt = new Date().toISOString();
+        if (state.frameOnly) {
+            device.frameLastSeenAt = device.lastSeenAt;
+        }
 
         const frameKind = safeString(header.frameKind || header.kind || header.frameType || '', 40).toLowerCase();
         if (frameKind === 'thumbnail' || header.type === 'thumbnail.binary') {
@@ -3113,6 +3192,17 @@ export function createRemoteHub(options = {}) {
                 state.inputOnly = true;
                 return;
             }
+            if (channel === 'frame') {
+                const device = attachFrameSocket(socket, message);
+                if (!device) {
+                    return;
+                }
+
+                state.authenticated = true;
+                state.device = device;
+                state.frameOnly = true;
+                return;
+            }
 
             const device = attachDevice(socket, message);
             if (!device) {
@@ -3134,6 +3224,10 @@ export function createRemoteHub(options = {}) {
             device.inputLastSeenAt = new Date().toISOString();
             return;
         }
+        if (state.frameOnly) {
+            device.frameLastSeenAt = new Date().toISOString();
+            return;
+        }
 
         device.counters.messagesReceived += 1;
         device.lastSeenAt = new Date().toISOString();
@@ -3207,7 +3301,8 @@ export function createRemoteHub(options = {}) {
         const state = {
             authenticated: false,
             device: null,
-            inputOnly: false
+            inputOnly: false,
+            frameOnly: false
         };
 
         const helloTimer = setTimeout(() => {
@@ -3259,6 +3354,7 @@ export function createRemoteHub(options = {}) {
             allSockets.delete(socket);
             clearTimeout(helloTimer);
             detachInputSocket(socket, reason);
+            detachFrameSocket(socket, reason);
             detachSocket(socket, reason);
         };
 
@@ -4009,6 +4105,21 @@ export function createRemoteHub(options = {}) {
         const normalized = normalizeLiveStreamStartOptions(options);
         const { fps, maxWidth, maxHeight, quality, monitorIndex, transfer } = normalized;
         const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
+        if (device.activeLiveStream?.streamId === streamId
+            && options.forceRestart !== true
+            && options.reuseExisting === true
+            && liveStreamIsReusable(device.activeLiveStream)) {
+            return {
+                ok: true,
+                commandId: device.activeLiveStream.commandId,
+                streamId,
+                fps: Number(device.activeLiveStream.fps || fps),
+                mode: device.activeLiveStream.mode || transfer.mode,
+                frameMode: device.activeLiveStream.frameMode || transfer.frameMode,
+                monitorIndex: Number(device.activeLiveStream.monitorIndex || monitorIndex),
+                reused: true
+            };
+        }
         if (device.activeLiveStream?.streamId === streamId
             && options.forceRestart !== true
             && liveStreamMatchesOptions(device.activeLiveStream, normalized)

package/hub/src/server.js

@@ -27,7 +27,6 @@ const audioClients = new Set();
 let frameClientSeq = 0;
 let inputClientSeq = 0;
 let audioClientSeq = 0;
-const FRAME_LIVE_WATCHDOG_MS = 2500;
 
 function handleRemoteHubEvent(type, event) {
   if (type !== 'RemoteDeviceConnected') {
@@ -221,6 +220,9 @@ function safeWebSocketSend(ws, payload, options = undefined) {
 }
 
 function updateFrameSubscription(ws, payload = {}) {
+  const previousDeviceIds = ws.liveDeskDeviceIds instanceof Set
+    ? new Set(ws.liveDeskDeviceIds)
+    : new Set();
   const deviceIds = normalizeDeviceIds(payload.deviceIds ?? payload.devices ?? payload.deviceId);
   ws.liveDeskDeviceIds = new Set(deviceIds);
   ws.liveDeskAutoStart = /^(1|true|yes|on|live)$/i.test(String(payload.autoStartLive ?? payload.startLive ?? ''));
@@ -232,7 +234,11 @@ function updateFrameSubscription(ws, payload = {}) {
     autoStartLive: ws.liveDeskAutoStart
   });
 
-  startFrameSubscriptionLive(ws, 'subscribe');
+  const newlySubscribedIds = deviceIds.filter(deviceId => !previousDeviceIds.has(deviceId));
+  const targetIds = newlySubscribedIds.length > 0 ? newlySubscribedIds : deviceIds;
+  for (const deviceId of targetIds.slice(0, 80)) {
+    startFrameSubscriptionLive(ws, 'subscribe', deviceId, { reuseExisting: true });
+  }
 }
 
 function startFrameSubscriptionLive(ws, reason = 'subscribe', onlyDeviceId = '', overrideLiveOptions = null) {
@@ -271,6 +277,7 @@ function startFrameSubscriptionLive(ws, reason = 'subscribe', onlyDeviceId = '',
     const result = remoteHub.startLiveStream(deviceId, {
       ...liveOptions,
       monitorIndex,
+      reuseExisting: liveOptions.reuseExisting === true || reason === 'subscribe' || reason === 'watchdog',
       silentReuse: reason === 'watchdog' && liveOptions.forceRestart !== true
     });
     if (result?.ok) {
@@ -761,14 +768,7 @@ httpServer.on('upgrade', (req, socket, head) => {
 frameWss.on('connection', (ws, req) => {
   frameClients.add(ws);
   ws.liveDeskFrameClientId = `rfws-${++frameClientSeq}`;
-  const liveWatchdog = setInterval(() => {
-    if (ws.readyState === 1) {
-      startFrameSubscriptionLive(ws, 'watchdog');
-    }
-  }, FRAME_LIVE_WATCHDOG_MS);
-  liveWatchdog.unref?.();
   const cleanup = () => {
-    clearInterval(liveWatchdog);
     frameClients.delete(ws);
   };
   try {

package/package.json

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