Improve CDP multithreading

Author: mdmintz

seleniumbase/undetected/__init__.py

@@ -402,7 +402,8 @@ def get(self, url):
 
     def add_cdp_listener(self, event_name, callback):
         if (
-            self.reactor
+            hasattr(self, "reactor")
+            and self.reactor
             and self.reactor is not None
             and isinstance(self.reactor, Reactor)
         ):
@@ -411,7 +412,11 @@ def add_cdp_listener(self, event_name, callback):
         return False
 
     def clear_cdp_listeners(self):
-        if self.reactor and isinstance(self.reactor, Reactor):
+        if (
+            hasattr(self, "reactor")
+            and self.reactor
+            and isinstance(self.reactor, Reactor)
+        ):
             self.reactor.handlers.clear()
 
     def window_new(self, url=None):
@@ -581,7 +586,11 @@ def quit(self):
                 finally:
                     with suppress(Exception):
                         self.service._terminate_process()
-        if self.reactor and hasattr(self.reactor, "event"):
+        if (
+            hasattr(self, "reactor")
+            and self.reactor
+            and hasattr(self.reactor, "event")
+        ):
             logger.debug("Shutting down Reactor")
             with suppress(Exception):
                 self.reactor.event.set()

seleniumbase/undetected/cdp_driver/connection.py

@@ -292,16 +292,16 @@ async def aclose(self):
         Closes the websocket connection. Shouldn't be called manually by users.
         """
         if self.websocket and self.websocket.state is not State.CLOSED:
-            if self.listener and self.listener.running:
-                self.listener.cancel()
-                self.enabled_domains.clear()
             try:
                 await self.websocket.close()
             except Exception:
                 logger.debug(
                     "\n❌ Error closing websocket connection to %s",
                     self.websocket_url
                 )
+            if self.listener and self.listener.running:
+                self.listener.cancel()
+                self.enabled_domains.clear()
             logger.debug(
                 "\n❌ Closed websocket connection to %s", self.websocket_url
             )
@@ -549,8 +549,7 @@ async def listener_loop(self):
             except asyncio.TimeoutError:
                 self.idle.set()
                 # Pause for a moment.
-                # await asyncio.sleep(self.time_before_considered_idle / 10)
-                await asyncio.sleep(0.015)
+                await asyncio.sleep(self.time_before_considered_idle / 10)
                 continue
             except (Exception,) as e:
                 logger.debug(