@wdio/utils 8.15.7 → 8.15.9

package/build/driver/index.d.ts

@@ -5,7 +5,7 @@ import { type GeckodriverParameters } from 'geckodriver';
 import { type EdgedriverParameters } from 'edgedriver';
 import type { InstallOptions } from '@puppeteer/browsers';
 import type { Options } from '@wdio/types';
-export type ChromedriverParameters = InstallOptions & Omit<EdgedriverParameters, 'port' | 'edgeDriverVersion' | 'customEdgeDriverPath'>;
+export type ChromedriverParameters = Partial<InstallOptions> & Omit<EdgedriverParameters, 'port' | 'edgeDriverVersion' | 'customEdgeDriverPath'>;
 declare global {
     namespace WebdriverIO {
         interface ChromedriverOptions extends ChromedriverParameters {

package/build/driver/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/driver/index.ts"],"names":[],"mappings":";AAGA,OAAO,EAAyB,MAAM,oBAAoB,CAAA;AAO1D,OAAO,EAA8B,KAAK,mBAAmB,IAAI,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAC7G,OAAO,EAA6B,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnF,OAAO,EAA0C,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAC9F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEzD,OAAO,KAAK,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAA;AAQxD,MAAM,MAAM,sBAAsB,GAAG,cAAc,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,mBAAmB,GAAG,sBAAsB,CAAC,CAAA;AACvI,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,WAAW,CAAC;QAClB,UAAU,mBAAoB,SAAQ,sBAAsB;SAAG;QAC/D,UAAU,kBAAmB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC;SAAG;QAC3E,UAAU,iBAAkB,SAAQ,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC;SAAG;QACzE,UAAU,mBAAoB,SAAQ,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC;SAAG;KAChF;CACJ;AAKD,wBAAsB,cAAc,CAAE,OAAO,EAAE,OAAO,CAAC,SAAS,wCA+H/D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/driver/index.ts"],"names":[],"mappings":";AAGA,OAAO,EAAyB,MAAM,oBAAoB,CAAA;AAO1D,OAAO,EAA8B,KAAK,mBAAmB,IAAI,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAC7G,OAAO,EAA6B,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnF,OAAO,EAA0C,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAC9F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEzD,OAAO,KAAK,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAA;AAQxD,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,mBAAmB,GAAG,sBAAsB,CAAC,CAAA;AAChJ,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,WAAW,CAAC;QAClB,UAAU,mBAAoB,SAAQ,sBAAsB;SAAG;QAC/D,UAAU,kBAAmB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC;SAAG;QAC3E,UAAU,iBAAkB,SAAQ,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC;SAAG;QACzE,UAAU,mBAAoB,SAAQ,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC;SAAG;KAChF;CACJ;AAKD,wBAAsB,cAAc,CAAE,OAAO,EAAE,OAAO,CAAC,SAAS,wCAmJ/D"}

package/build/driver/index.js

@@ -9,7 +9,7 @@ import { deepmerge } from 'deepmerge-ts';
 import { start as startSafaridriver } from 'safaridriver';
 import { start as startGeckodriver } from 'geckodriver';
 import { start as startEdgedriver, findEdgePath } from 'edgedriver';
-import { parseParams, setupChrome, definesRemoteDriver, setupChromedriver, isChrome, isFirefox, isEdge, isSafari, getCacheDir } from './utils.js';
+import { parseParams, setupPuppeteerBrowser, definesRemoteDriver, setupChromedriver, isChrome, isFirefox, isEdge, isSafari, getCacheDir } from './utils.js';
 import { SUPPORTED_BROWSERNAMES } from '../constants.js';
 const log = logger('@wdio/utils');
 const DRIVER_WAIT_TIMEOUT = 10 * 1000; // 10s
@@ -49,7 +49,7 @@ export async function startWebDriver(options) {
          * Chrome
          */
         const chromedriverOptions = caps['wdio:chromedriverOptions'] || {};
-        const { executablePath: chromeExecuteablePath, browserVersion } = await setupChrome(cacheDir, caps);
+        const { executablePath: chromeExecuteablePath, browserVersion } = await setupPuppeteerBrowser(cacheDir, caps);
         const { executablePath: chromedriverExcecuteablePath } = chromedriverOptions.binary
             ? { executablePath: chromedriverOptions.binary }
             : await setupChromedriver(cacheDir, browserVersion);
@@ -80,7 +80,17 @@ export async function startWebDriver(options) {
         /**
          * Firefox
          */
-        const geckodriverOptions = caps['wdio:geckodriverOptions'] || {};
+        const { executablePath } = await setupPuppeteerBrowser(cacheDir, caps);
+        caps['moz:firefoxOptions'] = deepmerge({ binary: executablePath }, caps['moz:firefoxOptions'] || {});
+        /**
+         * the "binary" parameter refers to the driver binary in the WebdriverIO.GeckodriverOptions and
+         * to the Firefox binary in the driver option
+         */
+        delete caps.browserVersion;
+        const { binary, ...geckodriverOptions } = caps['wdio:geckodriverOptions'] || {};
+        if (binary) {
+            geckodriverOptions.customGeckoDriverPath = binary;
+        }
         driver = 'GeckoDriver';
         driverProcess = await startGeckodriver({ ...geckodriverOptions, cacheDir, port });
     }
@@ -88,7 +98,10 @@ export async function startWebDriver(options) {
         /**
          * Microsoft Edge
          */
-        const edgedriverOptions = caps['wdio:edgedriverOptions'] || {};
+        const { binary, ...edgedriverOptions } = caps['wdio:edgedriverOptions'] || {};
+        if (binary) {
+            edgedriverOptions.customEdgeDriverPath = binary;
+        }
         driver = 'EdgeDriver';
         driverProcess = await startEdgedriver({ ...edgedriverOptions, cacheDir, port }).catch((err) => {
             log.warn(`Couldn't start EdgeDriver: ${err.message}, retry ...`);

package/build/driver/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/driver/manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAyFxD,wBAAsB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,kBAAkB,kCAazH;AAED,wBAAgB,YAAY,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,kBAAkB,kCAepH"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/driver/manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAgGxD,wBAAsB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,kBAAkB,kCAezH;AAED,wBAAgB,YAAY,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,kBAAkB,kCAYpH"}

package/build/driver/manager.js

@@ -1,7 +1,12 @@
 import logger from '@wdio/logger';
-import { getCacheDir, definesRemoteDriver, isSafari, isEdge, isFirefox, isChrome, setupChromedriver, setupEdgedriver, setupGeckodriver, setupChrome } from './utils.js';
+import { getCacheDir, definesRemoteDriver, getDriverOptions, isSafari, isEdge, isFirefox, isChrome, setupChromedriver, setupEdgedriver, setupGeckodriver, setupPuppeteerBrowser } from './utils.js';
 const log = logger('@wdio/utils');
 const UNDEFINED_BROWSER_VERSION = null;
+var BrowserDriverTaskLabel;
+(function (BrowserDriverTaskLabel) {
+    BrowserDriverTaskLabel["BROWSER"] = "browser binaries";
+    BrowserDriverTaskLabel["DRIVER"] = "browser driver";
+})(BrowserDriverTaskLabel || (BrowserDriverTaskLabel = {}));
 function mapCapabilities(options, caps, task, taskItemLabel) {
     const capabilitiesToRequireSetup = (Array.isArray(caps)
         ? caps.map((cap) => {
@@ -25,13 +30,15 @@ function mapCapabilities(options, caps, task, taskItemLabel) {
         })).flat().filter((cap) => (
     /**
      * only set up driver if
-     *   - browserName is defined so we know it is a browser session
-     *   - we are not about to run a cloud session
-     *   - we are not running Safari (driver already installed on macOS)
      */
+    // - browserName is defined so we know it is a browser session
     cap.browserName &&
+        // - we are not about to run a cloud session
         !definesRemoteDriver(options) &&
-        !isSafari(cap.browserName)));
+        // - we are not running Safari (driver already installed on macOS)
+        !isSafari(cap.browserName) &&
+        // - driver options don't define a binary path
+        !getDriverOptions(cap).binary));
     /**
      * nothing to setup
      */
@@ -71,13 +78,15 @@ export async function setupDriver(options, caps) {
             return setupEdgedriver(cacheDir, cap.browserVersion);
         }
         else if (isFirefox(cap.browserName)) {
-            return setupGeckodriver(cacheDir, cap.browserVersion);
+            // "latest" works for setting up browser only but not geckodriver
+            const version = cap.browserVersion === 'latest' ? undefined : cap.browserVersion;
+            return setupGeckodriver(cacheDir, version);
         }
         else if (isChrome(cap.browserName)) {
             return setupChromedriver(cacheDir, cap.browserVersion);
         }
         return Promise.resolve();
-    }, 'browser driver');
+    }, BrowserDriverTaskLabel.DRIVER);
 }
 export function setupBrowser(options, caps) {
     return mapCapabilities(options, caps, async (cap) => {
@@ -86,13 +95,9 @@ export function setupBrowser(options, caps) {
             // not yet implemented
             return Promise.resolve();
         }
-        else if (isFirefox(cap.browserName)) {
-            // not yet implemented
-            return Promise.resolve();
-        }
-        else if (isChrome(cap.browserName)) {
-            return setupChrome(cacheDir, cap);
+        else if (isChrome(cap.browserName) || isFirefox(cap.browserName)) {
+            return setupPuppeteerBrowser(cacheDir, cap);
         }
         return Promise.resolve();
-    }, 'browser binaries');
+    }, BrowserDriverTaskLabel.BROWSER);
 }

