browsertime 22.5.5 → 22.7.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## 22.7.0 - 2024-07-25
+### Added
+* Updated to Chrome and Chromedriover 127 [#2164](https://github.com/sitespeedio/browsertime/pull/2164).
+
+### Fixed
+* Updated to Selenium 4.23.0 [#2161](https://github.com/sitespeedio/browsertime/pull/2161).
+* Add extra check if the HAR file page misses an URL [#2160](https://github.com/sitespeedio/browsertime/pull/2160).
+
+## 22.6.0 - 2024-07-15
+### Added
+* Updated to Firefox 128 and Edge 126 in the Docker container [#2158](https://github.com/sitespeedio/browsertime/pull/2158).
+* Add request header using Bidi for Firefox (needs Firefox 128 or later) [#2108](https://github.com/sitespeedio/browsertime/pull/2108).
+
+### Fixed
+* Updated to Chrome HAR 0.13.5 [#2157](https://github.com/sitespeedio/browsertime/pull/2157)
+
 ## 22.5.5 - 2024-07-07
 ### Fixed
 * Fix stopping --tcpdump [#2155](https://github.com/sitespeedio/browsertime/pull/2155).

package/lib/core/engine/index.js

@@ -344,7 +344,13 @@ export class Engine {
     ) {
       const fullyLoadedPerUrl = getFullyLoaded(extras.har);
       for (let data of fullyLoadedPerUrl) {
-        collector.addFullyLoaded(data.url, data.fullyLoaded);
+        if (data.url === undefined) {
+          log.error(
+            'There is an page without an URL in the HAR. Please inspect the HAR file and check whats wrong'
+          );
+        } else {
+          collector.addFullyLoaded(data.url, data.fullyLoaded);
+        }
       }
 
       // Add the timings from the main document

package/lib/firefox/firefoxBidi.js

@@ -78,6 +78,7 @@ export class FirefoxBidi {
       }
     });
   }
+
   async setBasicAuth(basicAuth) {
     const parts = basicAuth.split('@');
     const bidi = new Bidi(this.driver, this.options.browser);
@@ -146,4 +147,52 @@ export class FirefoxBidi {
       }
     }
   }
+
+  async setRequestHeaders(requestHeaders) {
+    const headersArray = toArray(requestHeaders);
+    const headers = [];
+    for (let header of headersArray) {
+      if (header.indexOf && header.includes(':')) {
+        const parts = header.split(':');
+        headers.push({
+          name: parts[0],
+          value: {
+            type: 'string',
+            value: parts[1]
+          }
+        });
+      } else {
+        log.error(
+          'Request headers need to be of the format key:value not ' + header
+        );
+      }
+    }
+
+    const command = {
+      method: 'network.addIntercept',
+      params: {
+        phases: ['beforeRequestSent']
+      }
+    };
+    const bidi = new Bidi(this.driver, this.options.browser);
+
+    await bidi.send(command);
+    await bidi.subscribe('network.beforeRequestSent');
+    await bidi.onMessage(async function (event) {
+      const parsedEvent = JSON.parse(Buffer.from(event.toString()));
+      if (parsedEvent.method === 'network.beforeRequestSent') {
+        const continueRequest = {
+          method: 'network.continueRequest',
+          params: {
+            request: parsedEvent.params.request.request,
+            headers: [...parsedEvent.params.request.headers, ...headers]
+          }
+        };
+        const result = await bidi.send(continueRequest);
+        if (result.type != 'success') {
+          log.error(result);
+        }
+      }
+    });
+  }
 }

package/lib/firefox/webdriver/firefox.js

@@ -102,22 +102,25 @@ export class Firefox {
       await this.browsertimeBidi.setBasicAuth(this.options.basicAuth);
     }
 
-    if (this.options.block) {
-      await this.browsertimeBidi.blockUrls(this.options.block);
-    }
+    if (this.options.requestheader) {
+      await this.browsertimeBidi.setRequestHeaders(this.options.requestheader);
+      if (this.options.block) {
+        await this.browsertimeBidi.blockUrls(this.options.block);
+      }
 
-    if (
-      this.firefoxConfig.appendToUserAgent ||
-      this.options.appendToUserAgent
-    ) {
-      const currentUserAgent = await runner.runScript(
-        'return navigator.userAgent;',
-        'GET_USER_AGENT'
-      );
-      let script = `Services.prefs.setStringPref('general.useragent.override', '${currentUserAgent} ${
-        this.firefoxConfig.appendToUserAgent || this.options.appendToUserAgent
-      }');`;
-      return runner.runPrivilegedScript(script, 'SET_USER_AGENT');
+      if (
+        this.firefoxConfig.appendToUserAgent ||
+        this.options.appendToUserAgent
+      ) {
+        const currentUserAgent = await runner.runScript(
+          'return navigator.userAgent;',
+          'GET_USER_AGENT'
+        );
+        let script = `Services.prefs.setStringPref('general.useragent.override', '${currentUserAgent} ${
+          this.firefoxConfig.appendToUserAgent || this.options.appendToUserAgent
+        }');`;
+        return runner.runPrivilegedScript(script, 'SET_USER_AGENT');
+      }
     }
   }
 

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "browsertime",
   "description": "Get performance metrics from your web page using Browsertime.",
-  "version": "22.5.5",
+  "version": "22.7.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": "126.0.6478-55 ",
+    "@sitespeed.io/chromedriver": "127.0.6533-72",
     "@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",
     "btoa": "1.2.1",
-    "chrome-har": "0.13.3",
+    "chrome-har": "0.13.5",
     "chrome-remote-interface": "0.33.2",
     "dayjs": "1.11.11",
     "execa": "9.3.0",
@@ -30,7 +30,7 @@
     "lodash.merge": "4.6.2",
     "lodash.pick": "4.4.0",
     "lodash.set": "4.3.2",
-    "selenium-webdriver": "4.22.0",
+    "selenium-webdriver": "4.23.0",
     "usb-power-profiling": "^1.2.0",
     "yargs": "17.7.2"
   },