LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-10-31 07:57:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Attempt at handling ProxyConnectionError on .connect()

Browse Source
This commit is contained in:
Lonami Exo 2017-09-20 13:22:56 +02:00
parent b8d7b1c8af
commit c22224f516
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
telethon/telegram_client.py
View File

@ -4,6 +4,10 @@ from datetime import datetime, timedelta
from functools import lru_cache from functools import lru_cache
from mimetypes import guess_type from mimetypes import guess_type
from threading import Thread from threading import Thread
try:
import socks
except ImportError:
socks = None
from . import TelegramBareClient from . import TelegramBareClient
from . import helpers as utils from . import helpers as utils
@ -147,7 +151,19 @@ class TelegramClient(TelegramBareClient):
if self._sender and self._sender.is_connected(): if self._sender and self._sender.is_connected():
return return
ok = super().connect(exported_auth=exported_auth) if socks and self._recv_thread:
# Treat proxy errors specially since they're not related to
# Telegram itself, but rather to the proxy. If any happens on
# the read thread forward it to the main thread.
try:
ok = super().connect(exported_auth=exported_auth)
except socks.ProxyConnectionError as e:
ok = False
# Report the exception to the main thread
self.updates.set_error(e)
else:
ok = super().connect(exported_auth=exported_auth)
# The main TelegramClient is the only one that will have # The main TelegramClient is the only one that will have
# constant_read, since it's also the only one who receives # constant_read, since it's also the only one who receives
# updates and need to be processed as soon as they occur. # updates and need to be processed as soon as they occur.
@ -193,6 +209,10 @@ class TelegramClient(TelegramBareClient):
# region Working with different connections # region Working with different connections
def _on_read_thread(self):
return self._recv_thread is not None and \
threading.get_ident() == self._recv_thread.ident
def create_new_connection(self, on_dc=None, timeout=timedelta(seconds=5)): def create_new_connection(self, on_dc=None, timeout=timedelta(seconds=5)):
"""Creates a new connection which can be used in parallel """Creates a new connection which can be used in parallel
with the original TelegramClient. A TelegramBareClient with the original TelegramClient. A TelegramBareClient
@ -226,8 +246,7 @@ class TelegramClient(TelegramBareClient):
*args will be ignored. *args will be ignored.
""" """
if self._recv_thread is not None and \ if self._on_read_thread():
threading.get_ident() == self._recv_thread.ident:
raise AssertionError('Cannot invoke requests from the ReadThread') raise AssertionError('Cannot invoke requests from the ReadThread')
self.updates.check_error() self.updates.check_error()