pass the socket as the first arg allowing any thread to signal to exit

Author: mikeshardmind

async_utils/sig_service.py

@@ -23,7 +23,8 @@
 from typing import Any
 
 type SignalCallback = Callable[[signal.Signals], Any]
-type StartStopCall = Callable[[], Any]
+type StartCall = Callable[[socket.socket], Any]
+type StopCall = Callable[[], Any]
 type _HANDLER = Callable[[int, FrameType | None], Any] | int | signal.Handlers | None
 
 __all__ = ["SignalService"]
@@ -36,10 +37,10 @@ class SignalService:
     """Meant for graceful signal handling where the main thread is only used for signal handling.
     This should be paired with event loops being run in threads."""
 
-    def __init__(self, *, startup: list[StartStopCall], signal_cbs: list[SignalCallback], joins: list[StartStopCall]) -> None:
-        self._startup: list[StartStopCall] = startup
+    def __init__(self, *, startup: list[StartCall], signal_cbs: list[SignalCallback], joins: list[StopCall]) -> None:
+        self._startup: list[StartCall] = startup
         self._cbs: list[SignalCallback] = signal_cbs
-        self._joins: list[StartStopCall] = joins
+        self._joins: list[StopCall] = joins
 
     def run(self):
         ss, cs = socket.socketpair()
@@ -56,7 +57,7 @@ def run(self):
                 signal.siginterrupt(sig, False)
 
         for task_start in self._startup:
-            task_start()
+            task_start(cs)
 
         select.select([ss], [], [])
         data, *_ = ss.recv(4096)