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

Added option to count rate limits as errors

Browse Source 
`options.rate_limit_as_error`
This commit is contained in:
Amish Shah
2015-12-16 18:51:32 +00:00
parent 470fbbb6d6
commit b82c318e96
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Client/Client.js
View File

@@ -46,6 +46,7 @@ var Client = (function (_EventEmitter) {
this.options = options || {}; this.options = options || {};
this.options.compress = options.compress || true; this.options.compress = options.compress || true;
this.options.revive = options.revive || false; this.options.revive = options.revive || false;
this.options.rate_limit_as_error = options.rate_limit_as_error || false;
this.internal = new _InternalClient2["default"](this); this.internal = new _InternalClient2["default"](this);
} }

4
lib/Client/InternalClient.js
View File

@@ -133,11 +133,11 @@ var InternalClient = (function () {
ret.end(function (error, data) { ret.end(function (error, data) {
if (error) { if (error) {
error.response.error.status = 429; error.response.error.status = 429;
if (error.response && error.response.error && error.response.error.status && error.response.error.status === 429) { if (!_this.client.options.rate_limit_as_error && error.response && error.response.error && error.response.error.status && error.response.error.status === 429) {
if (data.headers["retry-after"] || data.headers["Retry-After"]) { if (data.headers["retry-after"] || data.headers["Retry-After"]) {
var toWait = data.headers["retry-after"] || data.headers["Retry-After"]; var toWait = data.headers["retry-after"] || data.headers["Retry-After"];
toWait = parseInt(toWait); toWait = parseInt(toWait);
console.log("waiting for", toWait);
setTimeout(function () { setTimeout(function () {
_this.apiRequest.apply(_this, _arguments).then(resolve)["catch"](reject); _this.apiRequest.apply(_this, _arguments).then(resolve)["catch"](reject);
}, toWait); }, toWait);

1
src/Client/Client.js
View File

@@ -21,6 +21,7 @@ export default class Client extends EventEmitter {
this.options = options || {}; this.options = options || {};
this.options.compress = options.compress || true; this.options.compress = options.compress || true;
this.options.revive = options.revive || false; this.options.revive = options.revive || false;
this.options.rate_limit_as_error = options.rate_limit_as_error || false;
this.internal = new InternalClient(this); this.internal = new InternalClient(this);
} }

9
src/Client/InternalClient.js
View File

@@ -66,7 +66,13 @@ export default class InternalClient {
ret.end((error, data) => { ret.end((error, data) => {
if (error) { if (error) {
error.response.error.status = 429; error.response.error.status = 429;
if (error.response && error.response.error && error.response.error.status && error.response.error.status === 429) { if (!this.client.options.rate_limit_as_error &&
error.response &&
error.response.error &&
error.response.error.status
&& error.response.error.status === 429
) {
if(data.headers["retry-after"] || data.headers["Retry-After"]){ if(data.headers["retry-after"] || data.headers["Retry-After"]){
var toWait = data.headers["retry-after"] || data.headers["Retry-After"]; var toWait = data.headers["retry-after"] || data.headers["Retry-After"];
toWait = parseInt(toWait); toWait = parseInt(toWait);
@@ -76,6 +82,7 @@ export default class InternalClient {
} else { } else {
return reject(error); return reject(error);
} }
} else { } else {
return reject(error); return reject(error);
} }