mielk-api 1.5.2 → 1.5.4

package/dist/middlewares/rateLimit/createRateLimiter.js

@@ -12,6 +12,7 @@ import { failure, HttpResponseStatus } from '../../http/index.js';
 import { RateLimitConfigFactory } from './rateLimitConfigFactory.js';
 import { generateRedisLockKey } from '../redis/redisLockChecker.js';
 import { Msg } from '../../internal/messaging/messageTags.js';
+import { generateRedisKey } from '../redis/redisKeysFactory.js';
 export const createGlobalRateLimiter = (config) => {
     return createRateLimiter(RateLimitConfigFactory.globalIp(config));
 };
@@ -23,8 +24,8 @@ export const createRateLimiter = (config) => {
         res.setHeader('X-RateLimit-Limit', limit);
         res.setHeader('X-RateLimit-Remaining', Math.max(0, limit - currentCounter));
         res.setHeader('X-RateLimit-Reset', ttl);
-        console.log('IP:', req.ip);
-        console.log('Forwarded:', req.headers['x-forwarded-for']);
+        // console.log('IP:', req.ip);
+        // console.log('Forwarded:', req.headers['x-forwarded-for']);
         if (!allowed) {
             return failure(res, HttpResponseStatus.TOO_MANY_REQUESTS, message || Msg.apiStatus.tooManyRequests);
         }
@@ -32,8 +33,8 @@ export const createRateLimiter = (config) => {
     });
 };
 const createRateLimitFromConfig = (config, req) => {
-    const { limit, windowSec, message, redisLockerConfig } = config;
-    const key = generateKeyFromConfig(config, req);
+    const { keyPrefix, keySuffixes, limit, windowSec, message, redisLockerConfig } = config;
+    const key = generateRedisKey(keyPrefix, keySuffixes, req);
     const rateLimit = { key, limit, windowSec, message };
     if (redisLockerConfig) {
         const { keyPrefix, ttlSeconds } = redisLockerConfig;
@@ -44,7 +45,3 @@ const createRateLimitFromConfig = (config, req) => {
     }
     return rateLimit;
 };
-const generateKeyFromConfig = (config, req) => {
-    const { keyPrefix, keySuffixes } = config;
-    return `${keyPrefix}:${keySuffixes(req).join(':')}`;
-};

package/dist/middlewares/rateLimit/rateLimitConfigFactory.js

@@ -1,7 +1,7 @@
 import { RedisKeyFactory } from "../redis/redisKeysFactory.js";
 import { Msg } from "../../internal/messaging/messageTags.js";
 const defaultRateLimitConfig = {
-    keyPrefix: RedisKeyFactory.prefixes.login,
+    keyPrefix: RedisKeyFactory.prefixes.authLogin,
     keySuffixes: RedisKeyFactory.suffixes.ip,
     windowSec: 15 * 60,
     limit: 5,
@@ -11,7 +11,7 @@ const createRateLimitConfig = (params) => {
     return Object.assign(Object.assign({}, defaultRateLimitConfig), params);
 };
 const globalIp = (params) => {
-    return createRateLimitConfig(Object.assign({ keyPrefix: RedisKeyFactory.prefixes.global, windowSec: 60, limit: 2 }, (params || {})));
+    return createRateLimitConfig(Object.assign({ keyPrefix: RedisKeyFactory.prefixes.authGlobal, windowSec: 60, limit: 2 }, (params || {})));
 };
 const loginIp = (params) => {
     return createRateLimitConfig(Object.assign({}, (params || {})));
@@ -20,7 +20,7 @@ const loginIpMail = (params) => {
     return createRateLimitConfig(Object.assign({ keySuffixes: RedisKeyFactory.suffixes.ipMail }, (params || {})));
 };
 const loginMail = (params) => {
-    return createRateLimitConfig(Object.assign({ keySuffixes: RedisKeyFactory.suffixes.mail, redisLockerConfig: { keyPrefix: RedisKeyFactory.prefixes.lockEmail, ttlSeconds: 15 * 60 } }, (params || {})));
+    return createRateLimitConfig(Object.assign({ keySuffixes: RedisKeyFactory.suffixes.mail, redisLockerConfig: { keyPrefix: RedisKeyFactory.prefixes.authLockEmail, ttlSeconds: 15 * 60 } }, (params || {})));
 };
 export const RateLimitConfigFactory = {
     globalIp,

package/dist/middlewares/redis/redisKeysFactory.d.ts

@@ -1,10 +1,10 @@
 import { Request } from 'express';
 export declare const RedisKeyFactory: {
     prefixes: {
-        readonly global: "global";
-        readonly login: "login";
-        readonly lockEmail: "lock:email";
-        readonly refresh: "refresh";
+        readonly authGlobal: "auth.global";
+        readonly authLogin: "auth.login";
+        readonly authLockEmail: "auth.lock:email";
+        readonly authRefresh: "auth.refresh";
     };
     suffixes: {
         readonly ip: (req: Request) => string[];
@@ -12,3 +12,4 @@ export declare const RedisKeyFactory: {
         readonly mail: (req: Request) => string[];
     };
 };
+export declare const generateRedisKey: (prefix: string, suffixCallback: (req: Request) => string[], req: Request) => string;

package/dist/middlewares/redis/redisKeysFactory.js

@@ -1,8 +1,8 @@
 const prefixes = {
-    global: 'global',
-    login: 'login',
-    lockEmail: 'lock:email',
-    refresh: 'refresh',
+    authGlobal: 'auth.global',
+    authLogin: 'auth.login',
+    authLockEmail: 'auth.lock:email',
+    authRefresh: 'auth.refresh',
 };
 const getIpSuffixCallback = (req) => {
     const ip = req.ip || 'undefined';
@@ -28,3 +28,6 @@ export const RedisKeyFactory = {
     prefixes: prefixes,
     suffixes: suffixCallbacks
 };
+export const generateRedisKey = (prefix, suffixCallback, req) => {
+    return `${prefix}:${suffixCallback(req).join(':')}`;
+};

package/dist/middlewares/redis/redisLockCheckerConfigFactory.js

@@ -1,7 +1,7 @@
 import { RedisKeyFactory } from "./redisKeysFactory.js";
 import { Msg } from "../../internal/messaging/messageTags.js";
 const defaultRedisLockCheckerConfig = {
-    keyPrefix: RedisKeyFactory.prefixes.lockEmail,
+    keyPrefix: RedisKeyFactory.prefixes.authLockEmail,
     keySuffixes: RedisKeyFactory.suffixes.mail,
     message: Msg.apiStatus.locked,
 };

package/dist/middlewares/redis/redisLockerConfigFactory.js

@@ -1,6 +1,6 @@
 import { RedisKeyFactory } from "./redisKeysFactory.js";
 const defaultRedisLockerConfig = {
-    keyPrefix: RedisKeyFactory.prefixes.lockEmail,
+    keyPrefix: RedisKeyFactory.prefixes.authLockEmail,
     ttlSeconds: 30 * 60,
 };
 const createRedisLockerConfig = (params) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mielk-api",
-	"version": "1.5.2",
+	"version": "1.5.4",
 	"keywords": [],
 	"author": "mielk",
 	"description": "Wrapper for API operations",