Update 1.py

1.py

@@ -24,7 +24,7 @@ try:
 except Exception:
     pass
 
-required_packages = ["aiohttp", "requests", "h2", "uvloop", "aioquic", "beautifulsoup4", "curl_cffi", "scapy", "httpx", "websockets", "redis", "fastapi", "uvicorn", "apscheduler", "pywinauto"]
+required_packages = ["aiohttp", "requests", "h2", "uvloop", "aioquic", "beautifulsoup4", "curl_cffi", "scapy", "httpx", "websockets", "redis", "fastapi", "uvicorn", "apscheduler", "pywinauto", "nodriver"]
 if platform.system() == "Windows":
     try:
         import ctypes
@@ -1963,8 +1963,13 @@ class VPNRotator:
 
 
 def get_playwright_clearance(url: str, identity=None) -> dict:
-    """حل تحدي Cloudflare باستخدام Playwright مع وقت استجابة قصير ومحاولات متعددة"""
-    if not PLAYWRIGHT_AVAILABLE:
+    """حل تحدي Cloudflare باستخدام nodriver (أقوى من Playwright العادي)"""
+    import asyncio
+    
+    # We will use nodriver instead of playwright
+    try:
+        import nodriver as uc
+    except ImportError:
         return {}
 
     if not hasattr(get_playwright_clearance, "semaphore"):
@@ -1972,85 +1977,65 @@ def get_playwright_clearance(url: str, identity=None) -> dict:
 
     result_holder = {}
 
-    def _playwright_worker():
+    def _nodriver_worker():
         with get_playwright_clearance.semaphore:
             try:
-                from playwright.sync_api import sync_playwright
-                with sync_playwright() as p:
-                    # إعدادات متصفح أكثر تخفياً
-                    browser = p.chromium.launch(
+                # nodriver is async, so we need an event loop in this thread
+                loop = asyncio.new_event_loop()
+                asyncio.set_event_loop(loop)
+                
+                async def _run_nodriver():
+                    browser = await uc.start(
                         headless=True,
-                        args=[
-                            '--disable-gpu',
-                            '--no-sandbox',
-                            '--disable-dev-shm-usage',
-                            '--disable-blink-features=AutomationControlled',
-                            '--disable-extensions',
-                            '--disable-features=IsolateOrigins,site-per-process',
-                            '--disable-setuid-sandbox',
-                        ]
+                        browser_args=['--disable-blink-features=AutomationControlled']
                     )
-                    context_options = {
-                        'viewport': {'width': random.randint(1366, 1920), 'height': random.randint(768, 1080)},
-                        'user_agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36',
-                        'locale': random.choice(['en-US', 'en-GB', 'fr-FR', 'de-DE']),
-                        'timezone_id': random.choice(['America/New_York', 'Europe/London', 'Europe/Paris']),
-                    }
-                    if identity and getattr(identity, 'proxy', None):
-                        context_options['proxy'] = {'server': identity.proxy}
-                    context = browser.new_context(**context_options)
-                    page = context.new_page()
-
-                    # محاكاة حركة الفأرة البشرية
-                    page.mouse.move(random.randint(100, 500), random.randint(100, 500))
-                    time.sleep(random.uniform(0.5, 1.5))
+                    page = await browser.get(url)
                     
-                    # تحميل الصفحة مع انتظار الشبكة
-                    page.goto(url, wait_until="networkidle", timeout=20000)  # 20 ثانية كحد أقصى
+                    # Wait for challenge to pass (max 20s)
+                    wait_count = 0
+                    cf_cleared = False
+                    while wait_count < 20:
+                        cookies = await browser.cookies.get_all()
+                        if any(c.name == 'cf_clearance' for c in cookies):
+                            cf_cleared = True
+                            break
+                        await asyncio.sleep(1)
+                        wait_count += 1
+                        
+                    cookies = await browser.cookies.get_all()
+                    cookie_dict = {c.name: c.value for c in cookies}
                     
-                    # انتظار اختفاء شاشة التحدي إن ظهرت
-                    try:
-                        page.wait_for_selector("#challenge-running", state="hidden", timeout=10000)
-                    except:
-                        pass
-
-                    # محاكاة تمرير الفأرة
-                    for _ in range(random.randint(2, 5)):
-                        page.mouse.wheel(0, random.randint(100, 300))
-                        time.sleep(random.uniform(0.2, 0.8))
-
-                    # جمع الكوكيز بعد الانتهاء
-                    cookies = context.cookies()
-                    cookie_dict = {c['name']: c['value'] for c in cookies}
+                    # Update identity cookie jar if present
                     if identity and getattr(identity, 'cookie_jar', None):
                         for c in cookies:
                             try:
                                 cookie = http.cookiejar.Cookie(
-                                    version=0, name=c['name'], value=c['value'], port=None, port_specified=False,
-                                    domain=c['domain'], domain_specified=True, domain_initial_dot=c['domain'].startswith('.'),
-                                    path=c['path'], path_specified=True, secure=c['secure'],
-                                    expires=int(c['expires']) if c.get('expires') and c['expires'] > 0 else None,
+                                    version=0, name=c.name, value=c.value, port=None, port_specified=False,
+                                    domain=c.domain, domain_specified=True, domain_initial_dot=c.domain.startswith('.'),
+                                    path=c.path, path_specified=True, secure=c.secure,
+                                    expires=int(c.expires) if hasattr(c, 'expires') and c.expires else None,
                                     discard=False, comment=None, comment_url=None,
-                                    rest={'HttpOnly': None} if c.get('httpOnly') else {}, rfc2109=False
+                                    rest={'HttpOnly': None} if hasattr(c, 'http_only') and c.http_only else {}, rfc2109=False
                                 )
                                 identity.cookie_jar.set_cookie(cookie)
                             except:
                                 pass
+                                
                     if 'cf_clearance' in cookie_dict:
                         result_holder['cookies'] = cookie_dict
-                        result_holder['ua'] = context_options['user_agent']
-                    browser.close()
+                        # Generate a realistic UA
+                        result_holder['ua'] = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36'
+                        
+                    await browser.stop()
+                    
+                loop.run_until_complete(_run_nodriver())
+                loop.close()
             except Exception as e:
-                # في حال الفشل، نسجل الخطأ ولكن نستمر
-                pass
-
-    # تشغيل الـ thread مع مهلة 25 ثانية (بدلاً من 38)
-            except Exception:
                 pass
 
-    t = threading.Thread(target=_playwright_worker, daemon=True)
+    t = threading.Thread(target=_nodriver_worker, daemon=True)
     t.start()
-    t.join(timeout=25)
+    t.join(timeout=30)
     return result_holder
 
 def load_cf_cookies_from_file(domain: str) -> dict:
@@ -3849,7 +3834,7 @@ class UltimateIntegratedEngine:
         if self.use_cffi and CURL_CFFI_AVAILABLE:
             # On Windows, select() has a hard limit of 512 file descriptors (sockets)
             # Creating too many AsyncSessions causes "ValueError: too many file descriptors in select()"
-            for imp in ["chrome124", "chrome120", "chrome116", "edge101", "safari17_0"]:
+            for imp in ["chrome126"]:
                 self.cffi_clients.append(cffi_requests.AsyncSession(impersonate=imp, verify=False, timeout=8))
         await self._create_httpx_client()
     async def _create_httpx_client(self):