webdriver 8.14.3 → 8.14.6

package/build/command.js

@@ -95,7 +95,7 @@ export default function (method, endpointUri, commandInfo, doubleEncodeVariables
                 /**
                  * kill driver process if there is one
                  */
-                if (this._driverProcess) {
+                if (this._driverProcess && body.deleteSessionOpts?.shutdownDriver !== false) {
                     log.info(`Kill ${this._driverProcess.spawnfile} driver process with command line: ${this._driverProcess.spawnargs.slice(1).join(' ')}`);
                     const killedSuccessfully = this._driverProcess.kill('SIGKILL');
                     if (!killedSuccessfully) {

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/driver/index.ts"],"names":[],"mappings":";AAIA,OAAO,EAAyB,MAAM,oBAAoB,CAAA;AAM1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,EAA8B,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAA;AACnF,OAAO,EAA6B,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnF,OAAO,EAA4B,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAChF,OAAO,EAA2C,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAElG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAO/C,MAAM,WAAW,oBAAqB,SAAQ,YAAY,CAAC,YAAY,EAAE,iBAAiB;CAAG;AAC7F,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,mBAAmB,GAAG,sBAAsB,CAAC,CAAA;AAEpI,MAAM,WAAW,iBAAiB;IAC9B,0BAA0B,CAAC,EAAE,mBAAmB,CAAA;IAChD,0BAA0B,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAA;IAC9D,yBAAyB,CAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAA;IAC/D,wBAAwB,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAA;CAChE;AAED,wBAAsB,cAAc,CAAE,OAAO,EAAE,OAAO,CAAC,SAAS,wCAyI/D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/driver/index.ts"],"names":[],"mappings":";AAIA,OAAO,EAAyB,MAAM,oBAAoB,CAAA;AAO1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,EAA8B,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAA;AACnF,OAAO,EAA6B,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnF,OAAO,EAA4B,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAChF,OAAO,EAA2C,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAElG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAO/C,MAAM,WAAW,oBAAqB,SAAQ,YAAY,CAAC,YAAY,EAAE,iBAAiB;CAAG;AAC7F,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,mBAAmB,GAAG,sBAAsB,CAAC,CAAA;AAEpI,MAAM,WAAW,iBAAiB;IAC9B,0BAA0B,CAAC,EAAE,mBAAmB,CAAA;IAChD,0BAA0B,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAA;IAC9D,yBAAyB,CAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAA;IAC/D,wBAAwB,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAA;CAChE;AAED,wBAAsB,cAAc,CAAE,OAAO,EAAE,OAAO,CAAC,SAAS,wCAsK/D"}

package/build/driver/index.js

@@ -3,6 +3,7 @@ import fsp from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import cp from 'node:child_process';
+import got from 'got';
 import getPort from 'get-port';
 import waitPort from 'wait-port';
 import logger from '@wdio/logger';
@@ -48,6 +49,7 @@ export async function startWebDriver(options) {
         /**
          * Chrome
          */
+        caps.browserName = caps.browserName.toLowerCase();
         const chromedriverOptions = caps['wdio:chromedriverOptions'] || {};
         const cacheDir = chromedriverOptions.cacheDir || options.cacheDir || os.tmpdir();
         const exist = await fsp.access(cacheDir).then(() => true, () => false);
@@ -55,22 +57,47 @@ export async function startWebDriver(options) {
             await fsp.mkdir(cacheDir, { recursive: true });
         }
         const { executablePath, buildId, platform } = await setupChrome(caps, cacheDir);
-        const chromedriverBinaryPath = computeExecutablePath({
+        let chromedriverBinaryPath = computeExecutablePath({
             browser: Browser.CHROMEDRIVER,
             buildId,
             cacheDir
         });
+        let loggedBuildId = buildId;
         const hasChromedriverInstalled = await fsp.access(chromedriverBinaryPath).then(() => true, () => false);
         if (!hasChromedriverInstalled) {
             log.info(`Downloading Chromedriver v${buildId}`);
-            await install({
+            const chromedriverInstallOpts = {
                 ...chromedriverOptions,
                 cacheDir,
                 platform,
                 buildId,
                 browser: Browser.CHROMEDRIVER,
+                unpack: true,
                 downloadProgressCallback: (downloadedBytes, totalBytes) => downloadProgressCallback('Chromedriver', downloadedBytes, totalBytes)
-            });
+            };
+            try {
+                await install({ ...chromedriverInstallOpts, buildId });
+            }
+            catch (err) {
+                /**
+                 * in case we detect a Chrome browser installed for which there is no Chromedriver available
+                 * we are falling back to the latest known good version
+                 */
+                log.warn(`Couldn't download Chromedriver v${buildId}: ${err.message}, trying to find known good version...`);
+                const majorVersion = buildId.split('.')[0];
+                const knownGoodVersions = await got('https://googlechromelabs.github.io/chrome-for-testing/known-good-versions.json').json();
+                const knownGoodVersion = knownGoodVersions.versions.filter(({ version }) => version.startsWith(majorVersion)).pop();
+                if (!knownGoodVersion) {
+                    throw new Error(`Couldn't find known good version for Chromedriver v${majorVersion}`);
+                }
+                loggedBuildId = knownGoodVersion.version;
+                await install({ ...chromedriverInstallOpts, buildId: loggedBuildId });
+                chromedriverBinaryPath = computeExecutablePath({
+                    browser: Browser.CHROMEDRIVER,
+                    buildId: loggedBuildId,
+                    cacheDir
+                });
+            }
         }
         else {
             log.info(`Using Chromedriver v${buildId} from cache directory ${cacheDir}`);
@@ -80,7 +107,7 @@ export async function startWebDriver(options) {
         chromedriverOptions.allowedIps = chromedriverOptions.allowedIps || [''];
         const driverParams = parseParams({ port, ...chromedriverOptions });
         driverProcess = cp.spawn(chromedriverBinaryPath, driverParams);
-        driver = `ChromeDriver v${buildId} with params ${driverParams.join(' ')}`;
+        driver = `Chromedriver v${loggedBuildId} with params ${driverParams.join(' ')}`;
     }
     else if (SUPPORTED_BROWSERNAMES.safari.includes(caps.browserName.toLowerCase())) {
         const safaridriverOptions = caps['wdio:safaridriverOptions'] || {};
@@ -114,7 +141,10 @@ export async function startWebDriver(options) {
         const edgedriverOptions = caps['wdio:edgedriverOptions'] || {};
         const cacheDir = edgedriverOptions.cacheDir || options.cacheDir || os.tmpdir();
         driver = 'EdgeDriver';
-        driverProcess = await startEdgedriver({ ...edgedriverOptions, cacheDir, port });
+        driverProcess = await startEdgedriver({ ...edgedriverOptions, cacheDir, port }).catch((err) => {
+            log.warn(`Couldn't start EdgeDriver: ${err.message}, retry ...`);
+            return startEdgedriver({ ...edgedriverOptions, cacheDir, port });
+        });
         /**
          * Microsoft Edge is very particular when it comes to browser names
          */

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/driver/utils.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,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,IAAI,EAAE,YAAY,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM;;;;GA2ClF;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,WAO7D"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/driver/utils.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,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,IAAI,EAAE,YAAY,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM;;;;GA4ClF;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,WAO7D"}

package/build/driver/utils.js

@@ -80,6 +80,7 @@ export async function setupChrome(caps, cacheDir) {
     const tag = caps.browserVersion || ChromeReleaseChannel.STABLE;
     const buildId = await resolveBuildId(Browser.CHROME, platform, tag);
     const installOptions = {
+        unpack: true,
         cacheDir,
         platform,
         buildId,

package/build/index.js

@@ -23,8 +23,8 @@ export default class WebDriver {
             process.env.WDIO_LOG_PATH = path.join(params.outputDir, 'wdio.log');
         }
         log.info('Initiate new session using the WebDriver protocol');
-        const requestedCapabilities = { ...params.capabilities };
         const driverProcess = await startWebDriver(params);
+        const requestedCapabilities = { ...params.capabilities };
         const { sessionId, capabilities } = await startWebDriverSession(params);
         const environment = sessionEnvironmentDetector({ capabilities, requestedCapabilities });
         const environmentPrototype = getEnvironmentVars(environment);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webdriver",
-  "version": "8.14.3",
+  "version": "8.14.6",
   "description": "A Node.js bindings implementation for the W3C WebDriver and Mobile JSONWire Protocol",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/webdriver",
@@ -39,16 +39,16 @@
     "@puppeteer/browsers": "^1.4.6",
     "@types/node": "^20.1.0",
     "@types/ws": "^8.5.3",
-    "@wdio/config": "8.14.0",
+    "@wdio/config": "8.14.6",
     "@wdio/logger": "8.11.0",
-    "@wdio/protocols": "8.11.0",
+    "@wdio/protocols": "8.14.6",
     "@wdio/types": "8.14.0",
     "@wdio/utils": "8.14.0",
     "chrome-launcher": "^1.0.0",
     "decamelize": "^6.0.0",
     "deepmerge-ts": "^5.1.0",
     "edgedriver": "^5.3.2",
-    "geckodriver": "^4.1.3",
+    "geckodriver": "^4.2.0",
     "get-port": "^7.0.0",
     "got": "^ 12.6.1",
     "ky": "^0.33.0",
@@ -56,5 +56,5 @@
     "wait-port": "^1.0.4",
     "ws": "^8.8.0"
   },
-  "gitHead": "5229517c22d25975c0e5dd3207b307f770b87605"
+  "gitHead": "84472108356bc234e6765ba9ffd84867aea2df2a"
 }