Merge branch 'main' into feature/conduits

Author: EvieePy

twitchio/client.py

@@ -202,6 +202,8 @@ async def set_adapter(self, adapter: BaseAdapter) -> None:
         if self._setup_called:
             await self._adapter.run()
 
+        self._adapter.client = self
+
     @property
     def tokens(self) -> MappingProxyType[str, TokenMappingData]:
         """Property which returns a read-only mapping of the tokens that are managed by the `Client`.

twitchio/web/starlette_adapter.py

@@ -174,6 +174,7 @@ def __init__(
             on_startup=[self.event_startup],
         )
         self._closing: bool = False
+        self._server: uvicorn.Server | None = None
 
     def __repr__(self) -> str:
         return f'{self.__class__.__name__}(host="{self._host}", port={self._port})'
@@ -215,7 +216,11 @@ async def close(self, with_client: bool = True) -> None:
             if with_client:
                 await self.client.close()
 
+        if self._server:
+            await self._server.shutdown()
+
         logger.info("Successfully shutdown TwitchIO <%s>.", self.__class__.__qualname__)
+        self._closing = False
 
     def _task_callback(self, task: asyncio.Task[None]) -> None:
         if not task.done():
@@ -243,8 +248,10 @@ async def run(self, host: str | None = None, port: int | None = None) -> None:
             timeout_graceful_shutdown=3,
         )
 
-        server: uvicorn.Server = uvicorn.Server(config)
-        self._runner_task = asyncio.create_task(server.serve(), name=f"twitchio-web-adapter:{self.__class__.__qualname__}")
+        self._server = uvicorn.Server(config)
+        self._runner_task = asyncio.create_task(
+            self._server.serve(), name=f"twitchio-web-adapter:{self.__class__.__qualname__}"
+        )
         self._runner_task.add_done_callback(self._task_callback)
 
     async def eventsub_callback(self, request: Request) -> Response: