Update CDP Mode

Author: mdmintz

seleniumbase/core/browser_launcher.py

@@ -443,14 +443,14 @@ def has_captcha(text):
         "<title>403 Forbidden</title>" in text
         or "Permission Denied</title>" in text
         or 'id="challenge-error-text"' in text
+        or "/challenge-platform/h/b/" in text
         or "<title>Just a moment..." in text
         or 'action="/?__cf_chl_f_tk' in text
         or 'id="challenge-widget-' in text
         or 'src="chromedriver.js"' in text
         or 'class="g-recaptcha"' in text
         or 'content="Pixelscan"' in text
         or 'id="challenge-form"' in text
-        or "/challenge-platform" in text
         or "window._cf_chl_opt" in text
         or "/recaptcha/api.js" in text
         or "/turnstile/" in text
@@ -656,10 +656,8 @@ def uc_open_with_cdp_mode(driver, url=None, **kwargs):
         safe_url = False
 
     if (
-        hasattr(driver, "_is_using_cdp")
-        and driver._is_using_cdp
-        and hasattr(driver, "cdp")
-        and driver.cdp
+        getattr(driver, "_is_using_cdp", None)
+        and getattr(driver, "cdp", None)
         and hasattr(driver.cdp, "loop")
     ):
         # CDP Mode was already initialized
@@ -1042,7 +1040,7 @@ def uc_click(
 def verify_pyautogui_has_a_headed_browser(driver):
     """PyAutoGUI requires a headed browser so that it can
     focus on the correct element when performing actions."""
-    if hasattr(driver, "_is_hidden") and driver._is_hidden:
+    if getattr(driver, "_is_hidden", None):
         raise Exception(
             "PyAutoGUI can't be used in headless mode!"
         )
@@ -1142,8 +1140,7 @@ def get_configured_pyautogui(pyautogui_copy):
         and "DISPLAY" in os.environ.keys()
     ):
         if (
-            hasattr(sb_config, "_pyautogui_x11_display")
-            and sb_config._pyautogui_x11_display
+            getattr(sb_config, "_pyautogui_x11_display", None)
             and hasattr(pyautogui_copy._pyautogui_x11, "_display")
             and (
                 sb_config._pyautogui_x11_display
@@ -1300,8 +1297,12 @@ def uc_gui_click_x_y(driver, x, y, timeframe=0.25):
 def _on_a_cf_turnstile_page(driver):
     source = driver.get_page_source()
     if (
-        'data-callback="onCaptchaSuccess"' in source
-        or "/challenge-platform/scripts/" in source
+        (
+            'data-callback="onCaptchaSuccess"' in source
+            and 'title="reCAPTCHA"' not in source
+            and 'id="recaptcha-token"' not in source
+        )
+        or "/challenge-platform/h/b/" in source
         or 'id="challenge-widget-' in source
         or "challenges.cloudf" in source
         or "cf-turnstile-" in source

seleniumbase/core/sb_cdp.py

@@ -1149,22 +1149,60 @@ def open_new_tab(self, url=None, switch_to=True):
         if not isinstance(url, str):
             url = "about:blank"
         if hasattr(driver, "cdp_base"):
-            self.loop.run_until_complete(self.page.get(url, new_tab=True))
+            try:
+                self.loop.run_until_complete(self.page.get(url, new_tab=True))
+            except Exception:
+                original_targets = self.loop.run_until_complete(
+                    self.page.send(mycdp.target.get_targets())
+                )
+                tab_url = driver.cdp_base.tabs[0].websocket_url
+                if not self.driver.is_connected():
+                    self.driver.connect()
+                self.driver.open_new_tab()
+                targets = self.loop.run_until_complete(
+                    self.page.send(mycdp.target.get_targets())
+                )
+                new_targets = []
+                for target in targets:
+                    if target not in original_targets:
+                        new_targets.append(target)
+                if new_targets:
+                    found_target = new_targets[0]
+                    t_str = str(new_targets[0])
+                    target_id = (
+                        t_str.split("target_id=TargetID('")[-1].split("')")[0]
+                    )
+                    pre_tab_url = tab_url.split("/page/")[0] + "/page/"
+                    new_tab_url = pre_tab_url + target_id
+                    new_tab = cdp_tab.Tab(
+                        new_tab_url, found_target, driver.cdp_base
+                    )
+                    driver.cdp_base.targets.append(new_tab)
+                    driver.cdp_base.tabs.append(new_tab)
+                    self.driver.disconnect()
+                    self.switch_to_newest_tab()
+                    self.open(url)
+                    return
+                elif getattr(sb_config, "guest_mode", None):
+                    print("  open_new_tab() failed! (Known Guest Mode issue)")
             if switch_to:
                 self.switch_to_newest_tab()
             return
 
         target_id = self.loop.run_until_complete(
             self.page.send(mycdp.target.create_target(url))
         )
+        if not target_id and getattr(sb_config, "guest_mode", None):
+            print("  open_new_tab() failed! (Known Guest Mode issue)")
         found_target = None
         targets = self.loop.run_until_complete(
             self.page.send(mycdp.target.get_targets())
         )
-        for target in targets:
-            if str(target_id) in str(target):
-                found_target = target
-                break
+        if target_id:
+            for target in targets:
+                if str(target_id) in str(target):
+                    found_target = target
+                    break
         if found_target:
             tab_url = driver.tabs[0].websocket_url
             pre_tab_url = tab_url.split("/page/")[0] + "/page/"
@@ -1875,7 +1913,7 @@ def _on_a_cf_turnstile_page(self, source=None):
                 and 'title="reCAPTCHA"' not in source
                 and 'id="recaptcha-token"' not in source
             )
-            or "/challenge-platform/scripts/" in source
+            or "/challenge-platform/h/b/" in source
             or 'id="challenge-widget-' in source
             or "challenges.cloudf" in source
             or "cf-turnstile-" in source

seleniumbase/fixtures/base_case.py

@@ -228,25 +228,18 @@ def open(self, url):
             self.cdp.open(url)
             return
         elif (
-            hasattr(self.driver, "_is_using_uc")
-            and self.driver._is_using_uc
-            # 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
-            )
+            getattr(self.driver, "_is_using_uc", None)
+            # and getattr(self.driver, "_is_using_auth", None)
+            and not getattr(self.driver, "_is_using_cdp", None)
         ):
             # Auth in UC Mode requires CDP Mode
             # (and now we're always forcing it)
             logging.info("open() in UC Mode now always activates CDP Mode.")
             self.activate_cdp_mode(url)
             return
         elif (
-            hasattr(self.driver, "_is_using_uc")
-            and self.driver._is_using_uc
-            and hasattr(self.driver, "_is_using_cdp")
-            and self.driver._is_using_cdp
+            getattr(self.driver, "_is_using_uc", None)
+            and getattr(self.driver, "_is_using_cdp", None)
         ):
             self.disconnect()
             self.cdp.open(url)
@@ -3979,10 +3972,8 @@ def open_new_window(self, switch_to=True):
             self.cdp.open_new_tab(url=url, switch_to=switch_to)
             return
         elif (
-            hasattr(self.driver, "_is_using_uc")
-            and self.driver._is_using_uc
-            and hasattr(self.driver, "_is_using_cdp")
-            and self.driver._is_using_cdp
+            getattr(self.driver, "_is_using_uc", None)
+            and getattr(self.driver, "_is_using_cdp", None)
         ):
             self.disconnect()
             self.cdp.open_new_tab(url=url, switch_to=switch_to)
@@ -5037,7 +5028,7 @@ def deactivate_design_mode(self, url=None):
 
     def activate_cdp_mode(self, url=None, **kwargs):
         """Activate CDP Mode with the URL and kwargs."""
-        if hasattr(self.driver, "_is_using_uc") and self.driver._is_using_uc:
+        if getattr(self.driver, "_is_using_uc", None):
             if self.__is_cdp_swap_needed():
                 return  # CDP Mode is already active
             if not self.is_connected():

seleniumbase/fixtures/page_actions.py

@@ -1646,11 +1646,7 @@ def switch_to_frame(
 
 
 def __switch_to_window(driver, window_handle, uc_lock=True):
-    if (
-        hasattr(driver, "_is_using_uc")
-        and driver._is_using_uc
-        and uc_lock
-    ):
+    if getattr(driver, "_is_using_uc", None) and uc_lock:
         gui_lock = FileLock(constants.MultiBrowser.PYAUTOGUILOCK)
         with gui_lock:
             driver.switch_to.window(window_handle)
@@ -1734,8 +1730,7 @@ def switch_to_window(
 
 def _reconnect_if_disconnected(driver):
     if (
-        hasattr(driver, "_is_using_uc")
-        and driver._is_using_uc
+        getattr(driver, "_is_using_uc", None)
         and hasattr(driver, "is_connected")
         and not driver.is_connected()
     ):
@@ -1757,24 +1752,17 @@ def open_url(driver, url):
         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
-        )
+        getattr(driver, "_is_using_uc", None)
+        # and getattr(driver, "_is_using_auth", None)
+        and not getattr(driver, "_is_using_cdp", None)
     ):
         # Auth in UC Mode requires CDP Mode
         # (and now we're always forcing it)
         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
+        getattr(driver, "_is_using_uc", None)
+        and getattr(driver, "_is_using_cdp", None)
     ):
         driver.disconnect()
         driver.cdp.open(url)

seleniumbase/fixtures/shared_utils.py

@@ -147,8 +147,7 @@ def fix_url_as_needed(url):
 
 def reconnect_if_disconnected(driver):
     if (
-        hasattr(driver, "_is_using_uc")
-        and driver._is_using_uc
+        getattr(driver, "_is_using_uc", None)
         and hasattr(driver, "is_connected")
         and not driver.is_connected()
     ):

seleniumbase/undetected/__init__.py

@@ -163,7 +163,7 @@ def __init__(
         from seleniumbase import config as sb_config
         if (
             (("-n" in sys.argv) or (" -n=" in arg_join) or ("-c" in sys.argv))
-            or (hasattr(sb_config, "multi_proxy") and sb_config.multi_proxy)
+            or getattr(sb_config, "multi_proxy", None)
             or not special_port_free
         ):
             debug_port = selenium.webdriver.common.service.utils.free_port()
@@ -197,9 +197,7 @@ def __init__(
                 except IndexError:
                     pass
         if not user_data_dir:
-            if hasattr(options, "user_data_dir") and getattr(
-                options, "user_data_dir", None
-            ):
+            if getattr(options, "user_data_dir", None):
                 options.add_argument(
                     "--user-data-dir=%s" % options.user_data_dir
                 )
@@ -405,9 +403,7 @@ def get(self, url):
 
     def add_cdp_listener(self, event_name, callback):
         if (
-            hasattr(self, "reactor")
-            and self.reactor
-            and self.reactor is not None
+            getattr(self, "reactor", None)
             and isinstance(self.reactor, Reactor)
         ):
             self.reactor.add_event_handler(event_name, callback)
@@ -416,8 +412,7 @@ def add_cdp_listener(self, event_name, callback):
 
     def clear_cdp_listeners(self):
         if (
-            hasattr(self, "reactor")
-            and self.reactor
+            getattr(self, "reactor", None)
             and isinstance(self.reactor, Reactor)
         ):
             self.reactor.handlers.clear()
@@ -526,7 +521,13 @@ def connect(self):
         with suppress(Exception):
             for window_handle in self.window_handles:
                 self.switch_to.window(window_handle)
-                if self.current_url.startswith("chrome-extension://"):
+                current_url = None
+                if hasattr(self, "cdp") and hasattr(self.cdp, "driver"):
+                    with suppress(Exception):
+                        current_url = self.cdp.get_current_url()
+                if not current_url:
+                    current_url = self.current_url
+                if current_url.startswith("chrome-extension://"):
                     # https://issues.chromium.org/issues/396611138
                     # (Remove the Linux conditional when resolved)
                     # (So that close() is always called)