Skip to content

Fix rate limiter and increase requests for Discord #1729

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

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Fix rate limiter and increase requests for Discord #1729

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions services/libs/integrations/src/integrations/discord/api/handleRateLimit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { IProcessStreamContext } from '../../../types'

const DISCORD_RATE_LIMIT = 50
const DISCORD_RATE_LIMIT_TIME = 1
const DISCORD_RATE_LIMIT = 100
const DISCORD_RATE_LIMIT_TIME = 1 // 1 second
const REDIS_KEY = 'discord-request-count'

export const getRateLimiter = (ctx: IProcessStreamContext) => {
Expand Down
6 changes: 5 additions & 1 deletion services/libs/redis/src/rateLimiter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,18 @@ export class RateLimiter implements IRateLimiter {
const requestCount = value === null ? 0 : parseInt(value)
const canMakeRequest = requestCount < this.maxRequests

if (requestCount === 0) {
await this.cache.set(this.counterKey, '0', this.timeWindowSeconds)
}

if (!canMakeRequest) {
const sleepTime = this.timeWindowSeconds + Math.floor(Math.random() * this.maxRequests)
throw new RateLimitError(sleepTime, endpoint)
}
}

public async incrementRateLimit() {
await this.cache.increment(this.counterKey, 1, this.timeWindowSeconds)
await this.cache.increment(this.counterKey, 1)
}
}

Expand Down