mastercontroller 1.2.11 → 1.2.13

package/MasterErrorMiddleware.js

@@ -0,0 +1,407 @@
+/**
+ * MasterErrorMiddleware - Request/Response error handling middleware
+ * Version: 1.0.0
+ */
+
+const { handleControllerError, handleRoutingError, sendErrorResponse } = require('./MasterBackendErrorHandler');
+const { logger } = require('./MasterErrorLogger');
+
+const isDevelopment = process.env.NODE_ENV !== 'production' && process.env.master === 'development';
+
+/**
+ * Global error handler middleware
+ * Wrap all controller actions with this
+ */
+function errorHandlerMiddleware(handler, controllerName, actionName) {
+  return async function wrappedHandler(requestObject) {
+    const startTime = Date.now();
+
+    try {
+      // Execute the actual handler
+      const result = await Promise.resolve(handler.call(this, requestObject));
+
+      // Log successful request in development
+      if (isDevelopment) {
+        const duration = Date.now() - startTime;
+        logger.debug({
+          code: 'MC_INFO_REQUEST_SUCCESS',
+          message: `${controllerName}#${actionName} completed`,
+          context: {
+            duration,
+            path: requestObject.pathName,
+            method: requestObject.type
+          }
+        });
+      }
+
+      return result;
+
+    } catch (error) {
+      const duration = Date.now() - startTime;
+
+      // Handle the error
+      const mcError = handleControllerError(
+        error,
+        controllerName,
+        actionName,
+        requestObject.pathName
+      );
+
+      // Send error response
+      sendErrorResponse(
+        requestObject.response,
+        mcError,
+        requestObject.pathName
+      );
+
+      // Log to monitoring
+      logger.error({
+        code: mcError.code,
+        message: mcError.message,
+        controller: controllerName,
+        action: actionName,
+        route: requestObject.pathName,
+        method: requestObject.type,
+        duration,
+        originalError: error,
+        stack: error.stack
+      });
+
+      // Don't re-throw - error has been handled
+      return null;
+    }
+  };
+}
+
+/**
+ * Request logging middleware
+ */
+function requestLoggerMiddleware() {
+  return function(requestObject, next) {
+    const startTime = Date.now();
+
+    logger.info({
+      code: 'MC_INFO_REQUEST_START',
+      message: `${requestObject.type} ${requestObject.pathName}`,
+      context: {
+        method: requestObject.type,
+        path: requestObject.pathName,
+        params: requestObject.params,
+        query: requestObject.query,
+        ip: requestObject.request.connection?.remoteAddress
+      }
+    });
+
+    // Continue to next middleware
+    if (typeof next === 'function') {
+      next();
+    }
+  };
+}
+
+/**
+ * 404 handler middleware
+ */
+function notFoundMiddleware(requestObject) {
+  const mcError = handleRoutingError(
+    requestObject.pathName,
+    [] // Would need to pass available routes here
+  );
+
+  sendErrorResponse(
+    requestObject.response,
+    mcError,
+    requestObject.pathName
+  );
+}
+
+/**
+ * Extract user code context from stack trace
+ */
+function extractUserCodeContext(stack) {
+  if (!stack) return null;
+
+  const lines = stack.split('\n');
+  const userFiles = [];
+  const frameworkFiles = [];
+
+  for (const line of lines) {
+    // Skip the error message line
+    if (!line.trim().startsWith('at ')) continue;
+
+    // Extract file path from stack line
+    const match = line.match(/\((.+?):(\d+):(\d+)\)|at (.+?):(\d+):(\d+)/);
+    if (!match) continue;
+
+    const filePath = match[1] || match[4];
+    const lineNum = match[2] || match[5];
+    const colNum = match[3] || match[6];
+
+    if (!filePath) continue;
+
+    // Categorize as user code or framework code
+    const isFramework = filePath.includes('node_modules/mastercontroller');
+    const isNodeInternal = filePath.includes('node:internal') || filePath.includes('/lib/internal/');
+
+    if (isNodeInternal) continue;
+
+    const fileInfo = {
+      file: filePath,
+      line: lineNum,
+      column: colNum,
+      location: `${filePath}:${lineNum}:${colNum}`
+    };
+
+    if (isFramework) {
+      frameworkFiles.push(fileInfo);
+    } else {
+      userFiles.push(fileInfo);
+    }
+  }
+
+  return {
+    userFiles,
+    frameworkFiles,
+    triggeringFile: userFiles[0] || frameworkFiles[0] || null
+  };
+}
+
+/**
+ * Uncaught exception handler
+ */
+function setupGlobalErrorHandlers() {
+  // Handle uncaught exceptions
+  process.on('uncaughtException', (error) => {
+    console.error('[MasterController] Uncaught Exception:', error);
+
+    // Extract context from stack trace
+    const context = extractUserCodeContext(error.stack);
+
+    // Build enhanced error message
+    let enhancedMessage = `Uncaught exception: ${error.message}`;
+
+    if (context && context.triggeringFile) {
+      enhancedMessage += `\n\n🔍 Error Location: ${context.triggeringFile.location}`;
+    }
+
+    if (context && context.userFiles.length > 0) {
+      enhancedMessage += `\n\n📂 Your Code Involved:`;
+      context.userFiles.forEach((file, i) => {
+        if (i < 3) { // Show first 3 user files
+          enhancedMessage += `\n   ${i + 1}. ${file.location}`;
+        }
+      });
+    }
+
+    if (context && context.frameworkFiles.length > 0) {
+      enhancedMessage += `\n\n🔧 Framework Files Involved:`;
+      context.frameworkFiles.forEach((file, i) => {
+        if (i < 2) { // Show first 2 framework files
+          enhancedMessage += `\n   ${i + 1}. ${file.location}`;
+        }
+      });
+    }
+
+    console.error(enhancedMessage);
+
+    logger.fatal({
+      code: 'MC_ERR_UNCAUGHT_EXCEPTION',
+      message: enhancedMessage,
+      originalError: error,
+      stack: error.stack,
+      context: context
+    });
+
+    // Give logger time to write, then exit
+    setTimeout(() => {
+      process.exit(1);
+    }, 1000);
+  });
+
+  // Handle unhandled promise rejections
+  process.on('unhandledRejection', (reason, promise) => {
+    console.error('[MasterController] Unhandled Rejection:', reason);
+
+    // Extract context from stack trace if available
+    const context = reason?.stack ? extractUserCodeContext(reason.stack) : null;
+
+    // Build enhanced error message
+    let enhancedMessage = `Unhandled promise rejection: ${reason}`;
+
+    if (context && context.triggeringFile) {
+      enhancedMessage += `\n\n🔍 Error Location: ${context.triggeringFile.location}`;
+    }
+
+    if (context && context.userFiles.length > 0) {
+      enhancedMessage += `\n\n📂 Your Code Involved:`;
+      context.userFiles.forEach((file, i) => {
+        if (i < 3) { // Show first 3 user files
+          enhancedMessage += `\n   ${i + 1}. ${file.location}`;
+        }
+      });
+    }
+
+    if (enhancedMessage !== `Unhandled promise rejection: ${reason}`) {
+      console.error(enhancedMessage);
+    }
+
+    logger.error({
+      code: 'MC_ERR_UNHANDLED_REJECTION',
+      message: enhancedMessage,
+      originalError: reason,
+      stack: reason?.stack,
+      context: context
+    });
+  });
+
+  // Handle warnings
+  process.on('warning', (warning) => {
+    if (isDevelopment) {
+      console.warn('[MasterController] Warning:', warning);
+    }
+
+    logger.warn({
+      code: 'MC_WARN_PROCESS_WARNING',
+      message: warning.message,
+      context: {
+        name: warning.name,
+        stack: warning.stack
+      }
+    });
+  });
+}
+
+/**
+ * Safe file reader with error handling
+ */
+function safeReadFile(fs, filePath, encoding = 'utf8') {
+  try {
+    return {
+      success: true,
+      content: fs.readFileSync(filePath, encoding),
+      error: null
+    };
+  } catch (error) {
+    const { handleFileReadError } = require('./MasterBackendErrorHandler');
+    const mcError = handleFileReadError(error, filePath);
+
+    return {
+      success: false,
+      content: null,
+      error: mcError
+    };
+  }
+}
+
+/**
+ * Safe file existence check
+ */
+function safeFileExists(fs, filePath) {
+  try {
+    return fs.existsSync(filePath);
+  } catch (error) {
+    logger.warn({
+      code: 'MC_WARN_FILE_CHECK',
+      message: `Could not check if file exists: ${filePath}`,
+      originalError: error
+    });
+    return false;
+  }
+}
+
+/**
+ * Wrap controller class with error handling
+ */
+function wrapController(ControllerClass, controllerName) {
+  const wrappedMethods = {};
+
+  // Get all methods from the controller
+  const methodNames = Object.getOwnPropertyNames(ControllerClass.prototype);
+
+  methodNames.forEach(methodName => {
+    if (methodName === 'constructor') return;
+
+    const originalMethod = ControllerClass.prototype[methodName];
+
+    if (typeof originalMethod === 'function') {
+      // Wrap each method with error handling
+      wrappedMethods[methodName] = errorHandlerMiddleware(
+        originalMethod,
+        controllerName,
+        methodName
+      );
+    }
+  });
+
+  // Create new class with wrapped methods
+  const WrappedController = class extends ControllerClass {
+    constructor(...args) {
+      super(...args);
+
+      // Apply wrapped methods
+      Object.keys(wrappedMethods).forEach(methodName => {
+        this[methodName] = wrappedMethods[methodName].bind(this);
+      });
+    }
+  };
+
+  return WrappedController;
+}
+
+/**
+ * Performance tracking middleware
+ */
+function performanceMiddleware() {
+  const requests = new Map();
+
+  return {
+    start(requestId, requestObject) {
+      requests.set(requestId, {
+        startTime: Date.now(),
+        path: requestObject.pathName,
+        method: requestObject.type
+      });
+    },
+
+    end(requestId) {
+      const req = requests.get(requestId);
+      if (!req) return;
+
+      const duration = Date.now() - req.startTime;
+
+      if (duration > 1000) {
+        logger.warn({
+          code: 'MC_WARN_SLOW_REQUEST',
+          message: `Slow request detected (${duration}ms)`,
+          context: {
+            duration,
+            path: req.path,
+            method: req.method
+          }
+        });
+      }
+
+      requests.delete(requestId);
+    },
+
+    getStats() {
+      return {
+        activeRequests: requests.size,
+        requests: Array.from(requests.values())
+      };
+    }
+  };
+}
+
+const performanceTracker = performanceMiddleware();
+
+module.exports = {
+  errorHandlerMiddleware,
+  requestLoggerMiddleware,
+  notFoundMiddleware,
+  setupGlobalErrorHandlers,
+  safeReadFile,
+  safeFileExists,
+  wrapController,
+  performanceTracker
+};

