Update CDP Mode

Author: mdmintz

seleniumbase/core/browser_launcher.py

@@ -445,11 +445,11 @@ def has_captcha(text):
         or 'action="/?__cf_chl_f_tk' in text
         or 'id="challenge-widget-' in text
         or 'src="chromedriver.js"' in text
+        or "com/recaptcha/api.js" in text
         or 'class="g-recaptcha"' in text
         or 'content="Pixelscan"' in text
         or 'id="challenge-form"' in text
         or "window._cf_chl_opt" in text
-        or "/recaptcha/api.js" in text
         or "/turnstile/" in text
     ):
         return True
@@ -694,6 +694,7 @@ def uc_open_with_cdp_mode(driver, url=None, **kwargs):
             xvfb=xvfb,
             xvfb_metrics=xvfb_metrics,
             browser_executable_path=binary_location,
+            mobile=getattr(sb_config, "_cdp_mobile_mode", None),
         )
     )
     loop.run_until_complete(driver.cdp_base.wait(0))
@@ -2761,6 +2762,8 @@ def _set_chrome_options(
     included_disabled_features.append("SidePanelPinning")
     included_disabled_features.append("UserAgentClientHint")
     included_disabled_features.append("DisableLoadExtensionCommandLineSwitch")
+    included_disabled_features.append("WebAuthentication")
+    included_disabled_features.append("PasskeyAuth")
     for item in extra_disabled_features:
         if item not in included_disabled_features:
             included_disabled_features.append(item)
@@ -3056,11 +3059,6 @@ def get_driver(
     if _special_binary_exists(binary_location, "atlas"):
         driver_dir = DRIVER_DIR_ATLAS
         sb_config._cdp_browser = "atlas"
-    if undetectable and mobile_emulator:
-        # For stealthy mobile mode, see the CDP Mode examples
-        # to learn how to properly configure it.
-        user_agent = None  # Undo the override
-        mobile_emulator = False  # Instead, set from CDP Mode
     if (
         hasattr(sb_config, "settings")
         and getattr(sb_config.settings, "NEW_DRIVER_DIR", None)
@@ -3075,6 +3073,23 @@ def get_driver(
     if browser_name in constants.ChromiumSubs.chromium_subs:
         browser_name = "chrome"
     browser_name = browser_name.lower()
+    if is_using_uc(undetectable, browser_name):
+        if ad_block_on:
+            sb_config.ad_block_on = True
+        else:
+            sb_config.ad_block_on = False
+        if disable_csp:
+            sb_config.disable_csp = True
+        else:
+            sb_config.disable_csp = False
+        if mobile_emulator:
+            # For stealthy mobile mode, see the CDP Mode examples
+            # to learn how to properly configure it.
+            user_agent = None  # Undo the override
+            mobile_emulator = False  # Instead, set from CDP Mode
+            sb_config._cdp_mobile_mode = True
+        else:
+            sb_config._cdp_mobile_mode = False
     if headless2 and browser_name == constants.Browser.FIREFOX:
         headless2 = False  # Only for Chromium
         headless = True

seleniumbase/core/sb_cdp.py

@@ -1922,8 +1922,8 @@ def _on_a_cf_turnstile_page(self, source=None):
         return False
 
     def _on_a_g_recaptcha_page(self, source=None):
-        time.sleep(0.25)
-        self.loop.run_until_complete(self.page.wait(0.25))
+        time.sleep(0.2)
+        self.loop.run_until_complete(self.page.wait(0.2))
         source = self.get_page_source()
         if (
             (
@@ -1934,7 +1934,7 @@ def _on_a_g_recaptcha_page(self, source=None):
         ):
             self.loop.run_until_complete(self.page.wait(0.1))
             return True
-        elif "/recaptcha/api.js" in source:
+        elif "com/recaptcha/api.js" in source:
             time.sleep(1.6)  # Still loading
             self.loop.run_until_complete(self.page.wait(0.1))
             return True
@@ -2330,6 +2330,9 @@ def gui_hover_element(self, selector, timeframe=0.25):
         self.loop.run_until_complete(self.page.wait())
 
     def gui_hover_and_click(self, hover_selector, click_selector):
+        if getattr(sb_config, "_cdp_mobile_mode", None):
+            self.select(click_selector).click()
+            return
         gui_lock = FileLock(constants.MultiBrowser.PYAUTOGUILOCK)
         with gui_lock:
             self.__make_sure_pyautogui_lock_is_writable()

seleniumbase/fixtures/base_case.py

@@ -15585,7 +15585,7 @@ def setUp(self, masterqa_mode=False):
                 "Invalid input for Mobile Emulator device metrics!\n"
                 "Expecting a comma-separated string with integer values\n"
                 "for Width/Height, and an int or float for Pixel-Ratio.\n"
-                'Example: --metrics="411,731,3" '
+                'Example: --metrics="412,732,3" '
             )
             if len(metrics_list) != 3:
                 raise Exception(exception_string)

seleniumbase/plugins/pytest_plugin.py

@@ -625,7 +625,7 @@ def pytest_addoption(parser):
         help="""Designates the three device metrics of the mobile
                 emulator: CSS Width, CSS Height, and Pixel-Ratio.
                 Format: A comma-separated string with the 3 values.
-                Examples: "375,734,5" or "411,731,3" or "390,715,3"
+                Examples: "375,734,5" or "412,732,3" or "390,715,3"
                 Default: None. (Will use default values if None)""",
     )
     parser.addoption(

seleniumbase/plugins/selenium_plugin.py

@@ -367,7 +367,7 @@ def options(self, parser, env):
             help="""Designates the three device metrics of the mobile
                     emulator: CSS Width, CSS Height, and Pixel-Ratio.
                     Format: A comma-separated string with the 3 values.
-                    Examples: "375,734,5" or "411,731,3" or "390,715,3"
+                    Examples: "375,734,5" or "412,732,3" or "390,715,3"
                     Default: None. (Will use default values if None)""",
         )
         parser.addoption(

seleniumbase/undetected/cdp_driver/browser.py

@@ -327,6 +327,7 @@ async def get(
         _cdp_platform = None
         _cdp_disable_csp = None
         _cdp_geolocation = None
+        _cdp_mobile_mode = None
         _cdp_recorder = None
         _cdp_ad_block = None
         if getattr(sb_config, "_cdp_timezone", None):
@@ -339,8 +340,12 @@ async def get(
             _cdp_platform = sb_config._cdp_platform
         if getattr(sb_config, "_cdp_geolocation", None):
             _cdp_geolocation = sb_config._cdp_geolocation
+        if getattr(sb_config, "_cdp_mobile_mode", None):
+            _cdp_mobile_mode = sb_config._cdp_mobile_mode
         if getattr(sb_config, "ad_block_on", None):
             _cdp_ad_block = sb_config.ad_block_on
+        if getattr(sb_config, "disable_csp", None):
+            _cdp_disable_csp = sb_config.disable_csp
         if "timezone" in kwargs:
             _cdp_timezone = kwargs["timezone"]
         elif "tzone" in kwargs:
@@ -361,12 +366,14 @@ async def get(
             _cdp_platform = kwargs["plat"]
         if "disable_csp" in kwargs:
             _cdp_disable_csp = kwargs["disable_csp"]
-        elif hasattr(sb_config, "disable_csp"):
-            _cdp_disable_csp = sb_config.disable_csp
         if "geolocation" in kwargs:
             _cdp_geolocation = kwargs["geolocation"]
         elif "geoloc" in kwargs:
             _cdp_geolocation = kwargs["geoloc"]
+        if "ad_block" in kwargs:
+            _cdp_ad_block = kwargs["ad_block"]
+        if "mobile" in kwargs:
+            _cdp_mobile_mode = kwargs["mobile"]
         if "recorder" in kwargs:
             _cdp_recorder = kwargs["recorder"]
         await connection.sleep(0.01)
@@ -422,6 +429,12 @@ async def get(
             await connection.set_geolocation(_cdp_geolocation)
         if _cdp_disable_csp:
             await connection.send(cdp.page.set_bypass_csp(enabled=True))
+        if _cdp_mobile_mode:
+            await connection.send(
+                cdp.emulation.set_device_metrics_override(
+                    width=412, height=732, device_scale_factor=3, mobile=True
+                )
+            )
         # (The code below is for the Chrome 142 extension fix)
         if (
             getattr(sb_config, "_cdp_proxy", None)

seleniumbase/undetected/cdp_driver/cdp_util.py

@@ -281,6 +281,7 @@ async def start(
     proxy: Optional[str] = None,  # "host:port" or "user:pass@host:port"
     tzone: Optional[str] = None,  # Eg "America/New_York", "Asia/Kolkata"
     geoloc: Optional[list | tuple] = None,  # Eg (48.87645, 2.26340)
+    mobile: Optional[bool] = None,  # Use Mobile Mode with default args
     disable_csp: Optional[str] = None,  # Disable content security policy
     extension_dir: Optional[str] = None,  # Chrome extension directory
     **kwargs: Optional[dict],
@@ -353,6 +354,15 @@ async def start(
             guest = True
         else:
             guest = False
+    if mobile is None:
+        if "--mobile" in sys_argv:
+            mobile = True
+        else:
+            mobile = False
+    if mobile:
+        sb_config._cdp_mobile_mode = True
+    else:
+        sb_config._cdp_mobile_mode = False
     if ad_block is None:
         if "--ad-block" in sys_argv or "--ad_block" in sys_argv:
             ad_block = True

seleniumbase/undetected/cdp_driver/config.py

@@ -206,7 +206,8 @@ def __call__(self):
             "OptimizationTargetPrediction,OptimizationGuideModelDownloading,"
             "SidePanelPinning,UserAgentClientHint,PrivacySandboxSettings4,"
             "OptimizationHintsFetching,InterestFeedContentSuggestions,"
-            "DisableLoadExtensionCommandLineSwitch"
+            "DisableLoadExtensionCommandLineSwitch,"
+            "WebAuthentication,PasskeyAuth"
         ]
         if self.expert:
             args += [