seleniumbase 4.34.14__py3-none-any.whl → 4.34.16__py3-none-any.whl

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.34.14"
+__version__ = "4.34.16"

seleniumbase/core/browser_launcher.py

@@ -107,7 +107,7 @@ def make_driver_executable_if_not(driver_path):
         shared_utils.make_executable(driver_path)
 
 
-def extend_driver(driver):
+def extend_driver(driver, proxy_auth=False, use_uc=True):
     # Extend the driver with new methods
     driver.default_find_element = driver.find_element
     driver.default_find_elements = driver.find_elements
@@ -235,6 +235,8 @@ def extend_driver(driver):
     driver.reset_window_size = DM.reset_window_size
     if hasattr(driver, "proxy"):
         driver.set_wire_proxy = DM.set_wire_proxy
+    if proxy_auth and not use_uc:
+        time.sleep(0.11)  # Proxy needs moment to load in Manifest V3
     return driver
 
 
@@ -716,6 +718,10 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.is_selected = CDPM.is_selected
     cdp.is_element_present = CDPM.is_element_present
     cdp.is_element_visible = CDPM.is_element_visible
+    cdp.is_text_visible = CDPM.is_text_visible
+    cdp.is_exact_text_visible = CDPM.is_exact_text_visible
+    cdp.wait_for_text = CDPM.wait_for_text
+    cdp.wait_for_text_not_visible = CDPM.wait_for_text_not_visible
     cdp.wait_for_element_visible = CDPM.wait_for_element_visible
     cdp.assert_element = CDPM.assert_element
     cdp.assert_element_visible = CDPM.assert_element_visible
@@ -729,6 +735,7 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.assert_url_contains = CDPM.assert_url_contains
     cdp.assert_text = CDPM.assert_text
     cdp.assert_exact_text = CDPM.assert_exact_text
+    cdp.assert_text_not_visible = CDPM.assert_text_not_visible
     cdp.assert_true = CDPM.assert_true
     cdp.assert_false = CDPM.assert_false
     cdp.assert_equal = CDPM.assert_equal
@@ -2278,6 +2285,7 @@ def _set_chrome_options(
         or proxy_string
     ):
         chrome_options.add_argument("--ignore-certificate-errors")
+        chrome_options.add_argument("--ignore-ssl-errors=yes")
     if not enable_ws:
         chrome_options.add_argument("--disable-web-security")
     if (
@@ -3591,6 +3599,7 @@ def get_local_driver(
     Can also be used to spin up additional browsers for the same test."""
     downloads_path = DOWNLOADS_FOLDER
     b_path = binary_location
+    use_uc = is_using_uc(undetectable, browser_name)
     if use_wire:
         pip_find_lock = fasteners.InterProcessLock(
             constants.PipInstall.FINDLOCK
@@ -4064,7 +4073,7 @@ def get_local_driver(
                     edge_options.add_argument("--headless=old")
                 else:
                     edge_options.add_argument("--headless")
-        if mobile_emulator and not is_using_uc(undetectable, browser_name):
+        if mobile_emulator and not use_uc:
             emulator_settings = {}
             device_metrics = {}
             if (
@@ -4128,7 +4137,7 @@ def get_local_driver(
                         settings.CHROME_START_HEIGHT,
                     )
                 )
-        if user_data_dir and not is_using_uc(undetectable, browser_name):
+        if user_data_dir and not use_uc:
             abs_path = os.path.abspath(user_data_dir)
             edge_options.add_argument("--user-data-dir=%s" % abs_path)
         if extension_zip:
@@ -4163,7 +4172,7 @@ def get_local_driver(
         edge_options.add_argument("--disable-prompt-on-repost")
         if not enable_3d_apis:
             edge_options.add_argument("--disable-3d-apis")
-        if headless or headless2 or is_using_uc(undetectable, browser_name):
+        if headless or headless2 or use_uc:
             edge_options.add_argument("--disable-renderer-backgrounding")
         edge_options.add_argument("--disable-backgrounding-occluded-windows")
         edge_options.add_argument("--disable-client-side-phishing-detection")
@@ -4228,6 +4237,7 @@ def get_local_driver(
         edge_options.add_argument("--log-level=3")
         edge_options.add_argument("--no-first-run")
         edge_options.add_argument("--ignore-certificate-errors")
+        edge_options.add_argument("--ignore-ssl-errors=yes")
         if devtools and not headless:
             edge_options.add_argument("--auto-open-devtools-for-tabs")
         edge_options.add_argument("--allow-file-access-from-files")
@@ -4235,10 +4245,7 @@ def get_local_driver(
         edge_options.add_argument("--allow-running-insecure-content")
         if user_agent:
             edge_options.add_argument("--user-agent=%s" % user_agent)
-        if (
-            IS_LINUX
-            or (IS_MAC and not is_using_uc(undetectable, browser_name))
-        ):
+        if IS_LINUX or (IS_MAC and not use_uc):
             edge_options.add_argument("--no-sandbox")
         if remote_debug:
             # To access the Debugger, go to: edge://inspect/#devices
@@ -4252,10 +4259,7 @@ def get_local_driver(
         if swiftshader:
             edge_options.add_argument("--use-gl=angle")
             edge_options.add_argument("--use-angle=swiftshader-webgl")
-        elif (
-            not is_using_uc(undetectable, browser_name)
-            and not enable_3d_apis
-        ):
+        elif not use_uc and not enable_3d_apis:
             edge_options.add_argument("--disable-gpu")
         if IS_LINUX:
             edge_options.add_argument("--disable-dev-shm-usage")
@@ -4502,14 +4506,14 @@ def get_local_driver(
                         and len(saved_mcv.split(".")) == 4
                     ):
                         driver_version = saved_mcv
-                        if is_using_uc(undetectable, browser_name):
+                        if use_uc:
                             use_br_version_for_uc = True
                     if (
                         (headless or headless2)
                         and IS_WINDOWS
                         and major_chrome_version
                         and int(major_chrome_version) >= 117
-                        and not is_using_uc(undetectable, browser_name)
+                        and not use_uc
                         and not (remote_debug or devtools or use_wire)
                         and not (proxy_string or multi_proxy or proxy_pac_url)
                         and (not chromium_arg or "debug" not in chromium_arg)
@@ -4565,7 +4569,7 @@ def get_local_driver(
                             use_version = ch_driver_version
             disable_build_check = True
             uc_driver_version = None
-            if is_using_uc(undetectable, browser_name):
+            if use_uc:
                 if use_br_version_for_uc or driver_version == "mlatest":
                     uc_driver_version = get_uc_driver_version(full=True)
                     full_ch_driver_version = uc_driver_version
@@ -4626,7 +4630,6 @@ def get_local_driver(
                         "\nWarning: Could not make chromedriver"
                         " executable: %s" % e
                     )
-            use_uc = is_using_uc(undetectable, browser_name)
             make_uc_driver_from_chromedriver = False
             local_ch_exists = (
                 LOCAL_CHROMEDRIVER and os.path.exists(LOCAL_CHROMEDRIVER)
@@ -4843,7 +4846,7 @@ def get_local_driver(
             service_args = []
             if disable_build_check:
                 service_args = ["--disable-build-check"]
-            if is_using_uc(undetectable, browser_name):
+            if use_uc:
                 uc_lock = fasteners.InterProcessLock(
                     constants.MultiBrowser.DRIVER_FIXING_LOCK
                 )
@@ -4872,20 +4875,14 @@ def get_local_driver(
                                 "\nWarning: Could not make uc_driver"
                                 " executable: %s" % e
                             )
-            if (
-                not headless
-                or not IS_LINUX
-                or is_using_uc(undetectable, browser_name)
-            ):
+            if not headless or not IS_LINUX or use_uc:
                 uc_activated = False
                 try:
-                    if (
-                        os.path.exists(LOCAL_CHROMEDRIVER)
-                        or is_using_uc(undetectable, browser_name)
-                    ):
+                    if os.path.exists(LOCAL_CHROMEDRIVER) or use_uc:
                         if headless and not IS_LINUX:
                             undetectable = False  # No support for headless
-                        if is_using_uc(undetectable, browser_name):
+                            use_uc = is_using_uc(undetectable, browser_name)
+                        if use_uc:
                             from seleniumbase import undetected
                             from urllib.error import URLError
                             if IS_LINUX:
@@ -5185,7 +5182,7 @@ def get_local_driver(
                             driver = webdriver.Chrome(
                                 service=service, options=chrome_options
                             )
-                            return extend_driver(driver)
+                            return extend_driver(driver, proxy_auth, use_uc)
                     if not auto_upgrade_chromedriver:
                         raise  # Not an obvious fix.
                     else:
@@ -5436,11 +5433,11 @@ def get_local_driver(
                                 'Emulation.setDeviceMetricsOverride',
                                 set_device_metrics_override
                             )
-                return extend_driver(driver)
+                return extend_driver(driver, proxy_auth, use_uc)
             else:  # Running headless on Linux (and not using --uc)
                 try:
                     driver = webdriver.Chrome(options=chrome_options)
-                    return extend_driver(driver)
+                    return extend_driver(driver, proxy_auth, use_uc)
                 except Exception as e:
                     if not hasattr(e, "msg"):
                         raise
@@ -5462,7 +5459,7 @@ def get_local_driver(
                             driver = webdriver.Chrome(
                                 service=service, options=chrome_options
                             )
-                            return extend_driver(driver)
+                            return extend_driver(driver, proxy_auth, use_uc)
                     mcv = None  # Major Chrome Version
                     if "Current browser version is " in e.msg:
                         line = e.msg.split("Current browser version is ")[1]
@@ -5505,7 +5502,7 @@ def get_local_driver(
                                 service=service,
                                 options=chrome_options,
                             )
-                            return extend_driver(driver)
+                            return extend_driver(driver, proxy_auth, use_uc)
                     # Use the virtual display on Linux during headless errors
                     logging.debug(
                         "\nWarning: Chrome failed to launch in"
@@ -5523,9 +5520,9 @@ def get_local_driver(
                     driver = webdriver.Chrome(
                         service=service, options=chrome_options
                     )
-                    return extend_driver(driver)
+                    return extend_driver(driver, proxy_auth, use_uc)
         except Exception as original_exception:
-            if is_using_uc(undetectable, browser_name):
+            if use_uc:
                 raise
             # Try again if Chrome didn't launch
             with suppress(Exception):
@@ -5533,7 +5530,7 @@ def get_local_driver(
                 driver = webdriver.Chrome(
                     service=service, options=chrome_options
                 )
-                return extend_driver(driver)
+                return extend_driver(driver, proxy_auth, use_uc)
             if user_data_dir:
                 print("\nUnable to set user_data_dir while starting Chrome!\n")
                 raise
@@ -5560,7 +5557,7 @@ def get_local_driver(
             )
             try:
                 driver = webdriver.Chrome(service=service)
-                return extend_driver(driver)
+                return extend_driver(driver, proxy_auth, use_uc)
             except Exception:
                 raise original_exception
     else:

seleniumbase/core/proxy_helper.py

@@ -94,21 +94,23 @@ def create_proxy_ext(
     manifest_json = (
         """{\n"""
         """"version": "1.0.0",\n"""
-        """"manifest_version": 2,\n"""
+        """"manifest_version": 3,\n"""
         """"name": "Chrome Proxy",\n"""
         """"permissions": [\n"""
         """    "proxy",\n"""
         """    "tabs",\n"""
         """    "unlimitedStorage",\n"""
         """    "storage",\n"""
-        """    "<all_urls>",\n"""
         """    "webRequest",\n"""
-        """    "webRequestBlocking"\n"""
+        """    "webRequestAuthProvider"\n"""
+        """],\n"""
+        """"host_permissions": [\n"""
+        """    "<all_urls>"\n"""
         """],\n"""
         """"background": {\n"""
-        """    "scripts": ["background.js"]\n"""
+        """    "service_worker": "background.js"\n"""
         """},\n"""
-        """"minimum_chrome_version":"22.0.0"\n"""
+        """"minimum_chrome_version":"88.0.0"\n"""
         """}"""
     )
     abs_path = os.path.abspath(".")

seleniumbase/core/sb_cdp.py

@@ -62,6 +62,7 @@ class CDPMethods():
             lambda destination: self.__mouse_drag(element, destination)
         )
         element.mouse_move = lambda: self.__mouse_move(element)
+        element.press_keys = lambda text: self.__press_keys(element, text)
         element.query_selector = (
             lambda selector: self.__query_selector(element, selector)
         )
@@ -211,7 +212,8 @@ class CDPMethods():
                 element = self.__add_sync_methods(element.parent)
                 return self.__add_sync_methods(element)
             elif (
-                element.parent.parent
+                element.parent
+                and element.parent.parent
                 and tag_name in element.parent.parent.tag_name.lower()
                 and text.strip() in element.parent.parent.text
             ):
@@ -272,7 +274,8 @@ class CDPMethods():
                 if element not in updated_elements:
                     updated_elements.append(element)
             elif (
-                element.parent.parent
+                element.parent
+                and element.parent.parent
                 and tag_name in element.parent.parent.tag_name.lower()
                 and text.strip() in element.parent.parent.text
             ):
@@ -445,6 +448,23 @@ class CDPMethods():
             self.loop.run_until_complete(element.mouse_move_async())
         )
 
+    def __press_keys(self, element, text):
+        element.scroll_into_view()
+        submit = False
+        if text.endswith("\n") or text.endswith("\r"):
+            submit = True
+            text = text[:-1]
+        for key in text:
+            element.send_keys(key)
+            time.sleep(0.044)
+        if submit:
+            element.send_keys("\r\n")
+            time.sleep(0.044)
+        self.__slow_mode_pause_if_set()
+        return (
+            self.loop.run_until_complete(self.page.wait())
+        )
+
     def __query_selector(self, element, selector):
         selector = self.__convert_to_css_if_xpath(selector)
         element2 = self.loop.run_until_complete(
@@ -1681,21 +1701,79 @@ class CDPMethods():
                 return True
             return False
 
-    def wait_for_element_visible(self, selector, timeout=None):
+    def is_text_visible(self, text, selector="body"):
+        selector = self.__convert_to_css_if_xpath(selector)
+        text = text.strip()
+        element = None
+        try:
+            element = self.find_element(selector, timeout=0.1)
+        except Exception:
+            return False
+        with suppress(Exception):
+            if text in element.text_all:
+                return True
+        return False
+
+    def is_exact_text_visible(self, text, selector="body"):
+        selector = self.__convert_to_css_if_xpath(selector)
+        text = text.strip()
+        element = None
+        try:
+            element = self.find_element(selector, timeout=0.1)
+        except Exception:
+            return False
+        with suppress(Exception):
+            if text == element.text_all.strip():
+                return True
+        return False
+
+    def wait_for_text(self, text, selector="body", timeout=None):
         if not timeout:
             timeout = settings.SMALL_TIMEOUT
+        start_ms = time.time() * 1000.0
+        stop_ms = start_ms + (timeout * 1000.0)
+        text = text.strip()
+        element = None
         try:
-            self.select(selector, timeout=timeout)
+            element = self.find_element(selector, timeout=timeout)
         except Exception:
-            raise Exception("Element {%s} was not found!" % selector)
-        for i in range(30):
-            if self.is_element_visible(selector):
-                return self.select(selector)
+            raise Exception("Element {%s} not found!" % selector)
+        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("Element {%s} was not visible!" % selector)
+        raise Exception(
+            "Text {%s} not found in {%s}! Actual text: {%s}"
+            % (text, selector, element.text_all)
+        )
 
-    def assert_element(self, selector, timeout=None):
-        """Same as assert_element_visible()"""
+    def wait_for_text_not_visible(self, text, selector="body", timeout=None):
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
+        text = text.strip()
+        start_ms = time.time() * 1000.0
+        stop_ms = start_ms + (timeout * 1000.0)
+        for i in range(int(timeout * 10)):
+            if not self.is_text_visible(text, selector):
+                return True
+            now_ms = time.time() * 1000.0
+            if now_ms >= stop_ms:
+                break
+            time.sleep(0.1)
+        plural = "s"
+        if timeout == 1:
+            plural = ""
+        raise Exception(
+            "Text {%s} in {%s} was still visible after %s second%s!"
+            % (text, selector, timeout, plural)
+        )
+
+    def wait_for_element_visible(self, selector, timeout=None):
         if not timeout:
             timeout = settings.SMALL_TIMEOUT
         try:
@@ -1704,10 +1782,15 @@ class CDPMethods():
             raise Exception("Element {%s} was not found!" % selector)
         for i in range(30):
             if self.is_element_visible(selector):
-                return True
+                return self.select(selector)
             time.sleep(0.1)
         raise Exception("Element {%s} was not visible!" % selector)
 
+    def assert_element(self, selector, timeout=None):
+        """Same as assert_element_visible()"""
+        self.assert_element_visible(selector, timeout=timeout)
+        return True
+
     def assert_element_visible(self, selector, timeout=None):
         """Same as assert_element()"""
         if not timeout:
@@ -1852,29 +1935,9 @@ class CDPMethods():
                 raise Exception(error % (expected, actual))
 
     def assert_text(self, text, selector="body", timeout=None):
-        if not timeout:
-            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(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)
-        )
+        """Same as wait_for_text()"""
+        self.wait_for_text(text, selector=selector, timeout=timeout)
+        return True
 
     def assert_exact_text(self, text, selector="body", timeout=None):
         if not timeout:
@@ -1904,6 +1967,13 @@ class CDPMethods():
             % (text, element.text_all, selector)
         )
 
+    def assert_text_not_visible(self, text, selector="body", timeout=None):
+        """Raises an exception if the text is still visible after timeout."""
+        self.wait_for_text_not_visible(
+            text, selector=selector, timeout=timeout
+        )
+        return True
+
     def assert_true(self, expression):
         if not expression:
             raise AssertionError("%s is not true" % expression)

seleniumbase/fixtures/base_case.py

@@ -1454,6 +1454,8 @@ class BaseCase(unittest.TestCase):
 
     def is_text_visible(self, text, selector="body", by="css selector"):
         """Returns whether the text substring is visible in the element."""
+        if self.__is_cdp_swap_needed():
+            return self.cdp.is_text_visible(text, selector)
         self.wait_for_ready_state_complete()
         time.sleep(0.01)
         selector, by = self.__recalculate_selector(selector, by)
@@ -1464,6 +1466,8 @@ class BaseCase(unittest.TestCase):
     def is_exact_text_visible(self, text, selector="body", by="css selector"):
         """Returns whether the text is exactly equal to the element text.
         (Leading and trailing whitespace is ignored in the verification.)"""
+        if self.__is_cdp_swap_needed():
+            return self.cdp.is_exact_text_visible(text, selector)
         self.wait_for_ready_state_complete()
         time.sleep(0.01)
         selector, by = self.__recalculate_selector(selector, by)
@@ -9281,7 +9285,8 @@ class BaseCase(unittest.TestCase):
                     "bottom_left", "bottom_center", "bottom_right"]
         max_messages: The limit of concurrent messages to display."""
         self.__check_scope()
-        self._check_browser()
+        if not self.__is_cdp_swap_needed():
+            self._check_browser()
         if not theme:
             theme = "default"  # "flat"
         if not location:
@@ -9308,7 +9313,8 @@ class BaseCase(unittest.TestCase):
         You can also post messages by using =>
             self.execute_script('Messenger().post("My Message")') """
         self.__check_scope()
-        self._check_browser()
+        if not self.__is_cdp_swap_needed():
+            self._check_browser()
         if style not in ["info", "success", "error"]:
             style = "info"
         if not duration:
@@ -10326,6 +10332,10 @@ class BaseCase(unittest.TestCase):
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
         selector, by = self.__recalculate_selector(selector, by)
+        if self.__is_cdp_swap_needed():
+            return self.cdp.wait_for_text(
+                text, selector=selector, timeout=timeout
+            )
         return page_actions.wait_for_text_not_visible(
             self.driver, text, selector, by, timeout
         )
@@ -13909,7 +13919,8 @@ class BaseCase(unittest.TestCase):
         js_utils.highlight_element_with_js(self.driver, element, loops, o_bs)
 
     def __highlight_with_jquery(self, selector, loops, o_bs):
-        self.wait_for_ready_state_complete()
+        if not self.__is_cdp_swap_needed():
+            self.wait_for_ready_state_complete()
         js_utils.highlight_with_jquery(self.driver, selector, loops, o_bs)
 
     def __highlight_with_js_2(self, message, selector, o_bs):

seleniumbase/fixtures/js_utils.py

@@ -585,52 +585,60 @@ def highlight_with_jquery(driver, selector, loops=4, o_bs=""):
         '0px 0px 6px 6px rgba(128, 128, 128, 0.5)');"""
         % selector
     )
-    safe_execute_script(driver, script)
+    with suppress(Exception):
+        safe_execute_script(driver, script)
     for n in range(loops):
         script = (
             """jQuery('%s').css('box-shadow',
             '0px 0px 6px 6px rgba(255, 0, 0, 1)');"""
             % selector
         )
-        execute_script(driver, script)
+        with suppress(Exception):
+            execute_script(driver, script)
         time.sleep(0.0181)
         script = (
             """jQuery('%s').css('box-shadow',
             '0px 0px 6px 6px rgba(128, 0, 128, 1)');"""
             % selector
         )
-        execute_script(driver, script)
+        with suppress(Exception):
+            execute_script(driver, script)
         time.sleep(0.0181)
         script = (
             """jQuery('%s').css('box-shadow',
             '0px 0px 6px 6px rgba(0, 0, 255, 1)');"""
             % selector
         )
-        execute_script(driver, script)
+        with suppress(Exception):
+            execute_script(driver, script)
         time.sleep(0.0181)
         script = (
             """jQuery('%s').css('box-shadow',
             '0px 0px 6px 6px rgba(0, 255, 0, 1)');"""
             % selector
         )
-        execute_script(driver, script)
+        with suppress(Exception):
+            execute_script(driver, script)
         time.sleep(0.0181)
         script = (
             """jQuery('%s').css('box-shadow',
             '0px 0px 6px 6px rgba(128, 128, 0, 1)');"""
             % selector
         )
-        execute_script(driver, script)
+        with suppress(Exception):
+            execute_script(driver, script)
         time.sleep(0.0181)
         script = (
             """jQuery('%s').css('box-shadow',
             '0px 0px 6px 6px rgba(128, 0, 128, 1)');"""
             % selector
         )
-        execute_script(driver, script)
+        with suppress(Exception):
+            execute_script(driver, script)
         time.sleep(0.0181)
     script = """jQuery('%s').css('box-shadow', '%s');""" % (selector, o_bs)
-    execute_script(driver, script)
+    with suppress(Exception):
+        execute_script(driver, script)
 
 
 def add_css_link(driver, css_link):
@@ -924,9 +932,20 @@ def post_message(driver, message, msg_dur=None, style="info"):
         """hideAfter: %s, hideOnNavigate: true});"""
         % (message, style, msg_dur)
     )
+    retry = False
     try:
         execute_script(driver, messenger_script)
+    except TypeError as e:
+        if (
+            shared_utils.is_cdp_swap_needed(driver)
+            and "cannot unpack non-iterable" in str(e)
+        ):
+            pass
+        else:
+            retry = True
     except Exception:
+        retry = True
+    if retry:
         activate_messenger(driver)
         set_messenger_theme(driver)
         try:
@@ -1273,7 +1292,10 @@ def slow_scroll_to_element(driver, element, *args, **kwargs):
     scroll_position = execute_script(driver, "return window.scrollY;")
     element_location_y = None
     try:
-        element_location_y = element.location["y"]
+        if shared_utils.is_cdp_swap_needed(driver):
+            element.get_position().y
+        else:
+            element_location_y = element.location["y"]
     except Exception:
         element.location_once_scrolled_into_view
         return

seleniumbase/undetected/cdp_driver/browser.py

@@ -265,6 +265,8 @@ class Browser:
         :param new_window: Open new window
         :return: Page
         """
+        if url and ":" not in url:
+            url = "https://" + url
         if new_tab or new_window:
             # Create new target using the browser session.
             target_id = await self.connection.send(

seleniumbase/undetected/cdp_driver/cdp_util.py

@@ -4,6 +4,7 @@ import asyncio
 import fasteners
 import logging
 import os
+import sys
 import time
 import types
 import typing
@@ -11,6 +12,7 @@ from contextlib import suppress
 from seleniumbase import config as sb_config
 from seleniumbase.config import settings
 from seleniumbase.core import detect_b_ver
+from seleniumbase.core import proxy_helper
 from seleniumbase.fixtures import constants
 from seleniumbase.fixtures import shared_utils
 from typing import Optional, List, Union, Callable
@@ -23,6 +25,7 @@ import mycdp as cdp
 
 logger = logging.getLogger(__name__)
 IS_LINUX = shared_utils.is_linux()
+PROXY_DIR_LOCK = proxy_helper.PROXY_DIR_LOCK
 T = typing.TypeVar("T")
 
 
@@ -139,6 +142,85 @@ def __activate_virtual_display_as_needed(
                 __activate_standard_virtual_display()
 
 
+def __set_proxy_filenames():
+    DOWNLOADS_DIR = constants.Files.DOWNLOADS_FOLDER
+    for num in range(1000):
+        PROXY_DIR_PATH = os.path.join(DOWNLOADS_DIR, "proxy_ext_dir_%s" % num)
+        if os.path.exists(PROXY_DIR_PATH):
+            continue
+        proxy_helper.PROXY_DIR_PATH = PROXY_DIR_PATH
+        return
+    # Exceeded upper bound. Use Defaults:
+    PROXY_DIR_PATH = os.path.join(DOWNLOADS_DIR, "proxy_ext_dir")
+    proxy_helper.PROXY_DIR_PATH = PROXY_DIR_PATH
+
+
+def __add_chrome_ext_dir(extension_dir, dir_path):
+    # Add dir_path to the existing extension_dir
+    option_exists = False
+    if extension_dir:
+        option_exists = True
+        extension_dir = "%s,%s" % (
+            extension_dir, os.path.realpath(dir_path)
+        )
+    if not option_exists:
+        extension_dir = os.path.realpath(dir_path)
+    return extension_dir
+
+
+def __add_chrome_proxy_extension(
+    extension_dir,
+    proxy_string,
+    proxy_user,
+    proxy_pass,
+    proxy_bypass_list=None,
+    multi_proxy=False,
+):
+    """Implementation of https://stackoverflow.com/a/35293284/7058266
+    for https://stackoverflow.com/q/12848327/7058266
+    (Run Selenium on a proxy server that requires authentication.)"""
+    args = " ".join(sys.argv)
+    bypass_list = proxy_bypass_list
+    if (
+        not ("-n" in sys.argv or " -n=" in args or args == "-c")
+        and not multi_proxy
+    ):
+        # Single-threaded
+        proxy_dir_lock = fasteners.InterProcessLock(PROXY_DIR_LOCK)
+        with proxy_dir_lock:
+            proxy_helper.create_proxy_ext(
+                proxy_string,
+                proxy_user,
+                proxy_pass,
+                bypass_list,
+                zip_it=False,
+            )
+            proxy_dir_path = proxy_helper.PROXY_DIR_PATH
+            extension_dir = __add_chrome_ext_dir(
+                extension_dir, proxy_dir_path
+            )
+    else:
+        # Multi-threaded
+        proxy_dir_lock = fasteners.InterProcessLock(PROXY_DIR_LOCK)
+        with proxy_dir_lock:
+            with suppress(Exception):
+                shared_utils.make_writable(PROXY_DIR_LOCK)
+            if multi_proxy:
+                __set_proxy_filenames()
+            if not os.path.exists(proxy_helper.PROXY_DIR_PATH):
+                proxy_helper.create_proxy_ext(
+                    proxy_string,
+                    proxy_user,
+                    proxy_pass,
+                    bypass_list,
+                    zip_it=False,
+                )
+            extension_dir = __add_chrome_ext_dir(
+                extension_dir, proxy_helper.PROXY_DIR_PATH
+            )
+    return extension_dir
+
+
 async def start(
     config: Optional[Config] = None,
     *,
@@ -156,6 +238,8 @@ async def start(
     xvfb: Optional[int] = None,  # Use a special virtual display on Linux
     headed: Optional[bool] = None,  # Override default Xvfb mode on Linux
     expert: Optional[bool] = None,  # Open up closed Shadow-root elements
+    proxy: Optional[str] = None,  # "host:port" or "user:pass@host:port"
+    extension_dir: Optional[str] = None,  # Chrome extension directory
     **kwargs: Optional[dict],
 ) -> Browser:
     """
