eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-04 04:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(api): do sliding window rate limiting correctly (hopefully)

Browse source
This commit is contained in:
alyssa 2024-09-27 16:57:32 +09:00
parent 873643153d
commit 21d647f423
2 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
services/api/src/middleware/ratelimit.lua
View file

@ -2,13 +2,11 @@
-- redis.replicate_commands()
local rate_limit_key = KEYS[1]
local burst = ARGV[1]
local rate = ARGV[2]
local period = ARGV[3]
local rate = ARGV[1]
local period = ARGV[2]
local cost = tonumber(ARGV[3])
-- we're only ever asking for 1 request at a time
-- todo: this is no longer true
local cost = 1 --local cost = tonumber(ARGV[4])
local burst = rate
local emission_interval = period / rate
local increment = emission_interval * cost

14
services/api/src/middleware/ratelimit.rs
View file

@ -137,24 +137,23 @@ pub async fn do_request_ratelimited(
rlimit.key()
);
let burst = 5;
let period = 1; // seconds
let cost = 1; // todo: update this for group member endpoints
// local rate_limit_key = KEYS[1]
// local burst = ARGV[1]
// local rate = ARGV[2]
// local period = ARGV[3]
// local rate = ARGV[1]
// local period = ARGV[2]
// return {remaining, tostring(retry_after), reset_after}
let resp = redis
.evalsha::<(i32, String, u64), String, Vec<String>, Vec<i32>>(
LUA_SCRIPT_SHA.to_string(),
vec![rl_key.clone()],
vec![burst, rlimit.rate(), period],
vec![rlimit.rate(), period, cost],
)
.await;
match resp {
Ok((mut remaining, retry_after, reset_after)) => {
Ok((remaining, retry_after, reset_after)) => {
// redis's lua doesn't support returning floats
let retry_after: f64 = retry_after
.parse()
@ -175,9 +174,6 @@ pub async fn do_request_ratelimited(
)
};
// the redis script puts burst in remaining for ??? some reason
remaining -= burst - rlimit.rate();
let reset_time = SystemTime::now()
.checked_add(Duration::from_secs(reset_after))
.expect("invalid timestamp")