Merge branch 'main' into new-network-idle

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## 17.17.0 - 2022-10-11
+### Added
+* Firefox 118, Edge 117 and Chrome/Chromedriver 118 in the Docker container [#1996](https://github.com/sitespeedio/browsertime/pull/1996).
+* Expose trace start/stop for Chrome in scripting (the same way as for Firefox). Thank you [KS](https://github.com/92kns) for [#1988](https://github.com/sitespeedio/browsertime/pull/1988). Documentation is coming when the functionality is rolled out in sitespeed.io.
+
+### Updated
+* Updated to Selenium 4.12
+
 ## 17.16.0 - 2022-09-04
 ### Added
 * Firefox 117 and Edge 116 in the Docker container.

browserscripts/pageinfo/resources.js

@@ -1,14 +1,27 @@
-(function() {
+(function () {
   const resources = window.performance.getEntriesByType('resource');
 
   let resourceDuration = 0;
+  let servedFromCache = 0;
+  let servedFromCacheSupported = false;
   for (let i = 0; i < resources.length; i++) {
     resourceDuration += resources[i].duration;
+    if (resources[i].deliveryType !== undefined) {
+      servedFromCacheSupported = true;
+      if (resources[i].deliveryType === 'cache') {
+        servedFromCache++;
+      }
+    }
   }
 
-  return {
+  const info = {
     count: Number(resources.length),
-    duration: Number(resourceDuration)
+    duration: Number(resourceDuration),
+  };
+
+  if (servedFromCacheSupported === true) {   
+    info.servedFromCache = Number(servedFromCache);
   }
-})();
 
+  return info;
+})();

lib/core/engine/command/geckoProfiler.js

@@ -1,11 +1,12 @@
 import intel from 'intel';
 const log = intel.getLogger('browsertime.command.geckoprofiler');
 export class GeckoProfiler {
-  constructor(GeckoProfiler, browser, index, options) {
+  constructor(GeckoProfiler, browser, index, options, result) {
     this.GeckoProfiler = GeckoProfiler;
     this.browser = browser;
     this.index = index;
     this.options = options;
+    this.result = result;
   }
 
   async start() {
@@ -25,11 +26,7 @@ export class GeckoProfiler {
   async stop() {
     if (this.options.browser === 'firefox') {
       if (this.options.firefox.geckoProfilerRecordingType === 'custom') {
-        const url = await this.browser
-          .getDriver()
-          .executeScript('return document.documentURI;');
-
-        return this.GeckoProfiler.stop(this.index, url);
+        return this.GeckoProfiler.stop(this.index, this.result[0].url);
       }
     } else {
       throw new Error('Geckoprofiler only works in Firefox');

lib/core/engine/iteration.js

@@ -159,7 +159,8 @@ export class Iteration {
         browserProfiler,
         browser,
         index,
-        this.options
+        this.options,
+        result
       );
       const cdp = new ChromeDevelopmentToolsProtocol(
         engineDelegate,

package.json

@@ -1,13 +1,13 @@
 {
   "name": "browsertime",
   "description": "Get performance metrics from your web page using Browsertime.",
-  "version": "17.16.0",
+  "version": "17.17.0",
   "bin": "./bin/browsertime.js",
   "type": "module",
   "dependencies": {
     "@cypress/xvfb": "1.2.4",
     "@devicefarmer/adbkit": "2.11.3",
-    "@sitespeed.io/chromedriver": "118.0.5993-70",
+    "@sitespeed.io/chromedriver": "119.0.6045-21",
     "@sitespeed.io/edgedriver": "115.0.1901-183",
     "@sitespeed.io/geckodriver": "0.33.0",
     "@sitespeed.io/throttle": "5.0.0",