mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-07-28 14:44:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'dev' into clients-pops

Browse source
This commit is contained in:
miloschwartz 2025-06-22 17:50:39 -04:00
commit 0e87b6e48b
No known key found for this signature in database
21 changed files with 231 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

34
server/middlewares/rateLimit.ts
View file

@ -1,4 +1,4 @@
import { rateLimit } from "express-rate-limit";
import { MemoryStore, rateLimit, Store } from "express-rate-limit";
import createHttpError from "http-errors";
import { NextFunction, Request, Response } from "express";
import logger from "@server/logger";
@ -6,7 +6,15 @@ import HttpCode from "@server/types/HttpCode";
import config from "@server/lib/config";
import { RedisStore } from "rate-limit-redis";
import redisManager from "@server/db/redis";
import { Command as RedisCommand } from "ioredis";
export let rateLimitStore: Store = new MemoryStore();
if (config.getRawConfig().flags?.enable_redis) {
const client = redisManager.client!;
rateLimitStore = new RedisStore({
sendCommand: async (command: string, ...args: string[]) =>
(await client.call(command, args)) as any
});
}
export function rateLimitMiddleware({
windowMin,
@ -19,11 +27,8 @@ export function rateLimitMiddleware({
type: "IP_ONLY" | "IP_AND_PATH";
skipCondition?: (req: Request, res: Response) => boolean;
}) {
const enableRedis = config.getRawConfig().flags?.enable_redis;
let opts;
if (type === "IP_AND_PATH") {
opts = {
return rateLimit({
windowMs: windowMin * 60 * 1000,
max,
skip: skipCondition,
@ -38,10 +43,11 @@ export function rateLimitMiddleware({
return next(
createHttpError(HttpCode.TOO_MANY_REQUESTS, message)
);
}
} as any;
},
store: rateLimitStore
});
} else {
opts = {
return rateLimit({
windowMs: windowMin * 60 * 1000,
max,
skip: skipCondition,
@ -52,18 +58,8 @@ export function rateLimitMiddleware({
createHttpError(HttpCode.TOO_MANY_REQUESTS, message)
);
}
};
}
if (enableRedis) {
const client = redisManager.client!;
opts.store = new RedisStore({
sendCommand: async (command: string, ...args: string[]) =>
(await client.call(command, args)) as any
});
}
return rateLimit(opts);
}
export default rateLimitMiddleware;