Merge pull request #1676 from seleniumbase/more-bug-fixes-and-updates

More bug fixes and updates

Author: mdmintz

integrations/node_js/npm-shrinkwrap.json

@@ -6,6 +6,6 @@
     "start": "node ./bin/www"
   },
   "dependencies": {
-    "express": "~4.17.1"
+    "express": "~4.18.2"
   }
 }

integrations/node_js/package.json

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.11.3"
+__version__ = "4.11.4"

seleniumbase/__version__.py

@@ -62,8 +62,8 @@ sbase install [DRIVER] [OPTIONS]
 sbase get chromedriver
 sbase get geckodriver
 sbase get edgedriver
-sbase get chromedriver 108
-sbase get chromedriver 108.0.5359.71
+sbase get chromedriver 109
+sbase get chromedriver 109.0.5414.74
 sbase get chromedriver latest
 sbase get chromedriver latest-1  # (Latest minus one)
 sbase get chromedriver -p

seleniumbase/console_scripts/ReadMe.md

@@ -143,8 +143,8 @@ def show_install_usage():
     print("           sbase get chromedriver")
     print("           sbase get geckodriver")
     print("           sbase get edgedriver")
-    print("           sbase get chromedriver 108")
-    print("           sbase get chromedriver 108.0.5359.71")
+    print("           sbase get chromedriver 109")
+    print("           sbase get chromedriver 109.0.5414.74")
     print("           sbase get chromedriver latest")
     print("           sbase get chromedriver latest-1")
     print("           sbase get chromedriver -p")

seleniumbase/console_scripts/run.py

@@ -14,8 +14,8 @@
          sbase get chromedriver
          sbase get geckodriver
          sbase get edgedriver
-         sbase get chromedriver 108
-         sbase get chromedriver 108.0.5359.71
+         sbase get chromedriver 109
+         sbase get chromedriver 109.0.5414.74
          sbase get chromedriver latest
          sbase get chromedriver latest-1  # (Latest minus one)
          sbase get chromedriver -p
@@ -59,7 +59,7 @@
 LOCAL_PATH = "/usr/local/bin/"  # On Mac and Linux systems
 DEFAULT_CHROMEDRIVER_VERSION = "72.0.3626.69"  # (If can't find LATEST_STABLE)
 DEFAULT_GECKODRIVER_VERSION = "v0.32.0"
-DEFAULT_EDGEDRIVER_VERSION = "108.0.1462.54"  # (If can't find LATEST_STABLE)
+DEFAULT_EDGEDRIVER_VERSION = "109.0.1518.52"  # (If can't find LATEST_STABLE)
 DEFAULT_OPERADRIVER_VERSION = "v.96.0.4664.45"
 
 
@@ -84,8 +84,8 @@ def invalid_run_command():
     exp += "           sbase get chromedriver\n"
     exp += "           sbase get geckodriver\n"
     exp += "           sbase get edgedriver\n"
-    exp += "           sbase get chromedriver 108\n"
-    exp += "           sbase get chromedriver 108.0.5359.71\n"
+    exp += "           sbase get chromedriver 109\n"
+    exp += "           sbase get chromedriver 109.0.5414.74\n"
     exp += "           sbase get chromedriver latest\n"
     exp += "           sbase get chromedriver latest-1\n"
     exp += "           sbase get chromedriver -p\n"
@@ -184,7 +184,6 @@ def main(override=None, intel_for_uc=None):
     c3 = colorama.Fore.BLUE + colorama.Back.LIGHTYELLOW_EX
     c4 = colorama.Fore.LIGHTRED_EX + colorama.Back.LIGHTWHITE_EX
     c5 = colorama.Fore.RED + colorama.Back.LIGHTWHITE_EX
-    c6 = colorama.Fore.LIGHTYELLOW_EX + colorama.Back.BLUE
     cr = colorama.Style.RESET_ALL
     if "linux" in sys_plat:
         c1 = ""
@@ -243,6 +242,11 @@ def main(override=None, intel_for_uc=None):
             else:
                 invalid_run_command()
         if "darwin" in sys_plat:
+            if IS_ARM_MAC and not intel_for_uc:
+                if use_version == "latest" or use_version == "latest-1":
+                    use_version = requests_get(last).text
+                if use_version == "latest-1":
+                    use_version = str(int(use_version.split(".")[0]) - 1)
             if (
                 IS_ARM_MAC
                 and not intel_for_uc
@@ -299,12 +303,12 @@ def main(override=None, intel_for_uc=None):
             if get_latest:
                 p_version = p_version + " " + c2 + "(Latest)" + cr
             else:
-                n_l_s = "NOT Latest"
+                n_l_s = "Not Latest"
                 try:
                     int_use_version = int(use_version.split(".")[0])
                     int_latest_version = int(latest_version.split(".")[0])
                     if int_use_version > int_latest_version:
-                        n_l_s = "NOT Latest Stable"
+                        n_l_s = "Not Latest Stable"
                 except Exception:
                     pass
                 not_latest = c5 + "(" + c4 + n_l_s + c5 + ")" + cr
@@ -314,12 +318,7 @@ def main(override=None, intel_for_uc=None):
         else:
             raise Exception("Could not find chromedriver to download!\n")
         if not get_latest:
-            to_upgrade = " " + c3 + "To upgrade" + cr
-            run_this = c3 + "run this" + cr
-            install_sb = c6 + "sbase get chromedriver latest" + cr
-            print("\n %s to the latest version of chromedriver," % to_upgrade)
-            print("   %s: >>> %s" % (run_this, install_sb))
-            print("  (Requires the latest version of Chrome installed)")
+            pass  # Previously recommended: "sbase get chromedriver latest"
     elif name == "geckodriver" or name == "firefoxdriver":
         use_version = DEFAULT_GECKODRIVER_VERSION
         found_geckodriver = False
@@ -381,6 +380,33 @@ def main(override=None, intel_for_uc=None):
             "https://msedgewebdriverstorage.blob.core.windows.net"
             "/edgewebdriver/LATEST_STABLE"
         )
+
+        if (
+            selenium4_or_newer
+            and not override
+            and (
+                num_args == 3
+                or (num_args == 4 and "-p" in sys.argv[3].lower())
+            )
+        ):
+            use_version = "latest"
+            major_edge_version = None
+            try:
+                from seleniumbase.core import detect_b_ver
+
+                br_app = "edge"
+                major_edge_version = (
+                    detect_b_ver.get_browser_version_from_os(br_app)
+                ).split(".")[0]
+                if int(major_edge_version) < 80:
+                    major_edge_version = None
+            except Exception:
+                major_edge_version = None
+            if major_edge_version and major_edge_version.isnumeric():
+                num_args += 1
+                sys.argv.insert(3, major_edge_version)
+                use_version = major_edge_version
+
         get_latest = False
         if num_args == 3:
             get_latest = True

seleniumbase/console_scripts/sb_install.py

