saucectl 0.165.0 → 0.166.0

package/index.js

@@ -4,12 +4,33 @@ const path = require('path');
 const { BinWrapper } = require('@saucelabs/bin-wrapper');
 const { Writable } = require('stream');
 
-const version = '0.165.0';
+const version = '0.166.0';
 const defaultBinInstallBase =
   'https://github.com/saucelabs/saucectl/releases/download';
 const binWrapper = (binInstallURL = null, binInstallBase = null) => {
   const bw = new BinWrapper();
 
+  if (binInstallURL) {
+    try {
+      new URL(binInstallURL);
+    } catch (e) {
+      console.error(
+        `Please ensure the provided saucectl binary source is valid: ${e}`,
+      );
+      return;
+    }
+  }
+  if (binInstallBase) {
+    try {
+      new URL(binInstallBase);
+    } catch (e) {
+      console.error(
+        `Please ensure the provided saucectl binary source mirror is valid: ${e}`,
+      );
+      return;
+    }
+  }
+
   if (process.env.GITHUB_TOKEN) {
     bw.httpOptions({
       headers: {

package/install.js

@@ -1,5 +1,16 @@
 const { binWrapper } = require('./index.js');
 
+function sanitizeURL(inputURL) {
+  const parsedURL = new URL(inputURL);
+
+  // Remove the username and password (authentication) if present
+  parsedURL.username = '';
+  parsedURL.password = '';
+
+  // Convert the sanitized URL back to a string
+  return parsedURL.toString();
+}
+
 // install.js is executed during the npm installation step.
 // To re-use BinWrapper logic, and limit changes, we force BinWrapper to
 // execute "saucectl --version".
@@ -11,6 +22,9 @@ async function install() {
     process.env.SAUCECTL_INSTALL_BINARY,
     process.env.SAUCECTL_INSTALL_BINARY_MIRROR,
   );
+  if (!bw) {
+    return;
+  }
   bw.run(['--version'])
     .then(() => {
       console.info(`Installation succeed`);
@@ -18,9 +32,27 @@ async function install() {
     })
     .catch((e) => {
       console.error(`Installation failed: ${e}`);
-      console.error(
-        `Check that you have access to https://github.com/saucelabs/saucectl/releases or format of the SAUCECTL_INSTALL_BINARY environment variable is correct\n\n`,
-      );
+      if (e.message.includes('AxiosError')) {
+        const binarySource = process.env.SAUCECTL_INSTALL_BINARY;
+        const binarySourceMirror = process.env.SAUCECTL_INSTALL_BINARY_MIRROR;
+        if (binarySource) {
+          console.error(
+            `Please check that you have access to the URL provided by the SAUCECTL_INSTALL_BINARY environment variable: ${sanitizeURL(
+              binarySource,
+            )}\n\n`,
+          );
+        } else if (binarySourceMirror) {
+          console.error(
+            `Please check that you have access to the URL provided by the SAUCECTL_INSTALL_BINARY_MIRROR environment variable: ${sanitizeURL(
+              binarySourceMirror,
+            )}\n\n`,
+          );
+        } else {
+          console.error(
+            `Please check that you have access to https://github.com/saucelabs/saucectl/releases\n\n`,
+          );
+        }
+      }
       process.exit(1);
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "saucectl",
-  "version": "0.165.0",
+  "version": "0.166.0",
   "description": "Node.js wrapper for saucectl",
   "main": "index.js",
   "bin": "index.js",