mythix 2.6.2 → 2.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix",
-  "version": "2.6.2",
+  "version": "2.7.0",
   "description": "Mythix is a NodeJS web-app framework",
   "main": "src/index",
   "scripts": {
@@ -35,7 +35,7 @@
     "form-data": "^4.0.0",
     "luxon": "^3.0.4",
     "micromatch": "^4.0.5",
-    "mythix-orm": "^1.7.2",
+    "mythix-orm": "^1.8.0",
     "nife": "^1.12.1",
     "prompts": "^2.4.2"
   }

package/src/cli/cli-utils.js

@@ -274,7 +274,18 @@ function defineCommand(_commandName, definer, _parent) {
 
       let commandOptions  = commandContext[commandName] || {};
       let commandInstance = new Klass(application, commandOptions);
-      let result          = await commandInstance.execute.call(commandInstance, commandOptions, commandContext);
+
+      const doExecuteCommand = async () => {
+        return await commandInstance.execute.call(commandInstance, commandOptions, commandContext);
+      };
+
+      let dbConnection = (typeof application.getDBConnection === 'function') ? application.getDBConnection() : undefined;
+      let result;
+
+      if (dbConnection && typeof dbConnection.createContext === 'function')
+        result = await dbConnection.createContext(doExecuteCommand, dbConnection, dbConnection);
+      else
+        result = await doExecuteCommand();
 
       await application.stop(result || 0);
     } catch (error) {

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

@@ -301,22 +301,32 @@ class HTTPServer {
   }
 
   async sendRequestToController(request, response, context) {
-    let controllerInstance = context.controllerInstance;
+    const executeRequest = async () => {
+      let controllerInstance = context.controllerInstance;
 
-    // Compile query params
-    context.query = this.compileQueryParams(context.route, context.query, (context.route && context.route.queryParams));
+      // Compile query params
+      context.query = this.compileQueryParams(context.route, context.query, (context.route && context.route.queryParams));
 
-    let route = context.route;
+      let route = context.route;
 
-    // Execute middleware if any exists
-    let middleware = (typeof controllerInstance.getMiddleware === 'function') ? controllerInstance.getMiddleware.call(controllerInstance, context) : [];
-    if (route && Nife.instanceOf(route.middleware, 'array') && Nife.isNotEmpty(route.middleware))
-      middleware = route.middleware.concat((middleware) ? middleware : []);
+      // Execute middleware if any exists
+      let middleware = (typeof controllerInstance.getMiddleware === 'function') ? controllerInstance.getMiddleware.call(controllerInstance, context) : [];
+      if (route && Nife.instanceOf(route.middleware, 'array') && Nife.isNotEmpty(route.middleware))
+        middleware = route.middleware.concat((middleware) ? middleware : []);
 
-    if (Nife.isNotEmpty(middleware))
-      await this.executeMiddleware(middleware, request, response);
+      if (Nife.isNotEmpty(middleware))
+        await this.executeMiddleware(middleware, request, response);
 
-    return await controllerInstance.handleIncomingRequest.apply(controllerInstance, [ request, response, context ]);
+      return await controllerInstance.handleIncomingRequest.apply(controllerInstance, [ request, response, context ]);
+    };
+
+    let application   = this.getApplication();
+    let dbConnection  = (typeof application.getDBConnection === 'function') ? application.getDBConnection() : undefined;
+
+    if (dbConnection && typeof dbConnection.createContext === 'function')
+      return await dbConnection.createContext(executeRequest, dbConnection, dbConnection);
+    else
+      return await executeRequest();
   }
 
   async baseRouter(request, response, next) {
@@ -361,10 +371,19 @@ class HTTPServer {
 
       let controllerResult = await this.sendRequestToController(request, response, context);
 
-      if (!(response.finished || response.statusMessage))
-        await controllerInstance.handleOutgoingResponse(controllerResult, request, response, context);
-      else if (!response.finished)
+      if (!(response.finished || response.statusMessage)) {
+        const handleOutgoing = async () => {
+          return await controllerInstance.handleOutgoingResponse(controllerResult, request, response, context);
+        };
+
+        let dbConnection = (typeof application.getDBConnection === 'function') ? application.getDBConnection() : undefined;
+        if (dbConnection && typeof dbConnection.createContext === 'function')
+          await dbConnection.createContext(handleOutgoing, dbConnection, dbConnection);
+        else
+          await handleOutgoing();
+      } else if (!response.finished) {
         response.end();
+      }
 
       let statusCode  = response.statusCode || 200;
       let requestTime = Nife.now() - startTime;

package/src/models/model-utils.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const { Types } = require('mythix-orm');
+const { Types, Utils } = require('mythix-orm');
 const { Model: ModelBase } = require('./model');
 
-function _setupModel(modelName, _Model, { application, connection }) {
+function _setupModel(modelName, _Model, { application, connection: applicationConnection }) {
   let Model       = _Model;
   let tableName   = Model.getTableName();
   let tablePrefix = application.getDBTablePrefix();
@@ -19,7 +19,15 @@ function _setupModel(modelName, _Model, { application, connection }) {
     if (_connection)
       return _connection;
 
-    return connection;
+    let { connection } = Model.getModelContext();
+    if (connection)
+      return connection;
+
+    connection = Utils.getContextValue('connection');
+    if (connection)
+      return connection;
+
+    return applicationConnection;
   };
 
   return { [modelName]: Model };

package/src/modules/database-module.js

@@ -76,7 +76,7 @@ class DatabaseModule extends BaseModule {
 
     if (Nife.isEmpty(databaseConfig)) {
       this.getLogger().error(`Error: database connection for "${this.getConfigValue('environment')}" not defined`);
-      return;
+      return {};
     }
 
     databaseConfig.logging = (this.getLogger().isDebugLevel()) ? this.getLogger().log.bind(this.getLogger()) : false;

package/src/tasks/task-module.js

@@ -126,7 +126,7 @@ class TaskModule extends BaseModule {
         promise.reject(error);
       };
 
-      const runTask = () => {
+      const _runTask = () => {
         let result = taskInstance.execute(lastTime, currentTime, diff);
 
         if (Nife.instanceOf(result, 'promise')) {
@@ -139,6 +139,16 @@ class TaskModule extends BaseModule {
         }
       };
 
+      const runTask = async () => {
+        let application   = this.getApplication();
+        let dbConnection  = (typeof application.getDBConnection === 'function') ? application.getDBConnection() : undefined;
+
+        if (dbConnection && typeof dbConnection.createContext === 'function')
+          await dbConnection.createContext(_runTask, dbConnection, dbConnection);
+        else
+          await _runTask();
+      };
+
       let taskName      = TaskKlass.taskName;
       let promise       = Nife.createResolvable();
       let taskInstance  = taskInfo.taskInstance;

package/src/utils/test-utils.js

@@ -64,6 +64,18 @@ function createTestApplication(ApplicationClass) {
       return defaultModules;
     }
 
+    createDatabaseConnection() {
+      const NOOP = () => {};
+
+      return {
+        isStarted:      () => true,
+        start:          NOOP,
+        stop:           NOOP,
+        registerModels: NOOP,
+        getModels:      () => ({}),
+      };
+    }
+
     constructor(_opts) {
       let opts = Nife.extend(true, {
         environment:  'test',