livedesk 0.1.458 → 0.1.460

package/bin/livedesk.js

@@ -334,6 +334,7 @@ Usage:
   npx -y --prefer-online livedesk@latest --force-role hub
   npx -y --prefer-online livedesk@latest --force-role client
   npx -y --prefer-online livedesk@latest diagnose mac-physical
+  npx -y --prefer-online livedesk@latest diagnose transport-physical
 
 Commands:
   No command     Resolve the signed-in device role and start the matching runtime.
@@ -341,6 +342,8 @@ Commands:
   client         Legacy alias for --force-role client.
   diagnose mac-physical
                  Run the isolated two-display macOS capture/control physical gate.
+  diagnose transport-physical
+                 Prove Direct, UDP P2P, encrypted relay, and Direct recovery on a current stream.
 
 Hub options:
   --no-open      Do not open the browser automatically.
@@ -397,11 +400,24 @@ Options:
 async function runDiagnosticCommand(args) {
   const name = String(args[0] || '').trim().toLowerCase();
   if (!name || name === '--help' || name === '-h' || name === 'help') {
-    printMacPhysicalDiagnosticHelp();
+    printHelp();
+    return;
+  }
+  if (name === 'transport-physical') {
+    const diagnosticEntry = resolve(
+      packageRoot,
+      'diagnostics',
+      'livedesk-transport-physical.mjs'
+    );
+    if (!existsSync(diagnosticEntry)) {
+      throw new Error(`LiveDesk transport-physical diagnostic is missing from this package: ${diagnosticEntry}`);
+    }
+    const diagnostic = await import(pathToFileURL(diagnosticEntry).href);
+    await diagnostic.runTransportPhysicalDiagnosticCli(args.slice(1));
     return;
   }
   if (name !== 'mac-physical') {
-    throw new Error(`Unknown LiveDesk diagnostic: ${name}. Supported diagnostic: mac-physical.`);
+    throw new Error(`Unknown LiveDesk diagnostic: ${name}. Supported diagnostics: mac-physical, transport-physical.`);
   }
   if (args.slice(1).some(argument => ['--help', '-h', 'help'].includes(String(argument).toLowerCase()))) {
     printMacPhysicalDiagnosticHelp();
@@ -2931,14 +2947,6 @@ async function main() {
     await runLegacyClientUpdateSupervisorCli();
     return;
   }
-  const roleStateOptions = {
-    stateDir: MANAGER_STATE_DIR,
-    legacyClientStateDir: process.env.LIVEDESK_LEGACY_CLIENT_STATE_DIR
-  };
-  migrateLegacyClientState({
-    stateDir: MANAGER_STATE_DIR,
-    legacyClientStateDir: process.env.LIVEDESK_LEGACY_CLIENT_STATE_DIR
-  });
   const topLevel = parseTopLevelArgs(rawArgs);
   if (topLevel.debug) {
     process.env.LIVEDESK_DEBUG = '1';
@@ -2953,10 +2961,37 @@ async function main() {
     console.log(readVersion());
     return;
   }
-  await assertNoActiveMacPhysicalDiagnosticLease();
   const explicitRoleCommand = command === 'hub' || command === 'manager' || command === 'client';
-  let resolvedRole;
-  let runtimeArgs = args;
+  if (explicitRoleCommand) {
+    const commandArgs = args.slice(1).map(value => String(value || '').trim().toLowerCase());
+    if (commandArgs.some(value => value === '--help' || value === '-h' || value === 'help')) {
+      if (command === 'client') {
+        console.warn('[LiveDesk] Legacy client command detected. Use `npx -y --prefer-online livedesk@latest` for automatic role selection.');
+        printClientHelp();
+      } else {
+        printHelp();
+      }
+      return;
+    }
+    if (commandArgs.some(value => value === '--version' || value === '-v' || value === 'version')) {
+      if (command === 'client') {
+        console.warn('[LiveDesk] Legacy client command detected. Use `npx -y --prefer-online livedesk@latest` for automatic role selection.');
+      }
+      console.log(readVersion());
+      return;
+    }
+  }
+  await assertNoActiveMacPhysicalDiagnosticLease();
+  const roleStateOptions = {
+    stateDir: MANAGER_STATE_DIR,
+    legacyClientStateDir: process.env.LIVEDESK_LEGACY_CLIENT_STATE_DIR
+  };
+  migrateLegacyClientState({
+    stateDir: MANAGER_STATE_DIR,
+    legacyClientStateDir: process.env.LIVEDESK_LEGACY_CLIENT_STATE_DIR
+  });
+  let resolvedRole;
+  let runtimeArgs = args;
   if (explicitRoleCommand) {
     const role = command === 'client' ? 'client' : 'hub';
     resolvedRole = await resolveDeviceRole({ forcedRole: role, ...roleStateOptions });
@@ -3075,20 +3110,12 @@ async function main() {
   }
 
   if (command === 'client') {
-    if (args.slice(1).some(arg => arg === '--help' || arg === '-h' || arg === 'help')) {
-      printClientHelp();
-      return;
-    }
     await runClient(runtimeArgs, resolvedRole, lock);
-    return;
-  }
-  if (command === 'hub' || command === 'manager') {
-    if (args.slice(1).some(arg => arg === '--help' || arg === '-h' || arg === 'help')) {
-      printHelp();
-      return;
-    }
+    return;
+  }
+  if (command === 'hub' || command === 'manager') {
     await runManager(runtimeArgs, resolvedRole, lock);
-    return;
+    return;
   }
   if (resolvedRole.role === 'client') {
     await runClient(runtimeArgs, resolvedRole, lock);

package/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.212",
+  "version": "0.1.213",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -40,10 +40,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.416",
-    "@livedesk/fast-osx-arm64": "0.1.416",
-    "@livedesk/fast-osx-x64": "0.1.416",
-    "@livedesk/fast-win-x64": "0.1.416"
+    "@livedesk/fast-linux-x64": "0.1.417",
+    "@livedesk/fast-osx-arm64": "0.1.417",
+    "@livedesk/fast-osx-x64": "0.1.417",
+    "@livedesk/fast-win-x64": "0.1.417"
   },
   "publishConfig": {
     "access": "public"

package/diagnostics/livedesk-mode3-capture-smoke.mjs

@@ -129,7 +129,15 @@ const requestedHeight = heightArgumentIndex >= 0
 const transitionToMode5 = process.argv.includes('--transition-mode5');
 const switchMonitor = process.argv.includes('--switch-monitor') || isMacPhysicalGate;
 const verifyMonitorPixels = process.argv.includes('--verify-monitor-pixels') || isMacPhysicalGate;
+const windowsInputAck = process.argv.includes('--windows-input-ack');
+const windowsInputHookLateStart = process.argv.includes('--windows-input-hook-late-start');
 const legacyFfmpegFirst = process.argv.includes('--legacy-ffmpeg-first');
+if (windowsInputAck && !isWindows) {
+  throw new Error('The Windows native input ACK diagnostic requires Windows hardware.');
+}
+if (windowsInputHookLateStart && !windowsInputAck) {
+  throw new Error('The Windows hook late-start diagnostic requires --windows-input-ack.');
+}
 const reportArgumentIndex = rawArguments.findIndex(
   argument => argument === '--report' || argument === '--gate-report'
 );
@@ -468,6 +476,150 @@ async function runMacModifierProbe(binding) {
   };
 }
 
+async function runWindowsInputAckProbe(binding, { expectHookLateStartFailure = false } = {}) {
+  const socket = new WebSocket(`ws://127.0.0.1:${httpPort}/api/remote/input/ws`, {
+    perMessageDeflate: false
+  });
+  const sendInput = async (input, timeoutMs = 5_000) => {
+    const outcome = waitForWebSocketJson(
+      socket,
+      message => (
+        (message.type === 'RemoteInputApplied' || message.type === 'RemoteInputError')
+        && Number(message.inputSeq) === Number(input.inputSeq)
+      ),
+      timeoutMs
+    );
+    socket.send(JSON.stringify({
+      type: 'input',
+      requestId: input.inputEventId,
+      deviceId: binding.deviceId,
+      input: {
+        ...input,
+        requestAck: true,
+        issuedAtEpochMs: Date.now(),
+        monitorIndex: binding.monitorIndex,
+        controlSessionId: binding.sessionId,
+        controlCommandId: binding.commandId,
+        captureGeneration: binding.captureGeneration
+      }
+    }));
+    return outcome;
+  };
+
+  let resetApplied = false;
+  try {
+    const ready = waitForWebSocketJson(socket, message => message.type === 'RemoteInputSocketReady');
+    await Promise.all([waitForWebSocketOpen(socket), ready]);
+    const probe = await sendInput({
+      type: 'keyboard.probe',
+      inputSeq: 1,
+      inputEventId: `windows-physical-probe-${Date.now()}`,
+      pressedCodes: [],
+      shiftKey: false,
+      ctrlKey: false,
+      altKey: false,
+      metaKey: false,
+      repeat: false
+    });
+    if (expectHookLateStartFailure) {
+      assert.equal(
+        probe.type,
+        'RemoteInputError',
+        'The forced late hook start unexpectedly reached native input injection.'
+      );
+      assert.match(
+        String(probe.error || ''),
+        /diagnostic keyboard isolation hook did not become ready/i,
+        'The forced late hook start did not fail at the bounded ready deadline.'
+      );
+      const reset = await sendInput({
+        type: 'keyboard.reset',
+        inputSeq: 2,
+        inputEventId: `windows-late-start-reset-${Date.now()}`,
+        pressedCodes: [],
+        shiftKey: false,
+        ctrlKey: false,
+        altKey: false,
+        metaKey: false,
+        repeat: false,
+        reason: 'windows-hook-late-start-cleanup'
+      });
+      assert.equal(reset.type, 'RemoteInputApplied', String(reset.error || 'Windows late-start reset failed.'));
+      assert.equal(reset.duplicate, false, 'Windows late-start reset was acknowledged as a duplicate.');
+      resetApplied = true;
+      return {
+        lateStartFailure: true,
+        error: String(probe.error || ''),
+        resetApplied
+      };
+    }
+    assert.equal(probe.type, 'RemoteInputApplied', String(probe.error || 'Windows native input probe failed.'));
+    assert.equal(probe.duplicate, false, 'Windows native input probe was acknowledged as a duplicate.');
+    assert.equal(probe.nativeInputBackend, 'win32-sendinput-hook-isolated');
+    assert.equal(Number(probe.nativeEventsRequested), 8);
+    assert.equal(Number(probe.nativeEventsAccepted), 8);
+    assert.equal(Number(probe.hookEventsObserved), 8);
+    assert.equal(Number(probe.hookEventsBlocked), 8);
+    assert.equal(probe.focusChanged, false, 'Windows native input probe changed the foreground window.');
+    assert.equal(probe.inputDiagnostic, true);
+
+    const reset = await sendInput({
+      type: 'keyboard.reset',
+      inputSeq: 2,
+      inputEventId: `windows-physical-reset-${Date.now()}`,
+      pressedCodes: [],
+      shiftKey: false,
+      ctrlKey: false,
+      altKey: false,
+      metaKey: false,
+      repeat: false,
+      reason: 'windows-native-input-diagnostic-cleanup'
+    });
+    assert.equal(reset.type, 'RemoteInputApplied', String(reset.error || 'Windows native input reset failed.'));
+    assert.equal(reset.duplicate, false, 'Windows native input reset was acknowledged as a duplicate.');
+    resetApplied = true;
+    return {
+      backend: String(probe.nativeInputBackend || ''),
+      requested: Number(probe.nativeEventsRequested || 0),
+      accepted: Number(probe.nativeEventsAccepted || 0),
+      hookObserved: Number(probe.hookEventsObserved || 0),
+      hookBlocked: Number(probe.hookEventsBlocked || 0),
+      duplicate: probe.duplicate === true,
+      focusChanged: probe.focusChanged === true,
+      resetApplied
+    };
+  } finally {
+    if (!resetApplied && socket.readyState === WebSocket.OPEN) {
+      try {
+        socket.send(JSON.stringify({
+          type: 'input',
+          deviceId: binding.deviceId,
+          fireAndForget: true,
+          input: {
+            type: 'keyboard.reset',
+            inputSeq: 0,
+            requestAck: false,
+            pressedCodes: [],
+            shiftKey: false,
+            ctrlKey: false,
+            altKey: false,
+            metaKey: false,
+            repeat: false,
+            reason: 'windows-native-input-diagnostic-finally',
+            monitorIndex: binding.monitorIndex,
+            controlSessionId: binding.sessionId,
+            controlCommandId: binding.commandId,
+            captureGeneration: binding.captureGeneration
+          }
+        }));
+      } catch {
+        // Closing the exact input owner also triggers RemoteFast ReleaseAll.
+      }
+    }
+    try { socket.close(); } catch {}
+  }
+}
+
 async function decodeKeyFrame(accessUnit, label) {
   const directory = await mkdtemp(path.join(tmpdir(), `livedesk-${label}-`));
   const inputPath = path.join(directory, 'frame.h264');
@@ -1044,6 +1196,10 @@ try {
         LIVEDESK_UDP_PREFER_P2P: '0',
         LIVEDESK_RELAY_ENABLED: '0'
       } : {}),
+      ...(windowsInputAck ? { LIVEDESK_INPUT_DIAGNOSTIC: '1' } : {}),
+      ...(windowsInputHookLateStart ? {
+        LIVEDESK_INPUT_DIAGNOSTIC_HOOK_START_DELAY_MS: '2500'
+      } : {}),
       LIVEDESK_FFMPEG: legacyFfmpegFirst ? ffmpegPath : ffmpegStaticPath,
       LIVEDESK_FFMPEG_PATHS: (legacyFfmpegFirst
         ? [ffmpegPath, ffmpegStaticPath]
@@ -1126,6 +1282,7 @@ try {
   }));
 
   const frames = await withMacDiagnosticAbort(framePromise, cancelFrameWait);
+  let activeInputBindingFrame = frames.at(-1);
   const initialCaptureIdentity = switchMonitor && isWindows
     ? await waitFor(
         () => findWindowsCaptureIdentity(agentLogs, requestedMonitorIndex),
@@ -1294,6 +1451,7 @@ try {
         )
       : null;
     const firstSwitchedFrame = switchedFrames[0];
+    activeInputBindingFrame = switchedFrames.at(-1);
     const switchedFirstFrameMs = firstSwitchedFrame.receivedAt - switchedAt;
     assert.equal(firstSwitchedFrame.metadata.isKeyFrame, true, 'Mode 3 monitor transition did not start on a key frame.');
     assert.notEqual(String(firstSwitchedFrame.metadata.commandId || ''), previousCommandId, 'Mode 3 monitor transition reused the previous command binding.');
@@ -1405,6 +1563,31 @@ try {
     console.log(`Mode 3 monitor transition OK: ${requestedMonitorIndex} -> ${nextMonitorIndex}, first frame ${switchedFirstFrameMs.toFixed(0)}ms, generation ${previousCaptureGeneration} -> ${firstSwitchedFrame.metadata.captureGeneration}.`);
   }
 
+  if (windowsInputAck) {
+    const inputProbe = await runWindowsInputAckProbe({
+      deviceId: connectedDeviceId,
+      sessionId: String(activeInputBindingFrame.metadata.sessionId || ''),
+      commandId: String(activeInputBindingFrame.metadata.commandId || ''),
+      captureGeneration: Number(activeInputBindingFrame.metadata.captureGeneration || 0),
+      monitorIndex: Number(activeInputBindingFrame.metadata.monitorIndex || 0)
+    }, {
+      expectHookLateStartFailure: windowsInputHookLateStart
+    });
+    if (windowsInputHookLateStart) {
+      console.log(
+        `Windows diagnostic hook late-start cleanup OK: expected timeout, `
+        + `Agent responsive, reset=${inputProbe.resetApplied}.`
+      );
+    } else {
+      console.log(
+        `Windows native modifier input ACK: ${inputProbe.accepted}/${inputProbe.requested} `
+        + `via ${inputProbe.backend}, hook=${inputProbe.hookObserved}/${inputProbe.hookBlocked}, `
+        + `duplicate=${inputProbe.duplicate}, `
+        + `focusChanged=${inputProbe.focusChanged}, reset=${inputProbe.resetApplied}.`
+      );
+    }
+  }
+
   if (transitionToMode5) {
     const previousFrameSocket = frameSocket;
     frameSocket = new WebSocket(`ws://127.0.0.1:${httpPort}/api/remote/frames/ws?devices=${encodeURIComponent(connectedDeviceId)}`);