refactor + docstrings

src/utils/browser.py

@@ -5,10 +5,24 @@ from nodriver.core.element import Element
 
 from src.utils import logger
 from src.utils.consts import CHALLENGE_TITLES
-from src.utils.extentions import downloaded_extentions
+from src.utils.extentions import download_extentions
+
+downloaded_extentions = download_extentions()
 
 
 async def new_browser():
+    """
+    Create a new browser instance with the specified configuration.
+
+    Returns
+    -------
+        A coroutine that resolves to the newly created browser instance.
+
+    Raises
+    ------
+        Any exceptions that may occur during the creation of the browser instance.
+
+    """
     config: webdriver.Config = webdriver.Config()
     config.sandbox = False
     config.add_argument(f"--load-extension={','.join(downloaded_extentions)}")
@@ -17,9 +31,34 @@ async def new_browser():
 
 
 async def bypass_cloudflare(page: webdriver.Tab):
+    """
+    Asynchronously bypasses Cloudflare challenges on the given web page.
+
+    Args:
+    ----
+        page (webdriver.Tab): The web page to bypass Cloudflare challenges on.
+
+    Returns:
+    -------
+        bool: True if the page was successfully bypassed, False otherwise.
+
+    Raises:
+    ------
+        Exception: If the element containing the Cloudflare challenge could not be found.
+
+    Notes:
+    -----
+        This function repeatedly checks the title of the page until it is not in the
+        list of known Cloudflare challenge titles. Once a challenge is found, it attempts
+        to locate the element containing the challenge and click it. If the element cannot
+        be found within a certain time limit, the function will retry. If the element is
+        found, it will be clicked. If the element cannot be found at all, an exception will
+        be raised.
+
+    """
     challenged = False
     while True:
-        await page.wait(0.5)
+        await page
         logger.debug(f"Current page: {page.target.title}")
         if page.target.title not in CHALLENGE_TITLES:
             return challenged
@@ -27,11 +66,33 @@ async def bypass_cloudflare(page: webdriver.Tab):
             logger.info("Found challenge")
             challenged = True
         try:
-            elem = await asyncio.wait_for(
+            elem = await page.find(
-                page.query_selector(".cf-turnstile-wrapper"), timeout=3
+                "Verify you are human by completing the action below.",
+                timeout=3,
             )
         except asyncio.TimeoutError:
-            logger.warning("Timed out waiting for element, trying again")
+            if page.target.title not in CHALLENGE_TITLES:
+                return challenged
+            raise
+
+        logger.debug("Timed out waiting for element, trying again")
+        if elem is None:
+            continue
+
+        elem = elem.parent
+        for _ in range(3):
+            if elem is not None:
+                elem = await elem.query_selector("div")  # type: ignore reportAttributeAccessIssue
+            else:
+                raise InvalidElementError
+
             continue
         if isinstance(elem, Element):
+            logger.debug("Clicking element")
             await elem.mouse_click()
+        else:
+            logger.warn("Coulnd't find checkbox, trying again...")
+
+
+class InvalidElementError(Exception):
+    pass