Skip to content
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

Jump to bottom

fix: ensure ratelimit expiry is set every time #556

Merged
merged 6 commits into from
May 18, 2024
Merged

fix: ensure ratelimit expiry is set every time #556

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9cf1cbc
fix: ensure ratelimit expiry is set every time
bshaffer Jan 17, 2024
4e4f327
resolve merge
bshaffer Jan 17, 2024
5063644
cs fix
bshaffer Jan 17, 2024
f80d7a1
Merge branch 'main' into fix-ratelimit-expiry
bshaffer May 17, 2024
ec55a4a
review comment, add test
bshaffer May 18, 2024
6d43c99
improve tests
bshaffer May 18, 2024
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
15 changes: 10 additions & 5 deletions src/CachedKeySet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,15 +212,20 @@ private function rateLimitExceeded(): bool
}

$cacheItem = $this->cache->getItem($this->rateLimitCacheKey);
if (!$cacheItem->isHit()) {
$cacheItem->expiresAfter(60); // # of calls are cached each minute

if (!$cacheItem->isHit() || !\is_array($cacheItemData = $cacheItem->get())) {
bshaffer marked this conversation as resolved.
Show resolved Hide resolved
$cacheItemData = [
'callsPerMinute' => 0,
'expiry' => new \DateTime('+60 seconds', new \DateTimeZone('UTC')),
];
}

$callsPerMinute = (int) $cacheItem->get();
if (++$callsPerMinute > $this->maxCallsPerMinute) {
if (++$cacheItemData['callsPerMinute'] > $this->maxCallsPerMinute) {
return true;
}
$cacheItem->set($callsPerMinute);

$cacheItem->set($cacheItemData);
$cacheItem->expiresAt($cacheItemData['expiry']);
$this->cache->save($cacheItem);
return false;
}
Expand Down
Loading