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

Support sending multiple requests at once

Browse Source
This commit is contained in:
Lonami Exo 2018-06-07 14:02:55 +02:00
parent 884dbe2d1f
commit 805bf00dee
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
telethon/network/mtprotosender.py
View File

@ -2,7 +2,7 @@ import asyncio
import logging import logging
from .connection import ConnectionTcpFull from .connection import ConnectionTcpFull
from .. import helpers from .. import helpers, utils
from ..errors import BadMessageError, rpc_message_to_error from ..errors import BadMessageError, rpc_message_to_error
from ..extensions import BinaryReader from ..extensions import BinaryReader
from ..tl import TLMessage, MessageContainer, GzipPacked from ..tl import TLMessage, MessageContainer, GzipPacked
@ -125,7 +125,7 @@ class MTProtoSender:
self._send_loop_handle.cancel() self._send_loop_handle.cancel()
self._recv_loop_handle.cancel() self._recv_loop_handle.cancel()
async def send(self, request): async def send(self, request, ordered=False):
""" """
This method enqueues the given request to be sent. This method enqueues the given request to be sent.
@ -153,10 +153,25 @@ class MTProtoSender:
# TODO Perhaps this method should be synchronous and just return # TODO Perhaps this method should be synchronous and just return
# a `Future` that you need to further ``await`` instead of the # a `Future` that you need to further ``await`` instead of the
# currently double ``await (await send())``? # currently double ``await (await send())``?
message = TLMessage(self.session, request) if utils.is_list_like(request):
self._pending_messages[message.msg_id] = message if not ordered:
await self._send_queue.put(message) # False-y values must be None to do after_id = ordered and ...
return message.future ordered = None
result = []
after_id = None
for r in request:
message = TLMessage(self.session, r, after_id=after_id)
self._pending_messages[message.msg_id] = message
after_id = ordered and message.msg_id
await self._send_queue.put(message)
result.append(message.future)
return result
else:
message = TLMessage(self.session, request)
self._pending_messages[message.msg_id] = message
await self._send_queue.put(message)
return message.future
# Loops # Loops
@ -307,7 +322,6 @@ class MTProtoSender:
bad_salt = reader.tgread_object() bad_salt = reader.tgread_object()
self.session.salt = bad_salt.new_server_salt self.session.salt = bad_salt.new_server_salt
self.session.save() self.session.save()
# TODO Will this work properly for containers?
await self._send_queue.put(self._pending_messages[bad_salt.bad_msg_id]) await self._send_queue.put(self._pending_messages[bad_salt.bad_msg_id])
async def _handle_bad_notification(self, msg_id, seq, reader): async def _handle_bad_notification(self, msg_id, seq, reader):