browsertime 14.4.0 → 14.7.0

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.4.0",
+  "version": "14.7.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,7 +22,7 @@
     "lodash.merge": "4.6.2",
     "lodash.pick": "4.4.0",
     "lodash.set": "4.3.2",
-    "selenium-webdriver": "4.0.0-rc-1",
+    "selenium-webdriver": "4.0.0",
     "@sitespeed.io/edgedriver": "93.0.910-5",
     "@sitespeed.io/geckodriver": "0.29.1-2",
     "@sitespeed.io/tracium": "0.3.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"

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

@@ -1,314 +0,0 @@
-'use strict';
-
-const log = require('intel').getLogger('browsertime.command.mouse');
-const webdriver = require('selenium-webdriver');
-
-class ClickAndHold {
-  constructor(browser) {
-    this.driver = browser.getDriver();
-    this.actions = this.driver.actions({ async: true });
-  }
-
-  /**
-   * Click and hold an element that matches a XPath selector.
-   * @param {string} xpath
-   * @returns {Promise} Promise object represents when mouse is pressed.
-   * @throws Will throw an error if the element is not found.
-   */
-  async byXpath(xpath) {
-    try {
-      const element = await this.driver.findElement(webdriver.By.xpath(xpath));
-      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);
-      throw Error('Could not click and hold on element with xpath ' + xpath);
-    }
-  }
-
-  /**
-   * Click and hold an element at the cursor's position.
-   * @param {string} xpath
-   * @returns {Promise} Promise object represents when mouse is pressed.
-   * @throws Will throw an error if action cannot be performed.
-   */
-  async atCursor() {
-    try {
-      return this.actions
-        .move({ origin: webdriver.Origin.POINTER })
-        .press()
-        .perform();
-    } catch (e) {
-      log.error('Could not click and hold at cursor');
-      log.verbose(e);
-      throw Error('Could not click and hold at cursor');
-    }
-  }
-
-  /**
-   * Click and hold an element at the given coordinates.
-   * @param {string} xpath
-   * @returns {Promise} Promise object represents when mouse is pressed.
-   * @throws Will throw an error if action cannot be performed.
-   */
-  async atPosition(xPos, yPos) {
-    try {
-      return this.actions
-        .move({ x: xPos, y: yPos, origin: webdriver.Origin.VIEWPORT })
-        .press()
-        .perform();
-    } catch (e) {
-      log.error('Could not click and hold at position (%d,%d)', xPos, yPos);
-      log.verbose(e);
-      throw Error(
-        'Could not click and hold at position (' + xPos + ',' + yPos + ')'
-      );
-    }
-  }
-
-  /**
-   * Release mouse on element that matches the specified Xpath.
-   * @param {string} xpath
-   * @returns {Promise} Promise object represents when mouse is released.
-   * @throws Will throw an error if action cannot be performed.
-   */
-  async releaseAtXpath(xpath) {
-    try {
-      const element = await this.driver.findElement(webdriver.By.xpath(xpath));
-      return this.actions
-        .move({ origin: element })
-        .release()
-        .perform();
-    } catch (e) {
-      log.error('Could not release on xpath %s', xpath);
-      log.verbose(e);
-      throw Error('Could not release on xpath ' + xpath);
-    }
-  }
-
-  /**
-   * Release mouse at specified coordinates.
-   * @param {string} xpath
-   * @returns {Promise} Promise object represents when mouse is released.
-   * @throws Will throw an error if action cannot be performed.
-   */
-  async releaseAtPosition(xPos, yPos) {
-    try {
-      return this.actions
-        .move({ x: xPos, y: yPos, origin: webdriver.Origin.VIEWPORT })
-        .release()
-        .perform();
-    } catch (e) {
-      log.error('Could not release at position (%d,%d)', xPos, yPos);
-      log.verbose(e);
-      throw Error('Could not release at position (' + xPos + ',' + yPos + ')');
-    }
-  }
-}
-
-class SingleClick {
-  constructor(browser, pageCompleteCheck) {
-    this.browser = browser;
-    this.actions = this.browser.getDriver().actions({ async: true });
-    this.pageCompleteCheck = pageCompleteCheck;
-  }
-
-  /**
-   * Perform mouse single click on an element matches a XPath selector.
-   * @param {string} xpath
-   * @returns {Promise} Promise object represents when the element has been clicked.
-   * @throws Will throw an error if the element is not found.
-   */
-  async byXpath(xpath, options) {
-    try {
-      const element = await this.browser
-        .getDriver()
-        .findElement(webdriver.By.xpath(xpath));
-      await this.actions.click(element).perform();
-      if (options && 'wait' in options && options.wait === true) {
-        return this.browser.extraWait(this.pageCompleteCheck);
-      }
-    } catch (e) {
-      log.error('Could not single click on element with xpath %s', xpath);
-      log.verbose(e);
-      throw Error('Could not single click on element with xpath ' + xpath);
-    }
-  }
-
-  /**
-   * Perform mouse single click at the cursor's position.
-   * @param {string} xpath
-   * @returns {Promise} Promise object represents when double click occurs.
-   * @throws Will throw an error if double click cannot be performed.
-   */
-  async atCursor(options) {
-    try {
-      await this.actions.click().perform();
-      if (options && 'wait' in options && options.wait === true) {
-        return this.browser.extraWait(this.pageCompleteCheck);
-      }
-    } catch (e) {
-      log.error('Could not perform single click');
-      log.verbose(e);
-      throw Error('Could not perform single click');
-    }
-  }
-}
-
-class DoubleClick {
-  constructor(browser, pageCompleteCheck) {
-    this.browser = browser;
-    this.actions = this.browser.getDriver().actions({ async: true });
-    this.pageCompleteCheck = pageCompleteCheck;
-  }
-
-  /**
-   * Perform mouse double click on an element matches a XPath selector.
-   * @param {string} xpath
-   * @returns {Promise} Promise object represents when the element has been double clicked.
-   * @throws Will throw an error if the element is not found.
-   */
-  async byXpath(xpath, options) {
-    try {
-      const element = await this.browser
-        .getDriver()
-        .findElement(webdriver.By.xpath(xpath));
-      await this.actions.doubleClick(element).perform();
-      if (options && 'wait' in options && options.wait === true) {
-        return this.browser.extraWait(this.pageCompleteCheck);
-      }
-    } catch (e) {
-      log.error('Could not double click on element with xpath %s', xpath);
-      log.verbose(e);
-      throw Error('Could not double click on element with xpath ' + xpath);
-    }
-  }
-
-  /**
-   * Perform mouse double click at the cursor's position.
-   * @param {string} xpath
-   * @returns {Promise} Promise object represents when double click occurs.
-   * @throws Will throw an error if double click cannot be performed.
-   */
-  async atCursor(options) {
-    try {
-      await this.actions.doubleClick().perform();
-      if (options && 'wait' in options && options.wait === true) {
-        return this.browser.extraWait(this.pageCompleteCheck);
-      }
-    } catch (e) {
-      log.error('Could not perform double click');
-      log.verbose(e);
-      throw Error('Could not perform double click');
-    }
-  }
-}
-
-class ContextClick {
-  constructor(browser) {
-    this.driver = browser.getDriver();
-    this.actions = this.driver.actions({ async: true });
-  }
-
-  /**
-   * Perform ContextClick on an element that matches a XPath selector.
-   * @param {string} xpath
-   * @returns {Promise} Promise object represents when context click occurs.
-   * @throws Will throw an error if the element is not found
-   */
-  async byXpath(xpath) {
-    try {
-      const element = await this.driver.findElement(webdriver.By.xpath(xpath));
-      return this.actions.contextClick(element).perform();
-    } catch (e) {
-      log.error('Could not context click on element with xpath %s', xpath);
-      log.verbose(e);
-      throw Error('Could not context click on element with xpath ' + xpath);
-    }
-  }
-
-  /**
-   * Perform ContextClick at the cursor's position.
-   * @param {string} xpath
-   * @returns {Promise} Promise object represents when context click occurs.
-   * @throws Will throw an error if context click cannot be performed.
-   */
-  async atCursor() {
-    try {
-      return this.actions.contextClick().perform();
-    } catch (e) {
-      log.error('Could not perform context click');
-      log.verbose(e);
-      throw Error('Could not perform context click');
-    }
-  }
-}
-
-class MouseMove {
-  constructor(browser) {
-    this.driver = browser.getDriver();
-    this.actions = this.driver.actions({ async: true });
-  }
-
-  /**
-   * Move mouse to an element that matches a XPath selector.
-   * @param {string} xpath
-   * @returns {Promise} Promise object represents when the mouse has moved
-   * @throws Will throw an error if the element is not found
-   */
-  async byXpath(xpath) {
-    try {
-      const element = await this.driver.findElement(webdriver.By.xpath(xpath));
-      return this.actions.move({ origin: element }).perform();
-    } catch (e) {
-      log.error('Could not find element by xpath %s', xpath);
-      log.verbose(e);
-      throw Error('Could not find element by xpath ' + xpath);
-    }
-  }
-
-  /**
-   * Move mouse to a position
-   * @param {number} xPos, {number} yPos
-   * @returns {Promise} Promise object represents when the mouse has moved
-   * @throws Will throw an error if the element is not found
-   */
-  async toPosition(xPos, yPos) {
-    try {
-      return this.actions.move({ x: xPos, y: yPos }).perform();
-    } catch (e) {
-      log.error('Could not move mouse to position.');
-      log.verbose(e);
-      throw Error('Could not move mouse to position.');
-    }
-  }
-
-  /**
-   * Move mouse by an offset
-   * @param {number} xOffset, {number} yOffset
-   * @returns {Promise} Promise object represents when the mouse has moved
-   * @throws Will throw an error if the element is not found
-   */
-  async byOffset(xOffset, yOffset) {
-    try {
-      return this.actions
-        .move({ x: xOffset, y: yOffset, origin: webdriver.Origin.POINTER })
-        .perform();
-    } catch (e) {
-      log.error('Could not move mouse by offset');
-      log.verbose(e);
-      throw Error('Could not move mouse by offset');
-    }
-  }
-}
-
-module.exports = {
-  SingleClick,
-  DoubleClick,
-  ClickAndHold,
-  ContextClick,
-  MouseMove
-};