Update CDP Mode

Author: mdmintz

seleniumbase/core/browser_launcher.py

@@ -1410,14 +1410,10 @@ def _uc_gui_click_captcha(
                     and driver.is_element_present("%s div" % frame)
                 ):
                     frame = "%s div" % frame
-                elif (
-                    driver.is_element_present('[name*="cf-turnstile-"]')
-                    and driver.is_element_present("#challenge-form div > div")
-                ):
+                elif driver.is_element_present("#challenge-form div > div"):
                     frame = "#challenge-form div > div"
                 elif (
-                    driver.is_element_present('[name*="cf-turnstile-"]')
-                    and driver.is_element_present(
+                    driver.is_element_present(
                         '[style="display: grid;"] div div'
                     )
                 ):
@@ -1430,13 +1426,11 @@ def _uc_gui_click_captcha(
                 ):
                     frame = '.spacer + div div:not([class])'
                 elif (
-                    driver.is_element_present('[name*="cf-turnstile-"]')
-                    and driver.is_element_present(".spacer div:not([class])")
+                    driver.is_element_present(".spacer div:not([class])")
                 ):
                     frame = ".spacer div:not([class])"
                 elif (
-                    driver.is_element_present('script[src*="challenges.c"]')
-                    and driver.is_element_present(
+                    driver.is_element_present(
                         '[data-testid*="challenge-"] div'
                     )
                 ):

seleniumbase/core/sb_cdp.py

@@ -1,6 +1,7 @@
 """Add CDP methods to extend the driver"""
 import asyncio
 import fasteners
+import mycdp
 import os
 import random
 import re
@@ -15,6 +16,7 @@
 from seleniumbase.fixtures import page_utils
 from seleniumbase.fixtures import shared_utils
 from seleniumbase.undetected.cdp_driver import cdp_util
+from seleniumbase.undetected.cdp_driver import tab as cdp_tab
 
 
 class CDPMethods():
@@ -1122,9 +1124,33 @@ def switch_to_newest_window(self):
         self.switch_to_tab(-1)
 
     def open_new_tab(self, url=None, switch_to=True):
+        driver = self.driver
         if not isinstance(url, str):
             url = "about:blank"
-        self.loop.run_until_complete(self.page.get(url, new_tab=True))
+        if hasattr(driver, "cdp_base"):
+            self.loop.run_until_complete(self.page.get(url, new_tab=True))
+            if switch_to:
+                self.switch_to_newest_tab()
+            return
+
+        target_id = self.loop.run_until_complete(
+            self.page.send(mycdp.target.create_target(url))
+        )
+        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 found_target:
+            tab_url = driver.tabs[0].websocket_url
+            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)
+            driver.targets.append(new_tab)
+            driver.tabs.append(new_tab)
         if switch_to:
             self.switch_to_newest_tab()
 

seleniumbase/core/sb_driver.py

@@ -288,11 +288,8 @@ def highlight(self, *args, **kwargs):
                 selector = kwargs["selector"]
             else:
                 selector = args[0]
-            if ":contains(" not in selector:
-                self.driver.cdp.highlight(selector)
-                return
-            else:
-                self.driver.connect()
+            self.driver.cdp.highlight(selector)
+            return
         if "scroll" in kwargs:
             kwargs.pop("scroll")
         w_args = kwargs.copy()

seleniumbase/fixtures/base_case.py

@@ -230,15 +230,16 @@ def open(self, url):
         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 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
             )
         ):
             # Auth in UC Mode requires CDP Mode
-            logging.info("UC Mode requires CDP Mode for auth. Activating now.")
+            # (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 (
@@ -6313,7 +6314,12 @@ def highlight(
         scroll - the option to scroll to the element first (Default: True)
         timeout - the time to wait for the element to appear """
         self.__check_scope()
-        if not self.__is_cdp_swap_needed():
+        if self.__is_cdp_swap_needed():
+            if page_utils.is_xpath_selector(selector):
+                if "contains(" in selector:
+                    self.cdp.highlight(selector)
+                    return
+        else:
             self._check_browser()
         self.__skip_if_esc()
         if isinstance(selector, WebElement):

seleniumbase/fixtures/page_actions.py

@@ -1759,14 +1759,15 @@ def open_url(driver, url):
     elif (
         hasattr(driver, "_is_using_uc")
         and driver._is_using_uc
-        and hasattr(driver, "_is_using_auth")
-        and driver._is_using_auth
+        # 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
+        # (and now we're always forcing it)
         driver.uc_activate_cdp_mode(url)
         return
     elif (