mirror of
https://github.com/LonamiWebs/Telethon.git
synced 2025-08-06 13:10:22 +03:00
Fix merging
This commit is contained in:
parent
9a9fcf8b80
commit
f9de43a7da
|
@ -10,11 +10,11 @@ from typing import Generic, Optional, Protocol, Type, TypeVar
|
||||||
|
|
||||||
from typing_extensions import Self
|
from typing_extensions import Self
|
||||||
|
|
||||||
from .protocol import BufferedTransportProtocol
|
|
||||||
from ..crypto import AuthKey
|
from ..crypto import AuthKey
|
||||||
from ..mtproto import (
|
from ..mtproto import (
|
||||||
BadMessageError,
|
BadMessageError,
|
||||||
Encrypted,
|
Encrypted,
|
||||||
|
MissingBytesError,
|
||||||
MsgId,
|
MsgId,
|
||||||
Mtp,
|
Mtp,
|
||||||
Plain,
|
Plain,
|
||||||
|
@ -32,6 +32,7 @@ from ..tl.types import UpdateDeleteMessages, UpdateShort
|
||||||
from ..tl.types.messages import AffectedFoundMessages, AffectedHistory, AffectedMessages
|
from ..tl.types.messages import AffectedFoundMessages, AffectedHistory, AffectedMessages
|
||||||
from .protocol import BufferedStreamingProtocol
|
from .protocol import BufferedStreamingProtocol
|
||||||
|
|
||||||
|
MAXIMUM_DATA = (1024 * 1024) + (8 * 1024)
|
||||||
|
|
||||||
PING_DELAY = 60
|
PING_DELAY = 60
|
||||||
|
|
||||||
|
@ -123,7 +124,6 @@ class Sender:
|
||||||
_reader: StreamReader
|
_reader: StreamReader
|
||||||
_writer: StreamWriter
|
_writer: StreamWriter
|
||||||
_transport: Transport
|
_transport: Transport
|
||||||
_protocol: BufferedTransportProtocol
|
|
||||||
_mtp: Mtp
|
_mtp: Mtp
|
||||||
_mtp_buffer: bytearray
|
_mtp_buffer: bytearray
|
||||||
_updates: list[Updates]
|
_updates: list[Updates]
|
||||||
|
@ -146,19 +146,16 @@ class Sender:
|
||||||
base_logger: logging.Logger,
|
base_logger: logging.Logger,
|
||||||
) -> Self:
|
) -> Self:
|
||||||
ip, port = addr.split(":")
|
ip, port = addr.split(":")
|
||||||
# TODO BRING BACK SUPPORT FOR connector
|
reader, writer = await connector(ip, int(port))
|
||||||
connection, protocol = await asyncio.get_running_loop().create_connection(
|
|
||||||
lambda: BufferedTransportProtocol(transport), ip, int(port)
|
|
||||||
)
|
|
||||||
|
|
||||||
sender = cls(
|
sender = cls(
|
||||||
dc_id=dc_id,
|
dc_id=dc_id,
|
||||||
addr=addr,
|
addr=addr,
|
||||||
lock=Lock(),
|
lock=Lock(),
|
||||||
_logger=base_logger.getChild("mtsender"),
|
_logger=base_logger.getChild("mtsender"),
|
||||||
_connection=connection,
|
_reader=reader,
|
||||||
|
_writer=writer,
|
||||||
_transport=transport,
|
_transport=transport,
|
||||||
_protocol=protocol,
|
|
||||||
_mtp=mtp,
|
_mtp=mtp,
|
||||||
_mtp_buffer=bytearray(),
|
_mtp_buffer=bytearray(),
|
||||||
_updates=[],
|
_updates=[],
|
||||||
|
@ -227,7 +224,6 @@ class Sender:
|
||||||
self._try_fill_write()
|
self._try_fill_write()
|
||||||
await self._wait_response()
|
await self._wait_response()
|
||||||
|
|
||||||
|
|
||||||
def _try_fill_write(self) -> None:
|
def _try_fill_write(self) -> None:
|
||||||
for request in self._requests:
|
for request in self._requests:
|
||||||
if isinstance(request.state, NotSerialized):
|
if isinstance(request.state, NotSerialized):
|
||||||
|
|
Loading…
Reference in New Issue
Block a user