package/build/driver/utils.d.ts

@@ -1,13 +1,17 @@
 import type { EdgedriverParameters } from 'edgedriver';
 import type { Options, Capabilities } from '@wdio/types';
 export declare function parseParams(params: EdgedriverParameters): string[];
-export declare function getLocalChromePath(): string | undefined;
-export declare function getBuildIdByPath(chromePath?: string): string | undefined;
+export declare function getBuildIdByChromePath(chromePath?: string): string | undefined;
+export declare function getBuildIdByFirefoxPath(firefoxPath?: string): Promise<string | undefined>;
 export declare const downloadProgressCallback: (artifact: string, downloadedBytes: number, totalBytes: number) => void;
-export declare function setupChrome(cacheDir: string, caps: Capabilities.Capabilities): Promise<{
+export declare function setupPuppeteerBrowser(cacheDir: string, caps: Capabilities.Capabilities): Promise<{
     executablePath: string;
     browserVersion: string | undefined;
+} | {
+    executablePath: string | undefined;
+    browserVersion: string;
 }>;
+export declare function getDriverOptions(caps: Capabilities.Capabilities): WebdriverIO.ChromedriverOptions | WebdriverIO.GeckodriverOptions | WebdriverIO.EdgedriverOptions;
 export declare function getCacheDir(options: Pick<Options.WebDriver, 'cacheDir'>, caps: Capabilities.Capabilities): string;
 export declare function setupChromedriver(cacheDir: string, driverVersion?: string): Promise<{
     executablePath: string;

package/build/driver/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/driver/utils.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAOxD,wBAAgB,WAAW,CAAC,MAAM,EAAE,oBAAoB,YAYvD;AAED,wBAAgB,kBAAkB,uBAOjC;AAED,wBAAgB,gBAAgB,CAAC,UAAU,CAAC,EAAE,MAAM,sBAenD;AAGD,eAAO,MAAM,wBAAwB,aAAc,MAAM,mBAAmB,MAAM,cAAc,MAAM,SAOrG,CAAA;AAED,wBAAsB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,YAAY;;;GA4DlF;AAaD,wBAAgB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,YAAY,UAGzG;AAED,wBAAsB,iBAAiB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM;;GA8DhF;AAED,wBAAgB,gBAAgB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAEzE;AAED,wBAAgB,eAAe,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAExE;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,GAAG,UAAU,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC,WAQ/H;AAED,wBAAgB,QAAQ,CAAE,WAAW,CAAC,EAAE,MAAM,WAE7C;AACD,wBAAgB,QAAQ,CAAE,WAAW,CAAC,EAAE,MAAM,WAE7C;AACD,wBAAgB,SAAS,CAAE,WAAW,CAAC,EAAE,MAAM,WAE9C;AACD,wBAAgB,MAAM,CAAE,WAAW,CAAC,EAAE,MAAM,WAE3C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/driver/utils.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAOxD,wBAAgB,WAAW,CAAC,MAAM,EAAE,oBAAoB,YAYvD;AAED,wBAAgB,sBAAsB,CAAC,UAAU,CAAC,EAAE,MAAM,sBAiBzD;AAED,wBAAsB,uBAAuB,CAAC,WAAW,CAAC,EAAE,MAAM,+BAiBjE;AAGD,eAAO,MAAM,wBAAwB,aAAc,MAAM,mBAAmB,MAAM,cAAc,MAAM,SAOrG,CAAA;AAED,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,YAAY;;;;;;GAwE5F;AAED,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,YAAY,CAAC,YAAY,oGAShE;AAED,wBAAgB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,YAAY,UAGzG;AAED,wBAAsB,iBAAiB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM;;GA8DhF;AAED,wBAAgB,gBAAgB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAEzE;AAED,wBAAgB,eAAe,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAExE;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,GAAG,UAAU,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC,WAQ/H;AAED,wBAAgB,QAAQ,CAAE,WAAW,CAAC,EAAE,MAAM,WAE7C;AACD,wBAAgB,QAAQ,CAAE,WAAW,CAAC,EAAE,MAAM,WAE7C;AACD,wBAAgB,SAAS,CAAE,WAAW,CAAC,EAAE,MAAM,WAE9C;AACD,wBAAgB,MAAM,CAAE,WAAW,CAAC,EAAE,MAAM,WAE3C"}

package/build/driver/utils.js

@@ -6,10 +6,10 @@ import cp from 'node:child_process';
 import got from 'got';
 import decamelize from 'decamelize';
 import logger from '@wdio/logger';
-import { getChromePath } from 'chrome-launcher';
 import { install, canDownload, resolveBuildId, detectBrowserPlatform, Browser, ChromeReleaseChannel, computeExecutablePath } from '@puppeteer/browsers';
 import { download as downloadGeckodriver } from 'geckodriver';
 import { download as downloadEdgedriver } from 'edgedriver';
+import { locateChrome, locateFirefox } from 'locate-app';
 import { DEFAULT_HOSTNAME, DEFAULT_PROTOCOL, DEFAULT_PATH, SUPPORTED_BROWSERNAMES } from '../constants.js';
 const log = logger('webdriver');
 const EXCLUDED_PARAMS = ['version', 'help'];
@@ -26,20 +26,11 @@ export function parseParams(params) {
         .flat()
         .filter(Boolean);
 }
-export function getLocalChromePath() {
-    try {
-        const chromePath = getChromePath();
-        return chromePath;
-    }
-    catch (err) {
-        return;
-    }
-}
-export function getBuildIdByPath(chromePath) {
+export function getBuildIdByChromePath(chromePath) {
     if (!chromePath) {
         return;
     }
-    else if (os.platform() === 'win32') {
+    if (os.platform() === 'win32') {
         const versionPath = path.dirname(chromePath);
         const contents = fs.readdirSync(versionPath);
         const versions = contents.filter(a => /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/g.test(a));
@@ -48,7 +39,23 @@ export function getBuildIdByPath(chromePath) {
         return oldest;
     }
     const versionString = cp.execSync(`"${chromePath}" --version`).toString();
-    return versionString.split(' ').pop()?.trim();
+    return versionString.trim().split(' ').pop()?.trim();
+}
+export async function getBuildIdByFirefoxPath(firefoxPath) {
+    if (!firefoxPath) {
+        return;
+    }
+    if (os.platform() === 'win32') {
+        const appPath = path.dirname(firefoxPath);
+        const contents = (await fsp.readFile(path.join(appPath, 'application.ini'))).toString('utf-8');
+        return contents
+            .split('\n')
+            .filter((line) => line.startsWith('Version='))
+            .map((line) => line.replace('Version=', '').replace(/\r/, ''))
+            .pop();
+    }
+    const versionString = cp.execSync(`"${firefoxPath}" --version`).toString();
+    return versionString.trim().split(' ').pop()?.trim();
 }
 let lastTimeCalled = Date.now();
 export const downloadProgressCallback = (artifact, downloadedBytes, totalBytes) => {
@@ -59,8 +66,9 @@ export const downloadProgressCallback = (artifact, downloadedBytes, totalBytes)
     log.info(`Downloading ${artifact} ${percentage}%`);
     lastTimeCalled = Date.now();
 };
-export async function setupChrome(cacheDir, caps) {
+export async function setupPuppeteerBrowser(cacheDir, caps) {
     caps.browserName = caps.browserName?.toLowerCase();
+    const browserName = caps.browserName === Browser.FIREFOX ? Browser.FIREFOX : Browser.CHROME;
     const exist = await fsp.access(cacheDir).then(() => true, () => false);
     if (!exist) {
         await fsp.mkdir(cacheDir, { recursive: true });
@@ -68,11 +76,15 @@ export async function setupChrome(cacheDir, caps) {
     /**
      * don't set up Chrome if a binary was defined in caps
      */
-    const chromeOptions = caps['goog:chromeOptions'] || {};
-    if (typeof chromeOptions.binary === 'string') {
+    const browserOptions = (browserName === Browser.CHROME
+        ? caps['goog:chromeOptions']
+        : caps['moz:firefoxOptions']) || {};
+    if (typeof browserOptions.binary === 'string') {
         return {
-            executablePath: chromeOptions.binary,
-            browserVersion: getBuildIdByPath(chromeOptions.binary)
+            executablePath: browserOptions.binary,
+            browserVersion: browserName === Browser.CHROME
+                ? getBuildIdByChromePath(browserOptions.binary)
+                : await getBuildIdByFirefoxPath(browserOptions.binary)
         };
     }
     const platform = detectBrowserPlatform();
@@ -80,41 +92,47 @@ export async function setupChrome(cacheDir, caps) {
         throw new Error('The current platform is not supported.');
     }
     if (!caps.browserVersion) {
-        const executablePath = getLocalChromePath();
-        const tag = getBuildIdByPath(executablePath);
+        const executablePath = browserName === Browser.CHROME
+            ? await locateChrome().catch(() => undefined)
+            : await locateFirefox().catch(() => undefined);
+        const tag = browserName === Browser.CHROME
+            ? getBuildIdByChromePath(executablePath)
+            : await getBuildIdByFirefoxPath(executablePath);
         /**
          * verify that we have a valid Chrome browser installed
          */
         if (tag) {
             return {
                 executablePath,
-                browserVersion: await resolveBuildId(Browser.CHROME, platform, tag)
+                browserVersion: await resolveBuildId(browserName, platform, tag)
             };
         }
     }
     /**
      * otherwise download provided Chrome browser version or "stable"
      */
-    const tag = caps.browserVersion || ChromeReleaseChannel.STABLE;
-    const buildId = await resolveBuildId(Browser.CHROME, platform, tag);
+    const tag = browserName === Browser.CHROME
+        ? caps.browserVersion || ChromeReleaseChannel.STABLE
+        : caps.browserVersion || 'latest';
+    const buildId = await resolveBuildId(browserName, platform, tag);
     const installOptions = {
         unpack: true,
         cacheDir,
         platform,
         buildId,
-        browser: Browser.CHROME,
-        downloadProgressCallback: (downloadedBytes, totalBytes) => downloadProgressCallback('Chrome', downloadedBytes, totalBytes)
+        browser: browserName,
+        downloadProgressCallback: (downloadedBytes, totalBytes) => downloadProgressCallback(`${browserName} (${buildId})`, downloadedBytes, totalBytes)
     };
     const isCombinationAvailable = await canDownload(installOptions);
     if (!isCombinationAvailable) {
-        throw new Error(`Couldn't find a matching Chrome browser for tag "${buildId}" on platform "${platform}"`);
+        throw new Error(`Couldn't find a matching ${browserName} browser for tag "${buildId}" on platform "${platform}"`);
     }
-    log.info(`Setting up Chrome v${buildId}`);
+    log.info(`Setting up ${browserName} v${buildId}`);
     await install(installOptions);
     const executablePath = computeExecutablePath(installOptions);
     return { executablePath, browserVersion: buildId };
 }
-function getDriverOptions(caps) {
+export function getDriverOptions(caps) {
     return (caps['wdio:chromedriverOptions'] ||
         caps['wdio:geckodriverOptions'] ||
         caps['wdio:edgedriverOptions'] ||
@@ -131,7 +149,7 @@ export async function setupChromedriver(cacheDir, driverVersion) {
     if (!platform) {
         throw new Error('The current platform is not supported.');
     }
-    const version = driverVersion || getBuildIdByPath(getLocalChromePath()) || ChromeReleaseChannel.STABLE;
+    const version = driverVersion || getBuildIdByChromePath(await locateChrome()) || ChromeReleaseChannel.STABLE;
     const buildId = await resolveBuildId(Browser.CHROMEDRIVER, platform, version);
     let executablePath = computeExecutablePath({
         browser: Browser.CHROMEDRIVER,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "8.15.7",
+  "version": "8.15.9",
   "description": "A WDIO helper utility to provide several utility functions used across the project.",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-utils",
@@ -33,7 +33,6 @@
     "@puppeteer/browsers": "^1.6.0",
     "@wdio/logger": "8.11.0",
     "@wdio/types": "8.15.7",
-    "chrome-launcher": "^1.0.0",
     "decamelize": "^6.0.0",
     "deepmerge-ts": "^5.1.0",
     "edgedriver": "^5.3.5",
@@ -41,11 +40,12 @@
     "get-port": "^7.0.0",
     "got": "^13.0.0",
     "import-meta-resolve": "^3.0.0",
+    "locate-app": "^2.1.0",
     "safaridriver": "^0.1.0",
     "wait-port": "^1.0.4"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "24d8f0dccf54e6e19779094d73eb90ae9086ee86"
+  "gitHead": "86eec4b2a71da7dcfaa0f021db32c8035e0ff06a"
 }