browsertime 17.0.0-beta.4 → 17.1.0

package/lib/support/logging.js

@@ -1,7 +1,7 @@
 import intel from 'intel';
 const { INFO, DEBUG, VERBOSE, TRACE, NONE, basicConfig } = intel;
 
-export default function configure(options) {
+export function configure(options) {
   options = options || {};
 
   let level = INFO;

package/lib/support/pathToFolder.js

@@ -9,7 +9,7 @@ function toSafeKey(key) {
   return key.replace(/[ %&()+,./:?|~–]|%7C/g, '-');
 }
 
-export default function (url, options) {
+export function pathToFolder(url, options) {
   if (options.useSameDir) {
     return '';
   } else {
@@ -40,9 +40,7 @@ export default function (url, options) {
       }
 
       // This is used from sitespeed.io to match URLs on Graphite
-      if (!options.storeURLsAsFlatPageOnDisk) {
-        pathSegments.push(...urlSegments);
-      } else {
+      if (options.storeURLsAsFlatPageOnDisk) {
         const folder = toSafeKey(urlSegments.join('_').concat('_'));
         if (folder.length > 255) {
           log.info(
@@ -52,6 +50,8 @@ export default function (url, options) {
         } else {
           pathSegments.push(folder);
         }
+      } else {
+        pathSegments.push(...urlSegments);
       }
     }
 

package/lib/support/preURL.js

@@ -2,7 +2,7 @@ import intel from 'intel';
 const log = intel.getLogger('browsertime');
 const delay = ms => new Promise(res => setTimeout(res, ms));
 
-export default async function (browser, options) {
+export async function preURL(browser, options) {
   log.info('Accessing preURL %s', options.preURL);
   await browser.loadAndWait(options.preURL);
   if (!options.preURLDisableWhiteBackground) {

package/lib/support/processes.js

@@ -1,5 +1,5 @@
 import { execaCommand as command } from 'execa';
-export default async function () {
+export async function getNumberOfRunningProcesses() {
   const { stdout } = await command('ps aux | wc -l', { shell: true });
   return stdout;
 }

package/lib/support/setResourceTimingBufferSize.js

@@ -1,4 +1,4 @@
-export default async function (startURL, driver, size) {
+export async function setResourceTimingBufferSize(startURL, driver, size) {
   await driver.get(startURL);
   await driver.executeScript(
     `window.performance.setResourceTimingBufferSize(${size});`

package/lib/support/stop.js

@@ -2,7 +2,7 @@ import { execa } from 'execa';
 import intel from 'intel';
 const log = intel.getLogger('browsertime');
 
-export default async function (processName) {
+export async function stop(processName) {
   const scriptArguments = ['-9', processName];
 
   log.debug('Kill all processes ' + processName);

package/lib/support/storageManager.js

@@ -49,7 +49,7 @@ async function streamToString(stream) {
   });
 }
 
-class StorageManager {
+export class StorageManager {
   constructor(url, { resultDir, prettyPrint = false } = {}) {
     this.baseDir = resultDir
       ? _resolve(resultDir)
@@ -134,5 +134,3 @@ class StorageManager {
     return this.baseDir;
   }
 }
-
-export default StorageManager;

package/lib/support/tcpdump.js

@@ -1,9 +1,9 @@
 import { join } from 'node:path';
 import { execa } from 'execa';
-import pathToFolder from './pathToFolder.js';
+import { pathToFolder } from './pathToFolder.js';
 import { rename } from './fileUtil.js';
 
-export default class TCPDump {
+export class TCPDump {
   constructor(directory, options) {
     this.baseDir = directory;
     this.options = options;

package/lib/support/xvfb.js

@@ -2,7 +2,7 @@ import { promisify } from 'node:util';
 import get from 'lodash.get';
 import Xvfb from '@cypress/xvfb';
 import { xvfbDisplay } from '../video/defaults.js';
-import getViewPort from '../support/getViewPort.js';
+import { getViewPort } from '../support/getViewPort.js';
 import { isAndroidConfigured } from '../android/index.js';
 
 function buildXvfbArguments({ display, screen = 0, size, silent }) {
@@ -41,7 +41,7 @@ async function stopXvfb(xvfb) {
  * Create a new XVFB instance
  * @class
  */
-class XVFB {
+export class XVFB {
   constructor(options) {
     this.options = options;
   }
@@ -67,5 +67,3 @@ class XVFB {
     }
   }
 }
-
-export default XVFB;

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

@@ -1,7 +1,7 @@
 import { execa } from 'execa';
 import intel from 'intel';
-import getTimingMetrics from './getTimingMetrics.js';
-import getFont from './getFont.js';
+import { getTimingMetrics } from './getTimingMetrics.js';
+import { getFont } from './getFont.js';
 import { isAndroidConfigured } from '../../../android/index.js';
 const log = intel.getLogger('browsertime.video');
 
@@ -14,7 +14,7 @@ function isSmallish(options) {
   );
 }
 
-export default async function (
+export async function addTextToVideo(
   inputFile,
   outputFile,
   videoMetrics,

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

@@ -2,7 +2,7 @@ import { execa } from 'execa';
 import intel from 'intel';
 const log = intel.getLogger('browsertime.video');
 
-export default async function (source, destination, framerate) {
+export async function convert(source, destination, framerate) {
   const scriptArguments = [
     '-nostdin',
     '-i',

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

@@ -1,5 +1,5 @@
 import { existsSync } from 'node:fs';
-export default function (options) {
+export function getFont(options) {
   // If the font is not part of the params and we're on macOS
   // we check that SFNSMono.ttf is available
   if (!options.videoParams.fontPath && process.platform === 'darwin') {

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

@@ -1,5 +1,5 @@
 import { isAndroidConfigured } from '../../../android/index.js';
-import getFont from './getFont.js';
+import { getFont } from './getFont.js';
 
 function isSmallish(options) {
   return (
@@ -30,7 +30,7 @@ function get(metric, metricName, pos, options) {
   },30)':x=(w-tw)/2: y=H-${pos}-h/${x}:fontcolor=white:fontsize=h/${fontSize}:box=1:boxcolor=0x000000AA:boxborderw=2:text='${metricName} ${metric}'`;
 }
 
-export default function (videoMetrics, timingMetrics, options) {
+export function getTimingMetrics(videoMetrics, timingMetrics, options) {
   let text = '';
   const vm = videoMetrics.visualMetrics;
   const startPosition = 'h/10';

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

@@ -7,9 +7,9 @@ import {
 import { promisify } from 'node:util';
 import intel from 'intel';
 import get from 'lodash.get';
-import addTextToVideo from './addTextToVideo.js';
-import removeOrange from './removeOrange.js';
-import convert from './convertFps.js';
+import { addTextToVideo } from './addTextToVideo.js';
+import { removeOrange } from './removeOrange.js';
+import { convert } from './convertFps.js';
 import { convert as _convert } from '../../defaults.js';
 import { isAndroidConfigured } from '../../../android/index.js';
 const rename = promisify(_rename);
@@ -17,7 +17,7 @@ const copyFile = promisify(_copyFile);
 const unlink = promisify(_unlink);
 const log = intel.getLogger('browsertime.video');
 
-export default async function (
+export async function finetuneVideo(
   videoDir,
   videoPath,
   index,

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

@@ -2,7 +2,7 @@ import { execa } from 'execa';
 import intel from 'intel';
 const log = intel.getLogger('browsertime.video');
 
-export default async function (
+export async function removeOrange(
   inputFile,
   outputFile,
   newStart,

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

@@ -1,4 +1,4 @@
-export default function (metrics) {
+export function extraMetrics(metrics) {
   const videoMetrics = {};
   if (!metrics.VisualReadiness) {
     metrics.VisualReadiness =

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

@@ -1,10 +1,10 @@
 import { join } from 'node:path';
 import intel from 'intel';
 import { run } from './visualMetrics.js';
-import extraMetrics from './extraMetrics.js';
+import { extraMetrics } from './extraMetrics.js';
 const log = intel.getLogger('browsertime.video');
 
-export default async function (
+export async function getVideoMetrics(
   videoDir,
   filmstripDir,
   videoPath,

package/lib/video/screenRecording/android/recorder.js

@@ -8,7 +8,7 @@ const unlink = promisify(_unlink);
 const log = intel.getLogger('browsertime.video');
 const delay = ms => new Promise(res => setTimeout(res, ms));
 
-export default class AndroidRecorder {
+export class AndroidRecorder {
   constructor(options) {
     this.waitTime = get(options, 'videoParams.androidVideoWaitTime', 5000);
     this.framerate = get(options, 'videoParams.framerate', framerate);

package/lib/video/screenRecording/desktop/convert.js

@@ -2,7 +2,7 @@ import { execa } from 'execa';
 import intel from 'intel';
 const log = intel.getLogger('browsertime.video');
 
-export default async function convert(source, destination, crf, threads) {
+export async function convert(source, destination, crf, threads) {
   const scriptArguments = [
     '-nostdin',
     '-i',

package/lib/video/screenRecording/desktop/desktopRecorder.js

@@ -3,7 +3,7 @@ import { unlink as _unlink, rename as _rename } from 'node:fs';
 import intel from 'intel';
 import get from 'lodash.get';
 import { start as _start, stop as _stop } from './ffmpegRecorder.js';
-import convert from './convert.js';
+import { convert } from './convert.js';
 import {
   xvfbDisplay,
   framerate as _framerate,
@@ -11,12 +11,12 @@ import {
   convert as _convert,
   threads as _threads
 } from '../../defaults.js';
-import getViewPort from '../../../support/getViewPort.js';
+import { getViewPort } from '../../../support/getViewPort.js';
 const unlink = promisify(_unlink);
 const rename = promisify(_rename);
 const log = intel.getLogger('browsertime.video');
 
-export default class DesktopRecorder {
+export class DesktopRecorder {
   constructor(options) {
     this.display = get(options, 'xvfbParams.display', xvfbDisplay);
     this.framerate = get(options, 'videoParams.framerate', _framerate);

package/lib/video/screenRecording/desktop/ffmpegRecorder.js

@@ -1,7 +1,7 @@
 import { execa } from 'execa';
 import intel from 'intel';
-import getScreenOnOSX from './osx/getScreen.js';
-import getSPDisplaysDataType from './osx/getSPDisplaysDataType.js';
+import { getScreenOnOSX } from './osx/getScreen.js';
+import { getSPDisplaysDataType } from './osx/getSPDisplaysDataType.js';
 const log = intel.getLogger('browsertime.video');
 
 async function buildX11FfmpegArguments({
@@ -98,15 +98,15 @@ async function startRecording(ffmpegArguments, nice, filePath) {
     });
   }
   let ffmpegProcess;
-  if (nice !== 0) {
+  if (nice === 0) {
+    log.debug('Start FFMPEG with %j', ffmpegArguments);
+    ffmpegProcess = execa('ffmpeg', ffmpegArguments);
+  } else {
     ffmpegArguments.unshift('ffmpeg');
     ffmpegArguments.unshift(`${nice}`);
     ffmpegArguments.unshift('-n');
     log.debug('Start FFMPEG with %j', ffmpegArguments);
     ffmpegProcess = execa('nice', ffmpegArguments);
-  } else {
-    log.debug('Start FFMPEG with %j', ffmpegArguments);
-    ffmpegProcess = execa('ffmpeg', ffmpegArguments);
   }
 
   // Race to catch if ffmpeg exists early, or if recording has started

package/lib/video/screenRecording/desktop/osx/getSPDisplaysDataType.js

@@ -1,6 +1,6 @@
 import { execaCommand as command } from 'execa';
 
-export default async function () {
+export async function getSPDisplaysDataType() {
   const output = await command('system_profiler SPDisplaysDataType', {
     shell: true
   });

package/lib/video/screenRecording/desktop/osx/getScreen.js

@@ -2,7 +2,7 @@ import { execa } from 'execa';
 import intel from 'intel';
 const log = intel.getLogger('browsertime.video');
 
-export default async function () {
+export async function getScreenOnOSX() {
   const scriptArguments = [
     '-hide_banner',
     '-f',

package/lib/video/screenRecording/firefox/firefoxWindowRecorder.js

@@ -147,7 +147,7 @@ async function generateVideo(destination, recordingDirectoryName) {
   return removeDirAndFiles(recordingDirectoryName);
 }
 
-export default class FirefoxWindowRecorder {
+export class FirefoxWindowRecorder {
   constructor(options, browser, baseDir) {
     this.options = options;
     this.browser = browser;

package/lib/video/screenRecording/ios/convertToMp4.js

@@ -2,7 +2,7 @@ import { execa } from 'execa';
 import intel from 'intel';
 const log = intel.getLogger('browsertime.video');
 
-export default async function convert(source, destination) {
+export async function convert(source, destination) {
   const scriptArguments = [
     '-framerate',
     60,

package/lib/video/screenRecording/ios/iosRecorder.js

@@ -4,7 +4,7 @@ import { resolve, join } from 'node:path';
 import { execaCommand as command } from 'execa';
 import { promisify } from 'node:util';
 import { unlink as _unlink } from 'node:fs';
-import convert from './convertToMp4.js';
+import { convert } from './convertToMp4.js';
 import intel from 'intel';
 const log = intel.getLogger('browsertime.video');
 const unlink = promisify(_unlink);
@@ -13,7 +13,7 @@ const moduleRootPath = resolve(__dirname, '..', '..', '..', '..');
 const QVH = resolve(moduleRootPath, 'vendor', 'mac', 'x86', 'qvh');
 const delay = ms => new Promise(res => setTimeout(res, ms));
 
-export default class IOSRecorder {
+export class IOSRecorder {
   constructor(options, baseDir) {
     this.options = options;
     this.uuid = options.safari.deviceUDID;

package/lib/video/screenRecording/iosSimulator/convertToMp4.js

@@ -2,7 +2,7 @@ import { execa } from 'execa';
 import intel from 'intel';
 const log = intel.getLogger('browsertime.video');
 
-export default async function convert(source, destination) {
+export async function convert(source, destination) {
   const scriptArguments = [
     //  '-framerate',
     //  60,

package/lib/video/screenRecording/iosSimulator/recorder.js

@@ -3,12 +3,12 @@ import util from 'node:util';
 import fs from 'node:fs';
 import { execa } from 'execa';
 import intel from 'intel';
-import { default as convert } from './convertToMp4.js';
+import { convert } from './convertToMp4.js';
 const unlink = util.promisify(fs.unlink);
 const delay = ms => new Promise(res => setTimeout(res, ms));
 const log = intel.getLogger('browsertime.video');
 
-export default class IOSSimulatorRecorder {
+export class IOSSimulatorRecorder {
   constructor(options, baseDir) {
     this.options = options;
     this.tmpVideo = path.join(baseDir, 'tmp.mov');

package/lib/video/screenRecording/recorder.js

@@ -1,11 +1,11 @@
 import { isAndroidConfigured } from '../../android/index.js';
-import AndroidRecorder from './android/recorder.js';
-import DesktopRecorder from './desktop/desktopRecorder.js';
-import FirefoxWindowRecorder from './firefox/firefoxWindowRecorder.js';
-import IOSSimulatorRecorder from './iosSimulator/recorder.js';
-import IOSRecorder from './ios/iosRecorder.js';
+import { AndroidRecorder } from './android/recorder.js';
+import { DesktopRecorder } from './desktop/desktopRecorder.js';
+import { FirefoxWindowRecorder } from './firefox/firefoxWindowRecorder.js';
+import { IOSSimulatorRecorder } from './iosSimulator/recorder.js';
+import { IOSRecorder } from './ios/iosRecorder.js';
 
-export default function getRecorder(options, browser, baseDir) {
+export function getRecorder(options, browser, baseDir) {
   if (
     options.browser === 'firefox' &&
     options.firefox &&

package/lib/video/screenRecording/setOrangeBackground.js

@@ -1,7 +1,7 @@
 import intel from 'intel';
 import { until, By } from 'selenium-webdriver';
 const log = intel.getLogger('browsertime.video');
-export default async function (driver) {
+export async function setOrangeBackground(driver) {
   log.debug('Add orange color');
   // We tried other ways for Android (access an orange page)
   // That works fine ... but break scripts

package/lib/video/video.js

@@ -1,16 +1,16 @@
 import { join } from 'node:path';
 import get from 'lodash.get';
-import getRecorder from './screenRecording/recorder.js';
-import getVideoMetrics from './postprocessing/visualmetrics/getVideoMetrics.js';
-import finetuneVideo from './postprocessing/finetune/index.js';
+import { getRecorder } from './screenRecording/recorder.js';
+import { getVideoMetrics } from './postprocessing/visualmetrics/getVideoMetrics.js';
+import { finetuneVideo } from './postprocessing/finetune/index.js';
 import { rename, removeFile, removeDirAndFiles } from '../support/fileUtil.js';
-import pathToFolders from '../support/pathToFolder.js';
+import { pathToFolder } from '../support/pathToFolder.js';
 
 /**
  * Create a new Video that handles everything with the video
  * @class
  */
-class Video {
+export class Video {
   constructor(storageManager, options, browser) {
     this.options = options;
     this.storageManager = storageManager;
@@ -24,15 +24,15 @@ class Video {
     this.index = index;
 
     this.videoDir = await storageManager.createSubDataDir(
-      join(pathToFolders(url, this.options), 'video')
+      join(pathToFolder(url, this.options), 'video')
     );
 
     await storageManager.createSubDataDir(
-      join(pathToFolders(url, this.options), 'video', 'images', '' + index)
+      join(pathToFolder(url, this.options), 'video', 'images', '' + index)
     );
 
     this.filmstripDir = await storageManager.createSubDataDir(
-      join(pathToFolders(url, this.options), 'filmstrip', '' + index)
+      join(pathToFolder(url, this.options), 'filmstrip', '' + index)
     );
   }
 
@@ -60,7 +60,7 @@ class Video {
     this.isRecording = false;
     this.videoPath = join(
       this.storageManager.directory,
-      pathToFolders(url, this.options),
+      pathToFolder(url, this.options),
       'video',
       this.index + '.mp4'
     );
@@ -120,5 +120,3 @@ class Video {
     return this.recorder.timeToFirstFrame;
   }
 }
-
-export default Video;

package/package.json

@@ -1,20 +1,20 @@
 {
   "description": "Browsertime",
-  "version": "17.0.0-beta.4",
+  "version": "17.1.0",
   "bin": "./bin/browsertime.js",
   "type": "module",
   "dependencies": {
     "@cypress/xvfb": "1.2.4",
     "@devicefarmer/adbkit": "2.11.3",
-    "@sitespeed.io/chromedriver": "106.0.5249-61",
-    "@sitespeed.io/edgedriver": "106.0.1370-34",
-    "@sitespeed.io/geckodriver": "0.31.0-c",
+    "@sitespeed.io/chromedriver": "110.0.5481-77",
+    "@sitespeed.io/edgedriver": "109.0.1518-70",
+    "@sitespeed.io/geckodriver": "0.32.0",
     "@sitespeed.io/throttle": "5.0.0",
     "@sitespeed.io/tracium": "0.3.3",
     "btoa": "1.2.1",
-    "chrome-har": "0.13.0",
-    "chrome-remote-interface": "0.31.3",
-    "dayjs": "1.11.6",
+    "chrome-har": "0.13.1",
+    "chrome-remote-interface": "0.32.0",
+    "dayjs": "1.11.7",
     "execa": "6.1.0",
     "fast-stats": "0.0.6",
     "find-up": "6.3.0",
@@ -27,21 +27,21 @@
     "lodash.merge": "4.6.2",
     "lodash.pick": "4.4.0",
     "lodash.set": "4.3.2",
-    "selenium-webdriver": "4.5.0",
-    "yargs": "17.6.0"
+    "selenium-webdriver": "4.8.0",
+    "yargs": "17.6.2"
   },
   "optionalDependencies": {
-    "jimp": "0.16.2"
+    "jimp": "0.22.1"
   },
   "devDependencies": {
-    "ava": "5.0.1",
-    "eslint": "8.26.0",
-    "eslint-config-prettier": "8.5.0",
+    "ava": "5.1.0",
+    "eslint": "8.31.0",
+    "eslint-config-prettier": "8.6.0",
     "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-unicorn": "44.0.2",
-    "prettier": "2.7.1",
-    "serve-handler": "6.1.3",
-    "serve": "14.0.1"
+    "eslint-plugin-unicorn": "45.0.2",
+    "prettier": "2.8.2",
+    "serve-handler": "6.1.5",
+    "serve": "14.1.2"
   },
   "engines": {
     "node": ">=14.19.1"
@@ -93,7 +93,7 @@
       "!test/data"
     ],
     "concurrency": 1,
-    "failFast": false,
+    "failFast": true,
     "require": [
       "./test/util/setup.js"
     ],