browsertime 21.6.1 → 21.7.0

package/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## 21.7.0 - 2024-04-03
+### Added
+* Edge and Edgedriver 123 [#2116](https://github.com/sitespeedio/browsertime/pull/2116).
+
+### Fixed
+*  Updated to Selenium 4.19.0 [#2117](https://github.com/sitespeedio/browsertime/pull/2117).
+* Block domains using Bidi instead of the extension server for Firefox [#2118](https://github.com/sitespeedio/browsertime/pull/2118).
+
 ## 21.6.1 - 2024-03-22
 ### Fixed
-* Fix runnimg Safari TP. Thank you [KS](https://github.com/92kns) for PR [#2115](https://github.com/sitespeedio/browsertime/pull/2115).
+* Fix running Safari TP. Thank you [KS](https://github.com/92kns) for PR [#2115](https://github.com/sitespeedio/browsertime/pull/2115).
 
 ## 21.6.0 - 2024-03-20
 ### Added

package/lib/extensionserver/index.js

@@ -17,7 +17,6 @@ export class ExtensionServer {
     return options.browser === 'firefox' &&
       (options.cacheClearRaw ||
         options.requestheader ||
-        options.block ||
         options.clearCacheKeepCookies)
       ? true
       : false;

package/lib/extensionserver/setup.js

@@ -6,9 +6,7 @@ const delay = ms => new Promise(res => setTimeout(res, ms));
 
 function generateURL(port, testUrl, options) {
   const query = {};
-  if (options.block) {
-    query.bl = toArray(options.block);
-  }
+
   if (options.requestheader) {
     query.rh = toArray(options.requestheader);
   }

package/lib/firefox/firefoxBidi.js

@@ -29,6 +29,55 @@ export class FirefoxBidi {
     }
   }
 
+  async blockUrls(blockers) {
+    // bin/browsertime.js --block upload.wikimedia.org https://en.wikipedia.org/wiki/Barack_Obama -n 1 -b firefox
+    const patterns = [];
+    const block = toArray(blockers);
+    for (let b of block) {
+      // Block a specific URL
+      if (b.startsWith('http')) {
+        patterns.push({ type: 'string', pattern: b });
+      } else {
+        // Block by domain
+        patterns.push({ type: 'pattern', hostname: b });
+      }
+    }
+
+    const bidi = new Bidi(this.driver, this.options.browser);
+
+    const command = {
+      method: 'network.addIntercept',
+      params: {
+        phases: ['beforeRequestSent'],
+        urlPatterns: patterns
+      }
+    };
+    const result = await bidi.send(command);
+    if (result.type != 'success') {
+      log.error(result);
+    }
+
+    await bidi.subscribe('network.beforeRequestSent');
+
+    await bidi.onMessage(async function (event) {
+      const parsedEvent = JSON.parse(Buffer.from(event.toString()));
+      if (
+        parsedEvent.method === 'network.beforeRequestSent' &&
+        parsedEvent.params.isBlocked === true
+      ) {
+        const fail = {
+          method: 'network.failRequest',
+          params: {
+            request: parsedEvent.params.request.request
+          }
+        };
+        const result = await bidi.send(fail);
+        if (result.type != 'success') {
+          log.error(result);
+        }
+      }
+    });
+  }
   async setBasicAuth(basicAuth) {
     const parts = basicAuth.split('@');
     const bidi = new Bidi(this.driver, this.options.browser);

package/lib/firefox/webdriver/firefox.js

@@ -97,6 +97,10 @@ export class Firefox {
       await this.browsertimeBidi.setBasicAuth(this.options.basicAuth);
     }
 
+    if (this.options.block) {
+      await this.browsertimeBidi.blockUrls(this.options.block);
+    }
+
     if (
       this.firefoxConfig.appendToUserAgent ||
       this.options.appendToUserAgent

package/lib/support/cli.js

@@ -1099,7 +1099,7 @@ export function parseCommandLine() {
     })
     .option('block', {
       describe:
-        'Domain to block or URL or URL pattern to block. If you use Chrome you can also use --blockDomainsExcept (that is more performant). Works in Chrome/Edge. For Firefox you can only block domains.'
+        'Domain to block or URL or URL pattern to block. If you use Chrome you can also use --blockDomainsExcept (that is more performant). Works in Chrome/Edge. For Firefox you block a URL if you start with http else you will block by setting a domain, like upload.wikimedia.org'
     })
     .option('percentiles', {
       type: 'array',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "browsertime",
   "description": "Get performance metrics from your web page using Browsertime.",
-  "version": "21.6.1",
+  "version": "21.7.0",
   "bin": "./bin/browsertime.js",
   "type": "module",
   "types": "./types/scripting.d.ts",
@@ -9,7 +9,7 @@
     "@cypress/xvfb": "1.2.4",
     "@devicefarmer/adbkit": "3.2.6",
     "@sitespeed.io/chromedriver": "123.0.6312-58",
-    "@sitespeed.io/edgedriver": "122.0.2365-92",
+    "@sitespeed.io/edgedriver": "123.0.2420-53",
     "@sitespeed.io/geckodriver": "0.34.0",
     "@sitespeed.io/throttle": "5.0.0",
     "@sitespeed.io/tracium": "0.3.3",
@@ -30,7 +30,7 @@
     "lodash.merge": "4.6.2",
     "lodash.pick": "4.4.0",
     "lodash.set": "4.3.2",
-    "selenium-webdriver": "4.18.1",
+    "selenium-webdriver": "4.19.0",
     "yargs": "17.7.2"
   },
   "optionalDependencies": {