browsertime 14.18.1 → 14.20.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## 14.20.0 - 2022-02-07
+### Added
+* Docker container for both amd64 and arm64.
+
+## 14.19.2 - 2022-02-05
+### Fixed
+* Upgraded to Geckodriver 0.30.0 [#1710](https://github.com/sitespeedio/browsertime/pull/1710).
+* Upgraded to Chromedriver that always looks for Chromedriver in PATH for arm64.
+* Fixed getting Geckoprofile on Android when you do not specify Android package [#1712](https://github.com/sitespeedio/browsertime/pull/1712).
+## 14.19.1 - 2022-02-03
+### Fixed
+* Remove the old fix for setting CPUThrottling, that works now in Chrome without that fix [#1708](https://github.com/sitespeedio/browsertime/pull/1708).
+* Do not set binary for Firefox when run on Android [#1706](https://github.com/sitespeedio/browsertime/pull/1706).
+
+## 14.19.0 - 2022-02-02
+
+### Added 
+* Chrome and Chromedriver 98 [#1704](https://github.com/sitespeedio/browsertime/pull/1704).
+
+### Fixed
+* Fix so we get the Firefox version on Android [#1704](https://github.com/sitespeedio/browsertime/pull/1704).
+
 ## 14.18.1 - 2022-01-24
 ### Fixed
 * If loading a URL failed and we retry and we logged that as an info message, but you as a user only need to know if it fails after X retries. The log message now logs at debug level [#1701](https://github.com/sitespeedio/browsertime/pull/1701).

package/lib/chrome/webdriver/setupChromiumOptions.js

@@ -25,14 +25,6 @@ module.exports = function (seleniumOptions, browserOptions, options, baseDir) {
     seleniumOptions.addArguments('--disable-setuid-sandbox');
   }
 
-  // Running CPU throttling  in Chrome desktop is broken. It works in
-  // headless mode
-  if (browserOptions.CPUThrottlingRate) {
-    seleniumOptions.addArguments(
-      '--disable-features=IsolateOrigins,site-per-process'
-    );
-  }
-
   if (options.xvfb && (options.xvfb === true || options.xvfb === 'true')) {
     seleniumOptions.addArguments('--disable-gpu');
   }

package/lib/core/engine/index.js

@@ -345,7 +345,19 @@ class Engine {
           // Just swallow
         }
       }
+    } // We don't have a HAR for Firefox on Android
+    else if (options.browser === 'firefox' && options.android) {
+      for (let result of totalResult) {
+        result.info.browser.name = 'Firefox';
+        try {
+          const vString = result.info.browser.userAgent.split('Firefox/')[1];
+          result.info.browser.version = vString;
+        } catch (e) {
+          // Just swallow
+        }
+      }
     }
+
     util.logResultLogLine(totalResult);
 
     if (failures.length > 0) {

package/lib/firefox/geckoProfiler.js

@@ -3,6 +3,7 @@ const log = require('intel').getLogger('browsertime.firefox');
 const geckoProfilerDefaults = require('./settings/geckoProfilerDefaults');
 const { isAndroidConfigured, Android } = require('../android');
 const path = require('path');
+const get = require('lodash.get');
 const pathToFolder = require('../support/pathToFolder');
 const { BrowserError } = require('../support/errors');
 const delay = ms => new Promise(res => setTimeout(res, ms));
@@ -103,7 +104,11 @@ class GeckoProfiler {
 
     let deviceProfileFilename = destinationFilename;
     if (isAndroidConfigured(options)) {
-      deviceProfileFilename = `/sdcard/Android/data/${this.firefoxConfig.android.package}/files/geckoProfile-${index}.json`;
+      deviceProfileFilename = `/sdcard/Android/data/${get(
+        this.firefoxConfig,
+        'android.package',
+        'org.mozilla.firefox'
+      )}/files/geckoProfile-${index}.json`;
     }
 
     // Must use String.raw or else the backslashes on Windows will be escapes.

package/lib/firefox/webdriver/builder.js

@@ -172,9 +172,14 @@ module.exports.configureBuilder = function (builder, baseDir, options) {
     return n !== undefined;
   });
 
-  ffOptions.setBinary(
-    firefoxTypes.length > 0 ? firefoxTypes[0] : firefox.Channel.RELEASE
-  );
+  // Do not set binary when using Android
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=1751196
+
+  if (!options.android) {
+    ffOptions.setBinary(
+      firefoxTypes.length > 0 ? firefoxTypes[0] : firefox.Channel.RELEASE
+    );
+  }
 
   ffOptions.addArguments('-no-remote');
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "description": "Browsertime",
-  "version": "14.18.1",
+  "version": "14.20.0",
   "bin": "./bin/browsertime.js",
   "dependencies": {
     "@sitespeed.io/throttle": "3.0.0",
     "@devicefarmer/adbkit": "2.11.3",
     "btoa": "1.2.1",
-    "@sitespeed.io/chromedriver": "97.0.4692-7b",
+    "@sitespeed.io/chromedriver": "98.0.4758-48b",
     "chrome-har": "0.12.0",
     "chrome-remote-interface": "0.31.0",
     "dayjs": "1.10.7",
@@ -24,7 +24,7 @@
     "lodash.set": "4.3.2",
     "selenium-webdriver": "4.1.0",
     "@sitespeed.io/edgedriver": "95.0.1020-30",
-    "@sitespeed.io/geckodriver": "0.29.1-3",
+    "@sitespeed.io/geckodriver": "0.30.0",
     "@sitespeed.io/tracium": "0.3.3",
     "speedline-core": "1.4.3",
     "@cypress/xvfb": "1.2.4",