@@ -570,7 +570,7 @@ def _set_chrome_options(
         # Only change it if not "normal", which is the default.
         chrome_options.page_load_strategy = settings.PAGE_LOAD_STRATEGY.lower()
     if headless2:
-        chrome_options.add_argument("--headless=chrome")
+        pass  # Processed After Version Check
     elif headless:
         chrome_options.add_argument("--headless")
     if (settings.DISABLE_CSP_ON_CHROME or disable_csp) and not headless:
@@ -646,7 +646,7 @@ def _set_chrome_options(
         chrome_options.add_argument("--remote-debugging-port=9222")
     if swiftshader:
         chrome_options.add_argument("--use-gl=swiftshader")
-    else:
+    elif not is_using_uc(undetectable, browser_name):
         chrome_options.add_argument("--disable-gpu")
     if "linux" in PLATFORM:
         chrome_options.add_argument("--disable-dev-shm-usage")
@@ -673,7 +673,7 @@ def _set_chrome_options(
     chrome_options.add_argument("--disable-prompt-on-repost")
     chrome_options.add_argument("--dns-prefetch-disable")
     chrome_options.add_argument("--disable-translate")
-    if not enable_3d_apis:
+    if not enable_3d_apis and not is_using_uc(undetectable, browser_name):
         chrome_options.add_argument("--disable-3d-apis")
     if headless or headless2 or is_using_uc(undetectable, browser_name):
         chrome_options.add_argument("--disable-renderer-backgrounding")
@@ -1932,37 +1932,86 @@ def get_local_driver(
             "profile.managed_default_content_settings.popups": 0,
             "profile.default_content_setting_values.automatic_downloads": 1,
         }
-        if LOCAL_EDGEDRIVER and os.path.exists(LOCAL_EDGEDRIVER):
+        use_version = "latest"
+        major_edge_version = None
+        try:
+            from seleniumbase.core import detect_b_ver
+
+            br_app = "edge"
+            major_edge_version = (
+                detect_b_ver.get_browser_version_from_os(br_app)
+            ).split(".")[0]
+            if int(major_edge_version) < 80:
+                major_edge_version = None
+        except Exception:
+            major_edge_version = None
+        if major_edge_version:
+            use_version = major_edge_version
+        driver_version = None
+        if os.path.exists(LOCAL_EDGEDRIVER):
             try:
-                make_driver_executable_if_not(LOCAL_EDGEDRIVER)
-            except Exception as e:
-                logging.debug(
-                    "\nWarning: Could not make edgedriver"
-                    " executable: %s" % e
+                output = subprocess.check_output(
+                    "%s --version" % LOCAL_EDGEDRIVER, shell=True
                 )
-        elif not edgedriver_on_path():
+                if IS_WINDOWS:
+                    output = output.decode("latin1")
+                else:
+                    output = output.decode("utf-8")
+                if output.split(" ")[0] == "MSEdgeDriver":
+                    # MSEdgeDriver VERSION
+                    output = output.split(" ")[1].split(".")[0]
+                elif output.split(" ")[0] == "Microsoft":
+                    # Microsoft Edge WebDriver VERSION
+                    output = output.split(" ")[3].split(".")[0]
+                else:
+                    output = 0
+                if int(output) >= 2:
+                    driver_version = output
+            except Exception:
+                pass
+        edgedriver_upgrade_needed = False
+        local_edgedriver_exists = False
+        if LOCAL_EDGEDRIVER and os.path.exists(LOCAL_EDGEDRIVER):
+            local_edgedriver_exists = True
+            if (
+                use_version != "latest"
+                and driver_version
+                and use_version != driver_version
+            ):
+                edgedriver_upgrade_needed = True
+            else:
+                try:
+                    make_driver_executable_if_not(LOCAL_EDGEDRIVER)
+                except Exception as e:
+                    logging.debug(
+                        "\nWarning: Could not make edgedriver"
+                        " executable: %s" % e
+                    )
+        if not local_edgedriver_exists or edgedriver_upgrade_needed:
             from seleniumbase.console_scripts import sb_install
 
             args = " ".join(sys.argv)
             if not ("-n" in sys.argv or " -n=" in args or args == "-c"):
                 # (Not multithreaded)
+                msg = "Microsoft Edge Driver not found."
+                if edgedriver_upgrade_needed:
+                    msg = "Microsoft Edge Driver update needed."
                 sys_args = sys.argv  # Save a copy of current sys args
-                print("\nWarning: msedgedriver not found. Getting it now:")
-                sb_install.main(override="edgedriver")
+                print("\n%s Getting it now:" % msg)
+                sb_install.main(override="edgedriver %s" % use_version)
                 sys.argv = sys_args  # Put back the original sys args
             else:
                 edgedriver_fixing_lock = fasteners.InterProcessLock(
                     constants.MultiBrowser.DRIVER_FIXING_LOCK
                 )
                 with edgedriver_fixing_lock:
-                    if not edgedriver_on_path():
-                        sys_args = sys.argv  # Save a copy of sys args
-                        print(
-                            "\nWarning: msedgedriver not found. "
-                            "Getting it now:"
-                        )
-                        sb_install.main(override="edgedriver")
-                        sys.argv = sys_args  # Put back original sys args
+                    msg = "Microsoft Edge Driver not found."
+                    if edgedriver_upgrade_needed:
+                        msg = "Microsoft Edge Driver update needed."
+                    sys_args = sys.argv  # Save a copy of current sys args
+                    print("\n%s Getting it now:" % msg)
+                    sb_install.main(override="edgedriver %s" % use_version)
+                    sys.argv = sys_args  # Put back the original sys args
 
         # For Microsoft Edge (Chromium) version 80 or higher
         if selenium4_or_newer:
@@ -2005,7 +2054,13 @@ def get_local_driver(
         if guest_mode:
             edge_options.add_argument("--guest")
         if headless2:
-            edge_options.add_argument("--headless=chrome")
+            try:
+                if use_version == "latest" or int(use_version) >= 109:
+                    edge_options.add_argument("--headless=new")
+                else:
+                    edge_options.add_argument("--headless=chrome")
+            except Exception:
+                edge_options.add_argument("--headless=new")
         elif headless:
             edge_options.add_argument("--headless")
         if mobile_emulator:
@@ -2448,6 +2503,14 @@ def get_local_driver(
                         driver_version = output
                 except Exception:
                     pass
+            if headless2:
+                try:
+                    if use_version == "latest" or int(use_version) >= 109:
+                        chrome_options.add_argument("--headless=new")
+                    else:
+                        chrome_options.add_argument("--headless=chrome")
+                except Exception:
+                    chrome_options.add_argument("--headless=new")
             disable_build_check = False
             uc_driver_version = None
             if IS_ARM_MAC:

seleniumbase/core/browser_launcher.py

@@ -41,10 +41,12 @@ class OSType(object):
 
 class ChromeType(object):
     GOOGLE = "google-chrome"
+    MSEDGE = "edge"
 
 
 PATTERN = {
     ChromeType.GOOGLE: r"\d+\.\d+\.\d+",
+    ChromeType.MSEDGE: r"\d+\.\d+\.\d+",
 }
 
 
@@ -133,6 +135,63 @@ def get_browser_version_from_os(browser_type=None):
                 r'\CurrentVersion\Uninstall\Google Chrome").version',
             ),
         },
+        ChromeType.MSEDGE: {
+            OSType.LINUX: linux_browser_apps_to_cmd(
+                "microsoft-edge",
+                "microsoft-edge-stable",
+                "microsoft-edge-beta",
+                "microsoft-edge-dev",
+            ),
+            OSType.MAC: r"/Applications/Microsoft\ Edge.app"
+                        r"/Contents/MacOS/Microsoft\ Edge --version",
+            OSType.WIN: windows_browser_apps_to_cmd(
+                # stable edge
+                r'(Get-Item -Path "$env:PROGRAMFILES\Microsoft\Edge'
+                r'\Application\msedge.exe").VersionInfo.FileVersion',
+                r'(Get-Item -Path "$env:PROGRAMFILES (x86)\Microsoft'
+                r'\Edge\Application\msedge.exe").VersionInfo.FileVersion',
+                r'(Get-ItemProperty -Path Registry::"HKCU\SOFTWARE'
+                r'\Microsoft\Edge\BLBeacon").version',
+                r'(Get-ItemProperty -Path Registry::"HKLM\SOFTWARE'
+                r'\Microsoft\EdgeUpdate\Clients'
+                r'\{56EB18F8-8008-4CBD-B6D2-8C97FE7E9062}").pv',
+                # beta edge
+                r'(Get-Item -Path "$env:LOCALAPPDATA\Microsoft\Edge Beta'
+                r'\Application\msedge.exe").VersionInfo.FileVersion',
+                r'(Get-Item -Path "$env:PROGRAMFILES\Microsoft\Edge Beta'
+                r'\Application\msedge.exe").VersionInfo.FileVersion',
+                r'(Get-Item -Path "$env:PROGRAMFILES (x86)\Microsoft\Edge Beta'
+                r'\Application\msedge.exe").VersionInfo.FileVersion',
+                r'(Get-ItemProperty -Path Registry::"HKCU\SOFTWARE\Microsoft'
+                r'\Edge Beta\BLBeacon").version',
+                # dev edge
+                r'(Get-Item -Path "$env:LOCALAPPDATA\Microsoft\Edge Dev'
+                r'\Application\msedge.exe").VersionInfo.FileVersion',
+                r'(Get-Item -Path "$env:PROGRAMFILES\Microsoft\Edge Dev'
+                r'\Application\msedge.exe").VersionInfo.FileVersion',
+                r'(Get-Item -Path "$env:PROGRAMFILES (x86)\Microsoft\Edge Dev'
+                r'\Application\msedge.exe").VersionInfo.FileVersion',
+                r'(Get-ItemProperty -Path Registry::"HKCU\SOFTWARE\Microsoft'
+                r'\Edge Dev\BLBeacon").version',
+                # canary edge
+                r'(Get-Item -Path "$env:LOCALAPPDATA\Microsoft\Edge SxS'
+                r'\Application\msedge.exe").VersionInfo.FileVersion',
+                r'(Get-ItemProperty -Path Registry::"HKCU\SOFTWARE'
+                r'\Microsoft\Edge SxS\BLBeacon").version',
+                # highest edge
+                r"(Get-Item (Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft"
+                r"\Windows\CurrentVersion\App Paths\msedge.exe')."
+                r"'(Default)').VersionInfo.ProductVersion",
+                r"[System.Diagnostics.FileVersionInfo]::GetVersionInfo(("
+                r"Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows"
+                r"\CurrentVersion\App Paths\msedge.exe')."
+                r"'(Default)').ProductVersion",
+                r"Get-AppxPackage -Name *MicrosoftEdge.* | Foreach Version",
+                r'(Get-ItemProperty -Path Registry::"HKLM\SOFTWARE\Wow6432Node'
+                r'\Microsoft\Windows\CurrentVersion\Uninstall'
+                r'\Microsoft Edge").version',
+            ),
+        },
     }
     try:
         cmd_mapping = cmd_mapping[browser_type][os_name()]