LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-02-03 21:24:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix typing issues

Browse Source
This commit is contained in:
Lonami Exo 2023-08-31 13:32:57 +02:00
parent 60ed7a32fe
commit 7c112d8b0f
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/src/telethon/_impl/mtsender/sender.py
View File

@ -102,7 +102,7 @@ class Sender:
cls, transport: Transport, mtp: Mtp, addr: str cls, transport: Transport, mtp: Mtp, addr: str
) -> Tuple[Self, Enqueuer]: ) -> Tuple[Self, Enqueuer]:
reader, writer = await asyncio.open_connection(*addr.split(":")) reader, writer = await asyncio.open_connection(*addr.split(":"))
request_queue: Queue[object] = Queue() request_queue: Queue[Request[object]] = Queue()
return ( return (
cls( cls(
@ -128,12 +128,12 @@ class Sender:
rx = self._enqueue_body(body) rx = self._enqueue_body(body)
return await self._step_until_receive(rx) return await self._step_until_receive(rx)
def _enqueue_body(self, body: bytes) -> Future[object]: def _enqueue_body(self, body: bytes) -> Future[bytes]:
oneshot = asyncio.get_running_loop().create_future() oneshot = asyncio.get_running_loop().create_future()
self._requests.append(Request(body=body, state=NotSerialized(), result=oneshot)) self._requests.append(Request(body=body, state=NotSerialized(), result=oneshot))
return oneshot return oneshot
async def _step_until_receive(self, rx: Future[object]) -> bytes: async def _step_until_receive(self, rx: Future[bytes]) -> bytes:
while True: while True:
await self.step() await self.step()
if rx.done(): if rx.done():
@ -203,7 +203,7 @@ class Sender:
self._read_buffer += read_buffer self._read_buffer += read_buffer
updates = [] updates: List[Updates] = []
while self._read_buffer: while self._read_buffer:
self._mtp_buffer.clear() self._mtp_buffer.clear()
try: try:
@ -254,7 +254,7 @@ class Sender:
if isinstance(ret, bytes): if isinstance(ret, bytes):
assert len(ret) >= 4 assert len(ret) >= 4
elif isinstance(ret, RpcError): elif isinstance(ret, RpcError):
ret.caused_by = req.body[:4] ret.caused_by = struct.unpack_from("<I", req.body)[0]
raise ret raise ret
elif isinstance(ret, BadMessage): elif isinstance(ret, BadMessage):
# TODO test that we resend the request # TODO test that we resend the request
@ -273,6 +273,8 @@ class Sender:
def auth_key(self) -> Optional[bytes]: def auth_key(self) -> Optional[bytes]:
if isinstance(self._mtp, Encrypted): if isinstance(self._mtp, Encrypted):
return self._mtp.auth_key return self._mtp.auth_key
else:
return None
async def connect(transport: Transport, addr: str) -> Tuple[Sender, Enqueuer]: async def connect(transport: Transport, addr: str) -> Tuple[Sender, Enqueuer]:
@ -284,13 +286,13 @@ async def generate_auth_key(
sender: Sender, sender: Sender,
enqueuer: Enqueuer, enqueuer: Enqueuer,
) -> Tuple[Sender, Enqueuer]: ) -> Tuple[Sender, Enqueuer]:
request, data = authentication.step1() request, data1 = authentication.step1()
response = await sender.send(request) response = await sender.send(request)
request, data = authentication.step2(data, response) request, data2 = authentication.step2(data1, response)
response = await sender.send(request) response = await sender.send(request)
request, data = authentication.step3(data, response) request, data3 = authentication.step3(data2, response)
response = await sender.send(request) response = await sender.send(request)
finished = authentication.create_key(data, response) finished = authentication.create_key(data3, response)
auth_key = finished.auth_key auth_key = finished.auth_key
time_offset = finished.time_offset time_offset = finished.time_offset
first_salt = finished.first_salt first_salt = finished.first_salt

2
client/src/telethon/_impl/tl/core/request.py
View File

@ -10,7 +10,7 @@ class Request(bytes, Generic[Return]):
@property @property
def constructor_id(self) -> int: def constructor_id(self) -> int:
try: try:
cid = struct.unpack("<i", self[:4])[0] cid = struct.unpack_from("<I", self)[0]
assert isinstance(cid, int) assert isinstance(cid, int)
return cid return cid
except struct.error: except struct.error: