Update CDP Mode

Author: mdmintz

seleniumbase/undetected/__init__.py

@@ -454,17 +454,20 @@ def reconnect(self, timeout=0.1):
             self.start_session()
             time.sleep(0.0075)
         with suppress(Exception):
-            for i in range(5):
-                if self.current_url.startswith("chrome-extension://"):
+            for window_handle in self.window_handles:
+                self.switch_to.window(window_handle)
+                if self.current_url.startswith(
+                    "chrome-extension://"
+                ):
                     self.close()
                     if self.service.is_connectable():
                         self.stop_client()
                         self.service.stop()
                     self.service.start()
                     self.start_session()
-                    time.sleep(0.0075)
-                else:
-                    break
+                    time.sleep(0.003)
+        with suppress(Exception):
+            self.switch_to.window(self.window_handles[-1])
         self._is_connected = True
 
     def disconnect(self):
@@ -487,17 +490,20 @@ def connect(self):
             self.start_session()
             time.sleep(0.0075)
         with suppress(Exception):
-            for i in range(5):
-                if self.current_url.startswith("chrome-extension://"):
+            for window_handle in self.window_handles:
+                self.switch_to.window(window_handle)
+                if self.current_url.startswith(
+                    "chrome-extension://"
+                ):
                     self.close()
                     if self.service.is_connectable():
                         self.stop_client()
                         self.service.stop()
                     self.service.start()
                     self.start_session()
-                    time.sleep(0.0075)
-                else:
-                    break
+                    time.sleep(0.003)
+        with suppress(Exception):
+            self.switch_to.window(self.window_handles[-1])
         self._is_connected = True
 
     def start_session(self, capabilities=None):

seleniumbase/undetected/webelement.py

@@ -26,10 +26,11 @@ def uc_click(
                 driver.js_click(selector, by=by, timeout=1)
         else:
             super().click()
+        driver = self._parent
         if not reconnect_time:
-            self._parent.reconnect(0.5)
+            driver.reconnect(0.5)
         else:
-            self._parent.reconnect(reconnect_time)
+            driver.reconnect(reconnect_time)
 
     def uc_reconnect(self, reconnect_time=None):
         if not reconnect_time: