Merge pull request #129 from contentstack/staging

Release PR

Author: harshithad0703

.talismanrc

@@ -3,7 +3,7 @@ fileignoreconfig:
   ignore_detectors:
     - filecontent
 - filename: package-lock.json
-  checksum: 34d28e7736ffac2b27d3708b6bca28591f3a930292433001d2397bfdf2d2fd0f
+  checksum: 52799bf1f9a1c387a74baeecac6c1c08f22bb8abdd2a1f0e689d8ed374b47635
 - filename: .husky/pre-commit
   checksum: 5baabd7d2c391648163f9371f0e5e9484f8fb90fa2284cfc378732ec3192c193
 - filename: test/request.spec.ts

CHANGELOG.md

@@ -1,4 +1,9 @@
 ## Change log
+
+### Version: 1.3.0
+#### Date: Aug-25-2025
+ - Fix: Remove custom error object and throw axios error
+
 ### Version: 1.2.4
 #### Date: Aug-18-2025
  - Fix: Retry request logic after rate limit replenishes

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/core",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "type": "commonjs",
   "main": "./dist/cjs/src/index.js",
   "types": "./dist/cjs/src/index.d.ts",

package.json

@@ -1,5 +1,51 @@
 import { AxiosInstance } from './types';
 
+/**
+ * Handles array parameters properly with & separators
+ */
+function serializeParams(params: any): string {
+  if (!params) return '';
+  const urlParams = new URLSearchParams();
+  Object.keys(params).forEach(key => {
+    const value = params[key];
+    if (Array.isArray(value)) {
+      value.forEach(item => {
+        urlParams.append(key, item);
+      });
+    } else {
+      urlParams.set(key, value);
+    }
+  });
+  
+  return urlParams.toString();
+}
+
+/**
+ * Builds the full URL with query parameters
+ */
+function buildFullUrl(baseURL: string | undefined, url: string, queryString: string): string {
+  const base = baseURL || '';
+  return `${base}${url}?${queryString}`;
+}
+
+/**
+ * Makes the HTTP request with proper URL handling
+ */
+async function makeRequest(instance: AxiosInstance, url: string, requestConfig: any, actualFullUrl: string): Promise<any> {
+  // If URL is too long, use direct axios request with full URL
+  if (actualFullUrl.length > 2000) {
+    return await instance.request({
+      method: 'get',
+      url: actualFullUrl,
+      headers: instance.defaults.headers,
+      maxContentLength: Infinity,
+      maxBodyLength: Infinity,
+    });
+  } else {
+    return await instance.get(url, requestConfig);
+  }
+}
+
 export async function getData(instance: AxiosInstance, url: string, data?: any) {
   try {
     if (instance.stackConfig && instance.stackConfig.live_preview) {
@@ -23,14 +69,22 @@ export async function getData(instance: AxiosInstance, url: string, data?: any)
         }
       }
     }
-    const response = await instance.get(url, data);
+    
+    const requestConfig = {
+      ...data,
+      maxContentLength: Infinity,
+      maxBodyLength: Infinity
+    };
+    const queryString = serializeParams(requestConfig.params);
+    const actualFullUrl = buildFullUrl(instance.defaults.baseURL, url, queryString);
+    const response = await makeRequest(instance, url, requestConfig, actualFullUrl);
 
     if (response && response.data) {
       return response.data;
     } else {
-      throw Error(JSON.stringify(response));
+      throw response;
     }
   } catch (err: any) {
-    throw new Error(`${err.message || JSON.stringify(err)}`);
+    throw err;
   }
 }

src/lib/request.ts

@@ -93,15 +93,7 @@ export const retryResponseErrorHandler = (error: any, config: any, axiosInstance
       return retry(error, config, retryCount, config.retryDelay, axiosInstance);
     }
 
-    const customError = {
-      status: response.status,
-      statusText: response.statusText,
-      error_message: response.data.error_message,
-      error_code: response.data.error_code,
-      errors: response.data.errors,
-    };
-
-    throw customError;
+    throw error;
   } catch (err) {
     throw err;
   }

src/lib/retryPolicy/delivery-sdk-handlers.ts

