browsertime 16.10.0 → 16.11.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## 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 
+* Firefox 102 and Edge 103 in the Docker container.
+* Use Edgedriver 103 [#1812](https://github.com/sitespeedio/browsertime/pull/1812)
+### Fixed
+* Upgraded to Selenium 4.3.0 [#1813](https://github.com/sitespeedio/browsertime/pull/1813).
+
+## 16.10.1 - 2022-06-26
+
+### Fixed
+* Verify that the CDP port is free before using it [1811](https://github.com/sitespeedio/browsertime/pull/1811).
+
 ## 16.10.0 - 2022-06-23
 ### Added
 * Upgraded the Docker container to use Chrome 103.

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/lib/chrome/chromeDevtoolsProtocol.js

@@ -56,7 +56,7 @@ class ChromeDevtoolsProtocol {
           port: this.options.devToolsPort
         });
       } else {
-        this.cdpClient = await CDP({});
+        this.cdpClient = await CDP({ port: this.options.devToolsPort });
       }
       // Enable what's needs to be enabled
       // Page is needed to inject JS to a page

package/lib/chrome/settings/chromeDesktopOptions.js

@@ -24,6 +24,5 @@ module.exports = [
   '--disable-fetching-hints-at-navigation-start',
   '--disable-dev-shm-usage',
   '--disable-back-forward-cache',
-  '--disable-site-isolation-trials',
-  '--remote-debugging-port=9222'
+  '--disable-site-isolation-trials'
 ];

package/lib/chrome/webdriver/setupChromiumOptions.js

@@ -129,6 +129,9 @@ module.exports = function (seleniumOptions, browserOptions, options, baseDir) {
   } else {
     if (!browserOptions.noDefaultOptions) {
       seleniumOptions.addArguments(defaultChromeOptions);
+      seleniumOptions.addArguments(
+        '--remote-debugging-port=' + options.devToolsPort
+      );
     } else {
       log.info('Skip setting default options for Chrome');
     }

package/lib/core/engine/index.js

@@ -64,6 +64,10 @@ class Engine {
       host: '127.0.0.1'
     });
 
+    log.debug(
+      `Preparing port ${options.devToolsPort} for devtools on Chrome/Edge`
+    );
+
     options.safariDriverPort = await getPort({
       port: getPort.makeRange(1234, 2000),
       host: '127.0.0.1'

package/package.json

@@ -1,12 +1,12 @@
 {
   "description": "Browsertime",
-  "version": "16.10.0",
+  "version": "16.11.1",
   "bin": "./bin/browsertime.js",
   "dependencies": {
     "@cypress/xvfb": "1.2.4",
     "@devicefarmer/adbkit": "2.11.3",
     "@sitespeed.io/chromedriver": "103.0.5060-24",
-    "@sitespeed.io/edgedriver": "101.0.1210-32",
+    "@sitespeed.io/edgedriver": "103.0.1264-37",
     "@sitespeed.io/geckodriver": "0.31.0",
     "@sitespeed.io/throttle": "4.0.1",
     "@sitespeed.io/tracium": "0.3.3",
@@ -26,7 +26,7 @@
     "lodash.merge": "4.6.2",
     "lodash.pick": "4.4.0",
     "lodash.set": "4.3.2",
-    "selenium-webdriver": "4.2.0",
+    "selenium-webdriver": "4.3.0",
     "yargs": "17.4.1"
   },
   "optionalDependencies": {