jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make ratelimiter actually match, return time to reset on hitting ratelimit

Browse Source
This commit is contained in:
Andrew Zhu
2018-05-25 01:39:35 -07:00
parent b20d086a24
commit bbf42aaf97
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rpg-docs/Routes/API.js
View File

@@ -44,9 +44,11 @@ var ifKeyValid = function(apiKey, response, method, callback){
} else if (!isKeyValid(apiKey)){ } else if (!isKeyValid(apiKey)){
response.writeHead(403, "API key is invalid"); response.writeHead(403, "API key is invalid");
response.end(); response.end();
} else if (isRateLimited(apiKey)){ } else if (isRateLimited(apiKey, method)){
response.writeHead(429, "Too many requests"); response.writeHead(429, "Too many requests");
response.end(); response.end(JSON.stringify({
"timeToReset": rateLimiter.check({apiKey: apiKey, method: method}).timeToReset
}));
} else { } else {
rateLimiter.increment({apiKey: apiKey, method: method}) rateLimiter.increment({apiKey: apiKey, method: method})
callback(); callback();
@@ -66,8 +68,8 @@ rateLimiter.addRule({apiKey: String, method: "vmixCharacter"}, 2, 10000);
rateLimiter.addRule({apiKey: String, method: "vmixParty"}, 2, 10000); rateLimiter.addRule({apiKey: String, method: "vmixParty"}, 2, 10000);
rateLimiter.addRule({apiKey: String, method: "jsonCharacterSheet"}, 5, 5000); rateLimiter.addRule({apiKey: String, method: "jsonCharacterSheet"}, 5, 5000);
var isRateLimited = function(apiKey){ var isRateLimited = function(apiKey, method){
const limited = !rateLimiter.check({apiKey}).allowed const limited = !rateLimiter.check({apiKey: apiKey, method: method}).allowed
if (limited) { if (limited) {
console.log(`Rate limit hit by API key ${apiKey}`); console.log(`Rate limit hit by API key ${apiKey}`);
return true; return true;