Update CDP Mode

Author: mdmintz

examples/cdp_mode/ReadMe.md

@@ -391,7 +391,7 @@ sb.cdp.select_all(selector, timeout=None)
 sb.cdp.find_elements(selector, timeout=None)
 sb.cdp.find_visible_elements(selector, timeout=None)
 sb.cdp.click(selector, timeout=None)
-sb.cdp.click_if_visible(selector)
+sb.cdp.click_if_visible(selector, timeout=0)
 sb.cdp.click_visible_elements(selector, limit=0)
 sb.cdp.click_nth_element(selector, number)
 sb.cdp.click_nth_visible_element(selector, number)

seleniumbase/core/browser_launcher.py

@@ -1338,12 +1338,12 @@ def _uc_gui_click_captcha(
     _on_a_captcha_page = None
     if ctype == "cf_t":
         if not _on_a_cf_turnstile_page(driver):
-            return
+            return False
         else:
             _on_a_captcha_page = _on_a_cf_turnstile_page
     elif ctype == "g_rc":
         if not _on_a_g_recaptcha_page(driver):
-            return
+            return False
         else:
             _on_a_captcha_page = _on_a_g_recaptcha_page
     else:
@@ -1354,7 +1354,7 @@ def _uc_gui_click_captcha(
             ctype = "cf_t"
             _on_a_captcha_page = _on_a_cf_turnstile_page
         else:
-            return
+            return False
     install_pyautogui_if_missing(driver)
     import pyautogui
     pyautogui = get_configured_pyautogui(pyautogui)
@@ -1505,7 +1505,7 @@ def _uc_gui_click_captcha(
                 ):
                     frame = "div:not([class]) > div:not([class])"
                 else:
-                    return
+                    return False
             if (
                 driver.is_element_present("form")
                 and (
@@ -1605,9 +1605,9 @@ def _uc_gui_click_captcha(
                         if driver.is_connected():
                             driver.switch_to_frame("iframe")
                     else:
-                        return
+                        return False
             if not i_x or not i_y:
-                return
+                return False
         try:
             if ctype == "g_rc" and not driver.is_connected():
                 x = (i_x + 29) * width_ratio
@@ -1638,7 +1638,7 @@ def _uc_gui_click_captcha(
                 try:
                     driver.switch_to.default_content()
                 except Exception:
-                    return
+                    return False
         if x and y:
             sb_config._saved_cf_x_y = (x, y)
             if not __is_cdp_swap_needed(driver):
@@ -1652,7 +1652,7 @@ def _uc_gui_click_captcha(
                 _uc_gui_click_x_y(driver, x, y, timeframe=0.32)
                 if __is_cdp_swap_needed(driver):
                     time.sleep(float(constants.UC.RECONNECT_TIME) / 2.0)
-                    return
+                    return True
     reconnect_time = (float(constants.UC.RECONNECT_TIME) / 2.0) + 0.6
     if IS_LINUX:
         reconnect_time = constants.UC.RECONNECT_TIME + 0.2
@@ -1684,17 +1684,17 @@ def _uc_gui_click_captcha(
                     try:
                         driver.switch_to_frame("iframe")
                     except Exception:
-                        return
+                        return False
                 checkbox_success = None
                 if ctype == "cf_t":
                     checkbox_success = "#success-icon"
                 elif ctype == "g_rc":
                     checkbox_success = "span.recaptcha-checkbox-checked"
                 else:
-                    return  # If this line is reached, ctype wasn't set
+                    return False  # If line is reached, ctype wasn't set
                 if driver.is_element_visible("#success-icon"):
                     driver.switch_to.parent_frame(checkbox_success)
-                    return
+                    return True
             if blind:
                 driver.uc_open_with_disconnect(driver.get_current_url(), 3.8)
                 if __is_cdp_swap_needed(driver) and _on_a_captcha_page(driver):
@@ -1708,6 +1708,7 @@ def _uc_gui_click_captcha(
                     _uc_gui_click_x_y(driver, x, y, timeframe=0.32)
         if not cdp_mode_on_at_start:
             driver.reconnect(reconnect_time)
+    return True
 
 
 def uc_gui_click_captcha(driver, frame="iframe", retry=False, blind=False):

seleniumbase/core/sb_cdp.py

@@ -791,10 +791,10 @@ def click_active_element(self):
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait())
 
-    def click_if_visible(self, selector):
+    def click_if_visible(self, selector, timeout=0):
         if self.is_element_visible(selector):
             with suppress(Exception):
-                element = self.find_element(selector, timeout=0)
+                element = self.find_element(selector, timeout=timeout)
                 element.scroll_into_view()
                 element.click()
                 self.__slow_mode_pause_if_set()
@@ -1969,6 +1969,12 @@ def _on_a_cf_turnstile_page(self, source=None):
             return True
         return False
 
+    def _on_an_incapsula_hcaptcha_page(self, *args, **kwargs):
+        self.loop.run_until_complete(self.page.wait())
+        if self.is_element_visible('iframe[src*="_Incapsula_Resource?"]'):
+            return True
+        return False
+
     def _on_a_g_recaptcha_page(self, *args, **kwargs):
         time.sleep(0.4)  # reCAPTCHA may need a moment to appear
         self.loop.run_until_complete(self.page.wait())
@@ -1999,20 +2005,34 @@ def __gui_click_recaptcha(self, use_cdp=False):
         if self.is_element_visible('iframe[title="reCAPTCHA"]'):
             selector = 'iframe[title="reCAPTCHA"]'
         else:
-            return
+            return False
         time.sleep(0.25)
         self.loop.run_until_complete(self.page.wait())
         time.sleep(0.25)
         with suppress(Exception):
-            element_rect = self.get_gui_element_rect(selector, timeout=1)
+            element_rect = self.get_element_rect(selector, timeout=0.1)
             e_x = element_rect["x"]
             e_y = element_rect["y"]
+            window_rect = self.get_window_rect()
+            win_width = window_rect["innerWidth"]
+            win_height = window_rect["innerHeight"]
+            if (
+                e_x > 1040
+                and e_y > 640
+                and abs(win_width - e_x) < 110
+                and abs(win_height - e_y) < 110
+            ):
+                # Probably the invisible reCAPTCHA in the bottom right corner
+                return False
+            gui_element_rect = self.get_gui_element_rect(selector, timeout=1)
+            gui_e_x = gui_element_rect["x"]
+            gui_e_y = gui_element_rect["y"]
             x_offset = 26
             y_offset = 35
             if shared_utils.is_windows():
                 x_offset = 29
-            x = e_x + x_offset
-            y = e_y + y_offset
+            x = gui_e_x + x_offset
+            y = gui_e_y + y_offset
             sb_config._saved_cf_x_y = (x, y)
             time.sleep(0.08)
             if use_cdp:
@@ -2025,6 +2045,33 @@ def __gui_click_recaptcha(self, use_cdp=False):
                     time.sleep(0.056)
             else:
                 self.gui_click_x_y(x, y)
+            return True
+        return False
+
+    def __cdp_click_incapsula_hcaptcha(self):
+        selector = None
+        if self.is_element_visible('iframe[src*="_Incapsula_Resource?"]'):
+            outer_selector = 'iframe[src*="_Incapsula_Resource?"]'
+            selector = "iframe[data-hcaptcha-widget-id]"
+            element = self.get_nested_element(outer_selector, selector)
+            if not element:
+                return False
+        else:
+            return False
+        time.sleep(0.05)
+        self.loop.run_until_complete(self.page.wait())
+        time.sleep(0.05)
+        x_offset = 30
+        y_offset = 36
+        gui_lock = FileLock(constants.MultiBrowser.PYAUTOGUILOCK)
+        with gui_lock:  # Prevent issues with multiple processes
+            self.bring_active_window_to_front()
+            time.sleep(0.05)
+            with suppress(Exception):
+                element.click_with_offset(x_offset, y_offset)
+                time.sleep(0.2)
+                return True
+        return False
 
     def solve_captcha(self):
         self.__click_captcha(use_cdp=True)
@@ -2046,10 +2093,13 @@ def __click_captcha(self, use_cdp=False):
         if self._on_a_cf_turnstile_page(source):
             pass
         elif self._on_a_g_recaptcha_page(source):
-            self.__gui_click_recaptcha(use_cdp)
-            return
+            result = self.__gui_click_recaptcha(use_cdp)
+            return result
+        elif self._on_an_incapsula_hcaptcha_page():
+            result = self.__cdp_click_incapsula_hcaptcha()
+            return result
         else:
-            return
+            return False
         selector = None
         if self.is_element_present('[class="cf-turnstile"]'):
             selector = '[class="cf-turnstile"]'
@@ -2085,6 +2135,10 @@ def __click_captcha(self, use_cdp=False):
             '[class*="turnstile"] div:not([class])'
         ):
             selector = '[class*="turnstile"] div:not([class])'
+        elif self.is_element_present(
+            "iframe[data-hcaptcha-widget-id]"
+        ):
+            selector = "iframe[data-hcaptcha-widget-id]"
         elif self.is_element_present(
             '[data-callback="onCaptchaSuccess"]'
         ):
@@ -2094,9 +2148,9 @@ def __click_captcha(self, use_cdp=False):
         ):
             selector = "div:not([class]) > div:not([class])"
         else:
-            return
+            return False
         if not selector:
-            return
+            return False
         if (
             self.is_element_present("form")
             and (
@@ -2204,6 +2258,8 @@ def __click_captcha(self, use_cdp=False):
                     time.sleep(0.05)
             else:
                 self.gui_click_x_y(x, y)
+            return True
+        return False
 
     def __gui_drag_drop(self, x1, y1, x2, y2, timeframe=0.25, uc_lock=False):
         self.__install_pyautogui_if_missing()

seleniumbase/fixtures/base_case.py

@@ -2415,7 +2415,7 @@ def click_if_visible(self, selector, by="css selector", timeout=0):
         If a "timeout" is provided, waits that long for the element
         to appear before giving up and returning without a click()."""
         if self.__is_cdp_swap_needed():
-            self.cdp.click_if_visible(selector)
+            self.cdp.click_if_visible(selector, timeout=timeout)
             return
         self.wait_for_ready_state_complete()
         if self.is_element_visible(selector, by=by):

seleniumbase/fixtures/js_utils.py

@@ -1374,7 +1374,10 @@ def slow_scroll_to_element(driver, element, *args, **kwargs):
         element_location_x_fix = 0
     if element_location_x + element_width <= screen_width:
         element_location_x_fix = 0
-    distance = element_location_y - scroll_position
+    if shared_utils.is_cdp_swap_needed(driver):
+        distance = element_location_y
+    else:
+        distance = element_location_y - scroll_position
     if distance != 0:
         total_steps = int(abs(distance) / 50.0) + 2.0
         step_value = float(distance) / total_steps
@@ -1388,7 +1391,8 @@ def slow_scroll_to_element(driver, element, *args, **kwargs):
     scroll_script = "window.scrollTo(%s, %s);" % (
         element_location_x_fix, element_location_y
     )
-    execute_script(driver, scroll_script)
+    if not shared_utils.is_cdp_swap_needed(driver):
+        execute_script(driver, scroll_script)
     time.sleep(0.01)
     if distance > 430 or distance < -300:
         # Add small recovery time for long-distance slow-scrolling