Merge pull request #2509 from contentstack/main

back merge

Author: harshitha-cstk

.github/workflows/release-production-platform-plugins.yml

@@ -37,14 +37,6 @@ jobs:
           filename: .github/config/release.json
           prefix: release
 
-      # Dev Dependencies
-      - name: Publishing dev dependencies (Production)
-        uses: JS-DevTools/npm-publish@v3
-        with:
-          token: ${{ secrets.NPM_TOKEN }}
-          package: ./packages/contentstack-dev-dependencies/package.json
-          tag: latest
-
       # Utilities
       - name: Publishing utilities (Production)
         uses: JS-DevTools/npm-publish@v3

.talismanrc

@@ -2,5 +2,5 @@ fileignoreconfig:
   - filename: .github/workflows/release-production-pipeline.yml
     checksum: 48264fdeb61cbbed348c7271aae5e155651f490aca063dbb1d54f2c15a154090
   - filename: pnpm-lock.yaml
-    checksum: 86aa5ecf1bce4a09ae5ee3027c28664b749bd95eaabffc51449ab4bfd99bfe69
+    checksum: c64bb59690952523cb0c314de42499c168d3e08b1810e4583a546c5773bd89fc
 version: '1.0'

packages/contentstack-utilities/src/contentstack-management-sdk.ts

@@ -2,7 +2,12 @@ import { client, ContentstackClient, ContentstackConfig } from '@contentstack/ma
 import authHandler from './auth-handler';
 import { Agent } from 'node:https';
 import configHandler, { default as configStore } from './config-handler';
-import { getProxyConfigForHost, resolveRequestHost, clearProxyEnv } from './proxy-helper';
+import {
+  getProxyConfigForHost,
+  resolveRequestHost,
+  clearProxyEnv,
+  shouldBypassProxy,
+} from './proxy-helper';
 import dotenv from 'dotenv';
 
 dotenv.config();
