browsertime 16.8.0 → 16.9.1

package/lib/chrome/longTaskMetrics.js

@@ -5,6 +5,7 @@ const get = require('lodash.get');
 module.exports = function (result, options) {
   let totalDurationFirstPaint = 0;
   let totalDurationFirstContentFulPaint = 0;
+  let totalDurationLargestContentFulPaint = 0;
   let totalDurationAfterLoadEventEnd = 0;
   let totalDuration = 0;
 
@@ -22,10 +23,16 @@ module.exports = function (result, options) {
     'browserScripts.timings.paintTiming.first-contentful-paint'
   );
 
+  const largestContentfulPaint = get(
+    result,
+    'browserScripts.timings.largestContentfulPaint.renderTime'
+  ); // result.browserScripts.timings.largestContentfulPaint.loadTime;
+
   const loadEventEnd = get(result, 'browserScripts.timings.loadEventEnd');
 
   let longTasksBeforeFirstPaint = 0;
   let longTasksBeforeFirstContentfulPaint = 0;
+  let longTasksBeforeLargestContentfulPaint = 0;
   let longTasksAfterLoadEventEnd = 0;
   let lastLongTask = 0;
 
@@ -42,6 +49,10 @@ module.exports = function (result, options) {
       longTasksBeforeFirstContentfulPaint++;
       totalDurationFirstContentFulPaint += longTask.duration;
     }
+    if (largestContentfulPaint && longTask.startTime < largestContentfulPaint) {
+      longTasksBeforeLargestContentfulPaint++;
+      totalDurationLargestContentFulPaint += longTask.duration;
+    }
     if (
       firstContentfulPaint &&
       longTask.startTime > firstContentfulPaint &&
@@ -74,6 +85,10 @@ module.exports = function (result, options) {
         tasks: longTasksBeforeFirstContentfulPaint,
         totalDuration: totalDurationFirstContentFulPaint
       },
+      beforeLargestContentfulPaint: {
+        tasks: longTasksBeforeLargestContentfulPaint,
+        totalDuration: totalDurationLargestContentFulPaint
+      },
       afterLoadEventEnd: {
         tasks: longTasksAfterLoadEventEnd,
         totalDuration: totalDurationAfterLoadEventEnd

package/lib/connectivity/index.js

@@ -2,7 +2,6 @@
 
 const trafficShapeParser = require('./trafficShapeParser');
 const get = require('lodash.get');
-const throttle = require('@sitespeed.io/throttle');
 const log = require('intel').getLogger('browsertime.connectivity');
 const Humble = require('./humble');
 
@@ -56,6 +55,7 @@ module.exports = {
             profile.rtt
           );
         }
+        const throttle = await import('@sitespeed.io/throttle');
         if (setOnLocalHost) {
           return throttle.start({
             localhost: true,
@@ -91,6 +91,7 @@ module.exports = {
       }
       case 'throttle': {
         const setOnLocalHost = get(connectivity, 'throttle.localhost', false);
+        const throttle = await import('@sitespeed.io/throttle');
         return throttle.stop({ localhost: setOnLocalHost });
       }
       case 'humble': {

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

@@ -36,6 +36,7 @@ class Debug {
         );
         await delay(1000);
       }
+      log.info('Exit breakpoint and continue.');
       return this.browser.runScript(
         'window.browsertime.pause = false',
         'SET_PAUSE_STATUS'

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

@@ -101,5 +101,28 @@ class Wait {
   async byPageToComplete() {
     return this.browser.extraWait(this.pageCompleteCheck);
   }
+
+  /**
+   * Wait for an condition that will eventually return a truthy-value for maxTime.
+   * @param {string} jsExpression The js code condition to wait for
+   * @param {number} maxTime Max time to wait in ms
+   * @returns {Promise} Promise object represents when the expression becomes truthy or the time times out
+   * @throws Will throw an error if the condition returned false
+   */
+  async byCondition(jsExpression, maxTime) {
+    const driver = this.browser.getDriver();
+    const time = maxTime || 6000;
+
+    try {
+      const script = `return ${jsExpression}`;
+      await driver.wait(() => {
+        return driver.executeScript(script);
+      }, time);
+    } catch (e) {
+      log.error('Condition was not met', jsExpression, time);
+      log.verbose(e);
+      throw Error(`Condition ${jsExpression} was not met in ${time} ms`);
+    }
+  }
 }
 module.exports = Wait;

package/lib/core/seleniumRunner.js

@@ -5,7 +5,11 @@ const merge = require('lodash.merge');
 const get = require('lodash.get');
 const { Condition } = require('selenium-webdriver/lib/webdriver');
 const { isAndroidConfigured } = require('../android');
-const { UrlLoadError, BrowserError } = require('../support/errors');
+const {
+  UrlLoadError,
+  BrowserError,
+  TimeoutError
+} = require('../support/errors');
 const builder = require('./webdriver');
 const getViewPort = require('../support/getViewPort');
 const defaultPageCompleteCheck = require('./pageCompleteChecks/defaultPageCompleteCheck');
@@ -18,7 +22,7 @@ const defaults = {
     pageLoad: 300000,
     script: 120000,
     logs: 90000,
-    pageCompleteCheck: 300000
+    pageCompleteCheck: 60000
   },
   index: 0
 };
@@ -36,7 +40,7 @@ async function timeout(promise, ms, errorMessage) {
 
   return Promise.race([
     new Promise((resolve, reject) => {
-      timer = setTimeout(reject, ms, new BrowserError(errorMessage));
+      timer = setTimeout(reject, ms, new TimeoutError(errorMessage));
       return timer;
     }),
     promise.then(value => {
@@ -182,20 +186,26 @@ class SeleniumRunner {
         `Running page complete check ${pageCompleteCheck} took too long`
       );
     } catch (e) {
-      log.error(
-        `Failed waiting on page ${
-          url ? url : ''
-        } to finished loading, timed out after ${pageCompleteCheckTimeout} ms`,
-        e
-      );
-      throw new UrlLoadError(
-        `Failed waiting on page ${
-          url ? url : ''
-        }  to finished loading, timed out after ${pageCompleteCheckTimeout} ms `,
-        {
-          cause: e
-        }
-      );
+      if (e instanceof TimeoutError) {
+        log.info(
+          `The page did not finished loading in ${pageCompleteCheckTimeout} ms. You can adjust the timeout by setting the --maxLoadTime option (in ms).`
+        );
+      } else {
+        log.error(
+          `Failed waiting on page ${
+            url ? url : ''
+          } to finished loading, timed out after ${pageCompleteCheckTimeout} ms`,
+          e
+        );
+        throw new UrlLoadError(
+          `Failed waiting on page ${
+            url ? url : ''
+          }  to finished loading, timed out after ${pageCompleteCheckTimeout} ms `,
+          {
+            cause: e
+          }
+        );
+      }
     }
   }
 

package/lib/firefox/webdriver/firefox.js

@@ -104,19 +104,6 @@ class Firefox {
    */
   async afterPageCompleteCheck(runner, index, url, alias) {
     const result = { url, alias };
-    if (this.firefoxConfig.collectMozLog) {
-      const files = await fileUtil.findFiles(this.baseDir, 'moz_log.txt');
-      for (const file of files) {
-        await rename(
-          `${this.baseDir}/${file}`,
-          path.join(
-            this.baseDir,
-            pathToFolder(result.url, this.options),
-            `${file}-${index}.txt`
-          )
-        );
-      }
-    }
 
     if (this.android && this.options.androidPower) {
       result.power = await this.android.measurePowerUsage(
@@ -192,6 +179,20 @@ class Firefox {
 
   async postWork(index, results) {
     for (let i = 0; i < results.length; i++) {
+      if (this.firefoxConfig.collectMozLog) {
+        const files = await fileUtil.findFiles(this.baseDir, 'moz_log.txt');
+        for (const file of files) {
+          await rename(
+            `${this.baseDir}/${file}`,
+            path.join(
+              this.baseDir,
+              pathToFolder(results[i].url, this.options),
+              `${file}-${index}.txt`
+            )
+          );
+        }
+      }
+
       if (this.firefoxConfig.geckoProfiler && this.options.visualMetrics) {
         const profileFilename = `geckoProfile-${index}.json.gz`;
         const profileSubdir = pathToFolder(results[i].url, this.options);

package/lib/support/cli.js

@@ -162,7 +162,8 @@ module.exports.parseCommandLine = function parseCommandLine() {
       group: 'timeouts'
     })
     .option('timeouts.pageCompleteCheck', {
-      default: 300000,
+      alias: 'maxLoadTime',
+      default: 120000,
       type: 'number',
       describe:
         'Timeout when waiting for page to complete loading, in milliseconds',

package/lib/support/errors.js

@@ -21,8 +21,16 @@ class UrlLoadError extends BrowsertimeError {
   }
 }
 
+class TimeoutError extends BrowsertimeError {
+  constructor(message, url, extra) {
+    super(message, extra);
+    this.url = url;
+  }
+}
+
 module.exports = {
   BrowsertimeError,
   BrowserError,
-  UrlLoadError
+  UrlLoadError,
+  TimeoutError
 };

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

@@ -81,10 +81,6 @@ module.exports = {
       scriptArgs.push('--perceptual');
     }
 
-    if (options.visualMetricsNotification) {
-      scriptArgs.push('--notification');
-    }
-
     if (options.visualMetricsContentful) {
       scriptArgs.push('--contentful');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "description": "Browsertime",
-  "version": "16.8.0",
+  "version": "16.9.1",
   "bin": "./bin/browsertime.js",
   "dependencies": {
     "@cypress/xvfb": "1.2.4",
@@ -8,7 +8,7 @@
     "@sitespeed.io/chromedriver": "102.0.5005-27",
     "@sitespeed.io/edgedriver": "101.0.1210-32",
     "@sitespeed.io/geckodriver": "0.31.0",
-    "@sitespeed.io/throttle": "3.1.1",
+    "@sitespeed.io/throttle": "4.0.1",
     "@sitespeed.io/tracium": "0.3.3",
     "btoa": "1.2.1",
     "chrome-har": "0.13.0",