remove comments

ui/src/components/WebRTCVideo.tsx

@@ -225,11 +225,8 @@ export default function WebRTCVideo() {
   );
 
   const relMouseMoveHandler = useMemo(
-    () => getRelMouseMoveHandler({
-      isPointerLockActive,
-      isPointerLockPossible,
-    }),
-    [getRelMouseMoveHandler, isPointerLockActive, isPointerLockPossible],
+    () => getRelMouseMoveHandler(),
+    [getRelMouseMoveHandler],
   );
 
   const mouseWheelHandler = useMemo(

ui/src/hooks/stores.ts

@@ -461,9 +461,6 @@ export interface HidState {
   keysDownState: KeysDownState;
   setKeysDownState: (state: KeysDownState) => void;
 
-  keyPressReportApiAvailable: boolean;
-  setkeyPressReportApiAvailable: (available: boolean) => void;
-
   isVirtualKeyboardEnabled: boolean;
   setVirtualKeyboardEnabled: (enabled: boolean) => void;
 
@@ -481,9 +478,6 @@ export const useHidStore = create<HidState>(set => ({
   keysDownState: { modifier: 0, keys: [0,0,0,0,0,0] } as KeysDownState,
   setKeysDownState: (state: KeysDownState): void => set({ keysDownState: state }),
 
-  keyPressReportApiAvailable: true,
-  setkeyPressReportApiAvailable: (available: boolean) => set({ keyPressReportApiAvailable: available }),
-
   isVirtualKeyboardEnabled: false,
   setVirtualKeyboardEnabled: (enabled: boolean): void => set({ isVirtualKeyboardEnabled: enabled }),
 

ui/src/hooks/useHidRpc.ts

@@ -81,8 +81,11 @@ export function useHidRpc(onHidRpcMessage?: (payload: RpcMessage) => void) {
       return;
     }
 
-    if (message.version < HID_RPC_VERSION) {
-      console.error("Server is using an older HID RPC version than the client", message);
+    if (message.version > HID_RPC_VERSION) {
+      // we assume that the UI is always using the latest version of the HID RPC protocol
+      // so we can't support this
+      // TODO: use capabilities to determine rather than version number
+      console.error("Server is using a newer HID RPC version than the client", message);
       return;
     }
 

ui/src/hooks/useKeyboard.ts

@@ -21,23 +21,19 @@ export default function useKeyboard() {
   // dynamically set when the device responds to the first key press event or reports its
   // keysDownState when queried since the keyPressReport was introduced together with the 
   // getKeysDownState API.
-  const { keyPressReportApiAvailable, setkeyPressReportApiAvailable } = useHidStore();
-  const enableKeyPressReport = useCallback((reason: string) => {
-    if (keyPressReportApiAvailable) return;
-    console.debug(`Enable keyPressReport API because ${reason}`);
-    setkeyPressReportApiAvailable(true);
-  }, [setkeyPressReportApiAvailable, keyPressReportApiAvailable]);
 
   // HidRPC is a binary format for exchanging keyboard and mouse events
-  const { reportKeyboardEvent, reportKeypressEvent, rpcHidReady } = useHidRpc((message) => {
+  const {
+    reportKeyboardEvent: sendKeyboardEventHidRpc,
+    reportKeypressEvent: sendKeypressEventHidRpc,
+    rpcHidReady,
+  } = useHidRpc((message) => {
     switch (message.constructor) {
       case KeysDownStateMessage:
         setKeysDownState((message as KeysDownStateMessage).keysDownState);
-        enableKeyPressReport("HidRPC:KeysDownStateMessage received");
         break;
       case KeyboardLedStateMessage:
         setKeyboardLedState((message as KeyboardLedStateMessage).keyboardLedState);
-        enableKeyPressReport("HidRPC:KeyboardLedStateMessage received");
         break;
       default:
         break;
@@ -56,8 +52,7 @@ export default function useKeyboard() {
 
       if (rpcHidReady) {
         console.debug("Sending keyboard report via HidRPC");
-        reportKeyboardEvent(state.keys, state.modifier);
-        enableKeyPressReport("HidRPC:KeyboardReport received");
+        sendKeyboardEventHidRpc(state.keys, state.modifier);
         return;
       }
 
@@ -71,28 +66,7 @@ export default function useKeyboard() {
       rpcDataChannel?.readyState,
       rpcHidReady,
       send,
-      reportKeyboardEvent,
-      enableKeyPressReport,
-    ],
-  );
-
-  // sendKeypressEvent is used to send a single key press/release event to the device.
-  // It sends the key and whether it is pressed or released.
-  // Older device version will not understand this request and will respond with
-  // an error with code -32601, which means that the RPC method name was not recognized.
-  // In that case we will switch to local key handling and update the keysDownState
-  // in client/browser-side code using simulateDeviceSideKeyHandlingForLegacyDevices.
-  const sendKeypressEvent = useCallback(
-    async (key: number, press: boolean) => {
-      console.debug(`Send keypressEvent key: ${key}, press: ${press}`);
-
-      if (!rpcHidReady) return;
-
-      reportKeypressEvent(key, press);
-    },
-    [
-      rpcHidReady,
-      reportKeypressEvent,
+      sendKeyboardEventHidRpc,
     ],
   );
 
@@ -149,14 +123,13 @@ export default function useKeyboard() {
       if ((key || 0) === 0) return; // ignore zero key presses (they are bad mappings)
 
       if (rpcHidReady) {
-        console.debug("Sending keypress event via HidRPC");
-        reportKeypressEvent(key, press);
-        return;
-      }
-
-      if (keyPressReportApiAvailable) {
         // if the keyPress api is available, we can just send the key press event
-        sendKeypressEvent(key, press);
+        // sendKeypressEvent is used to send a single key press/release event to the device.
+        // It sends the key and whether it is pressed or released.
+        // Older device version doesn't support this API, so we will switch to local key handling
+        // In that case we will switch to local key handling and update the keysDownState
+        // in client/browser-side code using simulateDeviceSideKeyHandlingForLegacyDevices.
+        sendKeypressEventHidRpc(key, press);
       } else {
         // if the keyPress api is not available, we need to handle the key locally
         const downState = simulateDeviceSideKeyHandlingForLegacyDevices(keysDownState, key, press);
@@ -169,14 +142,12 @@ export default function useKeyboard() {
       }
     },
     [
-      keyPressReportApiAvailable,
+      rpcHidReady,
       keysDownState,
       resetKeyboardState,
       rpcDataChannel?.readyState,
-      rpcHidReady,
       sendKeyboardEvent,
-      sendKeypressEvent,
-      reportKeypressEvent,
+      sendKeypressEventHidRpc,
     ],
   );
 

ui/src/hooks/useMouse.ts

@@ -13,11 +13,6 @@ export interface AbsMouseMoveHandlerProps {
   videoHeight: number;
 }
 
-export interface RelMouseMoveHandlerProps {
-  isPointerLockActive: boolean;
-  isPointerLockPossible: boolean;
-}
-
 export default function useMouse() {
   // states
   const { setMousePosition, setMouseMove } = useMouseStore();
@@ -55,9 +50,8 @@ export default function useMouse() {
   );
 
   const getRelMouseMoveHandler = useCallback(
-    ({ isPointerLockActive, isPointerLockPossible }: RelMouseMoveHandlerProps) => (e: MouseEvent) => {
+    () => (e: MouseEvent) => {
       if (mouseMode !== "relative") return;
-      if (isPointerLockActive === false && isPointerLockPossible) return;
 
       // Send mouse movement
       const { buttons } = e;

ui/src/routes/devices.$id.tsx

@@ -583,7 +583,6 @@ export default function KvmIdRoute() {
   const { 
     keyboardLedState,  setKeyboardLedState,
     keysDownState, setKeysDownState, setUsbState,
-    setkeyPressReportApiAvailable
   } = useHidStore();
 
   const [hasUpdated, setHasUpdated] = useState(false);
@@ -621,7 +620,6 @@ export default function KvmIdRoute() {
       const downState = resp.params as KeysDownState;
       console.debug("Setting key down state:", downState);
       setKeysDownState(downState);
-      setkeyPressReportApiAvailable(true); // if they returned a keyDownState, we know they also support keyPressReport
     }
 
     if (resp.method === "otaState") {
@@ -698,7 +696,6 @@ export default function KvmIdRoute() {
         if (resp.error.code === -32601) {
           // if we don't support key down state, we know key press is also not available
           console.warn("Failed to get key down state, switching to old-school", resp.error);
-          setkeyPressReportApiAvailable(false);
         } else {
           console.error("Failed to get key down state", resp.error);
         }
@@ -706,11 +703,10 @@ export default function KvmIdRoute() {
         const downState = resp.result as KeysDownState;
         console.debug("Keyboard key down state", downState);
         setKeysDownState(downState);
-        setkeyPressReportApiAvailable(true); // if they returned a keyDownState, we know they also support keyPressReport
       }
       setNeedKeyDownState(false);
     });
-  }, [keysDownState, needKeyDownState, rpcDataChannel?.readyState, send, setkeyPressReportApiAvailable, setKeysDownState]);
+  }, [keysDownState, needKeyDownState, rpcDataChannel?.readyState, send, setKeysDownState]);
 
   // When the update is successful, we need to refresh the client javascript and show a success modal
   useEffect(() => {