@amazon-sp-api-release/amazon-sp-api-sdk-js 1.0.0-rc8 → 1.0.0

package/src/shipping_v2/api/ShippingApi.js

@@ -11,7 +11,7 @@
  *
  */
 
-import {ApiClient} from "../ApiClient.js";
+import {ApiClient} from '../ApiClient.js';
 import {CancelShipmentResponse} from '../model/CancelShipmentResponse.js';
 import {CreateClaimRequest} from '../model/CreateClaimRequest.js';
 import {CreateClaimResponse} from '../model/CreateClaimResponse.js';
@@ -43,6 +43,8 @@ import {PurchaseShipmentResponse} from '../model/PurchaseShipmentResponse.js';
 import {SubmitNdrFeedbackRequest} from '../model/SubmitNdrFeedbackRequest.js';
 import {UnlinkCarrierAccountRequest} from '../model/UnlinkCarrierAccountRequest.js';
 import {UnlinkCarrierAccountResponse} from '../model/UnlinkCarrierAccountResponse.js';
+import {SuperagentRateLimiter} from '../../../helper/SuperagentRateLimiter.mjs';
+import {DefaultRateLimitFetcher} from '../../../helper/DefaultRateLimitFetcher.mjs';
 
 /**
 * Shipping service.
@@ -51,6 +53,9 @@ import {UnlinkCarrierAccountResponse} from '../model/UnlinkCarrierAccountRespons
 */
 export class ShippingApi {
 
+    // Private memeber stores the default rate limiters
+    #defaultRateLimiterMap;
+
     /**
     * Constructs a new ShippingApi. 
     * @alias module:shipping_v2/api/ShippingApi
@@ -60,6 +65,50 @@ export class ShippingApi {
     */
     constructor(apiClient) {
         this.apiClient = apiClient || ApiClient.instance;
+        this.initializeDefaultRateLimiterMap();
+    }
+
+    /**
+     * Initialize rate limiters for API operations
+     */
+    initializeDefaultRateLimiterMap() {
+        this.#defaultRateLimiterMap = new Map()
+        const defaultRateLimitFetcher = new DefaultRateLimitFetcher();
+        const operations = [
+            'ShippingApi-cancelShipment',
+            'ShippingApi-createClaim',
+            'ShippingApi-directPurchaseShipment',
+            'ShippingApi-generateCollectionForm',
+            'ShippingApi-getAccessPoints',
+            'ShippingApi-getAdditionalInputs',
+            'ShippingApi-getCarrierAccountFormInputs',
+            'ShippingApi-getCarrierAccounts',
+            'ShippingApi-getCollectionForm',
+            'ShippingApi-getCollectionFormHistory',
+            'ShippingApi-getRates',
+            'ShippingApi-getShipmentDocuments',
+            'ShippingApi-getTracking',
+            'ShippingApi-getUnmanifestedShipments',
+            'ShippingApi-linkCarrierAccount',
+            'ShippingApi-linkCarrierAccount_0',
+            'ShippingApi-oneClickShipment',
+            'ShippingApi-purchaseShipment',
+            'ShippingApi-submitNdrFeedback',
+            'ShippingApi-unlinkCarrierAccount',
+        ];
+
+        for (const operation of operations) {
+            const config = defaultRateLimitFetcher.getLimit(operation);
+            this.#defaultRateLimiterMap.set(operation, new SuperagentRateLimiter(config));
+        }
+    }
+
+    /**
+     * Get rate limiter for a specific operation
+     * @param {String} operation name
+     */
+    getRateLimiter(operation) {
+        return this.#defaultRateLimiterMap.get(operation);
     }
 
 
@@ -99,7 +148,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-cancelShipment',
         '/shipping/v2/shipments/{shipmentId}/cancel', 'PUT',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-cancelShipment')
       );
     }
 
@@ -152,7 +201,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-createClaim',
         '/shipping/v2/claims', 'POST',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-createClaim')
       );
     }
 
@@ -209,7 +258,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-directPurchaseShipment',
         '/shipping/v2/shipments/directPurchase', 'POST',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-directPurchaseShipment')
       );
     }
 
@@ -266,7 +315,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-generateCollectionForm',
         '/shipping/v2/collectionForms', 'POST',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-generateCollectionForm')
       );
     }
 
