hoelee/Telethon
1
0
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-06-18 11:06:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make disconnection more resilient

Browse Source
This commit is contained in:
Lonami Exo 2023-09-12 20:55:25 +02:00
parent f2b8a91fa9
commit 9e5eb619e1
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/telethon/_impl/client/client/client.py
View File

@ -485,7 +485,7 @@ class Client:
return await invoke_request(self, self._sender, self._sender_lock, request) return await invoke_request(self, self._sender, self._sender_lock, request)
async def __aenter__(self) -> Self: async def __aenter__(self) -> Self:
await self.connect() await connect(self)
return self return self
async def __aexit__( async def __aexit__(
@ -495,4 +495,4 @@ class Client:
tb: Optional[TracebackType], tb: Optional[TracebackType],
) -> None: ) -> None:
exc_type, exc, tb exc_type, exc, tb
await self.disconnect() await disconnect(self)

12
client/src/telethon/_impl/client/client/net.py
View File

@ -141,13 +141,23 @@ async def connect(self: Client) -> None:
async def disconnect(self: Client) -> None: async def disconnect(self: Client) -> None:
if not self._sender: if not self._sender:
return return
assert self._dispatcher assert self._dispatcher
self._dispatcher.cancel() self._dispatcher.cancel()
try:
await self._dispatcher await self._dispatcher
except asyncio.CancelledError:
pass
except Exception:
pass # TODO log
finally:
self._dispatcher = None self._dispatcher = None
try:
await self._sender.disconnect() await self._sender.disconnect()
except Exception:
pass # TODO log
finally:
self._sender = None self._sender = None
self._config.session.state = self._message_box.session_state() self._config.session.state = self._message_box.session_state()