fix: resolved a bunch of bugs

I don't what bugs I resolved because most of them were a couple months old and I
don't remember anymore.

Author: eeriemyxi

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mechvibes-lite"
-version = "0.3.1"
+version = "0.3.2"
 description = "A lightweight backend for Mechvibes."
 readme = "README.md"
 authors = [

src/mechvibes_lite/__main__.py

@@ -1,29 +1,31 @@
 import argparse
 import asyncio
 import importlib.metadata
-import kisesi
 import pathlib
 import sys
 import threading
 
-import pyglet.app
-import pyglet.media
+import kisesi
 import websockets.exceptions
 from websockets.asyncio.client import connect
 
-from mechvibes_lite import audio, const, struct, util, wskey
+from mechvibes_lite import const, struct, util, wskey
 
 log = kisesi.get_logger(__name__)
 
 
 async def start_wskey_listener(theme_path, wskey_host, wskey_port) -> None:
+    from mechvibes_lite import audio
+
+    log.debug(f"Started wskey listener {wskey_host=} {wskey_port=}")
     theme = struct.Theme.from_config(theme_path / "config.json", theme_path)
     keyplayer = audio.KeyPlayer(theme)
 
     async for websocket in connect(
         f"ws://{wskey_host}:{wskey_port}", ping_timeout=None
     ):
         try:
+            log.debug("Got a connection...")
             async for message in websocket:
                 code = int(message)
                 log.debug("Received scan code: %s", code)
@@ -54,6 +56,10 @@ def cmd_wskey_daemon(host, port, event_path=None) -> None:
 
 
 def cmd_daemon(theme_path, wskey_host, wskey_port) -> None:
+    import pyglet.app
+    import pyglet.media
+
+    log.debug("Starting daemon")
     pyglet.options["headless"] = True
     thread = threading.Thread(
         target=asyncio.run,
@@ -154,7 +160,7 @@ def main() -> None:
                 args.theme_folder_name,
                 args.wskey_host,
                 args.wskey_port,
-                event_id=args.event_id,
+                event_id=getattr(args, "event_id", None),
             )
         except (KeyError, FileNotFoundError) as e:
             log.error(e.args[0])

src/mechvibes_lite/audio.py

@@ -1,7 +1,7 @@
-import kisesi
 import pathlib
 from functools import partial
 
+import kisesi
 import pyglet.clock
 import pyglet.media as media
 

src/mechvibes_lite/struct.py

@@ -1,8 +1,9 @@
-import kisesi
 import pathlib
 from dataclasses import dataclass
 from enum import Enum, auto
 
+import kisesi
+
 from mechvibes_lite import util
 
 log = kisesi.get_logger(__name__)
@@ -45,7 +46,9 @@ def __post_init__(self):
 
         self.event_id = util.parse_event_id(self.event_id)
 
-        self.event_path = self.event_path_base / self.event_id
+        self.event_path = (
+            self.event_path_base / self.event_id if self.event_id else None
+        )
         self.theme_path = self.theme_dir / self.theme_folder_name
 
         self.ensure_files_exist()

src/mechvibes_lite/util.py

@@ -5,7 +5,9 @@
 
 def get_config_path(app_name: str) -> pathlib.Path:
     if os.name == "nt":
-        config_dir = os.getenv("APPDATA", pathlib.Path.home() / "AppData" / "Roaming")
+        config_dir = pathlib.Path(
+            os.getenv("APPDATA", pathlib.Path.home() / "AppData" / "Roaming")
+        )
     elif os.name == "posix":
         if sys.platform == "darwin":
             config_dir = pathlib.Path.home() / "Library" / "Application Support"

src/mechvibes_lite/wskey/__init__.py

@@ -1,7 +1,8 @@
-import kisesi
+import asyncio
 import sys
 from functools import partial
 
+import kisesi
 from websockets.asyncio.server import serve
 
 log = kisesi.get_logger(__name__)
@@ -13,14 +14,21 @@ async def keyboard_mod_sender(websocket) -> None:
     log.debug("Sending keys from keyboard_mod_sender")
     import keyboard
 
+    loop = asyncio.get_running_loop()
+
     while True:
-        event = keyboard.read_event()
+        try:
+            event = await loop.run_in_executor(None, keyboard.read_event)
+        except RuntimeError:
+            await asyncio.sleep(0.1)
+            continue
+
         log.debug("Got event: %s", event)
 
         if event.event_type is not keyboard.KEY_UP:
             continue
 
-        log.debug("Sending scancode from event: %s", event)
+        log.debug(f"Sending {event.scan_code=} from {event=}")
 
         await websocket.send(str(event.scan_code))
 
@@ -31,8 +39,6 @@ async def evdev_sender(websocket, *, event_path) -> None:
 
     device = evdev.InputDevice(event_path)
 
-    await websocket.send(str(1))
-
     for event in device.read_loop():
         if event.type != evdev.ecodes.EV_KEY:
             continue
@@ -60,5 +66,6 @@ async def start(host, port, event_path=None) -> None:
     else:
         raise NotImplementedError(f"No listener for {sys.platform} yet")
 
+    log.debug(f"Serving wskey on {host=} {port=}")
     server = await serve(sender, host, port)
     await server.serve_forever()