@@ -335,7 +384,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-getAccessPoints',
         '/shipping/v2/accessPoints', 'GET',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-getAccessPoints')
       );
     }
 
@@ -398,7 +447,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-getAdditionalInputs',
         '/shipping/v2/shipments/additionalInputs/schema', 'GET',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-getAdditionalInputs')
       );
     }
 
@@ -446,7 +495,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-getCarrierAccountFormInputs',
         '/shipping/v2/carrierAccountFormInputs', 'GET',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-getCarrierAccountFormInputs')
       );
     }
 
@@ -498,7 +547,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-getCarrierAccounts',
         '/shipping/v2/carrierAccounts', 'PUT',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-getCarrierAccounts')
       );
     }
 
@@ -552,7 +601,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-getCollectionForm',
         '/shipping/v2/collectionForms/{collectionFormId}', 'GET',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-getCollectionForm')
       );
     }
 
@@ -605,7 +654,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-getCollectionFormHistory',
         '/shipping/v2/collectionForms/history', 'PUT',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-getCollectionFormHistory')
       );
     }
 
@@ -658,7 +707,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-getRates',
         '/shipping/v2/shipments/rates', 'POST',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-getRates')
       );
     }
 
@@ -723,7 +772,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-getShipmentDocuments',
         '/shipping/v2/shipments/{shipmentId}/documents', 'GET',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-getShipmentDocuments')
       );
     }
 
@@ -787,7 +836,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-getTracking',
         '/shipping/v2/tracking', 'GET',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-getTracking')
       );
     }
 
@@ -841,7 +890,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-getUnmanifestedShipments',
         '/shipping/v2/unmanifestedShipments', 'PUT',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-getUnmanifestedShipments')
       );
     }
 
@@ -901,7 +950,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-linkCarrierAccount',
         '/shipping/v2/carrierAccounts/{carrierId}', 'PUT',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-linkCarrierAccount')
       );
     }
 
@@ -962,7 +1011,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-linkCarrierAccount_0',
         '/shipping/v2/carrierAccounts/{carrierId}', 'POST',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-linkCarrierAccount_0')
       );
     }
 
@@ -1016,7 +1065,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-oneClickShipment',
         '/shipping/v2/oneClickShipment', 'POST',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-oneClickShipment')
       );
     }
 
@@ -1071,7 +1120,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-purchaseShipment',
         '/shipping/v2/shipments', 'POST',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-purchaseShipment')
       );
     }
 
@@ -1125,7 +1174,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-submitNdrFeedback',
         '/shipping/v2/ndrFeedback', 'POST',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-submitNdrFeedback')
       );
     }
 
@@ -1185,7 +1234,7 @@ export class ShippingApi {
       return this.apiClient.callApi( 'ShippingApi-unlinkCarrierAccount',
         '/shipping/v2/carrierAccounts/{carrierId}/unlink', 'PUT',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('ShippingApi-unlinkCarrierAccount')
       );
     }
 

package/src/solicitations_v1/ApiClient.js

@@ -11,12 +11,11 @@
  *
  */
 
-import superagent from "superagent";
-import querystring from "querystring";
-import { URL } from 'node:url';
-import { RateLimitConfiguration } from "../../helper/RateLimitConfiguration.mjs";
-import { SuperagentRateLimiter } from "../../helper/SuperagentRateLimiter.mjs";
-import { DefaultRateLimitFetcher } from "../../helper/DefaultRateLimitFetcher.mjs";
+import superagent from 'superagent';
+import querystring from 'querystring';
+import {URL} from 'node:url';
+import {RateLimitConfiguration} from '../../helper/RateLimitConfiguration.mjs';
+import {SuperagentRateLimiter} from '../../helper/SuperagentRateLimiter.mjs';
 
 /**
 * @module solicitations_v1/ApiClient
@@ -193,9 +192,8 @@ export class ApiClient {
     #tokenForApiCall = null;
     #lwaClient = null;
     #rdtClient = null;
-    #defaultRateLimitFetcher = null;
-    #customizedRateLimiter = null;
-    #useDefaultRateLimiter = false;
+    #customizedRateLimiterMap = null;
+    #useRateLimiter = true;
 
     /**
     * Constructs a new ApiClient.
@@ -259,42 +257,54 @@ export class ApiClient {
          * Allow user to override superagent agent
          */
          this.requestAgent = null;
