mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-17 20:13:30 +01:00
Add rateLimit event (#2019)
* add ratelimited event * add some useful props * death * more death * Update tester1000.js * Update RequestHandler.js
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
const DiscordAPIError = require('../DiscordAPIError');
|
const DiscordAPIError = require('../DiscordAPIError');
|
||||||
|
const { Events: { RATE_LIMIT } } = require('../../util/Constants');
|
||||||
|
|
||||||
class RequestHandler {
|
class RequestHandler {
|
||||||
constructor(manager, handler) {
|
constructor(manager, handler) {
|
||||||
@@ -29,9 +30,35 @@ class RequestHandler {
|
|||||||
execute(item) {
|
execute(item) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const finish = timeout => {
|
const finish = timeout => {
|
||||||
// eslint-disable-next-line prefer-promise-reject-errors
|
if (timeout || this.limited) {
|
||||||
if (timeout || this.limited) reject({ timeout, limited: this.limited });
|
if (!timeout) {
|
||||||
else resolve();
|
timeout = this.resetTime - Date.now() + this.timeDifference + this.client.options.restTimeOffset;
|
||||||
|
}
|
||||||
|
// eslint-disable-next-line prefer-promise-reject-errors
|
||||||
|
reject({ timeout });
|
||||||
|
if (this.client.listenerCount(RATE_LIMIT)) {
|
||||||
|
/**
|
||||||
|
* Emitted when the client hits a rate limit while making a request
|
||||||
|
* @event Client#rateLimit
|
||||||
|
* @prop {number} timeout Timeout in ms
|
||||||
|
* @prop {number} limit Number of requests that can be made to this endpoint
|
||||||
|
* @prop {number} timeDifference Delta-T in ms between your system and Discord servers
|
||||||
|
* @prop {string} method HTTP method used for request that triggered this event
|
||||||
|
* @prop {string} path Path used for request that triggered this event
|
||||||
|
* @prop {string} route Route used for request that triggered this event
|
||||||
|
*/
|
||||||
|
this.client.emit(RATE_LIMIT, {
|
||||||
|
timeout,
|
||||||
|
limit: this.limit,
|
||||||
|
timeDifference: this.timeDifference,
|
||||||
|
method: item.request.method,
|
||||||
|
path: item.request.path,
|
||||||
|
route: item.request.route,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
resolve();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
item.request.gen().end((err, res) => {
|
item.request.gen().end((err, res) => {
|
||||||
if (res && res.headers) {
|
if (res && res.headers) {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ module.exports = function burst() {
|
|||||||
this.client.setTimeout(() => {
|
this.client.setTimeout(() => {
|
||||||
this.reset();
|
this.reset();
|
||||||
this.handle();
|
this.handle();
|
||||||
}, timeout || (this.resetTime - Date.now() + this.timeDifference + this.client.options.restTimeOffset));
|
}, timeout);
|
||||||
});
|
});
|
||||||
this.remaining--;
|
this.remaining--;
|
||||||
this.handle();
|
this.handle();
|
||||||
|
|||||||
@@ -11,6 +11,6 @@ module.exports = function sequential() {
|
|||||||
this.reset();
|
this.reset();
|
||||||
this.busy = false;
|
this.busy = false;
|
||||||
this.handle();
|
this.handle();
|
||||||
}, timeout || (this.resetTime - Date.now() + this.timeDifference + this.client.options.restTimeOffset));
|
}, timeout);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -194,6 +194,7 @@ exports.VoiceOPCodes = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
exports.Events = {
|
exports.Events = {
|
||||||
|
RATE_LIMIT: 'rateLimit',
|
||||||
READY: 'ready',
|
READY: 'ready',
|
||||||
RESUMED: 'resumed',
|
RESUMED: 'resumed',
|
||||||
GUILD_CREATE: 'guildCreate',
|
GUILD_CREATE: 'guildCreate',
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ client.on('debug', log);
|
|||||||
client.on('ready', () => {
|
client.on('ready', () => {
|
||||||
log('READY', client.user.tag, client.user.id);
|
log('READY', client.user.tag, client.user.id);
|
||||||
});
|
});
|
||||||
|
client.on('rateLimit', log);
|
||||||
|
|
||||||
const commands = {
|
const commands = {
|
||||||
eval: message => {
|
eval: message => {
|
||||||
|
|||||||
Reference in New Issue
Block a user