fix: reverts the endpoints helper method integration

nadeem-cs · nadeem-cs · commit 6031f9d6078e · 2025-11-13T17:25:58.000+05:30
diff --git a/.talismanrc b/.talismanrc
@@ -1,6 +1,6 @@
 fileignoreconfig:
 - filename: package-lock.json
-  checksum: 46c0d87a82455d4b2bae3347f7361dda71d2b979426b1c95ef707a9166c17778
+  checksum: f70da9c8a690f7b3a2eb2461f0492eef5c61025e746593161756eefcbc518517
 - filename: test/unit/contentstack.spec.ts
   checksum: d5b99c01459ab8bc597baaa9e6cc4aa91ac6d9bf78af08e1d0220d0c5db3d0b3
 - filename: test/unit/utils.spec.ts
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/delivery-sdk",
-  "version": "4.10.2",
+  "version": "4.10.3",
   "type": "module",
   "license": "MIT",
   "main": "./dist/legacy/index.cjs",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@contentstack/core": "^1.3.3",
-    "@contentstack/utils": "^1.6.2",
+    "@contentstack/utils": "1.5.0",
     "axios": "^1.13.1",
     "humps": "^2.0.1"
   },
diff --git a/src/lib/contentstack.ts b/src/lib/contentstack.ts
@@ -2,7 +2,7 @@ import { httpClient, retryRequestHandler, retryResponseErrorHandler, retryRespon
 import { AxiosRequestHeaders } from 'axios';
 import { handleRequest } from './cache';
 import { Stack as StackClass } from './stack';
-import { Policy, StackConfig, ContentstackPlugin } from './types';
+import { Policy, StackConfig, ContentstackPlugin, Region } from './types';
 import * as Utility from './utils';
 import * as Utils from '@contentstack/utils';
 export { Utils };
@@ -34,7 +34,7 @@ let version = '{{VERSION}}';
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function stack(config: StackConfig): StackClass {
-  const DEFAULT_HOST = Utility.getHostforRegion(config.region || "aws_na", config.host);
+  const DEFAULT_HOST = Utility.getHostforRegion(config.region || Region.US, config.host);
 
   let defaultConfig = {
     defaultHostname: DEFAULT_HOST,
diff --git a/src/lib/stack.ts b/src/lib/stack.ts
@@ -8,7 +8,6 @@ import { synchronization } from './synchronization';
 import {TaxonomyQuery} from './taxonomy-query';
 import { GlobalFieldQuery } from './global-field-query';
 import { GlobalField } from './global-field';
-import { getHostforRegion } from './utils';
 
 export class Stack {
   readonly config: StackConfig;
@@ -229,19 +228,4 @@ export class Stack {
     return this;
   }
 
-  /**
-   * @method setHost
-   * @memberOf Stack
-   * @description Sets the host based on cloud region
-   * @param {String} cloudRegion - Cloud region (e.g., 'aws_na', 'aws_eu')
-   * @param {String} host - Optional custom host
-   * @return {Promise<string>} - Returns the host URL
-   * @instance
-   * */
-  async setHost(region: string = "aws_na", host?: string): Promise<void> {
-    const resolvedHost = getHostforRegion(region, host);
-
-    this._client.defaults.baseURL = `https://${resolvedHost}`;
-  }
-
 }
diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -76,7 +76,7 @@ export interface StackConfig extends HttpClientParams {
   environment: string;
   branch?: string;
   early_access?: string[];
-  region?: string;
+  region?: Region;
   locale?: string;
   plugins?: ContentstackPlugin[];
   logHandler?: (level: string, data: any) => void;
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -1,10 +1,14 @@
 import { Region, params } from './types';
-import { getContentstackEndpoint } from '@contentstack/utils';
 
-export function getHostforRegion(region: string = "aws_na", host?: string): string {
+export function getHostforRegion(region: Region = Region.US, host?: string): string {
   if (host) return host;
 
-  return getContentstackEndpoint(region, 'contentDelivery', true) as string;
+  let url = 'cdn.contentstack.io';
+  if (region !== Region.US) {
+    url = region.toString().toLowerCase() + '-cdn.contentstack.com';
+  }
+
+  return url;
 }
 
 export function isBrowser() {
diff --git a/test/unit/contentstack.spec.ts b/test/unit/contentstack.spec.ts
@@ -263,147 +263,6 @@ describe("Contentstack", () => {
     done();
   });
 
-  describe('getHostforRegion integration in stack creation', () => {
-    it('should use getHostforRegion to set default hostname for aws_na region', () => {
-      const getHostforRegionSpy = jest.spyOn(utils, 'getHostforRegion');
-      const config = {
-        apiKey: "apiKey",
-        deliveryToken: "delivery",
-        environment: "env",
-        region: "aws_na",
-      };
-      
-      const stackInstance = createStackInstance(config);
-      
-      expect(getHostforRegionSpy).toHaveBeenCalledWith("aws_na", undefined);
-      expect(stackInstance).toBeInstanceOf(Stack);
-      
-      getHostforRegionSpy.mockRestore();
-    });
-
-    it('should use getHostforRegion to set default hostname for eu region', () => {
-      const getHostforRegionSpy = jest.spyOn(utils, 'getHostforRegion');
-      const config = {
-        apiKey: "apiKey",
-        deliveryToken: "delivery",
-        environment: "env",
-        region: "eu",
-      };
-      
-      const stackInstance = createStackInstance(config);
-      
-      expect(getHostforRegionSpy).toHaveBeenCalledWith("eu", undefined);
-      expect(stackInstance).toBeInstanceOf(Stack);
-      
-      getHostforRegionSpy.mockRestore();
-    });
-
-    it('should use getHostforRegion with custom host when both region and host are provided', () => {
-      const getHostforRegionSpy = jest.spyOn(utils, 'getHostforRegion');
-      const config = {
-        apiKey: "apiKey",
-        deliveryToken: "delivery",
-        environment: "env",
-        region: "eu",
-        host: CUSTOM_HOST,
-      };
-      
-      const stackInstance = createStackInstance(config);
-      
-      expect(getHostforRegionSpy).toHaveBeenCalledWith("eu", CUSTOM_HOST);
-      expect(stackInstance).toBeInstanceOf(Stack);
-      
-      getHostforRegionSpy.mockRestore();
-    });
-
-    it('should use getHostforRegion for azure-na region', () => {
-      const getHostforRegionSpy = jest.spyOn(utils, 'getHostforRegion');
-      const config = {
-        apiKey: "apiKey",
-        deliveryToken: "delivery",
-        environment: "env",
-        region: "azure-na",
-      };
-      
-      const stackInstance = createStackInstance(config);
-      
-      expect(getHostforRegionSpy).toHaveBeenCalledWith("azure-na", undefined);
-      expect(stackInstance).toBeInstanceOf(Stack);
-      
-      getHostforRegionSpy.mockRestore();
-    });
-
-    it('should use getHostforRegion for gcp-na region', () => {
-      const getHostforRegionSpy = jest.spyOn(utils, 'getHostforRegion');
-      const config = {
-        apiKey: "apiKey",
-        deliveryToken: "delivery",
-        environment: "env",
-        region: "gcp-na",
-      };
-      
-      const stackInstance = createStackInstance(config);
-      
-      expect(getHostforRegionSpy).toHaveBeenCalledWith("gcp-na", undefined);
-      expect(stackInstance).toBeInstanceOf(Stack);
-      
-      getHostforRegionSpy.mockRestore();
-    });
-
-    it('should use getHostforRegion for gcp-eu region', () => {
-      const getHostforRegionSpy = jest.spyOn(utils, 'getHostforRegion');
-      const config = {
-        apiKey: "apiKey",
-        deliveryToken: "delivery",
-        environment: "env",
-        region: "gcp-eu",
-      };
-      
-      const stackInstance = createStackInstance(config);
-      
-      expect(getHostforRegionSpy).toHaveBeenCalledWith("gcp-eu", undefined);
-      expect(stackInstance).toBeInstanceOf(Stack);
-      
-      getHostforRegionSpy.mockRestore();
-    });
-
-    it('should handle getHostforRegion error gracefully', () => {
-      const getHostforRegionSpy = jest.spyOn(utils, 'getHostforRegion').mockImplementation(() => {
-        throw new Error('Unable to set host using the provided region. Please provide a valid region.');
-      });
-      
-      const config = {
-        apiKey: "apiKey",
-        deliveryToken: "delivery",
-        environment: "env",
-        region: "invalid_region",
-      };
-      
-      expect(() => createStackInstance(config)).toThrow(
-        'Unable to set host using the provided region. Please provide a valid region.'
-      );
-      
-      getHostforRegionSpy.mockRestore();
-    });
-
-    it('should use getHostforRegion with undefined region when no region is provided', () => {
-      const getHostforRegionSpy = jest.spyOn(utils, 'getHostforRegion');
-      const config = {
-        apiKey: "apiKey",
-        deliveryToken: "delivery",
-        environment: "env",
-      };
-      
-      const stackInstance = createStackInstance(config);
-      
-      // When no region is provided, the default parameter "aws_na" is used
-      expect(getHostforRegionSpy).toHaveBeenCalledWith("aws_na", undefined);
-      expect(stackInstance).toBeInstanceOf(Stack);
-      
-      getHostforRegionSpy.mockRestore();
-    });
-  });
-
   describe('locale configuration', () => {
     it('should set locale in params when locale is provided in config', () => {
       const config = {
diff --git a/test/unit/stack.spec.ts b/test/unit/stack.spec.ts
@@ -236,70 +236,5 @@ describe('Stack class tests', () => {
     expect(stack.config.debug).toEqual(false);
   });
 
-  describe('setHost method integration tests', () => {
-    it('should set baseURL correctly for aws_na region', async () => {
-      await stack.setHost('aws_na');
-      expect(client.defaults.baseURL).toBe('https://cdn.contentstack.io');
-    });
-
-    it('should set baseURL correctly for eu region', async () => {
-      await stack.setHost('eu');
-      expect(client.defaults.baseURL).toBe('https://eu-cdn.contentstack.com');
-    });
-
-    it('should set baseURL correctly for au region', async () => {
-      await stack.setHost('au');
-      expect(client.defaults.baseURL).toBe('https://au-cdn.contentstack.com');
-    });
-
-    it('should set baseURL correctly for azure-na region', async () => {
-      await stack.setHost('azure-na');
-      expect(client.defaults.baseURL).toBe('https://azure-na-cdn.contentstack.com');
-    });
-
-    it('should set baseURL correctly for gcp-na region', async () => {
-      await stack.setHost('gcp-na');
-      expect(client.defaults.baseURL).toBe('https://gcp-na-cdn.contentstack.com');
-    });
-
-    it('should set baseURL correctly for gcp-eu region', async () => {
-      await stack.setHost('gcp-eu');
-      expect(client.defaults.baseURL).toBe('https://gcp-eu-cdn.contentstack.com');
-    });
-
-    it('should prioritize custom host over region', async () => {
-      const customHost = 'custom.example.com';
-      await stack.setHost('eu', customHost);
-      expect(client.defaults.baseURL).toBe(`https://${customHost}`);
-    });
-
-    it('should handle case insensitive regions', async () => {
-      await stack.setHost('EU');
-      expect(client.defaults.baseURL).toBe('https://eu-cdn.contentstack.com');
-    });
-
-    it('should use default region when no region provided', async () => {
-      await stack.setHost();
-      expect(client.defaults.baseURL).toBe('https://cdn.contentstack.io');
-    });
-
-    it('should throw error for invalid region', async () => {
-      await expect(stack.setHost('invalid_region')).rejects.toThrow(
-        'Invalid region: invalid_region'
-      );
-    });
-
-    it('should handle region aliases correctly', async () => {
-      await stack.setHost('na');
-      expect(client.defaults.baseURL).toBe('https://cdn.contentstack.io');
-      
-      await stack.setHost('us');
-      expect(client.defaults.baseURL).toBe('https://cdn.contentstack.io');
-      
-      await stack.setHost('aws-na');
-      expect(client.defaults.baseURL).toBe('https://cdn.contentstack.io');
-    });
-  });
-
 });
 
diff --git a/test/unit/utils.spec.ts b/test/unit/utils.spec.ts
