browsertime 16.11.4 → 16.13.1

package/CHANGELOG.md

@@ -1,8 +1,27 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## 16.13.1 - 2022-08-10
+### Fixed
+* Make sure that Android id is always picked up from the phone if tests run on Android [#1826](https://github.com/sitespeedio/browsertime/pull/1826).
+
+## 16.13.0 - 2022-08-08
+### Added
+* Upgraded to Edgedriver 104.
+
+### Fixed
+* Upgraded to Selenium 4.3.1 [#1824](https://github.com/sitespeedio/browsertime/pull/1824).
+* Upgraded Chrome reomte interface to 0.31.3 [#1825](https://github.com/sitespeedio/browsertime/pull/1825)
+## 16.12.0 - 2022-08-06
+### Added
+* Upgraded to Chrome 104, Edge 104, Firefox 103 in the Docker container.
+* Upgraded to Chromedriver 104.
+
+### Fixed
+* Remove old Firefox on Android workaround for orange frame [#1821](https://github.com/sitespeedio/browsertime/pull/1821), thank you [Sean Feng](https://github.com/sefeng211) for the PR.
+
 ## 16.11.4 - 2022-07-17
 ### Fixed
-* Automatically add white nbackground between --preURL and the URL that you wanna test. This makes visual metrics usable when using preURL. [#1819](https://github.com/sitespeedio/browsertime/pull/1819)
+* Automatically add white background between --preURL and the URL that you wanna test. This makes visual metrics usable when using preURL. [#1819](https://github.com/sitespeedio/browsertime/pull/1819)
 
 ## 16.11.3 - 2022-07-14
 

package/lib/android/index.js

@@ -161,13 +161,16 @@ class Android {
     const name = (await adb.util.readAll(rawName)).toString().trim();
     const rawDevice = await this._runCommand(`getprop ro.product.device`);
     const device = (await adb.util.readAll(rawDevice)).toString().trim();
+    const rawId = await this._runCommand(`getprop ro.serialno`);
+    const id = (await adb.util.readAll(rawId)).toString().trim();
+
     const rawRelease = await this._runCommand(
       `getprop ro.build.version.release `
     );
     const androidVersion = (await adb.util.readAll(rawRelease))
       .toString()
       .trim();
-    return { model, name, device, androidVersion };
+    return { model, name, device, androidVersion, id };
   }
 
   async pullNetLog(destination) {

package/lib/chrome/webdriver/builder.js

@@ -8,7 +8,6 @@ const isEmpty = require('lodash.isempty');
 const get = require('lodash.get');
 const setupChromiumOptions = require('./setupChromiumOptions');
 
-let hasConfiguredChromeDriverService = false;
 /**
  * Configure a WebDriver builder based on the specified options.
  * @param builder
@@ -17,34 +16,31 @@ let hasConfiguredChromeDriverService = false;
 module.exports.configureBuilder = function (builder, baseDir, options) {
   const chromeConfig = options.chrome || {};
 
-  if (!hasConfiguredChromeDriverService) {
-    let chromedriverPath = get(chromeConfig, 'chromedriverPath');
-    if (!chromedriverPath) {
-      const chromedriver = require('@sitespeed.io/chromedriver');
-      chromedriverPath = chromedriver.binPath();
-    }
-
-    const serviceBuilder = new chrome.ServiceBuilder(chromedriverPath);
-
-    // Remove the check that matches the Chromedriver version with Chrome version.
-    serviceBuilder.addArguments('--disable-build-check');
-
-    if (options.chrome && options.chrome.chromedriverPort) {
-      serviceBuilder.setPort(options.chrome.chromedriverPort);
-    }
-    if (
-      options.verbose >= 2 ||
-      chromeConfig.enableChromeDriverLog ||
-      chromeConfig.enableVerboseChromeDriverLog
-    ) {
-      serviceBuilder.loggingTo(`${baseDir}/chromedriver.log`);
-      if (options.verbose >= 3 || chromeConfig.enableVerboseChromeDriverLog)
-        serviceBuilder.enableVerboseLogging();
-    }
-    chrome.setDefaultService(serviceBuilder.build());
-    hasConfiguredChromeDriverService = true;
+  let chromedriverPath = get(chromeConfig, 'chromedriverPath');
+  if (!chromedriverPath) {
+    const chromedriver = require('@sitespeed.io/chromedriver');
+    chromedriverPath = chromedriver.binPath();
   }
 
+  const serviceBuilder = new chrome.ServiceBuilder(chromedriverPath);
+
+  // Remove the check that matches the Chromedriver version with Chrome version.
+  serviceBuilder.addArguments('--disable-build-check');
+
+  if (options.chrome && options.chrome.chromedriverPort) {
+    serviceBuilder.setPort(options.chrome.chromedriverPort);
+  }
+  if (
+    options.verbose >= 2 ||
+    chromeConfig.enableChromeDriverLog ||
+    chromeConfig.enableVerboseChromeDriverLog
+  ) {
+    serviceBuilder.loggingTo(`${baseDir}/chromedriver.log`);
+    if (options.verbose >= 3 || chromeConfig.enableVerboseChromeDriverLog)
+      serviceBuilder.enableVerboseLogging();
+  }
+  builder.setChromeService(serviceBuilder);
+
   const proxyPacSettings = pick(options.proxy, ['pac']);
 
   if (!isEmpty(proxyPacSettings)) {

package/lib/video/screenRecording/setOrangeBackground.js

@@ -2,49 +2,12 @@
 
 const log = require('intel').getLogger('browsertime.video');
 const { until, By } = require('selenium-webdriver');
-module.exports = async function (driver, options) {
+module.exports = async function (driver) {
   log.debug('Add orange color');
   // We tried other ways for Android (access an orange page)
   // That works fine ... but break scripts
   // https://github.com/sitespeedio/browsertime/issues/802
-
-  let orangeScript = '';
-
-  if (options.android && options.browser === 'firefox') {
-    orangeScript = `
-        (function() {
-          // Adding this extra layer of white frame fixes
-          // https://bugzilla.mozilla.org/show_bug.cgi?id=1606365
-          // Not clear why it fixes this bug, looks like when
-          // WebRender is enabled, orange frame isn't being
-          // removed correctly if it's the only element
-          // in the document.
-          const white = document.createElement('div');
-          white.id = 'browsertime-white';
-          white.style.position = 'absolute';
-          white.style.top = '0';
-          white.style.left = '0';
-          white.style.width = Math.max(document.documentElement.clientWidth, document.body.clientWidth) + 'px';
-          white.style.height = Math.max(document.documentElement.clientHeight,document.body.clientHeight) + 'px';
-          white.style.backgroundColor = 'white';
-          white.style.zIndex = '2147483647';
-          document.body.appendChild(white);
-          document.body.style.display = '';
-
-          const orange = document.createElement('div');
-          orange.id = 'browsertime-orange';
-          orange.style.position = 'absolute';
-          orange.style.top = '0';
-          orange.style.left = '0';
-          orange.style.width = Math.max(document.documentElement.clientWidth, document.body.clientWidth) + 'px';
-          orange.style.height = Math.max(document.documentElement.clientHeight,document.body.clientHeight) + 'px';
-          orange.style.backgroundColor = '#DE640D';
-          orange.style.zIndex = '2147483647';
-          document.body.appendChild(orange);
-          document.body.style.display = '';
-        })();`;
-  } else {
-    orangeScript = `
+  const orangeScript = `
         (function() {
           const orange = document.createElement('div');
           orange.id = 'browsertime-orange';
@@ -59,7 +22,6 @@ module.exports = async function (driver, options) {
           document.body.appendChild(orange);
           document.body.style.display = '';
         })();`;
-  }
 
   await driver.executeScript(orangeScript);
   // It seems that in some cases the video do not have any orange at the start, so make sure we

package/package.json

@@ -1,18 +1,18 @@
 {
   "description": "Browsertime",
-  "version": "16.11.4",
+  "version": "16.13.1",
   "bin": "./bin/browsertime.js",
   "dependencies": {
     "@cypress/xvfb": "1.2.4",
     "@devicefarmer/adbkit": "2.11.3",
-    "@sitespeed.io/chromedriver": "103.0.5060-24b",
-    "@sitespeed.io/edgedriver": "103.0.1264-37",
+    "@sitespeed.io/chromedriver": "104.0.5112-29",
+    "@sitespeed.io/edgedriver": "104.0.1293-47",
     "@sitespeed.io/geckodriver": "0.31.0-c",
     "@sitespeed.io/throttle": "4.0.1",
     "@sitespeed.io/tracium": "0.3.3",
     "btoa": "1.2.1",
     "chrome-har": "0.13.0",
-    "chrome-remote-interface": "0.31.2",
+    "chrome-remote-interface": "0.31.3",
     "dayjs": "1.11.1",
     "execa": "5.1.1",
     "fast-stats": "0.0.6",
@@ -26,7 +26,7 @@
     "lodash.merge": "4.6.2",
     "lodash.pick": "4.4.0",
     "lodash.set": "4.3.2",
-    "selenium-webdriver": "4.3.0",
+    "selenium-webdriver": "4.3.1",
     "yargs": "17.4.1"
   },
   "optionalDependencies": {