Let all connection modes implement the new Connection

telethon/network/connection/tcpfull.py

@@ -1,10 +1,8 @@
-import errno
 import struct
 from zlib import crc32
 
-from .common import Connection
+from .connection import Connection
 from ...errors import InvalidChecksumError
-from ...extensions import TcpClient
 
 
 class ConnectionTcpFull(Connection):
@@ -12,39 +10,23 @@ class ConnectionTcpFull(Connection):
     Default Telegram mode. Sends 12 additional bytes and
     needs to calculate the CRC value of the packet itself.
     """
-    def __init__(self, *, loop, timeout, proxy=None):
-        super().__init__(loop=loop, timeout=timeout, proxy=proxy)
-        self._send_counter = 0
-        self.conn = TcpClient(
-            timeout=self._timeout, loop=self._loop, proxy=self._proxy
-        )
-        self.read = self.conn.read
-        self.write = self.conn.write
-
-    async def connect(self, ip, port):
-        try:
-            await self.conn.connect(ip, port)
-        except OSError as e:
-            if e.errno == errno.EISCONN:
-                return  # Already connected, no need to re-set everything up
-            else:
-                raise
-
+    def __init__(self, ip, port, *, loop):
+        super().__init__(ip, port, loop=loop)
         self._send_counter = 0
 
-    def get_timeout(self):
-        return self.conn.timeout
+    def _send(self, data):
+        # https://core.telegram.org/mtproto#tcp-transport
+        # total length, sequence number, packet and checksum (CRC32)
+        length = len(data) + 12
+        data = struct.pack('<ii', length, self._send_counter) + data
+        crc = struct.pack('<I', crc32(data))
+        self._send_counter += 1
+        self._writer.write(data + crc)
 
-    def is_connected(self):
-        return self.conn.is_connected
-
-    async def close(self):
-        self.conn.close()
-
-    async def recv(self):
-        packet_len_seq = await self.read(8)  # 4 and 4
+    async def _recv(self):
+        packet_len_seq = await self._reader.readexactly(8)  # 4 and 4
         packet_len, seq = struct.unpack('<ii', packet_len_seq)
-        body = await self.read(packet_len - 8)
+        body = await self._reader.readexactly(packet_len - 8)
         checksum = struct.unpack('<I', body[-4:])[0]
         body = body[:-4]
 
@@ -53,12 +35,3 @@ class ConnectionTcpFull(Connection):
             raise InvalidChecksumError(checksum, valid_checksum)
 
         return body
-
-    async def send(self, message):
-        # https://core.telegram.org/mtproto#tcp-transport
-        # total length, sequence number, packet and checksum (CRC32)
-        length = len(message) + 12
-        data = struct.pack('<ii', length, self._send_counter) + message
-        crc = struct.pack('<I', crc32(data))
-        self._send_counter += 1
-        await self.write(data + crc)