mythix 2.4.3 → 2.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix",
-  "version": "2.4.3",
+  "version": "2.4.7",
   "description": "Mythix is a NodeJS web-app framework",
   "main": "src/index.js",
   "scripts": {
@@ -30,7 +30,7 @@
     "express": "^4.17.3",
     "express-busboy": "github:th317erd/express-busboy#0754a570d7979097b31e48655b80d3fcd628d4e4",
     "form-data": "^4.0.0",
-    "mythix-orm": "^1.4.7",
+    "mythix-orm": "^1.5.1",
     "nife": "^1.11.3",
     "prompts": "^2.4.2"
   }

package/src/cli/cli-utils.js

@@ -307,6 +307,8 @@ function loadMythixConfig(_mythixConfigPath, _appRootPath) {
   let appRootPath = (_appRootPath) ? Path.resolve(_appRootPath) : Path.resolve(mythixConfigPath, 'app');
 
   let defaultConfig = {
+    runtime:              process.env.MYTHIX_RUNTIME || 'node',
+    runtimeArgs:          (process.env.MYTHIX_RUNTIME_ARGS || '').split(/\s+/g),
     applicationPath:      (config) => Path.resolve(config.appRootPath, 'application.js'),
     getApplicationClass:  (config) => {
       let Application = require(config.applicationPath);
@@ -337,14 +339,15 @@ function loadMythixConfig(_mythixConfigPath, _appRootPath) {
   return resolveConfig(defaultConfig);
 }
 
-function spawnCommand(args, options) {
+function spawnCommand(args, options, _config) {
+  const config    = _config || {};
   const { spawn } = require('child_process');
 
   return new Promise((resolve, reject) => {
     try {
       let childProcess = spawn(
-        'node',
-        args,
+        config.runtime || 'node',
+        (config.runtimeArgs || []).concat(args),
         Object.assign({}, options || {}, {
           env:    Object.assign({}, process.env, (options || {}).env || {}),
           stdio:  'inherit',
@@ -364,16 +367,17 @@ function spawnCommand(args, options) {
   });
 }
 
-async function executeCommand(configPath, applicationCommandsPath, yargsPath, simpleYargsPath, argv, commandPath, command) {
+async function executeCommand(configPath, applicationCommandsPath, yargsPath, simpleYargsPath, argv, commandPath, command, config) {
   try {
     let Klass         = CommandBase.commands[command];
-    let nodeArguments = Klass.nodeArguments || [];
+    let nodeArguments = ((config.runtime || 'node') === 'node') ? (Klass.nodeArguments || []) : [];
     let args          = nodeArguments.concat([ commandPath ], argv);
 
     let code = await spawnCommand(
       args,
       {
         env: {
+          MYTHIX_RUNTIME:               config.runtime || process.env.MYTHIX_RUNTIME || 'node',
           MYTHIX_CONFIG_PATH:           configPath,
           MYTHIX_COMMAND_PATH:          commandPath,
           MYTHIX_APPLICATION_COMMANDS:  applicationCommandsPath,
@@ -382,6 +386,7 @@ async function executeCommand(configPath, applicationCommandsPath, yargsPath, si
           MYTHIX_EXECUTE_COMMAND:       command,
         },
       },
+      config,
     );
 
     process.exit(code);

package/src/controllers/controller-base.js

@@ -183,13 +183,13 @@ class ControllerBase {
     this.responseStatusCode = parseInt(code, 10);
   }
 
-  async handleIncomingRequest(request, response, { route, controllerMethod, startTime, params, query /* , controller, controllerInstance, */ }) {
-    this.route = route;
+  async handleIncomingRequest(request, response, args) {
+    this.route = args.route;
 
-    if (typeof this[controllerMethod] !== 'function')
-      this.throwInternalServerError(`Specified route handler named "${this.constructor.name}::${controllerMethod}" not found.`);
+    if (typeof this[args.controllerMethod] !== 'function')
+      this.throwInternalServerError(`Specified route handler named "${this.constructor.name}::${args.controllerMethod}" not found.`);
 
-    return await this[controllerMethod].call(this, { params, query, body: request.body, request, response, startTime }, this.getModels());
+    return await this[args.controllerMethod].call(this, { body: request.body, request, response, ...args }, this.getModels());
   }
 
   async handleOutgoingResponse(_controllerResult, request, response /*, { route, controller, controllerMethod, controllerInstance, startTime, params } */) {

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

@@ -239,15 +239,22 @@ class HTTPServer {
   }
 
   createRequestLogger(application, request) {
-    if (request.mythixLogger)
+    let requestID = (Date.now() + Math.random()).toFixed(REQUEST_ID_POSTFIX_LENGTH);
+
+    if (request.mythixLogger) {
+      if (!request.mythixRequestID)
+        request.mythixRequestID = requestID;
+
       return request.mythixLogger;
+    }
 
     let logger        = application.getLogger();
     let loggerMethod  = ('' + request.method).toUpperCase();
     let loggerURL     = ('' + request.path);
-    let requestID     = (Date.now() + Math.random()).toFixed(REQUEST_ID_POSTFIX_LENGTH);
     let ipAddress     = Nife.get(request, 'client.remoteAddress', '<unknown IP address>');
 
+    request.mythixRequestID = requestID;
+
     return logger.clone({ formatter: (output) => `{${ipAddress}} - [#${requestID} ${loggerMethod} ${loggerURL}]: ${output}`});
   }