webdriver 9.23.0 → 9.23.1

package/build/index.js

@@ -1055,6 +1055,25 @@ var BidiHandler = class extends BidiCore {
 // src/utils.ts
 var log2 = logger2("webdriver");
 var deepmerge = deepmergeCustom({ mergeArrays: false });
+function deepEqual(a, b) {
+  if (a === b) {
+    return true;
+  }
+  if (typeof a !== "object" || a === null || typeof b !== "object" || b === null) {
+    return false;
+  }
+  const keysA = Object.keys(a);
+  const keysB = Object.keys(b);
+  if (keysA.length !== keysB.length) {
+    return false;
+  }
+  for (const key of keysA) {
+    if (!keysB.includes(key) || !deepEqual(a[key], b[key])) {
+      return false;
+    }
+  }
+  return true;
+}
 var BROWSER_DRIVER_ERRORS = [
   "unknown command: wd/hub/session",
   // chromedriver
@@ -1080,6 +1099,29 @@ async function startWebDriverSession(params) {
     capabilities.alwaysMatch.unhandledPromptBehavior = "ignore";
   }
   validateCapabilities(capabilities.alwaysMatch);
+  const keysToNormalize = Object.keys(capabilities.alwaysMatch);
+  if (capabilities.firstMatch) {
+    for (const key of keysToNormalize) {
+      const alwaysVal = capabilities.alwaysMatch[key];
+      const hasConflict = capabilities.firstMatch.some(
+        (match) => key in match && !deepEqual(match[key], alwaysVal)
+      );
+      if (hasConflict) {
+        delete capabilities.alwaysMatch[key];
+        capabilities.firstMatch.forEach((match) => {
+          if (!(key in match)) {
+            match[key] = alwaysVal;
+          }
+        });
+      } else {
+        capabilities.firstMatch.forEach((match) => {
+          if (key in match) {
+            delete match[key];
+          }
+        });
+      }
+    }
+  }
   const sessionRequest = new environment.value.Request(
     "POST",
     "/session",
@@ -1796,7 +1838,7 @@ var WebDriverResponseError = class _WebDriverResponseError extends WebDriverErro
 // package.json
 var package_default = {
   name: "webdriver",
-  version: "9.22.0",
+  version: "9.23.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",

package/build/node.js

@@ -1027,6 +1027,25 @@ var BidiHandler = class extends BidiCore {
 // src/utils.ts
 var log2 = logger2("webdriver");
 var deepmerge = deepmergeCustom({ mergeArrays: false });
+function deepEqual(a, b) {
+  if (a === b) {
+    return true;
+  }
+  if (typeof a !== "object" || a === null || typeof b !== "object" || b === null) {
+    return false;
+  }
+  const keysA = Object.keys(a);
+  const keysB = Object.keys(b);
+  if (keysA.length !== keysB.length) {
+    return false;
+  }
+  for (const key of keysA) {
+    if (!keysB.includes(key) || !deepEqual(a[key], b[key])) {
+      return false;
+    }
+  }
+  return true;
+}
 var BROWSER_DRIVER_ERRORS = [
   "unknown command: wd/hub/session",
   // chromedriver
@@ -1052,6 +1071,29 @@ async function startWebDriverSession(params) {
     capabilities.alwaysMatch.unhandledPromptBehavior = "ignore";
   }
   validateCapabilities(capabilities.alwaysMatch);
+  const keysToNormalize = Object.keys(capabilities.alwaysMatch);
+  if (capabilities.firstMatch) {
+    for (const key of keysToNormalize) {
+      const alwaysVal = capabilities.alwaysMatch[key];
+      const hasConflict = capabilities.firstMatch.some(
+        (match) => key in match && !deepEqual(match[key], alwaysVal)
+      );
+      if (hasConflict) {
+        delete capabilities.alwaysMatch[key];
+        capabilities.firstMatch.forEach((match) => {
+          if (!(key in match)) {
+            match[key] = alwaysVal;
+          }
+        });
+      } else {
+        capabilities.firstMatch.forEach((match) => {
+          if (key in match) {
+            delete match[key];
+          }
+        });
+      }
+    }
+  }
   const sessionRequest = new environment.value.Request(
     "POST",
     "/session",
@@ -1727,7 +1769,7 @@ var WebDriverResponseError = class _WebDriverResponseError extends WebDriverErro
 // package.json
 var package_default = {
   name: "webdriver",
-  version: "9.22.0",
+  version: "9.23.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",

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAI/C,OAAO,KAAK,EAAE,eAAe,EAAY,MAAM,iBAAiB,CAAA;AAMhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAM1C,OAAO,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAoB/G;;GAEG;AACH,wBAAsB,qBAAqB,CAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,WAAW,CAAC,YAAY,CAAA;CAAE,CAAC,CAgEzI;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAE,YAAY,EAAE,WAAW,CAAC,YAAY,QAiC3E;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAE,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,WAkExE;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAE,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,oBAAoB,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC,sCAiD7H;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,qBAAqB,CAuBpM;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,QAgBhD;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,kBAAkB,EAAE,SAAQ,OAAO,CAAC,OAAO,CAAC,SAAS,CAAM,WAmD/F,CAAA;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CACxB,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,OAAc,EACzB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACrC,qBAAqB,CA6CvB;AAED,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,QAWtE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,IAAI,CAAC,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,qBAAqB,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;;;;EA8BhI"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAI/C,OAAO,KAAK,EAAE,eAAe,EAAY,MAAM,iBAAiB,CAAA;AAMhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAM1C,OAAO,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAwC/G;;GAEG;AACH,wBAAsB,qBAAqB,CAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,WAAW,CAAC,YAAY,CAAA;CAAE,CAAC,CAuGzI;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAE,YAAY,EAAE,WAAW,CAAC,YAAY,QAiC3E;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAE,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,WAkExE;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAE,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,oBAAoB,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC,sCAiD7H;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,qBAAqB,CAuBpM;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,QAgBhD;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,kBAAkB,EAAE,SAAQ,OAAO,CAAC,OAAO,CAAC,SAAS,CAAM,WAmD/F,CAAA;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CACxB,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,OAAc,EACzB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACrC,qBAAqB,CA6CvB;AAED,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,QAWtE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,IAAI,CAAC,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,qBAAqB,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;;;;EA8BhI"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webdriver",
-  "version": "9.23.0",
+  "version": "9.23.1",
   "description": "A Node.js bindings implementation for the W3C WebDriver and Mobile JSONWire Protocol",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/webdriver",
@@ -38,15 +38,15 @@
   "dependencies": {
     "@types/node": "^20.1.0",
     "@types/ws": "^8.5.3",
-    "@wdio/config": "9.23.0",
+    "@wdio/config": "9.23.1",
     "@wdio/logger": "9.18.0",
-    "@wdio/protocols": "9.16.2",
-    "@wdio/types": "9.20.0",
-    "@wdio/utils": "9.23.0",
+    "@wdio/protocols": "9.23.1",
+    "@wdio/types": "9.23.1",
+    "@wdio/utils": "9.23.1",
     "deepmerge-ts": "^7.0.3",
     "https-proxy-agent": "^7.0.6",
     "undici": "^6.21.3",
     "ws": "^8.8.0"
   },
-  "gitHead": "5b35e4e2b94e3ac5247ec2bf27f2f5e41ef00372"
+  "gitHead": "19ac2c1dd86f3bdd967bc6c22c5bcdd78907b988"
 }