Update UC Mode / CDP Mode

Author: mdmintz

seleniumbase/core/browser_launcher.py

@@ -542,6 +542,7 @@ def uc_open_with_cdp_mode(driver, url=None):
     driver.cdp_base = loop.run_until_complete(
         cdp_util.start(host=cdp_host, port=cdp_port)
     )
+
     page = loop.run_until_complete(driver.cdp_base.get(url))
     loop.run_until_complete(page.activate())
     if not safe_url:

seleniumbase/fixtures/base_case.py

@@ -4167,13 +4167,13 @@ def get_new_driver(
                     device_pixel_ratio=d_p_r,
                     browser=browser_name,
                 )
-                time.sleep(0.2)
+                time.sleep(0.16)
             except Exception:
                 pass
             finally:
                 with suppress(Exception):
                     decoy_driver.quit()
-                    time.sleep(0.1)
+                    time.sleep(0.08)
         # Launch a web browser
         new_driver = browser_launcher.get_driver(
             browser_name=browser_name,

seleniumbase/plugins/driver_manager.py

@@ -870,13 +870,13 @@ def Driver(
                 device_pixel_ratio=d_p_r,
                 browser=browser_name,
             )
-            time.sleep(0.2)
+            time.sleep(0.16)
         except Exception:
             pass
         finally:
             with suppress(Exception):
                 decoy_driver.quit()
-                time.sleep(0.1)
+                time.sleep(0.08)
 
     driver = browser_launcher.get_driver(
         browser_name=browser_name,

seleniumbase/undetected/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 import logging
 import os
 import re
@@ -433,10 +432,15 @@ def reconnect(self, timeout=0.1):
                 time.sleep(timeout)
             with suppress(Exception):
                 self.service.start()
-            time.sleep(0.012)
         with suppress(Exception):
             self.start_session()
-        time.sleep(0.012)
+        with suppress(Exception):
+            if self.current_url.startswith("chrome-extension://"):
+                self.close()
+                self.service.stop()
+                self.service.start()
+                self.start_session()
+        self._is_connected = True
 
     def disconnect(self):
         """Stops the chromedriver service that runs in the background.
@@ -445,19 +449,22 @@ def disconnect(self):
             with suppress(Exception):
                 self.service.stop()
             self._is_connected = False
-            time.sleep(0.012)
 
     def connect(self):
         """Starts the chromedriver service that runs in the background
         and recreates the session."""
         if hasattr(self, "service"):
             with suppress(Exception):
                 self.service.start()
-            time.sleep(0.012)
         with suppress(Exception):
             self.start_session()
+        with suppress(Exception):
+            if self.current_url.startswith("chrome-extension://"):
+                self.close()
+                self.service.stop()
+                self.service.start()
+                self.start_session()
         self._is_connected = True
-        time.sleep(0.012)
 
     def start_session(self, capabilities=None):
         if not capabilities:

seleniumbase/undetected/cdp.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 import fasteners
 import json
 import logging

seleniumbase/undetected/cdp_driver/config.py

@@ -5,6 +5,7 @@
 import sys
 import tempfile
 import zipfile
+from seleniumbase.config import settings
 from typing import Union, List, Optional
 
 __all__ = [
@@ -101,7 +102,13 @@ def __init__(
         # Other keyword args will be accessible by attribute
         self.__dict__.update(kwargs)
         super().__init__()
+        start_width = settings.CHROME_START_WIDTH
+        start_height = settings.CHROME_START_HEIGHT
+        start_x = settings.WINDOW_START_X
+        start_y = settings.WINDOW_START_Y
         self._default_browser_args = [
+            "--window-size=%s,%s" % (start_width, start_height),
+            "--window-position=%s,%s" % (start_x, start_y),
             "--remote-allow-origins=*",
             "--no-first-run",
             "--no-service-autorun",

seleniumbase/undetected/cdp_driver/connection.py

@@ -292,7 +292,14 @@ async def aclose(self):
             if self.listener and self.listener.running:
                 self.listener.cancel()
                 self.enabled_domains.clear()
-            await self.websocket.close()
+            await asyncio.sleep(0.015)
+            try:
+                await self.websocket.close()
+            except Exception:
+                logger.debug(
+                    "\n❌ Error closing websocket connection to %s",
+                    self.websocket_url
+                )
             logger.debug(
                 "\n❌ Closed websocket connection to %s", self.websocket_url
             )
@@ -540,6 +547,7 @@ async def listener_loop(self):
                 self.idle.set()
                 # Pause for a moment.
                 # await asyncio.sleep(self.time_before_considered_idle / 10)
+                await asyncio.sleep(0.015)
                 continue
             except (Exception,) as e:
                 logger.debug(

seleniumbase/undetected/dprocess.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 import os
 import sys
 import atexit

seleniumbase/undetected/options.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 import json
 import os
 from contextlib import suppress
@@ -59,7 +58,9 @@ def handle_prefs(self, user_data_dir):
                             json.load(f), undot_prefs
                         )
             with suppress(Exception):
-                with open(prefs_file, encoding="utf-8", mode="w") as f:
+                with open(
+                    prefs_file, encoding="utf-8", mode="w", errors="ignore"
+                ) as f:
                     json.dump(undot_prefs, f)
             # Remove experimental_options to avoid errors
             del self._experimental_options["prefs"]

seleniumbase/undetected/patcher.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 import io
 import logging
 import os

seleniumbase/undetected/reactor.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 import asyncio
 import json
 import logging