@@ -200,6 +284,18 @@ async def start(
     if IS_LINUX and not headless and not headed and not xvfb:
         xvfb = True  # The default setting on Linux
     __activate_virtual_display_as_needed(headless, headed, xvfb, xvfb_metrics)
+    if proxy and "@" in str(proxy):
+        user_with_pass = proxy.split("@")[0]
+        if ":" in user_with_pass:
+            proxy_user = user_with_pass.split(":")[0]
+            proxy_pass = user_with_pass.split(":")[1]
+            proxy_string = proxy.split("@")[1]
+            extension_dir = __add_chrome_proxy_extension(
+                extension_dir,
+                proxy_string,
+                proxy_user,
+                proxy_pass,
+            )
     if not config:
         config = Config(
             user_data_dir,
@@ -213,13 +309,19 @@ async def start(
             host=host,
             port=port,
             expert=expert,
+            proxy=proxy,
+            extension_dir=extension_dir,
             **kwargs,
         )
+    driver = None
     try:
-        return await Browser.create(config)
+        driver = await Browser.create(config)
     except Exception:
         time.sleep(0.15)
-        return await Browser.create(config)
+        driver = await Browser.create(config)
+    if proxy and "@" in str(proxy):
+        time.sleep(0.11)
+    return driver
 
 
 async def start_async(*args, **kwargs) -> Browser:

seleniumbase/undetected/cdp_driver/config.py

@@ -40,6 +40,8 @@ class Config:
         host: str = AUTO,
         port: int = AUTO,
         expert: bool = AUTO,
+        proxy: Optional[str] = None,
+        extension_dir: Optional[str] = None,
         **kwargs: dict,
     ):
         """
@@ -91,6 +93,8 @@ class Config:
         self.host = host
         self.port = port
         self.expert = expert
+        self.proxy = proxy
+        self.extension_dir = extension_dir
         self._extensions = []
         # When using posix-ish operating system and running as root,
         # you must use no_sandbox=True
@@ -195,6 +199,12 @@ class Config:
                 "--disable-web-security",
                 "--disable-site-isolation-trials",
             ]
+        if self.proxy:
+            args.append("--proxy-server=%s" % self.proxy.split("@")[-1])
+            args.append("--ignore-certificate-errors")
+            args.append("--ignore-ssl-errors=yes")
+        if self.extension_dir:
+            args.append("--load-extension=%s" % self.extension_dir)
         if self._browser_args:
             args.extend([arg for arg in self._browser_args if arg not in args])
         if self.headless:

{seleniumbase-4.34.14.dist-info → seleniumbase-4.34.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: seleniumbase
-Version: 4.34.14
+Version: 4.34.16
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -68,7 +68,7 @@ Requires-Dist: attrs>=25.1.0
 Requires-Dist: certifi>=2025.1.31
 Requires-Dist: exceptiongroup>=1.2.2
 Requires-Dist: websockets~=13.1; python_version < "3.9"
-Requires-Dist: websockets>=14.2; python_version >= "3.9"
+Requires-Dist: websockets>=15.0; python_version >= "3.9"
 Requires-Dist: filelock~=3.16.1; python_version < "3.9"
 Requires-Dist: filelock>=3.17.0; python_version >= "3.9"
 Requires-Dist: fasteners>=0.19
@@ -99,8 +99,8 @@ Requires-Dist: sniffio==1.3.1
 Requires-Dist: h11==0.14.0
 Requires-Dist: outcome==1.3.0.post0
 Requires-Dist: trio==0.27.0; python_version < "3.9"
-Requires-Dist: trio==0.28.0; python_version >= "3.9"
-Requires-Dist: trio-websocket==0.11.1
+Requires-Dist: trio==0.29.0; python_version >= "3.9"
+Requires-Dist: trio-websocket==0.12.1
 Requires-Dist: wsproto==1.2.0
 Requires-Dist: websocket-client==1.8.0
 Requires-Dist: selenium==4.27.1; python_version < "3.9"
@@ -137,7 +137,7 @@ Requires-Dist: pytest-cov>=5.0.0; python_version < "3.9" and extra == "coverage"
 Requires-Dist: pytest-cov>=6.0.0; python_version >= "3.9" and extra == "coverage"
 Provides-Extra: flake8
 Requires-Dist: flake8==5.0.4; python_version < "3.9" and extra == "flake8"
-Requires-Dist: flake8==7.1.1; python_version >= "3.9" and extra == "flake8"
+Requires-Dist: flake8==7.1.2; python_version >= "3.9" and extra == "flake8"
 Requires-Dist: mccabe==0.7.0; extra == "flake8"
 Requires-Dist: pyflakes==2.5.0; python_version < "3.9" and extra == "flake8"
 Requires-Dist: pyflakes==3.2.0; python_version >= "3.9" and extra == "flake8"

{seleniumbase-4.34.14.dist-info → seleniumbase-4.34.16.dist-info}/RECORD

@@ -3,7 +3,7 @@ sbase/__main__.py,sha256=G0bVB1-DM4PGwQ1KyOupaWCs4ePbChZNNWuX2htim5U,647
 sbase/steps.py,sha256=_WvAjydKqZfTdnZW9LPKkRty-g-lfdUPmLqnZj6ulcs,43013
 seleniumbase/__init__.py,sha256=OtJh8nGKL4xtZpw8KPqmn7Q6R-86t4cWUDyVF5MbMTo,2398
 seleniumbase/__main__.py,sha256=dn1p6dgCchmcH1zzTzzQvFwwdQQqnTGH6ULV9m4hv24,654
-seleniumbase/__version__.py,sha256=UxABS3j4kMHoxFb6GTOAJ94dTcWKwEv0oOyYZkzPXQQ,47
+seleniumbase/__version__.py,sha256=yo5-NDclqDbu-vlvPFL7dji8w3SHeRhS6yV5yaJdYxU,47
 seleniumbase/behave/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/behave/behave_helper.py,sha256=elkl8P9eLulRAioLstE9baYNM9N_PHBmAOcajX-pH_Y,24198
 seleniumbase/behave/behave_sb.py,sha256=qQF85LoohJBfrPK5ZcPi50v-pWtOrC9qcN1B3Ki_3tY,59401
@@ -36,7 +36,7 @@ seleniumbase/console_scripts/sb_print.py,sha256=tNy-bMDgwHJO3bZxMpmo9weSE8uhbH0C
 seleniumbase/console_scripts/sb_recorder.py,sha256=fnHb5-kh11Hit-E9Ha-e4QXzqLcZvtij6mb5qNd4B1Q,11032
 seleniumbase/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/core/application_manager.py,sha256=e_0sjtI8cjY5BNyZj1QBR0j6_oCScxGmSXYEpcYwuZE,576
-seleniumbase/core/browser_launcher.py,sha256=xkEcsdyz0E3acWgz_UYvrx6qMWUZT_IimhiJ885FVUw,235625
+seleniumbase/core/browser_launcher.py,sha256=zRDRfNGsCHKn5w1R_78l5SnbieQ3bm74NMmJs4O-sQ8,235755
 seleniumbase/core/capabilities_parser.py,sha256=meIS2uHapTCq2ldfNAToC7r0cKmZDRXuYNKExM1GHDY,6038
 seleniumbase/core/colored_traceback.py,sha256=DrRWfg7XEnKcgY59Xj7Jdk09H-XqHYBSUpB-DiZt6iY,2020
 seleniumbase/core/create_db_tables.sql,sha256=VWPtrdiW_HQ6yETHjqTu-VIrTwvd8I8o1NfBeaVSHpU,972
@@ -46,11 +46,11 @@ seleniumbase/core/encoded_images.py,sha256=rDKJ4cNJSuKiRcFViYU7bjyTS9_moI57gUPRX
 seleniumbase/core/jqc_helper.py,sha256=2DDQr9Q2jSSZqFzX588jLlUM9oJvyrRWq2aORSIPUdI,10322
 seleniumbase/core/log_helper.py,sha256=SW8wx2f2HfU3ERbANjxEC-jDbjy_IzaNYRKPlayfRRI,23442
 seleniumbase/core/mysql.py,sha256=8Fzj3p5dhtDWfMpFqFYxpSwa9s1UltiHsWJ56_aPOqk,3993
-seleniumbase/core/proxy_helper.py,sha256=kZnfkflB3XhuL2h-3inmx3UOLS8VAZ385BGCc4H8TvU,8267
+seleniumbase/core/proxy_helper.py,sha256=4VkpMwavz0fx8wcOqJ_jyBT0HIXwcxmAcpd1gjJizdc,8332
 seleniumbase/core/recorder_helper.py,sha256=fNGjbapXmEsht54x1o6Igk198QdnPxDDnjUOzQxNhNQ,25055
 seleniumbase/core/report_helper.py,sha256=AIl6Qava2yW1uSzbLpJBlPlYDz0KE-rVhogh8hsGWBo,12201
 seleniumbase/core/s3_manager.py,sha256=bkeI8I4y19ebWuQG1oEZV5qJbotC6eN8vin31OCNWJk,3521
-seleniumbase/core/sb_cdp.py,sha256=r9sv8WjwLhS_AFLn4QGLvbK4osfaC6ncRJRj0asrBvI,76754
+seleniumbase/core/sb_cdp.py,sha256=5OLmRH5JSJYwqDomY2O9cx_0lNlAwNYjJbUTGmFUZPQ,79126
 seleniumbase/core/sb_driver.py,sha256=yvTDRblBzG6bDX7XcLiAA6QcBelSJj_HHL_04lcfeeE,13760
 seleniumbase/core/session_helper.py,sha256=s9zD3PVZEWVzG2h81cCUskbNWLfdjC_LwwQjKptHCak,558
 seleniumbase/core/settings_parser.py,sha256=gqVohHVlE_5L5Cqe2L24uYrRzvoK-saX8E_Df7_-_3I,7609
@@ -65,11 +65,11 @@ seleniumbase/extensions/disable_csp.zip,sha256=5RvomXnm2PdivUVcxTV6jfvD8WhTEsQYH
 seleniumbase/extensions/recorder.zip,sha256=OOyzF-Ize2cSRu1CqhzSAq5vusI9hqLLd2OIApUHesI,11918
 seleniumbase/extensions/sbase_ext.zip,sha256=3s1N8zrVaMz8RQEOIoBzC3KDjtmHwVZRvVsX25Odr_s,8175
 seleniumbase/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-seleniumbase/fixtures/base_case.py,sha256=0bW99a1g8YH5YCXLnsJvZ5uSXvLOmY6QutDEpxDjX9U,721561
+seleniumbase/fixtures/base_case.py,sha256=AJ33rXML0feRLo6WdCcQhxmBwEtQdn_gXuOy_iFPInY,722065
 seleniumbase/fixtures/constants.py,sha256=WMrItuNyKq3XVJ64NluLIRc4gJCxDw8K8qXED0b9S2w,13752
 seleniumbase/fixtures/css_to_xpath.py,sha256=9ouDB1xl4MJ2os6JOgTIAyHKOQfuxtxvXC3O5hSnEKA,1954
 seleniumbase/fixtures/errors.py,sha256=KyxuEVx_e3MPhVrJfNIa_3ltMpbCFxfy_jxK8RFNTns,555
-seleniumbase/fixtures/js_utils.py,sha256=asZJ0LDFv2BPQOzUVKK_9ie8ToGcmFousDnGdb3Vabg,51534
+seleniumbase/fixtures/js_utils.py,sha256=QxHC0Wz_rDQ5dB6B1CK_UFs9zzryuElr-fj7MUtf_lA,52204
 seleniumbase/fixtures/page_actions.py,sha256=LPcFSkUvBkxLrOt4laQHHN-NLmqInT41E2vlPiOlLFY,66753
 seleniumbase/fixtures/page_utils.py,sha256=H1iV8f9vDyEy87DBntyiBXC_tg8HskcebUOAJVn0hxE,12160
 seleniumbase/fixtures/shared_utils.py,sha256=G6CsE-Adt-GfuZF-71jXWKSIQW7YZPx8FIM24pVd_yI,8368
@@ -115,9 +115,9 @@ seleniumbase/undetected/reactor.py,sha256=NropaXcO54pzmDq6quR27qPJxab6636H7LRAaq
 seleniumbase/undetected/webelement.py,sha256=OOpUYbEiOG52KsYYyuDW9tYLdA2SMnukvwQHUdPVn9E,1389
 seleniumbase/undetected/cdp_driver/__init__.py,sha256=c0TjMwPfVFyoqYOJ7PQ-Jln_L_dpN3ebHyaD-juQoM0,64
 seleniumbase/undetected/cdp_driver/_contradict.py,sha256=lP4b0h5quAy573ETn_TBbYV889cL1AuPLVInpJ0ZkiU,3183
-seleniumbase/undetected/cdp_driver/browser.py,sha256=vwccwrAZDssRmVnf-NVXYvs5Dvv8DtGzeiDHSY3RTfM,30189
-seleniumbase/undetected/cdp_driver/cdp_util.py,sha256=B5myq2zi-Gdq_vfZGPOG-LTSwbhK4n2h6SY2Z9dmIzQ,17784
-seleniumbase/undetected/cdp_driver/config.py,sha256=oHFJ3UH0OmLmEGgG5S6SZwbyBs9ZYMsbUJ02QCA7iZc,12044
+seleniumbase/undetected/cdp_driver/browser.py,sha256=ruPunmJKwE67Veh1MjSkZAF5W38FMwc32lHgy1YULho,30261
+seleniumbase/undetected/cdp_driver/cdp_util.py,sha256=zlYc_oTqtCSjV_T7lzPbFyJlj_78NHMxKkrpleXcfpQ,21374
+seleniumbase/undetected/cdp_driver/config.py,sha256=t8KV1Vqa5SQRBq3-gjkHHmj9h85AplAM01asO3AWufs,12507
 seleniumbase/undetected/cdp_driver/connection.py,sha256=sOTUGjbUqKA2hPvDcRCdqw1VQjVGJs7mbgVvzS7ldtE,23360
 seleniumbase/undetected/cdp_driver/element.py,sha256=FIC6v7OmumLCT-_vIc3H4oju_oBbaLpWJUJIKm2c_q4,40467
 seleniumbase/undetected/cdp_driver/tab.py,sha256=rcASsWY_mC7L0wXpFSWM5mtojzA47qG9BWEMXe7ZGF8,50906
@@ -135,9 +135,9 @@ seleniumbase/utilities/selenium_grid/start-grid-hub.bat,sha256=Ftq-GrAKRYH2ssDPr
 seleniumbase/utilities/selenium_grid/start-grid-hub.sh,sha256=KADv0RUHONLL2_I443QFK8PryBpDmKn5Gy0s4o0vDSM,106
 seleniumbase/utilities/selenium_ide/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/utilities/selenium_ide/convert_ide.py,sha256=pZFnqEJQEKZPyNFjkLD29s2HPQgCrWW9XJWpCPhWOoM,31691
-seleniumbase-4.34.14.dist-info/LICENSE,sha256=BRblZsX7HyPUjQmYTiyWr_e9tzWvmR3R4SFclM2R3W0,1085
-seleniumbase-4.34.14.dist-info/METADATA,sha256=u2jHtXFZv3QOcz_K67gNWrepuM0THRJz_JlaY-B0BoE,86522
-seleniumbase-4.34.14.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-seleniumbase-4.34.14.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
-seleniumbase-4.34.14.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
-seleniumbase-4.34.14.dist-info/RECORD,,
+seleniumbase-4.34.16.dist-info/LICENSE,sha256=BRblZsX7HyPUjQmYTiyWr_e9tzWvmR3R4SFclM2R3W0,1085
+seleniumbase-4.34.16.dist-info/METADATA,sha256=qF4wtXCAPxi0YzvlBRfk_z-drHDdQH4wTTkhCcWHO3g,86522
+seleniumbase-4.34.16.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+seleniumbase-4.34.16.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
+seleniumbase-4.34.16.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
+seleniumbase-4.34.16.dist-info/RECORD,,