move bottleneck to app file

Author: michelle0927

components/hubspot/hubspot.app.mjs

@@ -13,6 +13,12 @@ import {
   DEFAULT_PRODUCT_PROPERTIES,
   DEFAULT_LINE_ITEM_PROPERTIES,
 } from "./common/constants.mjs";
+import Bottleneck from "bottleneck";
+const limiter = new Bottleneck({
+  minTime: 250, // 4 requests per second
+  maxConcurrent: 1,
+});
+const axiosRateLimiter = limiter.wrap(axios);
 
 export default {
   type: "app",
@@ -473,7 +479,7 @@ export default {
       params,
       ...otherOpts
     }) {
-      return axios($, {
+      return axiosRateLimiter($, {
         url: `${BASE_URL}${api}${endpoint}`,
         headers: this._getHeaders(),
         data: data && this.trimStringValues(data),

components/hubspot/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/hubspot",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "Pipedream Hubspot Components",
   "main": "hubspot.app.mjs",
   "keywords": [

components/hubspot/sources/common/common.mjs

@@ -1,5 +1,4 @@
 import hubspot from "../../hubspot.app.mjs";
-import Bottleneck from "bottleneck";
 import { DEFAULT_POLLING_SOURCE_TIMER_INTERVAL } from "@pipedream/platform";
 
 export default {
@@ -14,14 +13,6 @@ export default {
     },
   },
   methods: {
-    _limiter() {
-      return new Bottleneck({
-        minTime: 250, // max 4 requests per second
-      });
-    },
-    async _requestWithLimiter(limiter, resourceFn, params) {
-      return limiter.schedule(async () => await resourceFn(params));
-    },
     _getAfter() {
       return this.db.get("after") || new Date().setDate(new Date().getDate() - 1); // 1 day ago
     },
@@ -76,9 +67,8 @@ export default {
     async paginate(params, resourceFn, resultType = null, after = null) {
       let results = null;
       let maxTs = after || 0;
-      const limiter = this._limiter();
       while (!results || params.after) {
-        results = await this._requestWithLimiter(limiter, resourceFn, params);
+        results = await resourceFn(params);
         if (results.paging) {
           params.after = results.paging.next.after;
         } else {
@@ -114,10 +104,9 @@ export default {
       let results, items;
       let count = 0;
       let maxTs = after || 0;
-      const limiter = this._limiter();
       while (hasMore && (!limitRequest || count < limitRequest)) {
         count++;
-        results = await this._requestWithLimiter(limiter, resourceFn, params);
+        results = await resourceFn(params);
         hasMore = results.hasMore;
         if (hasMore) {
           params.offset = results.offset;