mythix 1.1.2 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Mythix is a NodeJS web-app framework",
   "main": "src/index.js",
   "scripts": {

package/src/application.js

@@ -299,7 +299,10 @@ class Application extends EventEmitter {
   }
 
   async stop(exitCode) {
-    if (this.isStopping || !this.isStarted)
+    if (this.isStopping)
+      process.exit(1);
+
+    if (!this.isStarted)
       return;
 
     try {

package/src/controllers/controller-base.js

@@ -83,11 +83,17 @@ class ControllerBase {
 
   getModel(name) {
     let application = this.getApplication();
+    if (typeof application.getModel !== 'function')
+      return;
+
     return application.getModel(name);
   }
 
   getModels() {
     let application = this.getApplication();
+    if (typeof application.getModels !== 'function')
+      return {};
+
     return application.getModels();
   }
 
@@ -164,6 +170,9 @@ class ControllerBase {
   async handleIncomingRequest(request, response, { route, controllerMethod, startTime, params, query /* , controller, controllerInstance, */ }) {
     this.route = route;
 
+    if (typeof this[controllerMethod] !== 'function')
+      this.throwInternalServerError(`Specified route handler named "${this.constructor.name}::${controllerMethod}" not found.`);
+
     return await this[controllerMethod].call(this, { params, query, body: request.body, request, response, startTime }, this.getModels());
   }
 

package/src/controllers/controller-utils.js

@@ -296,7 +296,7 @@ function compileRoutes(routes, customParserTypes, _context) {
         accept:   '*',
         priority,
       },
-      getRouteProperties(route),
+      route || {},
       {
         path: path.replace(/\/{2,}/g, '/'),
       },
@@ -362,7 +362,7 @@ function compileRoutes(routes, customParserTypes, _context) {
       addRoute(theseRoutes, route, newPath, basePriority + i);
     }
 
-    if (ROUTE_PROPERTIES.indexOf(key) >= 0)
+    if (ROUTE_PROPERTIES.indexOf(key) >= 0 || Nife.instanceOf(route, 'boolean', 'string', 'number', 'bigint'))
       continue;
 
     let thisRouteName = (isArray) ? routeName : key;

package/src/http-server/http-server.js

@@ -116,6 +116,8 @@ class HTTPServer {
   }
 
   executeMiddleware(middleware, request, response) {
+    let { route, params } = (this.findFirstMatchingRoute(request, this.routes) || {});
+
     return new Promise((resolve, reject) => {
       if (Nife.isEmpty(middleware)) {
         resolve();
@@ -133,6 +135,9 @@ class HTTPServer {
       if (!request.Sequelize)
         request.Sequelize = Sequelize;
 
+      request.route = route;
+      request.params = params;
+
       let middlewareIndex = 0;
       const next = async () => {
         if (middlewareIndex >= middleware.length)

package/src/modules/file-watcher-module.js

@@ -69,10 +69,14 @@ class FileWatcherModule extends BaseModule {
     return this.watchedPathsCache;
   }
 
-  isWatchedFile(options, filePath) {
-    let monitoredPaths = this.getMonitoredPaths(options);
+  isWatchedFile(_monitoredPaths, filePath) {
+    let monitoredPaths = Nife.toArray(_monitoredPaths);
+
     for (let i = 0, il = monitoredPaths.length; i < il; i++) {
       let monitoredPath = monitoredPaths[i];
+      if (!monitoredPath)
+        continue;
+
       if (filePath.substring(0, monitoredPath.length) === monitoredPath)
         return true;
     }
@@ -90,7 +94,8 @@ class FileWatcherModule extends BaseModule {
       if (!queueName)
         continue;
 
-      if (this.isWatchedFile(options, filePath))
+      let paths = moduleInstance.fileWatcherGetMonitorPaths(options);
+      if (this.isWatchedFile(paths, filePath))
         return queueName;
     }