heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

merge: make the cap of activeRateLimitRequests match the rate limit (!602)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/602

Approved-by: Julia Johannesen <julia@insertdomain.name>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <2-Marie@users.noreply.activitypub.software>
This commit is contained in:
Amelia Yukii 2024-08-18 17:28:09 +00:00
commit 2e2dcb6b8d
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/server/api/StreamingApiServerService.ts
View file

@ -151,7 +151,7 @@ export class StreamingApiServerService {
return this.rateLimitThis(user, requestIp, { return this.rateLimitThis(user, requestIp, {
key: 'wsmessage', key: 'wsmessage',
duration: ms('2sec'), duration: ms('2sec'),
max: 4090, max: 4096,
}); });
}; };

4
packages/backend/src/server/api/stream/Connection.ts
View file

@ -120,7 +120,9 @@ export default class Connection {
if (this.closingConnection) return; if (this.closingConnection) return;
if (this.rateLimiter) { if (this.rateLimiter) {
if (this.activeRateLimitRequests <= 128) { // this 4096 should match the `max` of the `rateLimiter`, see
// StreamingApiServerService
if (this.activeRateLimitRequests <= 4096) {
this.activeRateLimitRequests++; this.activeRateLimitRequests++;
const shouldRateLimit = await this.rateLimiter(); const shouldRateLimit = await this.rateLimiter();
this.activeRateLimitRequests--; this.activeRateLimitRequests--;