Merge pull request #4097 from seleniumbase/cdp-mode-patch-74

CDP Mode: Patch 74

Author: mdmintz

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.44.9"
+__version__ = "4.44.10"

seleniumbase/core/browser_launcher.py

@@ -300,7 +300,9 @@ def extend_driver(
             if not use_uc and os.path.exists(os.path.realpath(ext_dir)):
                 with suppress(Exception):
                     driver.webextension.install(os.path.realpath(ext_dir))
+    driver._is_using_auth = False
     if proxy_auth:
+        driver._is_using_auth = True
         if not use_uc and os.path.exists(proxy_helper.PROXY_DIR_PATH):
             with suppress(Exception):
                 driver.webextension.install(proxy_helper.PROXY_DIR_PATH)
@@ -5786,6 +5788,7 @@ def get_local_driver(
                         )
                 driver.default_get = driver.get  # Save copy of original
                 driver.cdp = None  # Set a placeholder
+                driver._is_using_uc = False
                 driver._is_using_cdp = False
                 driver._is_connected = True
                 if uc_activated:

seleniumbase/fixtures/base_case.py

@@ -230,7 +230,8 @@ def open(self, url):
         elif (
             hasattr(self.driver, "_is_using_uc")
             and self.driver._is_using_uc
-            and "@" in self.proxy_string
+            and hasattr(self.driver, "_is_using_auth")
+            and self.driver._is_using_auth
             and (
                 not hasattr(self.driver, "_is_using_cdp")
                 or not self.driver._is_using_cdp

seleniumbase/fixtures/page_actions.py

@@ -1756,6 +1756,28 @@ def open_url(driver, url):
     if __is_cdp_swap_needed(driver):
         driver.cdp.open(url)
         return
+    elif (
+        hasattr(driver, "_is_using_uc")
+        and driver._is_using_uc
+        and hasattr(driver, "_is_using_auth")
+        and driver._is_using_auth
+        and (
+            not hasattr(driver, "_is_using_cdp")
+            or not driver._is_using_cdp
+        )
+    ):
+        # Auth in UC Mode requires CDP Mode
+        driver.uc_activate_cdp_mode(url)
+        return
+    elif (
+        hasattr(driver, "_is_using_uc")
+        and driver._is_using_uc
+        and hasattr(driver, "_is_using_cdp")
+        and driver._is_using_cdp
+    ):
+        driver.disconnect()
+        driver.cdp.open(url)
+        return
     url = str(url).strip()  # Remove leading and trailing whitespace
     if not page_utils.looks_like_a_page_url(url):
         if page_utils.is_valid_url("https://" + url):

seleniumbase/plugins/driver_manager.py

@@ -742,7 +742,10 @@ def Driver(
         uc_cdp_events = True
     else:
         uc_cdp_events = False
-    if undetectable and browser != "chrome":
+    if (
+        undetectable
+        and browser not in ["chrome", "opera", "brave", "comet", "atlas"]
+    ):
         message = (
             '\n  Undetected-Chromedriver Mode ONLY supports Chrome!'
             '\n  ("uc=True" / "undetectable=True" / "--uc")'