@@ -116,12 +116,11 @@ describe('Request tests', () => {
     const client = httpClient({});
     const mock = new MockAdapter(client as any);
     const url = '/your-api-endpoint';
-    const responseWithoutData = { status: 200, headers: {} }; // Response without data property
 
     // Mock response that returns undefined/empty data
     mock.onGet(url).reply(() => [200, undefined, {}]);
 
-    await expect(getData(client, url)).rejects.toThrowError();
+  await expect(getData(client, url)).rejects.toBeDefined();
   });
 
   it('should throw error when response is null', async () => {
@@ -132,7 +131,7 @@ describe('Request tests', () => {
     // Mock response that returns null
     mock.onGet(url).reply(() => [200, null]);
 
-    await expect(getData(client, url)).rejects.toThrowError();
+  await expect(getData(client, url)).rejects.toBeDefined();
   });
 
   it('should handle live_preview when enable is false', async () => {
@@ -287,7 +286,7 @@ describe('Request tests', () => {
     });
 
     // When error has message property, it uses the message
-    await expect(getData(client, url)).rejects.toThrowError('Internal Server Error');
+  await expect(getData(client, url)).rejects.toBeDefined();
   });
 
   it('should handle non-Error objects as errors when they have no message property', async () => {
@@ -301,7 +300,7 @@ describe('Request tests', () => {
     });
 
     // When error has no message property, it stringifies the object
-    await expect(getData(client, url)).rejects.toThrowError(JSON.stringify(errorObject));
+  await expect(getData(client, url)).rejects.toBeDefined();
   });
 
   it('should pass data parameter to axios get request', async () => {

test/request.spec.ts

@@ -648,11 +648,11 @@ describe('retryResponseErrorHandler', () => {
       await retryResponseErrorHandler(error, config, client);
       fail('Expected retryResponseErrorHandler to throw a custom error');
     } catch (customError: any) {
-      expect(customError.status).toBe(400);
-      expect(customError.statusText).toBe('Bad Request');
-      expect(customError.error_message).toBe('Invalid request parameters');
-      expect(customError.error_code).toBe(400);
-      expect(customError.errors).toEqual(['Missing required field: title']);
+      expect(customError.response.status).toBe(400);
+      expect(customError.response.statusText).toBe('Bad Request');
+      expect(customError.response.data.error_message).toBe('Invalid request parameters');
+      expect(customError.response.data.error_code).toBe(400);
+      expect(customError.response.data.errors).toEqual(['Missing required field: title']);
     }
   });
 
@@ -677,11 +677,11 @@ describe('retryResponseErrorHandler', () => {
       await retryResponseErrorHandler(error, config, client);
       fail('Expected retryResponseErrorHandler to throw a custom error');
     } catch (customError: any) {
-      expect(customError.status).toBe(500);
-      expect(customError.statusText).toBe('Internal Server Error');
-      expect(customError.error_message).toBe('Database connection failed');
-      expect(customError.error_code).toBe(500);
-      expect(customError.errors).toBe(null);
+      expect(customError.response.status).toBe(500);
+      expect(customError.response.statusText).toBe('Internal Server Error');
+      expect(customError.response.data.error_message).toBe('Database connection failed');
+      expect(customError.response.data.error_code).toBe(500);
+      expect(customError.response.data.errors).toBe(null);
     }
   });
 
@@ -709,11 +709,11 @@ describe('retryResponseErrorHandler', () => {
       await retryResponseErrorHandler(error, config, client);
       fail('Expected retryResponseErrorHandler to throw a custom error');
     } catch (customError: any) {
-      expect(customError.status).toBe(422);
-      expect(customError.statusText).toBe('Unprocessable Entity');
-      expect(customError.error_message).toBe('Validation failed');
-      expect(customError.error_code).toBe(422);
-      expect(customError.errors).toEqual({
+      expect(customError.response.status).toBe(422);
+      expect(customError.response.statusText).toBe('Unprocessable Entity');
+      expect(customError.response.data.error_message).toBe('Validation failed');
+      expect(customError.response.data.error_code).toBe(422);
+      expect(customError.response.data.errors).toEqual({
         title: ['Title is required'],
         content: ['Content cannot be empty'],
       });