mythix 2.4.8 → 2.4.11

package/package.json

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

package/src/cli/cli-utils.js

@@ -308,7 +308,7 @@ function loadMythixConfig(_mythixConfigPath, _appRootPath) {
 
   let defaultConfig = {
     runtime:              process.env.MYTHIX_RUNTIME || 'node',
-    runtimeArgs:          (process.env.MYTHIX_RUNTIME_ARGS || '').split(/\s+/g),
+    runtimeArgs:          (process.env.MYTHIX_RUNTIME_ARGS || '').split(/\s+/g).filter(Boolean),
     applicationPath:      (config) => Path.resolve(config.appRootPath, 'application.js'),
     getApplicationClass:  (config) => {
       let Application = require(config.applicationPath);
@@ -347,7 +347,7 @@ function spawnCommand(args, options, _config) {
     try {
       let childProcess = spawn(
         config.runtime || 'node',
-        (config.runtimeArgs || []).concat(args),
+        (config.runtimeArgs || []).concat(args).filter(Boolean),
         Object.assign({}, options || {}, {
           env:    Object.assign({}, process.env, (options || {}).env || {}),
           stdio:  'inherit',
@@ -367,8 +367,9 @@ function spawnCommand(args, options, _config) {
   });
 }
 
-async function executeCommand(configPath, applicationCommandsPath, yargsPath, simpleYargsPath, argv, commandPath, command, config) {
+async function executeCommand(configPath, applicationCommandsPath, yargsPath, simpleYargsPath, argv, commandPath, command, _config) {
   try {
+    let config        = _config || {};
     let Klass         = CommandBase.commands[command];
     let nodeArguments = ((config.runtime || 'node') === 'node') ? (Klass.nodeArguments || []) : [];
     let args          = nodeArguments.concat([ commandPath ], argv);

package/src/controllers/generate-client-api-interface.js

@@ -83,12 +83,18 @@ function nodeRequestHandler(routeName, requestOptions) {
       },
       requestOptions,
       extraConfig,
-      { headers:  Object.assign({}, headers, Utils.keysToLowerCase(extraConfig.headers || {})) },
+      {
+        headers: Utils.cleanObjectProperties(Object.assign(
+          {},
+          headers,
+          Utils.keysToLowerCase(extraConfig.headers || {}),
+        )),
+      },
     );
 
     delete options.data;
 
-    var thisRequest = HTTP.request(options, function(response) {
+    var thisRequest = HTTP.request(Utils.cleanObjectProperties(options), function(response) {
       var responseData = Buffer.alloc(0);
 
       response.on('data', function(chunk) {
@@ -172,7 +178,7 @@ function browserRequestHandler(routeName, requestOptions) {
     var url         = requestOptions.url;
     var data        = requestOptions.data;
     var extraConfig = {};
-    var headers     = Object.assign({ 'content-type': 'application/json; charset=UTF-8' }, Utils.keysToLowerCase(this.defaultHeaders || {}), Utils.keysToLowerCase(requestOptions.headers || {}));
+    var headers     = Object.assign(Utils.keysToLowerCase(this.defaultHeaders || {}), Utils.keysToLowerCase(requestOptions.headers || {}));
 
     if (data) {
       if (!method.match(/^(GET|HEAD)$/i)) {
@@ -193,12 +199,18 @@ function browserRequestHandler(routeName, requestOptions) {
       { method },
       requestOptions,
       extraConfig,
-      { headers:  Object.assign({}, headers, Utils.keysToLowerCase(extraConfig.headers || {})) },
+      {
+        headers: Utils.cleanObjectProperties(Object.assign(
+          {},
+          headers,
+          Utils.keysToLowerCase(extraConfig.headers || {}),
+        )),
+      },
     );
 
     delete options.data;
 
-    globalScope.fetch(url, options).then(
+    globalScope.fetch(url, Utils.cleanObjectProperties(options)).then(
       function(response) {
         if (typeof requestOptions.responseHandler === 'function')
           return requestOptions.responseHandler(response);
@@ -271,6 +283,22 @@ function generateUtils() {
       return newObj;
     }
 
+    function cleanObjectProperties(obj) {
+      var keys    = Object.keys(obj || {});
+      var newObj  = {};
+
+      for (var i = 0, il = keys.length; i < il; i++) {
+        var key   = keys[i];
+        var value = obj[key];
+        if (value == null || value == '')
+          continue;
+
+        newObj[key] = value;
+      }
+
+      return newObj;
+    }
+
     function injectURLParams(routeName, _options) {
       var options = _options || {};
       var params = options.params || {};
@@ -299,6 +327,7 @@ function generateUtils() {
       isEmpty,
       dataToQueryString,
       keysToLowerCase,
+      cleanObjectProperties,
       injectURLParams,
     };
   })();
@@ -350,11 +379,15 @@ function generateRoutes(_routes, _options) {
         contentType = contentType[0];
 
       clientOptions = {
-        credentials:  'same-origin',
-        headers:      {
-          'Content-Type': contentType,
-        },
+        credentials: 'same-origin',
       };
+
+      // Don't set content type for multipart/form-data
+      if (!(/multipart\/form-data/i).test(contentType)) {
+        clientOptions.headers = {
+          'Content-Type': contentType,
+        };
+      }
     }
 
     clientOptions = JSON.stringify(clientOptions, (key, value) => {

package/src/models/model-module.js

@@ -114,7 +114,7 @@ class ModelModule extends BaseModule {
     let application = this.getApplication();
     let connection  = (typeof application.getDBConnection === 'function') ? application.getDBConnection() : null;
     if (!connection)
-      return;
+      return {};
 
     return connection.getModels();
   }

package/src/tasks/task-base.js

@@ -55,17 +55,17 @@ class TaskBase {
   }
 
   getModel(name) {
-    let application = this.application;
+    let application = this.getApplication();
     return application.getModel(name);
   }
 
   getModels() {
-    let application = this.application;
+    let application = this.getApplication();
     return application.getModels();
   }
 
   getDBConnection() {
-    let application = this.application;
+    let application = this.getApplication();
     return application.getDBConnection();
   }
 

package/src/tasks/task-module.js

@@ -84,7 +84,7 @@ class TaskModule extends BaseModule {
     let connection  = (typeof application.getDBConnection === 'function') ? application.getDBConnection() : null;
     let dbConfig    = (typeof application.getDBConfig === 'function') ? application.getDBConfig() : null;
     let tasks       = {};
-    let args        = { application: this, connection, dbConfig };
+    let args        = { application, connection, dbConfig };
 
     for (let i = 0, il = taskFiles.length; i < il; i++) {
       let taskFile = taskFiles[i];
@@ -160,7 +160,7 @@ class TaskModule extends BaseModule {
       try {
         if (!TaskKlass.keepAlive || !taskInstance) {
           logger        = createTaskLogger();
-          taskInstance  = new TaskKlass(this, logger, runID, { lastTime, currentTime, diff });
+          taskInstance  = new TaskKlass(this.getApplication(), logger, runID, { lastTime, currentTime, diff });
 
           taskInfo.taskInstance = taskInstance;