browsertime 16.0.1 → 16.1.0

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
 
+## 16.1.0 - 2022-04-20
+### Fixed
+* Handle negative x/y offsets when cropping images in the new portable visual metrocs script, thank you [Gregory Mierzwinski](https://github.com/gmierz) for PR [#1770](https://github.com/sitespeedio/browsertime/pull/1770).
+* Bumped Throttle dependency [#1769](https://github.com/sitespeedio/browsertime/pull/1769).
+* Bumped chrome-har, chrome-remote-interface, dayjs and yargs dependencies [#1771](https://github.com/sitespeedio/browsertime/pull/1771).
+### Added
+* Added blocking of Chrome and Edge phone home domains [#1763](https://github.com/sitespeedio/browsertime/pull/1763).
+
 ## 16.0.1 - 2022-04-06
 ### Fixed
 * If visual metrics fails and you also use --visualElements, make sure that file is also stored so we can reporduce the issue [#1757](https://github.com/sitespeedio/browsertime/pull/1757).

package/browsertime/visualmetrics-portable.py

@@ -108,6 +108,11 @@ def crop_im(img, crop_x, crop_y, crop_x_offset, crop_y_offset, gravity=None):
         base_x += crop_x_offset
         base_y += crop_y_offset
 
+        # Take the maximum in case the offset was negative, and
+        # smaller than the base position
+        base_x = max(base_x, 0)
+        base_y = max(base_y, 0)
+
         return Image.fromarray(
             img[base_y : base_y + crop_y, base_x : base_x + crop_x, :]
         )
@@ -2109,9 +2114,10 @@ def calculate_contentful_speed_index(progress, directory):
             content.append(value)
 
         for i, value in enumerate(content):
-            content[i] = (
-                maxContent == 0 and 0.0 or float(content[i]) / float(maxContent)
-            )
+            if maxContent > 0:
+                content[i] = float(content[i]) / float(maxContent)
+            else:
+                content[i] = 0.0
 
         # Assume 0 content for first frame
         cont_si = 1 * (progress[1]["time"] - progress[0]["time"])

package/lib/chrome/webdriver/setupChromiumOptions.js

@@ -5,6 +5,17 @@ const getViewPort = require('../../support/getViewPort');
 const util = require('../../support/util');
 const log = require('intel').getLogger('browsertime.chrome');
 
+const CHROME_AMD_EDGE_INTERNAL_PHONE_HOME = [
+  '"MAP cache.pack.google.com 127.0.0.1"',
+  '"MAP clients1.google.com 127.0.0.1"',
+  '"MAP update.googleapis.com 127.0.0.1"',
+  '"MAP redirector.gvt1.com 127.0.0.1"',
+  '"MAP laptop-updates.brave.com 127.0.0.1"',
+  '"MAP offlinepages-pa.googleapis.com 127.0.0.1"',
+  '"MAP edge.microsoft.com 127.0.0.1"',
+  '"MAP optimizationguide-pa.googleapis.com 127.0.0.1"'
+];
+
 module.exports = function (seleniumOptions, browserOptions, options, baseDir) {
   // Fixing save password popup, only on Desktop
   if (!options.android) {
@@ -64,6 +75,17 @@ module.exports = function (seleniumOptions, browserOptions, options, baseDir) {
       excludes += 'MAP * 127.0.0.1, EXCLUDE ' + domain + ',';
     }
     seleniumOptions.addArguments('--host-resolver-rules=' + excludes);
+  } else {
+    // Make sure we only set this if we do not have any other host resolver rules
+    const chromeCommandLineArgs = util.toArray(browserOptions.args);
+    const argsWithHostResolverRules = chromeCommandLineArgs.filter(arg =>
+      arg.includes('host-resolver-rules')
+    );
+    if (argsWithHostResolverRules.length === 0) {
+      seleniumOptions.addArguments(
+        '--host-resolver-rules=' + CHROME_AMD_EDGE_INTERNAL_PHONE_HOME.join(',')
+      );
+    }
   }
 
   if (options.extension) {

package/lib/video/postprocessing/finetune/index.js

@@ -9,6 +9,7 @@ const fs = require('fs');
 const get = require('lodash.get');
 const { promisify } = require('util');
 const rename = promisify(fs.rename);
+const copyFile = promisify(fs.copyFile);
 const unlink = promisify(fs.unlink);
 const defaults = require('../../defaults');
 
@@ -23,6 +24,11 @@ module.exports = async function (
   const newStart = videoMetrics.videoRecordingStart / 1000;
   let tmpFile = path.join(videoDir, 'tmp.mp4');
 
+  if (get(options, 'videoParams.keepOriginalVideo', false)) {
+    const originalFile = path.join(videoDir, index + '-original.mp4');
+    await copyFile(videoPath, originalFile);
+  }
+
   // if there's no orange (too slow instance like travis?)
   // we don't wanna cut
   if (videoMetrics.videoRecordingStart > 0) {
@@ -45,11 +51,6 @@ module.exports = async function (
     tmpFile = videoPath;
   }
 
-  if (get(options, 'videoParams.keepOriginalVideo', false)) {
-    const originalFile = path.join(videoDir, index + '-original.mp4');
-    await rename(videoPath, originalFile);
-  }
-
   if (
     options.android &&
     get(options, 'videoParams.convert', defaults.convert)

package/package.json

@@ -1,6 +1,6 @@
 {
   "description": "Browsertime",
-  "version": "16.0.1",
+  "version": "16.1.0",
   "bin": "./bin/browsertime.js",
   "dependencies": {
     "@cypress/xvfb": "1.2.4",
@@ -8,12 +8,12 @@
     "@sitespeed.io/chromedriver": "100.0.4896-20",
     "@sitespeed.io/edgedriver": "100.0.1185-29",
     "@sitespeed.io/geckodriver": "0.30.0",
-    "@sitespeed.io/throttle": "3.0.0",
+    "@sitespeed.io/throttle": "3.1.1",
     "@sitespeed.io/tracium": "0.3.3",
     "btoa": "1.2.1",
-    "chrome-har": "0.12.0",
-    "chrome-remote-interface": "0.31.0",
-    "dayjs": "1.10.7",
+    "chrome-har": "0.13.0",
+    "chrome-remote-interface": "0.31.2",
+    "dayjs": "1.11.1",
     "execa": "5.1.1",
     "fast-stats": "0.0.6",
     "find-up": "5.0.0",
@@ -27,7 +27,7 @@
     "lodash.pick": "4.4.0",
     "lodash.set": "4.3.2",
     "selenium-webdriver": "4.1.1",
-    "yargs": "17.2.1"
+    "yargs": "17.4.1"
   },
   "optionalDependencies": {
     "jimp": "0.16.1"
@@ -42,7 +42,7 @@
     "serve": "13.0.2"
   },
   "engines": {
-    "node": ">=10.13.0"
+    "node": ">=14.19.1"
   },
   "files": [
     "CHANGELOG.md",