seyfert 3.2.4-dev-15814841418.0 → 3.2.4-dev-15826459558.0

package/lib/api/api.js

@@ -238,16 +238,17 @@ class ApiHandler {
     async handle429(route, method, url, request, response, result, next, reject, now) {
         await this.onRatelimit?.(response, request);
         const content = `${JSON.stringify(request)} `;
-        let retryAfter = Number(response.headers.get('x-ratelimit-reset-after') || response.headers.get('retry-after')) * 1000;
+        let retryAfter;
+        const data = JSON.parse(result);
+        if (data.retry_after)
+            retryAfter = Math.ceil(data.retry_after * 1000);
+        retryAfter ??=
+            Number(response.headers.get('x-ratelimit-reset-after') || response.headers.get('retry-after')) * 1000;
         if (Number.isNaN(retryAfter)) {
-            try {
-                retryAfter = JSON.parse(result).retry_after * 1000;
-            }
-            catch (err) {
-                this.debugger?.warn(`Unexpected error: ${err}`);
-                reject(err);
-                return false;
-            }
+            this.debugger?.warn(`${route} Could not extract retry_after from 429 response. ${result}`);
+            next();
+            reject(new Error('Could not extract retry_after from 429 response.'));
+            return false;
         }
         this.debugger?.info(`${response.headers.get('x-ratelimit-global') ? 'Global' : 'Unexpected'} 429: ${result.slice(0, 256)}\n${content} ${now} ${route} ${response.status}: ${this.ratelimits.get(route).remaining}/${this.ratelimits.get(route).limit} left | Reset ${retryAfter} (${this.ratelimits.get(route).reset - now}ms left) | Scope ${response.headers.get('x-ratelimit-scope')}`);
         if (retryAfter) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "3.2.4-dev-15814841418.0",
+	"version": "3.2.4-dev-15826459558.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",