@@ -22,13 +27,13 @@ class ManagementSDKInitiator {
     // NO_PROXY has priority over HTTP_PROXY/HTTPS_PROXY and config-set proxy
     const proxyConfig = getProxyConfigForHost(host);
 
-    // When bypassing, clear proxy env immediately so SDK never see it (they may read at init or first request).
-    if (!proxyConfig) {
+    // When NO_PROXY matches, strip proxy env so SDK/axios cannot pick up HTTP_PROXY for this process.
+    if (host && shouldBypassProxy(host)) {
       clearProxyEnv();
     }
 
     const option: ContentstackConfig = {
-      host: config.host,
+      host: config.host || host || undefined,
       maxContentLength: config.maxContentLength || 100000000,
       maxBodyLength: config.maxBodyLength || 1000000000,
       maxRequests: 10,
@@ -118,7 +123,10 @@ class ManagementSDKInitiator {
 
     if (proxyConfig) {
       option.proxy = proxyConfig;
+    } else if (host && shouldBypassProxy(host)) {
+      option.proxy = false;
     }
+    // When host is in NO_PROXY, do not add proxy to option at all
     if (config.endpoint) {
       option.endpoint = config.endpoint;
     }

packages/contentstack-utilities/src/http-client/client.ts

@@ -3,19 +3,25 @@ import { IHttpClient } from './client-interface';
 import { HttpResponse } from './http-response';
 import configStore from '../config-handler';
 import authHandler from '../auth-handler';
-import { hasProxy, getProxyUrl, getProxyConfig, getProxyConfigForHost } from '../proxy-helper';
+import {
+  hasProxy,
+  getProxyUrl,
+  getProxyConfigForHost,
+  resolveRequestHost,
+  shouldBypassProxy,
+} from '../proxy-helper';
 
 /**
  * Derive request host from baseURL or url for NO_PROXY checks.
  */
 function getRequestHost(baseURL?: string, url?: string): string | undefined {
   const toTry = [baseURL, url].filter(Boolean) as string[];
-  for (const candidateUrl of toTry) {
+  for (const u of toTry) {
     try {
-      const parsed = new URL(candidateUrl.startsWith('http') ? candidateUrl : `https://${candidateUrl}`);
+      const parsed = new URL(u.startsWith('http') ? u : `https://${u}`);
       return parsed.hostname || undefined;
     } catch {
-      // Invalid URL; try next candidate (baseURL or url)
+      // ignore
     }
   }
   return undefined;
@@ -427,12 +433,14 @@ export class HttpClient implements IHttpClient {
       }
     }
 
-    // Configure proxy if available. NO_PROXY has priority: hosts in NO_PROXY never use proxy.
+    // Configure proxy if available. NO_PROXY has priority; fall back to region CMA for host resolution.
     if (!this.request.proxy) {
-      const host = getRequestHost(this.request.baseURL, url);
-      const proxyConfig = host ? getProxyConfigForHost(host) : getProxyConfig();
+      const host = getRequestHost(this.request.baseURL, url) || resolveRequestHost({});
+      const proxyConfig = getProxyConfigForHost(host);
       if (proxyConfig) {
         this.request.proxy = proxyConfig;
+      } else if (host && shouldBypassProxy(host)) {
+        this.request.proxy = false;
       }
     }
 

packages/contentstack-utilities/src/proxy-helper.ts

@@ -82,44 +82,14 @@ export function shouldBypassProxy(host: string): boolean {
 }
 
 /**
- * Get proxy configuration. Sources (in order): env (HTTP_PROXY/HTTPS_PROXY), then global config
- * from `csdx config:set:proxy --host <host> --port <port> --protocol <protocol>`.
+ * Get proxy configuration. Priority order (per spec):
+ * 1. Global CLI config from `csdx config:set:proxy --host <host> --port <port> --protocol <protocol>`
+ * 2. Environment variables (HTTPS_PROXY or HTTP_PROXY)
  * For per-request use, prefer getProxyConfigForHost(host) so NO_PROXY overrides both sources.
  * @returns ProxyConfig object or undefined if no proxy is configured
  */
 export function getProxyConfig(): ProxyConfig | undefined {
-  // Priority 1: 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(':', '') as 'http' | 'https';
-        const proxyConfig: ProxyConfig = {
-          protocol: protocol,
-          host: url.hostname,
-          port: port,
-        };
-        
-        if (url.username || url.password) {
-          proxyConfig.auth = {
-            username: url.username,
-            password: url.password,
-          };
-        }
-        
-        return proxyConfig;
-      }
-    } catch {
-      // Invalid URL, continue to check global config
-    }
-  }
-  
-  // Priority 2: Global config (csdx config:set:proxy)
+  // Priority 1: Global config (csdx config:set:proxy)
   const globalProxyConfig = configStore.get('proxy');
   if (globalProxyConfig) {
     if (typeof globalProxyConfig === 'object') {
@@ -151,11 +121,42 @@ export function getProxyConfig(): ProxyConfig | undefined {
           return proxyConfig;
         }
       } catch {
-        // Invalid URL, return undefined
+        // Invalid URL, continue to check environment
       }
     }
   }
 
+  // Priority 2: 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(':', '') as 'http' | 'https';
+        const proxyConfig: ProxyConfig = {
+          protocol: protocol,
+          host: url.hostname,
+          port: port,
+        };
+        
+        if (url.username || url.password) {
+          proxyConfig.auth = {
+            username: url.username,
+            password: url.password,
+          };
+        }
+        
+        return proxyConfig;
+      }
+    } catch {
+      // Invalid URL, return undefined
+    }
+  }
+  
   return undefined;
 }
 
@@ -172,27 +173,38 @@ export function getProxyConfigForHost(host: string): ProxyConfig | undefined {
   return getProxyConfig();
 }
 
+function regionCmaHostname(): string {
+  const cma = configStore.get('region')?.cma;
+  if (!cma || typeof cma !== 'string') {
+    return '';
+  }
+  if (cma.startsWith('http')) {
+    try {
+      const u = new URL(cma);
+      return u.hostname || cma;
+    } catch {
+      return cma;
+    }
+  }
+  return cma;
+}
+
 /**
- * Resolve request host for proxy/NO_PROXY checks: config.host or default CMA from region.
- * Use when the caller may omit host so NO_PROXY still applies (e.g. from region.cma).
- * @param config - Object with optional host (e.g. API client config)
- * @returns Host string (hostname or empty)
+ * Hostname for NO_PROXY / proxy. Prefer `region.cma` when set so callers that pass a
+ * default SDK host (e.g. bulk-entries -> api.contentstack.io) still match rules like
+ * `.csnonprod.com` against the real API host (e.g. dev11-api.csnonprod.com).
  */
 export function resolveRequestHost(config: { host?: string }): string {
-  if (config.host) return config.host;
-  const cma = configStore.get('region')?.cma;
-  if (cma && typeof cma === 'string') {
-    if (cma.startsWith('http')) {
-      try {
-        const u = new URL(cma);
-        return u.hostname || cma;
-      } catch {
-        return cma;
-      }
-    }
-    return cma;
+  const fromRegion = regionCmaHostname();
+  if (fromRegion) {
+    return normalizeHost(fromRegion) || fromRegion;
+  }
+
+  const raw = config.host?.trim() || '';
+  if (!raw) {
+    return '';
   }
-  return '';
+  return normalizeHost(raw) || raw;
 }
 
 /**

packages/contentstack/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.59.0",
+  "version": "1.60.0",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run.js"
@@ -19,24 +19,24 @@
     "prepack": "pnpm compile && oclif manifest && oclif readme"
   },
   "dependencies": {
-    "@contentstack/cli-audit": "~1.18.0",
-    "@contentstack/cli-cm-export": "~1.23.2",
-    "@contentstack/cli-cm-import": "~1.31.3",
-    "@contentstack/cli-auth": "~1.7.3",
-    "@contentstack/cli-cm-bootstrap": "~1.18.4",
-    "@contentstack/cli-cm-branches": "~1.6.3",
-    "@contentstack/cli-cm-bulk-publish": "~1.10.7",
-    "@contentstack/cli-cm-clone": "~1.20.1",
-    "@contentstack/cli-cm-export-to-csv": "~1.11.0",
-    "@contentstack/cli-cm-import-setup": "~1.7.3",
+    "@contentstack/cli-audit": "~1.19.0",
+    "@contentstack/cli-cm-export": "~1.24.0",
+    "@contentstack/cli-cm-import": "~1.32.0",
+    "@contentstack/cli-auth": "~1.8.0",
+    "@contentstack/cli-cm-bootstrap": "~1.19.0",
+    "@contentstack/cli-cm-branches": "~1.7.0",
+    "@contentstack/cli-cm-bulk-publish": "~1.11.0",
+    "@contentstack/cli-cm-clone": "~1.21.0",
+    "@contentstack/cli-cm-export-to-csv": "~1.12.0",
+    "@contentstack/cli-cm-import-setup": "~1.8.0",
     "@contentstack/cli-cm-migrate-rte": "~1.6.4",
-    "@contentstack/cli-cm-seed": "~1.14.3",
-    "@contentstack/cli-command": "~1.7.2",
-    "@contentstack/cli-config": "~1.19.0",
+    "@contentstack/cli-cm-seed": "~1.15.0",
+    "@contentstack/cli-command": "~1.8.0",
+    "@contentstack/cli-config": "~1.20.0",
     "@contentstack/cli-launch": "^1.9.6",
-    "@contentstack/cli-migration": "~1.11.0",
-    "@contentstack/cli-utilities": "~1.17.4",
-    "@contentstack/cli-variants": "~1.3.8",
+    "@contentstack/cli-migration": "~1.12.0",
+    "@contentstack/cli-utilities": "~1.18.0",
+    "@contentstack/cli-variants": "~1.4.0",
     "@contentstack/management": "~1.27.5",
     "@oclif/core": "^4.8.3",
     "@oclif/plugin-help": "^6.2.28",