browsertime 16.16.0 → 17.0.0-beta.0

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

@@ -1,23 +1,22 @@
-'use strict';
+import { execa } from 'execa';
+import intel from 'intel';
+const log = intel.getLogger('browsertime.video');
 
-const execa = require('execa');
-const log = require('intel').getLogger('browsertime.video');
-
-module.exports = async function convert(src, dest) {
-  const scriptArgs = [
+export default async function convert(source, destination) {
+  const scriptArguments = [
     //  '-framerate',
     //  60,
     '-i',
-    src,
+    source,
     '-c:v',
     'copy',
     '-f',
     'mp4',
-    dest,
+    destination,
     '-y'
   ];
 
-  log.debug('Converting video from h264 to mp4 %j', scriptArgs);
+  log.debug('Converting video from h264 to mp4 %j', scriptArguments);
 
-  return execa('ffmpeg', scriptArgs);
-};
+  return execa('ffmpeg', scriptArguments);
+}

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

@@ -1,13 +1,14 @@
-const log = require('intel').getLogger('browsertime.video');
-const path = require('path');
-const execa = require('execa');
-const util = require('util');
-const fs = require('fs');
+import path from 'node:path';
+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';
 const unlink = util.promisify(fs.unlink);
-const convert = require('./convertToMp4');
 const delay = ms => new Promise(res => setTimeout(res, ms));
+const log = intel.getLogger('browsertime.video');
 
-module.exports = class IOSSimulatorRecorder {
+export default class IOSSimulatorRecorder {
   constructor(options, baseDir) {
     this.options = options;
     this.tmpVideo = path.join(baseDir, 'tmp.mov');
@@ -35,6 +36,6 @@ module.exports = class IOSSimulatorRecorder {
     await delay(2500);
     await convert(this.tmpVideo, destination);
     await unlink(this.tmpVideo);
-    return Promise.resolve(this.xcrunProcess);
+    return this.xcrunProcess;
   }
-};
+}

package/lib/video/screenRecording/recorder.js

@@ -1,12 +1,11 @@
-'use strict';
-const { isAndroidConfigured } = require('../../android');
-const AndroidRecorder = require('./android/recorder');
-const DesktopRecorder = require('./desktop/desktopRecorder');
-const FirefoxWindowRecorder = require('./firefox/firefoxWindowRecorder');
-const IOSSimulatorRecorder = require('./iosSimulator/recorder');
-const IOSRecorder = require('./ios/iosRecorder');
+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';
 
-module.exports = function getRecorder(options, browser, baseDir) {
+export default function getRecorder(options, browser, baseDir) {
   if (
     options.browser === 'firefox' &&
     options.firefox &&
@@ -32,4 +31,4 @@ module.exports = function getRecorder(options, browser, baseDir) {
   }
 
   return new DesktopRecorder(options);
-};
+}

package/lib/video/screenRecording/setOrangeBackground.js

@@ -1,8 +1,7 @@
-'use strict';
-
-const log = require('intel').getLogger('browsertime.video');
-const { until, By } = require('selenium-webdriver');
-module.exports = async function (driver) {
+import intel from 'intel';
+import { until, By } from 'selenium-webdriver';
+const log = intel.getLogger('browsertime.video');
+export default async function (driver) {
   log.debug('Add orange color');
   // We tried other ways for Android (access an orange page)
   // That works fine ... but break scripts
@@ -27,4 +26,4 @@ module.exports = async function (driver) {
   // It seems that in some cases the video do not have any orange at the start, so make sure we
   // the div orange div really exits
   return driver.wait(until.elementsLocated(By.id('browsertime-orange')));
-};
+}

package/lib/video/video.js

@@ -1,11 +1,10 @@
-'use strict';
-const path = require('path');
-const get = require('lodash.get');
-const getRecorder = require('./screenRecording/recorder');
-const getVideoMetrics = require('./postprocessing/visualmetrics/getVideoMetrics');
-const finetuneVideo = require('./postprocessing/finetune/');
-const fileUtil = require('../support/fileUtil');
-const pathToFolders = require('../support/pathToFolder');
+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 { rename, removeFile, removeDirAndFiles } from '../support/fileUtil.js';
+import pathToFolders from '../support/pathToFolder.js';
 
 /**
  * Create a new Video that handles everything with the video
@@ -25,15 +24,15 @@ class Video {
     this.index = index;
 
     this.videoDir = await storageManager.createSubDataDir(
-      path.join(pathToFolders(url, this.options), 'video')
+      join(pathToFolders(url, this.options), 'video')
     );
 
     await storageManager.createSubDataDir(
-      path.join(pathToFolders(url, this.options), 'video', 'images', '' + index)
+      join(pathToFolders(url, this.options), 'video', 'images', '' + index)
     );
 
     this.filmstripDir = await storageManager.createSubDataDir(
-      path.join(pathToFolders(url, this.options), 'filmstrip', '' + index)
+      join(pathToFolders(url, this.options), 'filmstrip', '' + index)
     );
   }
 
@@ -48,8 +47,8 @@ class Video {
     // skip recording if we already have one going
     if (!this.isRecording) {
       this.isRecording = true;
-      let tmp = path.join(this.tmpDir, 'x11-tmp.mp4');
-      return this.recorder.start(tmp);
+      let temporary = join(this.tmpDir, 'x11-tmp.mp4');
+      return this.recorder.start(temporary);
     }
   }
 
@@ -59,7 +58,7 @@ class Video {
    */
   async stop(url) {
     this.isRecording = false;
-    this.videoPath = path.join(
+    this.videoPath = join(
       this.storageManager.directory,
       pathToFolders(url, this.options),
       'video',
@@ -72,16 +71,13 @@ class Video {
   async cleanup() {
     // Keep or remove the original file
     if (get(this.options, 'videoParams.keepOriginalVideo', false)) {
-      const originalFile = path.join(
-        this.videoDir,
-        this.index + '-original.mp4'
-      );
-      await fileUtil.rename(this.videoPath, originalFile);
+      const originalFile = join(this.videoDir, this.index + '-original.mp4');
+      await rename(this.videoPath, originalFile);
     } else {
-      await fileUtil.removeFile(this.videoPath);
+      await removeFile(this.videoPath);
     }
     // Remove all tmp videos (and screenshots)
-    return fileUtil.removeDirAndFiles(path.join(this.videoDir, 'tmp'));
+    return removeDirAndFiles(join(this.videoDir, 'tmp'));
   }
 
   /**
@@ -103,18 +99,16 @@ class Video {
         this.options
       );
     }
-    if (this.options.video === true) {
-      await finetuneVideo(
-        this.videoDir,
-        this.videoPath,
-        this.index,
-        videoMetrics,
-        timingMetrics,
-        this.options
-      );
-    } else {
-      await fileUtil.removeFile(this.videoPath);
-    }
+    await (this.options.video === true
+      ? finetuneVideo(
+          this.videoDir,
+          this.videoPath,
+          this.index,
+          videoMetrics,
+          timingMetrics,
+          this.options
+        )
+      : removeFile(this.videoPath));
     return videoMetrics;
   }
 
@@ -127,4 +121,4 @@ class Video {
   }
 }
 
-module.exports = Video;
+export default Video;

package/package.json

@@ -1,23 +1,24 @@
 {
   "description": "Browsertime",
-  "version": "16.16.0",
+  "version": "17.0.0-beta.0",
   "bin": "./bin/browsertime.js",
+  "type": "module",
   "dependencies": {
     "@cypress/xvfb": "1.2.4",
     "@devicefarmer/adbkit": "2.11.3",
-    "@sitespeed.io/chromedriver": "105.0.5195-19",
-    "@sitespeed.io/edgedriver": "104.0.1293-47",
+    "@sitespeed.io/chromedriver": "106.0.5249-61",
+    "@sitespeed.io/edgedriver": "106.0.1370-34",
     "@sitespeed.io/geckodriver": "0.31.0-c",
     "@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.1",
-    "execa": "5.1.1",
+    "dayjs": "1.11.6",
+    "execa": "6.1.0",
     "fast-stats": "0.0.6",
-    "find-up": "5.0.0",
-    "get-port": "5.1.1",
+    "find-up": "6.3.0",
+    "get-port": "6.1.2",
     "hasbin": "1.2.3",
     "intel": "1.2.0",
     "lodash.get": "4.4.2",
@@ -26,20 +27,21 @@
     "lodash.merge": "4.6.2",
     "lodash.pick": "4.4.0",
     "lodash.set": "4.3.2",
-    "selenium-webdriver": "4.4.0",
-    "yargs": "17.4.1"
+    "selenium-webdriver": "4.5.0",
+    "yargs": "17.6.0"
   },
   "optionalDependencies": {
-    "jimp": "0.16.1"
+    "jimp": "0.16.2"
   },
   "devDependencies": {
-    "ava": "4.3.3",
-    "eslint": "8.14.0",
+    "ava": "5.0.1",
+    "eslint": "8.26.0",
     "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-prettier": "4.0.0",
-    "prettier": "2.6.2",
+    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-unicorn": "44.0.2",
+    "prettier": "2.7.1",
     "serve-handler": "6.1.3",
-    "serve": "13.0.2"
+    "serve": "14.0.1"
   },
   "engines": {
     "node": ">=14.19.1"
@@ -60,7 +62,7 @@
     "package.json",
     "vendor"
   ],
-  "main": "index.js",
+  "exports": "./index.js",
   "scripts": {
     "test": "ava",
     "start-server": "serve test/data/html/",
@@ -91,7 +93,7 @@
       "!test/data"
     ],
     "concurrency": 1,
-    "failFast": true,
+    "failFast": false,
     "require": [
       "./test/util/setup.js"
     ],