Merge pull request #1026 from seleniumbase/optimize-proxy-helper

Optimize the proxy_helper for proxy with auth

Author: mdmintz

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "2.0.2"
+__version__ = "2.0.3"

seleniumbase/core/browser_launcher.py

@@ -30,7 +30,6 @@
 AD_BLOCK_ZIP_PATH = "%s/%s" % (EXTENSIONS_DIR, "ad_block.zip")
 RECORDER_ZIP_PATH = "%s/%s" % (EXTENSIONS_DIR, "recorder.zip")
 PROXY_ZIP_PATH = proxy_helper.PROXY_ZIP_PATH
-PROXY_ZIP_PATH_2 = proxy_helper.PROXY_ZIP_PATH_2
 PROXY_ZIP_LOCK = proxy_helper.PROXY_ZIP_LOCK
 PLATFORM = sys.platform
 IS_WINDOWS = False
@@ -173,6 +172,8 @@ def _add_chrome_proxy_extension(
     if not ("-n" in sys.argv or " -n=" in arg_join or arg_join == "-c"):
         # Single-threaded
         proxy_helper.create_proxy_zip(proxy_string, proxy_user, proxy_pass)
+        proxy_zip = PROXY_ZIP_PATH
+        chrome_options.add_extension(proxy_zip)
     else:
         # Pytest multi-threaded test
         import fasteners
@@ -183,11 +184,8 @@ def _add_chrome_proxy_extension(
                 proxy_helper.create_proxy_zip(
                     proxy_string, proxy_user, proxy_pass
                 )
-    proxy_zip = PROXY_ZIP_PATH
-    if not os.path.exists(PROXY_ZIP_PATH):
-        # Handle "Permission denied" on the default proxy.zip path
-        proxy_zip = PROXY_ZIP_PATH_2
-    chrome_options.add_extension(proxy_zip)
+            proxy_zip = PROXY_ZIP_PATH
+            chrome_options.add_extension(proxy_zip)
     return chrome_options
 
 

seleniumbase/core/proxy_helper.py

@@ -2,12 +2,9 @@
 import threading
 import zipfile
 from seleniumbase.fixtures import constants
-from seleniumbase import drivers
 
-DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))
-PROXY_ZIP_PATH = "%s/%s" % (DRIVER_DIR, "proxy.zip")
 DOWNLOADS_DIR = constants.Files.DOWNLOADS_FOLDER
-PROXY_ZIP_PATH_2 = "%s/%s" % (DOWNLOADS_DIR, "proxy.zip")
+PROXY_ZIP_PATH = "%s/%s" % (DOWNLOADS_DIR, "proxy.zip")
 PROXY_ZIP_LOCK = "%s/%s" % (DOWNLOADS_DIR, "proxy.lock")
 
 
@@ -70,15 +67,11 @@ def create_proxy_zip(proxy_string, proxy_user, proxy_pass):
     )
     lock = threading.RLock()  # Support multi-threaded test runs with Pytest
     with lock:
-        try:
-            zf = zipfile.ZipFile(PROXY_ZIP_PATH, mode="w")
-        except IOError:
-            # Handle "Permission denied" on the default proxy.zip path
-            abs_path = os.path.abspath(".")
-            downloads_path = os.path.join(abs_path, DOWNLOADS_DIR)
-            if not os.path.exists(downloads_path):
-                os.mkdir(downloads_path)
-            zf = zipfile.ZipFile(PROXY_ZIP_PATH_2, mode="w")
+        abs_path = os.path.abspath(".")
+        downloads_path = os.path.join(abs_path, DOWNLOADS_DIR)
+        if not os.path.exists(downloads_path):
+            os.mkdir(downloads_path)
+        zf = zipfile.ZipFile(PROXY_ZIP_PATH, mode="w")
         zf.writestr("background.js", background_js)
         zf.writestr("manifest.json", manifest_json)
         zf.close()
@@ -92,8 +85,6 @@ def remove_proxy_zip_if_present():
     try:
         if os.path.exists(PROXY_ZIP_PATH):
             os.remove(PROXY_ZIP_PATH)
-        elif os.path.exists(PROXY_ZIP_PATH_2):
-            os.remove(PROXY_ZIP_PATH_2)
         if os.path.exists(PROXY_ZIP_LOCK):
             os.remove(PROXY_ZIP_LOCK)
     except Exception: