Update CDP Mode

Author: mdmintz

seleniumbase/core/browser_launcher.py

@@ -533,10 +533,26 @@ def uc_open_with_cdp_mode(driver, url=None):
     if url_protocol not in ["about", "data", "chrome"]:
         safe_url = False
 
+    headless = False
+    headed = None
+    xvfb = None
+    if hasattr(sb_config, "headless"):
+        headless = sb_config.headless
+    if hasattr(sb_config, "headed"):
+        headed = sb_config.headed
+    if hasattr(sb_config, "xvfb"):
+        xvfb = sb_config.xvfb
+
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)
     driver.cdp_base = loop.run_until_complete(
-        cdp_util.start(host=cdp_host, port=cdp_port)
+        cdp_util.start(
+            host=cdp_host,
+            port=cdp_port,
+            headless=headless,
+            headed=headed,
+            xvfb=xvfb,
+        )
     )
     loop.run_until_complete(driver.cdp_base.wait(0))
 
@@ -863,13 +879,15 @@ def __install_pyautogui_if_missing():
                         xvfb_height = 768
                     sb_config._xvfb_height = xvfb_height
                 with suppress(Exception):
-                    xvfb_display = Display(
+                    _xvfb_display = Display(
                         visible=True,
                         size=(xvfb_width, xvfb_height),
                         backend="xvfb",
                         use_xauth=True,
                     )
-                    xvfb_display.start()
+                    _xvfb_display.start()
+                    sb_config._virtual_display = _xvfb_display
+                    sb_config.headless_active = True
 
 
 def install_pyautogui_if_missing(driver):

seleniumbase/fixtures/base_case.py

@@ -13795,7 +13795,8 @@ def __switch_to_newest_window_if_not_blank(self):
             if self.get_current_url() == "about:blank":
                 self.switch_to_window(current_window)
         except Exception:
-            self.switch_to_window(current_window)
+            with suppress(Exception):
+                self.switch_to_window(current_window)
 
     def __needs_minimum_wait(self):
         if (
@@ -14004,9 +14005,10 @@ def __activate_standard_virtual_display(self):
                 visible=0, size=(width, height)
             )
             self._xvfb_display.start()
-            sb_config._virtual_display = self._xvfb_display
             self.headless_active = True
-            sb_config.headless_active = True
+            if not self.undetectable:
+                sb_config._virtual_display = self._xvfb_display
+                sb_config.headless_active = True
 
     def __activate_virtual_display(self):
         if self.undetectable and not (self.headless or self.headless2):
@@ -14029,6 +14031,8 @@ def __activate_virtual_display(self):
                         "\nX11 display failed! Will use regular xvfb!"
                     )
                     self.__activate_standard_virtual_display()
+                else:
+                    self.headless_active = True
             except Exception as e:
                 if hasattr(e, "msg"):
                     print("\n" + str(e.msg))
@@ -16601,6 +16605,7 @@ def tearDown(self):
             self.__quit_all_drivers()
         # Resume tearDown() for all test runners, (Pytest / Pynose / Behave)
         if hasattr(self, "_xvfb_display") and self._xvfb_display:
+            # Stop the Xvfb virtual display launched from BaseCase
             try:
                 if hasattr(self._xvfb_display, "stop"):
                     self._xvfb_display.stop()
@@ -16610,6 +16615,20 @@ def tearDown(self):
                 pass
             except Exception:
                 pass
+        if (
+            hasattr(sb_config, "_virtual_display")
+            and sb_config._virtual_display
+            and hasattr(sb_config._virtual_display, "stop")
+        ):
+            # CDP Mode may launch a 2nd Xvfb virtual display
+            try:
+                sb_config._virtual_display.stop()
+                sb_config._virtual_display = None
+                sb_config.headless_active = False
+            except AttributeError:
+                pass
+            except Exception:
+                pass
         if self.__visual_baseline_copies:
             sb_config._visual_baseline_copies = True
             if has_exception:

seleniumbase/plugins/sb_manager.py

@@ -1256,6 +1256,19 @@ def SB(
             print(traceback.format_exc().strip())
             if test and not test_passed:
                 print("********** ERROR: The test AND the tearDown() FAILED!")
+        if (
+            hasattr(sb_config, "_virtual_display")
+            and sb_config._virtual_display
+            and hasattr(sb_config._virtual_display, "stop")
+        ):
+            try:
+                sb_config._virtual_display.stop()
+                sb_config._virtual_display = None
+                sb_config.headless_active = False
+            except AttributeError:
+                pass
+            except Exception:
+                pass
         end_time = time.time()
         run_time = end_time - start_time
         sb_config = sb_config_backup

seleniumbase/undetected/cdp_driver/cdp_util.py

@@ -84,6 +84,9 @@ def __activate_virtual_display_as_needed(
                             "\nX11 display failed! Will use regular xvfb!"
                         )
                         __activate_standard_virtual_display()
+                    else:
+                        sb_config._virtual_display = _xvfb_display
+                        sb_config.headless_active = True
                 except Exception as e:
                     if hasattr(e, "msg"):
                         print("\n" + str(e.msg))