mastercontroller 1.3.14 → 1.3.16

package/MasterControl.js

@@ -1,16 +1,28 @@
 // MasterControl - by Alexander rich
 // version 1.0.252
 
-var url = require('url');
-var fileserver = require('fs');
-var http = require('http');
-var https = require('https');
-var tls = require('tls');
-var fs = require('fs');
-var url = require('url');
-var path = require('path');
-var globSearch = require("glob");
-var crypto = require('crypto'); // CRITICAL FIX: For ETag generation
+const url = require('url');
+const fileserver = require('fs');
+const http = require('http');
+const https = require('https');
+const tls = require('tls');
+const fs = require('fs');
+const path = require('path');
+const globSearch = require("glob");
+const crypto = require('crypto'); // CRITICAL FIX: For ETag generation
+
+// HTTP Status Code Constants
+const HTTP_STATUS = {
+    OK: 200,
+    MOVED_PERMANENTLY: 301,
+    FOUND: 302,
+    NOT_MODIFIED: 304,
+    BAD_REQUEST: 400,
+    FORBIDDEN: 403,
+    NOT_FOUND: 404,
+    PAYLOAD_TOO_LARGE: 413,
+    INTERNAL_ERROR: 500
+};
 
 // Enhanced error handling - setup global handlers
 const { setupGlobalErrorHandlers } = require('./error/MasterErrorMiddleware');
@@ -176,7 +188,10 @@ class MasterControl {
             return false;
         };
 
-        console.log('[MasterControl] Prototype pollution protection initialized');
+        logger.info({
+            code: 'MC_INFO_PROTOTYPE_PROTECTION',
+            message: 'Prototype pollution protection initialized'
+        });
     }
 
     // extends class methods to be used inside of the view class using the THIS keyword
