Merge branch 'main' into feature/conduits

Author: EvieePy

twitchio/client.py

@@ -502,7 +502,7 @@ async def main() -> None:
         self.__waiter.clear()
         await self.login(token=token, load_tokens=load_tokens, save_tokens=save_tokens)
 
-        if with_adapter:
+        if with_adapter and not self._adapter._running:
             await self._adapter.run()
 
         # Dispatch ready event... May change places in the future.

twitchio/web/aio_adapter.py

@@ -176,6 +176,7 @@ def __init__(
         self.router.add_route("POST", self._eventsub_path, self.eventsub_callback)
 
         self._responded: deque[str] = deque(maxlen=5000)
+        self._running: bool = False
 
     def __init_subclass__(cls: type[AiohttpAdapter]) -> None:
         return
@@ -215,6 +216,7 @@ async def close(self, *args: Any, **kwargs: Any) -> None:
 
         self._runner = None
         self._runner_task = None
+        self._running = False
 
     def _task_callback(self, task: asyncio.Task[None]) -> None:
         if not task.done():
@@ -224,6 +226,8 @@ def _task_callback(self, task: asyncio.Task[None]) -> None:
             raise e
 
     async def run(self, host: str | None = None, port: int | None = None) -> None:
+        self._running = True
+
         self._runner = web.AppRunner(self, access_log=None, handle_signals=True)
         await self._runner.setup()
 

twitchio/web/starlette_adapter.py

@@ -175,6 +175,7 @@ def __init__(
         )
         self._closing: bool = False
         self._server: uvicorn.Server | None = None
+        self._running: bool = False
 
     def __repr__(self) -> str:
         return f'{self.__class__.__name__}(host="{self._host}", port={self._port})'
@@ -221,6 +222,7 @@ async def close(self, with_client: bool = True) -> None:
 
         logger.info("Successfully shutdown TwitchIO <%s>.", self.__class__.__qualname__)
         self._closing = False
+        self._running = False
 
     def _task_callback(self, task: asyncio.Task[None]) -> None:
         if not task.done():
@@ -236,6 +238,8 @@ def _task_callback(self, task: asyncio.Task[None]) -> None:
                 logger.exception(e.__context__)
 
     async def run(self, host: str | None = None, port: int | None = None) -> None:
+        self._running = True
+
         self._host = host or self._host
         self._port = port or self._port
 

twitchio/web/utils.py

@@ -86,6 +86,7 @@ class BaseAdapter(abc.ABC):
     client: Client
     _runner_task: asyncio.Task[None] | None
     _eventsub_secret: str | None
+    _running: bool
 
     @abc.abstractmethod
     async def event_startup(self) -> None: ...