Merge pull request #72 from cashy-at/fix/request-throttling

Fix request throttling
storyblok · May 23, 2024 · 505356a · 505356a
2 parents 8a3c914 + dfc0dcd
commit 505356a
Showing 1 changed file with 34 additions and 14 deletions.
diff --git a/src/utils/api.js b/src/utils/api.js
@@ -14,22 +14,42 @@ export default {
   spaceId: null,
   region: '',
 
-  getClient () {
-    const { region } = creds.get()
+  getClient: (function () {
+    let client, accessToken, oauthToken, region, credsRegion
+
+    return function getClient() {
+      const { region: _credsRegion } = creds.get()
+
+      // cache the client if the params are the same
+      // this is needed so request throttling works properly
+      if (
+        client
+        && accessToken === this.accessToken
+        && oauthToken === this.oauthToken
+        && region === this.region
+        && credsRegion === _credsRegion) {
+        return client
+      }
 
-    try {
-      return new Storyblok({
-        accessToken: this.accessToken,
-        oauthToken: this.oauthToken,
-        region: this.region,
-        headers: {
-          ...DEFAULT_AGENT
-        }
-      }, this.apiSwitcher(region))
-    } catch (error) {
-      throw new Error(error)
+      accessToken = this.accessToken
+      oauthToken = this.oauthToken
+      region = this.region
+      credsRegion = _credsRegion
+
+      try {
+        return client = new Storyblok({
+          accessToken,
+          oauthToken,
+          region,
+          headers: {
+            ...DEFAULT_AGENT
+          }
+        }, this.apiSwitcher(credsRegion))
+      } catch (error) {
+        throw new Error(error)
+      }
     }
-  },
+  })(),
 
   getPath (path) {
     if (this.spaceId) {