Improve CDP Mode

Author: mdmintz

seleniumbase/core/browser_launcher.py

@@ -1413,7 +1413,7 @@ def _uc_gui_handle_captcha_(driver, frame="iframe", ctype=None):
             ctype = "cf_t"
         else:
             return
-    if not driver.is_connected():
+    if not driver.is_connected() and not __is_cdp_swap_needed(driver):
         driver.connect()
         time.sleep(2)
     install_pyautogui_if_missing(driver)
@@ -1425,15 +1425,18 @@ def _uc_gui_handle_captcha_(driver, frame="iframe", ctype=None):
     )
     with gui_lock:  # Prevent issues with multiple processes
         needs_switch = False
-        is_in_frame = js_utils.is_in_frame(driver)
+        if not __is_cdp_swap_needed(driver):
+            is_in_frame = js_utils.is_in_frame(driver)
+        else:
+            is_in_frame = False
         selector = "#challenge-stage"
         if ctype == "g_rc":
             selector = "#recaptcha-token"
         if is_in_frame and driver.is_element_present(selector):
             driver.switch_to.parent_frame()
             needs_switch = True
             is_in_frame = js_utils.is_in_frame(driver)
-        if not is_in_frame:
+        if not is_in_frame and not __is_cdp_swap_needed(driver):
             # Make sure the window is on top
             page_actions.switch_to_window(
                 driver, driver.current_window_handle, 2, uc_lock=False
@@ -1500,17 +1503,18 @@ def _uc_gui_handle_captcha_(driver, frame="iframe", ctype=None):
                 and frame == "iframe"
             ):
                 frame = 'iframe[title="reCAPTCHA"]'
-        if not is_in_frame or needs_switch:
-            # Currently not in frame (or nested frame outside CF one)
-            try:
-                if visible_iframe or ctype == "g_rc":
-                    driver.switch_to_frame(frame)
-            except Exception:
-                if visible_iframe or ctype == "g_rc":
-                    if driver.is_element_present("iframe"):
-                        driver.switch_to_frame("iframe")
-                    else:
-                        return
+        if not __is_cdp_swap_needed(driver):
+            if not is_in_frame or needs_switch:
+                # Currently not in frame (or nested frame outside CF one)
+                try:
+                    if visible_iframe or ctype == "g_rc":
+                        driver.switch_to_frame(frame)
+                except Exception:
+                    if visible_iframe or ctype == "g_rc":
+                        if driver.is_element_present("iframe"):
+                            driver.switch_to_frame("iframe")
+                        else:
+                            return
         try:
             selector = "div.cf-turnstile"
             if ctype == "g_rc":
@@ -1526,11 +1530,11 @@ def _uc_gui_handle_captcha_(driver, frame="iframe", ctype=None):
                 tab_count += 1
                 time.sleep(0.027)
                 active_element_css = js_utils.get_active_element_css(driver)
-                print(active_element_css)
                 if (
                     active_element_css.startswith(selector)
                     or active_element_css.endswith(" > div" * 2)
                     or (special_form and active_element_css.endswith(" div"))
+                    or (ctype == "g_rc" and "frame[name" in active_element_css)
                 ):
                     found_checkbox = True
                     sb_config._saved_cf_tab_count = tab_count
@@ -1550,6 +1554,7 @@ def _uc_gui_handle_captcha_(driver, frame="iframe", ctype=None):
             )
             and hasattr(sb_config, "_saved_cf_tab_count")
             and sb_config._saved_cf_tab_count
+            and not __is_cdp_swap_needed(driver)
         ):
             driver.uc_open_with_disconnect(driver.current_url, 3.8)
             with suppress(Exception):
@@ -4845,7 +4850,12 @@ def get_local_driver(
                                 )
                                 uc_activated = True
                             except URLError as e:
-                                if cert in e.args[0] and IS_MAC:
+                                if (
+                                    IS_MAC
+                                    and hasattr(e, "args")
+                                    and isinstance(e.args, (list, tuple))
+                                    and cert in e.args[0]
+                                ):
                                     mac_certificate_error = True
                                 else:
                                     raise

seleniumbase/core/sb_cdp.py

@@ -268,6 +268,7 @@ def click_nth_element(self, selector, number):
         if number < 0:
             number = 0
         element = elements[number]
+        element.scroll_into_view()
         element.click()
 
     def click_nth_visible_element(self, selector, number):
@@ -284,6 +285,7 @@ def click_nth_visible_element(self, selector, number):
         if number < 0:
             number = 0
         element = elements[number]
+        element.scroll_into_view()
         element.click()
 
     def click_link(self, link_text):
@@ -311,6 +313,13 @@ def __click(self, element):
         return result
 
     def __flash(self, element, *args, **kwargs):
