mirror of
https://github.com/LonamiWebs/Telethon.git
synced 2024-11-26 19:33:45 +03:00
863d2e8368
There was a race condition between TelegramBareClient.invoke receiving part and MtProtoSender._handle_rpc_result actually reading the result after setting request.confirmed = True. The .confirmed is now a threading.Event to avoid the sleep(0.1). RPC errors have been moved inside the request so they're not raised on a background thread anymore.
116 lines
3.5 KiB
Python
116 lines
3.5 KiB
Python
from datetime import datetime, timedelta
|
|
from threading import Event
|
|
|
|
|
|
class TLObject:
|
|
def __init__(self):
|
|
self.sent = False
|
|
|
|
self.request_msg_id = 0 # Long
|
|
self.sequence = 0
|
|
|
|
self.dirty = False
|
|
self.send_time = None
|
|
self.confirm_received = Event()
|
|
self.rpc_error = None
|
|
|
|
# These should be overrode
|
|
self.constructor_id = 0
|
|
self.content_related = False # Only requests/functions/queries are
|
|
self.responded = False
|
|
|
|
# These should not be overrode
|
|
def on_send_success(self):
|
|
self.send_time = datetime.now()
|
|
self.sent = True
|
|
|
|
def on_confirm(self):
|
|
self.confirm_received.set()
|
|
|
|
def need_resend(self):
|
|
return self.dirty or (
|
|
self.content_related and not self.confirm_received.is_set() and
|
|
datetime.now() - self.send_time > timedelta(seconds=3))
|
|
|
|
@staticmethod
|
|
def pretty_format(obj, indent=None):
|
|
"""Pretty formats the given object as a string which is returned.
|
|
If indent is None, a single line will be returned.
|
|
"""
|
|
if indent is None:
|
|
if isinstance(obj, TLObject):
|
|
return '{{{}: {}}}'.format(
|
|
type(obj).__name__,
|
|
TLObject.pretty_format(obj.to_dict())
|
|
)
|
|
if isinstance(obj, dict):
|
|
return '{{{}}}'.format(', '.join(
|
|
'{}: {}'.format(
|
|
k, TLObject.pretty_format(v)
|
|
) for k, v in obj.items()
|
|
))
|
|
elif isinstance(obj, str) or isinstance(obj, bytes):
|
|
return repr(obj)
|
|
elif hasattr(obj, '__iter__'):
|
|
return '[{}]'.format(
|
|
', '.join(TLObject.pretty_format(x) for x in obj)
|
|
)
|
|
else:
|
|
return str(obj)
|
|
else:
|
|
result = []
|
|
if isinstance(obj, TLObject):
|
|
result.append('{')
|
|
result.append(type(obj).__name__)
|
|
result.append(': ')
|
|
result.append(TLObject.pretty_format(
|
|
obj.to_dict(), indent
|
|
))
|
|
|
|
elif isinstance(obj, dict):
|
|
result.append('{\n')
|
|
indent += 1
|
|
for k, v in obj.items():
|
|
result.append('\t' * indent)
|
|
result.append(k)
|
|
result.append(': ')
|
|
result.append(TLObject.pretty_format(v, indent))
|
|
result.append(',\n')
|
|
indent -= 1
|
|
result.append('\t' * indent)
|
|
result.append('}')
|
|
|
|
elif isinstance(obj, str):
|
|
result.append('"')
|
|
result.append(obj)
|
|
result.append('"')
|
|
|
|
elif hasattr(obj, '__iter__'):
|
|
result.append('[\n')
|
|
indent += 1
|
|
for x in obj:
|
|
result.append('\t' * indent)
|
|
result.append(TLObject.pretty_format(x, indent))
|
|
result.append(',\n')
|
|
indent -= 1
|
|
result.append('\t' * indent)
|
|
result.append(']')
|
|
|
|
else:
|
|
result.append(str(obj))
|
|
|
|
return ''.join(result)
|
|
|
|
# These should be overrode
|
|
def to_dict(self):
|
|
return {}
|
|
|
|
def on_send(self, writer):
|
|
pass
|
|
|
|
def on_response(self, reader):
|
|
pass
|
|
|
|
def on_exception(self, exception):
|
|
pass
|