webdriver-installer 1.1.5 → 1.1.6

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.1.6](https://github.com/shaka-project/webdriver-installer/compare/v1.1.5...v1.1.6) (2023-07-19)
+
+
+### Bug Fixes
+
+* Ignore errors executing non-executable drivers ([#23](https://github.com/shaka-project/webdriver-installer/issues/23)) ([07c8644](https://github.com/shaka-project/webdriver-installer/commit/07c864446e68e6f8714c3d1a899b42b2d0931aae)), closes [#22](https://github.com/shaka-project/webdriver-installer/issues/22)
+* Retry when WebDriver updates are not available yet ([#24](https://github.com/shaka-project/webdriver-installer/issues/24)) ([e0312c8](https://github.com/shaka-project/webdriver-installer/commit/e0312c89eab70bbb7241298846dff93e4a690753))
+
 ## [1.1.5](https://github.com/shaka-project/webdriver-installer/compare/v1.1.4...v1.1.5) (2022-12-14)
 
 

package/chrome.js

@@ -63,9 +63,11 @@ class ChromeWebDriverInstaller extends WebDriverInstallerBase {
    * @return {!Promise<string>}
    */
   async getBestDriverVersion(browserVersion) {
-    const majorVersion = browserVersion.split('.')[0];
-    const versionUrl = `${CDN_URL}/LATEST_RELEASE_${majorVersion}`;
-    return await InstallerUtils.fetchVersionUrl(versionUrl);
+    const idealMajorVersion = parseInt(browserVersion.split('.')[0], 10);
+    return await InstallerUtils.fetchVersionUrlWithAutomaticDowngrade(
+        idealMajorVersion,
+        /* minMajorVersion */ idealMajorVersion - 2,
+        (majorVersion) => `${CDN_URL}/LATEST_RELEASE_${majorVersion}`);
   }
 
   /**

package/edge.js

@@ -63,7 +63,7 @@ class EdgeWebDriverInstaller extends WebDriverInstallerBase {
    * @return {!Promise<string>}
    */
   async getBestDriverVersion(browserVersion) {
-    const majorVersion = browserVersion.split('.')[0];
+    const idealMajorVersion = parseInt(browserVersion.split('.')[0], 10);
 
     let platform;
     if (os.platform() == 'linux') {
@@ -76,8 +76,15 @@ class EdgeWebDriverInstaller extends WebDriverInstallerBase {
       throw new Error(`Unrecognized platform: ${os.platform()}`);
     }
 
-    const versionUrl = `${CDN_URL}/LATEST_RELEASE_${majorVersion}_${platform}`;
-    return await InstallerUtils.fetchVersionUrl(versionUrl, 'UTF-16LE');
+    const urlFormatter = (majorVersion) => {
+      return `${CDN_URL}/LATEST_RELEASE_${majorVersion}_${platform}`;
+    };
+
+    return await InstallerUtils.fetchVersionUrlWithAutomaticDowngrade(
+        idealMajorVersion,
+        /* minMajorVersion */ idealMajorVersion - 2,
+        urlFormatter,
+        'UTF-16LE');
   }
 
   /**

package/package.json

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

package/utils.js

@@ -59,6 +59,11 @@ class InstallerUtils {
       if (error.code == 'ENOENT') {
         // Command does not exist.
         return null;
+      } else if (error.code == 'EACCES') {  // Missing "s" is not a typo!
+        // Command is not executable.  This can happen after a failed run that
+        // downloads something, but is interrupted before setting its
+        // executable bit.
+        return null;
       } else {
         // Command exists, but failed.
         throw error;
@@ -76,7 +81,8 @@ class InstallerUtils {
     const response = await fetch(url);
     if (!response.ok) {
       throw new Error(
-          `Failed to fetch ${url}: ${response.status} ${response.statusText}`);
+          `Failed to fetch ${url}: ${response.status} ${response.statusText}`,
+          { cause: response });
     }
     return response;
   }
@@ -223,7 +229,7 @@ class InstallerUtils {
   }
 
   /**
-   * Fetch a version number from a URL.  Both Chrome and Edge use this.
+   * Fetch a version number from a URL.
    *
    * @param {string} url
    * @param {string=} encoding
@@ -236,6 +242,50 @@ class InstallerUtils {
     return data.toString(encoding).trim();
   }
 
+  /**
+   * Fetch a version number from a URL.  If not found, downgrade the major
+   * version and try again.  If a WebDriver release lags the browser release
+   * (which seems common), this will compensate.  Both Chrome and Edge use
+   * this.
+   *
+   * @param {number} idealMajorVersion
+   * @param {number} minMajorVersion
+   * @param {function(number): string} urlFormatter
+   * @param {string=} encoding
+   * @return {!Promise<string>}
+   */
+  static async fetchVersionUrlWithAutomaticDowngrade(
+      idealMajorVersion, minMajorVersion, urlFormatter, encoding) {
+    let majorVersion = idealMajorVersion;
+    let firstError = null;
+
+    while (majorVersion >= minMajorVersion) {
+      const versionUrl = urlFormatter(majorVersion);
+      try {
+        return await InstallerUtils.fetchVersionUrl(versionUrl, encoding);
+      } catch (error) {
+        if (error.cause.status != 404) {
+          // Any unexpected error (other than HTTP 404) is thrown immediately.
+          throw error;
+        }
+
+        // Save the first error in case we run out this loop.  We'll throw this
+        // one if none of the allowed versions can be found.
+        if (firstError == null) {
+          firstError = error;
+        }
+
+        // For 404 errors, decrease the major version, fall through, loop, and
+        // try again.
+        majorVersion--;
+      }
+    }
+
+    // We tried all allowed versions.  Throw the initial error, which will have
+    // details of the first URL we tried.
+    throw firstError;
+  }
+
   /**
    * Fetch the latest tag from a GitHub repo.
    *