+        element.scroll_into_view()
+        if len(args) < 3 and "x_offset" not in kwargs:
+            x_offset = self.__get_x_scroll_offset()
+            kwargs["x_offset"] = x_offset
+        if len(args) < 3 and "y_offset" not in kwargs:
+            y_offset = self.__get_y_scroll_offset()
+            kwargs["y_offset"] = y_offset
         return (
             self.loop.run_until_complete(
                 element.flash_async(*args, **kwargs)
@@ -382,9 +391,9 @@ def __save_to_dom(self, element):
         )
 
     def __scroll_into_view(self, element):
-        return (
-            self.loop.run_until_complete(element.scroll_into_view_async())
-        )
+        self.loop.run_until_complete(element.scroll_into_view_async())
+        self.__add_light_pause()
+        return None
 
     def __select_option(self, element):
         return (
@@ -431,6 +440,18 @@ def __get_js_attributes(self, element):
             self.loop.run_until_complete(element.get_js_attributes_async())
         )
 
+    def __get_x_scroll_offset(self):
+        x_scroll_offset = self.loop.run_until_complete(
+            self.page.evaluate("window.pageXOffset")
+        )
+        return x_scroll_offset or 0
+
+    def __get_y_scroll_offset(self):
+        y_scroll_offset = self.loop.run_until_complete(
+            self.page.evaluate("window.pageYOffset")
+        )
+        return y_scroll_offset or 0
+
     def tile_windows(self, windows=None, max_columns=0):
         """Tile windows and return the grid of tiled windows."""
         driver = self.driver
@@ -504,7 +525,7 @@ def get_active_element_css(self):
     def click(self, selector, timeout=settings.SMALL_TIMEOUT):
         self.__slow_mode_pause_if_set()
         element = self.find_element(selector, timeout=timeout)
-        self.__add_light_pause()
+        element.scroll_into_view()
         element.click()
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait())
@@ -518,7 +539,9 @@ def click_active_element(self):
 
     def click_if_visible(self, selector):
         if self.is_element_visible(selector):
-            self.find_element(selector).click()
+            element = self.find_element(selector)
+            element.scroll_into_view()
+            element.click()
             self.__slow_mode_pause_if_set()
             self.loop.run_until_complete(self.page.wait())
 
@@ -545,9 +568,10 @@ def click_visible_elements(self, selector, limit=0):
                 except Exception:
                     continue
                 if (width != 0 or height != 0):
+                    element.scroll_into_view()
                     element.click()
                     click_count += 1
-                    time.sleep(0.044)
+                    time.sleep(0.042)
                     self.__slow_mode_pause_if_set()
                     self.loop.run_until_complete(self.page.wait())
             except Exception:
@@ -557,7 +581,7 @@ def mouse_click(self, selector, timeout=settings.SMALL_TIMEOUT):
         """(Attempt simulating a mouse click)"""
         self.__slow_mode_pause_if_set()
         element = self.find_element(selector, timeout=timeout)
-        self.__add_light_pause()
+        element.scroll_into_view()
         element.mouse_click()
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait())
@@ -579,6 +603,7 @@ def get_nested_element(self, parent_selector, selector):
 
     def select_option_by_text(self, dropdown_selector, option):
         element = self.find_element(dropdown_selector)
+        element.scroll_into_view()
         options = element.query_selector_all("option")
         for found_option in options:
             if found_option.text.strip() == option.strip():
@@ -599,25 +624,33 @@ def flash(
         """Paint a quickly-vanishing dot over an element."""
         selector = self.__convert_to_css_if_xpath(selector)
         element = self.find_element(selector)
-        element.flash(duration=duration, color=color)
+        element.scroll_into_view()
+        x_offset = self.__get_x_scroll_offset()
+        y_offset = self.__get_y_scroll_offset()
+        element.flash(duration, color, x_offset, y_offset)
         if pause and isinstance(pause, (int, float)):
             time.sleep(pause)
 
     def highlight(self, selector):
         """Highlight an element with multi-colors."""
         selector = self.__convert_to_css_if_xpath(selector)
         element = self.find_element(selector)
-        element.flash(0.46, "44CC88")
+        element.scroll_into_view()
+        x_offset = self.__get_x_scroll_offset()
+        y_offset = self.__get_y_scroll_offset()
+        element.flash(0.46, "44CC88", x_offset, y_offset)
         time.sleep(0.15)
-        element.flash(0.42, "8844CC")
+        element.flash(0.42, "8844CC", x_offset, y_offset)
         time.sleep(0.15)
-        element.flash(0.38, "CC8844")
+        element.flash(0.38, "CC8844", x_offset, y_offset)
         time.sleep(0.15)
-        element.flash(0.30, "44CC88")
+        element.flash(0.30, "44CC88", x_offset, y_offset)
         time.sleep(0.30)
 
     def focus(self, selector):
-        self.find_element(selector).focus()
+        element = self.find_element(selector)
+        element.scroll_into_view()
+        element.focus()
 
     def highlight_overlay(self, selector):
         self.find_element(selector).highlight_overlay()
@@ -646,7 +679,7 @@ def remove_elements(self, selector):
     def send_keys(self, selector, text, timeout=settings.SMALL_TIMEOUT):
         self.__slow_mode_pause_if_set()
         element = self.select(selector, timeout=timeout)
-        self.__add_light_pause()
+        element.scroll_into_view()
         if text.endswith("\n") or text.endswith("\r"):
             text = text[:-1] + "\r\n"
         element.send_keys(text)
@@ -657,7 +690,7 @@ def press_keys(self, selector, text, timeout=settings.SMALL_TIMEOUT):
         """Similar to send_keys(), but presses keys at human speed."""
         self.__slow_mode_pause_if_set()
         element = self.select(selector, timeout=timeout)
-        self.__add_light_pause()
+        element.scroll_into_view()
         submit = False
         if text.endswith("\n") or text.endswith("\r"):
             submit = True
@@ -675,7 +708,7 @@ def type(self, selector, text, timeout=settings.SMALL_TIMEOUT):
         """Similar to send_keys(), but clears the text field first."""
         self.__slow_mode_pause_if_set()
         element = self.select(selector, timeout=timeout)
-        self.__add_light_pause()
+        element.scroll_into_view()
         with suppress(Exception):
             element.clear_input()
         if text.endswith("\n") or text.endswith("\r"):
@@ -688,8 +721,8 @@ def set_value(self, selector, text, timeout=settings.SMALL_TIMEOUT):
         """Similar to send_keys(), but clears the text field first."""
         self.__slow_mode_pause_if_set()
         selector = self.__convert_to_css_if_xpath(selector)
-        self.select(selector, timeout=timeout)
-        self.__add_light_pause()
+        element = self.select(selector, timeout=timeout)
+        element.scroll_into_view()
         press_enter = False
         if text.endswith("\n"):
             text = text[:-1]
@@ -1655,38 +1688,52 @@ def assert_url_contains(self, substring):
                 raise Exception(error % (expected, actual))
 
     def assert_text(
-        self, text, selector="html", timeout=settings.SMALL_TIMEOUT
+        self, text, selector="body", timeout=settings.SMALL_TIMEOUT
     ):
+        start_ms = time.time() * 1000.0
+        stop_ms = start_ms + (timeout * 1000.0)
         text = text.strip()
         element = None
         try:
             element = self.find_element(selector, timeout=timeout)
         except Exception:
             raise Exception("Element {%s} not found!" % selector)
-        for i in range(30):
+        for i in range(int(timeout * 10)):
+            with suppress(Exception):
+                element = self.find_element(selector, timeout=0.1)
             if text in element.text_all:
                 return True
+            now_ms = time.time() * 1000.0
+            if now_ms >= stop_ms:
+                break
             time.sleep(0.1)
         raise Exception(
             "Text {%s} not found in {%s}! Actual text: {%s}"
             % (text, selector, element.text_all)
         )
 
     def assert_exact_text(
-        self, text, selector="html", timeout=settings.SMALL_TIMEOUT
+        self, text, selector="body", timeout=settings.SMALL_TIMEOUT
     ):
+        start_ms = time.time() * 1000.0
+        stop_ms = start_ms + (timeout * 1000.0)
         text = text.strip()
         element = None
         try:
             element = self.select(selector, timeout=timeout)
         except Exception:
             raise Exception("Element {%s} not found!" % selector)
-        for i in range(30):
+        for i in range(int(timeout * 10)):
+            with suppress(Exception):
+                element = self.select(selector, timeout=0.1)
             if (
                 self.is_element_visible(selector)
                 and text.strip() == element.text_all.strip()
             ):
                 return True
+            now_ms = time.time() * 1000.0
+            if now_ms >= stop_ms:
+                break
             time.sleep(0.1)
         raise Exception(
             "Expected Text {%s}, is not equal to {%s} in {%s}!"
@@ -1727,26 +1774,31 @@ def scroll_to_y(self, y):
         with suppress(Exception):
             self.loop.run_until_complete(self.page.evaluate(js_code))
             self.loop.run_until_complete(self.page.wait())
+        self.__add_light_pause()
 
     def scroll_to_top(self):
         js_code = "window.scrollTo(0, 0);"
         with suppress(Exception):
             self.loop.run_until_complete(self.page.evaluate(js_code))
             self.loop.run_until_complete(self.page.wait())
+        self.__add_light_pause()
 
     def scroll_to_bottom(self):
         js_code = "window.scrollTo(0, 10000);"
         with suppress(Exception):
             self.loop.run_until_complete(self.page.evaluate(js_code))
             self.loop.run_until_complete(self.page.wait())
+        self.__add_light_pause()
 
     def scroll_up(self, amount=25):
         self.loop.run_until_complete(self.page.scroll_up(amount))
         self.loop.run_until_complete(self.page.wait())
+        self.__add_light_pause()
 
     def scroll_down(self, amount=25):
         self.loop.run_until_complete(self.page.scroll_down(amount))
         self.loop.run_until_complete(self.page.wait())
+        self.__add_light_pause()
 
     def save_screenshot(self, name, folder=None, selector=None):
         filename = name