@wdio/utils 9.31.6 → 9.32.0-alpha.3

package/build/index.js

@@ -1001,7 +1001,7 @@ var ELEMENT_QUERY_COMMANDS = [
   "nextElement",
   "previousElement",
   "parentElement",
-  "unstable_select"
+  "select"
 ];
 var ELEMENT_PROPS = [
   "elementId",

package/build/node/utils.d.ts

@@ -2,6 +2,16 @@ import type { EdgedriverParameters } from 'edgedriver';
 import type { Options } from '@wdio/types';
 export declare const DEFAULT_EDGEDRIVER_CDN_URL = "https://msedgedriver.microsoft.com";
 export declare function setDefaultEdgedriverCdnUrl(): void;
+/**
+ * Allows to download Chromedriver from a custom host, e.g. an internal mirror
+ * or artifact registry, in environments where the default CDN is not reachable.
+ * This is the Chrome equivalent to the `EDGEDRIVER_CDNURL` environment variable
+ * that the `edgedriver` package supports.
+ * A blank value is treated as unset so that an empty variable in a CI config
+ * falls back to the default CDN rather than producing an invalid url.
+ * @return the configured CDN url without trailing slashes or `undefined` if not set
+ */
+export declare function getChromedriverCdnUrl(): string | undefined;
 /**
  * Helper utility to check file access
  * @param {string} file file to check access for

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/node/utils.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAI1C,eAAO,MAAM,0BAA0B,uCAAuC,CAAA;AAG9E,wBAAgB,0BAA0B,SAKzC;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,GAAI,OAAO,MAAM,YAWtC,CAAA;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,oBAAoB,YAYvD;AAED,wBAAgB,sBAAsB,CAAC,UAAU,CAAC,EAAE,MAAM,sBA6BzD;AAED,wBAAsB,uBAAuB,CAAC,WAAW,CAAC,EAAE,MAAM,+BAyBjE;AAGD,eAAO,MAAM,wBAAwB,GAAI,UAAU,MAAM,EAAE,iBAAiB,MAAM,EAAE,YAAY,MAAM,SAOrG,CAAA;AAgCD,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,YAAY;;;;;;GA4G3F;AAED,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,WAAW,CAAC,YAAY,oGAS/D;AAED,wBAAgB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,YAAY,UAGxG;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EAAC,MAAM,UAM3D;AAED,wBAAsB,iBAAiB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM;;GAgDhF;AAED,wBAAgB,gBAAgB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAEzE;AAED,wBAAsB,eAAe,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAI9E;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,CAAC,YAAY;;;;;;EAIlE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/node/utils.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAI1C,eAAO,MAAM,0BAA0B,uCAAuC,CAAA;AAG9E,wBAAgB,0BAA0B,SAKzC;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,uBAEpC;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,GAAI,OAAO,MAAM,YAWtC,CAAA;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,oBAAoB,YAYvD;AAED,wBAAgB,sBAAsB,CAAC,UAAU,CAAC,EAAE,MAAM,sBA6BzD;AAED,wBAAsB,uBAAuB,CAAC,WAAW,CAAC,EAAE,MAAM,+BAyBjE;AAGD,eAAO,MAAM,wBAAwB,GAAI,UAAU,MAAM,EAAE,iBAAiB,MAAM,EAAE,YAAY,MAAM,SAOrG,CAAA;AAoFD,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,YAAY;;;;;;GA4G3F;AAED,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,WAAW,CAAC,YAAY,oGAS/D;AAED,wBAAgB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,YAAY,UAGxG;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EAAC,MAAM,UAM3D;AAED,wBAAsB,iBAAiB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM;;GA0DhF;AAED,wBAAgB,gBAAgB,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAEzE;AAED,wBAAsB,eAAe,CAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,mBAI9E;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,CAAC,YAAY;;;;;;EAIlE"}

package/build/node.js

@@ -40,6 +40,9 @@ function setDefaultEdgedriverCdnUrl() {
     process.env.EDGEDRIVER_CDNURL = DEFAULT_EDGEDRIVER_CDN_URL;
   }
 }
+function getChromedriverCdnUrl() {
+  return process.env.CHROMEDRIVER_CDNURL?.trim().replace(/\/+$/, "") || void 0;
+}
 var canAccess = (file) => {
   if (!file) {
     return false;
@@ -111,14 +114,29 @@ var downloadProgressCallback = (artifact, downloadedBytes, totalBytes) => {
   log.progress(`Downloading ${artifact} ${percentage}%`);
   lastTimeCalled = Date.now();
 };
+function redactCredentials(message) {
+  return message.replace(/([a-zA-Z][\w+.-]{0,30}:\/\/)[^/\s?#]+@/g, "$1").replace(/([a-zA-Z][\w+.-]{0,30}:\/\/[^\s"'?#]*)\?[^\s"']*/g, "$1?[redacted]");
+}
+function describeRejection(err) {
+  if (err instanceof Error) {
+    return err.message;
+  }
+  if (typeof err === "string") {
+    return err;
+  }
+  try {
+    return JSON.stringify(err) ?? String(err);
+  } catch {
+    return String(err);
+  }
+}
 var _install = async (args, retry = false) => {
   await install(args).catch((err) => {
-    const error = `Failed downloading ${args.browser} v${args.buildId} using ${JSON.stringify(args)}: ${err.message}, retrying ...`;
+    const details = redactCredentials(`Failed downloading ${args.browser} v${args.buildId} using ${JSON.stringify(args)}: ${describeRejection(err)}`);
     if (retry) {
-      err.message += "\n" + error.replace(", retrying ...", "");
-      throw new Error(err);
+      throw new Error(details);
     }
-    log.error(error);
+    log.error(`${details}, retrying ...`);
     return _install(args, true);
   });
   log.progress("");
@@ -224,6 +242,7 @@ async function setupChromedriver(cacheDir, driverVersion) {
       platform,
       browser: Browser.CHROMEDRIVER,
       unpack: true,
+      baseUrl: getChromedriverCdnUrl(),
       downloadProgressCallback: (downloadedBytes, totalBytes) => downloadProgressCallback("Chromedriver", downloadedBytes, totalBytes)
     };
     let knownBuild = buildId;
@@ -231,7 +250,10 @@ async function setupChromedriver(cacheDir, driverVersion) {
       await _install({ ...chromedriverInstallOpts, buildId });
       log.info(`Download of Chromedriver v${buildId} was successful`);
     } else {
-      log.warn(`Chromedriver v${buildId} don't exist, trying to find known good version...`);
+      const cdnUrl = getChromedriverCdnUrl();
+      log.warn(
+        `Chromedriver v${buildId} don't exist, trying to find known good version...` + (cdnUrl ? ` (checked ${redactCredentials(cdnUrl)} from CHROMEDRIVER_CDNURL, a failed request is reported the same way as a missing version)` : "")
+      );
       knownBuild = await resolveBuildId(Browser.CHROMEDRIVER, platform, getMajorVersionFromString(version));
       if (knownBuild) {
         await _install({ ...chromedriverInstallOpts, buildId: knownBuild });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "9.31.6",
+  "version": "9.32.0-alpha.3+d8b6a29ba",
   "description": "A WDIO helper utility to provide several utility functions used across the project.",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-utils",
@@ -38,11 +38,11 @@
   },
   "dependencies": {
     "@puppeteer/browsers": "^2.2.0",
-    "@wdio/logger": "9.29.1",
-    "@wdio/types": "9.31.2",
+    "@wdio/logger": "9.32.0-alpha.3+d8b6a29ba",
+    "@wdio/types": "9.32.0-alpha.3+d8b6a29ba",
     "decamelize": "^6.0.0",
     "deepmerge-ts": "^8.0.0",
-    "edgedriver": "^6.1.2",
+    "edgedriver": "^6.3.1",
     "geckodriver": "^6.1.1",
     "get-port": "^7.0.0",
     "import-meta-resolve": "^4.0.0",
@@ -55,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b18898e3c339a2bba3a6c5af46bdf0f4f897cad8"
+  "gitHead": "d8b6a29ba73af54edb002d2a2e1a55b64849a8ef"
 }