webdriver 9.30.1 → 9.31.1

package/build/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAI1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,eAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAgK/D,CAAA;AAED,eAAO,MAAM,WAAW,wCAAwC,CAAA;AAChE,eAAO,MAAM,kBAAkB,uCAAuC,CAAA;AAEtE,eAAO,MAAM,aAAa,QAAiE,CAAA;AAC3F,eAAO,MAAM,qCAAqC,SAAU,CAAA;AAE5D,eAAO,MAAM,qBAAqB;;CAAsC,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAG1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,eAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CA+J/D,CAAA;AAED,eAAO,MAAM,WAAW,wCAAwC,CAAA;AAChE,eAAO,MAAM,kBAAkB,uCAAuC,CAAA;AAEtE,eAAO,MAAM,aAAa,QAAiE,CAAA;AAC3F,eAAO,MAAM,qCAAqC,SAAU,CAAA;AAE5D,eAAO,MAAM,qBAAqB;;CAAsC,CAAA"}

package/build/index.js

@@ -229,8 +229,7 @@ var DEFAULTS = {
    * when attempting to start a session.
    */
   cacheDir: {
-    type: "string",
-    default: environment.value.variables.WEBDRIVER_CACHE_DIR
+    type: "string"
   },
   /**
    * Mask sensitive data in logs by replacing matching string or all captured groups for the provided regular expressions as string
@@ -2074,10 +2073,11 @@ var WebDriverRequestError = class extends WebDriverError {
     __publicField(this, "code");
     this.url = url;
     this.opts = opts;
-    const errorCode = typeof err.cause === "object" && err.cause && "code" in err.cause && typeof err.cause.code === "string" ? err.cause.code : "code" in err && typeof err.code === "string" ? err.code : void 0;
+    const isAbortTimeout = err.name === "TimeoutError";
+    const errorCode = typeof err.cause === "object" && err.cause && "code" in err.cause && typeof err.cause.code === "string" ? err.cause.code : "code" in err && typeof err.code === "string" ? err.code : isAbortTimeout ? "ETIMEDOUT" : void 0;
     if (errorCode) {
       this.code = errorCode;
-      this.message = errorCode === "UND_ERR_CONNECT_TIMEOUT" ? 'Request timed out! Consider increasing the "connectionRetryTimeout" option.' : "Request failed with error code " + errorCode;
+      this.message = errorCode === "UND_ERR_CONNECT_TIMEOUT" || isAbortTimeout ? 'Request timed out! Consider increasing the "connectionRetryTimeout" option.' : "Request failed with error code " + errorCode;
     }
     if (typeof err.cause === "object" && err.cause) {
       this.statusCode = "statusCode" in err.cause && typeof err.cause.statusCode === "number" ? err.cause.statusCode : void 0;
@@ -2114,7 +2114,7 @@ var WebDriverResponseError = class _WebDriverResponseError extends WebDriverErro
 // package.json
 var package_default = {
   name: "webdriver",
-  version: "9.30.0",
+  version: "9.31.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",
@@ -2242,6 +2242,7 @@ var WebDriverRequest = class {
     __publicField(this, "requiresSessionId");
     __publicField(this, "eventHandler");
     __publicField(this, "abortSignal");
+    __publicField(this, "connectionRetryTimeout", DEFAULTS.connectionRetryTimeout.default);
     this.body = body;
     this.method = method;
     this.endpoint = endpoint;
@@ -2256,15 +2257,18 @@ var WebDriverRequest = class {
     (_b = (_a = this.eventHandler).onRequest) == null ? void 0 : _b.call(_a, requestOptions);
     return this._request(url, requestOptions, options.transformResponse, options.connectionRetryCount, 0);
   }
+  createAbortSignal(signal) {
+    return AbortSignal.any([
+      AbortSignal.timeout(this.connectionRetryTimeout),
+      ...signal ? [signal] : []
+    ]);
+  }
   async createOptions(options, sessionId, isBrowser = false) {
-    const timeout = options.connectionRetryTimeout || DEFAULTS.connectionRetryTimeout.default;
+    this.connectionRetryTimeout = options.connectionRetryTimeout || DEFAULTS.connectionRetryTimeout.default;
     const requestOptions = {
       method: this.method,
       redirect: "follow",
-      signal: AbortSignal.any([
-        AbortSignal.timeout(timeout),
-        ...this.abortSignal ? [this.abortSignal] : []
-      ])
+      signal: this.abortSignal
     };
     const requestHeaders = new Headers({
       ...DEFAULT_HEADERS,
@@ -2332,7 +2336,10 @@ var WebDriverRequest = class {
     if (loggableBody && hasLoggableBody(loggableBody)) {
       (_b = (_a = this.eventHandler).onLogData) == null ? void 0 : _b.call(_a, loggableBody);
     }
-    const { ...requestLibOptions } = fullRequestOptions;
+    const requestLibOptions = {
+      ...fullRequestOptions,
+      signal: this.createAbortSignal(fullRequestOptions.signal)
+    };
     const startTime = performance.now();
     let response = await this._libRequest(url, requestLibOptions).catch((err) => err);
     const durationMillisecond = performance.now() - startTime;

package/build/node.js

@@ -210,8 +210,7 @@ var DEFAULTS = {
    * when attempting to start a session.
    */
   cacheDir: {
-    type: "string",
-    default: environment.value.variables.WEBDRIVER_CACHE_DIR
+    type: "string"
   },
   /**
    * Mask sensitive data in logs by replacing matching string or all captured groups for the provided regular expressions as string
@@ -2004,10 +2003,11 @@ var WebDriverRequestError = class extends WebDriverError {
     super(message);
     this.url = url;
     this.opts = opts;
-    const errorCode = typeof err.cause === "object" && err.cause && "code" in err.cause && typeof err.cause.code === "string" ? err.cause.code : "code" in err && typeof err.code === "string" ? err.code : void 0;
+    const isAbortTimeout = err.name === "TimeoutError";
+    const errorCode = typeof err.cause === "object" && err.cause && "code" in err.cause && typeof err.cause.code === "string" ? err.cause.code : "code" in err && typeof err.code === "string" ? err.code : isAbortTimeout ? "ETIMEDOUT" : void 0;
     if (errorCode) {
       this.code = errorCode;
-      this.message = errorCode === "UND_ERR_CONNECT_TIMEOUT" ? 'Request timed out! Consider increasing the "connectionRetryTimeout" option.' : "Request failed with error code " + errorCode;
+      this.message = errorCode === "UND_ERR_CONNECT_TIMEOUT" || isAbortTimeout ? 'Request timed out! Consider increasing the "connectionRetryTimeout" option.' : "Request failed with error code " + errorCode;
     }
     if (typeof err.cause === "object" && err.cause) {
       this.statusCode = "statusCode" in err.cause && typeof err.cause.statusCode === "number" ? err.cause.statusCode : void 0;
@@ -2044,7 +2044,7 @@ var WebDriverResponseError = class _WebDriverResponseError extends WebDriverErro
 // package.json
 var package_default = {
   name: "webdriver",
-  version: "9.30.0",
+  version: "9.31.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",
@@ -2171,6 +2171,7 @@ var WebDriverRequest = class {
   requiresSessionId;
   eventHandler;
   abortSignal;
+  connectionRetryTimeout = DEFAULTS.connectionRetryTimeout.default;
   constructor(method, endpoint, body, abortSignal, isHubCommand = false, eventHandler = {}) {
     this.body = body;
     this.method = method;
@@ -2185,15 +2186,18 @@ var WebDriverRequest = class {
     this.eventHandler.onRequest?.(requestOptions);
     return this._request(url, requestOptions, options.transformResponse, options.connectionRetryCount, 0);
   }
+  createAbortSignal(signal) {
+    return AbortSignal.any([
+      AbortSignal.timeout(this.connectionRetryTimeout),
+      ...signal ? [signal] : []
+    ]);
+  }
   async createOptions(options, sessionId, isBrowser = false) {
-    const timeout = options.connectionRetryTimeout || DEFAULTS.connectionRetryTimeout.default;
+    this.connectionRetryTimeout = options.connectionRetryTimeout || DEFAULTS.connectionRetryTimeout.default;
     const requestOptions = {
       method: this.method,
       redirect: "follow",
-      signal: AbortSignal.any([
-        AbortSignal.timeout(timeout),
-        ...this.abortSignal ? [this.abortSignal] : []
-      ])
+      signal: this.abortSignal
     };
     const requestHeaders = new Headers({
       ...DEFAULT_HEADERS,
@@ -2260,7 +2264,10 @@ var WebDriverRequest = class {
     if (loggableBody && hasLoggableBody(loggableBody)) {
       this.eventHandler.onLogData?.(loggableBody);
     }
-    const { ...requestLibOptions } = fullRequestOptions;
+    const requestLibOptions = {
+      ...fullRequestOptions,
+      signal: this.createAbortSignal(fullRequestOptions.signal)
+    };
     const startTime = performance.now();
     let response = await this._libRequest(url, requestLibOptions).catch((err) => err);
     const durationMillisecond = performance.now() - startTime;

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

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/request/error.ts"],"names":[],"mappings":"AAIA,uBAAe,cAAe,SAAQ,KAAK;;IACvC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAA;IACjB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;IAE1B;;OAEG;IACH,mBAAmB;CAsCtB;AAED,qBAAa,qBAAsB,SAAQ,cAAc;IACrD,GAAG,EAAE,GAAG,CAAA;IACR,IAAI,EAAE,WAAW,CAAA;IAEjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;gBAEA,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW;CA8BvD;AAED,qBAAa,sBAAuB,SAAQ,cAAc;IACtD,GAAG,EAAE,GAAG,CAAA;IACR,IAAI,EAAE,WAAW,CAAA;gBACJ,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW;CA2D9D"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/request/error.ts"],"names":[],"mappings":"AAIA,uBAAe,cAAe,SAAQ,KAAK;;IACvC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAA;IACjB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;IAE1B;;OAEG;IACH,mBAAmB;CAsCtB;AAED,qBAAa,qBAAsB,SAAQ,cAAc;IACrD,GAAG,EAAE,GAAG,CAAA;IACR,IAAI,EAAE,WAAW,CAAA;IAEjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;gBAEA,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW;CAsCvD;AAED,qBAAa,sBAAuB,SAAQ,cAAc;IACtD,GAAG,EAAE,GAAG,CAAA;IACR,IAAI,EAAE,WAAW,CAAA;gBACJ,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW;CA2D9D"}

package/build/request/request.d.ts

@@ -10,8 +10,10 @@ export declare abstract class WebDriverRequest {
     requiresSessionId: boolean;
     eventHandler: RequestEventHandler;
     abortSignal?: AbortSignal;
+    connectionRetryTimeout: number;
     constructor(method: string, endpoint: string, body?: Record<string, unknown>, abortSignal?: AbortSignal, isHubCommand?: boolean, eventHandler?: RequestEventHandler);
     makeRequest(options: RequestOptions, sessionId?: string): Promise<WebDriverResponse<unknown>>;
+    private createAbortSignal;
     createOptions(options: RequestOptions, sessionId?: string, isBrowser?: boolean): Promise<{
         url: URL;
         requestOptions: RequestInit;

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

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/request/request.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAI1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAM5G,OAAO,eAAe,CAAA;AA+CtB,8BAAsB,gBAAgB;IAClC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;IAExE,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;IAC1B,YAAY,EAAE,mBAAmB,CAAA;IACjC,WAAW,CAAC,EAAE,WAAW,CAAA;gBAErB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,WAAW,CAAC,EAAE,WAAW,EACzB,YAAY,GAAE,OAAe,EAC7B,YAAY,GAAE,mBAAwB;IAWpC,WAAW,CAAE,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM;IAMxD,aAAa,CAAE,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC;QAAE,GAAG,EAAE,GAAG,CAAC;QAAC,cAAc,EAAE,WAAW,CAAC;KAAE,CAAC;cA6DlI,WAAW,CAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC;YAiBhF,aAAa;cAiBX,QAAQ,CACpB,GAAG,EAAE,GAAG,EACR,kBAAkB,EAAE,WAAW,EAC/B,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,kBAAkB,EAAE,cAAc,EAAE,WAAW,KAAK,kBAAkB,EACrG,eAAe,SAAI,EACnB,UAAU,SAAI,GACf,OAAO,CAAC,iBAAiB,CAAC;CA+HhC"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/request/request.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAI1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAM5G,OAAO,eAAe,CAAA;AA+CtB,8BAAsB,gBAAgB;IAClC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;IAExE,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;IAC1B,YAAY,EAAE,mBAAmB,CAAA;IACjC,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,sBAAsB,SAA2C;gBAE7D,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,WAAW,CAAC,EAAE,WAAW,EACzB,YAAY,GAAE,OAAe,EAC7B,YAAY,GAAE,mBAAwB;IAWpC,WAAW,CAAE,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM;IAM9D,OAAO,CAAC,iBAAiB;IAOnB,aAAa,CAAE,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC;QAAE,GAAG,EAAE,GAAG,CAAC;QAAC,cAAc,EAAE,WAAW,CAAC;KAAE,CAAC;cA0DlI,WAAW,CAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC;YAiBhF,aAAa;cAiBX,QAAQ,CACpB,GAAG,EAAE,GAAG,EACR,kBAAkB,EAAE,WAAW,EAC/B,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,kBAAkB,EAAE,cAAc,EAAE,WAAW,KAAK,kBAAkB,EACrG,eAAe,SAAI,EACnB,UAAU,SAAI,GACf,OAAO,CAAC,iBAAiB,CAAC;CAsIhC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webdriver",
-  "version": "9.30.1",
+  "version": "9.31.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",
@@ -38,15 +38,15 @@
   "dependencies": {
     "@types/node": "^20.1.0",
     "@types/ws": "^8.5.3",
-    "@wdio/config": "9.30.1",
+    "@wdio/config": "9.31.1",
     "@wdio/logger": "9.29.1",
-    "@wdio/protocols": "9.30.1",
-    "@wdio/types": "9.30.1",
-    "@wdio/utils": "9.30.1",
+    "@wdio/protocols": "9.31.1",
+    "@wdio/types": "9.31.1",
+    "@wdio/utils": "9.31.1",
     "deepmerge-ts": "^7.0.3",
     "https-proxy-agent": "^7.0.6",
     "undici": "^6.27.0",
     "ws": "^8.21.0"
   },
-  "gitHead": "2ea7c6945a5ec1fa0edd89fe7d3f821dc29201d8"
+  "gitHead": "c766850846f7ac91cd6cd1d2cd979fbb8a6e8daf"
 }