hi-secure 1.0.7 → 1.0.10

package/src/managers/JsonManager.ts

@@ -1,95 +1,9 @@
-// // import express from "express";
-// // import { logger } from "../logging";
-// // import { AdapterError } from "../core/errors/AdapterError";
-
-// // export class JsonManager {
-
-// //     /**
-// //      * JSON parser middleware — global + dynamic override
-// //      */
-// //     middleware(options?: any) {
-// //         try {
-// //             const opts = options || {};
-// //             return express.json(opts);
-// //         } catch (err: any) {
-// //             logger.error("❌ JSON Manager: failed to create JSON parser", {
-// //                 error: err?.message || err
-// //             });
-// //             throw new AdapterError("JSON parser initialization failed.");
-// //         }
-// //     }
-
-// //     /**
-// //      * URL-encoded parser — same global + dynamic style
-// //      */
-// //     urlencoded(options?: any) {
-// //         try {
-// //             const opts = options || { extended: true };
-// //             return express.urlencoded(opts);
-// //         } catch (err: any) {
-// //             logger.error("❌ JSON Manager: failed to create urlencoded parser", {
-// //                 error: err?.message || err
-// //             });
-// //             throw new AdapterError("URL-encoded parser initialization failed.");
-// //         }
-// //     }
-// // }
-
-
-
-// import express from "express";
-// import qs from "qs";
-// import { logger } from "../logging";
-// import { AdapterError } from "../core/errors/AdapterError.js";
-
-// export class JsonManager {
-
-//     // JSON parser  
-//     middleware(options?: any) {
-//         try {
-//             return express.json(options || {});
-//         } catch (err: any) {
-//             logger.error("❌ JSON Manager: failed to create JSON parser");
-//             throw new AdapterError("JSON parser initialization failed.");
-//         }
-//     }
-
-//     // URL-encoded parser  
-//     urlencoded(options?: any) {
-//         try {
-//             const opts = options || { extended: true };
-//             return express.urlencoded(opts);
-//         } catch (err: any) {
-//             logger.error("❌ URL-encoded parser failed");
-//             throw new AdapterError("URL-encoded parser initialization failed.");
-//         }
-//     }
-
-//     // NEW: Query-string parser  
-//     queryParser() {
-//         return (req: any, res: any, next: any) => {
-//             try {
-//                 req.query = qs.parse(req.url.split("?")[1] || "");
-//             } catch (err: any) {
-//                 logger.error("❌ Failed to parse query", { error: err?.message });
-//                 throw new AdapterError("Query parsing failed.");
-//             }
-//             next();
-//         };
-//     }
-// }
-
-
-
-
-// src/managers/JsonManager.ts - FIXED
 import express from "express";
 import qs from "qs";
 import { logger } from "../logging";
 import { AdapterError } from "../core/errors/AdapterError.js";
 
 export class JsonManager {
-    // JSON parser
     middleware(options?: any) {
         try {
             const defaultOptions = {
@@ -104,7 +18,6 @@ export class JsonManager {
         }
     }
 
-    // URL-encoded parser
     urlencoded(options?: any) {
         try {
             const defaultOptions = {
@@ -120,20 +33,17 @@ export class JsonManager {
         }
     }
 
-    // Query-string parser (doesn't override Express's query)
     queryParser(options?: any) {
         return (req: any, res: any, next: any) => {
             try {
-                // Only parse if not already parsed by Express
                 if (!req.parsedQuery && req.url.includes('?')) {
                     const queryString = req.url.split("?")[1] || "";
                     const parsed = qs.parse(queryString, {
-                        depth: 5, // Prevent deep nesting attacks
+                        depth: 5,
                         parameterLimit: 100,
                         ...options
                     });
                     
-                    // Store separately, don't override req.query
                     req.parsedQuery = parsed;
                     logger.debug("🔍 Query parsed", {
                         keys: Object.keys(parsed)

package/src/managers/RateLimitManager.ts

@@ -1,252 +1,3 @@
-
-
-// // // src/managers/RateLimitManager.ts - COMPLETE FIXED
-// // import { HiSecureConfig } from "../core/types/HiSecureConfig.js";
-// // import { AdapterError } from "../core/errors/AdapterError.js";
-// // import { logger } from "../logging";
-
-// // interface RateLimiterAdapter {
-// //     getMiddleware: (options?: any) => any;
-// // }
-
-// // export class RateLimitManager {
-// //     private config: HiSecureConfig["rateLimiter"];
-// //     private primaryAdapter: RateLimiterAdapter;
-// //     private fallbackAdapter: RateLimiterAdapter | null;
-
-// //     constructor(
-// //         config: HiSecureConfig["rateLimiter"],
-// //         primaryAdapter: RateLimiterAdapter,
-// //         fallbackAdapter: RateLimiterAdapter | null
-// //     ) {
-// //         this.config = config;
-// //         this.primaryAdapter = primaryAdapter;
-// //         this.fallbackAdapter = fallbackAdapter;
-// //     }
-
-// //     middleware(opts?: { mode?: "strict" | "relaxed" | "api"; options?: any }) {
-// //         let finalOptions: any = {};
-
-// //         // Handle presets (user cannot override these)
-// //         if (opts?.mode === "strict") {
-// //             finalOptions = {
-// //                 windowMs: 10_000,
-// //                 max: 5,
-// //                 points: 5,
-// //                 duration: 10,
-// //                 message: "Too many requests, please slow down."
-// //             };
-// //         } else if (opts?.mode === "relaxed") {
-// //             finalOptions = {
-// //                 windowMs: 60_000,
-// //                 max: 100,
-// //                 points: 100,
-// //                 duration: 60,
-// //                 message: "Rate limit exceeded."
-// //             };
-// //         } else if (opts?.mode === "api") {
-// //             finalOptions = {
-// //                 windowMs: 15 * 60 * 1000, // 15 minutes
-// //                 max: 100,
-// //                 points: 100,
-// //                 duration: 900,
-// //                 message: "API rate limit exceeded."
-// //             };
-// //         } else {
-// //             // Use defaults
-// //             finalOptions = {
-// //                 windowMs: this.config.windowMs,
-// //                 max: this.config.maxRequests,
-// //                 duration: this.config.windowMs / 1000,
-// //                 points: this.config.maxRequests,
-// //                 message: this.config.message
-// //             };
-// //         }
-
-// //         // Apply custom options WITHOUT overriding preset values
-// //         if (opts?.options) {
-// //             // Only allow specific overrides, not preset overrides
-// //             const allowedOverrides = ['message', 'skipFailedRequests', 'standardHeaders'];
-// //             for (const key of allowedOverrides) {
-// //                 if (opts.options[key] !== undefined) {
-// //                     finalOptions[key] = opts.options[key];
-// //                 }
-// //             }
-            
-// //             // Log if user tried to override preset
-// //             const attemptedOverrides = Object.keys(opts.options).filter(
-// //                 k => !allowedOverrides.includes(k) && k !== 'mode'
-// //             );
-// //             if (attemptedOverrides.length > 0) {
-// //                 logger.warn("⚠ Rate limit overrides ignored", { // ✅ FIXED: Better message
-// //                     preset: opts?.mode || 'default', // ✅ FIXED: Handle undefined
-// //                     ignoredOptions: attemptedOverrides
-// //                 });
-// //             }
-// //         }
-
-// //         // Try primary adapter
-// //         try {
-// //             logger.info("📌 Applying rate limiting", {
-// //                 mode: opts?.mode || 'default',
-// //                 windowMs: finalOptions.windowMs,
-// //                 max: finalOptions.max
-// //             });
-            
-// //             return this.primaryAdapter.getMiddleware(finalOptions);
-// //         } catch (err: any) {
-// //             logger.warn("⚠ Primary rate limiter failed → fallback", {
-// //                 error: err?.message
-// //             });
-
-// //             if (!this.fallbackAdapter) {
-// //                 throw new AdapterError("Rate limiters failed; no fallback adapter.");
-// //             }
-
-// //             try {
-// //                 logger.info("📌 Using fallback rate limiter");
-// //                 return this.fallbackAdapter.getMiddleware(finalOptions);
-// //             } catch (fallbackErr: any) {
-// //                 logger.error("❌ Fallback limiter also failed", {
-// //                     error: fallbackErr?.message
-// //                 });
-// //                 throw new AdapterError("Both primary and fallback limiters failed.");
-// //             }
-// //         }
-// //     }
-// // }
-
-
-
-// // src/managers/RateLimitManager.ts - FIXED
-// import { HiSecureConfig } from "../core/types/HiSecureConfig.js";
-// import { AdapterError } from "../core/errors/AdapterError.js";
-// import { logger } from "../logging";
-
-// interface RateLimiterAdapter {
-//     getMiddleware: (options?: any) => any;
-// }
-
-// export class RateLimitManager {
-//     private config: HiSecureConfig["rateLimiter"];
-//     private primaryAdapter: RateLimiterAdapter;
-//     private fallbackAdapter: RateLimiterAdapter | null;
-
-//     constructor(
-//         config: HiSecureConfig["rateLimiter"],
-//         primaryAdapter: RateLimiterAdapter,
-//         fallbackAdapter: RateLimiterAdapter | null
-//     ) {
-//         this.config = config;
-//         this.primaryAdapter = primaryAdapter;
-//         this.fallbackAdapter = fallbackAdapter;
-//     }
-
-//     middleware(opts?: { mode?: "strict" | "relaxed" | "api"; options?: any }) {
-//         let finalOptions: any = {};
-
-//         // Handle presets (user cannot override these)
-//         if (opts?.mode === "strict") {
-//             finalOptions = {
-//                 windowMs: 10_000,
-//                 max: 5,
-//                 points: 5,
-//                 // ❌ REMOVED: duration: 10,
-//                 message: "Too many requests, please slow down."
-//             };
-//         } else if (opts?.mode === "relaxed") {
-//             finalOptions = {
-//                 windowMs: 60_000,
-//                 max: 100,
-//                 points: 100,
-//                 // ❌ REMOVED: duration: 60,
-//                 message: "Rate limit exceeded."
-//             };
-//         } else if (opts?.mode === "api") {
-//             finalOptions = {
-//                 windowMs: 15 * 60 * 1000, // 15 minutes
-//                 max: 100,
-//                 points: 100,
-//                 // ❌ REMOVED: duration: 900,
-//                 message: "API rate limit exceeded."
-//             };
-//         } else {
-//             // Use defaults
-//             finalOptions = {
-//                 windowMs: this.config.windowMs,
-//                 max: this.config.maxRequests,
-//                 // ❌ REMOVED: duration: this.config.windowMs / 1000,
-//                 points: this.config.maxRequests,
-//                 message: this.config.message,
-//                 standardHeaders: true,      // ✅ ADD
-//                 legacyHeaders: false        // ✅ ADD
-//             };
-//         }
-
-//         // Apply custom options WITHOUT overriding preset values
-//         if (opts?.options) {
-//             // Only allow specific overrides, not preset overrides
-//             const allowedOverrides = ['message', 'skipFailedRequests', 'standardHeaders', 'legacyHeaders'];
-//             for (const key of allowedOverrides) {
-//                 if (opts.options[key] !== undefined) {
-//                     finalOptions[key] = opts.options[key];
-//                 }
-//             }
-            
-//             // Log if user tried to override preset
-//             const attemptedOverrides = Object.keys(opts.options).filter(
-//                 k => !allowedOverrides.includes(k) && k !== 'mode'
-//             );
-//             if (attemptedOverrides.length > 0) {
-//                 logger.warn("⚠ Rate limit overrides ignored", {
-//                     preset: opts?.mode || 'default',
-//                     ignoredOptions: attemptedOverrides
-//                 });
-//             }
-//         }
-
-//         // Add v8+ options if not present
-//         if (finalOptions.standardHeaders === undefined) {
-//             finalOptions.standardHeaders = true;
-//         }
-//         if (finalOptions.legacyHeaders === undefined) {
-//             finalOptions.legacyHeaders = false;
-//         }
-
-//         // Try primary adapter
-//         try {
-//             logger.info("📌 Applying rate limiting", {
-//                 mode: opts?.mode || 'default',
-//                 windowMs: finalOptions.windowMs,
-//                 max: finalOptions.max
-//             });
-            
-//             return this.primaryAdapter.getMiddleware(finalOptions);
-//         } catch (err: any) {
-//             logger.warn("⚠ Primary rate limiter failed → fallback", {
-//                 error: err?.message
-//             });
-
-//             if (!this.fallbackAdapter) {
-//                 throw new AdapterError("Rate limiters failed; no fallback adapter.");
-//             }
-
-//             try {
-//                 logger.info("📌 Using fallback rate limiter");
-//                 return this.fallbackAdapter.getMiddleware(finalOptions);
-//             } catch (fallbackErr: any) {
-//                 logger.error("❌ Fallback limiter also failed", {
-//                     error: fallbackErr?.message
-//                 });
-//                 throw new AdapterError("Both primary and fallback limiters failed.");
-//             }
-//         }
-//     }
-// }
-
-
-
-// src/managers/RateLimitManager.ts - COMPLETELY FIXED
 import { HiSecureConfig } from "../core/types/HiSecureConfig.js";
 import { AdapterError } from "../core/errors/AdapterError.js";
 import { logger } from "../logging";
@@ -273,42 +24,35 @@ export class RateLimitManager {
     middleware(opts?: { mode?: "strict" | "relaxed" | "api"; options?: any }) {
         let finalOptions: any = {};
 
-        // Handle presets (user cannot override these)
         if (opts?.mode === "strict") {
             finalOptions = {
                 windowMs: 10_000,
                 max: 5,
-                // ❌ REMOVED: points: 5,
                 message: "Too many requests, please slow down."
             };
         } else if (opts?.mode === "relaxed") {
             finalOptions = {
                 windowMs: 60_000,
                 max: 100,
-                // ❌ REMOVED: points: 100,
                 message: "Rate limit exceeded."
             };
         } else if (opts?.mode === "api") {
             finalOptions = {
-                windowMs: 15 * 60 * 1000, // 15 minutes
+                windowMs: 15 * 60 * 1000, 
                 max: 100,
-                // ❌ REMOVED: points: 100,
                 message: "API rate limit exceeded."
             };
         } else {
-            // Use defaults
             finalOptions = {
                 windowMs: this.config.windowMs,
                 max: this.config.maxRequests,
                 message: this.config.message,
-                standardHeaders: true,      // ✅ ADD
-                legacyHeaders: false        // ✅ ADD
+                standardHeaders: true,      
+                legacyHeaders: false        
             };
         }
 
-        // Apply custom options WITHOUT overriding preset values
         if (opts?.options) {
-            // Only allow specific overrides, not preset overrides
             const allowedOverrides = ['message', 'skipFailedRequests', 'standardHeaders', 'legacyHeaders'];
             for (const key of allowedOverrides) {
                 if (opts.options[key] !== undefined) {
@@ -316,7 +60,6 @@ export class RateLimitManager {
                 }
             }
             
-            // Log if user tried to override preset
             const attemptedOverrides = Object.keys(opts.options).filter(
                 k => !allowedOverrides.includes(k) && k !== 'mode'
             );
@@ -328,7 +71,6 @@ export class RateLimitManager {
             }
         }
 
-        // Add v8+ options if not present
         if (finalOptions.standardHeaders === undefined) {
             finalOptions.standardHeaders = true;
         }
@@ -336,7 +78,6 @@ export class RateLimitManager {
             finalOptions.legacyHeaders = false;
         }
 
-        // Try primary adapter
         try {
             logger.info("📌 Applying rate limiting", {
                 mode: opts?.mode || 'default',