webdriver 9.0.4 → 9.0.6

package/build/index.cjs

@@ -60,7 +60,7 @@ var init_request = __esm({
           };
         } catch (err) {
           if (!(err instanceof Error)) {
-            throw new import_index.RequestLibError(`Failed to fetch ${url.href}: ${err.message || err}`);
+            throw new import_index.RequestLibError(`Failed to fetch ${url.href}: ${err.message || err || "Unknown error"}`);
           }
           throw err;
         }

package/build/index.js

@@ -1,6 +1,6 @@
 // src/index.ts
 import logger5 from "@wdio/logger";
-import { webdriverMonad, sessionEnvironmentDetector, startWebDriver } from "@wdio/utils";
+import { webdriverMonad, sessionEnvironmentDetector, startWebDriver, isBidi } from "@wdio/utils";
 import { validateConfig } from "@wdio/config";
 
 // src/command.ts
@@ -875,22 +875,11 @@ var BROWSER_DRIVER_ERRORS = [
   // iedriver
 ];
 async function startWebDriverSession(params) {
-  if (params.capabilities) {
-    const extensionCaps = Object.keys(params.capabilities).filter((cap) => cap.includes(":"));
-    const invalidWebDriverCaps = Object.keys(params.capabilities).filter((cap) => !CAPABILITY_KEYS.includes(cap) && !cap.includes(":"));
-    if (extensionCaps.length && invalidWebDriverCaps.length) {
-      throw new Error(
-        `Invalid or unsupported WebDriver capabilities found ("${invalidWebDriverCaps.join('", "')}"). Ensure to only use valid W3C WebDriver capabilities (see https://w3c.github.io/webdriver/#capabilities).If you run your tests on a remote vendor, like Sauce Labs or BrowserStack, make sure that you put them into vendor specific capabilities, e.g. "sauce:options" or "bstack:options". Please reach out to your vendor support team if you have further questions.`
-      );
-    }
-  }
   const [w3cCaps, jsonwpCaps] = params.capabilities && "alwaysMatch" in params.capabilities ? [params.capabilities, params.capabilities.alwaysMatch] : [{ alwaysMatch: params.capabilities, firstMatch: [{}] }, params.capabilities];
-  if (!w3cCaps.alwaysMatch["wdio:enforceWebDriverClassic"] && typeof w3cCaps.alwaysMatch.browserName === "string" && w3cCaps.alwaysMatch.browserName !== "safari") {
+  if (!w3cCaps.alwaysMatch["wdio:enforceWebDriverClassic"] && typeof w3cCaps.alwaysMatch.browserName === "string" && w3cCaps.alwaysMatch.browserName.toLowerCase() !== "safari") {
     w3cCaps.alwaysMatch.webSocketUrl = true;
   }
-  if (!jsonwpCaps["wdio:enforceWebDriverClassic"] && typeof jsonwpCaps.browserName === "string" && jsonwpCaps.browserName !== "safari") {
-    jsonwpCaps.webSocketUrl = true;
-  }
+  validateCapabilities(w3cCaps.alwaysMatch);
   const sessionRequest = new FetchRequest(
     "POST",
     "/session",
@@ -913,6 +902,23 @@ async function startWebDriverSession(params) {
   params.capabilities = response.value.capabilities || response.value;
   return { sessionId, capabilities: params.capabilities };
 }
+function validateCapabilities(capabilities) {
+  const chromeArgs = capabilities["goog:chromeOptions"]?.args || [];
+  if (chromeArgs.includes("incognito") || chromeArgs.includes("--incognito")) {
+    throw new Error(
+      'Please remove "incognito" from `"goog:chromeOptions".args` as it is not supported running Chrome with WebDriver. WebDriver sessions are always incognito mode and do not persist across browser sessions.'
+    );
+  }
+  if (capabilities) {
+    const extensionCaps = Object.keys(capabilities).filter((cap) => cap.includes(":"));
+    const invalidWebDriverCaps = Object.keys(capabilities).filter((cap) => !CAPABILITY_KEYS.includes(cap) && !cap.includes(":"));
+    if (extensionCaps.length && invalidWebDriverCaps.length) {
+      throw new Error(
+        `Invalid or unsupported WebDriver capabilities found ("${invalidWebDriverCaps.join('", "')}"). Ensure to only use valid W3C WebDriver capabilities (see https://w3c.github.io/webdriver/#capabilities).If you run your tests on a remote vendor, like Sauce Labs or BrowserStack, make sure that you put them into vendor specific capabilities, e.g. "sauce:options" or "bstack:options". Please reach out to your vendor support team if you have further questions.`
+      );
+    }
+  }
+}
 function isSuccessfulResponse(statusCode, body) {
   if (!body || typeof body.value === "undefined") {
     log2.debug("request failed due to missing body");
@@ -1013,7 +1019,7 @@ var CustomRequestError = class _CustomRequestError extends Error {
     Error.captureStackTrace(this, _CustomRequestError);
   }
 };
-function getEnvironmentVars({ isW3C, isMobile, isIOS, isAndroid, isFirefox, isSauce, isSeleniumStandalone, isBidi, isChromium }) {
+function getEnvironmentVars({ isW3C, isMobile, isIOS, isAndroid, isFirefox, isSauce, isSeleniumStandalone, isBidi: isBidi2, isChromium }) {
   return {
     isW3C: { value: isW3C },
     isMobile: { value: isMobile },
@@ -1022,7 +1028,7 @@ function getEnvironmentVars({ isW3C, isMobile, isIOS, isAndroid, isFirefox, isSa
     isFirefox: { value: isFirefox },
     isSauce: { value: isSauce },
     isSeleniumStandalone: { value: isSeleniumStandalone },
-    isBidi: { value: isBidi },
+    isBidi: { value: isBidi2 },
     isChromium: { value: isChromium }
   };
 }
@@ -1130,7 +1136,7 @@ function parseBidiMessage(data) {
 // package.json
 var package_default = {
   name: "webdriver",
-  version: "9.0.0",
+  version: "9.0.5",
   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",
@@ -1364,7 +1370,7 @@ var FetchRequest = class extends WebDriverRequest {
       };
     } catch (err) {
       if (!(err instanceof Error)) {
-        throw new RequestLibError(`Failed to fetch ${url.href}: ${err.message || err}`);
+        throw new RequestLibError(`Failed to fetch ${url.href}: ${err.message || err || "Unknown error"}`);
       }
       throw err;
     }
@@ -1507,7 +1513,7 @@ var WebDriver = class _WebDriver {
       capabilities["wdio:driverPID"] = driverProcess.pid;
     }
     const bidiPrototype = {};
-    if (capabilities.webSocketUrl) {
+    if (isBidi(capabilities)) {
       log5.info(`Register BiDi handler for session with id ${sessionId}`);
       Object.assign(bidiPrototype, initiateBidi(capabilities.webSocketUrl, options.strictSSL));
     }
@@ -1522,7 +1528,7 @@ var WebDriver = class _WebDriver {
       }
     );
     const client = monad(sessionId, customCommandWrapper);
-    if (capabilities.webSocketUrl) {
+    if (isBidi(capabilities)) {
       await client._bidiHandler.connect();
       client._bidiHandler?.socket.on("message", parseBidiMessage.bind(client));
     }
@@ -1552,15 +1558,15 @@ var WebDriver = class _WebDriver {
     const environmentPrototype = getEnvironmentVars(options);
     const protocolCommands = getPrototype(options);
     const bidiPrototype = {};
-    const webSocketUrl = options.capabilities?.webSocketUrl;
-    if (typeof webSocketUrl === "string") {
+    if (isBidi(options.capabilities)) {
+      const webSocketUrl = options.capabilities?.webSocketUrl;
       log5.info(`Register BiDi handler for session with id ${options.sessionId}`);
       Object.assign(bidiPrototype, initiateBidi(webSocketUrl, options.strictSSL));
     }
     const prototype = { ...protocolCommands, ...environmentPrototype, ...userPrototype, ...bidiPrototype };
     const monad = webdriverMonad(options, modifier, prototype);
     const client = monad(options.sessionId, commandWrapper);
-    if (webSocketUrl) {
+    if (isBidi(options.capabilities)) {
       client._bidiHandler?.socket.on("message", parseBidiMessage.bind(client));
     }
     return client;

package/build/utils.d.ts

@@ -9,6 +9,13 @@ export declare function startWebDriverSession(params: RemoteConfig): Promise<{
     sessionId: string;
     capabilities: WebdriverIO.Capabilities;
 }>;
+/**
+ * Validates the given WebdriverIO capabilities.
+ *
+ * @param {WebdriverIO.Capabilities} capabilities - The capabilities to validate.
+ * @throws {Error} If the capabilities contain incognito mode.
+ */
+export declare function validateCapabilities(capabilities: WebdriverIO.Capabilities): void;
 /**
  * check if WebDriver requests was successful
  * @param  {number}  statusCode status code of request

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAW/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAO1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAYxF;;GAEG;AACH,wBAAsB,qBAAqB,CAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,WAAW,CAAC,YAAY,CAAA;CAAE,CAAC,CA6EzI;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAE,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,iBAAiB,WA4DlF;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAE,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,oBAAoB,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC,sCA8C7H;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAE,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,SAcvE;AAGD,qBAAa,kBAAmB,SAAQ,KAAK;gBAC5B,IAAI,EAAE,iBAAiB,EAAE,cAAc,EAAE,GAAG;CA8C5D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,qBAAqB,CAYpL;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,QAgBhD;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,QAAS,kBAAkB,WAAU,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,WAmD1F,CAAA;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,GAAG,KAAK,CAS1F;AA+BD;;;;GAIG;AACH,wBAAgB,YAAY,CAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAE,OAAc,GAAG,qBAAqB,CAejG;AAED,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,QAWjE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAW/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAO1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAYxF;;GAEG;AACH,wBAAsB,qBAAqB,CAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,WAAW,CAAC,YAAY,CAAA;CAAE,CAAC,CAkDzI;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAE,YAAY,EAAE,WAAW,CAAC,YAAY,QAiC3E;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAE,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,iBAAiB,WA4DlF;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAE,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,oBAAoB,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC,sCA8C7H;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAE,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,SAcvE;AAGD,qBAAa,kBAAmB,SAAQ,KAAK;gBAC5B,IAAI,EAAE,iBAAiB,EAAE,cAAc,EAAE,GAAG;CA8C5D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,qBAAqB,CAYpL;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,QAgBhD;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,QAAS,kBAAkB,WAAU,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,WAmD1F,CAAA;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,GAAG,KAAK,CAS1F;AA+BD;;;;GAIG;AACH,wBAAgB,YAAY,CAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAE,OAAc,GAAG,qBAAqB,CAejG;AAED,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,QAWjE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webdriver",
-  "version": "9.0.4",
+  "version": "9.0.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",
@@ -35,13 +35,13 @@
   "dependencies": {
     "@types/node": "^20.1.0",
     "@types/ws": "^8.5.3",
-    "@wdio/config": "9.0.4",
+    "@wdio/config": "9.0.6",
     "@wdio/logger": "9.0.4",
     "@wdio/protocols": "9.0.4",
     "@wdio/types": "9.0.4",
-    "@wdio/utils": "9.0.4",
+    "@wdio/utils": "9.0.6",
     "deepmerge-ts": "^7.0.3",
     "ws": "^8.8.0"
   },
-  "gitHead": "1f3d6f781391548e8672e768e72b3d5c499a3aa7"
+  "gitHead": "5dff8a8ea887a7d8df0f7faaa5ef6ae7d98dff83"
 }