usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: reimplement max/min with async

This commit is contained in:
anatawa12 2024-06-14 17:33:09 +09:00
parent d8844aed6f
commit 1d6d90d62d
No known key found for this signature in database
GPG Key ID: 9CA909848B8E4EA6
1 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
packages/backend/src/server/api/RateLimiterService.ts
View File

@ -49,47 +49,45 @@ export class RateLimiterService {
} }
// Short-term limit // Short-term limit
const min = () => { const min = async () => {
return new Promise<void>((ok, reject) => { const info = await this.checkLimiter({
this.checkLimiter({ id: `${actor}:${limitation.key}:min`,
id: `${actor}:${limitation.key}:min`, duration: limitation.minInterval! * factor,
duration: limitation.minInterval! * factor, max: 1,
max: 1, db: this.redisClient,
db: this.redisClient,
}).then((info) => {
this.logger.debug(`${actor} ${limitation.key} min remaining: ${info.remaining}`);
if (info.remaining === 0) {
return reject({ code: 'BRIEF_REQUEST_INTERVAL', info });
} else {
if (hasLongTermLimit) {
return max().then(ok, reject);
} else {
return ok();
}
}
});
}); });
this.logger.debug(`${actor} ${limitation.key} min remaining: ${info.remaining}`);
if (info.remaining === 0) {
// eslint-disable-next-line no-throw-literal
throw { code: 'BRIEF_REQUEST_INTERVAL', info };
} else {
if (hasLongTermLimit) {
await max();
} else {
return;
}
}
}; };
// Long term limit // Long term limit
const max = () => { const max = async () => {
return new Promise<void>((ok, reject) => { const info = await this.checkLimiter({
this.checkLimiter({ id: `${actor}:${limitation.key}`,
id: `${actor}:${limitation.key}`, duration: limitation.duration! * factor,
duration: limitation.duration! * factor, max: limitation.max! / factor,
max: limitation.max! / factor, db: this.redisClient,
db: this.redisClient,
}).then((info) => {
this.logger.debug(`${actor} ${limitation.key} max remaining: ${info.remaining}`);
if (info.remaining === 0) {
return reject({ code: 'RATE_LIMIT_EXCEEDED', info });
} else {
return ok();
}
});
}); });
this.logger.debug(`${actor} ${limitation.key} max remaining: ${info.remaining}`);
if (info.remaining === 0) {
// eslint-disable-next-line no-throw-literal
throw { code: 'RATE_LIMIT_EXCEEDED', info };
} else {
return;
}
}; };
const hasShortTermLimit = typeof limitation.minInterval === 'number'; const hasShortTermLimit = typeof limitation.minInterval === 'number';