webdriverio 9.1.0 → 9.1.2

package/build/commands/browser/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/execute.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAsB,OAAO,CAAC,WAAW,EAAE,cAAc,SAAS,GAAG,EAAE,EACnE,IAAI,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,kBAAkB,EAC1D,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,SAAS,EAAE,cAAc,KAAK,WAAW,CAAC,EAChE,GAAG,IAAI,EAAE,cAAc,GACxB,OAAO,CAAC,WAAW,CAAC,CAoCtB"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/execute.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAsB,OAAO,CAAC,WAAW,EAAE,cAAc,SAAS,GAAG,EAAE,EACnE,IAAI,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,kBAAkB,EAC1D,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,SAAS,EAAE,cAAc,KAAK,WAAW,CAAC,EAChE,GAAG,IAAI,EAAE,cAAc,GACxB,OAAO,CAAC,WAAW,CAAC,CAqCtB"}

package/build/commands/browser/executeAsync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executeAsync.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/executeAsync.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH,wBAAsB,YAAY,CAAC,WAAW,EAAE,cAAc,SAAS,GAAG,EAAE,EACxE,IAAI,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,kBAAkB,EAC1D,MAAM,EACF,MAAM,GACN,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC,KAAK,IAAI,CAAC,EACjG,GAAG,IAAI,EAAE,cAAc,GACxB,OAAO,CAAC,WAAW,CAAC,CA4CtB"}
+{"version":3,"file":"executeAsync.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/executeAsync.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH,wBAAsB,YAAY,CAAC,WAAW,EAAE,cAAc,SAAS,GAAG,EAAE,EACxE,IAAI,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,kBAAkB,EAC1D,MAAM,EACF,MAAM,GACN,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC,KAAK,IAAI,CAAC,EACjG,GAAG,IAAI,EAAE,cAAc,GACxB,OAAO,CAAC,WAAW,CAAC,CA6CtB"}

package/build/commands/browser/newWindow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"newWindow.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/newWindow.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAItD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAsB,SAAS,CAC3B,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,GAAG,EAAE,MAAM,EACX,EAAE,UAAe,EAAE,cAAmB,EAAE,GAAE,gBAAqB,mBA+ClE"}
+{"version":3,"file":"newWindow.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/newWindow.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAItD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAsB,SAAS,CAC3B,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,GAAG,EAAE,MAAM,EACX,EAAE,UAAe,EAAE,cAAmB,EAAE,GAAE,gBAAqB,mBAiDlE"}

package/build/commands/browser/switchWindow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"switchWindow.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/switchWindow.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAsB,YAAY,CAC9B,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,OAAO,EAAE,MAAM,GAAG,MAAM,mBAiD3B"}
+{"version":3,"file":"switchWindow.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/switchWindow.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAsB,YAAY,CAC9B,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,OAAO,EAAE,MAAM,GAAG,MAAM,mBAmD3B"}

package/build/context.d.ts

@@ -8,6 +8,7 @@ export declare class ContextManager {
     #private;
     constructor(browser: WebdriverIO.Browser);
     initialize(): Promise<boolean>;
+    setCurrentContext(context: string): void;
     getCurrentContext(): Promise<string>;
 }
 //# sourceMappingURL=context.d.ts.map

package/build/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAMA,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,kBAS7D;AAED;;;;GAIG;AACH,qBAAa,cAAc;;gBAKX,OAAO,EAAE,WAAW,CAAC,OAAO;IAoBlC,UAAU;IAsBV,iBAAiB;CAM1B"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAMA,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,kBAS7D;AAED;;;;GAIG;AACH,qBAAa,cAAc;;gBAKX,OAAO,EAAE,WAAW,CAAC,OAAO;IAoBlC,UAAU;IAqBhB,iBAAiB,CAAE,OAAO,EAAE,MAAM;IAI5B,iBAAiB;CAM1B"}

package/build/index.js

