@livedesk/hub 0.1.41 → 0.1.43

package/src/remote-hub.js

@@ -286,7 +286,7 @@ function normalizePort(value) {
     return clampNumber(value, 0, 65535, DEFAULT_REMOTE_HUB_PORT);
 }
 
-function safeString(value, maxLength = 200) {
+function safeString(value, maxLength = 200) {
     return String(value ?? '').replace(/[\r\n\t]/g, ' ').trim().slice(0, maxLength);
 }
 
@@ -1119,55 +1119,55 @@ function getAccountRouteEndpointReason(endpoint, context = {}) {
     return 'ok';
 }
 
-function safeText(value, maxLength = 1000) {
-    return String(value ?? '').replace(/\0/g, '').trim().slice(0, maxLength);
-}
-
-function normalizeClientUpdateVerifiedProof(device, message, receivedAt) {
-    const operationId = safeString(message?.operationId, 180);
-    const attemptId = safeString(message?.attemptId, 180);
-    const productVersion = safeString(message?.productVersion, 40);
-    const agentVersion = safeString(message?.agentVersion, 40);
-    const completedAt = safeString(message?.completedAt, 64);
-    const launcherPid = Math.max(0, Math.floor(Number(message?.launcherPid) || 0));
-    const agentPid = Math.max(0, Math.floor(Number(message?.agentPid) || 0));
-    const supervisorPid = Math.max(0, Math.floor(Number(message?.supervisorPid) || 0));
-    if (!operationId
-        || !attemptId
-        || !productVersion
-        || !agentVersion
-        || !Number.isFinite(Date.parse(completedAt))
-        || launcherPid <= 1
-        || agentPid <= 1
-        || supervisorPid <= 1
-        || agentPid !== Number(device?.pid || 0)
-        || productVersion !== String(device?.productVersion || '')
-        || agentVersion !== String(device?.agentVersion || '')) {
-        return null;
-    }
-    return {
-        operationId,
-        attemptId,
-        sessionId: String(device.sessionId || ''),
-        launcherPid,
-        agentPid,
-        supervisorPid,
-        productVersion,
-        agentVersion,
-        completedAt,
-        receivedAt
-    };
-}
-
-function normalizeRemoteKeyboardKey(value) {
-    const raw = String(value ?? '').replace(/\0/g, '');
-    return raw === ' ' ? ' ' : safeString(raw, 80);
-}
-
-function normalizeRemoteKeyboardText(value) {
-    const raw = String(value ?? '').replace(/\0/g, '');
-    return raw === ' ' ? ' ' : safeText(raw, 256);
-}
+function safeText(value, maxLength = 1000) {
+    return String(value ?? '').replace(/\0/g, '').trim().slice(0, maxLength);
+}
+
+function normalizeClientUpdateVerifiedProof(device, message, receivedAt) {
+    const operationId = safeString(message?.operationId, 180);
+    const attemptId = safeString(message?.attemptId, 180);
+    const productVersion = safeString(message?.productVersion, 40);
+    const agentVersion = safeString(message?.agentVersion, 40);
+    const completedAt = safeString(message?.completedAt, 64);
+    const launcherPid = Math.max(0, Math.floor(Number(message?.launcherPid) || 0));
+    const agentPid = Math.max(0, Math.floor(Number(message?.agentPid) || 0));
+    const supervisorPid = Math.max(0, Math.floor(Number(message?.supervisorPid) || 0));
+    if (!operationId
+        || !attemptId
+        || !productVersion
+        || !agentVersion
+        || !Number.isFinite(Date.parse(completedAt))
+        || launcherPid <= 1
+        || agentPid <= 1
+        || supervisorPid <= 1
+        || agentPid !== Number(device?.pid || 0)
+        || productVersion !== String(device?.productVersion || '')
+        || agentVersion !== String(device?.agentVersion || '')) {
+        return null;
+    }
+    return {
+        operationId,
+        attemptId,
+        sessionId: String(device.sessionId || ''),
+        launcherPid,
+        agentPid,
+        supervisorPid,
+        productVersion,
+        agentVersion,
+        completedAt,
+        receivedAt
+    };
+}
+
+function normalizeRemoteKeyboardKey(value) {
+    const raw = String(value ?? '').replace(/\0/g, '');
+    return raw === ' ' ? ' ' : safeString(raw, 80);
+}
+
+function normalizeRemoteKeyboardText(value) {
+    const raw = String(value ?? '').replace(/\0/g, '');
+    return raw === ' ' ? ' ' : safeText(raw, 256);
+}
 
 function safeTaskData(value) {
     if (value === undefined || value === null) return undefined;
@@ -1248,14 +1248,14 @@ function readRawRemoteInputMonitorIndex(input) {
     return undefined;
 }
 
-function normalizeRemoteInputEvent(value = {}) {
+function normalizeRemoteInputEvent(value = {}) {
     const input = value && typeof value === 'object' ? value : {};
     const type = safeString(input.type || input.Type, 48);
     const normalizedX = Number(input.normalizedX ?? input.NormalizedX);
     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 keyCode = Number(input.keyCode ?? input.KeyCode);
     const location = Number(input.location ?? input.Location);
     const monitorIndex = parseExactLiveStreamMonitorIndex(readRawRemoteInputMonitorIndex(input));
     const inputSeq = Number(input.inputSeq ?? input.InputSeq);
@@ -1263,18 +1263,18 @@ function normalizeRemoteInputEvent(value = {}) {
     const hubReceivedAtEpochMs = Number(input.hubReceivedAtEpochMs ?? input.HubReceivedAtEpochMs);
     const captureGeneration = Number(input.captureGeneration ?? input.CaptureGeneration);
     const rawPressedCodes = input.pressedCodes ?? input.PressedCodes;
-    const pressedCodes = Array.isArray(rawPressedCodes)
+    const pressedCodes = Array.isArray(rawPressedCodes)
         ? [...new Set(rawPressedCodes
             .map(code => safeString(code, 80))
             .filter(Boolean))]
             .slice(0, 64)
-        : null;
-    const key = normalizeRemoteKeyboardKey(input.key ?? input.Key);
-    let code = safeString(input.code ?? input.Code, 80);
-    if ((!code || code === 'Unidentified') && (key === ' ' || key === 'Spacebar' || keyCode === 32)) {
-        code = 'Space';
-    }
-    return {
+        : null;
+    const key = normalizeRemoteKeyboardKey(input.key ?? input.Key);
+    let code = safeString(input.code ?? input.Code, 80);
+    if ((!code || code === 'Unidentified') && (key === ' ' || key === 'Spacebar' || keyCode === 32)) {
+        code = 'Space';
+    }
+    return {
         type,
         // A missing monitor is not equivalent to the primary display. Control
         // input must prove the exact monitor owned by its capture generation.
@@ -1284,11 +1284,11 @@ function normalizeRemoteInputEvent(value = {}) {
         button: safeString(input.button || input.Button, 24),
         deltaX: Number.isFinite(deltaX) ? Math.max(-4096, Math.min(4096, deltaX)) : 0,
         deltaY: Number.isFinite(deltaY) ? Math.max(-4096, Math.min(4096, deltaY)) : 0,
-        key,
-        code,
+        key,
+        code,
         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: normalizeRemoteKeyboardText(input.text ?? input.Text),
+        text: normalizeRemoteKeyboardText(input.text ?? input.Text),
         repeat: input.repeat === true || input.Repeat === true,
         pressedCodes,
         shiftKey: input.shiftKey === true || input.ShiftKey === true,
@@ -1399,7 +1399,7 @@ function buildRemoteFramePath(deviceId, frameKind, frame) {
     return `/api/remote/devices/${encodeURIComponent(deviceId)}/${endpoint}?${params.toString()}`;
 }
 
-function serializeRemoteFrame(frame, deviceId, frameKind, options = {}) {
+function serializeRemoteFrame(frame, deviceId, frameKind, options = {}) {
     if (!frame) {
         return null;
     }
@@ -1421,27 +1421,27 @@ function serializeRemoteFrame(frame, deviceId, frameKind, options = {}) {
         serialized.dataUrl = dataUrl || buildFrameDataUrl(payload, '', publicFrame.mimeType || publicFrame.format || 'image/jpeg');
     }
 
-    return serialized;
-}
-
-function serializeActiveLiveStream(activeLiveStream, deviceId) {
-    if (!activeLiveStream) {
-        return null;
-    }
-
-    return {
-        ...activeLiveStream,
-        // The active descriptor is status metadata. Preserve the Hub's exact
-        // internal frame owner for delivery, but never copy encoded bytes or
-        // its access token into a browser status snapshot.
-        latestFrame: serializeRemoteFrame(
-            activeLiveStream.latestFrame,
-            deviceId,
-            'live',
-            { includeDataUrl: false }
-        )
-    };
-}
+    return serialized;
+}
+
+function serializeActiveLiveStream(activeLiveStream, deviceId) {
+    if (!activeLiveStream) {
+        return null;
+    }
+
+    return {
+        ...activeLiveStream,
+        // The active descriptor is status metadata. Preserve the Hub's exact
+        // internal frame owner for delivery, but never copy encoded bytes or
+        // its access token into a browser status snapshot.
+        latestFrame: serializeRemoteFrame(
+            activeLiveStream.latestFrame,
+            deviceId,
+            'live',
+            { includeDataUrl: false }
+        )
+    };
+}
 
 function getRecentFrameCache(device, frameKind) {
     if (!device) {
@@ -1632,7 +1632,7 @@ function serializeDevice(device, options = {}) {
         },
         latestThumbnail: serializeRemoteFrame(device.latestThumbnail, device.deviceId, 'thumbnail', options),
         latestLiveFrame: serializeRemoteFrame(device.latestLiveFrame, device.deviceId, 'live', options),
-        activeLiveStream: serializeActiveLiveStream(device.activeLiveStream, device.deviceId),
+        activeLiveStream: serializeActiveLiveStream(device.activeLiveStream, device.deviceId),
         liveCapturePause: device.liveCapturePause
             ? {
                 token: device.liveCapturePause.token,
@@ -1662,9 +1662,9 @@ function serializeDevice(device, options = {}) {
                 byteLength: device.latestAudioFrame.byteLength
             }
             : null,
-        latestAudioStatus: device.latestAudioStatus ? { ...device.latestAudioStatus } : null,
-        clientUpdateProof: device.clientUpdateProof ? { ...device.clientUpdateProof } : null,
-        udp: device.udp ? { ...device.udp } : { enabled: false, state: 'tcp-only', ready: false },
+        latestAudioStatus: device.latestAudioStatus ? { ...device.latestAudioStatus } : null,
+        clientUpdateProof: device.clientUpdateProof ? { ...device.clientUpdateProof } : null,
+        udp: device.udp ? { ...device.udp } : { enabled: false, state: 'tcp-only', ready: false },
         latestTask: device.latestTask ? { ...device.latestTask } : null,
         synthetic: device.synthetic === true,
         recentTasks: Array.isArray(device.recentTasks)
@@ -4464,9 +4464,9 @@ export function createRemoteHub(options = {}) {
             liveCapturePause: existing?.liveCapturePause || null,
             activeAudioStream: null,
             latestAudioFrame: null,
-            latestAudioStatus: null,
-            clientUpdateProof: null,
-            udp: {
+            latestAudioStatus: null,
+            clientUpdateProof: null,
+            udp: {
                 enabled: capabilities.udpP2p === true,
                 state: 'tcp-only',
                 ready: false,
@@ -7479,7 +7479,7 @@ export function createRemoteHub(options = {}) {
                 device.counters.statusReceived += 1;
                 emitRemoteEvent('RemoteDeviceStatus', device);
                 break;
-            case 'command.result':
+            case 'command.result':
             case 'command.error':
                 device.counters.commandResultsReceived += 1;
                 {
@@ -7507,23 +7507,23 @@ export function createRemoteHub(options = {}) {
                     commandId: safeString(message.commandId, 128),
                     result: message.result ?? null,
                     error: safeString(message.error, 500)
-                });
-                break;
-            case 'client.update.verified': {
-                const receivedAt = new Date().toISOString();
-                const proof = normalizeClientUpdateVerifiedProof(device, message, receivedAt);
-                if (!proof) {
-                    logWarn(
-                        'remote',
-                        `ignored invalid Client update supervisor proof from ${device.deviceName} (${device.deviceId})`
-                    );
-                    break;
-                }
-                device.clientUpdateProof = proof;
-                emitRemoteEvent('RemoteClientUpdateVerified', device, { proof });
-                break;
-            }
-            case 'input.applied':
+                });
+                break;
+            case 'client.update.verified': {
+                const receivedAt = new Date().toISOString();
+                const proof = normalizeClientUpdateVerifiedProof(device, message, receivedAt);
+                if (!proof) {
+                    logWarn(
+                        'remote',
+                        `ignored invalid Client update supervisor proof from ${device.deviceName} (${device.deviceId})`
+                    );
+                    break;
+                }
+                device.clientUpdateProof = proof;
+                emitRemoteEvent('RemoteClientUpdateVerified', device, { proof });
+                break;
+            }
+            case 'input.applied':
             case 'input.error':
                 handleRemoteInputOutcome(device, message, 'main');
                 break;
@@ -9705,39 +9705,39 @@ export function createRemoteHub(options = {}) {
                 liveStreamReplacementStillPending(activeLiveStream)
                     ? 'stream-restart-superseded'
                     : 'stream-start-timeout');
-        }
-        const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
-        const restartToken = safeString(options.restartToken, 128);
-        if (activeLiveStream
-            && options.forceRestart === true
-            && restartToken
-            && safeString(activeLiveStream.restartToken, 128) === restartToken
-            && liveStreamMatchesOptions(activeLiveStream, normalized)
-            && liveStreamIsReusable(activeLiveStream)) {
-            emitRemoteEvent('RemoteLiveStreamRestartTokenReused', device, {
-                streamId,
-                commandId: activeLiveStream.commandId,
-                restartToken,
-                captureGeneration: Number(activeLiveStream.captureGeneration || 0)
-            });
-            return {
-                ok: true,
-                commandId: activeLiveStream.commandId,
-                sessionId: device.sessionId,
-                streamId,
-                streamPurpose,
-                fps: Number(activeLiveStream.fps || fps),
-                mode: activeLiveStream.mode || transfer.mode,
-                frameMode: activeLiveStream.frameMode || transfer.frameMode,
-                monitorIndex: Number(activeLiveStream.monitorIndex ?? monitorIndex),
-                captureGeneration: Number(activeLiveStream.captureGeneration || 0),
-                ready: liveStreamHasCurrentFrame(activeLiveStream),
-                pending: activeLiveStream.open !== true,
-                reused: true
-            };
-        }
-        if (activeLiveStream
-            && options.forceRestart !== true
+        }
+        const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
+        const restartToken = safeString(options.restartToken, 128);
+        if (activeLiveStream
+            && options.forceRestart === true
+            && restartToken
+            && safeString(activeLiveStream.restartToken, 128) === restartToken
+            && liveStreamMatchesOptions(activeLiveStream, normalized)
+            && liveStreamIsReusable(activeLiveStream)) {
+            emitRemoteEvent('RemoteLiveStreamRestartTokenReused', device, {
+                streamId,
+                commandId: activeLiveStream.commandId,
+                restartToken,
+                captureGeneration: Number(activeLiveStream.captureGeneration || 0)
+            });
+            return {
+                ok: true,
+                commandId: activeLiveStream.commandId,
+                sessionId: device.sessionId,
+                streamId,
+                streamPurpose,
+                fps: Number(activeLiveStream.fps || fps),
+                mode: activeLiveStream.mode || transfer.mode,
+                frameMode: activeLiveStream.frameMode || transfer.frameMode,
+                monitorIndex: Number(activeLiveStream.monitorIndex ?? monitorIndex),
+                captureGeneration: Number(activeLiveStream.captureGeneration || 0),
+                ready: liveStreamHasCurrentFrame(activeLiveStream),
+                pending: activeLiveStream.open !== true,
+                reused: true
+            };
+        }
+        if (activeLiveStream
+            && options.forceRestart !== true
             && options.reuseExisting === true
             && liveStreamMatchesOptions(activeLiveStream, normalized)
             && liveStreamIsReusable(activeLiveStream)) {
@@ -9867,7 +9867,7 @@ export function createRemoteHub(options = {}) {
             monitorIndex,
             monitorCount: 1,
             startedAt: now,
-            restartToken,
+            restartToken,
             stoppedAt: '',
             stopReason: '',
             stopPending: false,