Merge branch 'main' into edgedriver

lib/support/cli.js

@@ -5,7 +5,6 @@ import { hideBin } from 'yargs/helpers';
 import { findUpSync } from 'find-up';
 import get from 'lodash.get';
 import set from 'lodash.set';
-import hasbin from 'hasbin';
 import {
   framerate,
   crf,
@@ -16,6 +15,8 @@ import {
 import { screenshotDefaults } from '../screenshot/defaults.js';
 import { geckoProfilerDefaults } from '../firefox/settings/geckoProfilerDefaults.js';
 
+import { execaSync } from 'execa';
+
 const configPath = findUpSync(['.browsertime.json']);
 
 let config;
@@ -33,6 +34,16 @@ try {
   throw error;
 }
 
+function hasbin(bin) {
+  try {
+    const cmd = process.platform === 'win32' ? 'where' : 'which';
+    execaSync(cmd, bin);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 function validateInput(argv) {
   // Check NodeJS major version
   const fullVersion = process.versions.node;
@@ -70,7 +81,7 @@ function validateInput(argv) {
     }
   }
 
-  if ((argv.video || argv.visualMetrics) && !hasbin.sync(['ffmpeg'])) {
+  if ((argv.video || argv.visualMetrics) && !hasbin(['ffmpeg'])) {
     return 'You need to have ffmpeg in your path to be able to record a video.';
   }
 
@@ -90,11 +101,11 @@ function validateInput(argv) {
     return 'There is no benefit running debug mode inside a Docker container.';
   }
 
-  if (argv.tcpdump && !hasbin.sync(['tcpdump'])) {
+  if (argv.tcpdump && !hasbin(['tcpdump'])) {
     return 'You need to have tcpdump in your path to be able to record a tcpdump.';
   }
 
-  if (argv.gnirehtet && !hasbin.sync(['gnirehtet'])) {
+  if (argv.gnirehtet && !hasbin(['gnirehtet'])) {
     return 'You need to have gnirehtet in your path to be able to use it. If you run on a Mac you can install it using Homebrew: brew install gnirehtet';
   }
 

package.json

@@ -20,7 +20,6 @@
     "ff-test-bidi-har-export": "0.0.17",
     "find-up": "7.0.0",
     "get-port": "7.1.0",
-    "hasbin": "1.2.3",
     "intel": "1.2.0",
     "lodash.get": "4.4.2",
     "lodash.groupby": "4.6.0",