LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-26 11:23:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle GzipPacked lost requests & possibly fix reading normal

Browse Source 
Reading normal "lost" requests didn't .seek(-4) to read the TLObject
again. Now it has been slightly refactored to seek back always and
only seek forward when needed (e.g. rpc error).
This commit is contained in:
Lonami Exo 2018-03-30 11:50:41 +02:00
parent dede5520dd
commit 2b9babb30f
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
telethon/network/mtproto_sender.py
View File

@ -476,11 +476,13 @@ class MtProtoSender:
reader.read_int(signed=False) # code reader.read_int(signed=False) # code
request_id = reader.read_long() request_id = reader.read_long()
inner_code = reader.read_int(signed=False) inner_code = reader.read_int(signed=False)
reader.seek(-4)
__log__.debug('Received response for request with ID %d', request_id) __log__.debug('Received response for request with ID %d', request_id)
request = self._pop_request(request_id) request = self._pop_request(request_id)
if inner_code == 0x2144ca19: # RPC Error if inner_code == 0x2144ca19: # RPC Error
reader.seek(4)
if self.session.report_errors and request: if self.session.report_errors and request:
error = rpc_message_to_error( error = rpc_message_to_error(
reader.read_int(), reader.tgread_string(), reader.read_int(), reader.tgread_string(),
@ -505,12 +507,10 @@ class MtProtoSender:
return True # All contents were read okay return True # All contents were read okay
elif request: elif request:
if inner_code == 0x3072cfa1: # GZip packed if inner_code == GzipPacked.CONSTRUCTOR_ID:
unpacked_data = gzip.decompress(reader.tgread_bytes()) with BinaryReader(GzipPacked.read(reader)) as compressed_reader:
with BinaryReader(unpacked_data) as compressed_reader:
request.on_response(compressed_reader) request.on_response(compressed_reader)
else: else:
reader.seek(-4)
request.on_response(reader) request.on_response(reader)
self.session.process_entities(request.result) self.session.process_entities(request.result)
@ -525,10 +525,17 @@ class MtProtoSender:
# session, it will be skipped by the handle_container(). # session, it will be skipped by the handle_container().
# For some reason this also seems to happen when downloading # For some reason this also seems to happen when downloading
# photos, where the server responds with FileJpeg(). # photos, where the server responds with FileJpeg().
def _try_read(r):
try: try:
obj = reader.tgread_object() return r.tgread_object()
except Exception as e: except Exception as e:
obj = '(failed to read: %s)' % e return '(failed to read: {})'.format(e)
if inner_code == GzipPacked.CONSTRUCTOR_ID:
with BinaryReader(GzipPacked.read(reader)) as compressed_reader:
obj = _try_read(compressed_reader)
else:
obj = _try_read(reader)
__log__.warning( __log__.warning(
'Lost request (ID %d) with code %s will be skipped, contents: %s', 'Lost request (ID %d) with code %s will be skipped, contents: %s',