Merge branch 'main' into feature/conduits

Author: EvieePy

twitchio/client.py

@@ -171,6 +171,7 @@ def __init__(
         self._ready_event.clear()
 
         self.__waiter: asyncio.Event = asyncio.Event()
+        self._setup_called = False
 
     @property
     def adapter(self) -> BaseAdapter:
@@ -194,10 +195,12 @@ async def set_adapter(self, adapter: BaseAdapter) -> None:
         None
         """
         if self._adapter:
-            await self._adapter.close()
+            await self._adapter.close(False)
 
         self._adapter = adapter
-        await self._adapter.run()
+
+        if self._setup_called:
+            await self._adapter.run()
 
     @property
     def tokens(self) -> MappingProxyType[str, TokenMappingData]:
@@ -439,6 +442,7 @@ async def login(self, *, token: str | None = None, load_tokens: bool = True, sav
 
     async def _setup(self) -> None:
         await self.setup_hook()
+        self._setup_called = True
 
     async def __aenter__(self) -> Self:
         return self

twitchio/web/aio_adapter.py

@@ -199,7 +199,7 @@ async def event_startup(self) -> None:
     async def event_shutdown(self) -> None:
         logger.info("Successfully shutdown TwitchIO <%s>.", self.__class__.__qualname__)
 
-    async def close(self) -> None:
+    async def close(self, *args: Any, **kwargs: Any) -> None:
         if self._runner_task is not None:
             try:
                 self._runner_task.cancel()

twitchio/web/starlette_adapter.py

@@ -194,7 +194,7 @@ async def event_startup(self) -> None:
     async def event_shutdown(self) -> None:
         await self.close()
 
-    async def close(self) -> None:
+    async def close(self, with_client: bool = True) -> None:
         if self._closing:
             return
 
@@ -211,7 +211,9 @@ async def close(self) -> None:
                 )
 
             self._runner_task = None
-            await self.client.close()
+
+            if with_client:
+                await self.client.close()
 
         logger.info("Successfully shutdown TwitchIO <%s>.", self.__class__.__qualname__)
 

twitchio/web/utils.py

@@ -94,7 +94,7 @@ async def event_startup(self) -> None: ...
     async def event_shutdown(self) -> None: ...
 
     @abc.abstractmethod
-    async def close(self) -> None: ...
+    async def close(self, *args: Any, **kwargs: Any) -> None: ...
 
     @abc.abstractmethod
     async def run(self, host: str | None = None, port: int | None = None) -> None: ...