package/MasterHtml.js

@@ -1,4 +1,4 @@
-// version 0.0.23
+// version 0.0.24
 
 var master = require('./MasterControl');
 var fs = require('fs');
@@ -7,6 +7,14 @@ var toolClass =  require('./MasterTools');
 var temp = new tempClass();
 var tools = new toolClass();
 
+// Enhanced error handling
+const { handleTemplateError } = require('./MasterBackendErrorHandler');
+const { safeReadFile, safeFileExists } = require('./MasterErrorMiddleware');
+const { logger } = require('./MasterErrorLogger');
+
+// Security - Sanitization
+const { sanitizeTemplateHTML, sanitizeUserHTML, escapeHTML } = require('./MasterSanitizer');
+
 class html {
 
 	javaScriptSerializer(name, obj){
@@ -17,21 +25,41 @@ class html {
 
 	// render partial views
 	renderPartial(path, data){
-		
+		try {
+			var partialViewUrl = `/app/views/${path}`;
+			var fullPath = master.router.currentRoute.root + partialViewUrl;
+
+			const fileResult = safeReadFile(fs, fullPath);
+
+			if (!fileResult.success) {
+				logger.warn({
+					code: 'MC_ERR_VIEW_NOT_FOUND',
+					message: `Partial view not found: ${path}`,
+					file: fullPath
+				});
+				return `<!-- Partial view not found: ${path} -->`;
+			}
 
-		var partialViewUrl = `/app/views/${path}`;
-		var filepartialView = fs.readFileSync(master.router.currentRoute.root + partialViewUrl, 'utf8');
+			var partialView = null;
+			if(master.overwrite.isTemplate){
+				partialView = master.overwrite.templateRender(data, "renderPartialView");
+			}
+			else{
+				partialView =  temp.htmlBuilder(fileResult.content, data);
+			}
 
-		var partialView = null;
-		if(master.overwrite.isTemplate){
-			partialView = master.overwrite.templateRender(data, "renderPartialView");
-		}
-		else{
-			partialView =  temp.htmlBuilder(filepartialView, data);	
+			return partialView;
+		} catch (error) {
+			const mcError = handleTemplateError(error, path, data);
+			logger.error({
+				code: mcError.code,
+				message: mcError.message,
+				file: path,
+				originalError: error
+			});
+			return `<!-- Error rendering partial: ${path} -->`;
 		}
 
-		return partialView;
-
 	}
 
 	   // render all your link tags styles given the folder location
@@ -447,7 +475,7 @@ class html {
 		return rangeField;
 	}
 
-	   // allows you to add data object to params 
+	   // allows you to add data object to params
 	addDataToParams(data){
 
 		//loop through data and add it to new oobjects prototype
@@ -457,7 +485,66 @@ class html {
 			master.view.extend(newObj);
 		}
 	}
-	
+
+	// ==================== Security Methods ====================
+
+	/**
+	 * Sanitize user-generated HTML content
+	 * Use this for any HTML that comes from user input
+	 * @param {string} html - HTML content to sanitize
+	 * @returns {string} - Sanitized HTML
+	 */
+	sanitizeHTML(html) {
+		return sanitizeUserHTML(html);
+	}
+
+	/**
+	 * Escape HTML special characters
+	 * Use this to display user input as text (not HTML)
+	 * @param {string} text - Text to escape
+	 * @returns {string} - Escaped text safe for display
+	 */
+	escapeHTML(text) {
+		return escapeHTML(text);
+	}
+
+	/**
+	 * Render user content safely
+	 * Sanitizes HTML and wraps in container
+	 * @param {string} content - User-generated content
+	 * @param {string} containerTag - HTML tag to wrap content (default: div)
+	 * @param {object} attrs - Attributes for container
+	 * @returns {string} - Safe HTML
+	 */
+	renderUserContent(content, containerTag = 'div', attrs = {}) {
+		const sanitized = sanitizeUserHTML(content);
+
+		let attrStr = '';
+		for (const [key, value] of Object.entries(attrs)) {
+			attrStr += ` ${key}="${escapeHTML(String(value))}"`;
+		}
+
+		return `<${containerTag}${attrStr}>${sanitized}</${containerTag}>`;
+	}
+
+	/**
+	 * Create safe text node content
+	 * @param {string} text - Text content
+	 * @returns {string} - HTML-escaped text
+	 */
+	textNode(text) {
+		return escapeHTML(text);
+	}
+
+	/**
+	 * Create safe attribute value
+	 * @param {string} value - Attribute value
+	 * @returns {string} - Escaped and quoted value
+	 */
+	safeAttr(value) {
+		return `"${escapeHTML(String(value))}"`;
+	}
+
 }
 
 master.extendView("html", html);