webdriver 9.0.8 → 9.1.1

package/build/index.js

@@ -22,6 +22,19 @@ import { URL } from "node:url";
 import logger3 from "@wdio/logger";
 import { transformCommandLogResult as transformCommandLogResult2 } from "@wdio/utils";
 
+// src/request/constants.ts
+var RETRYABLE_STATUS_CODES = [408, 413, 429, 500, 502, 503, 504];
+var RETRYABLE_ERROR_CODES = [
+  "ETIMEDOUT",
+  "ECONNRESET",
+  "EADDRINUSE",
+  "ECONNREFUSED",
+  "EPIPE",
+  "ENOTFOUND",
+  "ENETUNREACH",
+  "EAI_AGAIN"
+];
+
 // src/utils.ts
 import { deepmergeCustom } from "deepmerge-ts";
 import logger2 from "@wdio/logger";
@@ -875,20 +888,23 @@ var BROWSER_DRIVER_ERRORS = [
   // iedriver
 ];
 async function startWebDriverSession(params) {
-  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.toLowerCase() !== "safari") {
-    w3cCaps.alwaysMatch.webSocketUrl = true;
+  const capabilities = params.capabilities && "alwaysMatch" in params.capabilities ? params.capabilities : { alwaysMatch: params.capabilities, firstMatch: [{}] };
+  if (
+    /**
+     * except, if user does not want to opt-in
+     */
+    !capabilities.alwaysMatch["wdio:enforceWebDriverClassic"] && /**
+     * or user requests a Safari session which does not support Bidi
+     */
+    typeof capabilities.alwaysMatch.browserName === "string" && capabilities.alwaysMatch.browserName.toLowerCase() !== "safari"
+  ) {
+    capabilities.alwaysMatch.webSocketUrl = true;
   }
-  validateCapabilities(w3cCaps.alwaysMatch);
+  validateCapabilities(capabilities.alwaysMatch);
   const sessionRequest = new FetchRequest(
     "POST",
     "/session",
-    {
-      capabilities: w3cCaps,
-      // W3C compliant
-      desiredCapabilities: jsonwpCaps
-      // JSONWP compliant
-    }
+    { capabilities }
   );
   let response;
   try {
@@ -1078,7 +1094,7 @@ It seems like the service failed to start or is rejecting any connections.`;
   }
   return err.message;
 };
-function getTimeoutError(error, requestOptions, url) {
+function getRequestError(error, requestOptions, url) {
   const cmdName = getExecCmdName(url);
   const cmdArgs = getExecCmdArgs(requestOptions);
   const cmdInfoMsg = `when running "${cmdName}" with method "${requestOptions.method}"`;
@@ -1136,7 +1152,7 @@ function parseBidiMessage(data) {
 // package.json
 var package_default = {
   name: "webdriver",
-  version: "9.0.7",
+  version: "9.1.0",
   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",
@@ -1297,10 +1313,16 @@ var WebDriverRequest = class extends EventEmitter {
       return this._request(url, fullRequestOptions, transformResponse, totalRetryCount, retryCount);
     };
     if (response instanceof Error) {
-      if (response.code === "ETIMEDOUT") {
-        const error2 = getTimeoutError(response, fullRequestOptions, url);
+      const errorCode = response.code;
+      if (errorCode && RETRYABLE_ERROR_CODES.includes(errorCode)) {
+        const error2 = getRequestError(response, fullRequestOptions, url);
         return retry(error2, 'Request timed out! Consider increasing the "connectionRetryTimeout" option.');
       }
+      const statusCode = response.statusCode;
+      if (statusCode && RETRYABLE_STATUS_CODES.includes(statusCode)) {
+        const error2 = getRequestError(response, fullRequestOptions, url);
+        return retry(error2, "Request failed with status code " + statusCode);
+      }
       this.emit("performance", { request: fullRequestOptions, durationMillisecond, success: false, error: response, retryCount });
       throw response;
     }
@@ -1513,7 +1535,7 @@ var WebDriver = class _WebDriver {
       capabilities["wdio:driverPID"] = driverProcess.pid;
     }
     const bidiPrototype = {};
-    if (isBidi(capabilities)) {
+    if (isBidi(requestedCapabilities, capabilities)) {
       log5.info(`Register BiDi handler for session with id ${sessionId}`);
       Object.assign(bidiPrototype, initiateBidi(capabilities.webSocketUrl, options.strictSSL));
     }
@@ -1528,9 +1550,9 @@ var WebDriver = class _WebDriver {
       }
     );
     const client = monad(sessionId, customCommandWrapper);
-    if (isBidi(capabilities)) {
+    if (isBidi(requestedCapabilities, capabilities)) {
       await client._bidiHandler.connect();
-      client._bidiHandler?.socket.on("message", parseBidiMessage.bind(client));
+      client._bidiHandler.socket.on("message", parseBidiMessage.bind(client));
     }
     if (params.enableDirectConnect) {
       setupDirectConnect(client);
@@ -1558,7 +1580,7 @@ var WebDriver = class _WebDriver {
     const environmentPrototype = getEnvironmentVars(options);
     const protocolCommands = getPrototype(options);
     const bidiPrototype = {};
-    if (isBidi(options.capabilities)) {
+    if (isBidi(options.requestedCapabilities || {}, 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));
@@ -1566,7 +1588,7 @@ var WebDriver = class _WebDriver {
     const prototype = { ...protocolCommands, ...environmentPrototype, ...userPrototype, ...bidiPrototype };
     const monad = webdriverMonad(options, modifier, prototype);
     const client = monad(options.sessionId, commandWrapper);
-    if (isBidi(options.capabilities)) {
+    if (isBidi(options.requestedCapabilities || {}, options.capabilities || {})) {
       client._bidiHandler?.socket.on("message", parseBidiMessage.bind(client));
     }
     return client;

package/build/request/constants.d.ts

@@ -0,0 +1,9 @@
+/**
+ * retrieved from https://github.com/sindresorhus/ky/blob/3ba40cc6333cf1847c02c51744e22ab7c04407f5/source/utils/normalize.ts#L10
+ */
+export declare const RETRYABLE_STATUS_CODES: number[];
+/**
+ * retrieved from https://github.com/sindresorhus/got/blob/89b7fdfd4e7ea4e76258f50b70ae8a1d2aea8125/source/core/options.ts#L392C1-L399C37
+ */
+export declare const RETRYABLE_ERROR_CODES: string[];
+//# sourceMappingURL=constants.d.ts.map

package/build/request/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/request/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,sBAAsB,UAAsC,CAAA;AACzE;;GAEG;AACH,eAAO,MAAM,qBAAqB,UAGjC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/request/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAI9B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAM1C,KAAK,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAA;AACpD,KAAK,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;AAO7D,qBAAa,eAAgB,SAAQ,KAAK;IACtC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,IAAI,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,iBAAiB;IAC9B,KAAK,EAAE,GAAG,CAAA;IACV;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,eAAO,MAAM,sBAAsB,UAElC,CAAA;AAWD,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,gBAAiB,SAAQ,YAAY;;IAG/D,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,OAAO,CAAA;IACrB,iBAAiB,EAAE,OAAO,CAAA;gBAEb,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAE,OAAe;IAStG,WAAW,CAAE,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM;cAc9C,cAAc,CAAE,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC;QAAC,GAAG,EAAE,GAAG,CAAC;QAAC,cAAc,EAAE,WAAW,CAAC;KAAC,CAAC;cA0D3I,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAIxF,SAAS,CAAC,kBAAkB,IAAI,MAAM;YAIxB,QAAQ;CAgIzB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/request/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAI9B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAO1C,KAAK,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAA;AACpD,KAAK,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;AAO7D,qBAAa,eAAgB,SAAQ,KAAK;IACtC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,IAAI,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,iBAAiB;IAC9B,KAAK,EAAE,GAAG,CAAA;IACV;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,eAAO,MAAM,sBAAsB,UAElC,CAAA;AAWD,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,gBAAiB,SAAQ,YAAY;;IAG/D,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,OAAO,CAAA;IACrB,iBAAiB,EAAE,OAAO,CAAA;gBAEb,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAE,OAAe;IAStG,WAAW,CAAE,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM;cAc9C,cAAc,CAAE,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC;QAAC,GAAG,EAAE,GAAG,CAAC;QAAC,cAAc,EAAE,WAAW,CAAC;KAAC,CAAC;cA0D3I,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAIxF,SAAS,CAAC,kBAAkB,IAAI,MAAM;YAIxB,QAAQ;CAsIzB"}

package/build/utils.d.ts

@@ -58,7 +58,7 @@ export declare const getSessionError: (err: JSONWPCommandError, params?: Partial
 /**
  * return timeout error with information about the executing command on which the test hangs
  */
-export declare function getTimeoutError(error: Error, requestOptions: RequestInit, url: URL): Error;
+export declare function getRequestError(error: Error, requestOptions: RequestInit, url: URL): Error;
 /**
  * Enhance the monad with WebDriver Bidi primitives if a connection can be established successfully
  * @param socketUrl url to bidi interface

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,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"}
+{"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,CAyDzI;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.8",
+  "version": "9.1.1",
   "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.8",
-    "@wdio/logger": "9.0.8",
+    "@wdio/config": "9.1.0",
+    "@wdio/logger": "9.1.0",
     "@wdio/protocols": "9.0.8",
-    "@wdio/types": "9.0.8",
-    "@wdio/utils": "9.0.8",
+    "@wdio/types": "9.1.0",
+    "@wdio/utils": "9.1.0",
     "deepmerge-ts": "^7.0.3",
     "ws": "^8.8.0"
   },
-  "gitHead": "cc85ebf08918965cff46ce7e014703549b7f50d7"
+  "gitHead": "f70367e464d7c056328cd7d8e57ea296c0e766ae"
 }