mastercontroller 1.3.2 → 1.3.4

package/MasterActionFilters.js

@@ -1,9 +1,16 @@
 // version 2.0 - FIXED: Instance-level filters, async support, multiple filters
-var master = require('./MasterControl');
 const { logger } = require('./error/MasterErrorLogger');
 
 class MasterActionFilters {
 
+	// Lazy-load master to avoid circular dependency (Google-style Singleton pattern)
+	static get _master() {
+		if (!MasterActionFilters.__masterCache) {
+			MasterActionFilters.__masterCache = require('./MasterControl');
+		}
+		return MasterActionFilters.__masterCache;
+	}
+
 	constructor() {
 		// FIXED: Instance-level storage instead of module-level
 		// Each controller gets its own filter arrays
@@ -15,7 +22,7 @@ class MasterActionFilters {
 	// FIXED: Adds to array instead of overwriting
 	beforeAction(actionlist, func){
 		if (typeof func !== 'function') {
-			master.error.log("beforeAction callback not a function", "warn");
+			MasterActionFilters._master.error.log("beforeAction callback not a function", "warn");
 			return;
 		}
 
@@ -32,7 +39,7 @@ class MasterActionFilters {
 	// FIXED: Adds to array instead of overwriting
 	afterAction(actionlist, func){
 		if (typeof func !== 'function') {
-			master.error.log("afterAction callback not a function", "warn");
+			MasterActionFilters._master.error.log("afterAction callback not a function", "warn");
 			return;
 		}
 
@@ -112,7 +119,7 @@ class MasterActionFilters {
 					res.writeHead(500, { 'Content-Type': 'application/json' });
 					res.end(JSON.stringify({
 						error: 'Internal Server Error',
-						message: master.environmentType === 'development' ? error.message : 'Filter execution failed'
+						message: MasterActionFilters._master.environmentType === 'development' ? error.message : 'Filter execution failed'
 					}));
 				}
 
@@ -200,4 +207,12 @@ class MasterActionFilters {
 	}
 }
 
-master.extendController(MasterActionFilters);
+// Export and lazy register (prevents circular dependency - Spring/Angular pattern)
+module.exports = MasterActionFilters;
+
+setImmediate(() => {
+	const master = require('./MasterControl');
+	if (master && MasterActionFilters._master.extendController) {
+		MasterActionFilters._master.extendController(MasterActionFilters);
+	}
+});

package/MasterControl.js

@@ -319,21 +319,48 @@ class MasterControl {
                 'TemplateOverwrite': './TemplateOverwrite'
             };
 
-            for (const moduleName in internalModules) {
+            // Explicit module registration (prevents circular dependency issues)
+            // This is the Google-style dependency injection pattern
+            const moduleRegistry = {
+                'pipeline': { path: './MasterPipeline', exportName: 'MasterPipeline' },
+                'timeout': { path: './MasterTimeout', exportName: 'MasterTimeout' },
+                'errorRenderer': { path: './error/MasterErrorRenderer', exportName: 'MasterErrorRenderer' },
+                'error': { path: './error/MasterError', exportName: 'MasterError' },
+                'router': { path: './MasterRouter', exportName: 'MasterRouter' },
+                'request': { path: './MasterRequest', exportName: 'MasterRequest' },
+                'cors': { path: './MasterCors', exportName: 'MasterCors' },
+                'socket': { path: './MasterSocket', exportName: 'MasterSocket' },
+                'tempdata': { path: './MasterTemp', exportName: 'MasterTemp' },
+                'overwrite': { path: './TemplateOverwrite', exportName: 'TemplateOverwrite' },
+                'session': { path: './security/SessionSecurity', exportName: 'MasterSessionSecurity' }
+            };
+
+            for (const [name, config] of Object.entries(moduleRegistry)) {
                 try {
-                    const modulePath = internalModules[moduleName];
-                    const module = require(modulePath);
+                    const module = require(config.path);
+                    const ClassConstructor = module[config.exportName] || module;
 
-                    // Special handling for SessionSecurity to avoid circular dependency
-                    if (moduleName === 'SessionSecurity' && module.MasterSessionSecurity) {
-                        $that.session = new module.MasterSessionSecurity();
+                    if (ClassConstructor) {
+                        $that[name] = new ClassConstructor();
+                    } else {
+                        console.warn(`[MasterControl] Module ${name} does not export ${config.exportName}`);
                     }
-                    // Most modules auto-register via master.extend() at module load time
                 } catch (e) {
-                    console.error(`[MasterControl] Failed to load ${moduleName}:`, e && e.message);
+                    console.error(`[MasterControl] Failed to load ${name}:`, e.message);
                 }
             }
 
+            // Load view and controller extensions (these extend prototypes, not master instance)
+            try {
+                require('./MasterAction');
+                require('./MasterActionFilters');
+                require('./MasterHtml');
+                require('./MasterTemplate');
+                require('./MasterTools');
+            } catch (e) {
+                console.error('[MasterControl] Failed to load extensions:', e.message);
+            }
+
             // Initialize global error handlers
             setupGlobalErrorHandlers();
 

package/MasterCors.js

@@ -1,20 +1,27 @@
 // version 0.0.3 - robust origin handling (all envs), creds-safe reflection, function origins, extended Vary
-var master = require('./MasterControl');
 
 	// todo - res.setHeader('Access-Control-Request-Method', '*');
 class MasterCors{
 
+	// Lazy-load master to avoid circular dependency (Google-style lazy initialization)
+	get _master() {
+		if (!this.__masterCache) {
+			this.__masterCache = require('./MasterControl');
+		}
+		return this.__masterCache;
+	}
+
 	init(options){
 		if(options){
 			this.options = options;
 		}
 		else{
-			master.error.log("cors options missing", "warn");
+			this._master.error.log("cors options missing", "warn");
 		}
 
 		// Auto-register with pipeline if available
-		if (master.pipeline) {
-			master.pipeline.use(this.middleware());
+		if (this._master.pipeline) {
+			this._master.pipeline.use(this.middleware());
 		}
 
 		return this; // Chainable
@@ -34,7 +41,7 @@ class MasterCors{
 			this.configureMaxAge();
 		}
 		else{
-			master.error.log("cors response and requests missing", "warn");
+			this._master.error.log("cors response and requests missing", "warn");
 		}
 	}
 
@@ -198,4 +205,4 @@ class MasterCors{
 	}
 }
 
-master.extend("cors", MasterCors);
+module.exports = { MasterCors };

package/MasterHtml.js

@@ -1,6 +1,5 @@
 // version 0.0.25
 
-var master = require('./MasterControl');
 var fs = require('fs');
 var tempClass =  require('./MasterTemplate');
 var toolClass =  require('./MasterTools');
@@ -17,6 +16,14 @@ const { sanitizeTemplateHTML, sanitizeUserHTML, escapeHTML } = require('./securi
 
 class html {
 
+	// Lazy-load master to avoid circular dependency (Google-style lazy initialization)
+	get _master() {
+		if (!this.__masterCache) {
+			this.__masterCache = require('./MasterControl');
+		}
+		return this.__masterCache;
+	}
+
 	javaScriptSerializer(name, obj){
 		// SECURITY: Escape closing script tags and dangerous characters
 		const jsonStr = JSON.stringify(obj)
@@ -45,7 +52,7 @@ class html {
 			}
 
 			var partialViewUrl = `/app/views/${path}`;
-			var fullPath = master.router.currentRoute.root + partialViewUrl;
+			var fullPath = this._master.router.currentRoute.root + partialViewUrl;
 
 			const fileResult = safeReadFile(fs, fullPath);
 
@@ -59,8 +66,8 @@ class html {
 			}
 
 			var partialView = null;
-			if(master.overwrite.isTemplate){
-				partialView = master.overwrite.templateRender(data, "renderPartialView");
+			if(this._master.overwrite.isTemplate){
+				partialView = this._master.overwrite.templateRender(data, "renderPartialView");
 			}
 			else{
 				partialView =  temp.htmlBuilder(fileResult.content, data);
@@ -94,11 +101,11 @@ class html {
 
 		var styles = [];
 		var styleFolder = `/app/assets/stylesheets/`;
-		var rootLocation = master.router.currentRoute.root;
+		var rootLocation = this._master.router.currentRoute.root;
 		var extention = "";
 
-		if(master.router.currentRoute.isComponent === true){
-			extention = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
+		if(this._master.router.currentRoute.isComponent === true){
+			extention = tools.getBackSlashBySection(this._master.router.currentRoute.root, 2, "/");
 		}
 
 		var type = typeArray === undefined ? ["css"] : typeArray;
@@ -113,7 +120,7 @@ class html {
 					var fileExtension = file.replace(/^.*\./, '');
 					if(type.indexOf(fileExtension) >= 0){
 						var fileLocatoon = `${styleFolder}${file}`;
-						if(master.router.currentRoute.isComponent === true){
+						if(this._master.router.currentRoute.isComponent === true){
 							styles.push(`<link rel="stylesheet" type="text/${type}" href="/${extention}${fileLocatoon}">`);
 						}
 						else{
@@ -124,8 +131,8 @@ class html {
 		}
 	   	var partialView = null;
 		
-		if(master.overwrite.isTemplate){
-			partialView = master.overwrite.templateRender({}, "renderStyles");
+		if(this._master.overwrite.isTemplate){
+			partialView = this._master.overwrite.templateRender({}, "renderStyles");
 		}
 		else{
 			partialView =  temp.htmlBuilder(styles.join(""),{});	
@@ -148,11 +155,11 @@ class html {
 
 		var scripts = [];
 		var jsFolder =`/app/assets/javascripts/`;
-		var rootLocation = master.router.currentRoute.root;
+		var rootLocation = this._master.router.currentRoute.root;
 		var extention = "";
 		//components/auth/app/assets/javascripts/pages/changePassword.js
-		if(master.router.currentRoute.isComponent === true){
-			extention = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
+		if(this._master.router.currentRoute.isComponent === true){
+			extention = tools.getBackSlashBySection(this._master.router.currentRoute.root, 2, "/");
 		}
 
 		var type = typeArray === undefined ? ["js"] : typeArray;
@@ -166,7 +173,7 @@ class html {
 				var fileExtension = file.replace(/^.*\./, '');
 				if(type.indexOf(fileExtension) >= 0){
 					var fileLocatoon = `${jsFolder}${file}`;
-					if(master.router.currentRoute.isComponent === true){
+					if(this._master.router.currentRoute.isComponent === true){
 						scripts.push(`<script src="/${extention}${fileLocatoon}"></script>`);
 					}
 					else{
@@ -178,8 +185,8 @@ class html {
 
 		var partialView = null;
 
-		if(master.overwrite.isTemplate){
-			partialView = master.overwrite.templateRender({}, "renderScripts");
+		if(this._master.overwrite.isTemplate){
+			partialView = this._master.overwrite.templateRender({}, "renderScripts");
 		}
 		else{
 			partialView =  temp.htmlBuilder(scripts.join(""),{});	
@@ -195,10 +202,10 @@ class html {
 			return "";
 		}
 		else{
-			var rootLocation = master.router.currentRoute.root;
+			var rootLocation = this._master.router.currentRoute.root;
 			var jsFolder = `/app/assets/javascripts/`;
-			if(master.router.currentRoute.isComponent === true){
-				rootLocation = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
+			if(this._master.router.currentRoute.isComponent === true){
+				rootLocation = tools.getBackSlashBySection(this._master.router.currentRoute.root, 2, "/");
 				jsFolder = `${rootLocation}${jsFolder}`;
 			}
 			if(folderName){
@@ -215,9 +222,9 @@ class html {
 		}
 		else{
 			var styleFolder = `/app/assets/stylesheets/`;
-			var rootLocation = master.router.currentRoute.root;
-			if(master.router.currentRoute.isComponent === true){
-				rootLocation = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
+			var rootLocation = this._master.router.currentRoute.root;
+			if(this._master.router.currentRoute.isComponent === true){
+				rootLocation = tools.getBackSlashBySection(this._master.router.currentRoute.root, 2, "/");
 				styleFolder =  `${rootLocation}${styleFolder}`;
 			}
 			
@@ -565,7 +572,7 @@ class html {
 		if(data){
 			var newObj = Object.create(data);
 			newObj.prototype = newObj.__proto__;
-			master.view.extend(newObj);
+			this._master.view.extend(newObj);
 		}
 	}
 
@@ -630,5 +637,13 @@ class html {
 
 }
 
-master.extendView("html", html);
+// Export and lazy register (prevents circular dependency - Spring/Angular pattern)
+module.exports = html;
+
+setImmediate(() => {
+	const master = require('./MasterControl');
+	if (master && this._master.extendView) {
+		this._master.extendView("html", html);
+	}
+});
 

package/MasterPipeline.js

@@ -1,7 +1,6 @@
 // MasterPipeline - Middleware Pipeline System
 // version 1.0
 
-var master = require('./MasterControl');
 const { logger } = require('./error/MasterErrorLogger');
 
 class MasterPipeline {
@@ -10,6 +9,14 @@ class MasterPipeline {
         this.errorHandlers = [];
     }
 
+    // Lazy-load master to avoid circular dependency (Google-style lazy initialization)
+    get _master() {
+        if (!this.__masterCache) {
+            this.__masterCache = require('./MasterControl');
+        }
+        return this.__masterCache;
+    }
+
     /**
      * Use: Add middleware that processes request/response
      *
@@ -18,7 +25,7 @@ class MasterPipeline {
      * - next: Function to call next middleware in chain
      *
      * Example:
-     *   master.use(async (ctx, next) => {
+     *   this._master.use(async (ctx, next) => {
      *       console.log('Before');
      *       await next();
      *       console.log('After');
@@ -49,7 +56,7 @@ class MasterPipeline {
      * - Must send response
      *
      * Example:
-     *   master.run(async (ctx) => {
+     *   this._master.run(async (ctx) => {
      *       ctx.response.end('Hello World');
      *   });
      *
@@ -78,7 +85,7 @@ class MasterPipeline {
      * - configure: Function that receives a branch pipeline
      *
      * Example:
-     *   master.map('/api/*', (api) => {
+     *   this._master.map('/api/*', (api) => {
      *       api.use(authMiddleware);
      *       api.use(jsonMiddleware);
      *   });
@@ -129,7 +136,7 @@ class MasterPipeline {
      * - next: Pass to next error handler or rethrow
      *
      * Example:
-     *   master.useError(async (err, ctx, next) => {
+     *   this._master.useError(async (err, ctx, next) => {
      *       if (err.statusCode === 404) {
      *           ctx.response.statusCode = 404;
      *           ctx.response.end('Not Found');
@@ -276,7 +283,7 @@ class MasterPipeline {
             : (options.folders || ['middleware']);
 
         folders.forEach(folder => {
-            const dir = path.join(master.root, folder);
+            const dir = path.join(this._master.root, folder);
             if (!fs.existsSync(dir)) {
                 console.warn(`[Middleware] Folder not found: ${folder}`);
                 return;
@@ -340,5 +347,5 @@ class MasterPipeline {
     }
 }
 
-// Register with master
-master.extend("pipeline", MasterPipeline);
+// Export for MasterControl to register (prevents circular dependency)
+module.exports = { MasterPipeline };

package/MasterRequest.js

@@ -1,7 +1,6 @@
 
 // version 0.0.2
 
-var master = require('./MasterControl');
 var url = require('url');
 const StringDecoder = require('string_decoder').StringDecoder;
 var qs = require('qs');
@@ -15,6 +14,14 @@ class MasterRequest{
     request = {};
     response = {};
 
+    // Lazy-load master to avoid circular dependency (Google-style lazy initialization)
+    get _master() {
+        if (!this.__masterCache) {
+            this.__masterCache = require('./MasterControl');
+        }
+        return this.__masterCache;
+    }
+
    init(options){
      if(options){
         this.options = {};
@@ -403,8 +410,8 @@ class MasterRequest{
   // have a clear all object that you can run that will delete all rununing objects
     clear(code, end){
         this.parsedURL = {}; 
-        master.action.close(this.response, code, contentTypeManager.parse(this.request), end);
+        this._master.action.close(this.response, code, contentTypeManager.parse(this.request), end);
     }
 }
 
-master.extend("request", MasterRequest);
+module.exports = { MasterRequest };

package/MasterRouter.js

@@ -1,6 +1,5 @@
 // version 0.0.250
 
-var master = require('./MasterControl');
 var toolClass =  require('./MasterTools');
 const EventEmitter = require("events");
 var path = require('path');
@@ -112,7 +111,7 @@ const isDevelopment = process.env.NODE_ENV !== 'production' && process.env.maste
     try{
             // Ensure routes is an array
             if(!Array.isArray(routeList)){
-                master.error.log(`route list is not an array`, "error");
+                this._master.error.log(`route list is not an array`, "error");
                 return -1;
             }
 
@@ -150,7 +149,7 @@ const isDevelopment = process.env.NODE_ENV !== 'production' && process.env.maste
                             if(typeof routeList[item].constraint === "function"){
 
                                 var newObj = {};
-                                //tools.combineObjects(newObj, master.controllerList);
+                                //tools.combineObjects(newObj, this._master.controllerList);
                                 newObj.next = function(){
                                     currentRoute.root = root;
                                     currentRoute.pathName = requestObject.pathName;
@@ -239,9 +238,9 @@ const isDevelopment = process.env.NODE_ENV !== 'production' && process.env.maste
 };
 
 var loadScopedListClasses = function(){
-    for (var key in master._scopedList) {
-        var className =  master._scopedList[key];
-        master.requestList[key] = new className();
+    for (var key in this._master._scopedList) {
+        var className =  this._master._scopedList[key];
+        this._master.requestList[key] = new className();
     };
 };
 
@@ -272,6 +271,14 @@ class MasterRouter {
     currentRouteName = null
     _routes = {}
 
+    // Lazy-load master to avoid circular dependency (Google-style lazy initialization)
+    get _master() {
+        if (!this.__masterCache) {
+            this.__masterCache = require('./MasterControl');
+        }
+        return this.__masterCache;
+    }
+
     start(){
         var $that = this;
         return {
@@ -417,8 +424,8 @@ class MasterRouter {
          const requestId = `${Date.now()}-${Math.random()}`;
          performanceTracker.start(requestId, requestObject);
 
-         tools.combineObjects(master.requestList, requestObject);
-         requestObject = master.requestList;
+         tools.combineObjects(this._master.requestList, requestObject);
+         requestObject = this._master.requestList;
          var Control = null;
 
          try{
@@ -444,7 +451,7 @@ class MasterRouter {
                  }
              }
 
-             tools.combineObjectPrototype(Control, master.controllerList);
+             tools.combineObjectPrototype(Control, this._master.controllerList);
              Control.prototype.__namespace = Control.name;
              Control.prototype.__requestObject = requestObject;
              Control.prototype.__currentRoute = currentRoute;
@@ -564,4 +571,4 @@ class MasterRouter {
     
 }
 
-master.extend("router", MasterRouter);
+module.exports = { MasterRouter };

package/MasterSocket.js

@@ -1,6 +1,5 @@
 // version 0.1.2
 
-var master = require('./MasterControl');
 const { Server } = require('socket.io');
 const fs = require('fs');
 const path = require('path');
@@ -10,9 +9,17 @@ var jsUcfirst = function(string){
 };
 
 class MasterSocket{
-    
+
+    // Lazy-load master to avoid circular dependency (Google-style lazy initialization)
+    get _master() {
+        if (!this.__masterCache) {
+            this.__masterCache = require('./MasterControl');
+        }
+        return this.__masterCache;
+    }
+
     init(serverOrIo, options = {}){
-        this._baseurl = master.root;
+        this._baseurl = this._master.root;
 
         // Build Socket.IO options using master cors initializer when available
         const defaults = this._buildDefaultIoOptions();
@@ -23,14 +30,14 @@ class MasterSocket{
             // It's already an io instance
             this.io = serverOrIo;
         } else {
-            // Prefer explicit server, fallback to master.server
-            const httpServer = serverOrIo || master.server;
+            // Prefer explicit server, fallback to this._master.server
+            const httpServer = serverOrIo || this._master.server;
             if (!httpServer) {
                 throw new Error(
                     'MasterSocket.init requires an HTTP server. ' +
-                    'Either pass the server explicitly: master.socket.init(server) ' +
-                    'or call master.start(server) before socket.init(). ' +
-                    'Current initialization order issue: socket.init() called before master.start()'
+                    'Either pass the server explicitly: this._master.socket.init(server) ' +
+                    'or call this._master.start(server) before socket.init(). ' +
+                    'Current initialization order issue: socket.init() called before this._master.start()'
                 );
             }
             this.io = new Server(httpServer, ioOptions);
@@ -61,7 +68,7 @@ class MasterSocket{
 
     _loadCorsConfig(){
         try {
-            const cfgPath = path.join(master.root, 'config', 'initializers', 'cors.json');
+            const cfgPath = path.join(this._master.root, 'config', 'initializers', 'cors.json');
             if (fs.existsSync(cfgPath)) {
                 const raw = fs.readFileSync(cfgPath, 'utf8');
                 return JSON.parse(raw);
@@ -81,8 +88,8 @@ class MasterSocket{
                     try{
                         // MasterSocket.load expects [action, payload]
                         const data = [eventName, payload];
-                        if (master && master.socket && typeof master.socket.load === 'function') {
-                            master.socket.load(data, socket, io);
+                        if (master && this._master.socket && typeof this._master.socket.load === 'function') {
+                            this._master.socket.load(data, socket, io);
                         }
                     }catch(e){
                         try { console.error('Socket routing error:', e?.message || e); } catch(_){}
@@ -132,14 +139,14 @@ class MasterSocket{
                 bs[data[0]](data[1], socket, io);
             }
             catch(ex){
-                master.error.log(ex, "warn");
+                this._master.error.log(ex, "warn");
             }
 
         }
     }
 }
 
-master.extend("socket", MasterSocket);
+module.exports = { MasterSocket };
 
 // shallow+deep merge helper
 function isObject(item) {
@@ -164,19 +171,19 @@ function mergeDeep(target, source) {
  * 
  * 
  * 
- * It loads CORS and methods from config/initializers/cors.json automatically. During init, it reads master.root/config/initializers/cors.json and builds the Socket.IO options from:
+ * It loads CORS and methods from config/initializers/cors.json automatically. During init, it reads this._master.root/config/initializers/cors.json and builds the Socket.IO options from:
 origin, credentials, methods, allowedHeaders (if present)
 transports defaults to ['websocket', 'polling']
 If cors.json is missing or a field isn’t present, it falls back to:
 cors: { origin: true, credentials: true, methods: ['GET','POST'] }
 transports: ['websocket','polling']
 You can still override anything explicitly:
-master.socket.init(master.server, { cors: { origin: ['https://foo.com'], methods: ['GET','POST','PUT'] }, transports: ['websocket'] })
+this._master.socket.init(this._master.server, { cors: { origin: ['https://foo.com'], methods: ['GET','POST','PUT'] }, transports: ['websocket'] })
 
-If you don’t pass a server/io, init() falls back to master.server:
-master.socket.init() → uses master.server automatically
+If you don’t pass a server/io, init() falls back to this._master.server:
+this._master.socket.init() → uses this._master.server automatically
 You can pass overrides as the second arg:
-master.socket.init(undefined, { cors: { origin: ['https://app.com'] }, transports: ['websocket'] })
+this._master.socket.init(undefined, { cors: { origin: ['https://app.com'] }, transports: ['websocket'] })
 Or pass a prebuilt io:
-const io = new Server(master.server, opts); master.socket.init(io)
+const io = new Server(this._master.server, opts); this._master.socket.init(io)
  */

package/MasterTemp.js

@@ -1,17 +1,24 @@
 // version 0.0.3
-var master = require('./MasterControl');
 
 class MasterTemp{
 
     temp = {};
 
+    // Lazy-load master to avoid circular dependency (Google-style lazy initialization)
+    get _master() {
+        if (!this.__masterCache) {
+            this.__masterCache = require('./MasterControl');
+        }
+        return this.__masterCache;
+    }
+
     add(name, data){
 
         if(name !== "add" && name !== "clear"){
             this[name] = data;
         }
         else{
-            master.error.log("cannot use tempdata name add or clear", "warn");
+            this._master.error.log("cannot use tempdata name add or clear", "warn");
         }
     }
 
@@ -27,4 +34,4 @@ class MasterTemp{
 
 }
 
-master.extend("tempdata", MasterTemp);
+module.exports = { MasterTemp };