fix: improve Cloudflare challenge detection and handling logic

Author: sarperavci

cf_bypasser/core/bypasser.py

@@ -127,10 +127,14 @@ async def is_bypassed(self, page) -> bool:
         """Check if Cloudflare challenge has been bypassed."""
         try:
             title = await page.title()
+            if "just a moment" in title.lower():
+                return False
             html_content = await page.content()
-            return "just a moment" not in title.lower() and "please complete the captcha" not in html_content.lower()
+            if "please complete the captcha" in html_content.lower():
+                return False
+            return True
         except Exception as e:
-            self.log_message(f"Error checking page title: {e}")
+            self.log_message(f"Error checking bypass status: {e}")
             return False
 
     async def determine_challenge_type(self, page) -> CaptchaType:
@@ -153,45 +157,66 @@ async def solve_cloudflare_challenge(self, url: str, page) -> bool:
         try:
             # Navigate to the target URL
             self.log_message(f"Navigating to {url}")
-            await page.goto(url, wait_until="networkidle", timeout=10000)
+            try:
+                await page.goto(url, wait_until="domcontentloaded", timeout=30000)
+            except Exception as nav_err:
+                self.log_message(f"Navigation warning: {nav_err}")
+            # Wait for challenge scripts to load and execute
             await asyncio.sleep(5)
-            html_content = await page.content()
-            
-            if "cloudflare" not in html_content:
+            try:
+                html_content = await page.content()
+            except Exception:
+                html_content = ""
+
+            if "cloudflare" not in html_content.lower():
                 self.log_message("No Cloudflare protection detected on the page -- either not protected or already bypassed")
                 return True
-            
+
             # Check if we need to solve a challenge
             if await self.is_bypassed(page):
                 self.log_message("No Cloudflare challenge detected or already bypassed")
                 return True
 
-            self.log_message("Cloudflare challenge detected. Attempting to solve...")
+            self.log_message("Cloudflare challenge detected. Waiting for auto-resolve...")
+
+            # Most Cloudflare interstitial challenges now auto-resolve without
+            # user interaction. Poll for the challenge to clear before trying
+            # the click solver.
+            for i in range(self.max_retries):
+                await asyncio.sleep(5)
+                try:
+                    if await self.is_bypassed(page):
+                        self.log_message("Cloudflare challenge auto-resolved")
+                        await asyncio.sleep(1)
+                        return True
+                except Exception:
+                    # Page may be navigating — that's a good sign
+                    pass
+
+            # If auto-resolve failed, try the click solver as a fallback
+            # (for turnstile or interactive challenges)
+            self.log_message("Auto-resolve timed out. Attempting click solver...")
             challenge_type = await self.determine_challenge_type(page)
             if not challenge_type:
                 self.log_message("Could not determine challenge type")
                 return False
-            
+
             expected_selector = "#root"
             captcha_container = page
-            is_solved = False                
-            async with ClickSolver(framework=FrameworkType.CAMOUFOX, page=page, max_attempts=2, attempt_delay=1) as solver:
- 
+            is_solved = False
+            async with ClickSolver(framework=FrameworkType.CAMOUFOX, page=page, max_attempts=3, attempt_delay=2) as solver:
                 await solver.solve_captcha(
                     captcha_container=captcha_container,
                     captcha_type=challenge_type,
                     expected_content_selector=expected_selector,)
-
                 is_solved = "just a moment" not in await page.title()
-            
 
             if is_solved:
-                self.log_message("✅ Cloudflare challenge solved successfully!")
-                # Wait a bit more to ensure cookies are set
+                self.log_message("Cloudflare challenge solved successfully!")
                 await asyncio.sleep(1)
                 return True
             else:
-                self.log_message("❌ Failed to solve Cloudflare challenge")
+                self.log_message("Failed to solve Cloudflare challenge")
                 return False
 
         except Exception as e: