Merge branch 'axios-master-without-speedboats' of github.com:browsers…

…tack/browserstack-cypress-cli into ats_fixes
browserstack · Nov 20, 2024 · d3dd8d7 · d3dd8d7
2 parents da25bb1 + 0ea68a9
commit d3dd8d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/bin/helpers/helper.js b/bin/helpers/helper.js
@@ -445,6 +445,7 @@ exports.truncateString = (field, truncateSizeInBytes) => {
 exports.setAxiosProxy = (axiosConfig) => {
   if (process.env.HTTP_PROXY || process.env.HTTPS_PROXY) {
     const httpProxy = process.env.HTTP_PROXY || process.env.HTTPS_PROXY
+    axiosConfig.proxy = false;
     axiosConfig.httpsAgent = new HttpsProxyAgent(httpProxy);
   };
 };

diff --git a/bin/helpers/usageReporting.js b/bin/helpers/usageReporting.js
@@ -338,7 +338,7 @@ async function send(args) {
     retries: 3, 
     retryDelay: 2000, 
     retryCondition: (error) => {
-      return (error.response.status === 503 || error.response.status === 500)
+      return utils.isNotUndefined(error.response) && (error.response.status === 503 || error.response.status === 500)
     }
   });
   try {
@@ -350,7 +350,11 @@ async function send(args) {
     };
     fileLogger.info(`${JSON.stringify(result)}`);
   } catch (error) {
-    fileLogger.error(JSON.stringify(error.response.data));
+    if (error.response) {
+      fileLogger.error(JSON.stringify(error.response.data));
+    } else {
+      fileLogger.error(`Error sending usage data: ${error.message}`);
+    }
     return;
   }
 }