@contentstack/cli-utilities 1.16.1 → 1.17.0

package/lib/contentstack-management-sdk.js

@@ -6,19 +6,24 @@ const management_1 = require("@contentstack/management");
 const auth_handler_1 = tslib_1.__importDefault(require("./auth-handler"));
 const node_https_1 = require("node:https");
 const config_handler_1 = tslib_1.__importDefault(require("./config-handler"));
+const proxy_helper_1 = require("./proxy-helper");
+const dotenv_1 = tslib_1.__importDefault(require("dotenv"));
+dotenv_1.default.config();
 class ManagementSDKInitiator {
     constructor() { }
     init(context) {
         this.analyticsInfo = context === null || context === void 0 ? void 0 : context.analyticsInfo;
     }
     async createAPIClient(config) {
+        // Get proxy configuration with priority: Environment variables > Global config
+        const proxyConfig = (0, proxy_helper_1.getProxyConfig)();
         const option = {
             host: config.host,
             maxContentLength: config.maxContentLength || 100000000,
             maxBodyLength: config.maxBodyLength || 1000000000,
             maxRequests: 10,
             retryLimit: 3,
-            timeout: 60000,
+            timeout: proxyConfig ? 10000 : 60000,
             delayMs: config.delayMs,
             httpsAgent: new node_https_1.Agent({
                 maxSockets: 100,
@@ -31,6 +36,28 @@ class ManagementSDKInitiator {
             retryDelay: Math.floor(Math.random() * (8000 - 3000 + 1) + 3000),
             logHandler: (level, data) => { },
             retryCondition: (error) => {
+                // Don't retry proxy connection errors - fail fast
+                // Check if proxy is configured and this is a connection error
+                if (proxyConfig) {
+                    const errorCode = error.code || error.errno || error.syscall;
+                    const errorMessage = error.message || String(error);
+                    // Detect proxy connection failures - don't retry these
+                    if (errorCode === 'ECONNREFUSED' ||
+                        errorCode === 'ETIMEDOUT' ||
+                        errorCode === 'ENOTFOUND' ||
+                        errorCode === 'ERR_BAD_RESPONSE' ||
+                        (errorMessage === null || errorMessage === void 0 ? void 0 : errorMessage.includes('ECONNREFUSED')) ||
+                        (errorMessage === null || errorMessage === void 0 ? void 0 : errorMessage.includes('connect ECONNREFUSED')) ||
+                        (errorMessage === null || errorMessage === void 0 ? void 0 : errorMessage.includes('ERR_BAD_RESPONSE')) ||
+                        (errorMessage === null || errorMessage === void 0 ? void 0 : errorMessage.includes('Bad response')) ||
+                        (errorMessage === null || errorMessage === void 0 ? void 0 : errorMessage.includes('proxy')) ||
+                        (errorCode === 'ETIMEDOUT' && proxyConfig) // Timeout with proxy likely means proxy issue
+                    ) {
+                        // Don't retry - return false to fail immediately
+                        // The error will be thrown and handled by error formatter
+                        return false;
+                    }
+                }
                 // LINK ***REMOVED***vascript/blob/72fee8ad75ba7d1d5bab8489ebbbbbbaefb1c880/src/core/stack.js#L49
                 if (error.response && error.response.status) {
                     switch (error.response.status) {
@@ -43,6 +70,7 @@ class ManagementSDKInitiator {
                             return false;
                     }
                 }
+                return false;
             },
             retryDelayOptions: {
                 base: 1000,
@@ -75,6 +103,9 @@ class ManagementSDKInitiator {
                 });
             },
         };
+        if (proxyConfig) {
+            option.proxy = proxyConfig;
+        }
         if (config.endpoint) {
             option.endpoint = config.endpoint;
         }

package/lib/helpers.js

@@ -6,6 +6,7 @@ const recheck_1 = require("recheck");
 const traverse_1 = tslib_1.__importDefault(require("traverse"));
 const auth_handler_1 = tslib_1.__importDefault(require("./auth-handler"));
 const _1 = require(".");
+const proxy_helper_1 = require("./proxy-helper");
 const isAuthenticated = () => auth_handler_1.default.isAuthenticated();
 exports.isAuthenticated = isAuthenticated;
 const doesBranchExist = async (stack, branchName) => {
@@ -102,7 +103,7 @@ const validateRegex = (str) => {
 };
 exports.validateRegex = validateRegex;
 const formatError = function (error) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     let parsedError;
     // Parse the error
     try {
@@ -174,7 +175,12 @@ const formatError = function (error) {
         return 'Self-signed certificate in the certificate chain! Please ensure your certificate configuration is correct and the necessary CA certificates are trusted.';
     }
     // ENHANCED: Handle network errors with user-friendly messages
-    if (['ECONNREFUSED', 'ENOTFOUND', 'ETIMEDOUT', 'ENETUNREACH'].includes(parsedError === null || parsedError === void 0 ? void 0 : parsedError.code)) {
+    const networkErrorCodes = ['ECONNREFUSED', 'ENOTFOUND', 'ETIMEDOUT', 'ENETUNREACH', 'ERR_BAD_RESPONSE'];
+    if (networkErrorCodes.includes(parsedError === null || parsedError === void 0 ? void 0 : parsedError.code) || ((_g = parsedError === null || parsedError === void 0 ? void 0 : parsedError.message) === null || _g === void 0 ? void 0 : _g.includes('ERR_BAD_RESPONSE'))) {
+        // Check if proxy is configured and connection failed - likely proxy issue
+        if ((0, proxy_helper_1.hasProxy)()) {
+            return `Proxy error: Unable to connect to proxy server at ${(0, proxy_helper_1.getProxyUrl)()}. Please verify your proxy configuration. Error: ${(parsedError === null || parsedError === void 0 ? void 0 : parsedError.code) || 'Unknown'}`;
+        }
         return `Connection failed: Unable to reach the server. Please check your internet connection.`;
     }
     // Determine the error message

package/lib/http-client/client.js

@@ -6,6 +6,7 @@ const axios_1 = tslib_1.__importDefault(require("axios"));
 const http_response_1 = require("./http-response");
 const config_handler_1 = tslib_1.__importDefault(require("../config-handler"));
 const auth_handler_1 = tslib_1.__importDefault(require("../auth-handler"));
+const proxy_helper_1 = require("../proxy-helper");
 class HttpClient {
     /**
      * Createa new pending HTTP request instance.
@@ -306,14 +307,22 @@ class HttpClient {
         let counter = 0;
         this.axiosInstance.interceptors.response.use(null, async (error) => {
             var _a, _b;
-            const { message, response } = error;
+            const { message, response, code } = error;
+            // Don't retry proxy connection errors - fail fast
+            const proxyErrorCodes = ['ECONNREFUSED', 'ETIMEDOUT', 'ENOTFOUND', 'ERR_BAD_RESPONSE'];
+            const isProxyConfigured = this.request.proxy || (0, proxy_helper_1.hasProxy)();
+            if (isProxyConfigured && (proxyErrorCodes.includes(code) || (message === null || message === void 0 ? void 0 : message.includes('ERR_BAD_RESPONSE')))) {
+                const proxyUrl = this.request.proxy && typeof this.request.proxy === 'object'
+                    ? `${this.request.proxy.protocol}://${this.request.proxy.host}:${this.request.proxy.port}`
+                    : (0, proxy_helper_1.getProxyUrl)();
+                return Promise.reject(new Error(`Proxy error: Unable to connect to proxy server at ${proxyUrl}. Please verify your proxy configuration.`));
+            }
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.error_message) === null || _b === void 0 ? void 0 : _b.includes('access token is invalid or expired')) {
                 const token = await this.refreshToken();
                 this.headers(Object.assign(Object.assign({}, this.request.headers), { authorization: token.authorization }));
                 return await this.axiosInstance(Object.assign(Object.assign({ url,
                     method, withCredentials: true }, this.request), { data: this.prepareRequestPayload() }));
             }
-            // Retry while Network timeout or Network Error
             if (!(message.includes('timeout') || message.includes('Network Error') || message.includes('getaddrinfo ENOTFOUND'))) {
                 return Promise.reject(error);
             }
@@ -331,6 +340,13 @@ class HttpClient {
                 this.headers({ 'x-header-ea': Object.values(earlyAccessHeaders).join(',') });
             }
         }
+        // Configure proxy if available (priority: request.proxy > getProxyConfig())
+        if (!this.request.proxy) {
+            const proxyConfig = (0, proxy_helper_1.getProxyConfig)();
+            if (proxyConfig) {
+                this.request.proxy = proxyConfig;
+            }
+        }
         return await this.axiosInstance(Object.assign(Object.assign({ url,
             method, withCredentials: true }, this.request), { data: this.prepareRequestPayload() }));
     }

package/lib/proxy-helper.d.ts

@@ -0,0 +1,24 @@
+export interface ProxyConfig {
+    protocol: 'http' | 'https';
+    host: string;
+    port: number;
+    auth?: {
+        username: string;
+        password: string;
+    };
+}
+/**
+ * Get proxy configuration with priority: Environment variables > Global config
+ * @returns ProxyConfig object or undefined if no proxy is configured
+ */
+export declare function getProxyConfig(): ProxyConfig | undefined;
+/**
+ * Check if proxy is configured (from any source)
+ * @returns true if proxy is configured, false otherwise
+ */
+export declare function hasProxy(): boolean;
+/**
+ * Get proxy URL string for display purposes
+ * @returns Proxy URL string or 'proxy server' if not available
+ */
+export declare function getProxyUrl(): string;

package/lib/proxy-helper.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProxyUrl = exports.hasProxy = exports.getProxyConfig = void 0;
+const tslib_1 = require("tslib");
+const config_handler_1 = tslib_1.__importDefault(require("./config-handler"));
+/**
+ * Get proxy configuration with priority: Environment variables > Global config
+ * @returns ProxyConfig object or undefined if no proxy is configured
+ */
+function getProxyConfig() {
+    // Priority 1: Check environment variables (HTTPS_PROXY or HTTP_PROXY)
+    const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
+    if (proxyUrl) {
+        try {
+            const url = new URL(proxyUrl);
+            const defaultPort = url.protocol === 'https:' ? 443 : 80;
+            const port = url.port ? Number.parseInt(url.port, 10) : defaultPort;
+            if (!Number.isNaN(port) && port >= 1 && port <= 65535) {
+                const protocol = url.protocol.replace(':', '');
+                const proxyConfig = {
+                    protocol: protocol,
+                    host: url.hostname,
+                    port: port,
+                };
+                if (url.username || url.password) {
+                    proxyConfig.auth = {
+                        username: url.username,
+                        password: url.password,
+                    };
+                }
+                return proxyConfig;
+            }
+        }
+        catch (_a) {
+            // Invalid URL, continue to check global config
+        }
+    }
+    // Priority 2: Check global config store
+    const globalProxyConfig = config_handler_1.default.get('proxy');
+    if (globalProxyConfig) {
+        if (typeof globalProxyConfig === 'object') {
+            const port = globalProxyConfig.port;
+            if (port !== undefined && !Number.isNaN(port) && port >= 1 && port <= 65535) {
+                return globalProxyConfig;
+            }
+        }
+        else if (typeof globalProxyConfig === 'string') {
+            try {
+                const url = new URL(globalProxyConfig);
+                const defaultPort = url.protocol === 'https:' ? 443 : 80;
+                const port = url.port ? Number.parseInt(url.port, 10) : defaultPort;
+                if (!Number.isNaN(port) && port >= 1 && port <= 65535) {
+                    const protocol = url.protocol.replace(':', '');
+                    const proxyConfig = {
+                        protocol: protocol,
+                        host: url.hostname,
+                        port: port,
+                    };
+                    if (url.username || url.password) {
+                        proxyConfig.auth = {
+                            username: url.username,
+                            password: url.password,
+                        };
+                    }
+                    return proxyConfig;
+                }
+            }
+            catch (_b) {
+                // Invalid URL, return undefined
+            }
+        }
+    }
+    return undefined;
+}
+exports.getProxyConfig = getProxyConfig;
+/**
+ * Check if proxy is configured (from any source)
+ * @returns true if proxy is configured, false otherwise
+ */
+function hasProxy() {
+    return !!getProxyConfig() || !!process.env.HTTPS_PROXY || !!process.env.HTTP_PROXY || !!config_handler_1.default.get('proxy');
+}
+exports.hasProxy = hasProxy;
+/**
+ * Get proxy URL string for display purposes
+ * @returns Proxy URL string or 'proxy server' if not available
+ */
+function getProxyUrl() {
+    const proxyConfig = getProxyConfig();
+    if (proxyConfig) {
+        return `${proxyConfig.protocol}://${proxyConfig.host}:${proxyConfig.port}`;
+    }
+    const envProxy = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
+    if (envProxy) {
+        return envProxy;
+    }
+    const globalProxy = config_handler_1.default.get('proxy');
+    if (globalProxy && typeof globalProxy === 'object') {
+        return `${globalProxy.protocol}://${globalProxy.host}:${globalProxy.port}`;
+    }
+    return 'proxy server';
+}
+exports.getProxyUrl = getProxyUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.16.1",
+  "version": "1.17.0",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -68,7 +68,7 @@
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^10.0.10",
     "@types/node": "^14.18.63",
-    "@types/sinon": "^10.0.20",
+    "@types/sinon": "^21.0.0",
     "@types/traverse": "^0.6.37",
     "chai": "^4.5.0",
     "eslint": "^8.57.1",
@@ -77,7 +77,7 @@
     "fancy-test": "^2.0.42",
     "mocha": "10.8.2",
     "nyc": "^15.1.0",
-    "sinon": "^19.0.5",
+    "sinon": "^21.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^4.9.5"
   }