chromedriver 107.0.0 → 107.0.2

package/install.js

@@ -3,9 +3,8 @@
 
 const fs = require('fs');
 const helper = require('./lib/chromedriver');
-const axios = require('axios').default;
+const axios = require('axios');
 const path = require('path');
-const del = require('del');
 const child_process = require('child_process');
 const os = require('os');
 const url = require('url');
@@ -45,9 +44,12 @@ let platform = '';
       // Refer http://chromedriver.chromium.org/downloads/version-selection
       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));
-      console.log("Compatible ChromeDriver version is " + chromedriver_version);
+      const versionMatch = /^(.*?)\.\d+$/.exec(chromeVersion);
+      if (versionMatch) {
+        const chromeVersionWithoutPatch = versionMatch[1];
+        await getChromeDriverVersion(getRequestOptions(cdnUrl + '/LATEST_RELEASE_' + chromeVersionWithoutPatch));
+        console.log("Compatible ChromeDriver version is " + chromedriver_version);
+      }
     }
     if (chromedriver_version === 'LATEST') {
       await getChromeDriverVersion(getRequestOptions(`${cdnUrl}/LATEST_RELEASE`));
@@ -163,11 +165,10 @@ function findSuitableTempDirectory() {
     path.join(process.cwd(), 'tmp')
   ];
 
-  for (let i = 0; i < candidateTmpDirs.length; i++) {
-    if (!candidateTmpDirs[i]) continue;
-    // Prevent collision with other versions in the dependency tree
+  for (const tempDir of candidateTmpDirs) {
+    if (!tempDir) continue;
     const namespace = chromedriver_version;
-    const candidatePath = path.join(candidateTmpDirs[i], namespace, 'chromedriver');
+    const candidatePath = path.join(tempDir, namespace, 'chromedriver');
     try {
       fs.mkdirSync(candidatePath, { recursive: true });
       const testFile = path.join(candidatePath, now + '.tmp');
@@ -191,11 +192,12 @@ function getRequestOptions(downloadPath) {
 
   if (proxyUrl) {
     const proxyUrlParts = url.parse(proxyUrl);
-    options.proxy = {
-      host: proxyUrlParts.hostname,
-      port: proxyUrlParts.port ? parseInt(proxyUrlParts.port) : 80,
-      protocol: proxyUrlParts.protocol
-    };
+    if (proxyUrlParts.hostname && proxyUrlParts.protocol)
+      options.proxy = {
+        host: proxyUrlParts.hostname,
+        port: proxyUrlParts.port ? parseInt(proxyUrlParts.port) : 80,
+        protocol: proxyUrlParts.protocol
+      };
   }
 
   if (isHttps) {
@@ -245,7 +247,7 @@ function getRequestOptions(downloadPath) {
  */
 async function getChromeDriverVersion(requestOptions) {
   console.log('Finding Chromedriver version.');
-  const response = await axios(requestOptions);
+  const response = await axios.request(requestOptions);
   chromedriver_version = response.data.trim();
   console.log(`Chromedriver version is ${chromedriver_version}.`);
 }
@@ -259,7 +261,7 @@ async function requestBinary(requestOptions, filePath) {
   const outFile = fs.createWriteStream(filePath);
   let response;
   try {
-    response = await axios({ responseType: 'stream', ...requestOptions });
+    response = await axios.request({ responseType: 'stream', ...requestOptions });
   } catch (error) {
     if (error && error.response) {
       if (error.response.status)
@@ -267,7 +269,7 @@ async function requestBinary(requestOptions, filePath) {
       if (error.response.data) {
         error.response.data.on('data', data => console.error(data.toString('utf8')));
         try {
-          await finishedAsync(error.response.data)
+          await finishedAsync(error.response.data);
         } catch (error) {
           console.error('Error downloading entire response:', error);
         }
@@ -307,7 +309,7 @@ async function extractDownload(dirToExtractTo) {
 }
 
 async function copyIntoPlace(originPath, targetPath) {
-  await del(targetPath, { force: true });
+  fs.rmSync(targetPath, { recursive: true, force: true });
   console.log(`Copying from ${originPath} to target path ${targetPath}`);
   fs.mkdirSync(targetPath);
 
@@ -316,14 +318,14 @@ async function copyIntoPlace(originPath, targetPath) {
     .filter(dirent => dirent.isFile() && dirent.name.startsWith('chromedriver') && !dirent.name.endsWith(".debug") && !dirent.name.endsWith(".zip"))
     .map(dirent => dirent.name);
   const promises = files.map(name => {
-    return new Promise((resolve) => {
+    return /** @type {Promise<void>} */(new Promise((resolve) => {
       const file = path.join(originPath, name);
       const reader = fs.createReadStream(file);
       const targetFile = path.join(targetPath, name);
       const writer = fs.createWriteStream(targetFile);
       writer.on("close", () => resolve());
       reader.pipe(writer);
-    });
+    }));
   });
   await Promise.all(promises);
 }
@@ -347,7 +349,7 @@ function getMacOsRealArch() {
       return 'mac64_m1';
     }
 
-    return 'mac_arm64'
+    return 'mac_arm64';
   }
 
   if (process.arch === 'x64') {
@@ -364,14 +366,14 @@ function isEmulatedRosettaEnvironment() {
     const proc = child_process.spawnSync('sysctl', ['-in', 'sysctl.proc_translated']);
 
     // When run with `-in`, the return code is 0 even if there is no `sysctl.proc_translated`
-    if(proc.status) {
-        throw new Error('Unexpected return code from sysctl: ' + proc.status);
+    if (proc.status) {
+      throw new Error('Unexpected return code from sysctl: ' + proc.status);
     }
 
     // If there is no `sysctl.proc_translated` (i.e. not rosetta) then nothing is printed to
     // stdout
-    if(!proc.stdout) {
-        return false
+    if (!proc.stdout) {
+      return false;
     }
 
     const processTranslated = proc.stdout.toString().trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chromedriver",
-  "version": "107.0.0",
+  "version": "107.0.2",
   "keywords": [
     "chromedriver",
     "selenium"
@@ -23,18 +23,21 @@
   },
   "scripts": {
     "install": "node install.js",
-    "update-chromedriver": "node update.js"
+    "update-chromedriver": "node update.js",
+    "lint": "eslint"
   },
   "dependencies": {
     "@testim/chrome-version": "^1.1.3",
-    "axios": "^0.27.2",
+    "axios": "^1.1.3",
     "compare-versions": "^5.0.1",
-    "del": "^6.1.1",
     "extract-zip": "^2.0.1",
     "https-proxy-agent": "^5.0.1",
     "proxy-from-env": "^1.1.0",
     "tcp-port-used": "^1.0.1"
   },
+  "devDependencies": {
+    "eslint": "^8.26.0"
+  },
   "engines": {
     "node": ">=10"
   }