browsertime 23.4.5 → 24.0.0-alpha.1

package/CHANGELOG.md

@@ -1,6 +1,37 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
-## 23.4.4 -  2024-12-20
+## 24.0.0-alpha.1 - 2025-01-07
+### Fixed
+* Replace dependencies with local implementation:
+  * Replace btoa [#2233](https://github.com/sitespeedio/browsertime/pull/2233).
+  * Replace hasbin [#2234](https://github.com/sitespeedio/browsertime/pull/2234).
+  * Replace DayJS [#2235](https://github.com/sitespeedio/browsertime/pull/2235).
+  * Replace lodash.pick [#2237](https://github.com/sitespeedio/browsertime/pull/2237).
+  * Replace lodash.groupBy [#2238](https://github.com/sitespeedio/browsertime/pull/2238).
+  * Replace find-up [#2240](https://github.com/sitespeedio/browsertime/pull/2240).
+  * Replace lodash.isEmpty [#2241](https://github.com/sitespeedio/browsertime/pull/2241).
+  * Replace get-port [#2242](https://github.com/sitespeedio/browsertime/pull/2242).
+  * Replace jimp with jimp custom [#2243](https://github.com/sitespeedio/browsertime/pull/2243).
+  * Replace @cypress/xvfb [#2245](https://github.com/sitespeedio/browsertime/pull/2245).
+  * Replace intel (log) with sitespeed.io/log [#2246](https://github.com/sitespeedio/browsertime/pull/2246).
+* Fix Docker file ENV to follow the new standard [#2239](https://github.com/sitespeedio/browsertime/pull/2239).
+* Edgedriver 131 [#2236](https://github.com/sitespeedio/browsertime/pull/2236).
+
+
+## 23.5.0 -  2024-12-23
+### Added
+* Added `--userTimingBlockList` [#2227](https://github.com/sitespeedio/browsertime/pull/2227).
+
+### Fixed
+* Updated to webdriver 4.28 [#2226](https://github.com/sitespeedio/browsertime/pull/2226).
+* Updated dev dependencies [#2228](https://github.com/sitespeedio/browsertime/pull/2228).
+* Fix so the check for gnirehtet always use --android.gnirehtet to fix problens setting it in sitespeed.io [#2229](https://github.com/sitespeedio/browsertime/pull/2229).
+* Update to execa 9.5.2 [#2231](https://github.com/sitespeedio/browsertime/pull/2231).
+* Update to adbkit 3.3.8 [#2232](https://github.com/sitespeedio/browsertime/pull/2232).
+* Fix so you cannot use gnirehtet with webpagereplay [#2230](https://github.com/sitespeedio/browsertime/pull/2230).
+
+
+## 23.4.5 -  2024-12-20
 ### Fixed
 * Change bottom margin from 10 to 14 pixel when recoring a video on mobile, se bug [#2224](https://github.com/sitespeedio/browsertime/issues/2224) and PR [#2225](https://github.com/sitespeedio/browsertime/pull/2225).
 

package/bin/browsertime.js

@@ -2,7 +2,7 @@
 import merge from 'lodash.merge';
 import get from 'lodash.get';
 import set from 'lodash.set';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { existsSync, mkdirSync } from 'node:fs';
 import path from 'node:path';
 import { Engine } from '../lib/core/engine/index.js';
@@ -17,7 +17,7 @@ import { StorageManager } from '../lib/support/storageManager.js';
 import { loadScript } from '../lib/support/engineUtils.js';
 import { isAndroidConfigured } from '../lib/android/index.js';
 
-const log = intel.getLogger('browsertime');
+const log = getLogger('browsertime');
 const AsyncFunction = Object.getPrototypeOf(async function () {}).constructor;
 const delay = ms => new Promise(response => setTimeout(response, ms));
 
@@ -193,6 +193,7 @@ async function run(urls, options) {
     }
   } catch (error) {
     log.error('Error running browsertime', error);
+    console.log(error);
     process.exitCode = 1;
   } finally {
     process.exit();

package/lib/android/gnirehtet.js

@@ -1,6 +1,6 @@
 import { execa } from 'execa';
-import intel from 'intel';
-const log = intel.getLogger('browsertime.gnirehtet');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.gnirehtet');
 const delay = ms => new Promise(response => setTimeout(response, ms));
 
 export class Gnirehtet {

package/lib/android/index.js

@@ -3,13 +3,13 @@ import { mkdir as _mkdir, createWriteStream } from 'node:fs';
 import path from 'node:path';
 import { EOL as endOfLine } from 'node:os';
 import { execa } from 'execa';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import pkg from '@devicefarmer/adbkit';
 import usbPowerProfiler from 'usb-power-profiling/usb-power-profiling.js';
 const { Adb } = pkg;
 import get from 'lodash.get';
 import { pathToFolder } from '../support/pathToFolder.js';
-const log = intel.getLogger('browsertime.android');
+const log = getLogger('browsertime.android');
 const mkdir = promisify(_mkdir);
 const delay = ms => new Promise(res => setTimeout(res, ms));
 

package/lib/android/root.js

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.android');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.android');
 
 // Adopted from
 // https://dxr.mozilla.org/mozilla-central/source/testing/raptor/raptor/performance_tuning.py

package/lib/chrome/chromeDevtoolsProtocol.js

@@ -1,7 +1,6 @@
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import CDP from 'chrome-remote-interface';
-import btoa from 'btoa';
-const log = intel.getLogger('browsertime.chrome.cdp');
+const log = getLogger('browsertime.chrome.cdp');
 import { toArray } from '../support/util.js';
 import { traceCategories as defaultTraceCategories } from './settings/traceCategories.js';
 
@@ -107,7 +106,8 @@ export class ChromeDevtoolsProtocol {
 
   async setBasicAuth(basicAuth) {
     const parts = basicAuth.split('@');
-    const basic = 'Basic ' + btoa(parts[0] + ':' + parts[1]);
+    const basic =
+      'Basic ' + Buffer.from(parts[0] + ':' + parts[1]).toString('base64');
     await this.cdpClient.Network.setExtraHTTPHeaders({
       headers: { Authorization: basic }
     });

package/lib/chrome/har.js

@@ -1,7 +1,7 @@
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { harFromMessages } from 'chrome-har';
 import { logging } from 'selenium-webdriver';
-const log = intel.getLogger('browsertime.chrome');
+const log = getLogger('browsertime.chrome');
 import { addBrowser } from '../support/har/index.js';
 const { Type } = logging;
 

package/lib/chrome/networkManager.js

@@ -1,7 +1,7 @@
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import get from 'lodash.get';
 
-const log = intel.getLogger('browsertime.chrome.network');
+const log = getLogger('browsertime.chrome.network');
 
 export class NetworkManager {
   constructor(cdpClient, options) {

package/lib/chrome/parseCpuTrace.js

@@ -1,6 +1,6 @@
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { computeMainThreadTasks } from '@sitespeed.io/tracium';
-const log = intel.getLogger('browsertime.chrome.cpu');
+const log = getLogger('browsertime.chrome.cpu');
 
 function round(number_, decimals = 3) {
   const pow = Math.pow(10, decimals);

package/lib/chrome/traceCategoriesParser.js

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.chrome.trace');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.chrome.trace');
 
 // Adopting the Lighthouse way to clean the Trace log
 // https://github.com/GoogleChrome/lighthouse/blob/50a68ab2bf0115427e767e5e40dfe6be671902fe/lighthouse-core/config/config.js#L29-L110

package/lib/chrome/webdriver/builder.js

@@ -1,10 +1,9 @@
-import pick from 'lodash.pick';
-import isEmpty from 'lodash.isempty';
 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 { pick, isEmpty } from '../../support/util.js';
 
 /**
  * Configure a WebDriver builder based on the specified options.

package/lib/chrome/webdriver/chromium.js

@@ -2,9 +2,9 @@ import { promisify } from 'node:util';
 import { unlink as _unlink, rm as _rm } from 'node:fs';
 import path from 'node:path';
 import { logging } from 'selenium-webdriver';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import usbPowerProfiler from 'usb-power-profiling/usb-power-profiling.js';
-const log = intel.getLogger('browsertime.chrome');
+const log = getLogger('browsertime.chrome');
 const { Type } = logging;
 import { longTaskMetrics } from '../longTaskMetrics.js';
 import { parseCPUTrace } from '../parseCpuTrace.js';

package/lib/chrome/webdriver/setupChromiumOptions.js

@@ -1,11 +1,11 @@
 import { readFileSync } from 'node:fs';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 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');
+const log = getLogger('browsertime.chrome');
 
 const CHROME_AMD_EDGE_INTERNAL_PHONE_HOME = [
   'MAP cache.pack.google.com 127.0.0.1',

package/lib/chrome/webdriver/traceUtilities.js

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.chrome');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.chrome');
 
 function getLargestContentfulPaintEvent(traceEvents) {
   const lcpCandidates = traceEvents.filter(

package/lib/connectivity/humble.js

@@ -1,8 +1,8 @@
 import http from 'node:http';
 import https from 'node:https';
 import get from 'lodash.get';
-import intel from 'intel';
-const log = intel.getLogger('browsertime.connectivity.humble');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.connectivity.humble');
 
 export class Humble {
   constructor(options) {

package/lib/connectivity/index.js

@@ -1,10 +1,10 @@
 import get from 'lodash.get';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import {
   start as throttleStart,
   stop as throttleStop
 } from '@sitespeed.io/throttle';
-const log = intel.getLogger('browsertime.connectivity');
+const log = getLogger('browsertime.connectivity');
 import { Humble } from './humble.js';
 import { parseTrafficShapeConfig } from './trafficShapeParser.js';
 

package/lib/core/engine/collector.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { createRequire } from 'node:module';
 import get from 'lodash.get';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { timestamp as _timestamp } from '../../support/engineUtils.js';
 import { Statistics } from '../../support/statistics.js';
 import { pathToFolder } from '../../support/pathToFolder.js';
@@ -9,7 +9,7 @@ import { getConnectivitySettings } from '../../connectivity/index.js';
 import { formatMetric } from '../../support/util.js';
 const require = createRequire(import.meta.url);
 const version = require('../../../package.json').version;
-const log = intel.getLogger('browsertime');
+const log = getLogger('browsertime');
 
 function getNewResult(url, options) {
   return {

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

@@ -1,6 +1,6 @@
 import { By } from 'selenium-webdriver';
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.addText');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.addText');
 
 /**
  * Provides functionality to add text to elements on a web page using various selectors.

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

@@ -1,6 +1,6 @@
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { Android, isAndroidConfigured } from '../../../android/index.js';
-const log = intel.getLogger('browsertime.command.android');
+const log = getLogger('browsertime.command.android');
 /**
  * Provides functionality to interact with an Android device through shell commands.
  * @class

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

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.bidi');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.bidi');
 
 /**
  * Manages interactions using Bidi. At the moment this only works for Firefox

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

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.cache');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.cache');
 /**
  * Manage the browser cache.
  * This class provides methods to clear the cache and cookies in different browsers.

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

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.devtoolsprotocol');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.devtoolsprotocol');
 
 /**
  * Manages interactions with the Chrome DevTools Protocol for Chrome and Edge browsers.

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

@@ -1,9 +1,9 @@
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 
 import { getRenderBlocking } from '../../../chrome/webdriver/traceUtilities.js';
 import { parse } from '../../../chrome/traceCategoriesParser.js';
 import { parseCPUTrace } from '../../../chrome/parseCpuTrace.js';
-const log = intel.getLogger('browsertime.command.chrometrace');
+const log = getLogger('browsertime.command.chrometrace');
 /**
  * Manages Chrome trace functionality, enabling custom profiling and trace collection in Chrome.
  *

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

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.click');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.click');
 
 function addClick(js) {
   const trimmed = js.trim();

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

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.debug');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.debug');
 const delay = ms => new Promise(res => setTimeout(res, ms));
 
 /**

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

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.geckoprofiler');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.geckoprofiler');
 /**
  * Manages the Gecko Profiler for profiling Firefox performance.
  *

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

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.javascript');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.javascript');
 /**
  * Provides functionality to execute JavaScript code in the context of the current page.
  *

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

@@ -1,18 +1,21 @@
 import path from 'node:path';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import get from 'lodash.get';
 import merge from 'lodash.merge';
 import { timestamp as _timestamp } from '../../../support/engineUtils.js';
 import { Video } from '../../../video/video.js';
 import { pathToFolder } from '../../../support/pathToFolder.js';
 import { setOrangeBackground } from '../../../video/screenRecording/setOrangeBackground.js';
-import { filterAllowlisted } from '../../../support/userTiming.js';
+import {
+  filterAllowlisted,
+  filterBlocklisted
+} from '../../../support/userTiming.js';
 import { isAndroidConfigured, Android } from '../../../android/index.js';
 import { TCPDump } from '../../../support/tcpdump.js';
 import { lcpHighlightScript as highlightLargestContentfulPaint } from './util/lcpHighlightScript.js';
 import { clsHighlightScript as highlightLS } from './util/lsHighlightScript.js';
 const delay = ms => new Promise(res => setTimeout(res, ms));
-const log = intel.getLogger('browsertime.command.measure');
+const log = getLogger('browsertime.command.measure');
 
 // In some cases we could have one alias mapped to multiple URLs
 // we've seen it for login etc where the user get different query parameter
@@ -643,6 +646,14 @@ export class Measure {
       );
     }
 
+    if (this.options.userTimingBlockList) {
+      filterBlocklisted(
+        this.result[this.numberOfMeasuredPages].browserScripts.timings
+          .userTimings,
+        this.options.userTimingAllowList
+      );
+    }
+
     if (isAndroidConfigured(this.options) && this.options.processStartTime) {
       const packageName =
         this.options.browser === 'firefox'

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

@@ -1,6 +1,6 @@
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { By, Origin } from 'selenium-webdriver';
-const log = intel.getLogger('browsertime.command.mouse');
+const log = getLogger('browsertime.command.mouse');
 
 /**
  * Provides functionality to click and hold elements on a web page using different strategies.

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

@@ -1,6 +1,6 @@
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { By } from 'selenium-webdriver';
-const log = intel.getLogger('browsertime.command.mouse');
+const log = getLogger('browsertime.command.mouse');
 
 /**
  * Provides functionality to perform a context click (right-click) on elements in a web page.

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

@@ -1,6 +1,6 @@
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { By } from 'selenium-webdriver';
-const log = intel.getLogger('browsertime.command.mouse');
+const log = getLogger('browsertime.command.mouse');
 /**
  * Provides functionality to perform a double-click action on elements in a web page.
  *

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

@@ -1,6 +1,6 @@
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { By, Origin } from 'selenium-webdriver';
-const log = intel.getLogger('browsertime.command.mouse');
+const log = getLogger('browsertime.command.mouse');
 /**
  * Provides functionality to move the mouse cursor to elements or specific positions on a web page.
  *

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

@@ -1,6 +1,6 @@
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { By } from 'selenium-webdriver';
-const log = intel.getLogger('browsertime.command.mouse');
+const log = getLogger('browsertime.command.mouse');
 
 /**
  * Provides functionality to perform a single click action on elements or at specific positions in a web page. Uses Seleniums Action API.

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

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.navigation');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.navigation');
 
 /**
  * Provides functionality to control browser navigation such as back, forward, and refresh actions.

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

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.screenshot');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.screenshot');
 
 /**
  * Take a screenshot. The screenshot will be stored to disk,

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

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.scroll');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.scroll');
 const delay = ms => new Promise(res => setTimeout(res, ms));
 
 /**

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

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.select');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.select');
 
 /**
  * Provides functionality to interact with `<select>` elements on a web page.

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

@@ -1,5 +1,5 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.set');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.set');
 
 /**
  * Provides functionality to set properties like innerHTML, innerText, and value on elements in a web page.

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

@@ -1,6 +1,6 @@
 import { performance } from 'node:perf_hooks';
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.stopwatch');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.stopwatch');
 
 /**
  * A stopwatch utility for measuring time intervals.

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

@@ -1,6 +1,6 @@
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { By } from 'selenium-webdriver';
-const log = intel.getLogger('browsertime.command.switch');
+const log = getLogger('browsertime.command.switch');
 
 /**
  * Provides functionality to switch between frames, windows, and tabs in the browser.

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

@@ -1,6 +1,6 @@
 import webdriver from 'selenium-webdriver';
-import intel from 'intel';
-const log = intel.getLogger('browsertime.command.wait');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('browsertime.command.wait');
 const delay = ms => new Promise(res => setTimeout(res, ms));
 
 /**

package/lib/core/engine/index.js

@@ -1,7 +1,6 @@
 import { arch as _arch } from 'node:os';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import merge from 'lodash.merge';
-import getPort, { portNumbers } from 'get-port';
 import { execaCommand as command } from 'execa';
 import get from 'lodash.get';
 import { StorageManager } from '../../support/storageManager.js';
@@ -31,7 +30,8 @@ import {
   loadScript,
   loadPageCompleteScript
 } from '../../support/engineUtils.js';
-const log = intel.getLogger('browsertime');
+import { getAvailablePort } from '../../support/getPort.js';
+const log = getLogger('browsertime');
 const defaults = {
   scripts: [],
   iterations: 3,
@@ -52,9 +52,9 @@ function shouldDelay(index, total, delay) {
 export class Engine {
   constructor(options) {
     this.options = merge({}, defaults, options);
-    if (log.isEnabledFor(log.DEBUG)) {
-      log.debug('Running with options: %:2j', this.options);
-    }
+
+    log.debug('Running with options: %:2j', this.options);
+
     this.myXVFB = new XVFB(this.options);
   }
 
@@ -67,19 +67,13 @@ export class Engine {
   async start() {
     const options = this.options;
 
-    options.devToolsPort = await getPort({
-      port: portNumbers(9222, 9350),
-      host: '127.0.0.1'
-    });
+    options.devToolsPort = await getAvailablePort([9222, 9350]);
 
     log.debug(
       `Preparing port ${options.devToolsPort} for devtools on Chrome/Edge`
     );
 
-    options.safariDriverPort = await getPort({
-      port: portNumbers(1234, 2000),
-      host: '127.0.0.1'
-    });
+    options.safariDriverPort = await getAvailablePort([1234, 2000]);
 
     if (options.browser === 'safari' && options.safari.ios && options.video) {
       await IOSRecorder.activate();
@@ -93,7 +87,7 @@ export class Engine {
       await android._init();
       this.android = android;
 
-      if (options.gnirehtet === true) {
+      if (options.android.gnirehtet === true && !options.webpagereplay) {
         this.gnirehtet = new Gnirehtet(options);
         await this.gnirehtet.start();
       }
@@ -520,7 +514,12 @@ export class Engine {
       }
     }
 
-    if (options.gnirehtet === true && this.gnirehtet) {
+    if (
+      !options.webpagereplay &&
+      options.android &&
+      options.android.gnirehtet === true &&
+      this.gnirehtet
+    ) {
       await this.gnirehtet.stop();
     }
 

package/lib/core/engine/iteration.js

@@ -1,6 +1,6 @@
 import { platform } from 'node:os';
 import webdriver from 'selenium-webdriver';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 
 import { Context } from './context.js';
 import { Commands } from './commands.js';
@@ -23,7 +23,7 @@ import { flushDNS } from '../../support/dns.js';
 
 import { getNumberOfRunningProcesses } from '../../support/processes.js';
 import { isAndroidConfigured, Android } from '../../android/index.js';
-const log = intel.getLogger('browsertime');
+const log = getLogger('browsertime');
 const delay = ms => new Promise(res => setTimeout(res, ms));
 
 // Make this configurable