mastercontroller 1.3.30 → 1.3.32

package/MasterControl.js

@@ -957,34 +957,9 @@ class MasterControl {
             await next();
         });
 
-        // 5. Routing (TERMINAL - always needed)
-        $that.pipeline.run(async (ctx) => {
-            // Load config/load which triggers routing
-            require(`${$that.root}/config/load`)(ctx);
-        });
-
-        // 6. Global Error Handler
-        $that.pipeline.useError(async (error, ctx, next) => {
-            logger.error({
-                code: 'MC_ERR_PIPELINE',
-                message: 'Error in middleware pipeline',
-                error: error.message,
-                stack: error.stack,
-                path: ctx.request.url,
-                method: ctx.type
-            });
-
-            if (!ctx.response.headersSent) {
-                ctx.response.statusCode = 500;
-                ctx.response.setHeader('Content-Type', 'application/json');
-                ctx.response.end(JSON.stringify({
-                    error: 'Internal Server Error',
-                    message: process.env.NODE_ENV === 'production'
-                        ? 'An error occurred'
-                        : error.message
-                }));
-            }
-        });
+        // 5. Routing and Error Handler are registered in start() so that user
+        // middleware (auth, logging, etc.) registered between setupServer() and
+        // start() runs BEFORE the terminal routing middleware.
     }
 
     async serverRun(req, res){
@@ -1028,6 +1003,41 @@ class MasterControl {
             this.serverSettings(this._pendingServerSettings);
             this._pendingServerSettings = null;
         }
+
+        // Register terminal routing and error handler LAST so that user middleware
+        // (auth, logging, etc.) registered between setupServer() and start() runs first
+        const $that = this;
+
+        // Terminal routing middleware
+        $that.pipeline.run(async (ctx) => {
+            // Attach pipeline state to raw request object so it survives even if
+            // config/load creates a new requestObject without copying ctx.state
+            ctx.request.__pipelineState = ctx.state;
+            require(`${$that.root}/config/load`)(ctx);
+        });
+
+        // Global error handler
+        $that.pipeline.useError(async (error, ctx, next) => {
+            logger.error({
+                code: 'MC_ERR_PIPELINE',
+                message: 'Error in middleware pipeline',
+                error: error.message,
+                stack: error.stack,
+                path: ctx.request.url,
+                method: ctx.type
+            });
+
+            if (!ctx.response.headersSent) {
+                ctx.response.statusCode = 500;
+                ctx.response.setHeader('Content-Type', 'application/json');
+                ctx.response.end(JSON.stringify({
+                    error: 'Internal Server Error',
+                    message: process.env.NODE_ENV === 'production'
+                        ? 'An error occurred'
+                        : error.message
+                }));
+            }
+        });
     }
 
     startMVC(foldername){

package/MasterRouter.js

@@ -816,7 +816,7 @@ class MasterRouter {
              control.__currentRoute = currentRoute;
              control.__response = requestObject.response;
              control.__request = requestObject.request;
-             control.state = requestObject.state || {};
+             control.state = requestObject.state || requestObject.request.__pipelineState || {};
              const _callEmit = new EventEmitter();
 
              _callEmit.once(EVENT_NAMES.CONTROLLER, function(){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mastercontroller",
-  "version": "1.3.30",
+  "version": "1.3.32",
   "description": "Fortune 500 ready Node.js MVC framework with enterprise security, monitoring, and horizontal scaling",
   "main": "MasterControl.js",
   "license": "MIT",