proxy error fix

Author: ArthurKoba

bot/core/helper.py

@@ -31,8 +31,7 @@ def move_session_to_deleted(client: Client):
         os.makedirs("sessions/deleted_sessions", exist_ok=True)
     shutil.move(session_file, f"sessions/deleted_sessions/{client.name}.session")
 
-def set_proxy_for_tg_client(client: Client, proxy):
-    proxy = Proxy.from_str(proxy)
+def set_proxy_for_tg_client(client: Client, proxy: Proxy):
     proxy_dict = dict(
         scheme=proxy.protocol,
         hostname=proxy.host,

bot/core/tapper.py

@@ -3,8 +3,9 @@
 from random import randint, uniform
 from time import time
 
+from better_proxy import Proxy
 from aiocfscrape import CloudflareScraper
-from aiohttp_proxy import ProxyConnector
+from aiohttp_socks import ProxyConnector
 from pyrogram import Client
 
 from bot.config import settings
@@ -13,7 +14,7 @@
 from bot.core.headers import headers as default_headers
 from bot.core.helper import get_blum_database, set_proxy_for_tg_client, format_duration, move_session_to_deleted
 from bot.core.tg_auth import get_tg_web_data
-from bot.exceptions import NeedReLoginError, TelegramInvalidSessionException
+from bot.exceptions import NeedReLoginError, TelegramInvalidSessionException, TelegramProxyError
 from bot.utils.payload import check_payload_server, get_payload
 from bot.utils.logger import SessionLogger
 from bot.utils.checkers import check_proxy, wait_proxy
@@ -135,7 +136,7 @@ async def check_tasks(self):
         await asyncio.sleep(uniform(0.5, 1))
         await self.update_balance()
 
-    async def play_drop_game(self, proxy):
+    async def play_drop_game(self):
         if settings.PLAY_GAMES is not True or not self.play_passes:
             return
 
@@ -238,10 +239,11 @@ async def check_farming(self):
         await asyncio.sleep(uniform(0.1, 0.5))
         await self.update_balance()
 
-    async def run(self, proxy: str | None) -> None:
-        await self.random_delay()
+    async def run(self, proxy: Proxy | None) -> None:
+        if not settings.DEBUG:
+            await self.random_delay()
 
-        proxy_conn = ProxyConnector().from_url(proxy) if proxy else None
+        proxy_conn = ProxyConnector().from_url(proxy.as_url) if proxy else None
         headers = default_headers.copy()
         headers.update({'User-Agent': check_user_agent(self.tg_client.name)})
         async with CloudflareScraper(headers=headers, connector=proxy_conn) as session:
@@ -250,11 +252,14 @@ async def run(self, proxy: str | None) -> None:
                 if not ip:
                     self._log.warning(f"Proxy {proxy} not available. Waiting for the moment when it will work...")
                     ip = await wait_proxy(session)
-                self._log.info(f"Used proxy {proxy}. Real ip: {ip}")
+                self._log.info(f"Used proxy <y>{proxy}</y>. Real ip: <g>{ip}</g>")
                 set_proxy_for_tg_client(self.tg_client, proxy)
             else:
                 self._log.warning("Proxy not installed! This may lead to account ban! Be careful.")
-            await self.auth(session)
+            try:
+                await self.auth(session)
+            except TelegramProxyError:
+                return self._log.error(f"<r>The selected proxy cannot be applied to the Telegram client.</r>")
 
             timer = 0
             while True:
@@ -272,7 +277,7 @@ async def run(self, proxy: str | None) -> None:
                     # todo: add "api/v1/wallet/my/balance?fiat=usd", "api/v1/tribe/leaderboard" and another human behavior
                     await self.check_tribe()
                     await self.check_tasks()
-                    await self.play_drop_game(proxy)
+                    await self.play_drop_game()
                 except NeedReLoginError:
                     await self.auth(session)
                 except Exception:
@@ -282,7 +287,7 @@ async def run(self, proxy: str | None) -> None:
                 timer = time()
 
 
-async def run_tapper(tg_client: Client, proxy: str | None):
+async def run_tapper(tg_client: Client, proxy: Proxy | None):
     session_logger = SessionLogger(tg_client.name)
     try:
         await Tapper(tg_client, session_logger).run(proxy=proxy)

bot/core/tg_auth.py

@@ -9,7 +9,7 @@
 from pyrogram.raw.types import InputBotAppShortName
 
 from bot.core.helper import get_referral_token
-from bot.exceptions import TelegramInvalidSessionException
+from bot.exceptions import TelegramInvalidSessionException, TelegramProxyError
 from bot.utils.logger import SessionLogger
 
 
@@ -34,6 +34,8 @@ async def get_tg_web_data(client: Client, log: SessionLogger):
     except (Unauthorized, UserDeactivated, AuthKeyUnregistered, UserDeactivatedBan, AuthKeyDuplicated,
             SessionExpired, SessionRevoked):
         raise TelegramInvalidSessionException(f"Telegram session is invalid. Client: {client.name}")
+    except AttributeError as e:
+        raise TelegramProxyError(e)
     finally:
         if client.is_connected:
             await client.disconnect()

bot/exceptions/telegram.py

@@ -1,3 +1,6 @@
 
 class TelegramInvalidSessionException(Exception):
+    pass
+
+class TelegramProxyError(Exception):
     pass

bot/utils/checkers.py

@@ -1,6 +1,9 @@
-from asyncio import sleep
+import traceback
+from asyncio import sleep, CancelledError
 from aiohttp import ClientSession, ClientTimeout
 from aiohttp.client_exceptions import ClientProxyConnectionError
+from python_socks import ProxyError
+
 from bot.utils.logger import logger
 
 async def check_proxy(http_client: ClientSession) -> str | None:
@@ -9,10 +12,12 @@ async def check_proxy(http_client: ClientSession) -> str | None:
         data = await response.json()
         if data and data.get('ip'):
             return data.get('ip')
-    except (ConnectionRefusedError, ClientProxyConnectionError):
+    except (ConnectionRefusedError, ClientProxyConnectionError, CancelledError):
         logger.trace(f"Proxy not available")
+    except ProxyError as e:
+        logger.error(f"The proxy type may be incorrect! Error: {type(e).__name__}: {e}")
     except Exception as e:
-        logger.error(f"Proxy check error {e.__name__}: {e}")
+        logger.error(f"{traceback.format_exc()}")
 
 
 async def wait_proxy(http_client: ClientSession, time_between_checks_sec: int = 5) -> str | None:

bot/utils/launcher.py

@@ -30,12 +30,16 @@ def get_session_names() -> list[str]:
 
 
 def get_proxies() -> list[Proxy]:
+    proxies = []
     if settings.USE_PROXY_FROM_FILE:
         with open(file="bot/config/proxies.txt", encoding="utf-8-sig") as file:
-            proxies = [Proxy.from_str(proxy=row.strip()).as_url for row in file]
-    else:
-        proxies = []
-
+            for line in file:
+                if "type://" in line:
+                    continue
+                try:
+                    proxies.append(Proxy.from_str(proxy=line.strip()))
+                except ValueError as e:
+                    print(f"{e} - {line}")
     return proxies
 
 

requirements.txt

@@ -2,6 +2,7 @@ aiocfscrape==1.0.0
 aiohappyeyeballs==2.4.3
 aiohttp==3.10.10
 aiohttp-proxy==0.1.2
+aiohttp_socks==0.9.0
 aiosignal==1.3.1
 annotated-types==0.7.0
 async-timeout==4.0.3
@@ -22,6 +23,7 @@ pyjsparser==2.7.1
 Pyrogram==2.0.106
 PySocks==1.7.1
 python-dotenv==1.0.1
+python-socks==2.5.3
 six==1.16.0
 TgCrypto==1.2.5
 typing_extensions==4.12.2