browsertime 16.11.0 → 16.11.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## 16.11.3 - 2022-07-14
+
+### Fixed
+* If one of the visual elements failed, all failed. Fixed in [#1818](https://github.com/sitespeedio/browsertime/pull/1818).
+* Use buffered long tasks instead of injecting the measuremnt in the page [#1817](https://github.com/sitespeedio/browsertime/pull/1817).
+* Fixed broken CHromedriver and Geckodriver install on Windows.
+
+## 16.11.2 - 2022-07-05
+### Fixed
+* Updated Geckodriver install, it will autoamtically pickup Geckodriver in the path for Raspberry Pis.
+## 16.11.1 - 2022-06-29
+### Fixed
+* Fixed `--preWarmServer` so it works with `--headless`, Docker and specific Android or iOS device [#1815](https://github.com/sitespeedio/browsertime/pull/1815).
 ## 16.11.0 - 2022-06-28
 
 ### Added 

package/bin/browsertime.js

@@ -7,6 +7,8 @@ const logging = require('../').logging;
 const cli = require('../lib/support/cli');
 const StorageManager = require('../lib/support/storageManager');
 const merge = require('lodash.merge');
+const get = require('lodash.get');
+const set = require('lodash.set');
 const fs = require('fs');
 const path = require('path');
 const log = require('intel').getLogger('browsertime');
@@ -28,12 +30,37 @@ async function parseUserScripts(scripts) {
 }
 
 async function preWarmServer(urls, options) {
-  let engine = new Engine({
+  const preWarmOptions = {
     browser: options.browser,
     iterations: 1,
     xvfb: options.xvfb,
-    android: options.android
-  });
+    android: options.android,
+    docker: options.docker,
+    headless: options.headless
+  };
+  const chromeDevice = get(options, 'chrome.android.deviceSerial');
+  const firefoxDevice = get(options, 'firefox.android.deviceSerial');
+  const safariIos = get(options, 'safari.ios');
+  const safariDeviceName = get(options, 'safari.deviceName');
+  const safariDeviceUDID = get(options, 'safari.deviceUDID ');
+
+  if (chromeDevice) {
+    set(options, 'chrome.android.deviceSerial', chromeDevice);
+  } else if (firefoxDevice) {
+    set(options, 'firefox.android.deviceSerial', firefoxDevice);
+  }
+
+  if (safariIos) {
+    set(options, 'safari.ios', true);
+    if (safariDeviceName) {
+      set(options, 'safari.deviceName', safariDeviceName);
+    }
+    if (safariDeviceUDID) {
+      set(options, 'safari.deviceUDID', safariDeviceUDID);
+    }
+  }
+
+  let engine = new Engine(preWarmOptions);
   await engine.start();
   log.info('Start pre-testing/warming');
   await engine.runMultiple(urls, {});

package/browserscripts/pageinfo/longTask.js

@@ -1,25 +1,29 @@
 (function(minLength) {
-  if (window.__bt_longtask) {
-    const cleaned = [];
-    for (let event of window.__bt_longtask.e) {
-      if (event.duration >= minLength) {
-        const e = {};
-        e.duration = event.duration;
-        e.name = event.name;
-        e.startTime = event.startTime;
-        e.attribution = [];
-        for (let at of event.attribution) {
-          const a = {};
-          a.containerId = at.containerId;
-          a.containerName = at.containerName;
-          a.containerSrc = at.containerSrc;
-          a.containerType = at.containerType;
-          e.attribution.push(a);
-        }
-        cleaned.push(e);
+  const supported = PerformanceObserver.supportedEntryTypes;
+  if (!supported || supported.indexOf('longtask') === -1) {
+    return;
+  }
+  const observer = new PerformanceObserver(list => {});
+  observer.observe({type: 'longtask', buffered: true});
+  const entries = observer.takeRecords(); 
+  const cleaned = [];
+  for (let event of entries) {
+    if (event.duration >= minLength) {
+      const e = {};
+      e.duration = event.duration;
+      e.name = event.name;
+      e.startTime = event.startTime;
+      e.attribution = [];
+      for (let at of event.attribution) {
+        const a = {};
+        a.containerId = at.containerId;
+        a.containerName = at.containerName;
+        a.containerSrc = at.containerSrc;
+        a.containerType = at.containerType;
+        e.attribution.push(a);
       }
+      cleaned.push(e);
     }
-    window.__bt_longtask.e = [];
-    return cleaned;
   }
-})(arguments[arguments.length - 1]);
+  return cleaned;
+})(arguments[arguments.length - 1]);

package/browsertime/visualmetrics-portable.py

@@ -1266,14 +1266,16 @@ def calculate_visual_metrics(
                     viewport = hero_data["viewport"]
                     hero_timings = []
                     for hero in hero_data["heroes"]:
-                        hero_timings.append(
-                            {
-                                "name": hero["name"],
-                                "value": calculate_hero_time(
+                        hero_time = calculate_hero_time(
                                     progress, dirs, hero, viewport
-                                ),
-                            }
-                        )
+                                )
+                        if hero_time is not None:
+                            hero_timings.append(
+                                {
+                                    "name": hero["name"],
+                                    "value": hero_time,
+                                }
+                            )
                     hero_timings_sorted = sorted(
                         hero_timings, key=lambda timing: timing["value"]
                     )

package/lib/chrome/chromeDevtoolsProtocol.js

@@ -108,19 +108,6 @@ class ChromeDevtoolsProtocol {
     });
   }
 
-  async setupLongTask() {
-    const source = `
-    !function() {
-      let lt = window.__bt_longtask={e:[]};
-      lt.o = new PerformanceObserver(function(a) {
-        lt.e=lt.e.concat(a.getEntries());
-      });
-      lt.o.observe({entryTypes:['longtask']});
-    }();`;
-
-    return this.cdpClient.Page.addScriptToEvaluateOnNewDocument({ source });
-  }
-
   async setBasicAuth(basicAuth) {
     const parts = basicAuth.split('@');
     const basic = 'Basic ' + btoa(parts[0] + ':' + parts[1]);

package/lib/chrome/webdriver/chromium.js

@@ -121,8 +121,6 @@ class Chromium {
       await this.cdpClient.setUserAgent(this.options.userAgent);
     }
 
-    await this.cdpClient.setupLongTask();
-
     await this.cdpClient.loadingFailed();
 
     // Make sure we clear the console log

package/lib/video/postprocessing/visualmetrics/visualMetrics.js

@@ -28,6 +28,7 @@ const PORTABLE_SCRIPT_PATH = path.join(
 
 function getScript(options) {
   if (options.visualMetricsPortable) {
+    log.info('Use the visual metrics portable script');
     return PORTABLE_SCRIPT_PATH;
   }
   return SCRIPT_PATH;

package/package.json

@@ -1,13 +1,13 @@
 {
   "description": "Browsertime",
-  "version": "16.11.0",
+  "version": "16.11.3",
   "bin": "./bin/browsertime.js",
   "dependencies": {
     "@cypress/xvfb": "1.2.4",
     "@devicefarmer/adbkit": "2.11.3",
-    "@sitespeed.io/chromedriver": "103.0.5060-24",
+    "@sitespeed.io/chromedriver": "103.0.5060-24b",
     "@sitespeed.io/edgedriver": "103.0.1264-37",
-    "@sitespeed.io/geckodriver": "0.31.0",
+    "@sitespeed.io/geckodriver": "0.31.0-c",
     "@sitespeed.io/throttle": "4.0.1",
     "@sitespeed.io/tracium": "0.3.3",
     "btoa": "1.2.1",