mythix 2.4.2 → 2.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix",
-  "version": "2.4.2",
+  "version": "2.4.5",
   "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.6",
+    "mythix-orm": "^1.4.7",
     "nife": "^1.11.3",
     "prompts": "^2.4.2"
   }

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}`});
   }