HidemaruOwO/puyoskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix rate limit scaling (it's no longer inverted)

Browse source
This commit is contained in:
Hazelnoot 2024-12-08 12:02:58 -05:00
parent 91c9b67cb0
commit fc4599ec07
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/server/api/SkRateLimiterService.ts
View file

@ -95,7 +95,7 @@ export class SkRateLimiterService {
if (limit.minInterval < 0) throw new Error(`Invalid rate limit ${limit.key}: minInterval is negative (${limit.minInterval})`); if (limit.minInterval < 0) throw new Error(`Invalid rate limit ${limit.key}: minInterval is negative (${limit.minInterval})`);
const counter = await this.getLimitCounter(limit, actor, 'min'); const counter = await this.getLimitCounter(limit, actor, 'min');
const minInterval = Math.max(Math.ceil(limit.minInterval / factor), 0); const minInterval = Math.max(Math.ceil(limit.minInterval * factor), 0);
// Update expiration // Update expiration
if (counter.c > 0) { if (counter.c > 0) {
@ -132,7 +132,7 @@ export class SkRateLimiterService {
if (limit.dripSize != null && limit.dripSize < 1) throw new Error(`Invalid rate limit ${limit.key}: dripSize is less than 1 (${limit.dripSize})`); if (limit.dripSize != null && limit.dripSize < 1) throw new Error(`Invalid rate limit ${limit.key}: dripSize is less than 1 (${limit.dripSize})`);
const counter = await this.getLimitCounter(limit, actor, 'bucket'); const counter = await this.getLimitCounter(limit, actor, 'bucket');
const bucketSize = Math.max(Math.ceil(limit.size * factor), 1); const bucketSize = Math.max(Math.ceil(limit.size / factor), 1);
const dripRate = Math.ceil(limit.dripRate ?? 1000); const dripRate = Math.ceil(limit.dripRate ?? 1000);
const dripSize = Math.ceil(limit.dripSize ?? 1); const dripSize = Math.ceil(limit.dripSize ?? 1);

10
packages/backend/test/unit/server/api/SkRateLimiterServiceTests.ts
View file

@ -274,8 +274,8 @@ describe(SkRateLimiterService, () => {
it('should scale limit by factor', async () => { it('should scale limit by factor', async () => {
counter = { c: 1, t: 0 }; counter = { c: 1, t: 0 };
const i1 = await serviceUnderTest().limit(limit, actor, 2); // 1 + 1 = 2 const i1 = await serviceUnderTest().limit(limit, actor, 0.5); // 1 + 1 = 2
const i2 = await serviceUnderTest().limit(limit, actor, 2); // 2 + 1 = 3 const i2 = await serviceUnderTest().limit(limit, actor, 0.5); // 2 + 1 = 3
expect(i1.blocked).toBeFalsy(); expect(i1.blocked).toBeFalsy();
expect(i2.blocked).toBeTruthy(); expect(i2.blocked).toBeTruthy();
@ -514,7 +514,7 @@ describe(SkRateLimiterService, () => {
minCounter = { c: 1, t: 0 }; minCounter = { c: 1, t: 0 };
mockTimeService.now += 500; mockTimeService.now += 500;
const info = await serviceUnderTest().limit(limit, actor, 2); const info = await serviceUnderTest().limit(limit, actor, 0.5);
expect(info.blocked).toBeFalsy(); expect(info.blocked).toBeFalsy();
}); });
@ -657,7 +657,7 @@ describe(SkRateLimiterService, () => {
it('should scale limit by factor', async () => { it('should scale limit by factor', async () => {
counter = { c: 10, t: 0 }; counter = { c: 10, t: 0 };
const info = await serviceUnderTest().limit(limit, actor, 2); // 10 + 1 = 11 const info = await serviceUnderTest().limit(limit, actor, 0.5); // 10 + 1 = 11
expect(info.blocked).toBeTruthy(); expect(info.blocked).toBeTruthy();
}); });
@ -825,7 +825,7 @@ describe(SkRateLimiterService, () => {
minCounter = { c: 1, t: 0 }; minCounter = { c: 1, t: 0 };
mockTimeService.now += 500; mockTimeService.now += 500;
const info = await serviceUnderTest().limit(limit, actor, 2); const info = await serviceUnderTest().limit(limit, actor, 0.5);
expect(info.blocked).toBeFalsy(); expect(info.blocked).toBeFalsy();
}); });