browsertime 14.5.0 → 14.8.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## 14.8.0 - 2021-10-27
+### Added
+* New Edgedriver 95 and Edge 95 in the Docker container [#1665](https://github.com/sitespeedio/browsertime/pull/1665).
+
+### Fixed
+* Fix for storing Firefox memory report and geckoprofile on Android 10+. Thank you [Andrew Creskey](https://github.com/acreskeyMoz) for PR [#1663](https://github.com/sitespeedio/browsertime/pull/1663).
+
+## 14.7.0 - 2021-10-20
+### Added
+* Updated to Chromedriver 95. Added Chrome 95 in the Docker container.
+
+## 14.6.1 - 2021-10-18
+### Fixed
+* If loading the URL fails (we get an exception, the browser crashes etc) make sure we stop the video correctly so it can be used [#1657](https://github.com/sitespeedio/browsertime/pull/1657).
+
+
+## 14.6.0 - 2021-10-13
+### Added
+* Updated to Selenium 4.0.0 [#1655](https://github.com/sitespeedio/browsertime/pull/1655).
+* You can skip setting Browsertime default Firefox preferences with `--firefox.noDefaultPrefs`, thank you [Gregory Mierzwinski](https://github.com/gmierz) for PR [#1650](https://github.com/sitespeedio/browsertime/pull/1650).
+* You can skip setting Browsertime default Chrome options with `--chrome.noDefaultOptions`, fixed in [#1651](https://github.com/sitespeedio/browsertime/pull/1651).
+* Updated to Firefox 93 in the Docker container.
+
+### Fixed
+* Updated eslint and prettier dependencies [#1652](https://github.com/sitespeedio/browsertime/pull/1652).
+* Log Firefox preference and Chrome args on debug level [#1654](https://github.com/sitespeedio/browsertime/pull/1654)
 ## 14.5.0 - 2021-09-30
 ### Added
 * Added CSS selector support for mouse commands [#1645](https://github.com/sitespeedio/browsertime/pull/1645) 
@@ -9,7 +35,8 @@
 
 ## 14.4.0 - 2021-09-22
 ### Added
-* Updated to Chromedriver 94 and Chrome 94 in the Docker container [#1643](https://github.com/sitespeedio/browsertime/pull/1643).
+* Updated to Ch
+romedriver 94 and Chrome 94 in the Docker container [#1643](https://github.com/sitespeedio/browsertime/pull/1643).
 ## 14.3.0 - 2021-09-16
 ### Added
 * Update to Edgedriver 93. Update to Edge 93 in the Docker container [#1641](https://github.com/sitespeedio/browsertime/pull/1641).

package/bin/browsertime.js

@@ -11,7 +11,7 @@ const fs = require('fs');
 const path = require('path');
 const log = require('intel').getLogger('browsertime');
 const engineUtils = require('../lib/support/engineUtils');
-const AsyncFunction = Object.getPrototypeOf(async function() {}).constructor;
+const AsyncFunction = Object.getPrototypeOf(async function () {}).constructor;
 const delay = ms => new Promise(res => setTimeout(res, ms));
 
 async function parseUserScripts(scripts) {

package/lib/android/index.js

@@ -91,7 +91,7 @@ class Android {
     const transfer = await this.client.pull(this.id, sourcePath);
 
     return new Promise((resolve, reject) => {
-      transfer.on('end', function() {
+      transfer.on('end', function () {
         resolve();
       });
       transfer.on('error', reject);

package/lib/chrome/har.js

@@ -5,7 +5,7 @@ const perflogParser = require('chrome-har');
 const harBuilder = require('../support/har');
 const { Type } = require('selenium-webdriver').logging;
 
-module.exports = async function(
+module.exports = async function (
   runner,
   result,
   index,
@@ -38,9 +38,9 @@ module.exports = async function(
     await cdpClient.setResponseBodies(har);
   }
 
-  const versionInfo = (await cdpClient.send(
-    'Browser.getVersion'
-  )).product.split('/');
+  const versionInfo = (
+    await cdpClient.send('Browser.getVersion')
+  ).product.split('/');
   const info = {
     name: versionInfo[0],
     version: versionInfo[1]

package/lib/chrome/longTaskMetrics.js

@@ -2,7 +2,7 @@
 
 const get = require('lodash.get');
 
-module.exports = function(result, options) {
+module.exports = function (result, options) {
   let totalDurationFirstPaint = 0;
   let totalDurationFirstContentFulPaint = 0;
   let totalDurationAfterLoadEventEnd = 0;

package/lib/chrome/speedline.js

@@ -18,13 +18,13 @@ function pad(n) {
  * Use SpeedLine to analyse the Chrome trace log to get Visual Metrics.
  * Not as good as using a video but maybe usable in some cases.
  */
-module.exports = async function(trace, result, index) {
+module.exports = async function (trace, result, index) {
   try {
     const navStart = trace.traceEvents.filter(
       task =>
         task.cat === 'blink.user_timing' && task.name === 'navigationStart'
     );
-    navStart.sort(function(a, b) {
+    navStart.sort(function (a, b) {
       return a.ts - b.ts;
     });
     log.debug('Get Speedline result from the trace');

package/lib/chrome/webdriver/builder.js

@@ -14,7 +14,7 @@ let hasConfiguredChromeDriverService = false;
  * @param builder
  * @param {Object} options the options for a web driver.
  */
-module.exports.configureBuilder = function(builder, baseDir, options) {
+module.exports.configureBuilder = function (builder, baseDir, options) {
   const chromeConfig = options.chrome || {};
 
   if (!hasConfiguredChromeDriverService) {

package/lib/chrome/webdriver/setupChromiumOptions.js

@@ -5,7 +5,7 @@ const getViewPort = require('../../support/getViewPort');
 const util = require('../../support/util');
 const log = require('intel').getLogger('browsertime.chrome');
 
-module.exports = function(seleniumOptions, browserOptions, options, baseDir) {
+module.exports = function (seleniumOptions, browserOptions, options, baseDir) {
   // Fixing save password popup, only on Desktop
   if (!options.android) {
     seleniumOptions.setUserPreferences({
@@ -109,10 +109,15 @@ module.exports = function(seleniumOptions, browserOptions, options, baseDir) {
       '--remote-debugging-port=' + options.devToolsPort
     );
   } else {
-    seleniumOptions.addArguments(defaultChromeOptions);
+    if (!browserOptions.noDefaultOptions) {
+      seleniumOptions.addArguments(defaultChromeOptions);
+    } else {
+      log.info('Skip setting default options for Chrome');
+    }
   }
 
   if (browserOptions.args) {
+    log.debug('Set Chrome args %j', browserOptions.args);
     seleniumOptions.addArguments(browserOptions.args);
   }
 

package/lib/connectivity/trafficShapeParser.js

@@ -104,7 +104,7 @@ const legacyProfiles = {
 };
 
 module.exports = {
-  parseTrafficShapeConfig: function(options) {
+  parseTrafficShapeConfig: function (options) {
     if (options.connectivity && options.connectivity.profile === 'custom') {
       return {
         down: options.connectivity.down,
@@ -133,7 +133,7 @@ module.exports = {
       return null;
     }
   },
-  getProfiles: function() {
+  getProfiles: function () {
     return newProfiles;
   }
 };

package/lib/connectivity/tsProxy.js

@@ -14,7 +14,7 @@ const TS_PROXY_SCRIPT_PATH = path.join(
 );
 
 function getStartupCriteriaListener(resolve, reject) {
-  return function(data) {
+  return function (data) {
     const logLine = data.toString();
     if (logLine.startsWith('Started Socks5 proxy server on')) {
       log.debug('Started TSproxy');
@@ -65,12 +65,12 @@ class TSProxy {
     const tsProxyProcess = this.tsProxyProcess;
 
     if (this.logVerbose) {
-      tsProxyProcess.stderr.on('data', function(data) {
+      tsProxyProcess.stderr.on('data', function (data) {
         log.verbose(data.toString().trim());
       });
     }
 
-    return new Promise(function(resolve, reject) {
+    return new Promise(function (resolve, reject) {
       tsProxyProcess.stdout.on(
         'data',
         getStartupCriteriaListener(resolve, reject)

package/lib/core/engine/command/measure.js

@@ -96,6 +96,13 @@ class Measure {
     }
   }
 
+  async _stopVideo(url) {
+    if (this.recordVideo && !this.options.videoParams.debug) {
+      await this.video.stop(url);
+      this.videos.push(this.video);
+    }
+  }
+
   _error(message) {
     // If we already are measuring a page, associate the error woth that page
     if (this.areWeMeasuring === true) {
@@ -223,6 +230,9 @@ class Measure {
         this.numberOfMeasuredPages++;
         this.numberOfVisitedPages++;
         this.engineDelegate.failing(url);
+        // If we got an error we still should stop the video to make sure we can use it to
+        // try to understand what went wrong
+        await this._stopVideo(url);
         throw e;
       }
     } else {
@@ -261,14 +271,12 @@ class Measure {
     // we also need to add that to the meta data so that the correct folder is created
     if (this.result[this.numberOfMeasuredPages].alias) {
       if (this.options.urlMetaData) {
-        this.options.urlMetaData[url] = this.result[
-          this.numberOfMeasuredPages
-        ].alias;
+        this.options.urlMetaData[url] =
+          this.result[this.numberOfMeasuredPages].alias;
       } else {
         this.options.urlMetaData = {};
-        this.options.urlMetaData[url] = this.result[
-          this.numberOfMeasuredPages
-        ].alias;
+        this.options.urlMetaData[url] =
+          this.result[this.numberOfMeasuredPages].alias;
       }
     }
 
@@ -276,10 +284,8 @@ class Measure {
     await this.storageManager.createSubDataDir(
       path.join(pathToFolder(url, this.options))
     );
-    if (this.recordVideo && !this.options.videoParams.debug) {
-      await this.video.stop(url);
-      this.videos.push(this.video);
-    }
+    await this._stopVideo(url);
+
     const alias = this.options.urlMetaData
       ? this.options.urlMetaData[url]
       : undefined || this.result[this.numberOfMeasuredPages].alias;

package/lib/core/engine/command/mouse/clickAndHold.js

@@ -18,10 +18,7 @@ class ClickAndHold {
   async byXpath(xpath) {
     try {
       const element = await this.driver.findElement(webdriver.By.xpath(xpath));
-      return this.actions
-        .move({ origin: element })
-        .press()
-        .perform();
+      return this.actions.move({ origin: element }).press().perform();
     } catch (e) {
       log.error('Could not click and hold on element with xpath %s', xpath);
       log.verbose(e);
@@ -38,10 +35,7 @@ class ClickAndHold {
   async bySelector(selector) {
     try {
       const element = await this.driver.findElement(webdriver.By.css(selector));
-      return this.actions
-        .move({ origin: element })
-        .press()
-        .perform();
+      return this.actions.move({ origin: element }).press().perform();
     } catch (e) {
       log.error(
         'Could not click and hold on element with selector %s',
@@ -103,10 +97,7 @@ class ClickAndHold {
   async releaseAtXpath(xpath) {
     try {
       const element = await this.driver.findElement(webdriver.By.xpath(xpath));
-      return this.actions
-        .move({ origin: element })
-        .release()
-        .perform();
+      return this.actions.move({ origin: element }).release().perform();
     } catch (e) {
       log.error('Could not release on xpath %s', xpath);
       log.verbose(e);
@@ -123,10 +114,7 @@ class ClickAndHold {
   async releaseAtSelector(selector) {
     try {
       const element = await this.driver.findElement(webdriver.By.css(selector));
-      return this.actions
-        .move({ origin: element })
-        .release()
-        .perform();
+      return this.actions.move({ origin: element }).release().perform();
     } catch (e) {
       log.error('Could not release on selector %s', selector);
       log.verbose(e);

package/lib/core/engine/command/switch.js

@@ -58,10 +58,7 @@ class Switch {
    */
   async toNewTab(url) {
     try {
-      await this.browser
-        .getDriver()
-        .switchTo()
-        .newWindow('tab');
+      await this.browser.getDriver().switchTo().newWindow('tab');
       if (url) {
         await this.navigate(url);
         await this.browser.extraWait(this.pageCompleteCheck);
@@ -80,10 +77,7 @@ class Switch {
    */
   async toNewWindow(url) {
     try {
-      await this.browser
-        .getDriver()
-        .switchTo()
-        .newWindow('window');
+      await this.browser.getDriver().switchTo().newWindow('window');
       if (url) {
         await this.navigate(url);
         await this.browser.extraWait(this.pageCompleteCheck);

package/lib/core/engine/iteration.js

@@ -262,11 +262,10 @@ class Iteration {
               'PerceptualSpeedIndexProgress'
             ]) {
               if (videoMetrics.visualMetrics[progress]) {
-                videoMetrics.visualMetrics[
-                  progress
-                ] = util.jsonifyVisualProgress(
-                  videoMetrics.visualMetrics[progress]
-                );
+                videoMetrics.visualMetrics[progress] =
+                  util.jsonifyVisualProgress(
+                    videoMetrics.visualMetrics[progress]
+                  );
               }
             }
             result[i].videoRecordingStart = videoMetrics.videoRecordingStart;

package/lib/core/engine/run.js

@@ -1,7 +1,7 @@
 'use strict';
 
-module.exports = function(urlOrFunctions) {
-  return async function(context, commands) {
+module.exports = function (urlOrFunctions) {
+  return async function (context, commands) {
     for (let urlOrFunction of urlOrFunctions) {
       if (typeof urlOrFunction === 'function') {
         await urlOrFunction(context, commands);

package/lib/core/seleniumRunner.js

@@ -70,8 +70,9 @@ class SeleniumRunner {
         this.driver = await timeout(
           builder.createWebDriver(this.baseDir, this.options),
           this.options.timeouts.browserStart,
-          `Failed to start ${this.options.browser} in ${this.options.timeouts
-            .browserStart / 1000} seconds.`
+          `Failed to start ${this.options.browser} in ${
+            this.options.timeouts.browserStart / 1000
+          } seconds.`
         );
         break;
       } catch (e) {
@@ -85,9 +86,9 @@ class SeleniumRunner {
           throw e;
         } else {
           log.info(
-            `${this.options.browser} failed to start, trying ${tries -
-              i -
-              1} more time(s): ${e.message}`
+            `${this.options.browser} failed to start, trying ${
+              tries - i - 1
+            } more time(s): ${e.message}`
           );
         }
       }
@@ -167,11 +168,13 @@ class SeleniumRunner {
     try {
       const pageCompleteCheckCondition = new Condition(
         'for page complete check script to return true',
-        function(d) {
-          return d.executeScript(pageCompleteCheck, waitTime).then(function(t) {
-            log.verbose('PageCompleteCheck returned %s', t);
-            return t === true;
-          });
+        function (d) {
+          return d
+            .executeScript(pageCompleteCheck, waitTime)
+            .then(function (t) {
+              log.verbose('PageCompleteCheck returned %s', t);
+              return t === true;
+            });
         }
       );
       log.debug(
@@ -297,9 +300,9 @@ class SeleniumRunner {
           log.info(
             `URL ${url} failed to load, the ${
               this.options.browser
-            } are still on ${startURI} , trying ${tries -
-              i -
-              1} more time(s) but first wait for ${waitTime} ms.`
+            } are still on ${startURI} , trying ${
+              tries - i - 1
+            } more time(s) but first wait for ${waitTime} ms.`
           );
 
           if (i === tries - 1) {
@@ -476,13 +479,11 @@ class SeleniumRunner {
    */
   async getLogs(logType) {
     return timeout(
-      this.driver
-        .manage()
-        .logs()
-        .get(logType),
+      this.driver.manage().logs().get(logType),
       this.options.timeouts.logs,
-      `Extracting logs from ${this.options.browser} took more than ${this
-        .options.timeouts.logs / 1000} seconds.`
+      `Extracting logs from ${this.options.browser} took more than ${
+        this.options.timeouts.logs / 1000
+      } seconds.`
     );
   }
 
@@ -626,9 +627,9 @@ class SeleniumRunner {
       if (!script) {
         let func = category[scriptName].function;
         if (!func) {
-          throw 'Function and script cannot both be null in ' +
-            scriptName +
-            '.';
+          throw (
+            'Function and script cannot both be null in ' + scriptName + '.'
+          );
         }
         // We wrap the source code of the function in parenthesis
         // "(...)" to contain it in a separate scope. We add a

package/lib/core/webdriver/index.js

@@ -13,7 +13,7 @@ const safari = require('../../safari/webdriver/builder');
  * @returns {!Promise<webdriver.WebDriver>} a promise that resolves to the webdriver,
  * or rejects if the current configuration is invalid.
  */
-module.exports.createWebDriver = async function(baseDir, options) {
+module.exports.createWebDriver = async function (baseDir, options) {
   const browser = options.browser || 'chrome';
   const seleniumUrl = options.selenium ? options.selenium.url : undefined;
   const capabilities = options.selenium

package/lib/edge/webdriver/builder.js

@@ -7,7 +7,7 @@ const isEmpty = require('lodash.isempty');
 const webdriver = require('selenium-webdriver');
 const setupChromiumOptions = require('../../chrome/webdriver/setupChromiumOptions');
 
-module.exports.configureBuilder = function(builder, baseDir, options) {
+module.exports.configureBuilder = function (builder, baseDir, options) {
   const edgeConfig = options.edge || {};
   const chromeConfig = options.chrome || {};
 

package/lib/extensionserver/setup.js

@@ -46,7 +46,7 @@ function generateURL(port, testUrl, options) {
   });
 }
 
-module.exports = async function(url, browser, port, options) {
+module.exports = async function (url, browser, port, options) {
   const configUrl = generateURL(port, url, options);
   log.debug('Configuring browser plugin via %s', configUrl);
   await browser.loadAndWait(configUrl);

package/lib/firefox/geckoProfiler.js

@@ -40,9 +40,8 @@ class GeckoProfiler {
     const runner = this.runner;
     const firefoxConfig = this.firefoxConfig;
     const options = this.options;
-    const chosenFeatures = firefoxConfig.geckoProfilerParams.features.split(
-      ','
-    );
+    const chosenFeatures =
+      firefoxConfig.geckoProfilerParams.features.split(',');
     const featureString = '["' + chosenFeatures.join('","') + '"]';
 
     const chosenThreads = firefoxConfig.geckoProfilerParams.threads.split(',');
@@ -104,11 +103,13 @@ class GeckoProfiler {
 
     let deviceProfileFilename = destinationFilename;
     if (isAndroidConfigured(options)) {
-      deviceProfileFilename = `/sdcard/geckoProfile-${index}.json`;
+      deviceProfileFilename = `/sdcard/Android/data/${this.firefoxConfig.android.package}/files/geckoProfile-${index}.json`;
     }
 
     // Must use String.raw or else the backslashes on Windows will be escapes.
-    log.info(`Collecting Gecko profile in ${destinationFilename}`);
+    log.info(
+      `Collecting Gecko profile from ${deviceProfileFilename} to ${destinationFilename}`
+    );
     const script = `
       var callback = arguments[arguments.length - 1];
        Services.profiler.dumpProfileToFileAsync(String.raw\`${deviceProfileFilename}\`)

package/lib/firefox/getHAR.js

@@ -4,7 +4,7 @@ const log = require('intel').getLogger('browsertime.firefox');
 
 // Get the HAR from Firefox
 // Using https://github.com/firefox-devtools/har-export-trigger
-module.exports = async function(runner, includeResponseBodies) {
+module.exports = async function (runner, includeResponseBodies) {
   const script = `
     const callback = arguments[arguments.length - 1];
     async function triggerExport() {

package/lib/firefox/memoryReport.js

@@ -1,4 +1,5 @@
 'use strict';
+const log = require('intel').getLogger('browsertime.firefox');
 const path = require('path');
 const pathToFolder = require('../support/pathToFolder');
 const { BrowserError } = require('../support/errors');
@@ -76,7 +77,7 @@ class MemoryReport {
 
     let deviceReportFilename = destinationFilename;
     if (isAndroidConfigured(options)) {
-      deviceReportFilename = `/sdcard/memoryReport-${index}.json`;
+      deviceReportFilename = `/sdcard/Android/data/${firefoxConfig.android.package}/files/memoryReport-${index}.json`;
     }
 
     let minimizeFirst = 'false';
@@ -84,6 +85,9 @@ class MemoryReport {
       minimizeFirst = 'true';
     }
 
+    log.info(
+      `Collecting memory report from ${deviceReportFilename} to ${destinationFilename}`
+    );
     let script = `Cc['@mozilla.org/memory-info-dumper;1'].getService(Ci.nsIMemoryInfoDumper).dumpMemoryReportsToNamedFile(String.raw\`${deviceReportFilename}\`, null, null, false, ${minimizeFirst});`;
     await timeout(
       runner.runPrivilegedScript(script, 'Collecting memory report'),

package/lib/firefox/webdriver/builder.js

@@ -13,7 +13,7 @@ const disableTrackingProtectionPreferences = require('../settings/disableTrackin
 const util = require('../../support/util');
 const { Android } = require('../../android');
 
-module.exports.configureBuilder = function(builder, baseDir, options) {
+module.exports.configureBuilder = function (builder, baseDir, options) {
   // Here we configure everything that we need to start Firefox
   const firefoxConfig = options.firefox || {};
   const moduleRootPath = path.resolve(__dirname, '..', '..', '..');
@@ -83,18 +83,22 @@ module.exports.configureBuilder = function(builder, baseDir, options) {
     }
   }
 
-  Object.keys(defaultFirefoxPreferences).forEach(function(pref) {
-    ffOptions.setPreference(pref, defaultFirefoxPreferences[pref]);
-  });
+  if (!firefoxConfig.noDefaultPrefs) {
+    Object.keys(defaultFirefoxPreferences).forEach(function (pref) {
+      ffOptions.setPreference(pref, defaultFirefoxPreferences[pref]);
+    });
+  } else {
+    log.info('Skip setting default preferences for Firefox');
+  }
 
   if (firefoxConfig.disableSafeBrowsing) {
-    Object.keys(disableSafeBrowsingPreferences).forEach(function(pref) {
+    Object.keys(disableSafeBrowsingPreferences).forEach(function (pref) {
       ffOptions.setPreference(pref, disableSafeBrowsingPreferences[pref]);
     });
   }
 
   if (firefoxConfig.disableTrackingProtection) {
-    Object.keys(disableTrackingProtectionPreferences).forEach(function(pref) {
+    Object.keys(disableTrackingProtectionPreferences).forEach(function (pref) {
       ffOptions.setPreference(pref, disableTrackingProtectionPreferences[pref]);
     });
   }
@@ -140,6 +144,7 @@ module.exports.configureBuilder = function(builder, baseDir, options) {
   ffOptions.setPreference('devtools.chrome.enabled', true);
 
   const userPrefs = util.toArray(firefoxConfig.preference);
+  log.debug('Set Firefox preference %j', userPrefs);
   for (const pref of userPrefs) {
     const name = pref.substr(0, pref.indexOf(':'));
     let value = pref.substr(pref.indexOf(':') + 1);
@@ -163,7 +168,7 @@ module.exports.configureBuilder = function(builder, baseDir, options) {
     get(firefoxConfig, 'developer') ? firefox.Channel.AURORA : undefined
   ];
 
-  firefoxTypes = firefoxTypes.filter(function(n) {
+  firefoxTypes = firefoxTypes.filter(function (n) {
     return n !== undefined;
   });
 

package/lib/firefox/webdriver/firefox.js

@@ -206,13 +206,12 @@ class Firefox {
           ]) {
             // You can configure to not use content and perceptual.
             if (results[i].visualMetrics[progress]) {
-              results[i].visualMetrics[
-                progress
-              ] = util.adjustVisualProgressTimestamps(
-                results[i].visualMetrics[progress],
-                geckoProfile.meta.startTime,
-                firstFrameStartTime
-              );
+              results[i].visualMetrics[progress] =
+                util.adjustVisualProgressTimestamps(
+                  results[i].visualMetrics[progress],
+                  geckoProfile.meta.startTime,
+                  firstFrameStartTime
+                );
             }
           }
           geckoProfile.meta.visualMetrics = results[i].visualMetrics;

package/lib/safari/webdriver/builder.js

@@ -1,7 +1,7 @@
 'use strict';
 const s = require('selenium-webdriver/safari');
 
-module.exports.configureBuilder = async function(builder, baseDir, options) {
+module.exports.configureBuilder = async function (builder, baseDir, options) {
   const safariOptions = options.safari || {};
   builder
     .getCapabilities()

package/lib/support/browserScript.js

@@ -80,7 +80,7 @@ function generateScriptObject(name, path, contents) {
         content: null,
         isAsync:
           Object.getPrototypeOf(scriptAndMetadataObject.function) ===
-          Object.getPrototypeOf(async function() {})
+          Object.getPrototypeOf(async function () {})
       };
     }
   } catch (error) {

package/lib/support/cli.js

@@ -282,6 +282,12 @@ module.exports.parseCommandLine = function parseCommandLine() {
       describe: 'Collect Chromes console log and save to disk.',
       group: 'chrome'
     })
+    .option('chrome.noDefaultOptions', {
+      type: 'boolean',
+      describe:
+        'Prevent Browsertime from setting its default options for Chrome',
+      group: 'chrome'
+    })
     .option('cpu', {
       type: 'boolean',
       describe:
@@ -483,6 +489,12 @@ module.exports.parseCommandLine = function parseCommandLine() {
       type: 'boolean',
       group: 'firefox'
     })
+    .option('firefox.noDefaultPrefs', {
+      describe: 'Prevents browsertime from setting its default preferences.',
+      default: false,
+      type: 'boolean',
+      group: 'firefox'
+    })
     .option('firefox.disableSafeBrowsing', {
       describe: 'Disable safebrowsing.',
       default: true,

package/lib/support/engineUtils.js

@@ -4,7 +4,7 @@ const path = require('path');
 const dayjs = require('dayjs');
 const util = require('../support/util');
 const log = require('intel').getLogger('browsertime');
-const AsyncFunction = Object.getPrototypeOf(async function() {}).constructor;
+const AsyncFunction = Object.getPrototypeOf(async function () {}).constructor;
 
 module.exports = {
   loadPrePostScripts(scripts) {

package/lib/support/getViewPort.js

@@ -25,7 +25,7 @@ const sizeMap = {
   'iPad Pro': '1024x1366'
 };
 
-module.exports = function(options) {
+module.exports = function (options) {
   // you cannot set the width/height for phone so just keep the viewport undefined
   if (isAndroidConfigured(options)) {
     return;

package/lib/support/har/index.js

@@ -97,20 +97,19 @@ function addMetaToHAR(index, harPage, url, browserScript, options) {
       ? options.resultURL
       : options.resultURL + '/';
     if (options.screenshot) {
-      _meta.screenshot = `${base}${pathToFolder(
-        url,
-        options
-      )}screenshots/${index + 1}/afterPageCompleteCheck.${
-        options.screenshotParams.type
-      }`;
+      _meta.screenshot = `${base}${pathToFolder(url, options)}screenshots/${
+        index + 1
+      }/afterPageCompleteCheck.${options.screenshotParams.type}`;
     }
     if (options.video) {
-      _meta.video = `${base}${pathToFolder(url, options)}video/${index +
-        1}.mp4`;
+      _meta.video = `${base}${pathToFolder(url, options)}video/${
+        index + 1
+      }.mp4`;
     }
     if (options.chrome && options.chrome.timeline) {
-      _meta.timeline = `${base}${pathToFolder(url, options)}trace-${index +
-        1}.json.gz`;
+      _meta.timeline = `${base}${pathToFolder(url, options)}trace-${
+        index + 1
+      }.json.gz`;
     }
   }
   if (browserScript && browserScript.pageinfo) {
@@ -129,7 +128,7 @@ function jsonifyVisualProgress(visualProgress) {
 }
 
 module.exports = {
-  addBrowser: function(har, name, version, comment) {
+  addBrowser: function (har, name, version, comment) {
     merge(har.log, {
       browser: {
         name,
@@ -145,7 +144,7 @@ module.exports = {
     return har;
   },
 
-  addCreator: function(har, comment) {
+  addCreator: function (har, comment) {
     merge(har.log, {
       creator: {
         name: 'Browsertime',
@@ -161,7 +160,7 @@ module.exports = {
     return har;
   },
 
-  getFullyLoaded: function(har) {
+  getFullyLoaded: function (har) {
     const fullyLoaded = [];
     const entries = Array.from(har.log.entries);
 
@@ -190,7 +189,7 @@ module.exports = {
     return fullyLoaded;
   },
 
-  mergeHars: function(hars) {
+  mergeHars: function (hars) {
     if (isEmpty(hars)) {
       return undefined;
     }

package/lib/support/pathToFolder.js

@@ -10,7 +10,7 @@ function toSafeKey(key) {
   return key.replace(/[.~ /+|,:?&%–)(]|%7C/g, '-');
 }
 
-module.exports = function(url, options) {
+module.exports = function (url, options) {
   if (options.useSameDir) {
     return '';
   } else {
@@ -31,19 +31,13 @@ module.exports = function(url, options) {
 
       if (useHash && !isEmpty(parsedUrl.hash)) {
         const md5 = crypto.createHash('md5'),
-          hash = md5
-            .update(parsedUrl.hash)
-            .digest('hex')
-            .substring(0, 8);
+          hash = md5.update(parsedUrl.hash).digest('hex').substring(0, 8);
         urlSegments.push('hash-' + hash);
       }
 
       if (!isEmpty(parsedUrl.search)) {
         const md5 = crypto.createHash('md5'),
-          hash = md5
-            .update(parsedUrl.search)
-            .digest('hex')
-            .substring(0, 8);
+          hash = md5.update(parsedUrl.search).digest('hex').substring(0, 8);
         urlSegments.push('query-' + hash);
       }
 
@@ -65,7 +59,7 @@ module.exports = function(url, options) {
 
     pathSegments.push('data');
 
-    pathSegments.forEach(function(segment, index) {
+    pathSegments.forEach(function (segment, index) {
       if (segment) {
         pathSegments[index] = segment.replace(
           /[^-a-z0-9_.\u0621-\u064A]/gi,

package/lib/support/preURL.js

@@ -3,7 +3,7 @@
 const log = require('intel').getLogger('browsertime');
 const delay = ms => new Promise(res => setTimeout(res, ms));
 
-module.exports = async function(browser, options) {
+module.exports = async function (browser, options) {
   log.info('Accessing preURL %s', options.preURL);
   await browser.loadAndWait(options.preURL);
   await delay(options.preURLDelay ? options.preURLDelay : 1500);

package/lib/support/setResourceTimingBufferSize.js

@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = async function(startURL, driver, size) {
+module.exports = async function (startURL, driver, size) {
   await driver.get(startURL);
   await driver.executeScript(
     `window.performance.setResourceTimingBufferSize(${size});`

package/lib/support/statistics.js

@@ -137,7 +137,7 @@ class Statistics {
           stats.stddev() / Math.sqrt(stats.length).toFixed(decimals)
         ) // "standard deviation of the mean"
       };
-      percentiles.forEach(function(p) {
+      percentiles.forEach(function (p) {
         let name = percentileName(p);
         node[name] = parseFloat(stats.percentile(p).toFixed(decimals));
       });

package/lib/support/stop.js

@@ -3,7 +3,7 @@
 const execa = require('execa');
 const log = require('intel').getLogger('browsertime');
 
-module.exports = async function(processName) {
+module.exports = async function (processName) {
   const scriptArgs = ['-9', processName];
 
   log.debug('Kill all processes ' + processName);

package/lib/support/storageManager.js

@@ -17,9 +17,7 @@ const unlink = promisify(fs.unlink);
 const mkdir = promisify(fs.mkdir);
 
 const defaultDir = 'browsertime-results';
-let timestamp = dayjs()
-  .format()
-  .replace(/:/g, '');
+let timestamp = dayjs().format().replace(/:/g, '');
 
 function pathNameFromUrl(url) {
   const parsedUrl = urlParser.parse(url),
@@ -29,10 +27,7 @@ function pathNameFromUrl(url) {
 
   if (!isEmpty(parsedUrl.search)) {
     const md5 = crypto.createHash('md5'),
-      hash = md5
-        .update(parsedUrl.search)
-        .digest('hex')
-        .substring(0, 8);
+      hash = md5.update(parsedUrl.search).digest('hex').substring(0, 8);
     pathSegments.push('query-' + hash);
   }
 
@@ -115,18 +110,18 @@ class StorageManager {
   }
 
   async gzip(inputFile, outputFile, removeInput) {
-    const promise = new Promise(function(resolve, reject) {
+    const promise = new Promise(function (resolve, reject) {
       const gzip = zlib.createGzip();
       const input = fs.createReadStream(inputFile);
       const out = fs.createWriteStream(outputFile);
-      out.on('finish', function() {
+      out.on('finish', function () {
         if (removeInput) {
           unlink(inputFile).then(() => resolve());
         } else {
           resolve();
         }
       });
-      out.on('error', function(e) {
+      out.on('error', function (e) {
         log.error('Could not gzip %s to %s', inputFile, outputFile, e);
         reject();
       });

package/lib/video/postprocessing/finetune/addTextToVideo.js

@@ -15,7 +15,7 @@ function isSmallish(options) {
   );
 }
 
-module.exports = async function(
+module.exports = async function (
   inputFile,
   outputFile,
   videoMetrics,

package/lib/video/postprocessing/finetune/convertFps.js

@@ -3,7 +3,7 @@
 const execa = require('execa');
 const log = require('intel').getLogger('browsertime.video');
 
-module.exports = async function(src, dest, framerate) {
+module.exports = async function (src, dest, framerate) {
   const scriptArgs = ['-nostdin', '-i', src, '-r', framerate, dest];
   log.info('Converting video to %s fps', framerate);
   return execa('ffmpeg', scriptArgs);

package/lib/video/postprocessing/finetune/getFont.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const fs = require('fs');
-module.exports = function(options) {
+module.exports = function (options) {
   // If the font is not part of the params and we're on macOS
   // we check that SFNSMono.ttf is available
   if (!options.videoParams.fontPath && process.platform === 'darwin') {

package/lib/video/postprocessing/finetune/getTimingMetrics.js

@@ -26,11 +26,12 @@ function get(metric, metricName, pos, options) {
   }
 
   // H-h/8
-  return `drawtext=${fontFile}enable='between(t,${Number(metric) /
-    1000},30)':x=(w-tw)/2: y=H-${pos}-h/${x}:fontcolor=white:fontsize=h/${fontSize}:box=1:boxcolor=0x000000AA:boxborderw=2:text='${metricName} ${metric}'`;
+  return `drawtext=${fontFile}enable='between(t,${
+    Number(metric) / 1000
+  },30)':x=(w-tw)/2: y=H-${pos}-h/${x}:fontcolor=white:fontsize=h/${fontSize}:box=1:boxcolor=0x000000AA:boxborderw=2:text='${metricName} ${metric}'`;
 }
 
-module.exports = function(videoMetrics, timingMetrics, options) {
+module.exports = function (videoMetrics, timingMetrics, options) {
   let text = '';
   const vm = videoMetrics.visualMetrics;
   const startPosition = 'h/10';
@@ -59,7 +60,7 @@ module.exports = function(videoMetrics, timingMetrics, options) {
     });
   }
 
-  metricsAndValues.sort(function(a, b) {
+  metricsAndValues.sort(function (a, b) {
     return b.value - a.value;
   });
 

package/lib/video/postprocessing/finetune/index.js

@@ -12,7 +12,7 @@ const rename = promisify(fs.rename);
 const unlink = promisify(fs.unlink);
 const defaults = require('../../defaults');
 
-module.exports = async function(
+module.exports = async function (
   videoDir,
   videoPath,
   index,

package/lib/video/postprocessing/finetune/removeOrange.js

@@ -3,7 +3,7 @@
 const execa = require('execa');
 const log = require('intel').getLogger('browsertime.video');
 
-module.exports = async function(
+module.exports = async function (
   inputFile,
   outputFile,
   newStart,

package/lib/video/postprocessing/visualmetrics/extraMetrics.js

@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = function(metrics) {
+module.exports = function (metrics) {
   const videoMetrics = {};
   if (!metrics.VisualReadiness) {
     metrics.VisualReadiness =

package/lib/video/postprocessing/visualmetrics/getVideoMetrics.js

@@ -5,7 +5,7 @@ const path = require('path');
 const visualMetrics = require('./visualMetrics');
 const extraMetrics = require('./extraMetrics');
 
-module.exports = async function(
+module.exports = async function (
   videoDir,
   filmstripDir,
   videoPath,

package/lib/video/screenRecording/desktop/ffmpegRecorder.js

@@ -38,9 +38,9 @@ async function buildX11FfmpegArgs({
       '-r',
       30,
       '-filter:v',
-      `crop=${widthAndHeight[0] * devicePixelRatio}:${widthAndHeight[1] *
-        devicePixelRatio}:${offset.x * devicePixelRatio}:${offset.y *
-        devicePixelRatio}`,
+      `crop=${widthAndHeight[0] * devicePixelRatio}:${
+        widthAndHeight[1] * devicePixelRatio
+      }:${offset.x * devicePixelRatio}:${offset.y * devicePixelRatio}`,
       '-codec:v',
       'libx264rgb',
       '-threads',

package/lib/video/screenRecording/desktop/osx/getSPDisplaysDataType.js

@@ -2,7 +2,7 @@
 
 const execa = require('execa');
 
-module.exports = async function() {
+module.exports = async function () {
   const output = await execa.command('system_profiler SPDisplaysDataType', {
     shell: true
   });

package/lib/video/screenRecording/desktop/osx/getScreen.js

@@ -3,7 +3,7 @@
 const execa = require('execa');
 const log = require('intel').getLogger('browsertime.video');
 
-module.exports = async function() {
+module.exports = async function () {
   const scriptArgs = [
     '-hide_banner',
     '-f',

package/lib/video/screenRecording/firefox/firefoxWindowRecorder.js

@@ -81,7 +81,7 @@ function writeFrameDurationsToFile(directoryName, imageFiles) {
     const stream = fs.createWriteStream(
       path.join(directoryName, 'durations.txt')
     );
-    stream.once('open', function() {
+    stream.once('open', function () {
       stream.write(
         "file '" + path.join(directoryName, imageFiles[0].filename) + "'\n"
       );
@@ -120,7 +120,7 @@ async function generateVideo(destination, recordingDirectoryName) {
     imageFiles.push({ filename: newFilename, offset: offset });
   });
 
-  imageFiles.sort(function(a, b) {
+  imageFiles.sort(function (a, b) {
     if (a.filename < b.filename) return -1;
     if (a.filename > b.filename) return 1;
     return 0;

package/lib/video/screenRecording/setOrangeBackground.js

@@ -2,7 +2,7 @@
 
 const log = require('intel').getLogger('browsertime.video');
 const { until, By } = require('selenium-webdriver');
-module.exports = async function(driver, options) {
+module.exports = async function (driver, options) {
   log.debug('Add orange color');
   // We tried other ways for Android (access an orange page)
   // That works fine ... but break scripts

package/package.json

@@ -1,12 +1,12 @@
 {
   "description": "Browsertime",
-  "version": "14.5.0",
+  "version": "14.8.0",
   "bin": "./bin/browsertime.js",
   "dependencies": {
     "@sitespeed.io/throttle": "3.0.0",
     "@devicefarmer/adbkit": "2.11.3",
     "btoa": "1.2.1",
-    "@sitespeed.io/chromedriver": "94.0.4606-41",
+    "@sitespeed.io/chromedriver": "95.0.4638-17",
     "chrome-har": "0.11.12",
     "chrome-remote-interface": "0.31.0",
     "dayjs": "1.10.5",
@@ -22,8 +22,8 @@
     "lodash.merge": "4.6.2",
     "lodash.pick": "4.4.0",
     "lodash.set": "4.3.2",
-    "selenium-webdriver": "4.0.0-rc-1",
-    "@sitespeed.io/edgedriver": "93.0.910-5",
+    "selenium-webdriver": "4.0.0",
+    "@sitespeed.io/edgedriver": "95.0.1020-30",
     "@sitespeed.io/geckodriver": "0.29.1-2",
     "@sitespeed.io/tracium": "0.3.3",
     "speedline-core": "1.4.3",
@@ -34,15 +34,15 @@
     "jimp": "0.16.1"
   },
   "devDependencies": {
-    "bluebird": "3.5.5",
-    "chai": "4.2.0",
+    "bluebird": "3.7.2",
+    "chai": "4.3.4",
     "chai-as-promised": "7.1.1",
-    "eslint": "6.2.2",
-    "eslint-config-prettier": "6.1.0",
-    "eslint-plugin-prettier": "3.1.0",
+    "eslint": "8.0.1",
+    "eslint-config-prettier": "8.3.0",
+    "eslint-plugin-prettier": "4.0.0",
     "longjohn": "0.2.12",
     "mocha": "6.2.0",
-    "prettier": "1.18.2"
+    "prettier": "2.4.1"
   },
   "engines": {
     "node": ">=10.13.0"