@@ -291,7 +306,7 @@ class MasterControl {
 
         // Enhanced: Support both relative (to master.root) and absolute paths
         // If folderLocation is absolute, use it directly; otherwise join with master.root
-        var rootFolderLocation;
+        let rootFolderLocation;
         if (path.isAbsolute(folderLocation)) {
             // Absolute path provided - use it directly
             rootFolderLocation = path.join(folderLocation, innerFolder);
@@ -301,16 +316,20 @@ class MasterControl {
         }
 
         // Structure is always: {rootFolderLocation}/config/initializers/config.js
-        var configPath = path.join(rootFolderLocation, 'config', 'initializers', 'config.js');
+        const configPath =path.join(rootFolderLocation, 'config', 'initializers', 'config.js');
         if(fs.existsSync(configPath)){
             require(configPath);
         }else{
-            this.error.log(`Cannot find config file at ${configPath}`, "error");
+            logger.error({
+                code: 'MC_ERR_CONFIG_NOT_FOUND',
+                message: 'Cannot find config file',
+                path: configPath
+            });
         }
 
         // Structure is always: {rootFolderLocation}/config/routes.js
-        var routePath = path.join(rootFolderLocation, 'config', 'routes.js');
-        var routeObject = {
+        const routePath =path.join(rootFolderLocation, 'config', 'routes.js');
+        const routeObject ={
             isComponent : true,
             root : rootFolderLocation
         }
@@ -318,7 +337,11 @@ class MasterControl {
         if(fs.existsSync(routePath)){
             require(routePath);
         }else{
-            this.error.log(`Cannot find routes file at ${routePath}`, "error");
+            logger.error({
+                code: 'MC_ERR_ROUTES_NOT_FOUND',
+                message: 'Cannot find routes file',
+                path: routePath
+            });
         }
     }
 
@@ -335,7 +358,7 @@ class MasterControl {
 
         if(settings.httpPort || settings.requestTimeout){
             this.server.timeout = settings.requestTimeout;
-            var host = settings.hostname || settings.host || settings.http;
+            const host =settings.hostname || settings.host || settings.http;
             if(host){
                 this.server.listen(settings.httpPort, host);
             }else{
@@ -391,7 +414,7 @@ class MasterControl {
     // sets up https or http server protocals
     setupServer(type, credentials ){
         try {
-            var $that = this;
+            const $that = this;
 
             // SECURITY: Initialize prototype pollution protection
             this._initPrototypePollutionProtection();
@@ -547,7 +570,7 @@ class MasterControl {
      * @security CRITICAL: Always provide allowedHosts in production to prevent open redirect attacks
      */
     startHttpToHttpsRedirect(redirectPort, bindHost, allowedHosts = []){
-        var $that = this;
+        const $that = this;
 
         // Security warning if no hosts specified
         if (allowedHosts.length === 0) {
@@ -558,8 +581,8 @@ class MasterControl {
 
         return http.createServer(function (req, res) {
             try{
-                var host = req.headers['host'] || '';
-                var hostname = host.split(':')[0]; // Remove port number
+                const host = req.headers['host'] || '';
+                const hostname = host.split(':')[0]; // Remove port number
 
                 // CRITICAL SECURITY: Validate host header to prevent open redirect attacks
                 if (allowedHosts.length > 0) {
@@ -707,7 +730,7 @@ class MasterControl {
      * This includes: static files, body parsing, scoped services, routing, error handling
      */
     _registerCoreMiddleware(){
-        var $that = this;
+        const $that = this;
 
         // 1. Static File Serving (with path traversal protection)
         $that.pipeline.use(async (ctx, next) => {
@@ -750,17 +773,17 @@ class MasterControl {
                     return;
                 }
 
-                // Check if file exists
-                fs.exists(resolvedPath, function (exist) {
-                    if (!exist) {
-                        ctx.response.statusCode = 404;
-                        ctx.response.setHeader('Content-Type', 'text/plain');
-                        ctx.response.end('Not Found');
-                        return;
-                    }
+                // Check if file exists (use synchronous check for better performance in middleware)
+                if (!fs.existsSync(resolvedPath)) {
+                    ctx.response.statusCode = 404;
+                    ctx.response.setHeader('Content-Type', 'text/plain');
+                    ctx.response.end('Not Found');
+                    return;
+                }
 
-                    // Get file stats
-                    let finalPath = resolvedPath;
+                // Get file stats
+                let finalPath = resolvedPath;
+                try {
                     const stats = fs.statSync(resolvedPath);
 
                     // If directory, try to serve index.html
@@ -877,7 +900,19 @@ class MasterControl {
                             }
                         });
                     }
-                });
+                } catch (error) {
+                    // Handle file stat errors
+                    logger.error({
+                        code: 'MC_ERR_FILE_STAT',
+                        message: 'Error accessing static file',
+                        path: resolvedPath,
+                        error: error.message
+                    });
+                    ctx.response.statusCode = 500;
+                    ctx.response.setHeader('Content-Type', 'text/plain');
+                    ctx.response.end('Internal Server Error');
+                    return;
+                }
 
                 return; // Terminal - don't call next()
             }
@@ -968,7 +1003,7 @@ class MasterControl {
     }
 
     async serverRun(req, res){
-        var $that = this;
+        const $that = this;
         console.log("path", `${req.method} ${req.url}`);
 
         // Create request context for middleware pipeline
@@ -1016,7 +1051,7 @@ class MasterControl {
         var rootFolderLocation = path.join(this.root, foldername);
 
         // Structure is always: {rootFolderLocation}/routes.js
-        var routePath = path.join(rootFolderLocation, 'routes.js');
+        const routePath =path.join(rootFolderLocation, 'routes.js');
         var route = {
             isComponent : false,
             root : `${this.root}`
@@ -1025,14 +1060,18 @@ class MasterControl {
         if(fs.existsSync(routePath)){
             require(routePath);
         }else{
-            this.error.log(`Cannot find routes file at ${routePath}`, "error");
+            logger.error({
+                code: 'MC_ERR_ROUTES_NOT_FOUND',
+                message: 'Cannot find routes file',
+                path: routePath
+            });
         }
     }
     
     
     // builds and calls all the required tools to have master running completely
     addInternalTools(requiredList){
-        if(requiredList.constructor === Array){
+        if(Array.isArray(requiredList)){
             // Map module names to their new organized paths
             const modulePathMap = {
                 'MasterPipeline': './MasterPipeline',

package/MasterCors.js

@@ -1,6 +1,27 @@
 // version 0.0.3 - robust origin handling (all envs), creds-safe reflection, function origins, extended Vary
 
-	// todo - res.setHeader('Access-Control-Request-Method', '*');
+const { logger } = require('./error/MasterErrorLogger');
+
+// HTTP Status Code Constants
+const HTTP_STATUS = {
+	NO_CONTENT: 204,
+	BAD_REQUEST: 400
+};
+
+// CORS Header Name Constants
+const CORS_HEADERS = {
+	ALLOW_ORIGIN: 'Access-Control-Allow-Origin',
+	ALLOW_METHODS: 'Access-Control-Allow-Methods',
+	ALLOW_HEADERS: 'Access-Control-Allow-Headers',
+	ALLOW_CREDENTIALS: 'Access-Control-Allow-Credentials',
+	MAX_AGE: 'Access-Control-Max-Age',
+	EXPOSE_HEADERS: 'Access-Control-Expose-Headers',
+	REQUEST_HEADERS: 'Access-Control-Request-Headers',
+	REQUEST_METHOD: 'Access-Control-Request-Method',
+	VARY: 'Vary'
+};
+
+// todo - res.setHeader('Access-Control-Request-Method', '*');
 class MasterCors{
 
 	// Lazy-load master to avoid circular dependency (Google-style lazy initialization)
@@ -16,7 +37,10 @@ class MasterCors{
 			this.options = options;
 		}
 		else{
-			this._master.error.log("cors options missing", "warn");
+			logger.warn({
+				code: 'MC_CORS_OPTIONS_MISSING',
+				message: 'CORS options missing'
+			});
 		}
 
 		// Auto-register with pipeline if available
@@ -32,7 +56,15 @@ class MasterCors{
 			this.response = params.response;
 			this.request = params.request;
 			// Always signal that response may vary by Origin and requested headers/method
-			try { this.response.setHeader('Vary', 'Origin, Access-Control-Request-Headers, Access-Control-Request-Method'); } catch(_) {}
+			try {
+				this.response.setHeader('Vary', 'Origin, Access-Control-Request-Headers, Access-Control-Request-Method');
+			} catch(error) {
+				logger.warn({
+					code: 'MC_CORS_VARY_HEADER_FAILED',
+					message: 'Failed to set Vary header',
+					error: error.message
+				});
+			}
 			this.configureOrigin();
 			this.configureMethods()
 			this.configureAllowedHeaders();
@@ -41,7 +73,10 @@ class MasterCors{
 			this.configureMaxAge();
 		}
 		else{
-			this._master.error.log("cors response and requests missing", "warn");
+			logger.warn({
+				code: 'MC_CORS_PARAMS_MISSING',
+				message: 'CORS response and request params missing'
+			});
 		}
 	}
 
@@ -63,7 +98,7 @@ class MasterCors{
 
 			if(this.options.origin === true){
 				// If credentials are enabled, reflect request origin per spec
-				var requestOrigin = this.request.headers.origin;
+				const requestOrigin =this.request.headers.origin;
 				if (this.options.credentials === true && requestOrigin) {
 					this.setHeader('access-control-allow-origin', requestOrigin);
 				} else {
@@ -76,9 +111,9 @@ class MasterCors{
 				this.removeHeader('access-control-allow-origin');
 			}
 				
-			if(this.options.origin.constructor === Array){
+			if(Array.isArray(this.options.origin)){
 				// Get the origin from the incoming request
-				var requestOrigin = this.request.headers.origin;
+				const requestOrigin =this.request.headers.origin;
 				
 				// Check if the request origin is in our allowed list
 				if(requestOrigin && this.options.origin.includes(requestOrigin)){
@@ -90,15 +125,22 @@ class MasterCors{
 			// Function predicate support: (origin, req) => boolean|string
 			if (typeof this.options.origin === 'function'){
 				try {
-					var requestOrigin = this.request.headers.origin;
-					var res = this.options.origin(requestOrigin, this.request);
+					const requestOrigin = this.request.headers.origin;
+					const res = this.options.origin(requestOrigin, this.request);
 					if (res === true && requestOrigin){
 						this.setHeader('access-control-allow-origin', requestOrigin);
 					}
 					else if (typeof res === 'string' && res){
 						this.setHeader('access-control-allow-origin', res);
 					}
-				} catch(_) {}
+				} catch(error) {
+					logger.error({
+						code: 'MC_CORS_ORIGIN_FUNCTION_ERROR',
+						message: 'Error in origin function predicate',
+						error: error.message,
+						stack: error.stack
+					});
+				}
 			}
 
 		}
@@ -106,16 +148,16 @@ class MasterCors{
 
 	configureMethods(){
 		if(this.options.methods){
-			if(this.options.methods.constructor === Array){
-				var elements = this.options.methods.join(", ");
+			if(Array.isArray(this.options.methods)){
+				const elements =this.options.methods.join(", ");
 				this.setHeader('access-control-allow-methods', elements);
 			}
 		}
 	}
 
 	configureAllowedHeaders(){
-		var requestheader = this.request.headers["access-control-request-headers"];
-		var $that = this;
+		const requestheader =this.request.headers["access-control-request-headers"];
+		const $that =this;
 		if(this.options.allowedHeaders){
 
 			if($that.options.allowedHeaders === true){
@@ -135,8 +177,8 @@ class MasterCors{
 				this.setHeader("access-control-allow-headers", $that.options.allowedHeaders);
 			}
 				
-			if($that.options.allowedHeaders.constructor === Array){
-				var elements = $that.options.allowedHeaders.join(", ");
+			if(Array.isArray($that.options.allowedHeaders)){
+				const elements =$that.options.allowedHeaders.join(", ");
 				$that.request.headers['access-control-allow-headers'] = elements;
 				this.setHeader("access-control-allow-headers", elements);
 			}
@@ -158,8 +200,8 @@ class MasterCors{
 				this.setHeader('access-control-expose-headers', this.options.exposeHeaders);
 			}
 				
-			if(this.options.exposeHeaders.constructor === Array){
-				var elements = this.options.exposeHeaders.join(", ");
+			if(Array.isArray(this.options.exposeHeaders)){
+				const elements =this.options.exposeHeaders.join(", ");
 				this.setHeader('access-control-expose-headers', elements);
 			}
 
@@ -187,7 +229,7 @@ class MasterCors{
 	 * Handles both preflight OPTIONS requests and regular requests
 	 */
 	middleware() {
-		var $that = this;
+		const $that =this;
 
 		return async (ctx, next) => {
 			// Handle preflight OPTIONS request

package/MasterPipeline.js

@@ -3,6 +3,11 @@
 
 const { logger } = require('./error/MasterErrorLogger');
 
+// HTTP Status Code Constants
+const HTTP_STATUS = {
+    INTERNAL_ERROR: 500
+};
+
 class MasterPipeline {
     constructor() {
         this.middleware = [];
@@ -214,7 +219,7 @@ class MasterPipeline {
                 });
 
                 if (!context.response.headersSent) {
-                    context.response.statusCode = 500;
+                    context.response.statusCode = HTTP_STATUS.INTERNAL_ERROR;
                     context.response.end('Internal Server Error');
                 }
                 return;
@@ -285,7 +290,11 @@ class MasterPipeline {
         folders.forEach(folder => {
             const dir = path.join(this._master.root, folder);
             if (!fs.existsSync(dir)) {
-                console.warn(`[Middleware] Folder not found: ${folder}`);
+                logger.warn({
+                    code: 'MC_MIDDLEWARE_FOLDER_NOT_FOUND',
+                    message: 'Middleware folder not found',
+                    folder: folder
+                });
                 return;
             }
 
@@ -305,16 +314,30 @@ class MasterPipeline {
                     }
                     // Pattern 2: module.exports = { register: (master) => {} }
                     else if (middleware.register && typeof middleware.register === 'function') {
-                        middleware.register(master);
+                        middleware.register(this._master);
                     }
                     else {
-                        console.warn(`[Middleware] Invalid export in ${folder}/${file}`);
+                        logger.warn({
+                            code: 'MC_MIDDLEWARE_INVALID_EXPORT',
+                            message: 'Invalid middleware export',
+                            file: `${folder}/${file}`
+                        });
                         return;
                     }
 
-                    console.log(`[Middleware] Loaded: ${folder}/${file}`);
+                    logger.info({
+                        code: 'MC_MIDDLEWARE_LOADED',
+                        message: 'Middleware loaded',
+                        file: `${folder}/${file}`
+                    });
                 } catch (err) {
-                    console.error(`[Middleware] Failed to load ${folder}/${file}:`, err.message);
+                    logger.error({
+                        code: 'MC_MIDDLEWARE_LOAD_FAILED',
+                        message: 'Failed to load middleware',
+                        file: `${folder}/${file}`,
+                        error: err.message,
+                        stack: err.stack
+                    });
                 }
             });
         });