LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-11-04 01:47:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Attempt at cleaning up TelegramBareClient.invoke()

Browse Source
This commit is contained in:
Lonami Exo 2017-09-30 11:45:35 +02:00
parent 61033b2f56
commit 003e231239
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
telethon/telegram_bare_client.py
View File

@ -91,6 +91,10 @@ class TelegramBareClient:
if self.api_id < 20: # official apps must use obfuscated if self.api_id < 20: # official apps must use obfuscated
connection_mode = ConnectionMode.TCP_OBFUSCATED connection_mode = ConnectionMode.TCP_OBFUSCATED
# This is the main sender, which will be used from the thread
# that calls .connect(). Every other thread will spawn a new
# temporary connection. The connection on this one is always
# kept open so Telegram can send us updates.
self._sender = MtProtoSender(self.session, Connection( self._sender = MtProtoSender(self.session, Connection(
self.session.server_address, self.session.port, self.session.server_address, self.session.port,
mode=connection_mode, proxy=proxy, timeout=timeout mode=connection_mode, proxy=proxy, timeout=timeout
@ -370,7 +374,7 @@ class TelegramBareClient:
# region Invoking Telegram requests # region Invoking Telegram requests
def invoke(self, *requests, call_receive=True, retries=5): def invoke(self, *requests, retries=5):
"""Invokes (sends) a MTProtoRequest and returns (receives) its result. """Invokes (sends) a MTProtoRequest and returns (receives) its result.
The invoke will be retried up to 'retries' times before raising The invoke will be retried up to 'retries' times before raising
@ -383,9 +387,6 @@ class TelegramBareClient:
x.content_related for x in requests): x.content_related for x in requests):
raise ValueError('You can only invoke requests, not types!') raise ValueError('You can only invoke requests, not types!')
if retries <= 0:
raise ValueError('Number of retries reached 0.')
# Determine the sender to be used (main or a new connection) # Determine the sender to be used (main or a new connection)
# TODO Polish this so it's nicer # TODO Polish this so it's nicer
on_main_thread = threading.get_ident() == self._main_thread_ident on_main_thread = threading.get_ident() == self._main_thread_ident
@ -401,6 +402,25 @@ class TelegramBareClient:
sender = MtProtoSender(self.session, conn) sender = MtProtoSender(self.session, conn)
sender.connect() sender.connect()
# We should call receive from this thread if there's no background
# thread reading or if the server disconnected us and we're trying
# to reconnect. This is because the read thread may either be
# locked also trying to reconnect or we may be said thread already.
call_receive = not on_main_thread or \
self._recv_thread is None or self._connect_lock.locked()
try:
for _ in range(retries):
result = self._invoke(sender, call_receive, *requests)
if result:
return result
if retries <= 0:
raise ValueError('Number of retries reached 0.')
finally:
if sender != self._sender:
sender.disconnect() # Close temporary connections
def _invoke(self, sender, call_receive, *requests):
try: try:
# Ensure that we start with no previous errors (i.e. resending) # Ensure that we start with no previous errors (i.e. resending)
for x in requests: for x in requests:
@ -409,13 +429,6 @@ class TelegramBareClient:
sender.send(*requests) sender.send(*requests)
# We should call receive from this thread if there's no background
# thread reading or if the server disconnected us and we're trying
# to reconnect. This is because the read thread may either be
# locked also trying to reconnect or we may be said thread already.
call_receive = not on_main_thread or \
self._recv_thread is None or self._connect_lock.locked()
if not call_receive: if not call_receive:
# TODO This will be slightly troublesome if we allow # TODO This will be slightly troublesome if we allow
# switching between constant read or not on the fly. # switching between constant read or not on the fly.
@ -441,9 +454,7 @@ class TelegramBareClient:
# be on the very first connection (not authorized, not running), # be on the very first connection (not authorized, not running),
# but may be an issue for people who actually travel? # but may be an issue for people who actually travel?
self._reconnect(new_dc=e.new_dc) self._reconnect(new_dc=e.new_dc)
return self.invoke( return self._invoke(sender, call_receive, *requests)
*requests, call_receive=call_receive, retries=(retries - 1)
)
except TimeoutError: except TimeoutError:
pass # We will just retry pass # We will just retry
@ -477,10 +488,8 @@ class TelegramBareClient:
except StopIteration: except StopIteration:
if any(x.result is None for x in requests): if any(x.result is None for x in requests):
# "A container may only be accepted or # "A container may only be accepted or
# rejected by the other party as a whole." # rejected by the other party as a whole."
return self.invoke( return None
*requests, call_receive=call_receive, retries=(retries - 1)
)
elif len(requests) == 1: elif len(requests) == 1:
return requests[0].result return requests[0].result
else: else: