chromedriver 97.0.0 → 97.0.4

package/README.md

@@ -267,6 +267,28 @@ DETECT_CHROMEDRIVER_VERSION=true npm install chromedriver
 **Note:** When the property `detect_chromedriver_version` is provided,
 `chromedriver_version` and `chromedriver_filepath` properties are ignored.
 
+## Include Chromium
+
+If you don't have Chrome installed, you can check for Chromium version instead by setting the argument `include_chromium` to `true`.
+
+```shell
+npm install chromedriver --include_chromium
+```
+
+Or add property into your [`.npmrc`](https://docs.npmjs.com/files/npmrc) file.
+
+```
+include_chromium=true
+```
+
+Another option is to use environment variable `INCLUDE_CHROMIUM`.
+
+```shell
+INCLUDE_CHROMIUM=true npm install chromedriver
+```
+
+**Note:** The property `INCLUDE_CHROMIUM` is ignored if the property `DETECT_CHROMEDRIVER_VERSION` is not used.
+
 ## A Note on chromedriver
 
 Chromedriver is not a library for NodeJS.

package/install.js

@@ -10,11 +10,15 @@ const child_process = require('child_process');
 const os = require('os');
 const url = require('url');
 const https = require('https');
+const { promisify } = require('util');
+const { finished } = require('stream');
 const extractZip = require('extract-zip');
 const { getChromeVersion } = require('@testim/chrome-version');
 const HttpsProxyAgent = require('https-proxy-agent');
 const getProxyForUrl = require("proxy-from-env").getProxyForUrl;
 
+const finishedAsync = promisify(finished);
+
 const skipDownload = process.env.npm_config_chromedriver_skip_download || process.env.CHROMEDRIVER_SKIP_DOWNLOAD;
 if (skipDownload === 'true') {
   console.log('Found CHROMEDRIVER_SKIP_DOWNLOAD variable, skipping installation.');
@@ -29,6 +33,7 @@ const configuredfilePath = process.env.npm_config_chromedriver_filepath || proce
 cdnUrl = cdnUrl.replace(/\/+$/, '');
 const platform = validatePlatform();
 const detect_chromedriver_version = process.env.npm_config_detect_chromedriver_version || process.env.DETECT_CHROMEDRIVER_VERSION;
+const include_chromium = (process.env.npm_config_include_chromium || process.env.INCLUDE_CHROMIUM) === 'true';
 let chromedriver_version = process.env.npm_config_chromedriver_version || process.env.CHROMEDRIVER_VERSION || helper.version;
 let chromedriverBinaryFilePath;
 let downloadedFile = '';
@@ -37,7 +42,7 @@ let downloadedFile = '';
   try {
     if (detect_chromedriver_version === 'true') {
       // Refer http://chromedriver.chromium.org/downloads/version-selection
-      const chromeVersion = await getChromeVersion();
+      const chromeVersion = await getChromeVersion(include_chromium);
       console.log("Your Chrome version is " + chromeVersion);
       const chromeVersionWithoutPatch = /^(.*?)\.\d+$/.exec(chromeVersion)[1];
       await getChromeDriverVersion(getRequestOptions(cdnUrl + '/LATEST_RELEASE_' + chromeVersionWithoutPatch));
@@ -81,16 +86,19 @@ function validatePlatform() {
       process.exit(1);
     }
   } else if (thePlatform === 'darwin' || thePlatform === 'freebsd') {
-    if (process.arch === 'x64' || process.arch === 'arm64') {
-      thePlatform = 'mac64';
-    } else {
+    const osxPlatform = getMacOsRealArch();
+
+    if (!osxPlatform) {
       console.log('Only Mac 64 bits supported.');
       process.exit(1);
     }
+
+    thePlatform = osxPlatform;
   } else if (thePlatform !== 'win32') {
     console.log('Unexpected platform or architecture:', process.platform, process.arch);
     process.exit(1);
   }
+
   return thePlatform;
 }
 
@@ -256,10 +264,11 @@ async function requestBinary(requestOptions, filePath) {
         console.error('Error status code:', error.response.status);
       if (error.response.data) {
         error.response.data.on('data', data => console.error(data.toString('utf8')));
-        await new Promise((resolve) => {
-          error.response.data.on('finish', resolve);
-          error.response.data.on('error', resolve);
-        });
+        try {
+          await finishedAsync(error.response.data)
+        } catch (error) {
+          console.error('Error downloading entire response:', error);
+        }
       }
     }
     throw new Error('Error with http(s) request: ' + error);
@@ -330,6 +339,32 @@ function fixFilePermissions() {
   }
 }
 
+function getMacOsRealArch() {
+  if (process.arch === 'arm64' || isEmulatedRosettaEnvironment()) {
+    return 'mac64_m1';
+  }
+
+  if (process.arch === 'x64') {
+    return 'mac64';
+  }
+
+  return null;
+}
+
+function isEmulatedRosettaEnvironment() {
+  const archName = child_process.spawnSync('uname', ['-m']).stdout.toString().trim();
+
+  if (archName === 'x86_64') {
+    const processTranslated = child_process.spawnSync('sysctl', ['-in', 'sysctl.proc_translated'])
+      .stdout.toString()
+      .trim();
+
+    return processTranslated === '1';
+  }
+
+  return false;
+}
+
 function Deferred() {
   this.resolve = null;
   this.reject = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chromedriver",
-  "version": "97.0.0",
+  "version": "97.0.4",
   "keywords": [
     "chromedriver",
     "selenium"
@@ -26,8 +26,8 @@
     "update-chromedriver": "node update.js"
   },
   "dependencies": {
-    "@testim/chrome-version": "^1.0.7",
-    "axios": "^0.21.2",
+    "@testim/chrome-version": "^1.1.2",
+    "axios": "^0.24.0",
     "del": "^6.0.0",
     "extract-zip": "^2.0.1",
     "https-proxy-agent": "^5.0.0",