Update bot.py

bot.py

@@ -3,6 +3,7 @@ import re
 import time
 import io
 import asyncio
+import aiohttp
 from pyrogram import Client, filters
 from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton
 from pyrogram.errors import MessageNotModified
@@ -10,7 +11,6 @@ from pyrogram.errors import MessageNotModified
 from state import state
 from logger import get_logger
 import scraper
-from curl_cffi.requests import AsyncSession
 
 log = get_logger()
 
@@ -82,17 +82,19 @@ def generate_status_msg():
         f"🔨 Auction    : `{state.counts.get('auction', 0):,}`\n"
         f"✅ Available  : `{state.counts.get('available', 0):,}`\n"
         f"🛒 Sold       : `{state.counts.get('sold', 0):,}`\n"
+        f"⚠️ Errors     : `{state.counts.get('error', 0):,}`\n"
     )
 
-# --- PROXY TESTER ---
+# --- PROXY TESTER (aiohttp) ---
 async def test_proxy(proxy_url):
-    proxies = {"http": proxy_url, "https": proxy_url}
     start = time.time()
+    headers = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 Chrome/124.0 Safari/537.36"}
     try:
-        async with AsyncSession(impersonate="chrome120", proxies=proxies) as session:
-            resp = await session.get("https://fragment.com/", timeout=10)
-            if resp.status_code == 200:
-                return proxy_url, round((time.time() - start) * 1000)
+        timeout = aiohttp.ClientTimeout(total=10)
+        async with aiohttp.ClientSession(timeout=timeout) as session:
+            async with session.get("https://fragment.com/", headers=headers, proxy=proxy_url) as resp:
+                if resp.status == 200:
+                    return proxy_url, round((time.time() - start) * 1000)
     except Exception:
         pass
     return proxy_url, None
@@ -116,7 +118,7 @@ async def proxy_cmd(client, message):
     os.remove(file_path)
     if not raw_proxies: return await msg.edit_text("⚠️ No proxies found in file.")
         
-    await msg.edit_text(f"🔍 Testing **{len(raw_proxies)}** proxies concurrently...")
+    await msg.edit_text(f"🔍 Testing **{len(raw_proxies)}** proxies concurrently via aiohttp...")
     
     tasks = [test_proxy(p) for p in raw_proxies]
     results = await asyncio.gather(*tasks)
@@ -124,11 +126,22 @@ async def proxy_cmd(client, message):
     working = [p for p, lat in results if lat is not None]
     state.proxies = working # Save to memory
     
-    await msg.edit_text(f"✅ Saved **{len(working)}** working proxies to memory.", reply_markup=get_dynamic_menu())
+    # Format Top 10 Report
+    latency_board = sorted([(p, lat) for p, lat in results if lat is not None], key=lambda x: x[1])
+    top_str = "\n".join([f"⏱ `{lat}ms` | {url.split('@')[-1] if '@' in url else url}" for url, lat in latency_board[:10]])
+    
+    report = (
+        f"✅ **Proxy Test Complete**\n"
+        f"━━━━━━━━━━━━━━━━\n"
+        f"**Total Tested:** `{len(raw_proxies)}`\n"
+        f"**Working & Saved:** `{len(working)}`\n\n"
+        f"🏆 **Top Fastest Proxies:**\n{top_str if top_str else 'None'}"
+    )
+    
+    await msg.edit_text(report, reply_markup=get_dynamic_menu())
 
 @app.on_message(filters.command("upload") & is_admin)
 async def upload_cmd(client, message):
-    # Support both replying to a file, OR sending the file with the command as a caption
     target_message = message if message.document else message.reply_to_message
     
     if not target_message or not target_message.document:
@@ -137,10 +150,8 @@ async def upload_cmd(client, message):
     msg = await message.reply_text("⏳ Downloading `words.txt`...")
     
     try:
-        # Pyrogram downloads to a hidden folder. We capture the exact path.
         file_path = await target_message.download()
         
-        # Move it to the root directory where the bot is looking for it and overwrite the old one
         if os.path.exists("words.txt"):
             os.remove("words.txt")
         os.replace(file_path, "words.txt")
@@ -186,16 +197,20 @@ async def check_cmd(client, message):
 async def html_cmd(client, message):
     if len(message.command) < 2: return await message.reply_text("Usage: `/html <word>`")
     target = message.command[1].lower()
-    msg = await message.reply_text(f"🔍 Fetching raw HTML for `@{target}` via Chrome Impersonation...")
+    msg = await message.reply_text(f"🔍 Fetching raw HTML for `@{target}`...")
     
     url = f"https://fragment.com/username/{target}"
+    headers = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 Chrome/124.0 Safari/537.36"}
     
     try:
-        async with AsyncSession(impersonate="chrome120") as session:
-            resp = await session.get(url, timeout=15, allow_redirects=True)
-            html_text = resp.text
-            status_code = resp.status_code
-            final_url = str(resp.url)
+        proxy = state.proxies[0] if state.proxies else None
+        
+        timeout = aiohttp.ClientTimeout(total=15)
+        async with aiohttp.ClientSession(timeout=timeout) as session:
+            async with session.get(url, headers=headers, proxy=proxy, allow_redirects=True) as resp:
+                html_text = await resp.text()
+                status_code = resp.status
+                final_url = str(resp.url)
                 
         f = io.BytesIO(html_text.encode('utf-8'))
         f.name = f"{target}_fragment.html"
@@ -359,7 +374,7 @@ async def button_handler(client, query):
         elif data == "export_files":
             await query.edit_message_text("⏳ Preparing files from disk...")
             exported = 0
-            for s in ["taken", "unavailable", "sold", "forsale", "auction", "available"]:
+            for s in ["taken", "unavailable", "sold", "forsale", "auction", "available", "error"]:
                 if os.path.exists(f"results/{s}.txt"):
                     await client.send_document(query.message.chat.id, document=f"results/{s}.txt")
                     exported += 1