Handle ValueError on keyboard press

backend/systembridgebackend/server/keyboard.py

@@ -27,7 +27,16 @@ async def handler_keyboard(
         )
 
     if "key" in request.json:
-        keyboard_keypress(request.json["key"])
+        try:
+            keyboard_keypress(request.json["key"])
+        except ValueError as err:
+            return json(
+                {
+                    "message": err.args[0],
+                },
+                status=400,
+            )
+
         return json(
             {
                 "message": "Keypress sent",

backend/systembridgebackend/server/websocket.py

@@ -1,6 +1,6 @@
 """System Bridge: WebSocket handler"""
-from json import JSONDecodeError, dumps, loads
 from collections.abc import Callable
+from json import JSONDecodeError, dumps, loads
 from uuid import uuid4
 
 from systembridgeshared.base import Base
@@ -176,7 +176,20 @@ async def handler(self) -> None:
                         )
                         continue
 
-                    keyboard_keypress(data["key"])
+                    try:
+                        keyboard_keypress(data["key"])
+                    except ValueError as err:
+                        self._logger.warning(err.args[0])
+                        await self._websocket.send(
+                            dumps(
+                                {
+                                    EVENT_TYPE: TYPE_ERROR,
+                                    EVENT_SUBTYPE: SUBTYPE_MISSING_KEY,
+                                    EVENT_MESSAGE: "Invalid key",
+                                }
+                            )
+                        )
+                        continue
 
                     await self._websocket.send(
                         dumps(

connector/systembridgeconnector/const.py

@@ -22,6 +22,7 @@
 # Event Types
 SUBTYPE_BAD_API_KEY = "BAD_API_KEY"
 SUBTYPE_BAD_JSON = "BAD_JSON"
+SUBTYPE_BAD_KEY = "MISSING_KEY"
 SUBTYPE_LISTENER_ALREADY_REGISTERED = "LISTENER_ALREADY_REGISTERED"
 SUBTYPE_LISTENER_NOT_REGISTERED = "LISTENER_NOT_REGISTERED"
 SUBTYPE_MISSING_API_KEY = "MISSING_API_KEY"

shared/systembridgeshared/const.py

@@ -39,6 +39,7 @@
 # Event Types
 SUBTYPE_BAD_API_KEY = "BAD_API_KEY"
 SUBTYPE_BAD_JSON = "BAD_JSON"
+SUBTYPE_BAD_KEY = "MISSING_KEY"
 SUBTYPE_LISTENER_ALREADY_REGISTERED = "LISTENER_ALREADY_REGISTERED"
 SUBTYPE_LISTENER_NOT_REGISTERED = "LISTENER_NOT_REGISTERED"
 SUBTYPE_MISSING_API_KEY = "MISSING_API_KEY"