webdriver 9.5.3 → 9.5.4

package/build/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAI7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAgB,aAAa,EAAE,MAAM,YAAY,CAAA;AAKzE,MAAM,CAAC,OAAO,WACV,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,eAAe,EAC5B,qBAAqB,UAAQ,UAIgB,UAAU,WAAW,OAAO,EAAE,KAAG,OAAO,CAAC,iBAAiB,GAAG,aAAa,GAAG,IAAI,CAAC,CA6KlI"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAI7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAgB,aAAa,EAAE,MAAM,YAAY,CAAA;AAKzE,MAAM,CAAC,OAAO,WACV,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,eAAe,EAC5B,qBAAqB,UAAQ,UAIgB,UAAU,WAAW,OAAO,EAAE,KAAG,OAAO,CAAC,iBAAiB,GAAG,aAAa,GAAG,IAAI,CAAC,CAiLlI"}

package/build/index.js

@@ -103,8 +103,12 @@ function command_default(method, endpointUri, commandInfo, doubleEncodeVariables
       }
       body[commandParams[i].name] = arg;
     }
-    const request = new environment.value.Request(method, endpoint, body, isHubCommand);
-    request.on("performance", (...args2) => this.emit("request.performance", ...args2));
+    const request = new environment.value.Request(method, endpoint, body, isHubCommand, {
+      onPerformance: (data) => this.emit("request.performance", data),
+      onRequest: (data) => this.emit("request.start", data),
+      onResponse: (data) => this.emit("request.end", data),
+      onRetry: (data) => this.emit("request.retry", data)
+    });
     this.emit("command", { command, method, endpoint, body });
     log.info("COMMAND", commandCallStructure(command, args));
     return request.makeRequest(this.options, this.sessionId).then((result) => {
@@ -181,8 +185,8 @@ var DEFAULTS = {
    */
   path: {
     type: "string",
-    validate: (path2) => {
-      if (!path2.startsWith("/")) {
+    validate: (path) => {
+      if (!path.startsWith("/")) {
         throw new TypeError('The option "path" needs to start with a "/"');
       }
       return true;
@@ -1439,8 +1443,6 @@ _callbacks = new WeakMap();
 _ws2 = new WeakMap();
 
 // src/request/request.ts
-import path from "node:path";
-import { EventEmitter } from "node:events";
 import logger5 from "@wdio/logger";
 import { transformCommandLogResult as transformCommandLogResult2, sleep } from "@wdio/utils";
 
@@ -1556,7 +1558,7 @@ var WebDriverResponseError = class _WebDriverResponseError extends WebDriverErro
 // package.json
 var package_default = {
   name: "webdriver",
-  version: "9.5.1",
+  version: "9.5.3",
   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",
@@ -1617,23 +1619,25 @@ var DEFAULT_HEADERS = {
   "User-Agent": "webdriver/" + package_default.version
 };
 var log5 = logger5("webdriver");
-var WebDriverRequest = class extends EventEmitter {
-  constructor(method, endpoint, body, isHubCommand = false) {
-    super();
+var WebDriverRequest = class {
+  constructor(method, endpoint, body, isHubCommand = false, eventHandler = {}) {
     __publicField(this, "body");
     __publicField(this, "method");
     __publicField(this, "endpoint");
     __publicField(this, "isHubCommand");
     __publicField(this, "requiresSessionId");
+    __publicField(this, "eventHandler");
     this.body = body;
     this.method = method;
     this.endpoint = endpoint;
     this.isHubCommand = isHubCommand;
     this.requiresSessionId = Boolean(this.endpoint.match(/:sessionId/));
+    this.eventHandler = eventHandler;
   }
   async makeRequest(options, sessionId) {
+    var _a, _b;
     const { url, requestOptions } = await this.createOptions(options, sessionId);
-    this.emit("request", requestOptions);
+    (_b = (_a = this.eventHandler).onRequest) == null ? void 0 : _b.call(_a, requestOptions);
     return this._request(url, requestOptions, options.transformResponse, options.connectionRetryCount, 0);
   }
   async createOptions(options, sessionId, isBrowser = false) {
@@ -1659,7 +1663,7 @@ var WebDriverRequest = class extends EventEmitter {
       }
       endpoint = endpoint.replace(":sessionId", sessionId);
     }
-    const url = new URL("".concat(options.protocol, "://").concat(options.hostname, ":").concat(options.port).concat(this.isHubCommand ? this.endpoint : path.join(options.path || "", endpoint)));
+    const url = new URL("".concat(options.protocol, "://").concat(options.hostname, ":").concat(options.port).concat(this.isHubCommand ? this.endpoint : "".concat(options.path || "", "/").concat(endpoint).replace(/(\/){2,}/g, "/")));
     if (searchParams) {
       url.search = new URLSearchParams(searchParams).toString();
     }
@@ -1698,6 +1702,7 @@ var WebDriverRequest = class extends EventEmitter {
     }
   }
   async _request(url, fullRequestOptions, transformResponse, totalRetryCount = 0, retryCount = 0) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     log5.info("[".concat(fullRequestOptions.method, "] ").concat(url.href));
     if (fullRequestOptions.body && Object.keys(fullRequestOptions.body).length) {
       log5.info("DATA", transformCommandLogResult2(fullRequestOptions.body));
@@ -1707,18 +1712,19 @@ var WebDriverRequest = class extends EventEmitter {
     let response = await this._libRequest(url, requestLibOptions).catch((err) => err);
     const durationMillisecond = performance.now() - startTime;
     const retry = async (error2) => {
+      var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
       if (retryCount >= totalRetryCount || error2.message.includes("invalid session id")) {
         log5.error(error2.message);
-        this.emit("response", { error: error2 });
-        this.emit("performance", { request: fullRequestOptions, durationMillisecond, success: false, error: error2, retryCount });
+        (_b2 = (_a2 = this.eventHandler).onResponse) == null ? void 0 : _b2.call(_a2, { error: error2 });
+        (_d2 = (_c2 = this.eventHandler).onPerformance) == null ? void 0 : _d2.call(_c2, { request: fullRequestOptions, durationMillisecond, success: false, error: error2, retryCount });
         throw error2;
       }
       if (retryCount > 0) {
         await sleep(Math.min(1e4, 250 * Math.pow(2, retryCount)));
       }
       ++retryCount;
-      this.emit("retry", { error: error2, retryCount });
-      this.emit("performance", { request: fullRequestOptions, durationMillisecond, success: false, error: error2, retryCount });
+      (_f2 = (_e2 = this.eventHandler).onRetry) == null ? void 0 : _f2.call(_e2, { error: error2, retryCount });
+      (_h2 = (_g2 = this.eventHandler).onPerformance) == null ? void 0 : _h2.call(_g2, { request: fullRequestOptions, durationMillisecond, success: false, error: error2, retryCount });
       log5.warn(error2.message);
       log5.info("Retrying ".concat(retryCount, "/").concat(totalRetryCount));
       return this._request(url, fullRequestOptions, transformResponse, totalRetryCount, retryCount);
@@ -1728,29 +1734,29 @@ var WebDriverRequest = class extends EventEmitter {
       if (resError.code && RETRYABLE_ERROR_CODES.includes(resError.code) || resError.statusCode && RETRYABLE_STATUS_CODES.includes(resError.statusCode)) {
         return retry(resError);
       }
-      this.emit("performance", { request: fullRequestOptions, durationMillisecond, success: false, error: response, retryCount });
+      (_b = (_a = this.eventHandler).onPerformance) == null ? void 0 : _b.call(_a, { request: fullRequestOptions, durationMillisecond, success: false, error: response, retryCount });
       throw response;
     }
     if (typeof transformResponse === "function") {
       response = transformResponse(response, fullRequestOptions);
     }
     if (isSuccessfulResponse(response.statusCode, response.body)) {
-      this.emit("response", { result: response.body });
-      this.emit("performance", { request: fullRequestOptions, durationMillisecond, success: true, retryCount });
+      (_d = (_c = this.eventHandler).onResponse) == null ? void 0 : _d.call(_c, { result: response.body });
+      (_f = (_e = this.eventHandler).onPerformance) == null ? void 0 : _f.call(_e, { request: fullRequestOptions, durationMillisecond, success: true, retryCount });
       return response.body;
     }
     const error = new WebDriverResponseError(response, url, fullRequestOptions);
     if (this.isHubCommand) {
       if (typeof response.body === "string" && response.body.startsWith("<!DOCTYPE html>")) {
-        this.emit("performance", { request: fullRequestOptions, durationMillisecond, success: false, error, retryCount });
+        (_h = (_g = this.eventHandler).onPerformance) == null ? void 0 : _h.call(_g, { request: fullRequestOptions, durationMillisecond, success: false, error, retryCount });
         return Promise.reject(new Error("Command can only be called to a Selenium Hub"));
       }
       return { value: response.body || null };
     }
     if (error.name === "stale element reference") {
       log5.warn("Request encountered a stale element - terminating request");
-      this.emit("response", { error });
-      this.emit("performance", { request: fullRequestOptions, durationMillisecond, success: false, error, retryCount });
+      (_j = (_i = this.eventHandler).onResponse) == null ? void 0 : _j.call(_i, { error });
+      (_l = (_k = this.eventHandler).onPerformance) == null ? void 0 : _l.call(_k, { request: fullRequestOptions, durationMillisecond, success: false, error, retryCount });
       throw error;
     }
     if (ERRORS_TO_EXCLUDE_FROM_RETRY.includes(error.name)) {

package/build/node.js

@@ -96,8 +96,12 @@ Actual: ${actual}` + moreInfo
       }
       body[commandParams[i].name] = arg;
     }
-    const request = new environment.value.Request(method, endpoint, body, isHubCommand);
-    request.on("performance", (...args2) => this.emit("request.performance", ...args2));
+    const request = new environment.value.Request(method, endpoint, body, isHubCommand, {
+      onPerformance: (data) => this.emit("request.performance", data),
+      onRequest: (data) => this.emit("request.start", data),
+      onResponse: (data) => this.emit("request.end", data),
+      onRetry: (data) => this.emit("request.retry", data)
+    });
     this.emit("command", { command, method, endpoint, body });
     log.info("COMMAND", commandCallStructure(command, args));
     return request.makeRequest(this.options, this.sessionId).then((result) => {
@@ -173,8 +177,8 @@ var DEFAULTS = {
    */
   path: {
     type: "string",
-    validate: (path2) => {
-      if (!path2.startsWith("/")) {
+    validate: (path) => {
+      if (!path.startsWith("/")) {
         throw new TypeError('The option "path" needs to start with a "/"');
       }
       return true;
@@ -1384,8 +1388,6 @@ import dns from "node:dns";
 import { fetch as fetch2, Agent, ProxyAgent } from "undici";
 
 // src/request/request.ts
-import path from "node:path";
-import { EventEmitter } from "node:events";
 import logger5 from "@wdio/logger";
 import { transformCommandLogResult as transformCommandLogResult2, sleep } from "@wdio/utils";
 
@@ -1495,7 +1497,7 @@ var WebDriverResponseError = class _WebDriverResponseError extends WebDriverErro
 // package.json
 var package_default = {
   name: "webdriver",
-  version: "9.5.1",
+  version: "9.5.3",
   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",
@@ -1556,23 +1558,24 @@ var DEFAULT_HEADERS = {
   "User-Agent": "webdriver/" + package_default.version
 };
 var log5 = logger5("webdriver");
-var WebDriverRequest = class extends EventEmitter {
+var WebDriverRequest = class {
   body;
   method;
   endpoint;
   isHubCommand;
   requiresSessionId;
-  constructor(method, endpoint, body, isHubCommand = false) {
-    super();
+  eventHandler;
+  constructor(method, endpoint, body, isHubCommand = false, eventHandler = {}) {
     this.body = body;
     this.method = method;
     this.endpoint = endpoint;
     this.isHubCommand = isHubCommand;
     this.requiresSessionId = Boolean(this.endpoint.match(/:sessionId/));
+    this.eventHandler = eventHandler;
   }
   async makeRequest(options, sessionId) {
     const { url, requestOptions } = await this.createOptions(options, sessionId);
-    this.emit("request", requestOptions);
+    this.eventHandler.onRequest?.(requestOptions);
     return this._request(url, requestOptions, options.transformResponse, options.connectionRetryCount, 0);
   }
   async createOptions(options, sessionId, isBrowser = false) {
@@ -1598,7 +1601,7 @@ var WebDriverRequest = class extends EventEmitter {
       }
       endpoint = endpoint.replace(":sessionId", sessionId);
     }
-    const url = new URL(`${options.protocol}://${options.hostname}:${options.port}${this.isHubCommand ? this.endpoint : path.join(options.path || "", endpoint)}`);
+    const url = new URL(`${options.protocol}://${options.hostname}:${options.port}${this.isHubCommand ? this.endpoint : `${options.path || ""}/${endpoint}`.replace(/(\/){2,}/g, "/")}`);
     if (searchParams) {
       url.search = new URLSearchParams(searchParams).toString();
     }
@@ -1647,16 +1650,16 @@ var WebDriverRequest = class extends EventEmitter {
     const retry = async (error2) => {
       if (retryCount >= totalRetryCount || error2.message.includes("invalid session id")) {
         log5.error(error2.message);
-        this.emit("response", { error: error2 });
-        this.emit("performance", { request: fullRequestOptions, durationMillisecond, success: false, error: error2, retryCount });
+        this.eventHandler.onResponse?.({ error: error2 });
+        this.eventHandler.onPerformance?.({ request: fullRequestOptions, durationMillisecond, success: false, error: error2, retryCount });
         throw error2;
       }
       if (retryCount > 0) {
         await sleep(Math.min(1e4, 250 * Math.pow(2, retryCount)));
       }
       ++retryCount;
-      this.emit("retry", { error: error2, retryCount });
-      this.emit("performance", { request: fullRequestOptions, durationMillisecond, success: false, error: error2, retryCount });
+      this.eventHandler.onRetry?.({ error: error2, retryCount });
+      this.eventHandler.onPerformance?.({ request: fullRequestOptions, durationMillisecond, success: false, error: error2, retryCount });
       log5.warn(error2.message);
       log5.info(`Retrying ${retryCount}/${totalRetryCount}`);
       return this._request(url, fullRequestOptions, transformResponse, totalRetryCount, retryCount);
@@ -1666,29 +1669,29 @@ var WebDriverRequest = class extends EventEmitter {
       if (resError.code && RETRYABLE_ERROR_CODES.includes(resError.code) || resError.statusCode && RETRYABLE_STATUS_CODES.includes(resError.statusCode)) {
         return retry(resError);
       }
-      this.emit("performance", { request: fullRequestOptions, durationMillisecond, success: false, error: response, retryCount });
+      this.eventHandler.onPerformance?.({ request: fullRequestOptions, durationMillisecond, success: false, error: response, retryCount });
       throw response;
     }
     if (typeof transformResponse === "function") {
       response = transformResponse(response, fullRequestOptions);
     }
     if (isSuccessfulResponse(response.statusCode, response.body)) {
-      this.emit("response", { result: response.body });
-      this.emit("performance", { request: fullRequestOptions, durationMillisecond, success: true, retryCount });
+      this.eventHandler.onResponse?.({ result: response.body });
+      this.eventHandler.onPerformance?.({ request: fullRequestOptions, durationMillisecond, success: true, retryCount });
       return response.body;
     }
     const error = new WebDriverResponseError(response, url, fullRequestOptions);
     if (this.isHubCommand) {
       if (typeof response.body === "string" && response.body.startsWith("<!DOCTYPE html>")) {
-        this.emit("performance", { request: fullRequestOptions, durationMillisecond, success: false, error, retryCount });
+        this.eventHandler.onPerformance?.({ request: fullRequestOptions, durationMillisecond, success: false, error, retryCount });
         return Promise.reject(new Error("Command can only be called to a Selenium Hub"));
       }
       return { value: response.body || null };
     }
     if (error.name === "stale element reference") {
       log5.warn("Request encountered a stale element - terminating request");
-      this.emit("response", { error });
-      this.emit("performance", { request: fullRequestOptions, durationMillisecond, success: false, error, retryCount });
+      this.eventHandler.onResponse?.({ error });
+      this.eventHandler.onPerformance?.({ request: fullRequestOptions, durationMillisecond, success: false, error, retryCount });
       throw error;
     }
     if (ERRORS_TO_EXCLUDE_FROM_RETRY.includes(error.name)) {

package/build/request/request.d.ts

@@ -1,14 +1,14 @@
-import { EventEmitter } from 'node:events';
 import type { Options } from '@wdio/types';
-import type { WebDriverResponse, RequestLibResponse, RequestOptions } from './types.js';
-export declare abstract class WebDriverRequest extends EventEmitter {
+import type { WebDriverResponse, RequestLibResponse, RequestOptions, RequestEventHandler } from './types.js';
+export declare abstract class WebDriverRequest {
     protected abstract fetch(url: URL, opts: RequestInit): Promise<Response>;
     body?: Record<string, unknown>;
     method: string;
     endpoint: string;
     isHubCommand: boolean;
     requiresSessionId: boolean;
-    constructor(method: string, endpoint: string, body?: Record<string, unknown>, isHubCommand?: boolean);
+    eventHandler: RequestEventHandler;
+    constructor(method: string, endpoint: string, body?: Record<string, unknown>, isHubCommand?: boolean, eventHandler?: RequestEventHandler);
     makeRequest(options: RequestOptions, sessionId?: string): Promise<WebDriverResponse<unknown>>;
     createOptions(options: RequestOptions, sessionId?: string, isBrowser?: boolean): Promise<{
         url: URL;

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

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/request/request.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAI1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAI1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAoBvF,8BAAsB,gBAAiB,SAAQ,YAAY;IACvD,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;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;IAMxD,aAAa,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;cA2DhI,WAAW,CAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC;cA6B9E,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;CA0HhC"}
+{"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;AAoB5G,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;gBAEpB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAE,OAAe,EAAE,YAAY,GAAE,mBAAwB;IAS9I,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;QAAC,GAAG,EAAE,GAAG,CAAC;QAAC,cAAc,EAAE,WAAW,CAAC;KAAC,CAAC;cA2DhI,WAAW,CAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC;cA6B9E,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;CA0HhC"}

package/build/request/types.d.ts

@@ -16,4 +16,26 @@ export interface WebDriverResponse<T = unknown> {
 }
 export type RequestLibResponse = Options.RequestLibResponse;
 export type RequestOptions = Omit<Options.WebDriver, 'capabilities'>;
+export interface RequestEventHandler {
+    onRequest?: (ev: RequestStartEvent) => void;
+    onResponse?: (ev: RequestEndEvent) => void;
+    onRetry?: (ev: RequestRetryEvent) => void;
+    onPerformance?: (ev: RequestPerformanceEvent) => void;
+}
+export type RequestStartEvent = RequestInit;
+export type RequestEndEvent = {
+    result?: unknown;
+    error?: Error;
+};
+export type RequestRetryEvent = {
+    error: Error;
+    retryCount: number;
+};
+export type RequestPerformanceEvent = {
+    request: RequestInit;
+    durationMillisecond: number;
+    success: boolean;
+    error?: Error;
+    retryCount: number;
+};
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/request/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,MAAM,WAAW,iBAAiB,CAAC,CAAC,GAAG,OAAO;IAC1C,KAAK,EAAE,CAAC,CAAA;IACR;;;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,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAA;AAC3D,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/request/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,MAAM,WAAW,iBAAiB,CAAC,CAAC,GAAG,OAAO;IAC1C,KAAK,EAAE,CAAC,CAAA;IACR;;;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,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAA;AAC3D,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;AAEpE,MAAM,WAAW,mBAAmB;IAChC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,iBAAiB,KAAK,IAAI,CAAA;IAC3C,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,eAAe,KAAK,IAAI,CAAA;IAC1C,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACzC,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,uBAAuB,KAAK,IAAI,CAAA;CACxD;AAED,MAAM,MAAM,iBAAiB,GAAG,WAAW,CAAA;AAC3C,MAAM,MAAM,eAAe,GAAG;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAAA;AACjE,MAAM,MAAM,iBAAiB,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAA;AACpE,MAAM,MAAM,uBAAuB,GAAG;IAAE,OAAO,EAAE,WAAW,CAAC;IAAC,mBAAmB,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAA"}

package/build/types.d.ts

@@ -5,6 +5,7 @@ import type { BidiHandler } from './bidi/handler.js';
 import type { EventData } from './bidi/localTypes.js';
 import type { CommandData } from './bidi/remoteTypes.js';
 import type { CommandResponse } from './bidi/localTypes.js';
+import type { RequestStartEvent, RequestEndEvent, RequestPerformanceEvent, RequestRetryEvent } from './request/types.js';
 export interface JSONWPCommandError extends Error {
     code?: string;
     statusCode?: string;
@@ -49,13 +50,10 @@ type WebDriverClassicEvents = {
     };
     bidiCommand: Omit<CommandData, 'id'>;
     bidiResult: CommandResponse;
-    'request.performance': {
-        durationMillisecond: number;
-        error: string;
-        request: unknown;
-        retryCount: number;
-        success: boolean;
-    };
+    'request.performance': RequestPerformanceEvent;
+    'request.retry': RequestRetryEvent;
+    'request.start': RequestStartEvent;
+    'request.end': RequestEndEvent;
 };
 export type BidiEventMap = {
     [Event in keyof Omit<WebDriverBidiCommands, 'sendCommand' | 'sendAsyncCommand'>]: BidiInterface[WebDriverBidiCommands[Event]['socket']['command']];

package/build/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webdriver",
-  "version": "9.5.3",
+  "version": "9.5.4",
   "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",
@@ -47,5 +47,5 @@
     "undici": "^6.20.1",
     "ws": "^8.8.0"
   },
-  "gitHead": "f637de6d4711fe0e3f6d84925286481afcacc324"
+  "gitHead": "b4e5733841d26e9b3e29cac5630f9bb67e33e00e"
 }

package/build/request/index.d.ts

@@ -1,26 +0,0 @@
-import { EventEmitter } from 'node:events';
-import { URL } from 'node:url';
-import type { Options } from '@wdio/types';
-import type { WebDriverResponse } from './types.js';
-type RequestLibResponse = Options.RequestLibResponse;
-type RequestOptions = Omit<Options.WebDriver, 'capabilities'>;
-export declare const COMMANDS_WITHOUT_RETRY: string[];
-export default abstract class WebDriverRequest extends EventEmitter {
-    #private;
-    body?: Record<string, unknown>;
-    method: string;
-    endpoint: string;
-    isHubCommand: boolean;
-    requiresSessionId: boolean;
-    constructor(method: string, endpoint: string, body?: Record<string, unknown>, isHubCommand?: boolean);
-    makeRequest(options: RequestOptions, sessionId?: string): Promise<WebDriverResponse<unknown>>;
-    protected _createOptions(options: RequestOptions, sessionId?: string, isBrowser?: boolean): Promise<{
-        url: URL;
-        requestOptions: RequestInit;
-    }>;
-    protected _libRequest(_url: URL, _options: RequestInit): Promise<RequestLibResponse>;
-    protected _libPerformanceNow(): number;
-    private _request;
-}
-export {};
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"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;AAI1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAMnD,KAAK,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAA;AACpD,KAAK,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;AAO7D,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,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAI1F,SAAS,CAAC,kBAAkB,IAAI,MAAM;YAIxB,QAAQ;CAoIzB"}