webdriver-installer 1.1.0 → 1.1.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.1.1](https://github.com/joeyparrish/webdriver-installer/compare/v1.1.0...v1.1.1) (2022-02-03)
+
+
+### Bug Fixes
+
+* Make Windows browser version queries more robust ([85f3b27](https://github.com/joeyparrish/webdriver-installer/commit/85f3b2796e06e1a0f2171b46beef73f6a0407ecb))
+
 ## [1.1.0](https://github.com/joeyparrish/webdriver-installer/compare/v1.0.1...v1.1.0) (2022-02-03)
 
 

package/chrome.js

@@ -36,9 +36,7 @@ class ChromeWebDriverInstaller extends WebDriverInstallerBase {
     } else if (os.platform() == 'darwin') {
       return await InstallerUtils.getMacAppVersion('Google Chrome');
     } else if (os.platform() == 'win32') {
-      return await InstallerUtils.getWindowsRegistryVersion(
-          'HKCU\\Software\\Google\\Chrome\\BLBeacon',
-          'version');
+      return await InstallerUtils.getWindowsExeVersion('chrome.exe');
     } else {
       throw new Error(`Unrecognized platform: ${os.platform()}`);
     }

package/edge.js

@@ -36,8 +36,7 @@ class EdgeWebDriverInstaller extends WebDriverInstallerBase {
     } else if (os.platform() == 'darwin') {
       return await InstallerUtils.getMacAppVersion('Microsoft Edge');
     } else if (os.platform() == 'win32') {
-      return await InstallerUtils.getWindowsExeVersion(
-          'C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe');
+      return await InstallerUtils.getWindowsExeVersion('msedge.exe');
     } else {
       throw new Error(`Unrecognized platform: ${os.platform()}`);
     }

package/firefox.js

@@ -34,9 +34,7 @@ class FirefoxWebDriverInstaller extends WebDriverInstallerBase {
     } else if (os.platform() == 'darwin') {
       return await InstallerUtils.getMacAppVersion('Firefox');
     } else if (os.platform() == 'win32') {
-      return await InstallerUtils.getWindowsRegistryVersion(
-          'HKLM\\Software\\Mozilla\\Mozilla Firefox',
-          'CurrentVersion')
+      return await InstallerUtils.getWindowsExeVersion('firefox.exe');
     } else {
       throw new Error(`Unrecognized platform: ${os.platform()}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webdriver-installer",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Install the right WebDriver version for your local browsers, automatically.",
   "main": "main.js",
   "repository": {

package/utils.js

@@ -22,6 +22,9 @@ const execFile = util.promisify(childProcess.execFile);
 const pipeline = util.promisify(stream.pipeline);
 const zipFromBuffer = util.promisify(yauzl.fromBuffer);
 
+const WINDOWS_REGISTRY_APP_PATHS =
+    'HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\App\ Paths\\';
+
 /**
  * A static utility class for driver installers to use for common operations.
  */
@@ -90,7 +93,12 @@ class InstallerUtils {
       return null;
     }
 
-    const result = await regQuery(path, '64');
+    // Try the 64-bit registry first, then fall back to the 32-bit registry.
+    // Necessary values could be in either location.
+    let result = await regQuery(path, '64');
+    if (!result[path].exists || !result[path].values[key]) {
+      result = await regQuery(path, '32');
+    }
     if (!result[path].exists || !result[path].values[key]) {
       return null;
     }
@@ -125,9 +133,16 @@ class InstallerUtils {
     }
 
     if (!(await InstallerUtils.fileExists(path))) {
-      // No such file.  Avoid the need to parse "not found" errors from
-      // powershell output.
-      return null;
+      // No such file.
+      // If it's a relative path, ask the registry for a full one.
+      if (!path.includes('/') && !path.includes('\\')) {
+        path = await InstallerUtils.getWindowsRegistryVersion(
+            WINDOWS_REGISTRY_APP_PATHS + path,
+            '');
+        if (!path || !(await InstallerUtils.fileExists(path))) {
+          return null;
+        }
+      }
     }
 
     const result = await InstallerUtils.runCommand([