@livedesk/hub 0.1.37 → 0.1.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/hub",
-  "version": "0.1.37",
+  "version": "0.1.38",
   "description": "LiveDesk local Hub API and browser frame bridge",
   "type": "module",
   "main": "src/server.js",

package/src/remote-hub.js

@@ -1119,9 +1119,19 @@ function getAccountRouteEndpointReason(endpoint, context = {}) {
     return 'ok';
 }
 
-function safeText(value, maxLength = 1000) {
-    return String(value ?? '').replace(/\0/g, '').trim().slice(0, maxLength);
-}
+function safeText(value, maxLength = 1000) {
+    return String(value ?? '').replace(/\0/g, '').trim().slice(0, maxLength);
+}
+
+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;
@@ -1202,14 +1212,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);
@@ -1217,13 +1227,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;
-    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.
@@ -1233,11 +1248,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: safeString(input.key || input.Key, 80),
-        code: safeString(input.code || input.Code, 80),
+        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: safeText(input.text || input.Text, 256),
+        text: normalizeRemoteKeyboardText(input.text ?? input.Text),
         repeat: input.repeat === true || input.Repeat === true,
         pressedCodes,
         shiftKey: input.shiftKey === true || input.ShiftKey === true,

package/src/server.js

@@ -2710,7 +2710,7 @@ function enqueueFramePacketForClient(ws, packetOwner, meta) {
 }
 // FRAME_LANE_GENERATION_CONTRACT_END
 
-function updateFrameSubscription(ws, payload = {}) {
+function updateFrameSubscription(ws, payload = {}) {
   const previousDeviceIds = ws.liveDeskDeviceIds instanceof Set
     ? new Set(ws.liveDeskDeviceIds)
     : new Set();
@@ -2743,10 +2743,43 @@ function updateFrameSubscription(ws, payload = {}) {
   const targetIds = newlySubscribedIds.length > 0 ? newlySubscribedIds : deviceIds;
   for (const deviceId of targetIds.slice(0, 80)) {
     startFrameSubscriptionLive(ws, 'subscribe', deviceId, { reuseExisting: true });
-  }
-}
-
-function startFrameSubscriptionLive(
+  }
+}
+
+function refreshFrameSubscriptionLive(ws, payload = {}) {
+  if (!ws || ws.readyState !== 1) {
+    return;
+  }
+  const requestedIds = normalizeDeviceIds(payload.deviceIds ?? payload.devices ?? payload.deviceId);
+  const subscribedIds = [...(ws.liveDeskDeviceIds || [])];
+  const targetIds = requestedIds.length > 0
+    ? requestedIds.filter(deviceId => ws.liveDeskDeviceIds?.has?.(deviceId))
+    : subscribedIds;
+  if (targetIds.length === 0) {
+    return;
+  }
+  ws.liveDeskAutoStart = /^(1|true|yes|on|live)$/i.test(String(
+    payload.autoStartLive ?? payload.startLive ?? ws.liveDeskAutoStart ?? ''
+  ));
+  ws.liveDeskLiveOptions = normalizeLiveOptions({
+    ...(ws.liveDeskLiveOptions || {}),
+    ...payload,
+    forceRestart: false,
+    reuseExisting: true,
+    monitorSelections: {
+      ...(ws.liveDeskLiveOptions?.monitorSelections || {}),
+      ...(payload.monitorSelections || {})
+    }
+  });
+  for (const deviceId of targetIds.slice(0, 80)) {
+    startFrameSubscriptionLive(ws, 'watchdog', deviceId, {
+      ...ws.liveDeskLiveOptions,
+      reuseExisting: true
+    });
+  }
+}
+
+function startFrameSubscriptionLive(
   ws,
   reason = 'subscribe',
   onlyDeviceId = '',
@@ -5494,9 +5527,11 @@ frameWss.on('connection', (ws, req) => {
   ws.on('message', data => {
     try {
       const payload = JSON.parse(Buffer.isBuffer(data) ? data.toString('utf8') : String(data || ''));
-      if (payload?.type === 'subscribe') {
-        updateFrameSubscription(ws, payload);
-      } else if (payload?.type === 'restart-live') {
+      if (payload?.type === 'subscribe') {
+        updateFrameSubscription(ws, payload);
+      } else if (payload?.type === 'refresh-live') {
+        refreshFrameSubscriptionLive(ws, payload);
+      } else if (payload?.type === 'restart-live') {
         restartFrameSubscriptionLive(ws, payload);
       }
     } catch {