browser-webdriver-downloader 2.1.0 → 2.2.1

package/README.md

@@ -9,3 +9,5 @@ Setting `EDGEDRIVER_VERSION` will prevent it from downloading latest, for exampl
 Setting `DETECT_EDGEDRIVER_VERSION=true` will match your installed Edge version.
 
 Setting `SKIP_EDGEDRIVER_DOWNLOAD=true` will skip the download.
+
+Any supported proxy config from [proxy-from-env](https://www.npmjs.com/package/proxy-from-env) will work.

package/bin/msedgedriver.js

@@ -3,10 +3,11 @@
 
 require('../src/utils/throw-up');
 
-const execa = require('execa');
 const { getDriverPath } = require('../src');
 
 (async () => {
+  const { execa } = await import('execa');
+
   await execa(getDriverPath(), process.argv.slice(2), {
     stdio: 'inherit',
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-webdriver-downloader",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "description": "Install and wrap msedgedriver in Node.js",
   "bin": {
     "msedgedriver": "bin/msedgedriver.js"
@@ -42,11 +42,13 @@
     "node": ">=16.13"
   },
   "dependencies": {
-    "execa": "^5.0.0",
+    "execa": "^6.0.0",
     "extract-zip": "^2.0.1",
     "find-edge-version": "0.1.1",
     "fs-extra": "^11.0.0",
     "got": "^12.0.0",
+    "https-proxy-agent": "^7.0.2",
+    "proxy-from-env": "^1.1.0",
     "tmp": "0.2.1",
     "yn": "^5.0.0"
   },

package/src/index.js

@@ -7,12 +7,14 @@ const extractZip = require('extract-zip');
 const pipeline = promisify(require('stream').pipeline);
 const os = require('os');
 const { createTmpDir } = require('../src/tmp');
-const execa = require('execa');
+const { getProxyForUrl } = require('proxy-from-env');
+const { HttpsProxyAgent } = require('https-proxy-agent');
 
 const platform = os.platform();
 const arch = os.arch();
 
 const downloadHost = 'https://msedgedriver.azureedge.net';
+const latestVersionUrl = `${downloadHost}/LATEST_STABLE`;
 
 const driversRoot = path.join(__dirname, '../bin');
 
@@ -93,6 +95,8 @@ async function getDetectedDriverVersion() {
 
     let ps;
 
+    const { execa } = await import('execa');
+
     try {
       ps = await execa(browserCmd, ['--version']);
     } catch (err) {
@@ -117,10 +121,12 @@ async function getDetectedDriverVersion() {
 }
 
 async function getLatestDriverVersion() {
+  let options = getGotOptions(latestVersionUrl);
+
   // eslint-disable-next-line node/no-missing-import
   const { got } = await import('got');
 
-  let { body } = await got.get(`${downloadHost}/LATEST_STABLE`);
+  let { body } = await got.get(latestVersionUrl, options);
 
   // For example: '��102.0.1245.33\r\n'
   let version = body.replace(/[^\d.]/g, '');
@@ -166,6 +172,8 @@ async function install() {
   let shouldDownload = true;
 
   if (await fs.exists(driverPath)) {
+    const { execa } = await import('execa');
+
     let ps = await execa(driverPath, ['--version']);
 
     // "Microsoft Edge WebDriver 105.0.1343.53 (3a47f00402d579c8ba1fad7e143f9d73831b6765)"
@@ -208,13 +216,15 @@ async function download({ tmpPath, version }) {
 
   let downloadUrl = `${downloadHost}/${version}/${downloadName}`;
 
+  let options = getGotOptions(downloadUrl);
+
   console.log(`Downloading ${downloadUrl}...`);
 
   // eslint-disable-next-line node/no-missing-import
   const { got } = await import('got');
 
   await pipeline(
-    got.stream(downloadUrl),
+    got.stream(downloadUrl, options),
     fs.createWriteStream(downloadPath),
   );
 
@@ -257,7 +267,23 @@ async function hackLocalBinSymlink() {
   }
 }
 
+function getGotOptions(url) {
+  let options = {};
+
+  let proxyUrl = getProxyForUrl(url);
+
+  if (proxyUrl) {
+    options.agent = {
+      ...options.agent,
+      https: new HttpsProxyAgent(proxyUrl),
+    };
+  }
+
+  return options;
+}
+
 module.exports = {
   getDriverPath,
   install,
+  getGotOptions,
 };