browsertime 21.7.1 → 22.1.0

package/CHANGELOG.md

@@ -1,9 +1,31 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## 22.1.0 - 2024-05-20
+### Added
+* Updated to Edge and Edgedriver 125 [#2132](https://github.com/sitespeedio/browsertime/pull/2132).
+
+### Fixed
+* Updated to Selenium Webdriver 4.21.0 [#2131](https://github.com/sitespeedio/browsertime/pull/2131).
+* Trying to remove new Chrome popup [#2130](https://github.com/sitespeedio/browsertime/pull/2130).
+
+
+## 22.0.0 - 2024-05-16
+
+### Breaking
+
+There's a breaking change for Firefox if you add your own request header or if you use scripting and want to clear the browser in your script:
+
+* Removed the [Browsertime extension](https://github.com/sitespeedio/browsertime-extension). In the old days the extension helped Chrome and Firefox to add cookies, requestheaders, clear caches and more. However all that functionality has been implemented in CDP for Chrome and most functionality using Bidi webdriver for Firefox. At the moment we drop two things for Firefox: Add request header and clear the cache inside of scripting. We hope both soon is supported in Bidi [#2124](https://github.com/sitespeedio/browsertime/pull/2124).
+
+* The ff-test-bidi-har-export is now the default (and only) way to get a HAR file from Firefox. It's faster than the old HAR exporter and works on both desktop and mobile. It's also is implemented using Bidi so when other browsers also support bidi they can also export a HAR [#2123](https://github.com/sitespeedio/browsertime/pull/2123).
+
+### Added
+* Updated the Docker container to use Chrome 125 and Firefox 126 and Edge 124 [#2125](https://github.com/sitespeedio/browsertime/pull/2125) and [#2128](https://github.com/sitespeedio/browsertime/pull/2128).
+
 ## 21.7.1 - 2024-04-03
 ### Fixed
 * Bug fix: If you test a URL that failed, we got an error that didn't produce the browsertime.json [#2120](https://github.com/sitespeedio/browsertime/pull/2120).
-* Updated to Seleniuym webdriver 4.20.0 [#2121](https://github.com/sitespeedio/browsertime/pull/2121).
+* Updated to Selenium webdriver 4.20.0 [#2121](https://github.com/sitespeedio/browsertime/pull/2121).
 
 ## 21.7.0 - 2024-04-03
 ### Added

package/lib/chrome/webdriver/setupChromiumOptions.js

@@ -27,6 +27,7 @@ const CHROME_FEATURES_THAT_WE_DISABLES = [
   'MediaRouter',
   'OfflinePagesPrefetching',
   'OptimizationHints',
+  'SidePanelPinning',
   'Translate',
   'msAutofillEdgeCoupons',
   'msShoppingTrigger',

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

@@ -8,7 +8,7 @@ const log = intel.getLogger('browsertime.command.cache');
  * @hideconstructor
  */
 export class Cache {
-  constructor(browser, browserName, extensionServer, cdp) {
+  constructor(browser, browserName, cdp) {
     /**
      * @private
      */
@@ -17,10 +17,6 @@ export class Cache {
      * @private
      */
     this.browserName = browserName;
-    /**
-     * @private
-     */
-    this.extensionServer = extensionServer;
     /**
      * @private
      */
@@ -30,7 +26,6 @@ export class Cache {
   /**
    * Clears the browser cache. This includes both cache and cookies.
    *
-   * For Firefox, it uses the extensionServer setup with specific options.
    * For Chrome and Edge, it uses the Chrome DevTools Protocol (CDP) commands.
    * If the browser is not supported, logs an error message.
    *
@@ -40,13 +35,7 @@ export class Cache {
    * @returns {Promise<void>} A promise that resolves when the cache and cookies are cleared.
    */
   async clear() {
-    if (this.browserName === 'firefox') {
-      const options = {
-        cacheClearRaw: true,
-        browser: 'firefox'
-      };
-      return this.extensionServer.setup(undefined, this.browser, options);
-    } else if (this.browserName === 'chrome' || this.browserName === 'edge') {
+    if (this.browserName === 'chrome' || this.browserName === 'edge') {
       await this.cdp.send('Network.enable');
       await this.cdp.send('Network.clearBrowserCache');
       return this.cdp.send('Network.clearBrowserCookies');
@@ -58,7 +47,6 @@ export class Cache {
   /**
    * Clears the browser cache while keeping the cookies.
    *
-   * For Firefox, it uses the extensionServer setup with specific options.
    * For Chrome and Edge, it uses the Chrome DevTools Protocol (CDP) command to clear the cache.
    * If the browser is not supported, logs an error message.
    *
@@ -68,13 +56,7 @@ export class Cache {
    * @returns {Promise<void>} A promise that resolves when the cache is cleared but cookies are kept.
    */
   async clearKeepCookies() {
-    if (this.browserName === 'firefox') {
-      const options = {
-        clearCacheKeepCookies: true,
-        browser: 'firefox'
-      };
-      return this.extensionServer.setup(undefined, this.browser, options);
-    } else if (this.browserName === 'chrome' || this.browserName === 'edge') {
+    if (this.browserName === 'chrome' || this.browserName === 'edge') {
       await this.cdp.send('Network.enable');
       return this.cdp.send('Network.clearBrowserCache');
     } else {

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

@@ -41,7 +41,6 @@ export class Measure {
     pageCompleteCheck,
     result,
     engineDelegate,
-    extensionServer,
     storageManager,
     videos,
     scriptsByCategory,
@@ -87,10 +86,6 @@ export class Measure {
      * @private
      */
     this.recordVideo = options.visualMetrics || options.video;
-    /**
-     * @private
-     */
-    this.extensionServer = extensionServer;
     /**
      * @private
      */
@@ -244,17 +239,13 @@ export class Measure {
    */
   async _navigate(url) {
     log.info('Navigating to url %s iteration %s', url, this.index);
-    if (this.numberOfVisitedPages === 0) {
-      await this.extensionServer.setup(url, this.browser, this.options);
-
-      // There's a bug that we introduced when moving cookie handling to CDP
+    if (
+      this.numberOfVisitedPages === 0 && // There's a bug that we introduced when moving cookie handling to CDP
       // and this is the hack to fix that.
-      if (
-        (this.options.cookie && this.options.browser === 'chrome') ||
-        this.options.browser === 'edge'
-      ) {
-        await this.engineDelegate.setCookies(url, this.options.cookie);
-      }
+      ((this.options.cookie && this.options.browser === 'chrome') ||
+        this.options.browser === 'edge')
+    ) {
+      await this.engineDelegate.setCookies(url, this.options.cookie);
     }
     if (this.numberOfVisitedPages === 0) {
       await this.engineDelegate.beforeStartIteration(this.browser, this.index);
@@ -302,11 +293,6 @@ export class Measure {
       log.info('Start to measure');
     }
 
-    // On the first page of an iteration, do what you need to do!
-    if (this.numberOfVisitedPages === 0 && url) {
-      // We can only setup the extension if we have a URL at the moment
-      await this.extensionServer.setup(url, this.browser, this.options);
-    }
     if (this.numberOfVisitedPages === 0) {
       await this.engineDelegate.beforeStartIteration(this.browser, this.index);
     }

package/lib/core/engine/commands.js

@@ -40,7 +40,6 @@ export class Commands {
     result,
     storageManager,
     pageCompleteCheck,
-    extensionServer,
     context,
     videos,
     screenshotManager,
@@ -55,7 +54,6 @@ export class Commands {
       pageCompleteCheck,
       result,
       engineDelegate,
-      extensionServer,
       storageManager,
       videos,
       scriptsByCategory,
@@ -181,7 +179,7 @@ export class Commands {
      * Manages the browser's cache.
      * @type {Cache}
      */
-    this.cache = new Cache(browser, options.browser, extensionServer, cdp);
+    this.cache = new Cache(browser, options.browser, cdp);
 
     /**
      * Adds metadata to the user journey.

package/lib/core/engine/iteration.js

@@ -8,7 +8,6 @@ import { SeleniumRunner } from '../seleniumRunner.js';
 import { preURL } from '../../support/preURL.js';
 import { setResourceTimingBufferSize } from '../../support/setResourceTimingBufferSize.js';
 import { ScreenshotManager } from '../../screenshot/index.js';
-import { ExtensionServer } from '../../extensionserver/index.js';
 import { Video } from '../../video/video.js';
 import { stop } from '../../support/stop.js';
 
@@ -79,7 +78,6 @@ export class Iteration {
     const result = [];
     const batteryTemperature = {};
 
-    const extensionServer = new ExtensionServer(options);
     const engineDelegate = this.engineDelegate;
 
     try {
@@ -112,7 +110,6 @@ export class Iteration {
         result,
         this.storageManager,
         this.pageCompleteCheck,
-        extensionServer,
         context,
         videos,
         screenshotManager,

package/lib/firefox/webdriver/builder.js

@@ -1,6 +1,3 @@
-import { resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import path from 'node:path';
 import { platform } from 'node:os';
 import {
   ServiceBuilder,
@@ -18,12 +15,10 @@ import { disableTrackingProtectionPreferences } from '../settings/disableTrackin
 import { toArray } from '../../support/util.js';
 import { Android, isAndroidConfigured } from '../../android/index.js';
 const log = intel.getLogger('browsertime.firefox');
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 export async function configureBuilder(builder, baseDir, options) {
   // Here we configure everything that we need to start Firefox
   const firefoxConfig = options.firefox || {};
-  const moduleRootPath = resolve(__dirname, '..', '..', '..');
 
   let geckodriverPath = get(firefoxConfig, 'geckodriverPath');
   if (!geckodriverPath) {
@@ -112,15 +107,6 @@ export async function configureBuilder(builder, baseDir, options) {
     ffOptions.setPreference('detach', true);
   }
 
-  // Browsertime own extension, only load it when we need it
-  // We should be able to only install it only when needed, but that could break scripting
-
-  if (!firefoxConfig.disableBrowsertimeExtension) {
-    ffOptions.addExtensions(
-      resolve(moduleRootPath, 'vendor', 'browsertime-0.18.0-an+fx.xpi')
-    );
-  }
-
   if (options.extension) {
     const extensions = Array.isArray(options.extension)
       ? options.extension
@@ -200,33 +186,6 @@ export async function configureBuilder(builder, baseDir, options) {
 
   ffOptions.enableBidi();
 
-  // Enable bidi for HAR support
-  if (firefoxConfig.bidihar) {
-    /* We do not need to do anything for bidi har */
-  } else {
-    if (!options.skipHar) {
-      if (isAndroidConfigured(options)) {
-        log.info('Skip install HAR trigger on Android');
-      } else {
-        // Hack for opening the toolbar
-        // In Firefox 61 we need to have devtools open but do not need to choose netmonitor
-        // ffOptions.setPreference('devtools.toolbox.selectedTool', 'netmonitor');
-        if (!options.debug) {
-          ffOptions.setPreference('devtools.toolbox.footer.height', 0);
-          ffOptions.addArguments('-devtools');
-        }
-
-        ffOptions.addExtensions(
-          resolve(
-            moduleRootPath,
-            'vendor',
-            'har_export_trigger-0.6.1-an+fx.xpi'
-          )
-        );
-      }
-    }
-  }
-
   if (firefoxConfig.args) {
     ffOptions.addArguments(firefoxConfig.args);
   }

package/lib/firefox/webdriver/firefox.js

@@ -14,7 +14,6 @@ import { FirefoxBidi } from '../firefoxBidi.js';
 import { MemoryReport } from '../memoryReport.js';
 import { PerfStats } from '../perfStats.js';
 import { NetworkManager } from '../networkManager.js';
-import { getHAR } from '../getHAR.js';
 
 const log = intel.getLogger('browsertime.firefox');
 const rename = promisify(_rename);
@@ -55,7 +54,7 @@ export class Firefox {
   async afterBrowserStart(runner) {
     this.windowId = await runner.getDriver().getWindowHandle();
 
-    if (this.firefoxConfig.bidihar) {
+    if (!this.options.skipHar) {
       this.har = new adapters.SeleniumBiDiHarRecorder({
         browsingContextIds: [this.windowId],
         debugLogs:
@@ -128,7 +127,7 @@ export class Firefox {
       });
     `);
 
-    if (!this.skipHar && this.firefoxConfig.bidihar) {
+    if (!this.skipHar) {
       await this.har.startRecording();
     }
 
@@ -228,19 +227,13 @@ export class Firefox {
     }
     result.cpu = powerusage;
 
-    if (
-      this.skipHar ||
-      (isAndroidConfigured(this.options) && !this.firefoxConfig.bidihar)
-    ) {
+    if (this.skipHar) {
       if (result.alias && !this.aliasAndUrl[result.alias]) {
         this.aliasAndUrl[result.alias] = result.url;
       }
       return result;
     } else {
-      // const harExport = await this.har.stopRecording();
-      const har = this.firefoxConfig.bidihar
-        ? await this.har.stopRecording()
-        : await getHAR(runner, this.includeResponseBodies);
+      const har = await this.har.stopRecording();
       if (har.log.pages.length > 0) {
         // Hack to add the URL from a SPA
         if (result.alias && !this.aliasAndUrl[result.alias]) {

package/lib/support/cli.js

@@ -452,12 +452,6 @@ export function parseCommandLine() {
       type: 'boolean',
       group: 'firefox'
     })
-    .option('firefox.bidihar', {
-      describe: 'Use the new bidi HAR generator',
-      default: false,
-      type: 'boolean',
-      group: 'firefox'
-    })
     .option('firefox.windowRecorder', {
       describe:
         'Use the internal compositor-based Firefox window recorder to emit PNG files for each ' +
@@ -552,11 +546,6 @@ export function parseCommandLine() {
         'timestamp,nsHttp:5,cache2:5,nsSocketTransport:5,nsHostResolver:5',
       group: 'firefox'
     })
-    .option('firefox.disableBrowsertimeExtension', {
-      describe: 'Disable installing the browsertime extension.',
-      type: 'boolean',
-      group: 'firefox'
-    })
     .option('firefox.noDefaultPrefs', {
       describe: 'Prevents browsertime from setting its default preferences.',
       default: false,
@@ -1087,11 +1076,11 @@ export function parseCommandLine() {
     .option('requestheader', {
       alias: 'r',
       describe:
-        'Request header that will be added to the request. Add multiple instances to add multiple request headers. Works for Firefox and Chrome. Use the following format key:value'
+        'Request header that will be added to the request. Add multiple instances to add multiple request headers. Works for Edge and Chrome. Use the following format key:value'
     })
     .option('cookie', {
       describe:
-        'Cookie that will be added to the request. Add multiple instances to add multiple request cookies. Works for Firefox and Chrome. Use the following format cookieName=cookieValue'
+        'Cookie that will be added to the request. Add multiple instances to add multiple request cookies. Works for Firefox, Chrome and Edge. Use the following format cookieName=cookieValue'
     })
     .option('injectJs', {
       describe:

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "browsertime",
   "description": "Get performance metrics from your web page using Browsertime.",
-  "version": "21.7.1",
+  "version": "22.1.0",
   "bin": "./bin/browsertime.js",
   "type": "module",
   "types": "./types/scripting.d.ts",
   "dependencies": {
     "@cypress/xvfb": "1.2.4",
     "@devicefarmer/adbkit": "3.2.6",
-    "@sitespeed.io/chromedriver": "123.0.6312-58",
-    "@sitespeed.io/edgedriver": "123.0.2420-53",
+    "@sitespeed.io/chromedriver": "125.0.6422-60",
+    "@sitespeed.io/edgedriver": "125.0.2535-47",
     "@sitespeed.io/geckodriver": "0.34.0",
     "@sitespeed.io/throttle": "5.0.0",
     "@sitespeed.io/tracium": "0.3.3",
@@ -19,7 +19,7 @@
     "dayjs": "1.11.10",
     "execa": "8.0.1",
     "fast-stats": "0.0.6",
-    "ff-test-bidi-har-export": "0.0.12",
+    "ff-test-bidi-har-export": "0.0.13",
     "find-up": "7.0.0",
     "get-port": "7.0.0",
     "hasbin": "1.2.3",
@@ -30,7 +30,7 @@
     "lodash.merge": "4.6.2",
     "lodash.pick": "4.4.0",
     "lodash.set": "4.3.2",
-    "selenium-webdriver": "4.20.0",
+    "selenium-webdriver": "4.21.0",
     "yargs": "17.7.2"
   },
   "optionalDependencies": {

package/types/core/engine/command/cache.d.ts

@@ -6,7 +6,7 @@
  * @hideconstructor
  */
 export class Cache {
-    constructor(browser: any, browserName: any, extensionServer: any, cdp: any);
+    constructor(browser: any, browserName: any, cdp: any);
     /**
      * @private
      */
@@ -15,10 +15,6 @@ export class Cache {
      * @private
      */
     private browserName;
-    /**
-     * @private
-     */
-    private extensionServer;
     /**
      * @private
      */
@@ -26,7 +22,6 @@ export class Cache {
     /**
      * Clears the browser cache. This includes both cache and cookies.
      *
-     * For Firefox, it uses the extensionServer setup with specific options.
      * For Chrome and Edge, it uses the Chrome DevTools Protocol (CDP) commands.
      * If the browser is not supported, logs an error message.
      *
@@ -39,7 +34,6 @@ export class Cache {
     /**
      * Clears the browser cache while keeping the cookies.
      *
-     * For Firefox, it uses the extensionServer setup with specific options.
      * For Chrome and Edge, it uses the Chrome DevTools Protocol (CDP) command to clear the cache.
      * If the browser is not supported, logs an error message.
      *

package/types/core/engine/command/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../lib/core/engine/command/cache.js"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH;IACE,4EAiBC;IAhBC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,oBAA8B;IAC9B;;OAEG;IACH,wBAAsC;IACtC;;OAEG;IACH,YAAc;IAGhB;;;;;;;;;;;OAWG;IACH,SAFa,QAAQ,IAAI,CAAC,CAgBzB;IAED;;;;;;;;;;;OAWG;IACH,oBAFa,QAAQ,IAAI,CAAC,CAezB;CACF"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../lib/core/engine/command/cache.js"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH;IACE,sDAaC;IAZC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,oBAA8B;IAC9B;;OAEG;IACH,YAAc;IAGhB;;;;;;;;;;OAUG;IACH,SAFa,QAAQ,IAAI,CAAC,CAUzB;IAED;;;;;;;;;;OAUG;IACH,oBAFa,QAAQ,IAAI,CAAC,CASzB;CACF"}

package/types/core/engine/command/measure.d.ts

@@ -6,7 +6,7 @@
  * @hideconstructor
  */
 export class Measure {
-    constructor(browser: any, index: any, pageCompleteCheck: any, result: any, engineDelegate: any, extensionServer: any, storageManager: any, videos: any, scriptsByCategory: any, asyncScriptsByCategory: any, postURLScripts: any, context: any, screenshotManager: any, options: any);
+    constructor(browser: any, index: any, pageCompleteCheck: any, result: any, engineDelegate: any, storageManager: any, videos: any, scriptsByCategory: any, asyncScriptsByCategory: any, postURLScripts: any, context: any, screenshotManager: any, options: any);
     /**
      * @private
      */
@@ -43,10 +43,6 @@ export class Measure {
      * @private
      */
     private recordVideo;
-    /**
-     * @private
-     */
-    private extensionServer;
     /**
      * @private
      */

package/types/core/engine/command/measure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"measure.d.ts","sourceRoot":"","sources":["../../../../lib/core/engine/command/measure.js"],"names":[],"mappings":"AA6BA;;;;;;GAMG;AACH;IACE,sRA4GC;IA5FC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,0BAA0C;IAC1C;;OAEG;IACH,cAAkB;IAClB;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,uBAAoC;IACpC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,0BAA0C;IAC1C;;OAEG;IACH,uBAAoC;IACpC;;OAEG;IACH,oBAAyD;IACzD;;OAEG;IACH,wBAAsC;IACtC;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,0BAA0C;IAC1C;;OAEG;IACH,+BAAoD;IACpD;;OAEG;IACH,uBAAoC;IACpC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,8BAA8B;IAC9B;;OAEG;IACH,6BAA6B;IAC7B;;OAEG;IACH,uBAA2B;IAC3B;;OAEG;IACH,mBAAoB;IACpB;;OAEG;IACH,gBAA6D;IAC7D;;OAEG;IACH,2BAAsE;IACtE;;OAEG;IACH,uBAA8D;IAC9D;;OAEG;IACH,2BAAqE;IAGvE;;;OAGG;IACH,oBAsBC;IArBC,aAAuE;IAuBzE;;;OAGG;IACH,mBAKC;IAED;;;OAGG;IACH,eAyBC;IAED;;;OAGG;IACH,iBAQC;IAED;;;;;;;;;;;;OAYG;IACH,kBAuBC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,kBALW,MAAM,kBACN,MAAM,GAEJ,QAAQ,IAAI,CAAC,CAwFzB;IAED;;;;;;;;OAQG;IACH,0BAJW,MAAM,gBAiBhB;IACD;;;;;;;;;OASG;IACH,qBAJW,MAAM,gBAwEhB;IAED;;;;;;;OAOG;IACH,UAJW,MAAM,oBAYhB;IAED;;;;;;;OAOG;IACH,6BAOC;IAED;;;OAGG;IACH,gBA4KC;CACF;sBA/qBqB,yBAAyB"}
+{"version":3,"file":"measure.d.ts","sourceRoot":"","sources":["../../../../lib/core/engine/command/measure.js"],"names":[],"mappings":"AA6BA;;;;;;GAMG;AACH;IACE,gQAuGC;IAxFC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,0BAA0C;IAC1C;;OAEG;IACH,cAAkB;IAClB;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,uBAAoC;IACpC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,0BAA0C;IAC1C;;OAEG;IACH,uBAAoC;IACpC;;OAEG;IACH,oBAAyD;IACzD;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,0BAA0C;IAC1C;;OAEG;IACH,+BAAoD;IACpD;;OAEG;IACH,uBAAoC;IACpC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,8BAA8B;IAC9B;;OAEG;IACH,6BAA6B;IAC7B;;OAEG;IACH,uBAA2B;IAC3B;;OAEG;IACH,mBAAoB;IACpB;;OAEG;IACH,gBAA6D;IAC7D;;OAEG;IACH,2BAAsE;IACtE;;OAEG;IACH,uBAA8D;IAC9D;;OAEG;IACH,2BAAqE;IAGvE;;;OAGG;IACH,oBAsBC;IArBC,aAAuE;IAuBzE;;;OAGG;IACH,mBAKC;IAED;;;OAGG;IACH,eAyBC;IAED;;;OAGG;IACH,iBAQC;IAED;;;;;;;;;;;;OAYG;IACH,kBAmBC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,kBALW,MAAM,kBACN,MAAM,GAEJ,QAAQ,IAAI,CAAC,CAmFzB;IAED;;;;;;;;OAQG;IACH,0BAJW,MAAM,gBAiBhB;IACD;;;;;;;;;OASG;IACH,qBAJW,MAAM,gBAwEhB;IAED;;;;;;;OAOG;IACH,UAJW,MAAM,oBAYhB;IAED;;;;;;;OAOG;IACH,6BAOC;IAED;;;OAGG;IACH,gBA4KC;CACF;sBAjqBqB,yBAAyB"}

package/types/core/engine/commands.d.ts

@@ -3,7 +3,7 @@
  * @hideconstructor
  */
 export class Commands {
-    constructor(browser: any, engineDelegate: any, index: any, result: any, storageManager: any, pageCompleteCheck: any, extensionServer: any, context: any, videos: any, screenshotManager: any, scriptsByCategory: any, asyncScriptsByCategory: any, postURLScripts: any, options: any);
+    constructor(browser: any, engineDelegate: any, index: any, result: any, storageManager: any, pageCompleteCheck: any, context: any, videos: any, screenshotManager: any, scriptsByCategory: any, asyncScriptsByCategory: any, postURLScripts: any, options: any);
     profiler: GeckoProfilerCommand;
     /**
      * Manages Chrome trace functionality, enabling custom profiling and trace collection in Chrome.

package/types/core/engine/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../lib/core/engine/commands.js"],"names":[],"mappings":"AA8BA;;;GAGG;AACH;IACE,sRA8OC;IA3MC,+BAMC;IAMD;;;OAGG;IACH,OAFU,WAAW,CAE+C;IAEpE;;;OAGG;IACH,OAFU,KAAK,CAEmC;IAElD;;;OAGG;IACH,QAFU,MAAM,CAE0B;IAE1C;;;OAGG;IACH,SAFU,OAAO,CAEkB;IAEnC;;;OAGG;IACH,MAFU,IAAI,CAEkC;IAEhD;;;OAGG;IACH,SAFU,OAAO,CAEK;IAEtB;;;;;;;;OAQG;IACH,mBAA+C;IAE/C;;;OAGG;IACH,YAFU,UAAU,CAEwC;IAE5D;;;;;OAKG;IACH,gBAAyC;IAEzC;;;;;OAKG;IACH,wBAAmD;IAEnD;;;OAGG;IACH,IAFU,UAAU,CAEgC;IAEpD;;;OAGG;IACH,QAFU,MAAM,CAMf;IAED;;;OAGG;IACH,KAFU,GAAG,CAEc;IAE3B;;;OAGG;IACH,WAFU,SAAS,CAEoB;IAEvC;;;OAGG;IACH,OAFU,KAAK,CAEuD;IAEtE;;;OAGG;IACH,MAFU,IAAI,CAEQ;IAEtB;;;OAGG;IACH,YAFU,UAAU,CAE+C;IAEnE;;;OAGG;IACH,KAFU,8BAA8B,CAE1B;IAEd;;;;OAIG;IACH,MAFU,IAAI,CAEuC;IAErD;;;OAGG;IACH,SAFU,cAAc,CAEkB;IAE1C;;;;OAIG;IACH,OAFW,KAAK,CAEwB;IAExC;;;OAGG;IACH,WA0BC;IAED;;;OAGG;IACH,QAFU,MAAM,CAEiB;IAEjC;;;;OAIG;IACH,QAHU,OAAO,CAGiB;IAElC;;;OAGG;IACH,SAFU,OAAO,CAEkB;CAEtC;sDArPqD,4BAA4B;4BAXtD,0BAA0B;sBAhBhC,oBAAoB;uBAwBnB,qBAAqB;wBAzBpB,sBAAsB;qBAGzB,mBAAmB;wBAChB,sBAAsB;2BAsBnB,yBAAyB;2BArBzB,yBAAyB;uBAC7B,qBAAqB;oBAExB,kBAAkB;mCAGH,wBAAwB;sBAFrC,oBAAoB;qBACrB,mBAAmB;2BAHb,yBAAyB;+CASL,qCAAqC;qBAF/D,mBAAmB;+BACT,sBAAsB;sBAF/B,oBAAoB;uBADnB,qBAAqB;wBAbpB,sBAAsB;wBAGtB,sBAAsB"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../lib/core/engine/commands.js"],"names":[],"mappings":"AA8BA;;;GAGG;AACH;IACE,gQA4OC;IA3MC,+BAMC;IAMD;;;OAGG;IACH,OAFU,WAAW,CAE+C;IAEpE;;;OAGG;IACH,OAFU,KAAK,CAEmC;IAElD;;;OAGG;IACH,QAFU,MAAM,CAE0B;IAE1C;;;OAGG;IACH,SAFU,OAAO,CAEkB;IAEnC;;;OAGG;IACH,MAFU,IAAI,CAEkC;IAEhD;;;OAGG;IACH,SAFU,OAAO,CAEK;IAEtB;;;;;;;;OAQG;IACH,mBAA+C;IAE/C;;;OAGG;IACH,YAFU,UAAU,CAEwC;IAE5D;;;;;OAKG;IACH,gBAAyC;IAEzC;;;;;OAKG;IACH,wBAAmD;IAEnD;;;OAGG;IACH,IAFU,UAAU,CAEgC;IAEpD;;;OAGG;IACH,QAFU,MAAM,CAMf;IAED;;;OAGG;IACH,KAFU,GAAG,CAEc;IAE3B;;;OAGG;IACH,WAFU,SAAS,CAEoB;IAEvC;;;OAGG;IACH,OAFU,KAAK,CAEsC;IAErD;;;OAGG;IACH,MAFU,IAAI,CAEQ;IAEtB;;;OAGG;IACH,YAFU,UAAU,CAE+C;IAEnE;;;OAGG;IACH,KAFU,8BAA8B,CAE1B;IAEd;;;;OAIG;IACH,MAFU,IAAI,CAEuC;IAErD;;;OAGG;IACH,SAFU,cAAc,CAEkB;IAE1C;;;;OAIG;IACH,OAFW,KAAK,CAEwB;IAExC;;;OAGG;IACH,WA0BC;IAED;;;OAGG;IACH,QAFU,MAAM,CAEiB;IAEjC;;;;OAIG;IACH,QAHU,OAAO,CAGiB;IAElC;;;OAGG;IACH,SAFU,OAAO,CAEkB;CAEtC;sDAnPqD,4BAA4B;4BAXtD,0BAA0B;sBAhBhC,oBAAoB;uBAwBnB,qBAAqB;wBAzBpB,sBAAsB;qBAGzB,mBAAmB;wBAChB,sBAAsB;2BAsBnB,yBAAyB;2BArBzB,yBAAyB;uBAC7B,qBAAqB;oBAExB,kBAAkB;mCAGH,wBAAwB;sBAFrC,oBAAoB;qBACrB,mBAAmB;2BAHb,yBAAyB;+CASL,qCAAqC;qBAF/D,mBAAmB;+BACT,sBAAsB;sBAF/B,oBAAoB;uBADnB,qBAAqB;wBAbpB,sBAAsB;wBAGtB,sBAAsB"}

package/lib/extensionserver/httpServer.js

@@ -1,20 +0,0 @@
-import { promisify } from 'node:util';
-import { createServer } from 'node:http';
-
-export async function startServer() {
-  const server = createServer((request, res) => {
-    res.writeHead(200, {
-      'Content-Type': 'text/html',
-      'Referrer-Policy': 'no-referrer'
-    });
-    res.end('<html><body></body></html>');
-  });
-
-  const listen = promisify(server.listen.bind(server));
-  await listen();
-  return server;
-}
-export async function stopServer(server) {
-  const close = promisify(server.close.bind(server));
-  return close();
-}

package/lib/extensionserver/index.js

@@ -1,46 +0,0 @@
-import { startServer, stopServer } from './httpServer.js';
-import { setup } from './setup.js';
-
-/**
- * Create a ExtensionServer. The extension server helps us with
- * running the Browsertime extension, making it possible to
- * use a WebExtension to prepare our tests.
- * @class
- */
-export class ExtensionServer {
-  constructor(options) {
-    this.options = options;
-  }
-
-  _useServer(newOptions) {
-    const options = newOptions || this.options;
-    return options.browser === 'firefox' &&
-      (options.cacheClearRaw ||
-        options.requestheader ||
-        options.clearCacheKeepCookies)
-      ? true
-      : false;
-  }
-
-  async _start() {
-    if (!this.extensionServer) {
-      this.extensionServer = await startServer();
-    }
-  }
-
-  async _stop() {
-    if (this.extensionServer) {
-      await stopServer(this.extensionServer);
-      this.extensionServer = undefined;
-    }
-  }
-
-  async setup(url, browser, setupOptions) {
-    if (this._useServer(setupOptions)) {
-      await this._start();
-      const port = this.extensionServer.address().port;
-      await setup(url, browser, port, setupOptions);
-      return this._stop();
-    }
-  }
-}

package/lib/extensionserver/setup.js

@@ -1,39 +0,0 @@
-import { format } from 'node:url';
-import intel from 'intel';
-import { toArray } from '../support/util.js';
-const log = intel.getLogger('browsertime');
-const delay = ms => new Promise(res => setTimeout(res, ms));
-
-function generateURL(port, testUrl, options) {
-  const query = {};
-
-  if (options.requestheader) {
-    query.rh = toArray(options.requestheader);
-  }
-  if (options.cacheClearRaw) {
-    query.clear = 'true';
-  }
-
-  if (options.clearCacheKeepCookies) {
-    query.clearCacheKeepCookies = 'true';
-  }
-
-  if (options.basicAuth) {
-    query.ba = options.basicAuth + '@' + testUrl;
-  }
-
-  return format({
-    protocol: 'http',
-    hostname: '127.0.0.1',
-    port,
-    query
-  });
-}
-
-export async function setup(url, browser, port, options) {
-  const configUrl = generateURL(port, url, options);
-  log.debug('Configuring browser plugin via %s', configUrl);
-  await browser.loadAndWait(configUrl);
-  // Add some time to make sure the cache is cleared etc
-  await delay(500);
-}

package/lib/firefox/getHAR.js

@@ -1,66 +0,0 @@
-import intel from 'intel';
-const log = intel.getLogger('browsertime.firefox');
-
-// Get the HAR from Firefox
-// Using https://github.com/firefox-devtools/har-export-trigger
-export async function getHAR(runner, includeResponseBodies) {
-  const script = `
-    const callback = arguments[arguments.length - 1];
-    async function triggerExport() {
-      try {
-        const result = await HAR.triggerExport();
-        if (result.pages.length > 0) {
-          result.pages[0].title = document.URL;
-          return callback({'har': {log: result}});
-        } else {
-          return callback({'error': 'The HAR export trigger returned an empty HAR' + JSON.stringify(result)});
-        }
-      }
-      catch(e) {
-        // Sometimes the HAR trigger is really slow so then HAR is not defined.
-        // we catch that with one extra delay
-        const delay = ms => new Promise(res => setTimeout(res, ms));
-        await delay(10000);
-        try {
-          const result = await HAR.triggerExport();
-          result.pages[0].title = document.URL;
-          return callback({'har': {log: result}});
-        } catch(e) {
-          return callback({'error': e.toString()});
-        }
-      }
-    };
-    return triggerExport();
-    `;
-
-  log.info('Waiting on har-export-trigger to collect the HAR');
-  try {
-    const harResult = await runner.runAsyncScript(script, 'GET_HAR_SCRIPT');
-    if (harResult.har) {
-      // The HAR from Firefox always includes content and that can make the HAR file
-      // really big, so we have an option to remove it.
-      if (
-        includeResponseBodies === 'none' ||
-        includeResponseBodies === 'html'
-      ) {
-        for (let entry of harResult.har.log.entries) {
-          if (includeResponseBodies === 'none') {
-            delete entry.response.content.text;
-          } else if (
-            entry.response.content.mimeType &&
-            !entry.response.content.mimeType.includes('text/html')
-          ) {
-            delete entry.response.content.text;
-          }
-        }
-      }
-      return harResult.har;
-    } else {
-      log.error(
-        'Got an error from HAR Export Trigger ' + JSON.stringify(harResult)
-      );
-    }
-  } catch (error) {
-    log.error('Could not get the HAR from Firefox', error);
-  }
-}