@@ -3002,13 +3002,15 @@ var ContextManager = class {
    *
    * @param {local.BrowsingContextNavigationInfo} context  browsing context used to navigate
    */
-  #handleNavigationStarted(context) {
-    this.#browser.getWindowHandle().then((windowHandle) => {
-      if (context.context === windowHandle) {
-        log4.info(`Update current context: ${context.context}`);
-        this.#currentContext = context.context;
-      }
-    });
+  async #handleNavigationStarted(context) {
+    const windowHandle = await this.#browser.getWindowHandle();
+    if (context.context === windowHandle) {
+      log4.info(`Update current context: ${context.context}`);
+      this.#currentContext = context.context;
+    }
+  }
+  setCurrentContext(context) {
+    this.#currentContext = context;
   }
   async getCurrentContext() {
     if (!this.#currentContext) {
@@ -3027,8 +3029,9 @@ async function execute(script, ...args) {
     const browser = getBrowserObject2(this);
     const contextManager2 = getContextManager(browser);
     const context = await contextManager2.getCurrentContext();
+    const userScript = typeof script === "string" ? new Function(script) : script;
     const functionDeclaration = new Function(`
-            return (${SCRIPT_PREFIX}${script.toString()}${SCRIPT_SUFFIX}).apply(this, arguments);
+            return (${SCRIPT_PREFIX}${userScript.toString()}${SCRIPT_SUFFIX}).apply(this, arguments);
         `).toString();
     const params = {
       functionDeclaration,
@@ -3057,12 +3060,13 @@ async function executeAsync(script, ...args) {
     const browser = getBrowserObject3(this);
     const contextManager2 = getContextManager(browser);
     const context = await contextManager2.getCurrentContext();
+    const userScript = typeof script === "string" ? new Function(script) : script;
     const functionDeclaration = new Function(`
             const args = Array.from(arguments)
             return new Promise(async (resolve, reject) => {
                 const cb = (result) => resolve(result)
                 try {
-                    await (${script.toString()}).apply(this, [...args, cb])
+                    await (${userScript.toString()}).apply(this, [...args, cb])
                 } catch (err) {
                     return reject(err)
                 }
@@ -3532,10 +3536,10 @@ var WebDriverInterception = class _WebDriverInterception {
   }
   #matchesFilterOptions(request) {
     let isRequestMatching = true;
-    if (this.#filterOptions.method) {
-      isRequestMatching = typeof this.#filterOptions.method === "function" ? this.#filterOptions.method(request.request.method) : this.#filterOptions.method === request.request.method;
+    if (isRequestMatching && this.#filterOptions.method) {
+      isRequestMatching = typeof this.#filterOptions.method === "function" ? this.#filterOptions.method(request.request.method) : this.#filterOptions.method.toLowerCase() === request.request.method.toLowerCase();
     }
-    if (this.#filterOptions.requestHeaders) {
+    if (isRequestMatching && this.#filterOptions.requestHeaders) {
       isRequestMatching = typeof this.#filterOptions.requestHeaders === "function" ? this.#filterOptions.requestHeaders(request.request.headers.reduce((acc, { name, value }) => {
         acc[name] = value.type === "string" ? value.value : Buffer.from(value.value, "base64").toString();
         return acc;
@@ -3547,7 +3551,7 @@ var WebDriverInterception = class _WebDriverInterception {
         return header.value.type === "string" ? header.value.value === value : Buffer.from(header.value.value, "base64").toString() === value;
       });
     }
-    if (this.#filterOptions.responseHeaders && "response" in request) {
+    if (isRequestMatching && this.#filterOptions.responseHeaders && "response" in request) {
       isRequestMatching = typeof this.#filterOptions.responseHeaders === "function" ? this.#filterOptions.responseHeaders(request.response.headers.reduce((acc, { name, value }) => {
         acc[name] = value.type === "string" ? value.value : Buffer.from(value.value, "base64").toString();
         return acc;
@@ -3559,7 +3563,7 @@ var WebDriverInterception = class _WebDriverInterception {
         return header.value.type === "string" ? header.value.value === value : Buffer.from(header.value.value, "base64").toString() === value;
       });
     }
-    if (this.#filterOptions.statusCode && "response" in request) {
+    if (isRequestMatching && this.#filterOptions.statusCode && "response" in request) {
       isRequestMatching = typeof this.#filterOptions.statusCode === "function" ? this.#filterOptions.statusCode(request.response.status) : this.#filterOptions.statusCode === request.response.status;
     }
     return isRequestMatching;
@@ -3779,7 +3783,9 @@ async function newWindow(url6, { windowName = "", windowFeatures = "" } = {}) {
   }
   const tabsBefore = await this.getWindowHandles();
   if (this.isBidi) {
+    const contextManager2 = getContextManager(this);
     const { context } = await this.browsingContextCreate({ type: "window" });
+    contextManager2.setCurrentContext(context);
     await this.browsingContextNavigate({ context, url: url6 });
   } else {
     await this.execute(newWindowHelper, url6, windowName, windowFeatures);
@@ -4071,8 +4077,10 @@ async function switchWindow(matcher) {
     }
     return !!target.match(matcher);
   };
+  const contextManager2 = getContextManager(this);
   for (const tab of tabs) {
     await this.switchToWindow(tab);
+    contextManager2.setCurrentContext(tab);
     const url6 = await this.getUrl();
     if (matchesTarget(url6)) {
       return tab;
@@ -4878,10 +4886,11 @@ var ShadowRootManager = class {
       return;
     }
     this.#initialize = this.#browser.sessionSubscribe({
-      events: ["log.entryAdded"]
+      events: ["log.entryAdded", "browsingContext.navigationStarted"]
     }).then(() => true, () => false);
     this.#browser.on("log.entryAdded", this.handleLogEntry.bind(this));
     this.#browser.on("result", this.#commandResultHandler.bind(this));
+    this.#browser.on("browsingContext.navigationStarted", this.#handleNavigationStarted.bind(this));
     browser.scriptAddPreloadScript({
       functionDeclaration: customElementWrapper.toString()
     });
@@ -4889,6 +4898,12 @@ var ShadowRootManager = class {
   async initialize() {
     return this.#initialize;
   }
+  /**
+   * keep track of navigation events and remove shadow roots when they are no longer needed
+   */
+  #handleNavigationStarted(context) {
+    this.#shadowRoots.delete(context.context);
+  }
   /**
    * keep track of frame depth
    */
@@ -6894,9 +6909,7 @@ var REGION_MAPPING = {
   // default endpoint
   "eu": "eu-central-1.",
   "eu-central-1": "eu-central-1.",
-  "us-east-4": "us-east-4.",
-  "apac": "apac-southeast-1.",
-  "apac-southeast-1": "apac-southeast-1"
+  "us-east-4": "us-east-4."
 };
 function getSauceEndpoint(region, { isRDC, isVisual } = {}) {
   const shortRegion = REGION_MAPPING[region] ? region : "us";

package/build/shadowRoot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shadowRoot.d.ts","sourceRoot":"","sources":["../src/shadowRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,WAAW,CAAA;AAQtC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,qBAShE;AAED;;;;GAIG;AACH,qBAAa,iBAAiB;;gBAMd,OAAO,EAAE,WAAW,CAAC,OAAO;IAwBlC,UAAU;IAgBhB;;;OAGG;IACH,aAAa;IAIb;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ;IA2FvC,4BAA4B,CAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;IAmB1E,gCAAgC,CAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE;IAgBpG,qBAAqB,CAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IActF,gBAAgB,CAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAOvD;AAED,qBAAa,cAAc;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,cAAc,CAAA;IACrB,QAAQ,sBAA4B;gBAEvB,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,cAAc;IAMxE;;OAEG;IACH,gBAAgB,CAAE,IAAI,EAAE,cAAc,GAAG,IAAI;IAC7C;;;;;OAKG;IACH,gBAAgB,CAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI;IA6B5D,IAAI,CAAE,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAelD,cAAc,CAAE,UAAU,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAe/D,kBAAkB,IAAK,MAAM,EAAE;IAO/B,IAAI,IAAK,cAAc,EAAE;IAIzB,MAAM,CAAE,OAAO,EAAE,MAAM,GAAG,OAAO;CAcpC"}
+{"version":3,"file":"shadowRoot.d.ts","sourceRoot":"","sources":["../src/shadowRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,WAAW,CAAA;AAQtC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,qBAShE;AAED;;;;GAIG;AACH,qBAAa,iBAAiB;;gBAMd,OAAO,EAAE,WAAW,CAAC,OAAO;IAyBlC,UAAU;IAuBhB;;;OAGG;IACH,aAAa;IAIb;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ;IA2FvC,4BAA4B,CAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;IAmB1E,gCAAgC,CAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE;IAgBpG,qBAAqB,CAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IActF,gBAAgB,CAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAOvD;AAED,qBAAa,cAAc;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,cAAc,CAAA;IACrB,QAAQ,sBAA4B;gBAEvB,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,cAAc;IAMxE;;OAEG;IACH,gBAAgB,CAAE,IAAI,EAAE,cAAc,GAAG,IAAI;IAC7C;;;;;OAKG;IACH,gBAAgB,CAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI;IA6B5D,IAAI,CAAE,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAelD,cAAc,CAAE,UAAU,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAe/D,kBAAkB,IAAK,MAAM,EAAE;IAO/B,IAAI,IAAK,cAAc,EAAE;IAIzB,MAAM,CAAE,OAAO,EAAE,MAAM,GAAG,OAAO;CAcpC"}

package/build/utils/detectBackend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detectBackend.d.ts","sourceRoot":"","sources":["../../src/utils/detectBackend.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAiBxD,UAAU,qBAAqB;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAA;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,YAAY,CAAC,+BAA+B,CAAA;CAC9D;AAgBD;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,OAAO,GAAE,qBAA0B;;;;;EAkGxE"}
+{"version":3,"file":"detectBackend.d.ts","sourceRoot":"","sources":["../../src/utils/detectBackend.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAexD,UAAU,qBAAqB;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAA;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,YAAY,CAAC,+BAA+B,CAAA;CAC9D;AAgBD;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,OAAO,GAAE,qBAA0B;;;;;EAkGxE"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webdriverio",
   "description": "Next-gen browser and mobile automation test framework for Node.js",
-  "version": "9.1.0",
+  "version": "9.1.2",
   "homepage": "https://webdriver.io",
   "author": "Christian Bromann <mail@bromann.dev>",
   "license": "MIT",
@@ -76,12 +76,12 @@
   "dependencies": {
     "@types/node": "^20.11.30",
     "@types/sinonjs__fake-timers": "^8.1.5",
-    "@wdio/config": "9.1.0",
+    "@wdio/config": "9.1.2",
     "@wdio/logger": "9.1.0",
     "@wdio/protocols": "9.0.8",
     "@wdio/repl": "9.0.8",
-    "@wdio/types": "9.1.0",
-    "@wdio/utils": "9.1.0",
+    "@wdio/types": "9.1.2",
+    "@wdio/utils": "9.1.2",
     "archiver": "^7.0.1",
     "aria-query": "^5.3.0",
     "cheerio": "^1.0.0-rc.12",
@@ -100,7 +100,7 @@
     "rgb2hex": "0.2.5",
     "serialize-error": "^11.0.3",
     "urlpattern-polyfill": "^10.0.0",
-    "webdriver": "9.1.0"
+    "webdriver": "9.1.2"
   },
   "peerDependencies": {
     "puppeteer-core": "^22.3.0"
@@ -110,5 +110,5 @@
       "optional": true
     }
   },
-  "gitHead": "e6b005f5a150c335a105cfc2e386d43ac526adac"
+  "gitHead": "e009b5102f9f98b99fa62df870ce7f3f5bc1b99a"
 }