webdriver-installer 1.1.0 → 1.1.4

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+### [1.1.4](https://github.com/joeyparrish/webdriver-installer/compare/v1.1.3...v1.1.4) (2022-02-17)
+
+
+### Bug Fixes
+
+* Fix unlinking existing binaries ([#12](https://github.com/joeyparrish/webdriver-installer/issues/12)) ([8a43765](https://github.com/joeyparrish/webdriver-installer/commit/8a43765b54fbbf164762f7a8edf52520b4d08059))
+
+### [1.1.3](https://github.com/joeyparrish/webdriver-installer/compare/v1.1.2...v1.1.3) (2022-02-11)
+
+
+### Bug Fixes
+
+* Choose platform-specific msedgedriver version ([#8](https://github.com/joeyparrish/webdriver-installer/issues/8)) ([2e0e859](https://github.com/joeyparrish/webdriver-installer/commit/2e0e8598f878c0c3fcd8ed55d4e830da398a891b))
+
+
+### [1.1.2](https://github.com/joeyparrish/webdriver-installer/compare/v1.1.1...v1.1.2) (2022-02-03)
+
+
+### Bug Fixes
+
+* Fix CLI installation ([2f6b649](https://github.com/joeyparrish/webdriver-installer/commit/2f6b649033312f778795b1372abfc0a175d70e61))
+
+### [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()}`);
     }
@@ -65,7 +64,19 @@ class EdgeWebDriverInstaller extends WebDriverInstallerBase {
    */
   async getBestDriverVersion(browserVersion) {
     const majorVersion = browserVersion.split('.')[0];
-    const versionUrl = `${CDN_URL}/LATEST_RELEASE_${majorVersion}`;
+
+    let platform;
+    if (os.platform() == 'linux') {
+      platform = 'LINUX';
+    } else if (os.platform() == 'darwin') {
+      platform = 'MACOS';
+    } else if (os.platform() == 'win32') {
+      platform = 'WINDOWS';
+    } else {
+      throw new Error(`Unrecognized platform: ${os.platform()}`);
+    }
+
+    const versionUrl = `${CDN_URL}/LATEST_RELEASE_${majorVersion}_${platform}`;
     return await InstallerUtils.fetchVersionUrl(versionUrl, 'UTF-16LE');
   }
 

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,8 +1,11 @@
 {
   "name": "webdriver-installer",
-  "version": "1.1.0",
+  "version": "1.1.4",
   "description": "Install the right WebDriver version for your local browsers, automatically.",
   "main": "main.js",
+  "bin": {
+    "webdriver-installer": "main.js"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/joeyparrish/webdriver-installer"

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.
  */
@@ -81,32 +84,37 @@ class InstallerUtils {
   /**
    * Get a version number from the Windows registry.
    *
-   * @param {string} path
+   * @param {string} regPath
    * @param {string} key
    * @return {!Promise<?string>}
    */
-  static async getWindowsRegistryVersion(path, key) {
+  static async getWindowsRegistryVersion(regPath, key) {
     if (os.platform() != 'win32') {
       return null;
     }
 
-    const result = await regQuery(path, '64');
-    if (!result[path].exists || !result[path].values[key]) {
+    // 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(regPath, '64');
+    if (!result[regPath].exists || !result[regPath].values[key]) {
+      result = await regQuery(regPath, '32');
+    }
+    if (!result[regPath].exists || !result[regPath].values[key]) {
       return null;
     }
 
-    return result[path].values[key].value;
+    return result[regPath].values[key].value;
   }
 
   /**
    * Test if a file exists.
    *
-   * @param {path}
+   * @param {filePath}
    * @return {!Promise<boolean}
    */
-  static async fileExists(path) {
+  static async fileExists(filePath) {
     try {
-      await fsPromises.stat(path);
+      await fsPromises.stat(filePath);
       return true;
     } catch (error) {
       return false;
@@ -116,23 +124,31 @@ class InstallerUtils {
   /**
    * Get a version number from the metadata of a Windows executable.
    *
-   * @param {string} path
+   * @param {string} executablePath
    * @return {!Promise<?string>}
    */
-  static async getWindowsExeVersion(path) {
+  static async getWindowsExeVersion(executablePath) {
     if (os.platform() != 'win32') {
       return null;
     }
 
-    if (!(await InstallerUtils.fileExists(path))) {
-      // No such file.  Avoid the need to parse "not found" errors from
-      // powershell output.
-      return null;
+    if (!(await InstallerUtils.fileExists(executablePath))) {
+      // No such file.
+      // If it's a relative path, ask the registry for a full one.
+      if (!executablePath.includes('/') && !executablePath.includes('\\')) {
+        executablePath = await InstallerUtils.getWindowsRegistryVersion(
+            WINDOWS_REGISTRY_APP_PATHS + executablePath,
+            '');
+        if (!executablePath ||
+            !(await InstallerUtils.fileExists(executablePath))) {
+          return null;
+        }
+      }
     }
 
     const result = await InstallerUtils.runCommand([
       'powershell',
-      `(Get-Item "${path}").VersionInfo.ProductVersion`,
+      `(Get-Item "${executablePath}").VersionInfo.ProductVersion`,
     ]);
 
     const output = result.stdout.trim();
@@ -315,7 +331,7 @@ class InstallerUtils {
     // permission errors overwriting it.  Unlinking it first will ensure the
     // newly-written file is a fresh filesystem inode that doesn't conflict
     // with what's running.
-    if (await InstallerUtils.fileExists(path)) {
+    if (await InstallerUtils.fileExists(outputPath)) {
       await fsPromises.unlink(outputPath);
     }