webdriverio 9.2.1 → 9.2.4

package/build/index.js

@@ -5,7 +5,7 @@ var __export = (target, all) => {
 };
 
 // src/index.ts
-import logger21 from "@wdio/logger";
+import logger22 from "@wdio/logger";
 import WebDriver, { DEFAULTS } from "webdriver";
 import { validateConfig } from "@wdio/config";
 import { enableFileLogging, wrapCommand as wrapCommand3 } from "@wdio/utils";
@@ -16,7 +16,7 @@ import clone2 from "lodash.clonedeep";
 import { webdriverMonad as webdriverMonad2, wrapCommand as wrapCommand2 } from "@wdio/utils";
 
 // src/middlewares.ts
-import { ELEMENT_KEY as ELEMENT_KEY18 } from "webdriver";
+import { ELEMENT_KEY as ELEMENT_KEY19 } from "webdriver";
 import { getBrowserObject as getBrowserObject31 } from "@wdio/utils";
 
 // src/utils/implicitWait.ts
@@ -78,9 +78,9 @@ import { URL as URL2 } from "node:url";
 import cssValue from "css-value";
 import rgb2hex from "rgb2hex";
 import GraphemeSplitter from "grapheme-splitter";
-import logger20 from "@wdio/logger";
+import logger21 from "@wdio/logger";
 import isPlainObject from "is-plain-obj";
-import { ELEMENT_KEY as ELEMENT_KEY17 } from "webdriver";
+import { ELEMENT_KEY as ELEMENT_KEY18 } from "webdriver";
 import { UNICODE_CHARACTERS as UNICODE_CHARACTERS2, asyncIterators, getBrowserObject as getBrowserObject30 } from "@wdio/utils";
 
 // src/commands/browser.ts
@@ -2974,9 +2974,7 @@ var ReferenceValue = class {
 };
 
 // src/context.ts
-import logger4 from "@wdio/logger";
 var contextManager = /* @__PURE__ */ new Map();
-var log4 = logger4("webdriverio:ContextManager");
 function getContextManager(browser) {
   const existingContextManager = contextManager.get(browser);
   if (existingContextManager) {
@@ -2988,53 +2986,47 @@ function getContextManager(browser) {
 }
 var ContextManager = class {
   #browser;
-  #initialize;
   #currentContext;
   constructor(browser) {
     this.#browser = browser;
-    if (!browser.isBidi || process.env.VITEST_WORKER_ID || browser.options?.automationProtocol !== "webdriver") {
-      this.#initialize = Promise.resolve(true);
+    if (process.env.WDIO_UNIT_TESTS) {
       return;
     }
-    this.#initialize = this.#browser.sessionSubscribe({
-      events: ["browsingContext.navigationStarted"]
-    }).then(() => true, () => false);
-    this.#browser.on("browsingContext.navigationStarted", this.#handleNavigationStarted.bind(this));
-  }
-  async initialize() {
-    return this.#initialize;
+    this.#browser.on("command", (event) => {
+      if (event.command === "switchToWindow") {
+        this.setCurrentContext(event.body.handle);
+      }
+      if (event.command === "switchToParentFrame") {
+        this.#currentContext = void 0;
+      }
+    });
   }
   /**
-   * We use this handler to observe the current context which is used to navigate to a certain url.
-   * This is most likely the context that the user is using. However if a frame was loaded on the page
-   * then this handler is triggered with the context of the frame. To find out which context we are in
-   * we use the `getWindowHandle` method to validate our assumption before setting the `#currentContext`
-   * value.
-   *
-   * @param {local.BrowsingContextNavigationInfo} context  browsing context used to navigate
+   * set context at the start of the session
    */
-  async #handleNavigationStarted(context) {
-    const windowHandle = await this.#browser.getWindowHandle();
-    if (context.context === windowHandle && context.url !== "UNKNOWN") {
-      log4.info(`Update current context: ${context.context}`);
-      this.#currentContext = context.context;
+  async initialize() {
+    if (process.env.WDIO_UNIT_TESTS) {
+      return "fake-context";
     }
+    const windowHandle = await this.#browser.getWindowHandle();
+    this.#currentContext = windowHandle;
+    return windowHandle;
   }
   setCurrentContext(context) {
     this.#currentContext = context;
   }
   async getCurrentContext() {
     if (!this.#currentContext) {
-      this.#currentContext = await this.#browser.getWindowHandle();
+      return this.initialize();
     }
     return this.#currentContext;
   }
 };
 
 // src/polyfill.ts
-import logger5 from "@wdio/logger";
+import logger4 from "@wdio/logger";
 var polyfillManager = /* @__PURE__ */ new Map();
-var log5 = logger5("webdriverio:PolyfillManager");
+var log4 = logger4("webdriverio:PolyfillManager");
 var NAME_POLYFILL = "var __defProp = Object.defineProperty;var __name = function (target, value) { return __defProp(target, 'name', { value: value, configurable: true }); };var __globalThis = (typeof globalThis === 'object' && globalThis) || (typeof window === 'object' && window);__globalThis.__name = __name;";
 function getPolyfillManager(browser) {
   const existingPolyfillManager = polyfillManager.get(browser);
@@ -3048,7 +3040,7 @@ function getPolyfillManager(browser) {
 var PolyfillManager = class {
   #initialize;
   constructor(browser) {
-    if (!browser.isBidi || process.env.VITEST_WORKER_ID || browser.options?.automationProtocol !== "webdriver") {
+    if (!browser.isBidi || process.env.WDIO_UNIT_TESTS || browser.options?.automationProtocol !== "webdriver") {
       this.#initialize = Promise.resolve(true);
       return;
     }
@@ -3060,7 +3052,7 @@ var PolyfillManager = class {
       browser.addInitScript(polyfill, NAME_POLYFILL),
       browser.execute(polyfill, NAME_POLYFILL)
     ]).then(() => {
-      log5.info("polyfill script added");
+      log4.info("polyfill script added");
       return true;
     }, () => false);
   }
@@ -3145,8 +3137,8 @@ async function executeAsync(script, ...args) {
 }
 
 // src/commands/browser/getCookies.ts
-import logger6 from "@wdio/logger";
-var log6 = logger6("webdriverio");
+import logger5 from "@wdio/logger";
+var log5 = logger5("webdriverio");
 async function getCookies(filter) {
   const usesMultipleFilter = Array.isArray(filter) && filter.length > 1;
   if (!this.isBidi || usesMultipleFilter) {
@@ -3165,7 +3157,7 @@ async function getCookiesClassic(names) {
   }
   const usesMultipleFilter = Array.isArray(names) && names.length > 1;
   if (usesMultipleFilter) {
-    log6.warn(
+    log5.warn(
       "Passing a string array as filter for `getCookies` is deprecated and its support will be removed in an upcoming version of WebdriverIO!"
     );
     const allCookies2 = await this.getAllCookies();
@@ -3184,7 +3176,7 @@ function getCookieFilter(names) {
   }
   return (Array.isArray(names) ? names : [names]).map((filter) => {
     if (typeof filter === "string") {
-      log6.warn("Passing string values into `getCookie` is deprecated and its support will be removed in an upcoming version of WebdriverIO!");
+      log5.warn("Passing string values into `getCookie` is deprecated and its support will be removed in an upcoming version of WebdriverIO!");
       return { name: filter };
     }
     return filter;
@@ -3192,9 +3184,9 @@ function getCookieFilter(names) {
 }
 
 // src/commands/browser/getPuppeteer.ts
-import logger7 from "@wdio/logger";
+import logger6 from "@wdio/logger";
 import { userImport } from "@wdio/utils";
-var log7 = logger7("webdriverio");
+var log6 = logger6("webdriverio");
 var DEBUG_PIPE_FLAG = "remote-debugging-pipe";
 async function getPuppeteer() {
   const puppeteer = await userImport("puppeteer-core");
@@ -3204,7 +3196,7 @@ async function getPuppeteer() {
     );
   }
   if (this.puppeteer?.connected) {
-    log7.debug("Reusing existing puppeteer session");
+    log6.debug("Reusing existing puppeteer session");
     return this.puppeteer;
   }
   const { headers } = this.options;
@@ -3315,7 +3307,7 @@ import { getBrowserObject as getBrowserObject5 } from "@wdio/utils";
 
 // src/utils/interception/index.ts
 import EventEmitter2 from "node:events";
-import logger8 from "@wdio/logger";
+import logger7 from "@wdio/logger";
 import { URLPattern } from "urlpattern-polyfill";
 
 // src/utils/Timer.ts
@@ -3372,10 +3364,10 @@ var Timer = class {
   }
   _tick() {
     const result = this._fn();
+    if (!result) {
+      return this._checkCondition(new Error(TIMEOUT_ERROR));
+    }
     if (typeof result.then !== "function") {
-      if (!result) {
-        return this._checkCondition(new Error(TIMEOUT_ERROR));
-      }
       return this._checkCondition(void 0, result);
     }
     result.then(
@@ -3481,7 +3473,7 @@ function getPatternParam(pattern, key) {
 }
 
 // src/utils/interception/index.ts
-var log8 = logger8("WebDriverInterception");
+var log7 = logger7("WebDriverInterception");
 var hasSubscribedToEvents = false;
 var WebDriverInterception = class _WebDriverInterception {
   #pattern;
@@ -3510,7 +3502,7 @@ var WebDriverInterception = class _WebDriverInterception {
           "network.responseStarted"
         ]
       });
-      log8.info("subscribed to network events");
+      log7.info("subscribed to network events");
       hasSubscribedToEvents = true;
     }
     const interception = await browser.networkAddIntercept({
@@ -3672,7 +3664,7 @@ var WebDriverInterception = class _WebDriverInterception {
     this.#respondOverwrites = [];
     this.#restored = true;
     const handle = await this.#browser.getWindowHandle();
-    log8.trace(`Restoring mock for ${handle}`);
+    log7.trace(`Restoring mock for ${handle}`);
     SESSION_MOCKS[handle].delete(this);
     if (this.#mockId) {
       await this.#browser.networkRemoveIntercept({ intercept: this.#mockId });
@@ -3812,11 +3804,11 @@ async function mock(url6, filterOptions) {
 }
 
 // src/commands/browser/mockClearAll.ts
-import logger9 from "@wdio/logger";
-var log9 = logger9("webdriverio:mockClearAll");
+import logger8 from "@wdio/logger";
+var log8 = logger8("webdriverio:mockClearAll");
 async function mockClearAll() {
   for (const [handle, mocks] of Object.entries(SESSION_MOCKS)) {
-    log9.trace(`Clearing mocks for ${handle}`);
+    log8.trace(`Clearing mocks for ${handle}`);
     for (const mock2 of mocks) {
       mock2.clear();
     }
@@ -3824,11 +3816,11 @@ async function mockClearAll() {
 }
 
 // src/commands/browser/mockRestoreAll.ts
-import logger10 from "@wdio/logger";
-var log10 = logger10("webdriverio:mockRestoreAll");
+import logger9 from "@wdio/logger";
+var log9 = logger9("webdriverio:mockRestoreAll");
 async function mockRestoreAll() {
   for (const [handle, mocks] of Object.entries(SESSION_MOCKS)) {
-    log10.trace(`Clearing mocks for ${handle}`);
+    log9.trace(`Clearing mocks for ${handle}`);
     for (const mock2 of mocks) {
       await mock2.restore();
     }
@@ -3838,18 +3830,26 @@ async function mockRestoreAll() {
 // src/commands/browser/newWindow.ts
 import { sleep } from "@wdio/utils";
 import newWindowHelper from "./scripts/newWindow.js";
+import logger10 from "@wdio/logger";
+var log10 = logger10("webdriverio:newWindow");
 var WAIT_FOR_NEW_HANDLE_TIMEOUT = 3e3;
-async function newWindow(url6, { windowName = "", windowFeatures = "" } = {}) {
+async function newWindow(url6, { type = "window", windowName = "", windowFeatures = "" } = {}) {
   if (typeof url6 !== "string") {
     throw new Error("number or type of arguments don't agree with newWindow command");
   }
+  if (!["tab", "window"].includes(type)) {
+    throw new Error(`Invalid type '${type}' provided to newWindow command. Use either 'tab' or 'window'`);
+  }
+  if (windowName || windowFeatures) {
+    log10.warn('The "windowName" and "windowFeatures" options are deprecated and only supported in WebDriver Classic sessions.');
+  }
   if (this.isMobile) {
     throw new Error("newWindow command is not supported on mobile platforms");
   }
   const tabsBefore = await this.getWindowHandles();
   if (this.isBidi) {
     const contextManager2 = getContextManager(this);
-    const { context } = await this.browsingContextCreate({ type: "window" });
+    const { context } = await this.browsingContextCreate({ type });
     contextManager2.setCurrentContext(context);
     await this.browsingContextNavigate({ context, url: url6 });
   } else {
@@ -3869,7 +3869,7 @@ async function newWindow(url6, { windowName = "", windowFeatures = "" } = {}) {
     throw new Error("No window handle was found to switch to");
   }
   await this.switchToWindow(newTab);
-  return newTab;
+  return { handle: newTab, type };
 }
 
 // src/commands/browser/pause.ts
@@ -4135,6 +4135,7 @@ async function switchWindow(matcher) {
   if (typeof matcher !== "string" && !(matcher instanceof RegExp)) {
     throw new Error('Unsupported parameter for switchWindow, required is "string" or an RegExp');
   }
+  const currentWindow = await this.getWindowHandle();
   const tabs = await this.getWindowHandles();
   const matchesTarget = (target) => {
     if (typeof matcher === "string") {
@@ -4162,60 +4163,150 @@ async function switchWindow(matcher) {
       return tab;
     }
   }
+  await this.switchToWindow(currentWindow);
   throw new Error(`No window found with title, url or name matching "${matcher}"`);
 }
 
 // src/commands/browser/switchFrame.ts
+import logger13 from "@wdio/logger";
+import { ELEMENT_KEY as ELEMENT_KEY8 } from "webdriver";
+var log13 = logger13("webdriverio:switchFrame");
 async function switchFrame(context) {
+  if (!this.isBidi) {
+    if (typeof context === "function") {
+      throw new Error("Cannot use a function to fetch a context in WebDriver Classic");
+    }
+    if (typeof context === "string") {
+      throw new Error("Cannot use a string to fetch a context in WebDriver Classic");
+    }
+    return switchToFrame(this, context);
+  }
   if (context === null) {
     const handle = await this.getWindowHandle();
-    await switchToFrameHelper(this, handle);
+    switchToFrameHelper(this, handle);
+    await switchToFrame(this, context);
     return handle;
   }
   if (typeof context === "string") {
     const tree = await this.browsingContextGetTree({});
-    const urlContext = findContext(context, tree.contexts, byUrl)?.context;
+    let newContextId;
+    const urlContext = findContext(context, tree.contexts, byUrl) || /**
+     * In case the user provides an url without `/` at the end, e.g. `https://example.com`,
+     * the `browsingContextGetTree` command may return a context with the url `https://example.com/`.
+     */
+    findContext(`${context}/`, tree.contexts, byUrl);
+    const urlContextContaining = findContext(context, tree.contexts, byUrlContaining);
+    const contextIdContext = findContext(context, tree.contexts, byContextId);
     if (urlContext) {
-      await switchToFrameHelper(this, urlContext);
-      return urlContext;
+      log13.info(`Found context by url "${urlContext.url}" with context id "${urlContext.context}"`);
+      newContextId = urlContext.context;
+    } else if (urlContextContaining) {
+      log13.info(`Found context by url containing "${urlContextContaining.url}" with context id "${urlContextContaining.context}"`);
+      newContextId = urlContextContaining.context;
+    } else if (contextIdContext) {
+      log13.info(`Found context by id "${contextIdContext}" with url "${contextIdContext.url}"`);
+      newContextId = contextIdContext.context;
+    }
+    if (!newContextId) {
+      throw new Error(`No frame with url or id "${context}" found!`);
     }
-    const urlContextContaining = findContext(context, tree.contexts, byUrlContaining)?.context;
-    if (urlContextContaining) {
-      await switchToFrameHelper(this, urlContextContaining);
-      return urlContextContaining;
+    const sessionContext = getContextManager(this);
+    const currentContext = await sessionContext.getCurrentContext();
+    const allContexts = await getFlatContextTree(this);
+    const allFrames = (await Promise.all(Object.keys(allContexts).map(async (id) => {
+      const { nodes } = await this.browsingContextLocateNodes({
+        locator: { type: "css", value: "iframe, frame" },
+        context: id
+      }).catch(() => ({ nodes: [] }));
+      return Promise.all(nodes.map(async (node) => {
+        const html = `<iframe${Object.entries(node.value?.attributes || {}).reduce((acc, [key, value]) => `${acc} ${key}="${value}"`, " ")}></iframe>`;
+        const args = [{ [ELEMENT_KEY8]: node.sharedId }];
+        const userScript = (iframe) => iframe.contentWindow;
+        const functionDeclaration = new Function(`
+                    return (${SCRIPT_PREFIX}${userScript.toString()}${SCRIPT_SUFFIX}).apply(this, arguments);
+                `).toString();
+        const params = {
+          functionDeclaration,
+          awaitPromise: false,
+          arguments: args.map((arg) => LocalValue.getArgument(arg)),
+          target: { context: id }
+        };
+        const result = await this.scriptCallFunction(params).catch((err) => log13.warn(`Failed to identify frame context id: ${err.message}`));
+        if (!result) {
+          return [];
+        }
+        const { context: context2 } = parseScriptResult(params, result);
+        return {
+          /**
+           * the actual frame context we need to switch WebDriver Bidi commands to
+           */
+          context: context2,
+          /**
+           * the element reference of the iframe so we can call `switchToFrame` to
+           * switch context for WebDriver Classic commands
+           */
+          frameElement: { [ELEMENT_KEY8]: node.sharedId },
+          /**
+           * the context id in which the iframe was found
+           */
+          parentContext: id,
+          /**
+           * an HTML representation of the iframe for a good error message in case
+           * we can't find the desired frame from this list
+           */
+          html
+        };
+      }));
+    }))).flat(Infinity);
+    let desiredFrame;
+    let desiredContext = newContextId;
+    const contextQueue = [];
+    log13.info(`Available frames to switch to: ${allFrames.length}, desired context to switch: ${desiredContext}`);
+    while (desiredContext !== currentContext) {
+      desiredFrame = allFrames.find(({ context: context2 }) => context2 === desiredContext);
+      if (!desiredFrame) {
+        break;
+      }
+      log13.info(
+        contextQueue.length === 0 ? `Found desired frame with element id ${desiredFrame.frameElement[ELEMENT_KEY8]}` : `to switch to desired frame, we need to switch to ${desiredFrame.context} first`
+      );
+      contextQueue.unshift(desiredFrame);
+      desiredContext = desiredFrame.parentContext;
+    }
+    if (contextQueue.length === 0) {
+      throw new Error(`Frame with url or context id "${context}" not found, available frames to switch to:
+  - ${allFrames.map(({ html }) => html).join("\n  - ")}`);
     }
-    const contextIdContext = findContext(context, tree.contexts, byContextId)?.context;
-    if (contextIdContext) {
-      await switchToFrameHelper(this, contextIdContext);
-      return contextIdContext;
+    for (const contextToSwitch of contextQueue) {
+      switchToFrameHelper(this, contextToSwitch.context);
+      await switchToFrame(this, contextToSwitch.frameElement);
     }
-    throw new Error(`Frame with url or context id "${context}" not found`);
+    return newContextId;
   }
   if (typeof context === "object" && typeof context.getElement === "function") {
     const element = await context.getElement();
     return switchToFrameUsingElement(this, element);
   }
   if (typeof context === "function") {
-    const tree = await this.browsingContextGetTree({});
-    const mapContext = (context2) => [
-      context2.context,
-      ...(context2.children || []).map(mapContext)
-    ];
-    const sessionContext = getContextManager(this);
-    const currentContext = await sessionContext.getCurrentContext();
-    const allContexts = tree.contexts.map(mapContext).flat(Infinity).filter((ctx) => ctx !== currentContext).reduce((acc, ctx) => {
-      const context2 = findContext(ctx, tree.contexts, byContextId);
-      acc[ctx] = context2;
-      return acc;
-    }, {});
-    for (const [contextId, ctx] of Object.entries(allContexts)) {
-      sessionContext.setCurrentContext(contextId);
-      const isDesiredFrame = await context(ctx);
-      if (isDesiredFrame) {
-        return context;
+    const allContexts = await getFlatContextTree(this);
+    const allContextIds = Object.keys(allContexts);
+    for (const contextId of allContextIds) {
+      const functionDeclaration = new Function(`
+                return (${SCRIPT_PREFIX}${context.toString()}${SCRIPT_SUFFIX}).apply(this, arguments);
+            `).toString();
+      const params = {
+        functionDeclaration,
+        awaitPromise: false,
+        arguments: [],
+        target: { context: contextId }
+      };
+      const result = await this.scriptCallFunction(params).catch((err) => log13.warn(`switchFrame context callback threw error: ${err.message}`));
+      if (!result || result.type !== "success" || result.result.type !== "boolean" || !result.result.value) {
+        continue;
       }
+      await this.switchFrame(contextId);
+      return contextId;
     }
-    sessionContext.setCurrentContext(currentContext);
     throw new Error("Could not find the desired frame");
   }
   throw new Error(
@@ -4227,25 +4318,14 @@ function switchToFrameHelper(browser, context) {
   sessionContext.setCurrentContext(context);
 }
 async function switchToFrameUsingElement(browser, element) {
-  let frameSrc = await element.getAttribute("src");
-  if (!frameSrc) {
-    const source = await element.getHTML({ includeSelectorTag: true });
-    throw new Error(
-      `The provided frame element ("${source}") does not have a src attribute needed to detect the context, please use a different method to select the frame. For more information checkout our docs: https://webdriver.io/docs/api/browser/switchFrame.html`
-    );
-  }
-  if (!frameSrc.startsWith("http")) {
-    frameSrc = await browser.execute((urlPath) => URL.parse(urlPath, window.location.href)?.href, frameSrc) || frameSrc;
-  }
-  const tree = await browser.browsingContextGetTree({});
-  const urlContext = findContext(frameSrc, tree.contexts, byUrl)?.context;
-  if (!urlContext) {
-    throw new Error(
-      `Frame with url "${frameSrc}" not found! Please try a different method to select the frame. For more information checkout our docs: https://webdriver.io/docs/api/browser/switchFrame.html`
-    );
-  }
-  await switchToFrameHelper(browser, urlContext);
-  return urlContext;
+  const frame = await browser.execute(
+    (iframe) => iframe.contentWindow,
+    element
+  );
+  switchToFrameHelper(browser, frame.context);
+  const elementId = element[ELEMENT_KEY8];
+  await switchToFrame(browser, { [ELEMENT_KEY8]: elementId });
+  return frame.context;
 }
 function byUrl(context, url6) {
   return context.url === url6;
@@ -4256,13 +4336,13 @@ function byUrlContaining(context, url6) {
 function byContextId(context, contextId) {
   return context.context === contextId;
 }
-function findContext(url6, contexts, matcher) {
+function findContext(urlOrId, contexts, matcher) {
   for (const context of contexts || []) {
-    if (matcher(context, url6)) {
+    if (matcher(context, urlOrId)) {
       return context;
     }
     if (Array.isArray(context.children) && context.children.length > 0) {
-      const result = findContext(url6, context.children, matcher);
+      const result = findContext(urlOrId, context.children, matcher);
       if (result) {
         return result;
       }
@@ -4270,13 +4350,32 @@ function findContext(url6, contexts, matcher) {
   }
   return void 0;
 }
+async function getFlatContextTree(browser) {
+  const tree = await browser.browsingContextGetTree({});
+  const mapContext = (context) => [
+    context.context,
+    ...(context.children || []).map(mapContext)
+  ];
+  const allContexts = tree.contexts.map(mapContext).flat(Infinity).reduce((acc, ctx) => {
+    const context = findContext(ctx, tree.contexts, byContextId);
+    acc[ctx] = context;
+    return acc;
+  }, {});
+  return allContexts;
+}
+function switchToFrame(browser, frame) {
+  process.env.DISABLE_WEBDRIVERIO_DEPRECATION_WARNINGS = "true";
+  return browser.switchToFrame(frame).finally(() => {
+    delete process.env.DISABLE_WEBDRIVERIO_DEPRECATION_WARNINGS;
+  });
+}
 
 // src/commands/browser/throttle.ts
-import logger13 from "@wdio/logger";
+import logger14 from "@wdio/logger";
 import { getBrowserObject as getBrowserObject8 } from "@wdio/utils";
-var log13 = logger13("webdriverio:throttle");
+var log14 = logger14("webdriverio:throttle");
 async function throttle(params) {
-  log13.warn('Command "throttle" is deprecated and will be removed with the next major version release! Use `throttleNetwork` instead.');
+  log14.warn('Command "throttle" is deprecated and will be removed with the next major version release! Use `throttleNetwork` instead.');
   const browser = getBrowserObject8(this);
   await browser.throttleNetwork(params);
 }
@@ -4432,13 +4531,15 @@ function getNetworkManager(browser) {
   networkManager.set(browser, newContext);
   return newContext;
 }
+var UNKNOWN_NAVIGATION_ID = "UNKNOWN_NAVIGATION_ID";
 var NetworkManager = class {
   #browser;
   #initialize;
   #requests = /* @__PURE__ */ new Map();
+  #lastNetworkId;
   constructor(browser) {
     this.#browser = browser;
-    if (!browser.isBidi || process.env.VITEST_WORKER_ID || browser.options?.automationProtocol !== "webdriver") {
+    if (!browser.isBidi || process.env.WDIO_UNIT_TESTS || browser.options?.automationProtocol !== "webdriver") {
       this.#initialize = Promise.resolve(true);
       return;
     }
@@ -4458,15 +4559,15 @@ var NetworkManager = class {
   async initialize() {
     return this.#initialize;
   }
-  #beforeRequestSent(log21) {
-    if (log21.navigation) {
+  #beforeRequestSent(log22) {
+    if (log22.navigation) {
       return;
     }
-    const request = log21.context ? this.#requests.get(log21.context) : void 0;
+    const request = this.#findRootRequest(log22.navigation);
     if (!request) {
       return;
     }
-    const { request: id, headers, cookies, url: url6 } = log21.request;
+    const { request: id, headers, cookies, url: url6 } = log22.request;
     request.children?.push({
       id,
       url: url6,
@@ -4482,66 +4583,76 @@ var NetworkManager = class {
         sameSite: cookie.sameSite,
         expiry: cookie.expiry
       })),
-      timestamp: log21.timestamp
+      timestamp: log22.timestamp
     });
   }
-  #navigationStarted(log21) {
+  #navigationStarted(log22) {
     if (
       /**
        * we need a navigation id to identify the request
        */
-      !log21.navigation || /**
+      !log22.navigation || /**
        * ignore urls that do not start with http
        */
-      !log21.url.startsWith("http")
+      !log22.url.startsWith("http")
     ) {
-      if (log21.navigation === null && log21.url === "") {
-        return this.#requests.set(log21.context, {
+      if (log22.navigation === null && log22.url === "") {
+        this.#lastNetworkId = UNKNOWN_NAVIGATION_ID;
+        return this.#requests.set(UNKNOWN_NAVIGATION_ID, {
           url: "",
           headers: {},
-          timestamp: log21.timestamp,
+          timestamp: log22.timestamp,
           redirectChain: [],
           children: []
         });
       }
       return;
     }
-    this.#requests.set(log21.context, {
-      url: log21.url,
+    this.#lastNetworkId = log22.navigation;
+    this.#requests.set(log22.navigation, {
+      url: log22.url,
       headers: {},
-      timestamp: log21.timestamp,
-      navigation: log21.navigation,
+      timestamp: log22.timestamp,
+      navigation: log22.navigation,
       redirectChain: [],
       children: []
     });
   }
-  #fetchError(log21) {
-    const response = log21.context ? this.#requests.get(log21.context) : void 0;
+  #fetchError(log22) {
+    const response = this.#findRootRequest(log22.navigation);
     if (!response) {
       return;
     }
-    const request = response.children?.find((child) => child.id === log21.request.request);
+    const request = response.children?.find((child) => child.id === log22.request.request);
     if (!request) {
       return;
     }
-    request.error = log21.errorText;
+    request.error = log22.errorText;
+  }
+  #findRootRequest(navigationId) {
+    const response = this.#requests.get(navigationId || UNKNOWN_NAVIGATION_ID);
+    if (response) {
+      return response;
+    }
+    const firstRequest = this.#requests.values().next().value;
+    return this.#lastNetworkId ? this.#requests.get(this.#lastNetworkId) || firstRequest : firstRequest;
   }
-  #responseCompleted(log21) {
-    const response = log21.context ? this.#requests.get(log21.context) : void 0;
+  #responseCompleted(log22) {
+    const response = this.#findRootRequest(log22.navigation);
     if (!response) {
       return;
     }
     if (!response.navigation && response.url === "") {
-      response.url = log21.request.url;
-      response.navigation = log21.navigation;
+      response.url = log22.request.url;
+      response.navigation = log22.navigation;
     }
-    if (log21.navigation === response.navigation) {
-      if (response.url !== log21.response.url) {
+    if (log22.navigation === response.navigation) {
+      if (response.url !== log22.response.url) {
         response.redirectChain?.push(response.url);
       }
-      response.url = log21.response.url;
-      const { headers: requestHeaders } = log21.request;
-      const { fromCache, headers: responseHeaders, mimeType, status } = log21.response;
+      response.url = log22.response.url;
+      const { headers: requestHeaders } = log22.request;
+      const { fromCache, headers: responseHeaders, mimeType, status } = log22.response;
       response.headers = headerListToObject(requestHeaders), response.response = {
         fromCache,
         headers: headerListToObject(responseHeaders),
@@ -4550,30 +4661,30 @@ var NetworkManager = class {
       };
       return;
     }
-    const request = response.children?.find((child) => child.id === log21.request.request);
+    const request = response.children?.find((child) => child.id === log22.request.request);
     if (!request) {
       return;
     }
     request.response = {
-      fromCache: log21.response.fromCache,
-      headers: headerListToObject(log21.response.headers),
-      mimeType: log21.response.mimeType,
-      status: log21.response.status
+      fromCache: log22.response.fromCache,
+      headers: headerListToObject(log22.response.headers),
+      mimeType: log22.response.mimeType,
+      status: log22.response.status
     };
     response.children?.push(request);
   }
-  getRequestResponseData(context) {
-    return this.#requests.get(context);
+  getRequestResponseData(navigationId) {
+    return this.#requests.get(navigationId);
   }
   /**
    * Returns the number of requests that are currently pending.
    * @param context browsing context id
    * @returns the number of requests that are currently pending
    */
-  getPendingRequests(context) {
-    const request = this.#requests.get(context);
+  getPendingRequests(navigationId) {
+    const request = this.#requests.get(navigationId);
     if (!request) {
-      throw new Error(`Couldn't find request for context ${context}`);
+      throw new Error(`Couldn't find request for navigation with id ${navigationId}`);
     }
     const subRequests = request.children || [];
     return subRequests.filter((child) => (
@@ -4627,17 +4738,16 @@ async function url3(path4, options = {}) {
     }
     const classicPageLoadStrategy = this.capabilities.pageLoadStrategy === "none" ? "none" : this.capabilities.pageLoadStrategy === "normal" ? "complete" : this.capabilities.pageLoadStrategy === "eager" ? "interactive" : void 0;
     const wait = options.wait === "networkIdle" ? "complete" : options.wait || classicPageLoadStrategy || DEFAULT_WAIT_STATE;
-    await this.browsingContextNavigate({
+    const navigation = await this.browsingContextNavigate({
       context,
       url: path4,
       wait
     });
-    const network = networkManager.get(this);
-    const request = network?.getRequestResponseData(context);
     if (mock2) {
       await mock2.restore();
     }
-    if (network && options.wait === "networkIdle") {
+    const network = getNetworkManager(this);
+    if (options.wait === "networkIdle") {
       const timeout = options.timeout || DEFAULT_NETWORK_IDLE_TIMEOUT;
       await this.waitUntil(async () => {
         return network.getPendingRequests(context).length === 0;
@@ -4649,6 +4759,15 @@ async function url3(path4, options = {}) {
     if (resetPreloadScript) {
       await resetPreloadScript.remove();
     }
+    const request = await this.waitUntil(
+      () => network.getRequestResponseData(navigation.navigation),
+      /**
+       * set a short interval to immediately return once the first request payload comes in
+       */
+      {
+        interval: 1
+      }
+    );
     return request;
   }
   if (Object.keys(options).length > 0) {
@@ -4765,9 +4884,9 @@ function clearValue() {
 }
 
 // src/commands/element/click.ts
-import logger14 from "@wdio/logger";
+import logger15 from "@wdio/logger";
 import { getBrowserObject as getBrowserObject10 } from "@wdio/utils";
-var log14 = logger14("webdriver");
+var log15 = logger15("webdriver");
 function click(options) {
   if (typeof options !== "undefined") {
     if (typeof options !== "object" || Array.isArray(options)) {
@@ -4813,10 +4932,10 @@ async function actionClick(element, options) {
   if (x || y) {
     const { width, height } = await browser.getElementRect(element.elementId);
     if (x && x < -Math.floor(width / 2) || x && x > Math.floor(width / 2)) {
-      log14.warn("x would cause a out of bounds error as it goes outside of element");
+      log15.warn("x would cause a out of bounds error as it goes outside of element");
     }
     if (y && y < -Math.floor(height / 2) || y && y > Math.floor(height / 2)) {
-      log14.warn("y would cause a out of bounds error as it goes outside of element");
+      log15.warn("y would cause a out of bounds error as it goes outside of element");
     }
   }
   const clickNested = async () => {
@@ -4833,7 +4952,7 @@ async function actionClick(element, options) {
 }
 
 // src/commands/element/custom$$.ts
-import { ELEMENT_KEY as ELEMENT_KEY8 } from "webdriver";
+import { ELEMENT_KEY as ELEMENT_KEY9 } from "webdriver";
 import { getBrowserObject as getBrowserObject11 } from "@wdio/utils";
 async function custom$$2(strategyName, ...strategyArguments) {
   const browserObject = getBrowserObject11(this);
@@ -4849,13 +4968,13 @@ async function custom$$2(strategyName, ...strategyArguments) {
   if (!Array.isArray(res)) {
     res = [res];
   }
-  res = res.filter((el) => !!el && typeof el[ELEMENT_KEY8] === "string");
+  res = res.filter((el) => !!el && typeof el[ELEMENT_KEY9] === "string");
   const elements = res.length ? await getElements.call(this, strategyRef, res) : [];
   return enhanceElementsArray(elements, this, strategyName, "custom$$", strategyArguments);
 }
 
 // src/commands/element/custom$.ts
-import { ELEMENT_KEY as ELEMENT_KEY9 } from "webdriver";
+import { ELEMENT_KEY as ELEMENT_KEY10 } from "webdriver";
 import { getBrowserObject as getBrowserObject12 } from "@wdio/utils";
 async function custom$2(strategyName, ...strategyArguments) {
   const browserObject = getBrowserObject12(this);
@@ -4871,7 +4990,7 @@ async function custom$2(strategyName, ...strategyArguments) {
   if (Array.isArray(res)) {
     res = res[0];
   }
-  if (res && typeof res[ELEMENT_KEY9] === "string") {
+  if (res && typeof res[ELEMENT_KEY10] === "string") {
     return await getElement.call(this, strategyRef, res);
   }
   return await getElement.call(this, strategyRef, new Error("no such element"));
@@ -4885,7 +5004,7 @@ async function doubleClick() {
 }
 
 // src/commands/element/dragAndDrop.ts
-import { ELEMENT_KEY as ELEMENT_KEY10 } from "webdriver";
+import { ELEMENT_KEY as ELEMENT_KEY11 } from "webdriver";
 import { getBrowserObject as getBrowserObject14 } from "@wdio/utils";
 var ACTION_BUTTON = 0;
 async function dragAndDrop(target, { duration = 10 } = {}) {
@@ -4906,8 +5025,8 @@ async function dragAndDrop(target, { duration = 10 } = {}) {
     throw new Error('command dragAndDrop requires an WebdriverIO Element or and object with "x" and "y" variables as first parameter');
   }
   const isMovingToElement = target.constructor.name === "Element";
-  const sourceRef = { [ELEMENT_KEY10]: this[ELEMENT_KEY10] };
-  const targetRef = { [ELEMENT_KEY10]: moveToElement[ELEMENT_KEY10] };
+  const sourceRef = { [ELEMENT_KEY11]: this[ELEMENT_KEY11] };
+  const targetRef = { [ELEMENT_KEY11]: moveToElement[ELEMENT_KEY11] };
   const origin = sourceRef;
   const targetOrigin = isMovingToElement ? targetRef : "pointer";
   const targetX = isMovingToElement ? 0 : moveToCoordinates.x;
@@ -5028,15 +5147,15 @@ async function getElement2() {
 }
 
 // src/commands/element/getHTML.ts
-import { ELEMENT_KEY as ELEMENT_KEY11 } from "webdriver";
+import { ELEMENT_KEY as ELEMENT_KEY12 } from "webdriver";
 import { prettify as prettifyFn } from "htmlfy";
 import { getBrowserObject as getBrowserObject18 } from "@wdio/utils";
 
 // src/shadowRoot.ts
-import logger15 from "@wdio/logger";
+import logger16 from "@wdio/logger";
 import customElementWrapper from "./scripts/customElement.js";
 var shadowRootManager = /* @__PURE__ */ new Map();
-var log15 = logger15("webdriverio:ShadowRootManager");
+var log16 = logger16("webdriverio:ShadowRootManager");
 function getShadowRootManager(browser) {
   const existingShadowRootManager = shadowRootManager.get(browser);
   if (existingShadowRootManager) {
@@ -5053,7 +5172,7 @@ var ShadowRootManager = class {
   #frameDepth = 0;
   constructor(browser) {
     this.#browser = browser;
-    if (!browser.isBidi || process.env.VITEST_WORKER_ID || browser.options?.automationProtocol !== "webdriver") {
+    if (!browser.isBidi || process.env.WDIO_UNIT_TESTS || browser.options?.automationProtocol !== "webdriver") {
       this.#initialize = Promise.resolve(true);
       return;
     }
@@ -5144,9 +5263,9 @@ var ShadowRootManager = class {
         !shadowElem.value?.shadowRoot?.sharedId || // we expect the shadow root to have a proper type
         shadowElem.value.shadowRoot.value?.nodeType !== 11
       ) {
-        return log15.warn(`Expected element with shadow root but found <${shadowElem.value?.localName} />`);
+        return log16.warn(`Expected element with shadow root but found <${shadowElem.value?.localName} />`);
       }
-      log15.info(`Registered new shadow root for element <${shadowElem.value.localName} /> with id ${shadowElem.value.shadowRoot.sharedId}`);
+      log16.info(`Registered new shadow root for element <${shadowElem.value.localName} /> with id ${shadowElem.value.shadowRoot.sharedId}`);
       const newTree = new ShadowRootTree(
         shadowElem.sharedId,
         shadowElem.value.shadowRoot.sharedId,
@@ -5273,11 +5392,12 @@ var ShadowRootTree = class _ShadowRootTree {
     return [this, ...Array.from(this.children).map((tree) => tree.flat())].flat();
   }
   remove(element) {
-    for (const child of this.children) {
-      if (child.element === element) {
-        return this.children.delete(child);
+    const childArray = Array.from(this.children);
+    for (let i = childArray.length - 1; i >= 0; i--) {
+      if (childArray[i].element === element) {
+        return this.children.delete(childArray[i]);
       }
-      const wasFound = child.remove(element);
+      const wasFound = childArray[i].remove(element);
       if (wasFound) {
         return true;
       }
@@ -5307,7 +5427,7 @@ async function getHTML(options = {}) {
   }, options);
   const basicGetHTML = (elementId, includeSelectorTag2) => {
     return browser.execute(getHTMLScript, {
-      [ELEMENT_KEY11]: elementId,
+      [ELEMENT_KEY12]: elementId,
       // w3c compatible
       ELEMENT: elementId
       // jsonwp compatible
@@ -5327,18 +5447,18 @@ async function getHTML(options = {}) {
     const context = await contextManager2.getCurrentContext();
     const shadowRootElementPairs = shadowRootManager2.getShadowElementPairsByContextId(context, this.elementId);
     const elementsWithShadowRootAndIdVerified = (await Promise.all(
-      shadowRootElementPairs.map(([elemId, elem]) => browser.execute((elem2) => elem2.tagName, { [ELEMENT_KEY11]: elemId }).then(
+      shadowRootElementPairs.map(([elemId, elem]) => browser.execute((elem2) => elem2.tagName, { [ELEMENT_KEY12]: elemId }).then(
         () => [elemId, elem],
         () => void 0
       ))
     )).filter(Boolean).map(([elemId, shadowId]) => [
       elemId,
-      { [ELEMENT_KEY11]: elemId },
-      shadowId ? { [ELEMENT_KEY11]: shadowId } : void 0
+      { [ELEMENT_KEY12]: elemId },
+      shadowId ? { [ELEMENT_KEY12]: shadowId } : void 0
     ]);
     const { html, shadowElementHTML } = await browser.execute(
       getHTMLShadowScript,
-      { [ELEMENT_KEY11]: this.elementId },
+      { [ELEMENT_KEY12]: this.elementId },
       includeSelectorTag,
       elementsWithShadowRootAndIdVerified
     );
@@ -5436,7 +5556,7 @@ function getValue() {
 }
 
 // src/commands/element/isClickable.ts
-import { ELEMENT_KEY as ELEMENT_KEY12 } from "webdriver";
+import { ELEMENT_KEY as ELEMENT_KEY13 } from "webdriver";
 import { getBrowserObject as getBrowserObject19 } from "@wdio/utils";
 import isElementClickableScript from "./scripts/isElementClickable.js";
 async function isClickable() {
@@ -5448,7 +5568,7 @@ async function isClickable() {
   }
   const browser = getBrowserObject19(this);
   return browser.execute(isElementClickableScript, {
-    [ELEMENT_KEY12]: this.elementId,
+    [ELEMENT_KEY13]: this.elementId,
     // w3c compatible
     ELEMENT: this.elementId
     // jsonwp compatible
@@ -5486,10 +5606,10 @@ function isEnabled() {
 }
 
 // src/commands/element/isEqual.ts
-import { ELEMENT_KEY as ELEMENT_KEY13 } from "webdriver";
+import { ELEMENT_KEY as ELEMENT_KEY14 } from "webdriver";
 import { getBrowserObject as getBrowserObject21 } from "@wdio/utils";
 var getWebElement = (el) => ({
-  [ELEMENT_KEY13]: el.elementId,
+  [ELEMENT_KEY14]: el.elementId,
   // w3c compatible
   ELEMENT: el.elementId
   // jsonwp compatible
@@ -5532,13 +5652,13 @@ async function isExisting() {
 }
 
 // src/commands/element/isFocused.ts
-import { ELEMENT_KEY as ELEMENT_KEY14 } from "webdriver";
+import { ELEMENT_KEY as ELEMENT_KEY15 } from "webdriver";
 import { getBrowserObject as getBrowserObject22 } from "@wdio/utils";
 import isFocusedScript from "./scripts/isFocused.js";
 async function isFocused() {
   const browser = await getBrowserObject22(this);
   return browser.execute(isFocusedScript, {
-    [ELEMENT_KEY14]: this.elementId,
+    [ELEMENT_KEY15]: this.elementId,
     // w3c compatible
     ELEMENT: this.elementId
     // jsonwp compatible
@@ -5551,13 +5671,13 @@ function isSelected() {
 }
 
 // src/commands/element/isStable.ts
-import { ELEMENT_KEY as ELEMENT_KEY15 } from "webdriver";
+import { ELEMENT_KEY as ELEMENT_KEY16 } from "webdriver";
 import { getBrowserObject as getBrowserObject23 } from "@wdio/utils";
 import isElementStable from "./scripts/isElementStable.js";
 async function isStable() {
   const browser = getBrowserObject23(this);
   return await browser.executeAsync(isElementStable, {
-    [ELEMENT_KEY15]: this.elementId,
+    [ELEMENT_KEY16]: this.elementId,
     // w3c compatible
     ELEMENT: this.elementId
     // jsonwp compatible
@@ -5565,18 +5685,18 @@ async function isStable() {
 }
 
 // src/commands/element/moveTo.ts
-import logger16 from "@wdio/logger";
+import logger17 from "@wdio/logger";
 import { getBrowserObject as getBrowserObject24 } from "@wdio/utils";
-var log16 = logger16("webdriver");
+var log17 = logger17("webdriver");
 async function moveTo({ xOffset, yOffset } = {}) {
   const browser = getBrowserObject24(this);
   if (xOffset || yOffset) {
     const { width, height } = await browser.getElementRect(this.elementId);
     if (xOffset && xOffset < -Math.floor(width / 2) || xOffset && xOffset > Math.floor(width / 2)) {
-      log16.warn("xOffset would cause a out of bounds error as it goes outside of element");
+      log17.warn("xOffset would cause a out of bounds error as it goes outside of element");
     }
     if (yOffset && yOffset < -Math.floor(height / 2) || yOffset && yOffset > Math.floor(height / 2)) {
-      log16.warn("yOffset would cause a out of bounds error as it goes outside of element");
+      log17.warn("yOffset would cause a out of bounds error as it goes outside of element");
     }
   }
   const moveToNested = async () => {
@@ -5686,16 +5806,16 @@ async function saveScreenshot2(filepath) {
 }
 
 // src/commands/element/scrollIntoView.ts
-import logger17 from "@wdio/logger";
-import { ELEMENT_KEY as ELEMENT_KEY16 } from "webdriver";
+import logger18 from "@wdio/logger";
+import { ELEMENT_KEY as ELEMENT_KEY17 } from "webdriver";
 import { getBrowserObject as getBrowserObject27 } from "@wdio/utils";
-var log17 = logger17("webdriverio");
+var log18 = logger18("webdriverio");
 function scrollIntoViewWeb(options = { block: "start", inline: "nearest" }) {
   const browser = getBrowserObject27(this);
   return browser.execute(
     (elem, options2) => elem.scrollIntoView(options2),
     {
-      [ELEMENT_KEY16]: this.elementId,
+      [ELEMENT_KEY17]: this.elementId,
       // w3c compatible
       ELEMENT: this.elementId
       // jsonwp compatible
@@ -5748,7 +5868,7 @@ async function scrollIntoView(options = { block: "start", inline: "nearest" }) {
     deltaY = Math.round(deltaY - scrollY);
     await browser.action("wheel").scroll({ duration: 0, x: deltaX, y: deltaY, origin: this }).perform();
   } catch (err) {
-    log17.warn(
+    log18.warn(
       `Failed to execute "scrollIntoView" using WebDriver Actions API: ${err.message}!
 Re-attempting using \`Element.scrollIntoView\` via Web API.`
     );
@@ -5813,7 +5933,7 @@ async function setValue(value) {
 }
 
 // src/commands/element/shadow$$.ts
-import logger18 from "@wdio/logger";
+import logger19 from "@wdio/logger";
 import { getBrowserObject as getBrowserObject28 } from "@wdio/utils";
 import { SHADOW_ELEMENT_KEY } from "webdriver";
 import { shadowFnFactory } from "./scripts/shadowFnFactory.js";
@@ -6141,7 +6261,7 @@ var createRoleBaseXpathSelector = (role) => {
 };
 
 // src/commands/element/shadow$$.ts
-var log18 = logger18("webdriverio");
+var log19 = logger19("webdriverio");
 async function shadow$$(selector) {
   const browser = getBrowserObject28(this);
   try {
@@ -6151,7 +6271,7 @@ async function shadow$$(selector) {
     const elements = await getElements.call(this, selector, res, { isShadowElement: true });
     return enhanceElementsArray(elements, this, selector);
   } catch (err) {
-    log18.warn(
+    log19.warn(
       `Failed to fetch element within shadow DOM using WebDriver command: ${err.message}!
 Falling back to JavaScript shim.`
     );
@@ -6160,11 +6280,11 @@ Falling back to JavaScript shim.`
 }
 
 // src/commands/element/shadow$.ts
-import logger19 from "@wdio/logger";
+import logger20 from "@wdio/logger";
 import { SHADOW_ELEMENT_KEY as SHADOW_ELEMENT_KEY2 } from "webdriver";
 import { shadowFnFactory as shadowFnFactory2 } from "./scripts/shadowFnFactory.js";
 import { getBrowserObject as getBrowserObject29 } from "@wdio/utils";
-var log19 = logger19("webdriverio");
+var log20 = logger20("webdriverio");
 async function shadow$(selector) {
   const browser = getBrowserObject29(this);
   try {
@@ -6173,7 +6293,7 @@ async function shadow$(selector) {
     const res = await browser.findElementFromShadowRoot(shadowRoot[SHADOW_ELEMENT_KEY2], using, value);
     return getElement.call(this, selector, res, { isShadowElement: true });
   } catch (err) {
-    log19.warn(
+    log20.warn(
       `Failed to fetch element within shadow DOM using WebDriver command: ${err.message}!
 Falling back to JavaScript shim.`
     );
@@ -6472,7 +6592,7 @@ function querySelectorAllDeep(findMany, s, r) {
 }
 
 // src/utils/index.ts
-var log20 = logger20("webdriverio");
+var log21 = logger21("webdriverio");
 var INVALID_SELECTOR_ERROR = "selector needs to be typeof `string` or `function`";
 var IGNORED_COMMAND_FILE_EXPORTS = ["SESSION_MOCKS", "CDP_SESSIONS"];
 var scopes = {
@@ -6502,8 +6622,8 @@ var getElementFromResponse = (res) => {
   if (res.ELEMENT) {
     return res.ELEMENT;
   }
-  if (res[ELEMENT_KEY17]) {
-    return res[ELEMENT_KEY17];
+  if (res[ELEMENT_KEY18]) {
+    return res[ELEMENT_KEY18];
   }
   return null;
 };
@@ -6610,7 +6730,7 @@ async function findDeepElement(selector) {
   const startNodes = shadowRoots.length > 0 ? shadowRoots.map((shadowRootNodeId) => ({ sharedId: shadowRootNodeId })) : this.elementId ? [{ sharedId: this.elementId }] : void 0;
   const deepElementResult = await browser.browsingContextLocateNodes({ locator, context, startNodes }).then(async (result) => {
     const nodes = result.nodes.filter((node) => Boolean(node.sharedId)).map((node) => ({
-      [ELEMENT_KEY17]: node.sharedId,
+      [ELEMENT_KEY18]: node.sharedId,
       locator
     }));
     if (!this.elementId) {
@@ -6619,15 +6739,15 @@ async function findDeepElement(selector) {
     const scopedNodes = await Promise.all(nodes.map(async (node) => {
       const isIn = await browser.execute(
         elementContains,
-        { [ELEMENT_KEY17]: this.elementId },
+        { [ELEMENT_KEY18]: this.elementId },
         node
       );
       return [isIn, node];
     })).then((elems) => elems.filter(([isIn]) => isIn).map(([, elem]) => elem));
     return scopedNodes[0];
   }, (err) => {
-    log20.warn(`Failed to execute browser.browsingContextLocateNodes({ ... }) due to ${err}, falling back to regular WebDriver Classic command`);
-    return browser.findElement(using, value);
+    log21.warn(`Failed to execute browser.browsingContextLocateNodes({ ... }) due to ${err}, falling back to regular WebDriver Classic command`);
+    return this && "elementId" in this && this.elementId ? this.findElementFromElement(this.elementId, using, value) : browser.findElement(using, value);
   });
   if (!deepElementResult) {
     return new Error(`Couldn't find element with selector "${selector}"`);
@@ -6648,7 +6768,7 @@ async function findDeepElements(selector) {
   const startNodes = shadowRoots.length > 0 ? shadowRoots.map((shadowRootNodeId) => ({ sharedId: shadowRootNodeId })) : this.elementId ? [{ sharedId: this.elementId }] : void 0;
   const deepElementResult = await browser.browsingContextLocateNodes({ locator, context, startNodes }).then(async (result) => {
     const nodes = result.nodes.filter((node) => Boolean(node.sharedId)).map((node) => ({
-      [ELEMENT_KEY17]: node.sharedId,
+      [ELEMENT_KEY18]: node.sharedId,
       locator
     }));
     if (!this.elementId) {
@@ -6657,15 +6777,15 @@ async function findDeepElements(selector) {
     const scopedNodes = await Promise.all(nodes.map(async (node) => {
       const isIn = await browser.execute(
         elementContains,
-        { [ELEMENT_KEY17]: this.elementId },
+        { [ELEMENT_KEY18]: this.elementId },
         node
       );
       return [isIn, node];
     })).then((elems) => elems.filter(([isIn]) => isIn).map(([, elem]) => elem));
     return scopedNodes;
   }, (err) => {
-    log20.warn(`Failed to execute browser.browsingContextLocateNodes({ ... }) due to ${err}, falling back to regular WebDriver Classic command`);
-    return browser.findElements(using, value);
+    log21.warn(`Failed to execute browser.browsingContextLocateNodes({ ... }) due to ${err}, falling back to regular WebDriver Classic command`);
+    return this && "elementId" in this && this.elementId ? this.findElementsFromElement(this.elementId, using, value) : browser.findElements(using, value);
   });
   return deepElementResult;
 }
@@ -6761,7 +6881,7 @@ function verifyArgsAndStripIfElement(args) {
         throw new Error(`The element with selector "${elem.selector}" you are trying to pass into the execute method wasn't found`);
       }
       return {
-        [ELEMENT_KEY17]: elem.elementId,
+        [ELEMENT_KEY18]: elem.elementId,
         ELEMENT: elem.elementId
       };
     }
@@ -6792,7 +6912,7 @@ async function getElementRect(scope) {
       if (rectJs && typeof rectJs[key] === "number") {
         rect[key] = Math.floor(rectJs[key]);
       } else {
-        log20.error("getElementRect", { rect, rectJs, key });
+        log21.error("getElementRect", { rect, rectJs, key });
         throw new Error("Failed to receive element rects via execute command");
       }
     });
@@ -6867,7 +6987,7 @@ var elementErrorHandler = (fn) => (commandName, commandFn) => {
       }
       const element = await implicitWait(this, commandName);
       this.elementId = element.elementId;
-      this[ELEMENT_KEY18] = element.elementId;
+      this[ELEMENT_KEY19] = element.elementId;
       try {
         const result = await fn(commandName, commandFn).apply(this, args);
         const caps = getBrowserObject31(this).capabilities;
@@ -7160,6 +7280,8 @@ function detectBackend(options = {}) {
 
 // src/protocol-stub.ts
 import { capabilitiesEnvironmentDetector } from "@wdio/utils";
+var NOOP2 = () => {
+};
 var ProtocolStub = class {
   static async newSession(options) {
     const capabilities = emulateSessionCapabilities(options.capabilities);
@@ -7172,6 +7294,9 @@ var ProtocolStub = class {
       overwrittenCommands: [],
       // internally used to transfer overwritten commands to the actual protocol instance
       commandList: [],
+      getWindowHandle: NOOP2,
+      on: NOOP2,
+      off: NOOP2,
       ...capabilitiesEnvironmentDetector(capabilities)
     };
     browser.addCommand = (...args) => browser.customCommands.push(args);
@@ -7239,7 +7364,7 @@ var DialogManager = class {
   #autoHandleDialog = true;
   constructor(browser) {
     this.#browser = browser;
-    if (!browser.isBidi || process.env.VITEST_WORKER_ID || browser.options?.automationProtocol !== "webdriver") {
+    if (!browser.isBidi || process.env.WDIO_UNIT_TESTS || browser.options?.automationProtocol !== "webdriver") {
       this.#initialize = Promise.resolve(true);
       return;
     }
@@ -7256,14 +7381,14 @@ var DialogManager = class {
   /**
    * capture shadow root elements propagated through console.debug
    */
-  async #handleUserPrompt(log21) {
+  async #handleUserPrompt(log22) {
     if (this.#autoHandleDialog) {
       return this.#browser.browsingContextHandleUserPrompt({
         accept: false,
-        context: log21.context
+        context: log22.context
       });
     }
-    const dialog = new Dialog(log21, this.#browser);
+    const dialog = new Dialog(log22, this.#browser);
     this.#browser.emit("dialog", dialog);
   }
   /**
@@ -7326,7 +7451,7 @@ var remote = async function(params, remoteModifier) {
   const keysToKeep = Object.keys(process.env.WDIO_WORKER_ID ? params : DEFAULTS);
   const config = validateConfig(WDIO_DEFAULTS, params, keysToKeep);
   await enableFileLogging(config.outputDir);
-  logger21.setLogLevelsConfig(config.logLevels, config.logLevel);
+  logger22.setLogLevelsConfig(config.logLevels, config.logLevel);
   const modifier = (client, options2) => {
     Object.assign(options2, Object.entries(config).reduce((a, [k, v]) => typeof v === "undefined" ? a : { ...a, [k]: v }, {}));
     if (typeof remoteModifier === "function") {