Refactor sender

This commit is contained in:
Jahongir Qurbonov 2024-10-14 14:47:08 +05:00
parent 6b6714c8b5
commit 2ad5e9658d
3 changed files with 10 additions and 6 deletions

View File

@ -61,7 +61,7 @@ async def handle_migrate(client: Client, dc_id: Optional[int]) -> None:
client._config, client._session.dcs, DataCenter(id=dc_id) client._config, client._session.dcs, DataCenter(id=dc_id)
) )
async with client._sender.lock: async with client._sender._lock:
old_sender = client._sender old_sender = client._sender
client._sender = sender client._sender = sender
await old_sender.disconnect() await old_sender.disconnect()

View File

@ -276,10 +276,14 @@ async def step_sender(client: Client) -> None:
process_socket_updates(client, updates) process_socket_updates(client, updates)
async def step(self: Client) -> None:
if self._sender:
await step_sender(self)
async def run_until_disconnected(self: Client) -> None: async def run_until_disconnected(self: Client) -> None:
while self.connected: while self.connected:
if self._sender: await step(self)
await step_sender(self)
def connected(client: Client) -> bool: def connected(client: Client) -> bool:

View File

@ -162,8 +162,8 @@ class Request(Generic[Return]):
class Sender: class Sender:
dc_id: int dc_id: int
addr: str addr: str
lock: Lock
_logger: logging.Logger _logger: logging.Logger
_lock: Lock
_reader: AsyncReader _reader: AsyncReader
_writer: AsyncWriter _writer: AsyncWriter
_transport: Transport _transport: Transport
@ -192,8 +192,8 @@ class Sender:
return cls( return cls(
dc_id=dc_id, dc_id=dc_id,
addr=addr, addr=addr,
lock=Lock(),
_logger=base_logger.getChild("mtsender"), _logger=base_logger.getChild("mtsender"),
_lock=Lock(),
_reader=reader, _reader=reader,
_writer=writer, _writer=writer,
_transport=transport, _transport=transport,
@ -235,7 +235,7 @@ class Sender:
return rx.result() return rx.result()
async def step(self) -> list[Updates]: async def step(self) -> list[Updates]:
async with self.lock: async with self._lock:
return await self._step() return await self._step()
async def _step(self) -> list[Updates]: async def _step(self) -> list[Updates]: