browsertime 17.0.0-beta.3 → 17.0.0

package/CHANGELOG.md

@@ -1,12 +1,42 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
-## 17.0.0 - UNRELEASED
+## 17.0.0 - 2022-02-10
 
 ### Breaking changes
-* We moved the project to be a [pure ESM package](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c) [#1859](https://github.com/sitespeedio/browsertime/pull/1859). That helps us keep up to date with dependencies that already did the move.
+The project was transitioned to a [pure ESM package](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c) [#1859](https://github.com/sitespeedio/browsertime/pull/1859), allowing us to stay current with dependencies that have made the same transition and ensuring the ability to always utilize the latest versions of our dependencies. This is important for us and will make the project easier to maintain.
 
-If you are a command line user, everything will work as before. If you import Browsertime in NodeJS 
-we changed how you do your import.
+
+#### CLI users
+If you are a command line user and use scripting, you will need to do a change to your scripts or add a extra configuration. 
+
+The new browsertime version treat all JavaScript files that ends with *.js* as ESM modules, that means your old script files will not work out of the box. There's a couple of fixes for that:
+
+**The best fix**:
+Change your code so your scripts also follows ESM package. If you have simple scripts you probably just need to change your exports. The old way looked like this:
+
+```
+module.exports = async function(context, commands) {
+...
+}
+```
+
+change that to:
+```
+export default async function (context, commands) {
+...
+}
+```
+
+If you have more complicated scripts, follow the [ESM package guide](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c). 
+
+This is the best fix and will woirk 100% of the time.
+
+**The quick fix**: Rename your *.js* to *.cjs* that way NodeJS will treat your file as a common JS file and everything will just work. For example if you have a file names `login.js` you can rename that to `login.cjs` and make sure you load that new file.
+
+**Another quick fix alternative**: As a last alternative add `--cjs` as a parameter to your test. That way the scripting file will be treated as a commonjs file. This is a hack, so to make sure it works, the user that runs Browsertime need to have write privileges to the folder where you have your scripting files. Browsertime will create a package.json file on the same levels as yoru script file. If you already have a package.json there, it will be overwritten.
+
+#### Non cli users 
+If you import Browsertime in NodeJS we changed how you do your import.
 
 If you use ES modules you can import Browsertime like this:
 ```JavaScript
@@ -24,7 +54,7 @@ Read [Sindre Sorhus Pure ESM package guide](https://gist.github.com/sindresorhus
 
 * We moved to use a new [Visual Metrics script](https://github.com/sitespeedio/browsertime/blob/main/browsertime/visualmetrics-portable.py) as default contributed by [Gregory Mierzwinski](https://github.com/gmierz) that do _not_ use ImageMagick. Mozilla has used this script for many months and we have internally used it in our test infrastructure since it was first released.
 
-If you run Browsertime direct using NodeJs (and not using Docker) you need to install two new Python dependencies OpenCV-Python Numpy.
+If you run Browsertime direct using NodeJs (and not using Docker) you need to install two new Python dependencies `OpenCV-Python Numpy`.
 
 ```
 python -m pip install --user OpenCV-Python Numpy
@@ -33,16 +63,21 @@ python -m pip install --user OpenCV-Python Numpy
 This is pretty cool because it makes dependencies easier to install on all platforms + the script has also been cleaned up so its easier for us to maintain. 
 
 ### Added
-* Chrome and Chromedriver 106 [#1853](https://github.com/sitespeedio/browsertime/pull/1853).
-* Selenium 4.5 [#1852](https://github.com/sitespeedio/browsertime/pull/1852).
-* Updated dependencies:  edgedriver, execa, days, find-up, get-ports, jimp, yargs [#1860](https://github.com/sitespeedio/browsertime/pull/1860)
-* Updated to Chrome 107 in the Docker container.
-* Updated to NodeJS 18 in the Docker container.
-
+* Selenium 4.8.
+* Updated dependencies: execa, days, find-up, get-ports, jimp, yargs [#1860](https://github.com/sitespeedio/browsertime/pull/1860)
+* Updated to Chrome, Firefox and Edge 109 in the Docker container. Also updated all drivers.
+* Updated to NodeJS 18 and Ubuntu 22.04 in the Docker container.
+* Get CPU metrics using Glean on Firefox, thank you [afinder-mozilla](https://github.com/afinder-mozilla) for PR [#1875](https://github.com/sitespeedio/browsertime/pull/1875)
+* Provide active tab id to gecko profiler StartProfiler API in Firefox, thank you [Nazım Can Altınova](https://github.com/canova) for PR [#1874](https://github.com/sitespeedio/browsertime/pull/1874).
+* There's two new methods to switch to frame: `switch.toFrameByXpath(xpath)` and `switch.toFrameBySelector(selector)` [#1880](https://github.com/sitespeedio/browsertime/pull/1880).
+* Add a timeout to gecko profiler gzipping phase, thank you [Nazım Can Altınova](https://github.com/canova) for PR [#1896](https://github.com/sitespeedio/browsertime/pull/1896)
+* Pin CPU freq to fastest for Samsung A51 (if you have a rooted device) [#1895](https://github.com/sitespeedio/browsertime/pull/1895).
 ### Fixed
 * Pause the gecko profiler before starting to collect the profile data, thank you [Nazım Can Altınova](https://github.com/canova) for PR [#1856](https://github.com/sitespeedio/browsertime/pull/1856).
 
-* All Android configurations has been moved to an Android group. That makes it easier when you run --help and can see all Android configuration grouped together. For example `--androidBatteryTemperature` is now `--android.batteryTemperatureLimit`. Old names will still work. [#1865](https://github.com/sitespeedio/browsertime/pull/1865) 
+* All Android configurations has been moved to an Android group. That makes it easier when you run --help and can see all Android configuration grouped together. For example `--androidBatteryTemperature` is now `--android.batteryTemperatureLimit`. Old names will still work but are deprecated [#1865](https://github.com/sitespeedio/browsertime/pull/1865).
+
+* Updated to Chromedriver 110 to work with Android 13 [#1894](https://github.com/sitespeedio/browsertime/pull/1894).
 
 ## 16.17.0 - 2022-09-27
 ### Added

package/bin/browsertime.js

@@ -5,15 +5,15 @@ import set from 'lodash.set';
 import intel from 'intel';
 import { existsSync, mkdirSync } from 'node:fs';
 import { resolve, relative } from 'node:path';
-import Engine from '../lib/core/engine/index.js';
+import { Engine } from '../lib/core/engine/index.js';
 import {
   findAndParseScripts,
   allScriptCategories,
   getScriptsForCategories
 } from '../lib/support/browserScript.js';
-import logging from '../lib/support/logging.js';
+import { configure } from '../lib/support/logging.js';
 import { parseCommandLine } from '../lib/support/cli.js';
-import StorageManager from '../lib/support/storageManager.js';
+import { StorageManager } from '../lib/support/storageManager.js';
 import { loadScript } from '../lib/support/engineUtils.js';
 import { isAndroidConfigured } from '../lib/android/index.js';
 
@@ -154,6 +154,7 @@ async function run(urls, options) {
 }
 
 let cliResult = parseCommandLine();
+configure(cliResult.options);
 
 /*
   Each url can be:
@@ -169,8 +170,7 @@ const tests = [];
 for (const url of cliResult.urls) {
   // for each url, we try to load it as a script, that may contain
   // export a single function or an object containing setUp/test/tearDown functions.
-  let testScript = await loadScript(url);
-
+  let testScript = await loadScript(url, cliResult.options);
   // if the value is an url or a not a single function,  we can return the original value
   if (typeof testScript == 'string' || testScript instanceof AsyncFunction) {
     tests.push(url);
@@ -192,7 +192,4 @@ for (const url of cliResult.urls) {
   // here, url is the filename containing the script, and test the callable.
   tests.push([url, testScript.test]);
 }
-
-logging(cliResult.options);
-
 await run(tests, cliResult.options);

package/bin/browsertimeWebPageReplay.js

@@ -3,8 +3,8 @@ import merge from 'lodash.merge';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 
-import Engine from '../lib/core/engine/index.js';
-import logging from '../lib/support/logging.js';
+import { Engine } from '../lib/core/engine/index.js';
+import { configure as logging } from '../lib/support/logging.js';
 
 async function runBrowsertime() {
   let yargsInstance = yargs(hideBin(process.argv));

package/index.js

@@ -12,5 +12,5 @@ export const browserScripts = {
   findAndParseScripts
 };
 
-export { default as BrowsertimeEngine } from './lib/core/engine/index.js';
-export { default as configureLogging } from './lib/support/logging.js';
+export { Engine as BrowsertimeEngine } from './lib/core/engine/index.js';
+export { configure as configureLogging } from './lib/support/logging.js';

package/lib/android/gnirehtet.js

@@ -3,7 +3,7 @@ import intel from 'intel';
 const log = intel.getLogger('browsertime.gnirehtet');
 const delay = ms => new Promise(response => setTimeout(response, ms));
 
-class Gnirehtet {
+export class Gnirehtet {
   constructor(options) {
     this.options = options;
   }
@@ -65,4 +65,3 @@ class Gnirehtet {
     return delay(2000);
   }
 }
-export default Gnirehtet;

package/lib/android/root.js

@@ -11,7 +11,7 @@ const animationsToStop = [
   'window_animation_scale'
 ];
 
-class RootedDevice {
+export class RootedDevice {
   constructor(androidClient) {
     this.client = androidClient;
   }
@@ -83,6 +83,29 @@ class RootedDevice {
     }
   }
 
+  async setCPUPerformanceSamsungA51() {
+    // Octa-core (4x2.3 GHz Cortex-A73 & 4x1.7 GHz Cortex-A53)
+    // See values by
+    // cat /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies
+    // cat /sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies
+
+    await this.client._runAsRoot(
+      'echo performance > /sys/devices/system/cpu/cpufreq/policy0/scaling_governor'
+    );
+
+    await this.client._runAsRoot(
+      'echo performance > /sys/devices/system/cpu/cpufreq/policy4/scaling_governor'
+    );
+
+    await this.client._runAsRoot(
+      'echo 1742000 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq'
+    );
+
+    return this.client._runAsRoot(
+      'echo 2314000 > /sys/devices/system/cpu/cpufreq/policy4/scaling_min_freq'
+    );
+  }
+
   async setCPUPerformancePixel2() {
     // MSM8998 (4x 2.35GHz, 4x 1.9GHz)
     // values obtained from:
@@ -166,6 +189,11 @@ class RootedDevice {
     );
   }
 
+  async setGPUPerformanceSamsungA51() {
+    // Mali-G72 MP3 (3 @ 850 MHz)
+    // Missing info on how to set the GPU
+  }
+
   async start() {
     await this.stopServices();
     await this.stopAnimations();
@@ -178,19 +206,34 @@ class RootedDevice {
       `getprop ro.product.model`
     );
 
-    if (model === 'Moto G (5)') {
-      log.info('Set CPU and GPU performance settings for Moto G5');
-      await this.setCPUPerformanceMotoG5();
-      await this.setGPUPerformanceMotoG5();
-    } else if (model === 'Pixel 2') {
-      log.info('Set CPU and GPU performance settings for Pixel 2');
-      await this.setCPUPerformancePixel2();
-      await this.setGPUPerformancePixel2();
-    } else {
-      log.info(
-        'No specific CPU/GPU settings for %s - you can help out by creating a PR at https://github.com/sitespeedio/browsertime for your phone',
-        model
-      );
+    switch (model) {
+      case 'Moto G (5)': {
+        log.info('Set CPU and GPU performance settings for Moto G5');
+        await this.setCPUPerformanceMotoG5();
+        await this.setGPUPerformanceMotoG5();
+
+        break;
+      }
+      case 'Pixel 2': {
+        log.info('Set CPU and GPU performance settings for Pixel 2');
+        await this.setCPUPerformancePixel2();
+        await this.setGPUPerformancePixel2();
+
+        break;
+      }
+      case 'SM-A515F': {
+        // Samsung A51
+        await this.setCPUPerformanceSamsungA51();
+        await this.setGPUPerformanceSamsungA51();
+
+        break;
+      }
+      default: {
+        log.info(
+          'No specific CPU/GPU settings for %s - you can help out by creating a PR at https://github.com/sitespeedio/browsertime for your phone',
+          model
+        );
+      }
     }
   }
 
@@ -199,5 +242,3 @@ class RootedDevice {
     return this.startAnimations();
   }
 }
-
-export default RootedDevice;

package/lib/chrome/chromeDevtoolsProtocol.js

@@ -3,7 +3,7 @@ import CDP from 'chrome-remote-interface';
 import btoa from 'btoa';
 const log = intel.getLogger('browsertime.chrome.cdp');
 import { toArray } from '../support/util.js';
-import defaultTraceCategories from './settings/traceCategories.js';
+import { traceCategories as defaultTraceCategories } from './settings/traceCategories.js';
 
 const MIME_TYPE_MATCHERS = [
   [/^text\/html/, 'html'],
@@ -20,7 +20,7 @@ function getContentType(mimeType) {
   return MIME_TYPE_MATCHERS.find(matcher => matcher[0].test(mimeType))[1];
 }
 
-class ChromeDevtoolsProtocol {
+export class ChromeDevtoolsProtocol {
   constructor(options) {
     this.options = options;
     this.chrome = options.chrome || {};
@@ -234,4 +234,3 @@ class ChromeDevtoolsProtocol {
     }
   }
 }
-export default ChromeDevtoolsProtocol;

package/lib/chrome/har.js

@@ -5,7 +5,7 @@ const log = intel.getLogger('browsertime.chrome');
 import { addBrowser } from '../support/har/index.js';
 const { Type } = logging;
 
-export default async function (
+export async function getHar(
   runner,
   result,
   index,

package/lib/chrome/longTaskMetrics.js

@@ -1,6 +1,6 @@
 import get from 'lodash.get';
 
-export default function (result, options) {
+export function longTaskMetrics(result, options) {
   let totalDurationFirstPaint = 0;
   let totalDurationFirstContentFulPaint = 0;
   let totalDurationLargestContentFulPaint = 0;

package/lib/chrome/parseCpuTrace.js

@@ -11,7 +11,7 @@ function slowestFirst(a, b) {
   return b.value - a.value;
 }
 
-export default async (tracelog, url) => {
+export async function parseCPUTrace(tracelog, url) {
   try {
     log.debug('Start parse Chrome trace log using Tracium.');
     const tasks = computeMainThreadTasks(tracelog, {
@@ -87,4 +87,4 @@ export default async (tracelog, url) => {
     );
     return {};
   }
-};
+}

package/lib/chrome/settings/chromeAndroidOptions.js

@@ -3,7 +3,7 @@
  * see https://github.com/GoogleChrome/chrome-launcher/blob/master/docs/chrome-flags-for-tools.md
  * https://peter.sh/experiments/chromium-command-line-switches/
  */
-export default [
+export const chromeAndroidOptions = [
   '--disable-fre',
   // : Disable reporting to UMA, but allows for collection
   '--metrics-recording-only',

package/lib/chrome/settings/chromeDesktopOptions.js

@@ -1,6 +1,6 @@
 // See https://github.com/GoogleChrome/chrome-launcher/blob/master/docs/chrome-flags-for-tools.md
 // https://peter.sh/experiments/chromium-command-line-switches/
-export default [
+export const chromeDesktopOptions = [
   '--disable-background-networking',
   '--no-default-browser-check',
   '--no-first-run',

package/lib/chrome/settings/traceCategories.js

@@ -1,7 +1,7 @@
 /**
  * Default trace categories for the Chrome trace log.
  */
-export default [
+export const traceCategories = [
   '-*',
   'disabled-by-default-lighthouse',
   'v8',

package/lib/chrome/traceCategoriesParser.js

@@ -119,9 +119,7 @@ function cleanTrace(trace, url) {
   // and using TS of first found TracingStartedIn* event
 
   // With Chrome 58 we got undefined events on Travis (I cant't reproduce it on my local)
-  if (mostActiveFrame !== undefined) {
-    traceEvents.unshift(makeMockEvent(mostActiveFrame, ts));
-  } else {
+  if (mostActiveFrame === undefined) {
     // sometimes it seems we are missing inserting the 'TracingStartedInPage
     // let log and find out more
     log.error(
@@ -130,6 +128,8 @@ function cleanTrace(trace, url) {
       traceEvents.length,
       threads
     );
+  } else {
+    traceEvents.unshift(makeMockEvent(mostActiveFrame, ts));
   }
 
   // Verify that we got a navigationStart event for that frame. In Chrome 76 we started to get

package/lib/chrome/webdriver/builder.js

@@ -4,7 +4,7 @@ import get from 'lodash.get';
 import { logging } from 'selenium-webdriver';
 import { ServiceBuilder, Options } from 'selenium-webdriver/chrome.js';
 import { pac, manual } from 'selenium-webdriver/proxy.js';
-import setupChromiumOptions from './setupChromiumOptions.js';
+import { setupChromiumOptions } from './setupChromiumOptions.js';
 
 /**
  * Configure a WebDriver builder based on the specified options.

package/lib/chrome/webdriver/chromium.js

@@ -5,20 +5,20 @@ import { logging } from 'selenium-webdriver';
 import intel from 'intel';
 const log = intel.getLogger('browsertime.chrome');
 const { Type } = logging;
-import cpuMetrics from '../longTaskMetrics.js';
-import parseCpuTrace from '../parseCpuTrace.js';
-import har from '../har.js';
+import { longTaskMetrics } from '../longTaskMetrics.js';
+import { parseCPUTrace } from '../parseCpuTrace.js';
+import { getHar } from '../har.js';
 import { getEmptyHAR, mergeHars } from '../../support/har/index.js';
 import { toArray } from '../../support/util.js';
 import { logging as _logging } from 'selenium-webdriver';
 import { parse } from '../traceCategoriesParser.js';
-import pathToFolder from '../../support/pathToFolder.js';
-import ChromeDevtoolsProtocol from '../chromeDevtoolsProtocol.js';
+import { pathToFolder } from '../../support/pathToFolder.js';
+import { ChromeDevtoolsProtocol } from '../chromeDevtoolsProtocol.js';
 import { Android, isAndroidConfigured } from '../../android/index.js';
 const unlink = promisify(_unlink);
 const rm = promisify(_rm);
 
-class Chromium {
+export class Chromium {
   constructor(storageManager, options) {
     this.options = options;
     this.chrome = options.chrome || {};
@@ -248,7 +248,7 @@ class Chromium {
 
     if (!this.skipHar) {
       this.hars.push(
-        await har(
+        await getHar(
           runner,
           result,
           index,
@@ -286,11 +286,9 @@ class Chromium {
             break;
           }
           default: {
-            if (m.name.includes('Duration')) {
-              cleanedMetrics[m.name] = m.value * 1000;
-            } else {
-              cleanedMetrics[m.name] = m.value;
-            }
+            cleanedMetrics[m.name] = m.name.includes('Duration')
+              ? m.value * 1000
+              : m.value;
           }
         }
       }
@@ -334,7 +332,7 @@ class Chromium {
     if (this.collectTracingEvents) {
       const trace = parse(this.events, result.url);
       result.extraJson[`trace-${index}.json`] = trace;
-      const cpu = await parseCpuTrace(trace, result.url);
+      const cpu = await parseCPUTrace(trace, result.url);
       result.cpu = cpu;
 
       // Collect render blocking info
@@ -420,7 +418,7 @@ class Chromium {
       result.browserScripts.pageinfo &&
       result.browserScripts.pageinfo.longTask
     ) {
-      const cpuData = cpuMetrics(result, this.options);
+      const cpuData = longTaskMetrics(result, this.options);
       if (result.cpu) {
         result.cpu.longTasks = cpuData.longTasks;
       } else {
@@ -492,12 +490,10 @@ class Chromium {
   }
 
   async getHARs() {
-    return !this.skipHar ? { har: mergeHars(this.hars) } : {};
+    return this.skipHar ? {} : { har: mergeHars(this.hars) };
   }
 
   async setCookies(url, cookies) {
     return this.cdpClient.setCookies(url, cookies);
   }
 }
-
-export default Chromium;

package/lib/chrome/webdriver/setupChromiumOptions.js

@@ -1,8 +1,8 @@
 import { readFileSync } from 'node:fs';
 import intel from 'intel';
-import defaultChromeOptions from '../settings/chromeDesktopOptions.js';
-import defaultAndroidChromeOptions from '../settings/chromeAndroidOptions.js';
-import getViewPort from '../../support/getViewPort.js';
+import { chromeDesktopOptions as defaultChromeOptions } from '../settings/chromeDesktopOptions.js';
+import { chromeAndroidOptions as defaultAndroidChromeOptions } from '../settings/chromeAndroidOptions.js';
+import { getViewPort } from '../../support/getViewPort.js';
 import { toArray } from '../../support/util.js';
 import { isAndroidConfigured } from '../../android/index.js';
 const log = intel.getLogger('browsertime.chrome');
@@ -19,7 +19,12 @@ const CHROME_AMD_EDGE_INTERNAL_PHONE_HOME = [
   '"MAP optimizationguide-pa.googleapis.com 127.0.0.1"'
 ];
 
-export default function (seleniumOptions, browserOptions, options, baseDir) {
+export function setupChromiumOptions(
+  seleniumOptions,
+  browserOptions,
+  options,
+  baseDir
+) {
   // Fixing save password popup, only on Desktop
 
   if (!isAndroidConfigured(options)) {
@@ -93,9 +98,9 @@ export default function (seleniumOptions, browserOptions, options, baseDir) {
   }
 
   if (options.extension) {
-    const extensions = !Array.isArray(options.extension)
-      ? [options.extension]
-      : options.extension;
+    const extensions = Array.isArray(options.extension)
+      ? options.extension
+      : [options.extension];
     for (const extension of extensions) {
       seleniumOptions.addExtensions(
         readFileSync(extension, { encoding: 'base64' })
@@ -119,9 +124,9 @@ export default function (seleniumOptions, browserOptions, options, baseDir) {
   }
 
   if (browserOptions.collectNetLog) {
-    const dir = !isAndroidConfigured(browserOptions)
-      ? baseDir
-      : '/data/local/tmp';
+    const dir = isAndroidConfigured(browserOptions)
+      ? '/data/local/tmp'
+      : baseDir;
     seleniumOptions.addArguments(`--log-net-log=${dir}/chromeNetlog.json`);
     const level = browserOptions.netLogCaptureMode || 'IncludeSensitive';
     seleniumOptions.addArguments(`--net-log-capture-mode=${level}`);
@@ -133,13 +138,13 @@ export default function (seleniumOptions, browserOptions, options, baseDir) {
       '--remote-debugging-port=' + options.devToolsPort
     );
   } else {
-    if (!browserOptions.noDefaultOptions) {
+    if (browserOptions.noDefaultOptions) {
+      log.info('Skip setting default options for Chrome');
+    } else {
       seleniumOptions.addArguments(defaultChromeOptions);
       seleniumOptions.addArguments(
         '--remote-debugging-port=' + options.devToolsPort
       );
-    } else {
-      log.info('Skip setting default options for Chrome');
     }
   }
 

package/lib/connectivity/humble.js

@@ -4,7 +4,7 @@ import get from 'lodash.get';
 import intel from 'intel';
 const log = intel.getLogger('browsertime.connectivity.humble');
 
-class Humble {
+export class Humble {
   constructor(options) {
     this.url = get(options.connectivity, 'humble.url');
     this.profile = options.connectivity.profile;
@@ -13,13 +13,13 @@ class Humble {
   async start(profile) {
     const library = this.url.startsWith('https') ? https : http;
     const res = await new Promise(resolve => {
-      if (this.profile !== 'custom') {
-        library.get(`${this.url}/api/${this.profile}`, resolve);
-      } else {
+      if (this.profile === 'custom') {
         library.get(
           `${this.url}/api/custom?up=${profile.up}&down=${profile.down}&rtt=${profile.rtt}`,
           resolve
         );
+      } else {
+        library.get(`${this.url}/api/${this.profile}`, resolve);
       }
     });
 
@@ -30,10 +30,10 @@ class Humble {
       res.on('end', () => resolve(data));
     });
 
-    if (res.statusCode !== 200) {
-      log.error('Humble response: %s', data);
-    } else {
+    if (res.statusCode === 200) {
       log.info('Switch Humble at %s to use profile %s', this.url, this.profile);
+    } else {
+      log.error('Humble response: %s', data);
     }
   }
 
@@ -50,12 +50,10 @@ class Humble {
       res.on('end', () => resolve(data));
     });
 
-    if (res.statusCode !== 200) {
-      log.error('Humble response: %s', data);
-    } else {
+    if (res.statusCode === 200) {
       log.info('Humble throttling stopped successfully');
+    } else {
+      log.error('Humble response: %s', data);
     }
   }
 }
-
-export default Humble;

package/lib/connectivity/index.js

@@ -5,7 +5,7 @@ import {
   stop as throttleStop
 } from '@sitespeed.io/throttle';
 const log = intel.getLogger('browsertime.connectivity');
-import Humble from './humble.js';
+import { Humble } from './humble.js';
 import { parseTrafficShapeConfig } from './trafficShapeParser.js';
 
 let humble;

package/lib/core/engine/collector.js

@@ -4,7 +4,7 @@ import get from 'lodash.get';
 import intel from 'intel';
 import { timestamp as _timestamp } from '../../support/engineUtils.js';
 import { Statistics } from '../../support/statistics.js';
-import pathToFolder from '../../support/pathToFolder.js';
+import { pathToFolder } from '../../support/pathToFolder.js';
 import { getConnectivitySettings } from '../../connectivity/index.js';
 import { formatMetric } from '../../support/util.js';
 const require = createRequire(import.meta.url);
@@ -60,7 +60,7 @@ function getNewResult(url, options) {
  * per iteration and store what's needed to disk.
  * @class
  */
-class Collector {
+export class Collector {
   constructor(url, storageManager, options) {
     this.options = options;
     this.storageManager = storageManager;
@@ -520,5 +520,3 @@ class Collector {
     }
   }
 }
-
-export default Collector;

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

@@ -2,7 +2,7 @@ import { By } from 'selenium-webdriver';
 import intel from 'intel';
 const log = intel.getLogger('browsertime.command.addText');
 
-class AddText {
+export class AddText {
   constructor(browser) {
     this.browser = browser;
   }
@@ -117,4 +117,3 @@ class AddText {
     }
   }
 }
-export default AddText;

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

@@ -1,7 +1,7 @@
 import intel from 'intel';
 import { Android, isAndroidConfigured } from '../../../android/index.js';
 const log = intel.getLogger('browsertime.command.android');
-export default class AndroidCommand {
+export class AndroidCommand {
   constructor(options) {
     this.options = options;
   }