Merge pull request #123 from LambdaTest/stage

Stage

Author: parthlambdatest

commands/utils/httpClient.js

@@ -1,9 +1,10 @@
 const axios = require('axios');
 const https = require('https');
+const { HttpsProxyAgent } = require('https-proxy-agent');
+const { HttpProxyAgent } = require('http-proxy-agent');
 
 let proxyUrl = null;
 
-// Handle proxy URL configuration
 try {
     const SMARTUI_API_PROXY = process.env.SMARTUI_API_PROXY;
     if (SMARTUI_API_PROXY) {
@@ -15,21 +16,18 @@ try {
     console.error('[smartui] Invalid proxy URL:', error.message);
 }
 
-const axiosConfig = {
-    proxy: proxyUrl ? {
-        host: proxyUrl.hostname,
-        port: proxyUrl.port ? Number(proxyUrl.port) : 80,
-        ...(proxyUrl.username && proxyUrl.password ? {
-            auth: {
-                username: proxyUrl.username,
-                password: proxyUrl.password
-            }
-        } : {})
-    } : false
-};
-
-// Handle certificate verification skip
-if (process.env.SMARTUI_API_SKIP_CERTIFICATES) {
+const skipCertificates = process.env.SMARTUI_API_SKIP_CERTIFICATES === 'true';
+
+const axiosConfig = {};
+
+if (proxyUrl) {
+    const agentOptions = {
+        rejectUnauthorized: !skipCertificates
+    };
+
+    axiosConfig.httpsAgent = new HttpsProxyAgent(proxyUrl, agentOptions);
+    axiosConfig.httpAgent = new HttpProxyAgent(proxyUrl,agentOptions);
+} else if (skipCertificates) {
     axiosConfig.httpsAgent = new https.Agent({
         rejectUnauthorized: false
     });

commands/utils/package.js

@@ -18,8 +18,10 @@ function checkUpdate(version, options) {
         .catch(function (error) {
             if (error.response && error.response.data && error.response.data.error) {
                 console.log('Cannot check for updates. Error: ' + error.response.data.error.message);
+            } else if (error.code) {
+                console.log('Cannot check for updates. Error: ' + error.code + (error.message ? ' - ' + error.message : ''));
             } else {
-                console.log('Cannot check for updates. Error: ' + error.message);   
+                console.log('Cannot check for updates. Error: ' + (error.message || JSON.stringify(error)));   
             }
         });
 };

commands/utils/validate.js

@@ -30,9 +30,11 @@ function validateProjectToken(options) {
                 if (error.response) {
                     console.log('[smartui] Error: Invalid Project Token');
                 } else if (error.request) {
-                    console.log('[smartui] Project Token not validated. Error: ', error.message);
+                    const errorMsg = error.code ? `${error.code}${error.message ? ' - ' + error.message : ''}` : (error.message || 'Unknown error');
+                    console.log('[smartui] Project Token not validated. Error: ', errorMsg);
                 } else {
-                    console.log('[smartui] Project Token not validated. Error: ', error.message);
+                    const errorMsg = error.code ? `${error.code}${error.message ? ' - ' + error.message : ''}` : (error.message || 'Unknown error');
+                    console.log('[smartui] Project Token not validated. Error: ', errorMsg);
                 }
                 process.exit(constants.ERROR_CATCHALL);
             });

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambdatest/smartui-storybook",
-  "version": "1.1.30",
+  "version": "1.1.31",
   "description": "LambdaTest's command-line interface (CLI) aimed to help you run your SmartUI tests on LambdaTest platform",
   "main": "index.js",
   "repository": {
@@ -25,13 +25,15 @@
   "license": "MIT",
   "dependencies": {
     "archiver": "^5.3.1",
-    "axios": "^1.2.2",
+    "axios": "^1.12.0",
     "browserless": "^9.8.0",
     "chalk": "^5.2.0",
     "cli-table3": "^0.6.3",
     "commander": "^9.5.0",
     "finalhandler": "^1.2.0",
     "form-data": "^4.0.0",
+    "http-proxy-agent": "^7.0.0",
+    "https-proxy-agent": "^7.0.0",
     "jsdom": "^21.1.0",
     "lodash": "^4.17.21",
     "puppeteer": "^19.5.2",