Skip to content

Fix: Stop incrementing hit counter while client is blocked #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Stop incrementing hit counter while client is blocked #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions packages/throttler-storage-redis/src/throttler-storage-redis.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,17 @@ export class ThrottlerStorageRedisService implements ThrottlerStorageRedis, OnMo
local limit = tonumber(ARGV[3])
local blockDuration = tonumber(ARGV[4])

local isBlocked = redis.call('GET', blockKey)
if isBlocked then
local timeToBlockExpire = redis.call('PTTL', blockKey)
if timeToBlockExpire > 0 then
local currentHits = tonumber(redis.call('GET', hitKey)) or 0
return { currentHits, redis.call('PTTL', hitKey), 1, timeToBlockExpire }
else
redis.call('DEL', blockKey)
end
end

local totalHits = redis.call('INCR', hitKey)
local timeToExpire = redis.call('PTTL', hitKey)

Expand All @@ -46,26 +57,12 @@ export class ThrottlerStorageRedisService implements ThrottlerStorageRedis, OnMo
timeToExpire = ttl
end

local isBlocked = redis.call('GET', blockKey)
local timeToBlockExpire = 0

if isBlocked then
timeToBlockExpire = redis.call('PTTL', blockKey)
elseif totalHits > limit then
if totalHits > limit then
redis.call('SET', blockKey, 1, 'PX', blockDuration)
isBlocked = '1'
timeToBlockExpire = blockDuration
end

if isBlocked and timeToBlockExpire <= 0 then
redis.call('DEL', blockKey)
redis.call('SET', hitKey, 1, 'PX', ttl)
totalHits = 1
timeToExpire = ttl
isBlocked = false
return { totalHits, timeToExpire, 1, blockDuration }
end

return { totalHits, timeToExpire, isBlocked and 1 or 0, timeToBlockExpire }
return { totalHits, timeToExpire, 0, 0 }
`
.replace(/^\s+/gm, '')
.trim();
Expand Down