livedesk 0.1.432 → 0.1.434

package/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.190",
+  "version": "0.1.191",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -41,10 +41,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.397",
-    "@livedesk/fast-osx-arm64": "0.1.397",
-    "@livedesk/fast-osx-x64": "0.1.397",
-    "@livedesk/fast-win-x64": "0.1.397"
+    "@livedesk/fast-linux-x64": "0.1.398",
+    "@livedesk/fast-osx-arm64": "0.1.398",
+    "@livedesk/fast-osx-x64": "0.1.398",
+    "@livedesk/fast-win-x64": "0.1.398"
   },
   "publishConfig": {
     "access": "public"

package/hub/src/remote-hub.js

@@ -3334,6 +3334,20 @@ export function createRemoteHub(options = {}) {
         return {
             deviceId: device.deviceId,
             commandId: safeString(message.commandId || message.CommandId || pending?.commandId, 128),
+            hubConnectionId: safeString(
+                message.hubConnectionId
+                || message.HubConnectionId
+                || result.hubConnectionId
+                || result.HubConnectionId
+                || pending?.hubConnectionId,
+                128),
+            inputEventId: safeString(
+                message.inputEventId
+                || message.InputEventId
+                || result.inputEventId
+                || result.InputEventId
+                || pending?.inputEventId,
+                128),
             inputSeq,
             inputType: safeString(
                 message.inputType
@@ -4536,23 +4550,12 @@ export function createRemoteHub(options = {}) {
 
         if (state.inputOnly) {
             device.inputLastSeenAt = new Date().toISOString();
-            if (message.type === 'input.applied') {
+            if (message.type === 'input.applied' || message.type === 'input.error') {
                 handleRemoteInputOutcome(device, {
                     ...message,
                     agentApplyMs: Number(message.agentApplyMs || 0) || 0
                 }, 'input');
             }
-            if (message.type === 'input.error') {
-                const pending = takePendingInputFallback(
-                    device,
-                    message.commandId || message.CommandId,
-                    message.inputSeq ?? message.InputSeq);
-                emitEvent('RemoteInputError', {
-                    ...buildRemoteInputOutcome(device, message, pending),
-                    error: safeString(message.error || message.Error, 600) || 'remote-input-failed',
-                    failedAtEpochMs: Number(message.failedAtEpochMs ?? message.FailedAtEpochMs ?? 0) || 0
-                });
-            }
             return;
         }
         if (state.frameOnly) {
@@ -5386,6 +5389,8 @@ export function createRemoteHub(options = {}) {
                 inputSeq: normalized.inputSeq,
                 inputType: normalized.type,
                 monitorIndex: normalized.monitorIndex,
+                hubConnectionId: normalized.hubConnectionId,
+                inputEventId: normalized.inputEventId,
                 issuedAtEpochMs: normalized.issuedAtEpochMs,
                 hubReceivedAtEpochMs: normalized.hubReceivedAtEpochMs,
                 hubForwardedAtEpochMs,

package/hub/src/server.js

@@ -170,19 +170,27 @@ function readPositiveIntegerEnv(name, fallback) {
 function handleRemoteHubEvent(type, event) {
   liveDeskUpdateManager?.handleRemoteEvent(type, event);
   hubTransferJobs?.handleRemoteEvent(type, event);
-  if (type === 'RemoteInputApplied') {
-    for (const ws of inputClients) {
-      sendJson(ws, {
-        type: 'RemoteInputApplied',
-        ...event
+  if (type === 'RemoteInputApplied') {
+    const targetConnectionId = String(event?.hubConnectionId || '').trim();
+    for (const ws of inputClients) {
+      if (targetConnectionId && ws.liveDeskInputClientId !== targetConnectionId) {
+        continue;
+      }
+      sendJson(ws, {
+        type: 'RemoteInputApplied',
+        ...event
       });
     }
     return;
-  }
+  }
   if (type === 'RemoteInputError') {
-    for (const ws of inputClients) {
-      sendJson(ws, {
-        type: 'RemoteInputError',
+    const targetConnectionId = String(event?.hubConnectionId || '').trim();
+    for (const ws of inputClients) {
+      if (targetConnectionId && ws.liveDeskInputClientId !== targetConnectionId) {
+        continue;
+      }
+      sendJson(ws, {
+        type: 'RemoteInputError',
         ...event
       });
     }
@@ -4212,7 +4220,12 @@ inputWss.on('connection', ws => {
       return;
     }
     const deviceId = String(payload?.deviceId || '').trim();
-    const inputEventId = String(payload?.requestId || '').trim() || crypto.randomUUID();
+    const inputEventId = String(
+      payload?.input?.inputEventId
+      || payload?.inputEventId
+      || payload?.requestId
+      || ''
+    ).trim() || crypto.randomUUID();
     const input = payload?.input && typeof payload.input === 'object'
       ? { ...payload.input, inputEventId, hubConnectionId: ws.liveDeskInputClientId, hubReceivedAtEpochMs: Date.now() }
       : { ...payload, inputEventId, hubConnectionId: ws.liveDeskInputClientId, hubReceivedAtEpochMs: Date.now() };
@@ -4224,11 +4237,14 @@ inputWss.on('connection', ws => {
     if (fireAndForget && result?.ok) {
       return;
     }
-    sendJson(ws, {
-      type: result?.ok ? 'RemoteInputQueued' : 'RemoteInputError',
-      requestId: payload?.requestId || '',
-      deviceId,
-      result,
+    sendJson(ws, {
+      type: result?.ok ? 'RemoteInputQueued' : 'RemoteInputError',
+      requestId: payload?.requestId || '',
+      deviceId,
+      inputSeq: Number(input?.inputSeq || 0) || 0,
+      inputEventId: String(input?.inputEventId || ''),
+      hubConnectionId: ws.liveDeskInputClientId,
+      result,
       timestamp: new Date().toISOString()
     });
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "livedesk",
-  "version": "0.1.432",
-  "livedeskClientVersion": "0.1.190",
+  "version": "0.1.434",
+  "livedeskClientVersion": "0.1.191",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
@@ -50,10 +50,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.397",
-    "@livedesk/fast-osx-arm64": "0.1.397",
-    "@livedesk/fast-osx-x64": "0.1.397",
-    "@livedesk/fast-win-x64": "0.1.397"
+    "@livedesk/fast-linux-x64": "0.1.398",
+    "@livedesk/fast-osx-arm64": "0.1.398",
+    "@livedesk/fast-osx-x64": "0.1.398",
+    "@livedesk/fast-win-x64": "0.1.398"
   },
   "publishConfig": {
     "access": "public"