mastercontroller 1.2.5 → 1.2.7

package/LICENSE

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2025 Alexander Rich
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

package/MasterControl.js

@@ -151,19 +151,25 @@ class MasterControl {
 
     component(folderLocation, innerFolder){
 
-        var rootFolderLocation = `${this.root}/${folderLocation}/${innerFolder}`;
-        var search = `${rootFolderLocation}/**/*config.js`;
-        var files = globSearch.sync(search, rootFolderLocation);
-        require(files[0]);
-        var searchRoutes = `${rootFolderLocation}/**/*routes.js`;
-        var routeFiles = globSearch.sync(searchRoutes, rootFolderLocation);
-        var route = routeFiles[0];
+        var rootFolderLocation = path.join(this.root, folderLocation, innerFolder);
+        var files = globSearch.sync("**/*config.js", { cwd: rootFolderLocation, absolute: true });
+        if(files && files.length > 0){
+            require(files[0]);
+        }else{
+            master.error.log(`Cannot find config file under ${rootFolderLocation}`, "error");
+        }
+        var routeFiles = globSearch.sync("**/*routes.js", { cwd: rootFolderLocation, absolute: true });
+        var route = routeFiles && routeFiles.length > 0 ? routeFiles[0] : null;
         var routeObject = {
             isComponent : true, 
             root : rootFolderLocation
         }
         this.router.setup(routeObject);
-        require(route);
+        if(route){
+            require(route);
+        }else{
+            master.error.log(`Cannot find routes file under ${rootFolderLocation}`, "error");
+        }
     }
 
 
@@ -464,15 +470,18 @@ class MasterControl {
     }
 
     startMVC(foldername){
-        var rootFolderLocation = `${this.root}/${foldername}`;
-        var search = `${rootFolderLocation}/**/*routes.js`;
-        var files = globSearch.sync(search, rootFolderLocation);
+        var rootFolderLocation = path.join(this.root, foldername);
+        var files = globSearch.sync("**/*routes.js", { cwd: rootFolderLocation, absolute: true });
         var route = {
             isComponent : false, 
             root : `${this.root}`
         }
         this.router.setup(route);
-        require(files[0]);
+        if(files && files.length > 0){
+            require(files[0]);
+        }else{
+            master.error.log(`Cannot find routes file under ${rootFolderLocation}`, "error");
+        }
     }
     
     

package/MasterRouter.js

@@ -3,6 +3,7 @@
 var master = require('./MasterControl');
 var toolClass =  require('./MasterTools');
 const EventEmitter = require("events");
+var path = require('path');
 var currentRoute = {};
 var tools = new toolClass();
 
@@ -36,6 +37,17 @@ var tools = new toolClass();
     var root = routeObject.root;
     var isComponent = routeObject.isComponent;
     try{
+            // Ensure routes is an array
+            if(!Array.isArray(routeList)){
+                master.error.log(`route list is not an array`, "error");
+                return -1;
+            }
+
+            // No routes registered for this scope; skip silently
+            if(routeList.length === 0){
+                return -1;
+            }
+
             if(routeList.length > 0){
                 // loop through routes
                 for(var item in routeList){
@@ -86,10 +98,6 @@ var tools = new toolClass();
                 };
                 return -1;
             }
-            else{
-                master.error.log(`route list is not an array`, "error");
-                return -1;
-            }
         }
         catch(e){
             throw new Error("Error processing routes: " + e.stack); 
@@ -251,12 +259,15 @@ class MasterRouter {
 
          tools.combineObjects(master.requestList, requestObject);
          requestObject = master.requestList;
-         var Control = require(`${currentRoute.root}/app/controllers/${tools.firstLetterlowercase(requestObject.toController)}Controller`);
-         if(Control === null){
-            Control = require(`${currentRoute.root}/app/controllers/${tools.firstLetterUppercase(requestObject.toController)}Controller`);
-            if(Control === null){
-                console.log(`Cannot find controller name - ${requestObject.toController}`);
-            }
+         var Control = null;
+         try{
+             Control = require(path.join(currentRoute.root, 'app', 'controllers', `${tools.firstLetterlowercase(requestObject.toController)}Controller`));
+         }catch(e){
+             try{
+                 Control = require(path.join(currentRoute.root, 'app', 'controllers', `${tools.firstLetterUppercase(requestObject.toController)}Controller`));
+             }catch(e2){
+                 console.log(`Cannot find controller name - ${requestObject.toController}`);
+             }
          }
          tools.combineObjectPrototype(Control, master.controllerList);
          Control.prototype.__namespace = Control.name;

package/README.md

@@ -54,5 +54,5 @@ Use `setupServer('https', credentials)` or configure via environment TLS; see do
 - If keeping TLS in Node, harden TLS and manage cert rotation.
 
 ### License
-ISC
+MIT
 

package/package.json

@@ -8,7 +8,7 @@
   },
   "description": "A class library that makes using the Master Framework a breeze",
   "homepage": "https://github.com/Tailor/MasterController#readme",
-  "license": "ISC",
+  "license": "MIT",
   "main": "MasterControl.js",
   "name": "mastercontroller",
   "repository": {
@@ -18,5 +18,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "1.2.5"
+  "version": "1.2.7"
 }