webdriver 9.14.0 → 9.16.0

package/build/node.js

@@ -8,9 +8,9 @@ import { webdriverMonad, sessionEnvironmentDetector, startWebDriver, isBidi } fr
 import { validateConfig } from "@wdio/config";
 
 // src/command.ts
-import logger from "@wdio/logger";
-import { commandCallStructure, isValidParameter, getArgumentType } from "@wdio/utils";
-import { WebDriverBidiProtocol } from "@wdio/protocols";
+import logger3 from "@wdio/logger";
+import { commandCallStructure, isValidParameter, getArgumentType, transformCommandLogResult } from "@wdio/utils";
+import { WebDriverBidiProtocol as WebDriverBidiProtocol2 } from "@wdio/protocols";
 
 // src/environment.ts
 var isNode = !!(typeof process !== "undefined" && process.version);
@@ -31,169 +31,32 @@ var environment = {
   }
 };
 
-// src/command.ts
-var log = logger("webdriver");
-var BIDI_COMMANDS = Object.values(WebDriverBidiProtocol).map((def) => def.socket.command);
-var sessionAbortListeners = /* @__PURE__ */ new Map();
-function command_default(method, endpointUri, commandInfo, doubleEncodeVariables = false) {
-  const { command, deprecated, ref, parameters, variables = [], isHubCommand = false } = commandInfo;
-  return async function protocolCommand(...args) {
-    const isBidiCommand = BIDI_COMMANDS.includes(command);
-    let endpoint = endpointUri;
-    const commandParams = [...variables.map((v) => Object.assign(v, {
-      /**
-       * url variables are:
-       */
-      required: true,
-      // always required as they are part of the endpoint
-      type: "string"
-      // have to be always type of string
-    })), ...parameters];
-    const commandUsage = `${command}(${commandParams.map((p) => p.name).join(", ")})`;
-    const moreInfo = `
+// src/types.ts
+var CommandRuntimeOptions = class {
+  // mask the text parameter value of the command
+  mask;
+  constructor(options) {
+    this.mask = options.mask;
+  }
+};
 
-For more info see ${ref}
-`;
-    const body = {};
-    if (typeof deprecated === "string" && !process.env.DISABLE_WEBDRIVERIO_DEPRECATION_WARNINGS) {
-      const warning = deprecated.replace("This command", `The "${command}" command`);
-      log.warn(warning);
-      console.warn(`\u26A0\uFE0F [WEBDRIVERIO DEPRECATION NOTICE] ${warning}`);
-    }
-    if (isBidiCommand) {
-      throw new Error(
-        `Failed to execute WebDriver Bidi command "${command}" as no Bidi session was established. Make sure you enable it by setting "webSocketUrl: true" in your capabilities and verify that your environment and browser supports it.`
-      );
-    }
-    const minAllowedParams = commandParams.filter((param) => param.required).length;
-    if (args.length < minAllowedParams || args.length > commandParams.length) {
-      const parameterDescription = commandParams.length ? `
+// src/utils.ts
+import { deepmergeCustom } from "deepmerge-ts";
+import logger2, { SENSITIVE_DATA_REPLACER } from "@wdio/logger";
+import {
+  WebDriverProtocol,
+  MJsonWProtocol,
+  AppiumProtocol,
+  ChromiumProtocol,
+  SauceLabsProtocol,
+  SeleniumProtocol,
+  GeckoProtocol,
+  WebDriverBidiProtocol
+} from "@wdio/protocols";
+import { CAPABILITY_KEYS } from "@wdio/protocols";
 
-Property Description:
-${commandParams.map((p) => `  "${p.name}" (${p.type}): ${p.description}`).join("\n")}` : "";
-      throw new Error(
-        `Wrong parameters applied for ${command}
-Usage: ${commandUsage}` + parameterDescription + moreInfo
-      );
-    }
-    for (const [it, arg] of Object.entries(args)) {
-      if (isBidiCommand) {
-        break;
-      }
-      const i = parseInt(it, 10);
-      const commandParam = commandParams[i];
-      if (!isValidParameter(arg, commandParam.type)) {
-        if (typeof arg === "undefined" && !commandParam.required) {
-          continue;
-        }
-        const actual = commandParam.type.endsWith("[]") ? `(${(Array.isArray(arg) ? arg : [arg]).map((a) => getArgumentType(a))})[]` : getArgumentType(arg);
-        throw new Error(
-          `Malformed type for "${commandParam.name}" parameter of command ${command}
-Expected: ${commandParam.type}
-Actual: ${actual}` + moreInfo
-        );
-      }
-      if (i < variables.length) {
-        const encodedArg = doubleEncodeVariables ? encodeURIComponent(encodeURIComponent(arg)) : encodeURIComponent(arg);
-        endpoint = endpoint.replace(`:${commandParams[i].name}`, encodedArg);
-        continue;
-      }
-      body[commandParams[i].name] = arg;
-    }
-    const { isAborted, abortSignal, cleanup } = manageSessionAbortions.call(this);
-    const requiresSession = endpointUri.includes("/:sessionId/");
-    if (isAborted && command !== "deleteSession" && requiresSession) {
-      throw new Error(`Trying to run command "${commandCallStructure(command, args)}" after session has been deleted, aborting request without executing it`);
-    }
-    const request = new environment.value.Request(method, endpoint, body, abortSignal, 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) => {
-      if (typeof result.value !== "undefined") {
-        let resultLog = result.value;
-        if (/screenshot|recording/i.test(command) && typeof result.value === "string" && result.value.length > 64) {
-          resultLog = `${result.value.slice(0, 61)}...`;
-        } else if (command === "executeScript" && typeof body.script === "string" && body.script.includes("(() => window.__wdioEvents__)")) {
-          resultLog = `[${result.value.length} framework events captured]`;
-        }
-        log.info("RESULT", resultLog);
-      }
-      this.emit("result", { command, method, endpoint, body, result });
-      if (command === "deleteSession") {
-        const browser = this;
-        browser._bidiHandler?.close();
-        const shutdownDriver = body.deleteSessionOpts?.shutdownDriver !== false;
-        if (shutdownDriver && "wdio:driverPID" in this.capabilities && this.capabilities["wdio:driverPID"]) {
-          log.info(`Kill driver process with PID ${this.capabilities["wdio:driverPID"]}`);
-          try {
-            const killedSuccessfully = process.kill(this.capabilities["wdio:driverPID"], "SIGKILL");
-            if (!killedSuccessfully) {
-              log.warn("Failed to kill driver process, manually clean-up might be required");
-            }
-          } catch (err) {
-            log.warn("Failed to kill driver process", err);
-          }
-          setTimeout(() => {
-            for (const handle of process._getActiveHandles()) {
-              if (handle.servername && handle.servername.includes("edgedl.me")) {
-                handle.destroy();
-              }
-            }
-          }, 10);
-        }
-        if (!process.env.WDIO_WORKER_ID) {
-          logger.clearLogger();
-        }
-      }
-      return result.value;
-    }).catch((error) => {
-      this.emit("result", { command, method, endpoint, body, result: { error } });
-      throw error;
-    }).finally(() => {
-      cleanup();
-    });
-  };
-}
-function manageSessionAbortions() {
-  const abort = new AbortController();
-  const abortOnSessionEnd = (result) => {
-    if (result.command !== "deleteSession") {
-      return;
-    }
-    const abortListeners = sessionAbortListeners.get(this.sessionId);
-    if (abortListeners) {
-      for (const abortListener of abortListeners) {
-        abortListener.abort();
-      }
-      abortListeners.clear();
-      sessionAbortListeners.set(this.sessionId, null);
-    }
-  };
-  let abortListenerForCurrentSession = sessionAbortListeners.get(this.sessionId);
-  if (typeof abortListenerForCurrentSession === "undefined") {
-    abortListenerForCurrentSession = /* @__PURE__ */ new Set();
-    sessionAbortListeners.set(this.sessionId, abortListenerForCurrentSession);
-    this.on("result", abortOnSessionEnd);
-  }
-  if (abortListenerForCurrentSession === null) {
-    return { isAborted: true, abortSignal: void 0, cleanup: () => {
-    } };
-  }
-  abortListenerForCurrentSession.add(abort);
-  return {
-    isAborted: false,
-    abortSignal: abort.signal,
-    cleanup: () => {
-      this.off("result", abortOnSessionEnd);
-      abortListenerForCurrentSession?.delete(abort);
-    }
-  };
-}
+// src/bidi/core.ts
+import logger from "@wdio/logger";
 
 // src/constants.ts
 var DEFAULTS = {
@@ -333,32 +196,51 @@ var DEFAULTS = {
   cacheDir: {
     type: "string",
     default: environment.value.variables.WEBDRIVER_CACHE_DIR
+  },
+  /**
+   * Mask sensitive data in logs by replacing matching string or all captured groups for the provided regular expressions as string
+   */
+  maskingPatterns: {
+    type: "string",
+    default: void 0
   }
 };
 var ELEMENT_KEY = "element-6066-11e4-a52e-4f735466cecf";
 var SHADOW_ELEMENT_KEY = "shadow-6066-11e4-a52e-4f735466cecf";
+var BASE_64_REGEX = /^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$/;
+var BASE_64_SAFE_STRING_TO_PROCESS_LENGTH = 2e5;
+var APPIUM_MASKING_HEADER = { "x-appium-is-sensitive": "true" };
 
-// src/utils.ts
-import { deepmergeCustom } from "deepmerge-ts";
-import logger3 from "@wdio/logger";
-import {
-  WebDriverProtocol,
-  MJsonWProtocol,
-  AppiumProtocol,
-  ChromiumProtocol,
-  SauceLabsProtocol,
-  SeleniumProtocol,
-  GeckoProtocol,
-  WebDriverBidiProtocol as WebDriverBidiProtocol2
-} from "@wdio/protocols";
-import { CAPABILITY_KEYS } from "@wdio/protocols";
+// src/bidi/utils.ts
+function isBase64Safe(str) {
+  if (typeof str !== "string") {
+    return false;
+  }
+  if (str.length === 0) {
+    return true;
+  }
+  if (str.length % 4 !== 0) {
+    return false;
+  }
+  const length = str.length;
+  const digitCount = length.toString().length;
+  if (length > BASE_64_SAFE_STRING_TO_PROCESS_LENGTH) {
+    const chunkSize = Math.floor(length / digitCount / 4) * 4;
+    for (let i = 0; i < length; i += chunkSize) {
+      const chunk = str.slice(i, i + chunkSize);
+      if (!BASE_64_REGEX.test(chunk)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  return BASE_64_REGEX.test(str);
+}
 
 // src/bidi/core.ts
-import logger2 from "@wdio/logger";
 var SCRIPT_PREFIX = "/* __wdio script__ */";
 var SCRIPT_SUFFIX = "/* __wdio script end__ */";
-var base64Regex = /^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$/;
-var log2 = logger2("webdriver");
+var log = logger("webdriver");
 var RESPONSE_TIMEOUT = 1e3 * 60;
 var BidiCore = class {
   #id = 0;
@@ -391,7 +273,7 @@ var BidiCore = class {
     this.client = client;
   }
   async connect() {
-    log2.info(`Connecting to webSocketUrl ${this.#webSocketUrl}`);
+    log.info(`Connecting to webSocketUrl ${this.#webSocketUrl}`);
     this.#ws = await environment.value.createBidiConnection(this.#webSocketUrl, this.#clientOptions);
     this._isConnected = Boolean(this.#ws);
     this.#resolveWaitForConnected(this._isConnected);
@@ -404,7 +286,7 @@ var BidiCore = class {
     if (!this._isConnected) {
       return;
     }
-    log2.info(`Close Bidi connection to ${this.#webSocketUrl}`);
+    log.info(`Close Bidi connection to ${this.#webSocketUrl}`);
     this._isConnected = false;
     if (this.#ws) {
       this.#ws.off("message", this.#handleResponse.bind(this));
@@ -414,7 +296,7 @@ var BidiCore = class {
     }
   }
   reconnect(webSocketUrl, opts) {
-    log2.info(`Reconnect to new Bidi session at ${webSocketUrl}`);
+    log.info(`Reconnect to new Bidi session at ${webSocketUrl}`);
     this.close();
     this.#webSocketUrl = webSocketUrl;
     this.#clientOptions = opts;
@@ -447,24 +329,24 @@ var BidiCore = class {
         return;
       }
       let resultLog = data.toString();
-      if (typeof payload.result === "object" && payload.result && "data" in payload.result && typeof payload.result.data === "string" && base64Regex.test(payload.result.data)) {
+      if (typeof payload.result === "object" && payload.result && "data" in payload.result && typeof payload.result.data === "string" && isBase64Safe(payload.result.data)) {
         resultLog = JSON.stringify({
           ...payload.result,
           data: `Base64 string [${payload.result.data.length} chars]`
         });
       }
-      log2.info("BIDI RESULT", resultLog);
+      log.info("BIDI RESULT", resultLog);
       this.client?.emit("bidiResult", payload);
       const resolve = this.#pendingCommands.get(payload.id);
       if (!resolve) {
-        log2.error(`Couldn't resolve command with id ${payload.id}`);
+        log.error(`Couldn't resolve command with id ${payload.id}`);
         return;
       }
       this.#pendingCommands.delete(payload.id);
       resolve(payload);
     } catch (err) {
       const error = err instanceof Error ? err : new Error(`Failed parse message: ${String(err)}`);
-      log2.error(`Failed parse message: ${error.message}`);
+      log.error(`Failed parse message: ${error.message}`);
     }
   }
   async send(params) {
@@ -498,7 +380,7 @@ ${driverStack}`;
     if (!this.#ws || !this._isConnected) {
       throw new Error("No connection to WebDriver Bidi was established");
     }
-    log2.info("BIDI COMMAND", ...parseBidiCommand(params));
+    log.info("BIDI COMMAND", ...parseBidiCommand(params));
     const id = ++this.#id;
     this.client?.emit("bidiCommand", params);
     this.#ws.send(JSON.stringify({ id, ...params }));
@@ -1140,7 +1022,7 @@ var BidiHandler = class extends BidiCore {
 };
 
 // src/utils.ts
-var log3 = logger3("webdriver");
+var log2 = logger2("webdriver");
 var deepmerge = deepmergeCustom({ mergeArrays: false });
 var BROWSER_DRIVER_ERRORS = [
   "unknown command: wd/hub/session",
@@ -1176,7 +1058,7 @@ async function startWebDriverSession(params) {
   try {
     response = await sessionRequest.makeRequest(params);
   } catch (err) {
-    log3.error(err);
+    log2.error(err);
     const message = getSessionError(err, params);
     throw new Error(message);
   }
@@ -1203,7 +1085,7 @@ function validateCapabilities(capabilities) {
 }
 function isSuccessfulResponse(statusCode, body) {
   if (!body || typeof body !== "object" || !("value" in body) || typeof body.value === "undefined") {
-    log3.debug("request failed due to missing body");
+    log2.debug("request failed due to missing body");
     return false;
   }
   if ("status" in body && body.status === 7 && body.value && typeof body.value === "object" && "message" in body.value && body.value.message && typeof body.value.message === "string" && (body.value.message.toLowerCase().startsWith("no such element") || // Appium
@@ -1212,7 +1094,7 @@ function isSuccessfulResponse(statusCode, body) {
     return true;
   }
   if ("status" in body && body.status && body.status !== 0) {
-    log3.debug(`request failed due to status ${body.status}`);
+    log2.debug(`request failed due to status ${body.status}`);
     return false;
   }
   const hasErrorResponse = body.value && (typeof body.value === "object" && "error" in body.value && body.value.error || typeof body.value === "object" && "stackTrace" in body.value && body.value.stackTrace || typeof body.value === "object" && "stacktrace" in body.value && body.value.stacktrace);
@@ -1224,7 +1106,7 @@ function isSuccessfulResponse(statusCode, body) {
   }
   if (hasErrorResponse) {
     const errMsg = typeof body.value === "object" && body.value && "error" in body.value ? body.value.error : body.value;
-    log3.debug("request failed due to response error:", errMsg);
+    log2.debug("request failed due to response error:", errMsg);
     return false;
   }
   return true;
@@ -1241,7 +1123,7 @@ function getPrototype({ isW3C, isChromium, isFirefox, isMobile, isSauce, isSelen
     /**
      * enable Bidi protocol for W3C sessions
      */
-    isW3C ? WebDriverBidiProtocol2 : {},
+    isW3C ? WebDriverBidiProtocol : {},
     /**
      * only apply mobile protocol if session is actually for mobile
      */
@@ -1304,7 +1186,7 @@ function setupDirectConnect(client) {
   const directConnectPath = capabilities["appium:directConnectPath"];
   const directConnectPort = capabilities["appium:directConnectPort"];
   if (directConnectProtocol && directConnectHost && directConnectPort && (directConnectPath || directConnectPath === "")) {
-    log3.info(`Found direct connect information in new session response. Will connect to server at ${directConnectProtocol}://${directConnectHost}:${directConnectPort}${directConnectPath}`);
+    log2.info(`Found direct connect information in new session response. Will connect to server at ${directConnectProtocol}://${directConnectHost}:${directConnectPort}${directConnectPath}`);
     client.options.protocol = directConnectProtocol;
     client.options.hostname = directConnectHost;
     client.options.port = directConnectPort;
@@ -1346,7 +1228,7 @@ It seems like the service failed to start or is rejecting any connections.`;
 function initiateBidi(socketUrl, strictSSL = true, userHeaders) {
   const isUnitTesting = process.env.WDIO_UNIT_TESTS;
   if (isUnitTesting) {
-    log3.info("Skip connecting to WebDriver Bidi interface due to unit tests");
+    log2.info("Skip connecting to WebDriver Bidi interface due to unit tests");
     return {
       _bidiHandler: {
         value: {
@@ -1365,10 +1247,10 @@ function initiateBidi(socketUrl, strictSSL = true, userHeaders) {
     bidiReqOpts.headers = userHeaders;
   }
   const handler = new BidiHandler(socketUrl, bidiReqOpts);
-  handler.connect().then((isConnected) => isConnected && log3.info(`Connected to WebDriver Bidi interface at ${socketUrl}`));
+  handler.connect().then((isConnected) => isConnected && log2.info(`Connected to WebDriver Bidi interface at ${socketUrl}`));
   return {
     _bidiHandler: { value: handler },
-    ...Object.values(WebDriverBidiProtocol2).map((def) => def.socket).reduce((acc, cur) => {
+    ...Object.values(WebDriverBidiProtocol).map((def) => def.socket).reduce((acc, cur) => {
       acc[cur.command] = {
         value: function(...args) {
           const bidiFn = handler[cur.command];
@@ -1389,8 +1271,208 @@ function parseBidiMessage(data) {
     }
     this.emit(payload.method, payload.params);
   } catch (err) {
-    log3.error(`Failed parse WebDriver Bidi message: ${err.message}`);
+    log2.error(`Failed parse WebDriver Bidi message: ${err.message}`);
+  }
+}
+function mask(commandInfo, options, body, args) {
+  const unmaskedResult = { maskedBody: body, maskedArgs: args, isMasked: false };
+  if (!options.mask) {
+    return unmaskedResult;
+  }
+  const textValueParamIndex = commandInfo.parameters.findIndex((param) => param.name === "text");
+  if (textValueParamIndex === -1) {
+    return unmaskedResult;
+  }
+  const textValueIndexInArgs = (commandInfo.variables?.length ?? 0) + textValueParamIndex;
+  const text = args[textValueIndexInArgs];
+  if (typeof text !== "string" || !text) {
+    return unmaskedResult;
+  }
+  const maskedBody = {
+    ...body,
+    text: SENSITIVE_DATA_REPLACER
+  };
+  const textValueArgsIndex = textValueParamIndex + (commandInfo.variables?.length ?? 0);
+  const maskedArgs = args.slice(0, textValueArgsIndex).concat(SENSITIVE_DATA_REPLACER).concat(args.slice(textValueArgsIndex + 1));
+  return {
+    maskedBody,
+    maskedArgs,
+    isMasked: true
+  };
+}
+
+// src/command.ts
+var log3 = logger3("webdriver");
+var BIDI_COMMANDS = Object.values(WebDriverBidiProtocol2).map((def) => def.socket.command);
+var sessionAbortListeners = /* @__PURE__ */ new Map();
+function command_default(method, endpointUri, commandInfo, doubleEncodeVariables = false) {
+  const { command, deprecated, ref, parameters, variables = [], isHubCommand = false } = commandInfo;
+  return async function protocolCommand(...unmaskedArgs) {
+    let runtimeOptions = {};
+    if (unmaskedArgs.length > 0 && unmaskedArgs[unmaskedArgs.length - 1] instanceof CommandRuntimeOptions) {
+      runtimeOptions = unmaskedArgs.pop();
+    }
+    const isBidiCommand = BIDI_COMMANDS.includes(command);
+    let endpoint = endpointUri;
+    const commandParams = [...variables.map((v) => Object.assign(v, {
+      /**
+       * url variables are:
+       */
+      required: true,
+      // always required as they are part of the endpoint
+      type: "string"
+      // have to be always type of string
+    })), ...parameters];
+    const commandUsage = `${command}(${commandParams.map((p) => p.name).join(", ")})`;
+    const moreInfo = `
+
+For more info see ${ref}
+`;
+    if (typeof deprecated === "string" && !process.env.DISABLE_WEBDRIVERIO_DEPRECATION_WARNINGS) {
+      const warning = deprecated.replace("This command", `The "${command}" command`);
+      log3.warn(warning);
+      console.warn(`\u26A0\uFE0F [WEBDRIVERIO DEPRECATION NOTICE] ${warning}`);
+    }
+    if (isBidiCommand) {
+      throw new Error(
+        `Failed to execute WebDriver Bidi command "${command}" as no Bidi session was established. Make sure you enable it by setting "webSocketUrl: true" in your capabilities and verify that your environment and browser supports it.`
+      );
+    }
+    const minAllowedParams = commandParams.filter((param) => param.required).length;
+    if (unmaskedArgs.length < minAllowedParams || unmaskedArgs.length > commandParams.length) {
+      const parameterDescription = commandParams.length ? `
+
+Property Description:
+${commandParams.map((p) => `  "${p.name}" (${p.type}): ${p.description}`).join("\n")}` : "";
+      throw new Error(
+        `Wrong parameters applied for ${command}
+Usage: ${commandUsage}` + parameterDescription + moreInfo
+      );
+    }
+    const unmaskedBody = {};
+    for (const [it, arg] of Object.entries(unmaskedArgs)) {
+      if (isBidiCommand) {
+        break;
+      }
+      const i = parseInt(it, 10);
+      const commandParam = commandParams[i];
+      if (!isValidParameter(arg, commandParam.type)) {
+        if (typeof arg === "undefined" && !commandParam.required) {
+          continue;
+        }
+        const actual = commandParam.type.endsWith("[]") ? `(${(Array.isArray(arg) ? arg : [arg]).map((a) => getArgumentType(a))})[]` : getArgumentType(arg);
+        throw new Error(
+          `Malformed type for "${commandParam.name}" parameter of command ${command}
+Expected: ${commandParam.type}
+Actual: ${actual}` + moreInfo
+        );
+      }
+      if (i < variables.length) {
+        const encodedArg = doubleEncodeVariables ? encodeURIComponent(encodeURIComponent(arg)) : encodeURIComponent(arg);
+        endpoint = endpoint.replace(`:${commandParams[i].name}`, encodedArg);
+        continue;
+      }
+      unmaskedBody[commandParams[i].name] = arg;
+    }
+    const { maskedBody, maskedArgs, isMasked } = mask(commandInfo, runtimeOptions, unmaskedBody, unmaskedArgs);
+    const { isAborted, abortSignal, cleanup } = manageSessionAbortions.call(this);
+    const requiresSession = endpointUri.includes("/:sessionId/");
+    if (isAborted && command !== "deleteSession" && requiresSession) {
+      throw new Error(`Trying to run command "${commandCallStructure(command, maskedArgs)}" after session has been deleted, aborting request without executing it`);
+    }
+    const request = new environment.value.Request(method, endpoint, unmaskedBody, abortSignal, isHubCommand, {
+      onPerformance: (data) => this.emit("request.performance", { ...data, request: {
+        ...data.request,
+        body: isMasked ? maskedBody : data.request.body
+      } }),
+      onRequest: (data) => this.emit("request.start", { ...data, body: isMasked ? maskedBody : data.body }),
+      onResponse: (data) => this.emit("request.end", data),
+      onRetry: (data) => this.emit("request.retry", data),
+      onLogData: (data) => log3.info("DATA", transformCommandLogResult(isMasked ? maskedBody : data))
+    });
+    this.emit("command", { command, method, endpoint, body: maskedBody });
+    log3.info("COMMAND", commandCallStructure(command, maskedArgs));
+    const options = isMasked ? { ...this.options, headers: { ...this.options.headers, ...APPIUM_MASKING_HEADER } } : this.options;
+    return request.makeRequest(options, this.sessionId).then((result) => {
+      if (typeof result.value !== "undefined") {
+        let resultLog = result.value;
+        if (/screenshot|recording/i.test(command) && typeof result.value === "string" && result.value.length > 64) {
+          resultLog = `${result.value.slice(0, 61)}...`;
+        } else if (command === "executeScript" && typeof maskedBody.script === "string" && maskedBody.script.includes("(() => window.__wdioEvents__)")) {
+          resultLog = `[${result.value.length} framework events captured]`;
+        }
+        log3.info("RESULT", resultLog);
+      }
+      this.emit("result", { command, method, endpoint, body: maskedBody, result });
+      if (command === "deleteSession") {
+        const browser = this;
+        browser._bidiHandler?.close();
+        const shutdownDriver = maskedBody.deleteSessionOpts?.shutdownDriver !== false;
+        if (shutdownDriver && "wdio:driverPID" in this.capabilities && this.capabilities["wdio:driverPID"]) {
+          log3.info(`Kill driver process with PID ${this.capabilities["wdio:driverPID"]}`);
+          try {
+            const killedSuccessfully = process.kill(this.capabilities["wdio:driverPID"], "SIGKILL");
+            if (!killedSuccessfully) {
+              log3.warn("Failed to kill driver process, manually clean-up might be required");
+            }
+          } catch (err) {
+            log3.warn("Failed to kill driver process", err);
+          }
+          setTimeout(() => {
+            for (const handle of process._getActiveHandles()) {
+              if (handle.servername && handle.servername.includes("edgedl.me")) {
+                handle.destroy();
+              }
+            }
+          }, 10);
+        }
+        if (!process.env.WDIO_WORKER_ID) {
+          logger3.clearLogger();
+        }
+      }
+      return result.value;
+    }).catch((error) => {
+      this.emit("result", { command, method, endpoint, body: maskedBody, result: { error } });
+      throw error;
+    }).finally(() => {
+      cleanup();
+    });
+  };
+}
+function manageSessionAbortions() {
+  const abort = new AbortController();
+  const abortOnSessionEnd = (result) => {
+    if (result.command !== "deleteSession") {
+      return;
+    }
+    const abortListeners = sessionAbortListeners.get(this.sessionId);
+    if (abortListeners) {
+      for (const abortListener of abortListeners) {
+        abortListener.abort();
+      }
+      abortListeners.clear();
+      sessionAbortListeners.set(this.sessionId, null);
+    }
+  };
+  let abortListenerForCurrentSession = sessionAbortListeners.get(this.sessionId);
+  if (typeof abortListenerForCurrentSession === "undefined") {
+    abortListenerForCurrentSession = /* @__PURE__ */ new Set();
+    sessionAbortListeners.set(this.sessionId, abortListenerForCurrentSession);
+    this.on("result", abortOnSessionEnd);
+  }
+  if (abortListenerForCurrentSession === null) {
+    return { isAborted: true, abortSignal: void 0, cleanup: () => {
+    } };
   }
+  abortListenerForCurrentSession.add(abort);
+  return {
+    isAborted: false,
+    abortSignal: abort.signal,
+    cleanup: () => {
+      this.off("result", abortOnSessionEnd);
+      abortListenerForCurrentSession?.delete(abort);
+    }
+  };
 }
 
 // src/bidi/localTypes.ts
@@ -1546,10 +1628,10 @@ import { fetch as fetch2, Agent, ProxyAgent } from "undici";
 
 // src/request/request.ts
 import logger5 from "@wdio/logger";
-import { transformCommandLogResult as transformCommandLogResult2, sleep } from "@wdio/utils";
+import { sleep } from "@wdio/utils";
 
 // src/request/error.ts
-import { transformCommandLogResult } from "@wdio/utils";
+import { transformCommandLogResult as transformCommandLogResult2 } from "@wdio/utils";
 
 // src/request/constants.ts
 var RETRYABLE_STATUS_CODES = [408, 413, 429, 500, 502, 503, 504];
@@ -1593,7 +1675,7 @@ var WebDriverError = class extends Error {
     if (typeof cmdJson !== "object") {
       return "";
     }
-    const transformedRes = transformCommandLogResult(cmdJson);
+    const transformedRes = transformCommandLogResult2(cmdJson);
     if (typeof transformedRes === "string") {
       return transformedRes;
     }
@@ -1654,7 +1736,7 @@ var WebDriverResponseError = class _WebDriverResponseError extends WebDriverErro
 // package.json
 var package_default = {
   name: "webdriver",
-  version: "9.13.0",
+  version: "9.15.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",
@@ -1839,7 +1921,7 @@ var WebDriverRequest = class {
   async _request(url, fullRequestOptions, transformResponse, totalRetryCount = 0, retryCount = 0) {
     log5.info(`[${fullRequestOptions.method}] ${url.href}`);
     if (fullRequestOptions.body && Object.keys(fullRequestOptions.body).length) {
-      log5.info("DATA", transformCommandLogResult2(fullRequestOptions.body));
+      this.eventHandler.onLogData?.(fullRequestOptions.body);
     }
     const { ...requestLibOptions } = fullRequestOptions;
     const startTime = performance.now();
@@ -1901,14 +1983,26 @@ var WebDriverRequest = class {
 
 // src/request/node.ts
 dns.setDefaultResultOrder("ipv4first");
+var SESSION_DISPATCHERS = /* @__PURE__ */ new Map();
 var FetchRequest = class extends WebDriverRequest {
-  fetch(url, opts) {
-    return fetch2(url, opts);
+  async fetch(url, opts) {
+    const response = await fetch2(url, opts);
+    if (opts.method === "DELETE") {
+      const match = url.pathname.match(/\/session\/([^/]+)$/);
+      const sessionId = match?.[1];
+      if (sessionId) {
+        this.cleanupSessionDispatcher(sessionId);
+      }
+    }
+    return response;
   }
-  async createOptions(options, sessionId, isBrowser = false) {
-    const { url, requestOptions } = await super.createOptions(options, sessionId, isBrowser);
+  getDispatcher(url, options, sessionId) {
+    if (sessionId && SESSION_DISPATCHERS.has(sessionId)) {
+      return SESSION_DISPATCHERS.get(sessionId);
+    }
     const { PROXY_URL, NO_PROXY } = environment.value.variables;
-    const dispatcher = PROXY_URL && !NO_PROXY?.some((str) => url.hostname.endsWith(str)) ? new ProxyAgent({
+    const shouldUseProxy = PROXY_URL && !NO_PROXY?.some((str) => url.hostname.endsWith(str));
+    const dispatcher = shouldUseProxy ? new ProxyAgent({
       uri: PROXY_URL,
       connectTimeout: options.connectionRetryTimeout,
       headersTimeout: options.connectionRetryTimeout,
@@ -1918,7 +2012,21 @@ var FetchRequest = class extends WebDriverRequest {
       headersTimeout: options.connectionRetryTimeout,
       bodyTimeout: options.connectionRetryTimeout
     });
-    requestOptions.dispatcher = dispatcher;
+    if (sessionId) {
+      SESSION_DISPATCHERS.set(sessionId, dispatcher);
+    }
+    return dispatcher;
+  }
+  cleanupSessionDispatcher(sessionId) {
+    const dispatcher = SESSION_DISPATCHERS.get(sessionId);
+    if (dispatcher && typeof dispatcher.close === "function") {
+      dispatcher.close();
+    }
+    SESSION_DISPATCHERS.delete(sessionId);
+  }
+  async createOptions(options, sessionId, isBrowser = false) {
+    const { url, requestOptions } = await super.createOptions(options, sessionId, isBrowser);
+    requestOptions.dispatcher = this.getDispatcher(url, options, sessionId);
     return { url, requestOptions };
   }
 };
@@ -2048,7 +2156,11 @@ environment.value = {
   }
 };
 export {
+  APPIUM_MASKING_HEADER,
+  BASE_64_REGEX,
+  BASE_64_SAFE_STRING_TO_PROCESS_LENGTH,
   BidiHandler,
+  CommandRuntimeOptions,
   DEFAULTS,
   ELEMENT_KEY,
   SHADOW_ELEMENT_KEY,