Refactoring

Author: muhammedkamel

.env.testing

@@ -9,6 +9,5 @@ REDIS_USERNAME=default
 REDIS_PASSWORD=password
 
 # RATE LIMITER
-RATE_LIMITER_ENABLED=true
 RATE_LIMITER_MAX_REQUESTS=5
-RATE_LIMITER_TIME_WINDOW=60000
+RATE_LIMITER_TIME_WINDOW_SECONDS=60

src/middlewares/rate-limiter.ts

@@ -10,7 +10,7 @@ export const rateLimiter = async (req: Request, res: Response, next: NextFunctio
 
     const key = `rate-limiter:${ip}`;
 
-    const current = await getCurrentWindow(key, Number(process.env.RATE_LIMITER_TIME_WINDOW));
+    const current = await getCurrentWindow(key, Number(process.env.RATE_LIMITER_TIME_WINDOW_SECONDS));
 
     if (current + 1 > Number(process.env.RATE_LIMITER_MAX_REQUESTS)) {
         return res.status(429).json({

src/router.ts

@@ -3,9 +3,7 @@ import { rateLimiter } from './middlewares/rate-limiter';
 
 const app = express();
 
-if (process.env.RATE_LIMITER_ENABLED === 'true') {
-    app.use(rateLimiter.bind(this));
-}
+app.use(rateLimiter);
 
 app.get('/', (req, res) => res.json({ message: 'Hello World!' }));
 

src/utils/rate-limiter.ts

@@ -3,8 +3,11 @@ import { client } from "./redis";
 export const getCurrentWindow = async (key: string, slidingWindow: number): Promise<number> => {
     const now = Date.now();
 
+    // tslint:disable-next-line:no-console
+    console.log(slidingWindow);
+
     const [, currentWindow] = await client.multi()
-        .zRemRangeByScore(key, 0, now - slidingWindow)
+        .zRemRangeByScore(key, 0, now - slidingWindow * 1000)
         .zCard(key)
         .zAdd(key, { score: now, value: now.toString() })
         .expire(key, slidingWindow)