Fixed broken ratelimit middleware
This commit is contained in:
@@ -1,22 +1,23 @@
|
|||||||
import {Logger} from './logger';
|
import {Logger} from './logger';
|
||||||
|
|
||||||
let buckets = { };
|
let buckets = { };
|
||||||
|
let requestsPerSecond = 0.2;
|
||||||
|
|
||||||
export class RateLimits {
|
export class RateLimits {
|
||||||
constructor() {
|
constructor() {
|
||||||
Logger.info('Initialized ratelimiting middleware');
|
Logger.info('Initialized ratelimiting middleware');
|
||||||
this.requestsPerSecond = 1;
|
setInterval(this.tick, 1000 / requestsPerSecond);
|
||||||
setInterval(this.tick, 1000 / this.requestsPerSecond);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async request(obj, client, next) {
|
async request(obj, client, next) {
|
||||||
let id = obj.author.id;
|
let id = obj.author.id;
|
||||||
|
if (id == client.user.id) { return; }
|
||||||
|
|
||||||
if (!buckets[id]) {
|
if (!buckets[id]) {
|
||||||
Logger.debug(`New rate limiting bucket`);
|
Logger.debug(`New rate limiting bucket`);
|
||||||
|
|
||||||
buckets[id] = {id: id, tokens: [], lastUsed: new Date().getTime()};
|
buckets[id] = {id: id, tokens: [], lastUsed: new Date().getTime()};
|
||||||
for (let i = 0; i < this.requestsPerSecond; i++) {
|
for (let i = 0; i < requestsPerSecond; i++) {
|
||||||
buckets[id].tokens.push(1);
|
buckets[id].tokens.push(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -25,25 +26,24 @@ export class RateLimits {
|
|||||||
}
|
}
|
||||||
|
|
||||||
buckets[id].lastUsed = new Date().getTime();
|
buckets[id].lastUsed = new Date().getTime();
|
||||||
|
|
||||||
|
Logger.debug(buckets[id].tokens.length);
|
||||||
if (buckets[id].tokens.length <= 0) {
|
if (buckets[id].tokens.length <= 0) {
|
||||||
Logger.middleware(`${id} is being rate limited`);
|
Logger.middleware(`${id} is being rate limited`);
|
||||||
obj.limiting = true;
|
obj.limiting = true;
|
||||||
next();
|
next();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
buckets[id].tokens.pop();
|
buckets[id].tokens.pop();
|
||||||
next();
|
next();
|
||||||
}
|
}
|
||||||
|
|
||||||
tick() {
|
tick() {
|
||||||
for (let bucket in buckets) {
|
for (let bucket in buckets) {
|
||||||
// if (buckets[bucket].lastUsed += disposeTime >= new Date().getTime()) {
|
if (buckets[bucket].tokens.length > requestsPerSecond) {
|
||||||
// delete buckets[bucket]; // remove element here, don't redefine
|
continue;
|
||||||
// continue;
|
}
|
||||||
// }
|
|
||||||
if (buckets[bucket].tokens.length > this.requestsPerSecond) continue;
|
|
||||||
buckets[bucket].tokens.push(1);
|
buckets[bucket].tokens.push(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user