Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-19 04:53:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add 429 handling back into Sequential Handler

Browse Source
This commit is contained in:
Amish Shah
2016-08-19 18:47:37 +01:00
parent fd64fb0a82
commit f012655e53
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/client/rest/RequestHandlers/Sequential.js
View File

@@ -45,9 +45,17 @@ module.exports = class SequentialRequestHandler extends RequestHandler {
this.timeDifference = Date.now() - new Date(res.headers.date).getTime(); this.timeDifference = Date.now() - new Date(res.headers.date).getTime();
} }
if (err) { if (err) {
this.waiting = false; if (err.status === 429) {
item.reject(err); setTimeout(() => {
reject(err); this.waiting = false;
resolve();
}, res.headers['retry-after']);
} else {
this.queue.shift();
this.waiting = false;
item.reject(err);
resolve(err);
}
} else { } else {
this.queue.shift(); this.queue.shift();
const data = res && res.body ? res.body : {}; const data = res && res.body ? res.body : {};
@@ -56,7 +64,7 @@ module.exports = class SequentialRequestHandler extends RequestHandler {
setTimeout(() => { setTimeout(() => {
this.waiting = false; this.waiting = false;
resolve(data); resolve(data);
}, (this.requestResetTime - Date.now()) + this.timeDifference + 1000); }, (this.requestResetTime - Date.now()) + this.timeDifference - 1000);
} else { } else {
this.waiting = false; this.waiting = false;
resolve(data); resolve(data);
@@ -74,6 +82,6 @@ module.exports = class SequentialRequestHandler extends RequestHandler {
this.waiting = true; this.waiting = true;
const item = this.queue[0]; const item = this.queue[0];
this.execute(item).then(() => this.handle()).catch(console.log); this.execute(item).then(() => this.handle());
} }
}; };