web captcha

Author: davidhozic

docs/source/changelog.rst

@@ -37,6 +37,11 @@ Glossary
 Releases
 ---------------------
 
+|UNRELEASED| v2.10.4
+======================
+- Fixed prematurely exiting when waiting for captcha to be completed by user.
+
+
 v2.10.3
 ======================
 - Fixed Chrome driver not working with newer Chrome versions (115+).

src/daf/web.py

@@ -69,6 +69,8 @@ class GLOBALS:
 WD_FETCH_INVITE_CLOUDFLARE_TRIES = 3
 WD_FETCH_INVITE_CLOUDFLARE_DELAY = 7
 
+WD_CAPTCHA_RETRIES = 3
+
 WD_RD_CLICK_UPPER_N = 5
 WD_RD_CLICK_LOWER_N = 2
 WD_OUTPUT_PATH = pathlib.Path.home().joinpath("daf/daf_web_data")
@@ -83,6 +85,9 @@ class GLOBALS:
 TOP_GG_SERVER_JOIN_URL = "https://top.gg/servers/{id}/join"
 
 
+XPATH_CAPTCHA = "//iframe[contains(@src, 'captcha')]"
+
+
 @doc.doc_category("Clients")
 class SeleniumCLIENT:
     """
@@ -448,13 +453,21 @@ async def await_captcha(self):
         trace("Awaiting CAPTCHA", TraceLEVELS.DEBUG)
         await asyncio.sleep(WD_TIMEOUT_SHORT)
         try:
+            driver = self.driver
             # CAPTCHA detected, wait until it is solved by the user
-            await self.async_execute(
-                WebDriverWait(self.driver, WD_TIMEOUT_LONG).until_not,
-                presence_of_element_located(
-                    (By.XPATH, "//iframe[contains(@src, 'captcha')]")
+            for _ in range(WD_CAPTCHA_RETRIES):
+                await self.async_execute(
+                    WebDriverWait(driver, WD_TIMEOUT_LONG).until_not,
+                    presence_of_element_located(
+                        (By.XPATH, XPATH_CAPTCHA)
+                    )
                 )
-            )
+                await asyncio.sleep(WD_TIMEOUT_SHORT)
+                try:
+                    driver.find_element(By.XPATH, XPATH_CAPTCHA)
+                except:
+                    break  # No element found, skip the loop to prevent pointless waiting
+
         except TimeoutException as exc:
             raise TimeoutError("CAPTCHA was not solved by the user") from exc