+
+         /*
+         * Initialize customized rate limiter map
+         */
+        this.#customizedRateLimiterMap = new Map();
     }
 
     /**
-    * Initialize #defaultRateLimitFetcher
+    * Set customized rate limiter for one operation
+    * For operations that customized rate limiter are not set
+    * Will use default rate limiter
+    * @param {String} operationName
+    * @param {RateLimitConfiguration} config
     */
-    async initializeDefaultRateLimit() {
-        try {
-            this.#defaultRateLimitFetcher = await DefaultRateLimitFetcher.getInstance();
-        } catch (err) {
-            throw new Error('Error reading default rate limit:', err);
-        } 
+    setCustomizedRateLimiterForOperation(operationName, config) {
+        this.#customizedRateLimiterMap.set(operationName, new SuperagentRateLimiter(config));
     }
 
     /**
-    * Enable default rate limiter
+    * Disable customized rate limiter for one operation
+    * Fall back to default rate limiter
+    * @param {String} operationName
     */
-    enableDefaultRateLimiter() {
-        this.#useDefaultRateLimiter = true;
-        this.#customizedRateLimiter = null;
+    disableCustomizedRatelimiterForOperation(operationName) {
+        this.#customizedRateLimiterMap.delete(operationName);
     }
 
     /**
-    * Set customized rate limiter
-    * @param {RateLimitConfiguration} config
+    * Clear customized rate limiter for all operations
+    * All operations will fall back to default rate limiter
+    * @param {String} operationName
+    */
+    disableCustomizedRatelimiterForAll() {
+        this.#customizedRateLimiterMap.clear();
+    }
+
+    /**
+    * Disable both default and customized rate limiter for all operations
     */
-    enableCustomizedRateLimiter(config) {
-        this.#customizedRateLimiter = new SuperagentRateLimiter(config);
-        this.#useDefaultRateLimiter = false;
+    disableRateLimiter() {
+        this.#useRateLimiter = false;
     }
 
     /**
-    * Disable both customized and default rate limiter
+    * Enable default or customized rate limiter for all operations
     */
-    disableRatelimiter() {
-        this.#customizedRateLimiter = null;
-        this.defaultRateLimiter = false;
+    enableRateLimiter() {
+        this.#useRateLimiter = true;
     }
 
     /**
@@ -597,11 +607,12 @@ export class ApiClient {
     * @param {Array<String>} accepts An array of acceptable response MIME types.
     * @param {(String|Array|ObjectFunction)} returnType The required type to return; can be a string for simple types or the
     * constructor for a complex type.
+    * @param {SuperagentRateLimiter} defaultRateLimiter The default rate limiter. 
     * @returns {Promise} A {@link https://www.promisejs.org/|Promise} object.
     */
     async callApi(operation, path, httpMethod, pathParams,
         queryParams, headerParams, formParams, bodyParam, contentTypes, accepts,
-        returnType) {
+        returnType, defaultRateLimiter) {
 
         var url = this.buildUrl(path, pathParams);
         var request = superagent(httpMethod, url);
@@ -609,15 +620,14 @@ export class ApiClient {
             throw new Error('none of accessToken, RDT token and auto-retrieval is set.');
         }
 
-        //Set rate limiter
-        if (this.#useDefaultRateLimiter) {
-            await this.initializeDefaultRateLimit();
-            const defaultRateLimiter = new SuperagentRateLimiter(this.#defaultRateLimitFetcher.getLimit(operation));
-            request.use(defaultRateLimiter.getPlugin());
-        } else if (this.#customizedRateLimiter) {
-            request.use(this.#customizedRateLimiter.getPlugin());
+        if (this.#useRateLimiter) {
+            //Set rate limiter
+            if (this.#customizedRateLimiterMap.get(operation)) {
+                request.use(this.#customizedRateLimiterMap.get(operation).getPlugin());
+            } else if (defaultRateLimiter) {
+                request.use(defaultRateLimiter.getPlugin());
+            }
         }
-        
 
         // set query parameters
         if (httpMethod.toUpperCase() === 'GET' && this.cache === false) {

package/src/solicitations_v1/api/SolicitationsApi.js

@@ -11,9 +11,11 @@
  *
  */
 
-import {ApiClient} from "../ApiClient.js";
+import {ApiClient} from '../ApiClient.js';
 import {CreateProductReviewAndSellerFeedbackSolicitationResponse} from '../model/CreateProductReviewAndSellerFeedbackSolicitationResponse.js';
 import {GetSolicitationActionsForOrderResponse} from '../model/GetSolicitationActionsForOrderResponse.js';
+import {SuperagentRateLimiter} from '../../../helper/SuperagentRateLimiter.mjs';
+import {DefaultRateLimitFetcher} from '../../../helper/DefaultRateLimitFetcher.mjs';
 
 /**
 * Solicitations service.
@@ -22,6 +24,9 @@ import {GetSolicitationActionsForOrderResponse} from '../model/GetSolicitationAc
 */
 export class SolicitationsApi {
 
+    // Private memeber stores the default rate limiters
+    #defaultRateLimiterMap;
+
     /**
     * Constructs a new SolicitationsApi. 
     * @alias module:solicitations_v1/api/SolicitationsApi
@@ -31,6 +36,32 @@ export class SolicitationsApi {
     */
     constructor(apiClient) {
         this.apiClient = apiClient || ApiClient.instance;
+        this.initializeDefaultRateLimiterMap();
+    }
+
+    /**
+     * Initialize rate limiters for API operations
+     */
+    initializeDefaultRateLimiterMap() {
+        this.#defaultRateLimiterMap = new Map()
+        const defaultRateLimitFetcher = new DefaultRateLimitFetcher();
+        const operations = [
+            'SolicitationsApi-createProductReviewAndSellerFeedbackSolicitation',
+            'SolicitationsApi-getSolicitationActionsForOrder',
+        ];
+
+        for (const operation of operations) {
+            const config = defaultRateLimitFetcher.getLimit(operation);
+            this.#defaultRateLimiterMap.set(operation, new SuperagentRateLimiter(config));
+        }
+    }
+
+    /**
+     * Get rate limiter for a specific operation
+     * @param {String} operation name
+     */
+    getRateLimiter(operation) {
+        return this.#defaultRateLimiterMap.get(operation);
     }
 
 
@@ -73,7 +104,7 @@ export class SolicitationsApi {
       return this.apiClient.callApi( 'SolicitationsApi-createProductReviewAndSellerFeedbackSolicitation',
         '/solicitations/v1/orders/{amazonOrderId}/solicitations/productReviewAndSellerFeedback', 'POST',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('SolicitationsApi-createProductReviewAndSellerFeedbackSolicitation')
       );
     }
 
@@ -129,7 +160,7 @@ export class SolicitationsApi {
       return this.apiClient.callApi( 'SolicitationsApi-getSolicitationActionsForOrder',
         '/solicitations/v1/orders/{amazonOrderId}', 'GET',
         pathParams, queryParams, headerParams, formParams, postBody,
-        contentTypes, accepts, returnType
+        contentTypes, accepts, returnType, this.getRateLimiter('SolicitationsApi-getSolicitationActionsForOrder')
       );
     }
 

package/src/supplysources_v2020_07_01/ApiClient.js

@@ -11,12 +11,11 @@
  *
  */
 
-import superagent from "superagent";
-import querystring from "querystring";
-import { URL } from 'node:url';
-import { RateLimitConfiguration } from "../../helper/RateLimitConfiguration.mjs";
-import { SuperagentRateLimiter } from "../../helper/SuperagentRateLimiter.mjs";
-import { DefaultRateLimitFetcher } from "../../helper/DefaultRateLimitFetcher.mjs";
+import superagent from 'superagent';
+import querystring from 'querystring';
+import {URL} from 'node:url';
+import {RateLimitConfiguration} from '../../helper/RateLimitConfiguration.mjs';
+import {SuperagentRateLimiter} from '../../helper/SuperagentRateLimiter.mjs';
 
 /**
 * @module supplysources_v2020_07_01/ApiClient
@@ -193,9 +192,8 @@ export class ApiClient {
     #tokenForApiCall = null;
     #lwaClient = null;
     #rdtClient = null;
-    #defaultRateLimitFetcher = null;
-    #customizedRateLimiter = null;
-    #useDefaultRateLimiter = false;
+    #customizedRateLimiterMap = null;
+    #useRateLimiter = true;
 
     /**
     * Constructs a new ApiClient.
@@ -259,42 +257,54 @@ export class ApiClient {
          * Allow user to override superagent agent
          */
          this.requestAgent = null;
+
+         /*
+         * Initialize customized rate limiter map
+         */
+        this.#customizedRateLimiterMap = new Map();
     }
 
     /**
-    * Initialize #defaultRateLimitFetcher
+    * Set customized rate limiter for one operation
+    * For operations that customized rate limiter are not set
+    * Will use default rate limiter
+    * @param {String} operationName
+    * @param {RateLimitConfiguration} config
     */
-    async initializeDefaultRateLimit() {
-        try {
-            this.#defaultRateLimitFetcher = await DefaultRateLimitFetcher.getInstance();
-        } catch (err) {
-            throw new Error('Error reading default rate limit:', err);
-        } 
+    setCustomizedRateLimiterForOperation(operationName, config) {
+        this.#customizedRateLimiterMap.set(operationName, new SuperagentRateLimiter(config));
     }
 
     /**
-    * Enable default rate limiter
+    * Disable customized rate limiter for one operation
+    * Fall back to default rate limiter
+    * @param {String} operationName
     */
-    enableDefaultRateLimiter() {
-        this.#useDefaultRateLimiter = true;
-        this.#customizedRateLimiter = null;
+    disableCustomizedRatelimiterForOperation(operationName) {
+        this.#customizedRateLimiterMap.delete(operationName);
     }
 
     /**
-    * Set customized rate limiter
-    * @param {RateLimitConfiguration} config
+    * Clear customized rate limiter for all operations
+    * All operations will fall back to default rate limiter
+    * @param {String} operationName
+    */
+    disableCustomizedRatelimiterForAll() {
+        this.#customizedRateLimiterMap.clear();
+    }
+
+    /**
+    * Disable both default and customized rate limiter for all operations
     */
-    enableCustomizedRateLimiter(config) {
-        this.#customizedRateLimiter = new SuperagentRateLimiter(config);
-        this.#useDefaultRateLimiter = false;
+    disableRateLimiter() {
+        this.#useRateLimiter = false;
     }
 
     /**
-    * Disable both customized and default rate limiter
+    * Enable default or customized rate limiter for all operations
     */
-    disableRatelimiter() {
-        this.#customizedRateLimiter = null;
-        this.defaultRateLimiter = false;
+    enableRateLimiter() {
+        this.#useRateLimiter = true;
     }
 
     /**
@@ -597,11 +607,12 @@ export class ApiClient {
     * @param {Array<String>} accepts An array of acceptable response MIME types.
     * @param {(String|Array|ObjectFunction)} returnType The required type to return; can be a string for simple types or the
     * constructor for a complex type.
+    * @param {SuperagentRateLimiter} defaultRateLimiter The default rate limiter. 
     * @returns {Promise} A {@link https://www.promisejs.org/|Promise} object.
     */
     async callApi(operation, path, httpMethod, pathParams,
         queryParams, headerParams, formParams, bodyParam, contentTypes, accepts,
-        returnType) {
+        returnType, defaultRateLimiter) {
 
         var url = this.buildUrl(path, pathParams);
         var request = superagent(httpMethod, url);
@@ -609,15 +620,14 @@ export class ApiClient {
             throw new Error('none of accessToken, RDT token and auto-retrieval is set.');
         }
 
-        //Set rate limiter
-        if (this.#useDefaultRateLimiter) {
-            await this.initializeDefaultRateLimit();
-            const defaultRateLimiter = new SuperagentRateLimiter(this.#defaultRateLimitFetcher.getLimit(operation));
-            request.use(defaultRateLimiter.getPlugin());
-        } else if (this.#customizedRateLimiter) {
-            request.use(this.#customizedRateLimiter.getPlugin());
+        if (this.#useRateLimiter) {
+            //Set rate limiter
+            if (this.#customizedRateLimiterMap.get(operation)) {
+                request.use(this.#customizedRateLimiterMap.get(operation).getPlugin());
+            } else if (defaultRateLimiter) {
+                request.use(defaultRateLimiter.getPlugin());
+            }
         }
-        
 
         // set query parameters
         if (httpMethod.toUpperCase() === 'GET' && this.cache === false) {