updated the way rate limits are set (#439)

Co-authored-by: Iulian Masar <[email protected]>

Author: iulian03

Diff for: lib/api.js

@@ -337,62 +337,42 @@ Api.prototype = {
 };
 
 function setRateLimits(self, headers) {
-    if (self.rateLimits === undefined || self.rateLimits.length === 0) {
-        self.rateLimits = [
-            {
-                minutesInterval: 15,
-                callsMade: 0,
-                callsRemaining: 0,
-                resetTimeMillis: 0
-            },
-            {
-                minutesInterval: 30,
-                callsMade: 0,
-                callsRemaining: 0,
-                resetTimeMillis: 0
-            },
-            {
-                minutesInterval: 60,
-                callsMade: 0,
-                callsRemaining: 0,
-                resetTimeMillis: 0
-            },
-            {
-                minutesInterval: 24 * 60,
-                callsMade: 0,
-                callsRemaining: 0,
-                resetTimeMillis: 0
-            }
-        ];
-    }
-
+    self.rateLimits = [];
     if (headers !== undefined) {
-        try {
-            if (headers['x-ratelimit'] !== undefined && headers['x-ratelimit'].split(', ').length > 0) {
-                const rateLimit = headers['x-ratelimit'].split(', ').map(Number);
-                self.rateLimits[0].callsMade = rateLimit[0];
-                self.rateLimits[1].callsMade = rateLimit[1];
-                self.rateLimits[2].callsMade = rateLimit[2];
-                self.rateLimits[3].callsMade = rateLimit[3];
-            }
-
-            if (headers['x-ratelimit-remaining'] !== undefined && headers['x-ratelimit-remaining'].split(', ').length > 0) {
-                const remaining = headers['x-ratelimit-remaining'].split(', ').map(Number);
-                self.rateLimits[0].callsRemaining = remaining[0];
-                self.rateLimits[1].callsRemaining = remaining[1];
-                self.rateLimits[2].callsRemaining = remaining[2];
-                self.rateLimits[3].callsRemaining = remaining[3];
-            }
+        let rateLimitReset = headers['x-ratelimit-reset'];
+        let rateLimitRemaining = headers['x-ratelimit-remaining'];
+        let rateLimitMade = headers['x-ratelimit'];
+
+        if (rateLimitReset !== undefined && rateLimitRemaining !== undefined && rateLimitMade !== undefined) {
+            rateLimitReset = rateLimitReset.split(",");
+            rateLimitRemaining = rateLimitRemaining.split(",");
+            rateLimitMade = rateLimitMade.split(",");
+
+            if (rateLimitReset.length === rateLimitRemaining.length && rateLimitReset.length === rateLimitMade.length) {
+                const currentTime = Math.floor(Date.now() / 1000);
+                for (let i = 0; i < rateLimitReset.length; i++) {
+                    const numberOfMinutes = (parseInt(rateLimitReset[i]) - currentTime) / 60;
+                    const rateLimit = {
+                        resetTimeMillis: parseInt(rateLimitReset[i]),
+                        callsRemaining: parseInt(rateLimitRemaining[i]),
+                        callsMade: parseInt(rateLimitMade[i])
+                    };
+
+                    if (numberOfMinutes <= 15) {
+                        rateLimit.minutesInterval = 15;
+                    } else if (numberOfMinutes <= 30) {
+                        rateLimit.minutesInterval = 30;
+                    } else if (numberOfMinutes <= 60) {
+                        rateLimit.minutesInterval = 60;
+                    } else if (numberOfMinutes <= 60 * 24) {
+                        rateLimit.minutesInterval = 60 * 24;
+                    }
 
-            if (headers['x-ratelimit-reset'] !== undefined && headers['x-ratelimit-reset'].split(', ').length > 0) {
-                const limitReset = headers['x-ratelimit-reset'].split(', ').map(Number);
-                self.rateLimits[0].resetTimeMillis = limitReset[0];
-                self.rateLimits[1].resetTimeMillis = limitReset[1];
-                self.rateLimits[2].resetTimeMillis = limitReset[2];
-                self.rateLimits[3].resetTimeMillis = limitReset[3];
+                    self.rateLimits.push(rateLimit);
+                }
+            } else {
+                console.log("Could not set rate limits: headers length should be the same");
             }
-        } catch (exception) {
-            console.log("Something went wrong while parsing rate limits.");
         }
     }
 }