Merge pull request #120 from Nick-1234531/DOT-7102

parthlambdatest · web-flow · commit d36882eab1a8 · 2025-12-16T15:18:37.000+05:30
added support for SMARTUI_API_PROXY
diff --git a/commands/storybook.js b/commands/storybook.js
@@ -1,4 +1,4 @@
-const { default: axios } = require('axios')
+const { httpClient } = require('./utils/httpClient')
 const fs = require('fs')
 const { sendDoM } = require('./utils/dom')
 const { validateStorybookUrl, validateStorybookDir } = require('./utils/validate')
@@ -27,7 +27,7 @@ async function storybook(serve, options) {
         storybookConfig.browsers = (!storybookConfig.browsers.length) ? 'all' : storybookConfig.browsers.map(x => x.toLowerCase()).toString();
 
         // Get stories object from stories.json and add url corresponding to every story ID 
-        await axios.get(new URL('stories.json', url).href)
+        await httpClient.get(new URL('stories.json', url).href)
             .then(async function (response) {
                 let stories = {}
                 for (const [storyId, storyInfo] of Object.entries(response.data.stories)) {
@@ -101,7 +101,7 @@ async function storybook(serve, options) {
                 // Upload to S3
                 const zipData = fs.readFileSync('storybook-static.zip');
                 console.log('[smartui] Upload in progress...')
-                await axios.put(url, zipData, {
+                await httpClient.put(url, zipData, {
                     headers: {
                         'Content-Type': 'application/zip',
                         'Content-Length': zipData.length
@@ -183,7 +183,7 @@ async function storybook(serve, options) {
                 }
 
                 // Call static render API
-                await axios.post(new URL(constants[options.env].STATIC_RENDER_PATH, constants[options.env].BASE_URL).href, payload)
+                await httpClient.post(new URL(constants[options.env].STATIC_RENDER_PATH, constants[options.env].BASE_URL).href, payload)
                     .then(async function (response) {
                         if (response.data && response.data.error) {
                             console.log('[smartui] Error: ', response.data.error.message);
diff --git a/commands/utils/dom.js b/commands/utils/dom.js
@@ -1,4 +1,4 @@
-const axios = require('axios');
+const { httpClient } = require('./httpClient');
 const fs = require('fs');
 const path = require('path')
 const formData = require('form-data');
@@ -73,7 +73,7 @@ async function sendDoM(storybookUrl, stories, storybookConfig, options) {
     }
 
     // Send DOM to render API
-    await axios.post(constants[options.env].RENDER_API_URL, form, {
+    await httpClient.post(constants[options.env].RENDER_API_URL, form, {
         headers: {
             ...form.getHeaders()
         }
@@ -99,7 +99,7 @@ async function sendDoM(storybookUrl, stories, storybookConfig, options) {
 };
 
 function getBase64(url) {
-    return axios.get(url, {
+    return httpClient.get(url, {
             responseType: "text",
             responseEncoding: "base64",
         })
diff --git a/commands/utils/httpClient.js b/commands/utils/httpClient.js
@@ -0,0 +1,41 @@
+const axios = require('axios');
+const https = require('https');
+
+let proxyUrl = null;
+
+// Handle proxy URL configuration
+try {
+    const SMARTUI_API_PROXY = process.env.SMARTUI_API_PROXY;
+    if (SMARTUI_API_PROXY) {
+        const urlStr = SMARTUI_API_PROXY.startsWith('http') ?
+            SMARTUI_API_PROXY : `http://${SMARTUI_API_PROXY}`;
+        proxyUrl = new URL(urlStr);
+    }
+} catch (error) {
+    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) {
+    axiosConfig.httpsAgent = new https.Agent({
+        rejectUnauthorized: false
+    });
+}
+
+const httpClient = axios.create(axiosConfig);
+
+module.exports = { httpClient };
+
diff --git a/commands/utils/package.js b/commands/utils/package.js
@@ -1,9 +1,9 @@
-const axios = require('axios');
 var { constants } = require('./constants');
+const { httpClient } = require('./httpClient');
 
 // Check for package updates
 function checkUpdate(version, options) {
-    return axios.get(new URL(constants[options.env].CHECK_UPDATE_PATH, constants[options.env].BASE_URL).href, {
+    return httpClient.get(new URL(constants[options.env].CHECK_UPDATE_PATH, constants[options.env].BASE_URL).href, {
         params: {
             packageName: 'smartui-storybook',
             packageVersion: version
diff --git a/commands/utils/polling.js b/commands/utils/polling.js
@@ -1,4 +1,4 @@
-const axios = require('axios');
+const { httpClient } = require('./httpClient');
 const Table = require('cli-table3');
 var { constants } = require('./constants');
 
@@ -10,7 +10,7 @@ var CURRENT_TIME = 0
 var FLAG = 0
 
 async function shortPolling(buildId, retries = 0, options) {
-    await axios.get(new URL('?buildId=' + buildId, constants[options.env].BUILD_STATUS_URL).href, {
+    await httpClient.get(new URL('?buildId=' + buildId, constants[options.env].BUILD_STATUS_URL).href, {
         headers: {
             projectToken: process.env.PROJECT_TOKEN
         }})
diff --git a/commands/utils/static.js b/commands/utils/static.js
@@ -1,5 +1,5 @@
 const fs = require('fs');
-const axios = require('axios');
+const { httpClient } = require('./httpClient');
 const archiver = require('archiver');
 var { constants } = require('./constants');
 const { skipStory } = require('./story');
@@ -9,7 +9,7 @@ var INTERVAL = 2000
 const MAX_INTERVAL = 512000
 
 function getSignedUrl(options) {
-    return axios.get(new URL(constants[options.env].GET_SIGNED_URL_PATH, constants[options.env].BASE_URL).href, {
+    return httpClient.get(new URL(constants[options.env].GET_SIGNED_URL_PATH, constants[options.env].BASE_URL).href, {
         headers: {
             projectToken: process.env.PROJECT_TOKEN
         }});
diff --git a/commands/utils/validate.js b/commands/utils/validate.js
@@ -1,4 +1,4 @@
-const axios = require('axios');
+const { httpClient } = require('./httpClient');
 var { constants } = require('./constants');
 const fs = require('fs');
 const { getLastCommit } = require('./git');
@@ -18,7 +18,7 @@ class ValidationError extends Error {
 
 function validateProjectToken(options) {
     if (process.env.PROJECT_TOKEN) {
-        return axios.get(constants[options.env].AUTH_URL, {
+        return httpClient.get(constants[options.env].AUTH_URL, {
             headers: {
                 projectToken: process.env.PROJECT_TOKEN
             }
@@ -51,7 +51,7 @@ function validateStorybookUrl(url) {
         console.log('[smartui] Error: ', error.message)
         process.exit(constants.ERROR_CATCHALL);
     }
-    return axios.get(aboutUrl)
+    return httpClient.get(aboutUrl)
         .then(function (response) {
             console.log('[smartui] Connection to storybook established');
         })
@@ -87,7 +87,7 @@ async function validateStorybookDir(dir) {
 
 async function validateLatestBuild(options) {
     let commit = await getLastCommit();
-    return axios.get(new URL(constants[options.env].SB_BUILD_VALIDATE_PATH, constants[options.env].BASE_URL).href, {
+    return httpClient.get(new URL(constants[options.env].SB_BUILD_VALIDATE_PATH, constants[options.env].BASE_URL).href, {
         headers: {
             projectToken: process.env.PROJECT_TOKEN
         },
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lambdatest/smartui-storybook",
-  "version": "1.1.29",
+  "version": "1.1.30",
   "description": "LambdaTest's command-line interface (CLI) aimed to help you run your SmartUI tests on LambdaTest platform",
   "main": "index.js",
   "repository": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@lambdatest/smartui-storybook",`
`3`		`- "version": "1.1.29",`
	`3`	`+ "version": "1.1.30",`
`4`	`4`	`"description": "LambdaTest's command-line interface (CLI) aimed to help you run your SmartUI tests on LambdaTest platform",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"repository": {`