Added optional evdev dependency

(Pulled in by pynput on Linux anyway)

Author: Game4Move78

Makefile

@@ -1,7 +1,13 @@
 .PHONY: build test package clean
 
+POETRY_EXTRAS =
+
+ifeq ($(USE_EVDEV),true)
+	POETRY_EXTRAS := $(POETRY_EXTRAS) use_evdev
+endif
+
 build:
-	poetry install
+	poetry install --extras "$(POETRY_EXTRAS)"
 
 test:
 	poetry run aw-watcher-afk --help  # Ensures that it at least starts

aw_watcher_afk/listeners.py

@@ -59,9 +59,6 @@ def next_event(self):
     def has_new_event(self):
         return self.keyboard.has_new_event() or self.mouse.has_new_event()
 
-def env_true(envvar):
-    return os.getenv(envvar) == "true"
-
 system = platform.system()
 
 def use_evdev():

aw_watcher_afk/listeners_evdev.py

@@ -66,11 +66,29 @@ class DataListener(AsyncioListener, Generic[TData]):
     def __init__(self) -> None:
         self.data = self._init_data()
 
+    async def reconnect_wait(self):
+        await asyncio.sleep(2)
+
     @abstractmethod
     async def _read_loop(self, dev):
         """Read data from a device"""
         raise NotImplementedError
 
+    async def _read_loop_reconnect(self, dev):
+
+        """Update self.data by reading evdev events"""
+
+        while True:
+            try:
+                dev = InputDevice(dev)
+                logger.debug(f"Connected to {dev.name}")
+                await self._read_loop(dev)
+            except OSError as e:
+                logger.warning(f"Device {dev.path} disconnected: {e}")
+                await self.reconnect_wait()
+            except Exception as e:
+                logger.error(f"Unexpected error in event loop: {e}", exc_info=True)
+
     @abstractmethod
     def _init_data(self) -> TData:
         raise NotImplementedError
@@ -85,7 +103,7 @@ def _create_tasks(self, loop):
         devices = list(self._find_devices())
         assert len(devices), "You may need to add your user to the 'input' group"
         for dev in devices:
-            loop.create_task(self._read_loop(dev))
+            loop.create_task(self._read_loop_reconnect(dev))
 
     def run(self):
         loop = asyncio.new_event_loop()
@@ -135,10 +153,6 @@ def _find_devices(self) -> Iterable[str]:
 
     async def _read_loop(self, dev):
 
-        """Update self.data by reading evdev events"""
-
-        dev = InputDevice(dev)
-
         async for event in dev.async_read_loop():
             # logger.debug(f"Evdev event ({dev.name}): {evdev.categorize(event)}")
             if event.type == ecodes.EV_KEY and event.value == 1:
@@ -186,8 +200,6 @@ async def _read_loop(self, dev):
 
         """Update self.data by reading evdev events"""
 
-        dev = InputDevice(dev)
-
         old_x = None
         old_y = None