diff --git a/telethon/extensions/__init__.py b/telethon/extensions/__init__.py index 9e7f6686..903460b6 100644 --- a/telethon/extensions/__init__.py +++ b/telethon/extensions/__init__.py @@ -4,4 +4,3 @@ communication with support for cancelling the operation, and an utility class to read arbitrary binary data in a more comfortable way, with int/strings/etc. """ from .binaryreader import BinaryReader -from .tcpclient import TcpClient diff --git a/telethon/extensions/tcpclient.py b/telethon/extensions/tcpclient.py deleted file mode 100644 index 4baa46ca..00000000 --- a/telethon/extensions/tcpclient.py +++ /dev/null @@ -1,171 +0,0 @@ -""" -This module holds a rough implementation of the C# TCP client. - -This class is **not** safe across several tasks since partial reads -may be ``await``'ed before being able to return the exact byte count. - -This class is also not concerned about disconnections or retries of -any sort, nor any other kind of errors such as connecting twice. -""" -import asyncio -import errno -import logging -import socket -import ssl - -CONN_RESET_ERRNOS = { - errno.EBADF, errno.ENOTSOCK, errno.ENETUNREACH, - errno.EINVAL, errno.ENOTCONN, errno.EHOSTUNREACH, - errno.ECONNREFUSED, errno.ECONNRESET, errno.ECONNABORTED, - errno.ENETDOWN, errno.ENETRESET, errno.ECONNABORTED, - errno.EHOSTDOWN, errno.EPIPE, errno.ESHUTDOWN -} -# catched: EHOSTUNREACH, ECONNREFUSED, ECONNRESET, ENETUNREACH -# ConnectionError: EPIPE, ESHUTDOWN, ECONNABORTED, ECONNREFUSED, ECONNRESET - -try: - import socks -except ImportError: - socks = None - -SSL_PORT = 443 -__log__ = logging.getLogger(__name__) - - -class TcpClient: - """A simple TCP client to ease the work with sockets and proxies.""" - - class SocketClosed(ConnectionError): - pass - - def __init__(self, *, loop, timeout, ssl=None, proxy=None): - """ - Initializes the TCP client. - - :param proxy: the proxy to be used, if any. - :param timeout: the timeout for connect, read and write operations. - :param ssl: ssl.wrap_socket keyword arguments to use when connecting - if port == SSL_PORT, or do nothing if not present. - """ - self._loop = loop - self.proxy = proxy - self.ssl = ssl - self._socket = None - self._reader = None - self._writer = None - self._closed = asyncio.Event(loop=self._loop) - self._closed.set() - - if isinstance(timeout, (int, float)): - self.timeout = float(timeout) - elif hasattr(timeout, 'seconds'): - self.timeout = float(timeout.seconds) - else: - raise TypeError('Invalid timeout type: {}'.format(type(timeout))) - - @staticmethod - def _create_socket(mode, proxy): - if proxy is None: - s = socket.socket(mode, socket.SOCK_STREAM) - else: - __log__.info('Connection will be made through proxy %s', proxy) - import socks - s = socks.socksocket(mode, socket.SOCK_STREAM) - if isinstance(proxy, dict): - s.set_proxy(**proxy) - else: # tuple, list, etc. - s.set_proxy(*proxy) - s.setblocking(False) - return s - - async def connect(self, ip, port): - """ - Tries connecting to IP:port unless an OSError is raised. - - :param ip: the IP to connect to. - :param port: the port to connect to. - """ - if ':' in ip: # IPv6 - ip = ip.replace('[', '').replace(']', '') - mode, address = socket.AF_INET6, (ip, port, 0, 0) - else: - mode, address = socket.AF_INET, (ip, port) - - try: - if self._socket is None: - self._socket = self._create_socket(mode, self.proxy) - wrap_ssl = self.ssl and port == SSL_PORT - else: - wrap_ssl = False - - await asyncio.wait_for( - self._loop.sock_connect(self._socket, address), - timeout=self.timeout, - loop=self._loop - ) - if wrap_ssl: - # Temporarily set the socket to blocking - # (timeout) until connection is established. - self._socket.settimeout(self.timeout) - self._socket = ssl.wrap_socket( - self._socket, do_handshake_on_connect=True, **self.ssl) - self._socket.setblocking(False) - - self._closed.clear() - self._reader, self._writer =\ - await asyncio.open_connection(sock=self._socket) - except OSError as e: - if e.errno in CONN_RESET_ERRNOS: - raise ConnectionResetError() from e - else: - raise - - @property - def is_connected(self): - """Determines whether the client is connected or not.""" - return not self._closed.is_set() - - def close(self): - """Closes the connection.""" - fd = None - try: - if self._writer is not None: - self._writer.close() - - if self._socket is not None: - fd = self._socket.fileno() - if self.is_connected: - self._socket.shutdown(socket.SHUT_RDWR) - self._socket.close() - except OSError: - pass # Ignore ENOTCONN, EBADF, and any other error when closing - finally: - self._socket = None - self._reader = None - self._writer = None - self._closed.set() - if fd and fd != -1: - self._loop.remove_reader(fd) - - async def write(self, data): - """ - Writes (sends) the specified bytes to the connected peer. - :param data: the data to send. - """ - if not self.is_connected: - raise ConnectionResetError('Not connected') - - self._writer.write(data) - await self._writer.drain() - - async def read(self, size): - """ - Reads (receives) a whole block of size bytes from the connected peer. - - :param size: the size of the block to be read. - :return: the read data with len(data) == size. - """ - if not self.is_connected: - raise ConnectionResetError('Not connected') - - return await self._reader.readexactly(size)