@morojs/moro 1.6.0 → 1.6.2

package/src/moro.ts

@@ -11,7 +11,11 @@ import { createFrameworkLogger, applyLoggingConfiguration } from './core/logger/
 import { Logger } from './types/logger.js';
 import { MiddlewareManager } from './core/middleware/index.js';
 import { IntelligentRoutingManager } from './core/routing/app-integration.js';
-import { RouteBuilder, RouteSchema, CompiledRoute } from './core/routing/index.js';
+import { RouteSchema } from './core/routing/index.js';
+import {
+  UnifiedRouter,
+  RouteBuilder as UnifiedRouteBuilder,
+} from './core/routing/unified-router.js';
 import { AppDocumentationManager, DocsConfig } from './core/docs/index.js';
 import { EventEmitter } from 'events';
 import cluster from 'cluster';
@@ -37,12 +41,16 @@ export class Moro extends EventEmitter {
   private eventBus!: MoroEventBus;
   // Application logger
   private logger!: Logger;
-  // Intelligent routing system
-  private intelligentRouting = new IntelligentRoutingManager();
+  // Unified routing system (singleton - shared across all routers)
+  private unifiedRouter!: UnifiedRouter;
+  // Legacy intelligent routing (kept for backward compatibility, now a facade)
+  private intelligentRouting!: IntelligentRoutingManager;
   // Documentation system
   private documentation = new AppDocumentationManager();
   // Configuration system
   private config!: AppConfig;
+  // Track if user explicitly set logger options (for worker log level handling)
+  private userSetLogger = false;
   // Runtime system
   private runtimeAdapter!: RuntimeAdapter;
   private runtimeType!: RuntimeType;
@@ -58,6 +66,9 @@ export class Moro extends EventEmitter {
   constructor(options: MoroOptions = {}) {
     super(); // Call EventEmitter constructor
 
+    // Track if user explicitly set logger/logging options
+    this.userSetLogger = !!(options.logger || options.logging);
+
     // Apply logging configuration BEFORE config loading to avoid DEBUG spam
     // 1. Environment variables (base level)
     const envLogLevel = process.env.LOG_LEVEL || process.env.MORO_LOG_LEVEL;
@@ -76,13 +87,18 @@ export class Moro extends EventEmitter {
     // Use simplified global configuration system
     this.config = initializeConfig(options);
 
-    // Apply config file logging if it exists (may override createApp options if needed)
-    if (this.config.logging && !options.logger) {
+    // Apply final config logging (this includes normalized logger → logging conversion)
+    // Always apply this as it's the authoritative merged config
+    if (this.config.logging) {
       applyLoggingConfiguration(this.config.logging, undefined);
       // Recreate logger with updated config
       this.logger = createFrameworkLogger('App');
     }
 
+    // NOW initialize routing systems AFTER logger is configured
+    this.unifiedRouter = UnifiedRouter.getInstance();
+    this.intelligentRouting = new IntelligentRoutingManager();
+
     this.logger.info(
       `Configuration system initialized: ${process.env.NODE_ENV || 'development'}:${this.config.server.port}`
     );
@@ -181,84 +197,85 @@ export class Moro extends EventEmitter {
 
   // Intelligent route methods - chainable with automatic middleware ordering
   // Overloads for better TypeScript inference
-  get(path: string): RouteBuilder;
+  get(path: string): UnifiedRouteBuilder;
   get(path: string, handler: (req: HttpRequest, res: HttpResponse) => any, options?: any): this;
   get(
     path: string,
     handler?: (req: HttpRequest, res: HttpResponse) => any,
     options?: any
-  ): RouteBuilder | this {
+  ): UnifiedRouteBuilder | this {
     if (handler) {
       // Direct route registration
       return this.addRoute('GET', path, handler, options);
     }
-    // Chainable route builder
-    return this.intelligentRouting.get(path);
+    // Use unified router for chainable API
+    return this.unifiedRouter.get(path);
   }
 
-  post(path: string): RouteBuilder;
+  post(path: string): UnifiedRouteBuilder;
   post(path: string, handler: (req: HttpRequest, res: HttpResponse) => any, options?: any): this;
   post(
     path: string,
     handler?: (req: HttpRequest, res: HttpResponse) => any,
     options?: any
-  ): RouteBuilder | this {
+  ): UnifiedRouteBuilder | this {
     if (handler) {
       // Direct route registration
       return this.addRoute('POST', path, handler, options);
     }
-    // Chainable route builder
-    return this.intelligentRouting.post(path);
+    // Use unified router for chainable API
+    return this.unifiedRouter.post(path);
   }
 
-  put(path: string): RouteBuilder;
+  put(path: string): UnifiedRouteBuilder;
   put(path: string, handler: (req: HttpRequest, res: HttpResponse) => any, options?: any): this;
   put(
     path: string,
     handler?: (req: HttpRequest, res: HttpResponse) => any,
     options?: any
-  ): RouteBuilder | this {
+  ): UnifiedRouteBuilder | this {
     if (handler) {
       // Direct route registration
       return this.addRoute('PUT', path, handler, options);
     }
-    // Chainable route builder
-    return this.intelligentRouting.put(path);
+    // Use unified router for chainable API
+    return this.unifiedRouter.put(path);
   }
 
-  delete(path: string): RouteBuilder;
+  delete(path: string): UnifiedRouteBuilder;
   delete(path: string, handler: (req: HttpRequest, res: HttpResponse) => any, options?: any): this;
   delete(
     path: string,
     handler?: (req: HttpRequest, res: HttpResponse) => any,
     options?: any
-  ): RouteBuilder | this {
+  ): UnifiedRouteBuilder | this {
     if (handler) {
       // Direct route registration
       return this.addRoute('DELETE', path, handler, options);
     }
-    // Chainable route builder
-    return this.intelligentRouting.delete(path);
+    // Use unified router for chainable API
+    return this.unifiedRouter.delete(path);
   }
 
-  patch(path: string): RouteBuilder;
+  patch(path: string): UnifiedRouteBuilder;
   patch(path: string, handler: (req: HttpRequest, res: HttpResponse) => any, options?: any): this;
   patch(
     path: string,
     handler?: (req: HttpRequest, res: HttpResponse) => any,
     options?: any
-  ): RouteBuilder | this {
+  ): UnifiedRouteBuilder | this {
     if (handler) {
       // Direct route registration
       return this.addRoute('PATCH', path, handler, options);
     }
-    // Chainable route builder
-    return this.intelligentRouting.patch(path);
+    // Use unified router for chainable API
+    return this.unifiedRouter.patch(path);
   }
 
   // Schema-first route method
-  route(schema: RouteSchema): CompiledRoute {
-    return this.intelligentRouting.route(schema);
+  route(schema: RouteSchema): void {
+    // Use unified router for schema-first registration
+    this.unifiedRouter.route(schema);
   }
 
   // Enable automatic API documentation
@@ -554,18 +571,31 @@ export class Moro extends EventEmitter {
       this.logger.debug('Documentation not enabled', 'Documentation');
     }
 
-    // Add intelligent routing middleware to handle chainable routes
-    this.coreFramework.addMiddleware(
-      async (req: HttpRequest, res: HttpResponse, next: () => void) => {
-        // Try intelligent routing first
-        const handled = await this.intelligentRouting.handleIntelligentRoute(req, res);
-        if (!handled) {
-          next(); // Fall back to direct routes
+    // Add unified routing middleware (handles both chainable and direct routes)
+    // Optimized: call router without extra async wrapper when possible
+    this.coreFramework.addMiddleware((req: HttpRequest, res: HttpResponse, next: () => void) => {
+      // Try unified router first (handles all route types)
+      const handled = this.unifiedRouter.handleRequest(req, res);
+
+      // Check if it's a promise (async route) or sync
+      if (handled && typeof (handled as any).then === 'function') {
+        // Async - await the result
+        (handled as Promise<boolean>)
+          .then(isHandled => {
+            if (!isHandled) {
+              next(); // Fall back to legacy routes if any
+            }
+          })
+          .catch(() => next());
+      } else {
+        // Sync - check immediately
+        if (!(handled as boolean)) {
+          next();
         }
       }
-    );
+    });
 
-    // Register direct routes with the HTTP server
+    // Register legacy direct routes with the HTTP server (for backward compatibility)
     if (this.routes.length > 0) {
       this.registerDirectRoutes();
     }
@@ -581,10 +611,12 @@ export class Moro extends EventEmitter {
         }
         this.logger.info('Learn more at https://morojs.com', 'Server');
 
-        // Log intelligent routes info
-        const intelligentRoutes = this.intelligentRouting.getIntelligentRoutes();
-        if (intelligentRoutes.length > 0) {
-          this.logger.info(`Intelligent Routes: ${intelligentRoutes.length} registered`, 'Server');
+        // Log unified router stats
+        const routeCount = this.unifiedRouter.getRouteCount();
+        if (routeCount > 0) {
+          this.logger.info(`Unified Router: ${routeCount} routes registered`, 'Server');
+          // Log performance stats
+          this.unifiedRouter.logPerformanceStats();
         }
 
         this.eventBus.emit('server:started', { port, runtime: this.runtimeType });
@@ -744,11 +776,11 @@ export class Moro extends EventEmitter {
         // Documentation not enabled, that's fine
       }
 
-      // Try intelligent routing first
-      const handled = await this.intelligentRouting.handleIntelligentRoute(req, res);
+      // Try unified router first (handles all routes)
+      const handled = await this.unifiedRouter.handleRequest(req, res);
       if (handled) return;
 
-      // Handle direct routes
+      // Handle legacy direct routes (backward compatibility)
       if (this.routes.length > 0) {
         await this.handleDirectRoutes(req, res);
       }
@@ -915,8 +947,11 @@ export class Moro extends EventEmitter {
 
   // Private methods
   private addRoute(method: string, path: string, handler: Function, options: any = {}) {
-    const handlerName = `handler_${this.routes.length}`;
+    // Register with unified router (primary routing system)
+    this.unifiedRouter.addRoute(method as any, path, handler as any, options.middleware || []);
 
+    // Also store in legacy routes array for backward compatibility
+    const handlerName = `handler_${this.routes.length}`;
     const route = {
       method: method as any,
       path,
@@ -929,10 +964,10 @@ export class Moro extends EventEmitter {
 
     this.routes.push(route);
 
-    // Organize routes for optimal lookup
+    // Organize routes for optimal lookup (legacy)
     this.organizeRouteForLookup(route);
 
-    // Store handler for later module creation
+    // Store handler for later module creation (legacy)
     this.routeHandlers[handlerName] = handler;
 
     return this;
@@ -1440,8 +1475,9 @@ export class Moro extends EventEmitter {
 
       // Reduce logging contention in workers (major bottleneck)
       // Multiple workers writing to same log files creates I/O contention
-      if (this.config.logging) {
-        // Workers log less frequently to reduce I/O contention
+      // ONLY reduce log level if user didn't explicitly set one
+      if (!this.userSetLogger) {
+        // Workers log less frequently to reduce I/O contention (only if not explicitly configured)
         applyLoggingConfiguration(undefined, { level: 'warn' }); // Only warnings and errors
       }
 
@@ -1462,9 +1498,9 @@ export class Moro extends EventEmitter {
         'Worker'
       );
 
-      // Optimize V8 flags for better performance (Rust-level optimizations)
+      // Optimize V8 flags for better performance
       if (process.env.NODE_ENV === 'production') {
-        // Ultra-aggressive V8 optimizations for maximum performance
+        // Aggressive V8 optimizations for maximum performance
         const v8Flags = [
           '--optimize-for-size', // Trade memory for speed
           '--always-opt', // Always optimize functions
@@ -1523,17 +1559,31 @@ export class Moro extends EventEmitter {
         // Documentation not enabled, that's fine
       }
 
-      // Add intelligent routing middleware
-      this.coreFramework.addMiddleware(
-        async (req: HttpRequest, res: HttpResponse, next: () => void) => {
-          const handled = await this.intelligentRouting.handleIntelligentRoute(req, res);
-          if (!handled) {
+      // Add unified routing middleware (handles both chainable and direct routes)
+      // Optimized: call router without extra async wrapper when possible
+      this.coreFramework.addMiddleware((req: HttpRequest, res: HttpResponse, next: () => void) => {
+        // Try unified router first (handles all route types)
+        const handled = this.unifiedRouter.handleRequest(req, res);
+
+        // Check if it's a promise (async route) or sync
+        if (handled && typeof (handled as any).then === 'function') {
+          // Async - await the result
+          (handled as Promise<boolean>)
+            .then(isHandled => {
+              if (!isHandled) {
+                next(); // Fall back to legacy routes if any
+              }
+            })
+            .catch(() => next());
+        } else {
+          // Sync - check immediately
+          if (!(handled as boolean)) {
             next();
           }
         }
-      );
+      });
 
-      // Register direct routes
+      // Register legacy direct routes with the HTTP server (for backward compatibility)
       if (this.routes.length > 0) {
         this.registerDirectRoutes();
       }

package/src/types/config.ts

@@ -9,6 +9,9 @@ export interface ServerConfig {
   requestTracking: {
     enabled: boolean;
   };
+  requestLogging: {
+    enabled: boolean;
+  };
   errorBoundary: {
     enabled: boolean;
   };

package/dist/core/http/router.js

@@ -1,183 +0,0 @@
-import { createFrameworkLogger } from '../logger/index.js';
-export class Router {
-    routes = [];
-    logger = createFrameworkLogger('Router');
-    // Performance optimizations - O(1) static route lookup
-    staticRoutes = new Map(); // "GET:/api/users" -> route
-    dynamicRoutes = []; // Routes with parameters
-    // Object pooling for parameters to reduce GC pressure
-    paramObjectPool = [];
-    maxPoolSize = 50;
-    get(path, ...handlers) {
-        this.addRoute('GET', path, handlers);
-    }
-    post(path, ...handlers) {
-        this.addRoute('POST', path, handlers);
-    }
-    put(path, ...handlers) {
-        this.addRoute('PUT', path, handlers);
-    }
-    delete(path, ...handlers) {
-        this.addRoute('DELETE', path, handlers);
-    }
-    patch(path, ...handlers) {
-        this.addRoute('PATCH', path, handlers);
-    }
-    addRoute(method, path, handlers) {
-        const { pattern, paramNames } = this.pathToRegex(path);
-        const handler = handlers.pop();
-        const middleware = handlers;
-        const route = {
-            method,
-            path,
-            pattern,
-            paramNames,
-            handler,
-            middleware,
-        };
-        // Add to routes array (maintain compatibility)
-        this.routes.push(route);
-        // Performance optimization: separate static and dynamic routes
-        const isStatic = !path.includes(':') && !path.includes('*');
-        if (isStatic && middleware.length === 0) {
-            // Static route with no middleware - use O(1) lookup
-            const routeKey = `${method}:${path}`;
-            this.staticRoutes.set(routeKey, route);
-            this.logger.debug(`Added static route: ${routeKey}`, 'FastRoute');
-        }
-        else {
-            // Dynamic route or has middleware - needs regex matching
-            this.dynamicRoutes.push(route);
-            this.logger.debug(`Added dynamic route: ${method} ${path}`, 'DynamicRoute');
-        }
-        // Initialize object pool on first route
-        if (this.paramObjectPool.length === 0) {
-            for (let i = 0; i < this.maxPoolSize; i++) {
-                this.paramObjectPool.push({});
-            }
-        }
-    }
-    pathToRegex(path) {
-        const paramNames = [];
-        // Convert parameterized routes to regex
-        const regexPattern = path
-            .replace(/\/:([^/]+)/g, (match, paramName) => {
-            paramNames.push(paramName);
-            return '/([^/]+)';
-        })
-            .replace(/\//g, '\\/');
-        return {
-            pattern: new RegExp(`^${regexPattern}$`),
-            paramNames,
-        };
-    }
-    async handle(req, res, basePath = '') {
-        let path = req.path.startsWith(basePath) ? req.path.substring(basePath.length) : req.path;
-        // If removing basePath results in empty string, default to '/'
-        if (path === '' || path === undefined) {
-            path = '/';
-        }
-        this.logger.debug(`Router processing: originalPath="${req.path}", basePath="${basePath}", processedPath="${path}"`, 'Processing');
-        // PERFORMANCE OPTIMIZATION: Fast path - O(1) static route lookup first
-        const routeKey = `${req.method}:${path}`;
-        const staticRoute = this.staticRoutes.get(routeKey);
-        if (staticRoute) {
-            this.logger.debug(`Fast route match: ${routeKey}`, 'FastRoute');
-            // Static route with no middleware - execute handler directly
-            req.params = {}; // No params for static routes
-            const result = await staticRoute.handler(req, res);
-            // If handler returns data and response hasn't been sent, send it
-            if (result !== undefined && result !== null && !res.headersSent) {
-                res.json(result);
-            }
-            return true;
-        }
-        // Fallback: Dynamic route matching (with middleware support)
-        const route = this.dynamicRoutes.find(r => r.method === req.method && r.pattern.test(path));
-        this.logger.debug(`Found dynamic route: ${!!route}${route ? ` ${route.method} ${route.path}` : ' none'}`, 'RouteMatch');
-        if (!route) {
-            return false; // Route not found
-        }
-        // Extract path parameters using object pooling
-        const matches = path.match(route.pattern);
-        if (matches) {
-            req.params = this.acquireParamObject();
-            route.paramNames.forEach((name, index) => {
-                req.params[name] = matches[index + 1];
-            });
-        }
-        try {
-            // Execute middleware
-            for (const mw of route.middleware) {
-                await new Promise((resolve, reject) => {
-                    let nextCalled = false;
-                    const next = () => {
-                        if (nextCalled)
-                            return;
-                        nextCalled = true;
-                        resolve();
-                    };
-                    try {
-                        const result = mw(req, res, next);
-                        if (result instanceof Promise) {
-                            result
-                                .then(() => {
-                                if (!nextCalled)
-                                    next();
-                            })
-                                .catch(reject);
-                        }
-                    }
-                    catch (error) {
-                        reject(error);
-                    }
-                });
-                if (res.headersSent)
-                    break; // Early exit if response sent
-            }
-            // Execute handler
-            const result = await route.handler(req, res);
-            // If handler returns data and response hasn't been sent, send it
-            if (result !== undefined && result !== null && !res.headersSent) {
-                res.json(result);
-            }
-            return true;
-        }
-        finally {
-            // Release parameter object back to pool
-            if (req.params && matches) {
-                this.releaseParamObject(req.params);
-            }
-        }
-    }
-    getRoutes() {
-        return [...this.routes];
-    }
-    // Object pooling methods for performance optimization
-    acquireParamObject() {
-        const obj = this.paramObjectPool.pop();
-        if (obj) {
-            // Clear the object
-            for (const key in obj) {
-                delete obj[key];
-            }
-            return obj;
-        }
-        return {};
-    }
-    releaseParamObject(obj) {
-        if (this.paramObjectPool.length < this.maxPoolSize) {
-            this.paramObjectPool.push(obj);
-        }
-    }
-    // Performance statistics for monitoring
-    getPerformanceStats() {
-        return {
-            totalRoutes: this.routes.length,
-            staticRoutes: this.staticRoutes.size,
-            dynamicRoutes: this.dynamicRoutes.length,
-            paramObjectPoolSize: this.paramObjectPool.length,
-        };
-    }
-}
-//# sourceMappingURL=router.js.map

package/dist/core/http/router.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/core/http/router.ts"],"names":[],"mappings":"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"}