@morojs/moro 1.5.17 → 1.6.1

package/src/moro.ts

@@ -5,35 +5,39 @@ import { Moro as MoroCore } from './core/framework';
 import { HttpRequest, HttpResponse, middleware } from './core/http';
 import { ModuleConfig, InternalRouteDefinition } from './types/module';
 import { MoroOptions } from './types/core';
-import { ModuleDefaultsConfig } from './types/config';
 import { MoroEventBus } from './core/events';
-import { createFrameworkLogger, applyLoggingConfiguration } from './core/logger';
-import { Logger } from './types/logger';
+import {
+  createFrameworkLogger,
+  logger as globalLogger,
+  applyLoggingConfiguration,
+} from './core/logger';
 import { MiddlewareManager } from './core/middleware';
 import { IntelligentRoutingManager } from './core/routing/app-integration';
 import { RouteBuilder, RouteSchema, CompiledRoute } from './core/routing';
 import { AppDocumentationManager, DocsConfig } from './core/docs';
+import { readdirSync, statSync } from 'fs';
+import { join } from 'path';
 import { EventEmitter } from 'events';
 // Configuration System Integration
-import { initializeConfig, type AppConfig } from './core/config';
+import { initializeConfig, getGlobalConfig, type AppConfig } from './core/config';
 // Runtime System Integration
-import { RuntimeAdapter, RuntimeType, createRuntimeAdapter } from './core/runtime';
+import {
+  RuntimeAdapter,
+  RuntimeType,
+  createRuntimeAdapter,
+  NodeRuntimeAdapter,
+} from './core/runtime';
 
 export class Moro extends EventEmitter {
   private coreFramework: MoroCore;
   private routes: InternalRouteDefinition[] = [];
   private moduleCounter = 0;
   private loadedModules = new Set<string>();
-  private lazyModules = new Map<string, ModuleConfig>();
   private routeHandlers: Record<string, Function> = {};
-  private moduleDiscovery?: any; // Store for cleanup
-  private autoDiscoveryOptions: MoroOptions | null = null;
-  private autoDiscoveryInitialized = false;
-  private autoDiscoveryPromise: Promise<void> | null = null;
   // Enterprise event system integration
   private eventBus: MoroEventBus;
   // Application logger
-  private logger!: Logger;
+  private logger = createFrameworkLogger('App');
   // Intelligent routing system
   private intelligentRouting = new IntelligentRoutingManager();
   // Documentation system
@@ -49,33 +53,72 @@ export class Moro extends EventEmitter {
   constructor(options: MoroOptions = {}) {
     super(); // Call EventEmitter constructor
 
-    // Apply logging configuration BEFORE config loading to avoid DEBUG spam
-    // 1. Environment variables (base level)
+    // Configure logger from environment variables BEFORE config system initialization
+    // This ensures the config loading process respects the log level
     const envLogLevel = process.env.LOG_LEVEL || process.env.MORO_LOG_LEVEL;
     if (envLogLevel) {
       applyLoggingConfiguration({ level: envLogLevel }, undefined);
     }
 
-    // 2. createApp logger options (highest precedence)
+    // Initialize configuration system - create a deep copy for this instance
+    this.config = JSON.parse(JSON.stringify(initializeConfig()));
+
+    // Apply logging configuration from the loaded config (this happens after config file processing)
+    if (this.config.logging) {
+      applyLoggingConfiguration(this.config.logging, undefined);
+    }
+
+    // Apply additional logging configuration from createApp options (takes precedence)
     if (options.logger !== undefined) {
       applyLoggingConfiguration(undefined, options.logger);
     }
 
-    // Create logger AFTER initial configuration
-    this.logger = createFrameworkLogger('App');
-
-    // Use simplified global configuration system
-    this.config = initializeConfig(options);
+    // Apply performance configuration from createApp options (takes precedence)
+    if (options.performance) {
+      if (options.performance.clustering) {
+        this.config.performance.clustering = {
+          ...this.config.performance.clustering,
+          ...options.performance.clustering,
+        };
+      }
+      if (options.performance.compression) {
+        this.config.performance.compression = {
+          ...this.config.performance.compression,
+          ...options.performance.compression,
+        };
+      }
+      if (options.performance.circuitBreaker) {
+        this.config.performance.circuitBreaker = {
+          ...this.config.performance.circuitBreaker,
+          ...options.performance.circuitBreaker,
+        };
+      }
+    }
 
-    // Apply config file logging if it exists (may override createApp options if needed)
-    if (this.config.logging && !options.logger) {
-      applyLoggingConfiguration(this.config.logging, undefined);
-      // Recreate logger with updated config
-      this.logger = createFrameworkLogger('App');
+    // Apply modules configuration from createApp options (takes precedence)
+    if (options.modules) {
+      if (options.modules.cache) {
+        this.config.modules.cache = {
+          ...this.config.modules.cache,
+          ...options.modules.cache,
+        };
+      }
+      if (options.modules.rateLimit) {
+        this.config.modules.rateLimit = {
+          ...this.config.modules.rateLimit,
+          ...options.modules.rateLimit,
+        };
+      }
+      if (options.modules.validation) {
+        this.config.modules.validation = {
+          ...this.config.modules.validation,
+          ...options.modules.validation,
+        };
+      }
     }
 
     this.logger.info(
-      `Configuration system initialized: ${process.env.NODE_ENV || 'development'}:${this.config.server.port}`
+      `Configuration system initialized: ${this.config.server.environment}:${this.config.server.port}`
     );
 
     // Initialize runtime system
@@ -84,12 +127,10 @@ export class Moro extends EventEmitter {
 
     this.logger.info(`Runtime system initialized: ${this.runtimeType}`, 'Runtime');
 
-    // Pass configuration from config to framework
+    // Pass logging configuration from config to framework
     const frameworkOptions: any = {
       ...options,
       logger: this.config.logging,
-      websocket: this.config.websocket.enabled ? options.websocket || {} : false,
-      config: this.config,
     };
 
     this.coreFramework = new MoroCore(frameworkOptions);
@@ -121,10 +162,10 @@ export class Moro extends EventEmitter {
       ...options,
     });
 
-    // Store auto-discovery options for later initialization
-    // IMPORTANT: Auto-discovery is deferred to ensure user middleware (like auth)
-    // is registered before module middleware that might bypass it
-    this.autoDiscoveryOptions = options.autoDiscover !== false ? options : null;
+    // Auto-discover modules if enabled
+    if (options.autoDiscover !== false) {
+      this.autoDiscoverModules(options.modulesPath || './modules');
+    }
 
     // Emit initialization event through enterprise event bus
     this.eventBus.emit('framework:initialized', {
@@ -353,13 +394,6 @@ export class Moro extends EventEmitter {
         version: moduleOrPath.version || '1.0.0',
       });
     }
-
-    // IMPORTANT: If modules are loaded manually after auto-discovery,
-    // ensure the final module handler is set up to maintain middleware order
-    if (this.autoDiscoveryInitialized) {
-      this.coreFramework.setupFinalModuleHandler();
-    }
-
     return this;
   }
 
@@ -501,162 +535,34 @@ export class Moro extends EventEmitter {
       this.registerDirectRoutes();
     }
 
-    const startServer = () => {
-      const actualCallback = () => {
-        const displayHost = host || 'localhost';
-        this.logger.info('Moro Server Started', 'Server');
-        this.logger.info(`Runtime: ${this.runtimeType}`, 'Server');
-        this.logger.info(`HTTP API: http://${displayHost}:${port}`, 'Server');
-        if (this.config.websocket.enabled) {
-          this.logger.info(`WebSocket: ws://${displayHost}:${port}`, 'Server');
-        }
-        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');
-        }
-
-        this.eventBus.emit('server:started', { port, runtime: this.runtimeType });
-        if (callback) callback();
-      };
-
-      if (host && typeof host === 'string') {
-        this.coreFramework.listen(port, host, actualCallback);
-      } else {
-        this.coreFramework.listen(port, actualCallback);
+    const actualCallback = () => {
+      const displayHost = host || 'localhost';
+      this.logger.info('Moro Server Started', 'Server');
+      this.logger.info(`Runtime: ${this.runtimeType}`, 'Server');
+      this.logger.info(`HTTP API: http://${displayHost}:${port}`, 'Server');
+      this.logger.info(`WebSocket: ws://${displayHost}:${port}`, 'Server');
+      this.logger.info('Native Node.js HTTP • Zero Dependencies • Maximum Performance', 'Server');
+      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');
       }
-    };
-
-    // Ensure auto-discovery is complete before starting server
-    this.ensureAutoDiscoveryComplete()
-      .then(() => {
-        startServer();
-      })
-      .catch(error => {
-        this.logger.error('Auto-discovery initialization failed during server start', 'Framework', {
-          error: error instanceof Error ? error.message : String(error),
-        });
-        // Start server anyway - auto-discovery failure shouldn't prevent startup
-        startServer();
-      });
-  }
-
-  // Public method to manually initialize auto-discovery
-  // Useful for ensuring auth middleware is registered before auto-discovery
-  async initializeAutoDiscoveryNow(): Promise<void> {
-    return this.ensureAutoDiscoveryComplete();
-  }
 
-  // Public API: Initialize modules explicitly after middleware setup
-  // This provides users with explicit control over module loading timing
-  // IMPORTANT: This forces module loading even if autoDiscovery.enabled is false
-  // Usage: app.initModules() or app.initModules({ paths: ['./my-modules'] })
-  initModules(options?: {
-    paths?: string[];
-    patterns?: string[];
-    recursive?: boolean;
-    loadingStrategy?: 'eager' | 'lazy' | 'conditional';
-    watchForChanges?: boolean;
-    ignorePatterns?: string[];
-    loadOrder?: 'alphabetical' | 'dependency' | 'custom';
-    failOnError?: boolean;
-    maxDepth?: number;
-  }): void {
-    this.logger.info('User-requested module initialization', 'ModuleSystem');
-
-    // If already initialized, do nothing
-    if (this.autoDiscoveryInitialized) {
-      this.logger.debug('Auto-discovery already completed, skipping', 'ModuleSystem');
-      return;
-    }
-
-    // Store the options and mark that we want to force initialization
-    this.autoDiscoveryOptions = {
-      autoDiscover: {
-        enabled: true, // Force enabled regardless of original config
-        paths: options?.paths || ['./modules', './src/modules'],
-        patterns: options?.patterns || [
-          '**/*.module.{ts,js}',
-          '**/index.{ts,js}',
-          '**/*.config.{ts,js}',
-        ],
-        recursive: options?.recursive ?? true,
-        loadingStrategy: options?.loadingStrategy || ('eager' as const),
-        watchForChanges: options?.watchForChanges ?? false,
-        ignorePatterns: options?.ignorePatterns || [
-          '**/*.test.{ts,js}',
-          '**/*.spec.{ts,js}',
-          '**/node_modules/**',
-        ],
-        loadOrder: options?.loadOrder || ('dependency' as const),
-        failOnError: options?.failOnError ?? false,
-        maxDepth: options?.maxDepth ?? 5,
-      },
+      this.eventBus.emit('server:started', { port, runtime: this.runtimeType });
+      if (callback) callback();
     };
 
-    this.logger.debug(
-      'Module initialization options stored, will execute on next listen/getHandler call',
-      'ModuleSystem'
-    );
-  }
-
-  // Robust method to ensure auto-discovery is complete, handling race conditions
-  private async ensureAutoDiscoveryComplete(): Promise<void> {
-    // If already initialized, nothing to do
-    if (this.autoDiscoveryInitialized) {
-      return;
-    }
-
-    // If auto-discovery is disabled, mark as initialized
-    if (!this.autoDiscoveryOptions) {
-      this.autoDiscoveryInitialized = true;
-      return;
-    }
-
-    // If already in progress, wait for it to complete
-    if (this.autoDiscoveryPromise) {
-      return this.autoDiscoveryPromise;
-    }
-
-    // Start auto-discovery
-    this.autoDiscoveryPromise = this.performAutoDiscovery();
-
-    try {
-      await this.autoDiscoveryPromise;
-      this.autoDiscoveryInitialized = true;
-    } catch (error) {
-      // Reset promise on error so it can be retried
-      this.autoDiscoveryPromise = null;
-      throw error;
-    } finally {
-      this.autoDiscoveryOptions = null; // Clear after attempt
+    if (host && typeof host === 'string') {
+      this.coreFramework.listen(port, host, actualCallback);
+    } else {
+      this.coreFramework.listen(port, actualCallback);
     }
   }
 
-  // Perform the actual auto-discovery work
-  private async performAutoDiscovery(optionsOverride?: MoroOptions): Promise<void> {
-    const optionsToUse = optionsOverride || this.autoDiscoveryOptions;
-    if (!optionsToUse) return;
-
-    this.logger.debug('Starting auto-discovery initialization', 'AutoDiscovery');
-
-    await this.initializeAutoDiscovery(optionsToUse);
-
-    this.logger.debug('Auto-discovery initialization completed', 'AutoDiscovery');
-  }
-
   // Get handler for non-Node.js runtimes
   getHandler() {
-    // Ensure auto-discovery is complete for non-Node.js runtimes
-    // This handles the case where users call getHandler() immediately after createApp()
-    this.ensureAutoDiscoveryComplete().catch(error => {
-      this.logger.error('Auto-discovery initialization failed for runtime handler', 'Framework', {
-        error: error instanceof Error ? error.message : String(error),
-      });
-    });
-
     // Create a unified request handler that works with the runtime adapter
     const handler = async (req: HttpRequest, res: HttpResponse) => {
       // Add documentation middleware first (if enabled)
@@ -980,33 +886,20 @@ export class Moro extends EventEmitter {
   }
 
   private setupDefaultMiddleware(options: MoroOptions) {
-    // CORS - check config enabled property OR options.security.cors.enabled === true
-    if (this.config.security.cors.enabled || options.security?.cors?.enabled === true) {
-      const corsOptions =
-        typeof options.cors === 'object'
-          ? options.cors
-          : this.config.security.cors
-            ? this.config.security.cors
-            : {};
+    // CORS
+    if (options.cors !== false) {
+      const corsOptions = typeof options.cors === 'object' ? options.cors : {};
       this.use(middleware.cors(corsOptions));
     }
 
-    // Helmet - check config enabled property OR options.security.helmet.enabled === true
-    if (this.config.security.helmet.enabled || options.security?.helmet?.enabled === true) {
+    // Helmet
+    if (options.helmet !== false) {
       this.use(middleware.helmet());
     }
 
-    // Compression - check config enabled property OR options.performance.compression.enabled === true
-    if (
-      this.config.performance.compression.enabled ||
-      options.performance?.compression?.enabled === true
-    ) {
-      const compressionOptions =
-        typeof options.compression === 'object'
-          ? options.compression
-          : this.config.performance.compression
-            ? this.config.performance.compression
-            : {};
+    // Compression
+    if (options.compression !== false) {
+      const compressionOptions = typeof options.compression === 'object' ? options.compression : {};
       this.use(middleware.compression(compressionOptions));
     }
 
@@ -1014,216 +907,27 @@ export class Moro extends EventEmitter {
     this.use(middleware.bodySize({ limit: '10mb' }));
   }
 
-  // Enhanced auto-discovery initialization
-  private async initializeAutoDiscovery(options: MoroOptions): Promise<void> {
-    const { ModuleDiscovery } = await import('./core/modules/auto-discovery');
-
-    // Merge auto-discovery configuration
-    const autoDiscoveryConfig = this.mergeAutoDiscoveryConfig(options);
-
-    if (!autoDiscoveryConfig.enabled) {
-      return;
-    }
-
-    this.moduleDiscovery = new ModuleDiscovery(process.cwd());
-
+  private autoDiscoverModules(modulesPath: string) {
     try {
-      // Discover modules based on configuration
-      const modules = await this.moduleDiscovery.discoverModulesAdvanced(autoDiscoveryConfig);
-
-      // Load modules based on strategy
-      await this.loadDiscoveredModules(modules, autoDiscoveryConfig);
-
-      // Setup final module handler to run after user middleware (like auth)
-      this.coreFramework.setupFinalModuleHandler();
-
-      // Setup file watching if enabled
-      if (autoDiscoveryConfig.watchForChanges) {
-        this.moduleDiscovery.watchModulesAdvanced(
-          autoDiscoveryConfig,
-          async (updatedModules: ModuleConfig[]) => {
-            await this.handleModuleChanges(updatedModules);
+      if (!statSync(modulesPath).isDirectory()) return;
+
+      const items = readdirSync(modulesPath);
+      items.forEach(item => {
+        const fullPath = join(modulesPath, item);
+        if (statSync(fullPath).isDirectory()) {
+          const indexPath = join(fullPath, 'index.ts');
+          try {
+            statSync(indexPath);
+            // Module directory found, will be loaded later
+            this.logger.debug(`Discovered module: ${item}`, 'ModuleDiscovery');
+          } catch {
+            // No index.ts, skip
           }
-        );
-      }
-
-      this.logger.info(
-        `Auto-discovery completed: ${modules.length} modules loaded`,
-        'ModuleDiscovery'
-      );
-    } catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-
-      if (autoDiscoveryConfig.failOnError) {
-        throw new Error(`Module auto-discovery failed: ${errorMsg}`);
-      } else {
-        this.logger.warn(`Module auto-discovery failed: ${errorMsg}`, 'ModuleDiscovery');
-      }
-    }
-  }
-
-  // Merge auto-discovery configuration from multiple sources
-  private mergeAutoDiscoveryConfig(options: MoroOptions) {
-    const defaultConfig = this.config.modules.autoDiscovery;
-
-    // Handle legacy modulesPath option
-    if (options.modulesPath && !options.autoDiscover) {
-      return {
-        ...defaultConfig,
-        paths: [options.modulesPath],
-      };
-    }
-
-    // Handle boolean autoDiscover option
-    if (typeof options.autoDiscover === 'boolean') {
-      return {
-        ...defaultConfig,
-        enabled: options.autoDiscover,
-      };
-    }
-
-    // Handle object autoDiscover option
-    if (typeof options.autoDiscover === 'object') {
-      return {
-        ...defaultConfig,
-        ...options.autoDiscover,
-      };
-    }
-
-    return defaultConfig;
-  }
-
-  // Load discovered modules based on strategy
-  private async loadDiscoveredModules(
-    modules: ModuleConfig[],
-    config: ModuleDefaultsConfig['autoDiscovery']
-  ): Promise<void> {
-    switch (config.loadingStrategy) {
-      case 'eager':
-        // Load all modules immediately
-        for (const module of modules) {
-          await this.loadModule(module);
-        }
-        break;
-
-      case 'lazy':
-        // Register modules for lazy loading
-        this.registerLazyModules(modules);
-        break;
-
-      case 'conditional':
-        // Load modules based on conditions
-        await this.loadConditionalModules(modules);
-        break;
-
-      default:
-        // Default to eager loading
-        for (const module of modules) {
-          await this.loadModule(module);
-        }
-    }
-  }
-
-  // Register modules for lazy loading
-  private registerLazyModules(modules: ModuleConfig[]): void {
-    modules.forEach(module => {
-      // Store module for lazy loading when first route is accessed
-      this.lazyModules.set(module.name, module);
-
-      // Register placeholder routes that trigger lazy loading
-      if (module.routes) {
-        module.routes.forEach(route => {
-          const basePath = `/api/v${module.version}/${module.name}`;
-          const fullPath = `${basePath}${route.path}`;
-
-          // Note: Lazy loading will be implemented when route is accessed
-          // For now, we'll store the module for later loading
-          this.logger.debug(
-            `Registered lazy route: ${route.method} ${fullPath}`,
-            'ModuleDiscovery'
-          );
-        });
-      }
-    });
-
-    this.logger.info(`Registered ${modules.length} modules for lazy loading`, 'ModuleDiscovery');
-  }
-
-  // Load modules conditionally based on environment or configuration
-  private async loadConditionalModules(modules: ModuleConfig[]): Promise<void> {
-    for (const module of modules) {
-      const shouldLoad = this.shouldLoadModule(module);
-
-      if (shouldLoad) {
-        await this.loadModule(module);
-      } else {
-        this.logger.debug(`Skipping module ${module.name} due to conditions`, 'ModuleDiscovery');
-      }
-    }
-  }
-
-  // Determine if a module should be loaded based on conditions
-  private shouldLoadModule(module: ModuleConfig): boolean {
-    const moduleConfig = module.config as any;
-
-    // Check environment conditions
-    if (moduleConfig?.conditions?.environment) {
-      const requiredEnv = moduleConfig.conditions.environment;
-      const currentEnv = process.env.NODE_ENV || 'development';
-
-      if (Array.isArray(requiredEnv)) {
-        if (!requiredEnv.includes(currentEnv)) {
-          return false;
-        }
-      } else if (requiredEnv !== currentEnv) {
-        return false;
-      }
-    }
-
-    // Check feature flags
-    if (moduleConfig?.conditions?.features) {
-      const requiredFeatures = moduleConfig.conditions.features;
-
-      for (const feature of requiredFeatures) {
-        if (!process.env[`FEATURE_${feature.toUpperCase()}`]) {
-          return false;
         }
-      }
-    }
-
-    // Check custom conditions
-    if (moduleConfig?.conditions?.custom) {
-      const customCondition = moduleConfig.conditions.custom;
-
-      if (typeof customCondition === 'function') {
-        return customCondition();
-      }
+      });
+    } catch {
+      // Modules directory doesn't exist, that's fine
     }
-
-    return true;
-  }
-
-  // Handle module changes during development
-  private async handleModuleChanges(modules: ModuleConfig[]): Promise<void> {
-    this.logger.info('Module changes detected, reloading...', 'ModuleDiscovery');
-
-    // Unload existing modules (if supported)
-    // For now, just log the change
-    this.eventBus.emit('modules:changed', {
-      modules: modules.map(m => ({ name: m.name, version: m.version })),
-      timestamp: new Date(),
-    });
-  }
-
-  // Legacy method for backward compatibility
-  private autoDiscoverModules(modulesPath: string) {
-    // Redirect to new system
-    this.initializeAutoDiscovery({
-      autoDiscover: {
-        enabled: true,
-        paths: [modulesPath],
-      },
-    });
   }
 
   private async importModule(modulePath: string): Promise<ModuleConfig> {
@@ -1231,84 +935,55 @@ export class Moro extends EventEmitter {
     return module.default || module;
   }
 
-  /**
-   * Node.js Clustering Implementation
-   * This clustering algorithm is based on published research and Node.js best practices.
-   *
-   * IPC (Inter-Process Communication) Considerations:
-   * - Excessive workers create IPC bottlenecks (Source: BetterStack Node.js Guide)
-   * - Round-robin scheduling provides better load distribution (Node.js Documentation)
-   * - Message passing overhead increases significantly with worker count
-   *
-   * Memory Management:
-   * - ~2GB per worker prevents memory pressure and GC overhead
-   * - Conservative heap limits reduce memory fragmentation
-   *
-   * References:
-   * - Node.js Cluster Documentation: https://nodejs.org/api/cluster.html
-   * - BetterStack Node.js Clustering: https://betterstack.com/community/guides/scaling-nodejs/node-clustering/
-   */
+  // Clustering support for massive performance gains with proper cleanup
   private clusterWorkers = new Map<number, any>();
-
   private startWithClustering(port: number, host?: string, callback?: () => void): void {
     const cluster = require('cluster');
     const os = require('os');
 
-    // Worker count calculation - respect user choice
+    // Smart worker count calculation based on actual bottlenecks
     let workerCount = this.config.performance?.clustering?.workers || os.cpus().length;
 
-    // Only auto-optimize if user hasn't specified a number or set it to 'auto'
-    if (workerCount === 'auto') {
+    // Auto-optimize worker count based on system characteristics
+    if (workerCount === 'auto' || workerCount > 8) {
+      // For high-core machines, limit workers to prevent IPC/memory bottlenecks
       const cpuCount = os.cpus().length;
       const totalMemoryGB = os.totalmem() / (1024 * 1024 * 1024);
 
-      // Get memory per worker from config - if not set by user, calculate dynamically
-      let memoryPerWorkerGB = this.config.performance?.clustering?.memoryPerWorkerGB;
-
-      if (!memoryPerWorkerGB) {
-        // Dynamic calculation: (Total RAM - 4GB headroom) / CPU cores
-        const headroomGB = 4;
-        memoryPerWorkerGB = Math.max(0.5, Math.floor((totalMemoryGB - headroomGB) / cpuCount));
+      // Optimal worker count formula based on research
+      if (cpuCount >= 16) {
+        // High-core machines: focus on memory/IPC efficiency
+        workerCount = Math.min(Math.ceil(totalMemoryGB / 2), 4); // 2GB per worker max, cap at 4
+      } else if (cpuCount >= 8) {
+        // Mid-range machines: balanced approach
+        workerCount = Math.min(cpuCount / 2, 4);
+      } else {
+        // Low-core machines: use all cores
+        workerCount = cpuCount;
       }
 
-      // Conservative formula based on general guidelines:
-      // - Don't exceed CPU cores
-      // - Respect user's memory allocation preference
-      // - Let the system resources determine the limit
-      workerCount = Math.min(
-        cpuCount, // Don't exceed CPU cores
-        Math.floor(totalMemoryGB / memoryPerWorkerGB) // User-configurable memory per worker
-      );
-
       this.logger.info(
-        `Auto-calculated worker count: ${workerCount} (CPU: ${cpuCount}, RAM: ${totalMemoryGB.toFixed(1)}GB, ${memoryPerWorkerGB}GB per worker)`,
+        `Auto-optimized workers: ${workerCount} (CPU: ${cpuCount}, RAM: ${totalMemoryGB.toFixed(1)}GB)`,
         'Cluster'
       );
-    } else if (typeof workerCount === 'number') {
-      // User specified a number - respect their choice
-      this.logger.info(`Using user-specified worker count: ${workerCount}`, 'Cluster');
     }
 
     if (cluster.isPrimary) {
-      this.logger.info(`Starting ${workerCount} workers`, 'Cluster');
+      this.logger.info(`🚀 Starting ${workerCount} workers for maximum performance`, 'Cluster');
 
       // Optimize cluster scheduling for high concurrency
-      // Round-robin is the default on all platforms except Windows (Node.js docs)
-      // Provides better load distribution than shared socket approach
-      cluster.schedulingPolicy = cluster.SCHED_RR;
+      cluster.schedulingPolicy = cluster.SCHED_RR; // Round-robin scheduling
 
       // Set cluster settings for better performance
       cluster.setupMaster({
-        exec: process.argv[1] || process.execPath,
+        exec: process.argv[1],
         args: process.argv.slice(2),
         silent: false,
       });
 
-      // IPC Optimization: Reduce communication overhead between master and workers
-      // Research shows excessive IPC can create bottlenecks in clustered applications
-      // (Source: BetterStack - Node.js Clustering Guide)
+      // Optimize IPC to reduce communication overhead
       process.env.NODE_CLUSTER_SCHED_POLICY = 'rr'; // Ensure round-robin
-      process.env.NODE_DISABLE_COLORS = '1'; // Reduce IPC message size by disabling color codes
+      process.env.NODE_DISABLE_COLORS = '1'; // Reduce IPC message size
 
       // Graceful shutdown handler
       const gracefulShutdown = () => {
@@ -1329,32 +1004,37 @@ export class Moro extends EventEmitter {
       process.on('SIGINT', gracefulShutdown);
       process.on('SIGTERM', gracefulShutdown);
 
-      // Fork workers with basic tracking
+      // Fork workers with proper tracking and CPU affinity
       for (let i = 0; i < workerCount; i++) {
-        const worker = cluster.fork();
+        const worker = cluster.fork({
+          WORKER_ID: i,
+          WORKER_CPU_AFFINITY: i % os.cpus().length, // Distribute workers across CPUs
+        });
         this.clusterWorkers.set(worker.process.pid!, worker);
-        this.logger.info(`Worker ${worker.process.pid} started`, 'Cluster');
+        this.logger.info(
+          `Worker ${worker.process.pid} started (CPU ${i % os.cpus().length})`,
+          'Cluster'
+        );
 
-        // Handle individual worker messages
+        // Handle individual worker messages (reuse handler)
         worker.on('message', this.handleWorkerMessage.bind(this));
       }
 
-      // Simple worker exit handling
+      // Handle worker exits with cleanup
       cluster.on('exit', (worker: any, code: number, signal: string) => {
-        const pid = worker.process.pid;
-        this.clusterWorkers.delete(pid);
-
-        if (code !== 0 && !worker.exitedAfterDisconnect) {
-          this.logger.warn(
-            `Worker ${pid} died unexpectedly (${signal || code}). Restarting...`,
-            'Cluster'
-          );
-
-          // Simple restart
-          const newWorker = cluster.fork();
-          this.clusterWorkers.set(newWorker.process.pid!, newWorker);
-          this.logger.info(`Worker ${newWorker.process.pid} restarted`, 'Cluster');
-        }
+        // Clean up worker tracking
+        this.clusterWorkers.delete(worker.process.pid);
+
+        this.logger.warn(
+          `Worker ${worker.process.pid} died (${signal || code}). Restarting...`,
+          'Cluster'
+        );
+
+        // Restart worker with proper tracking
+        const newWorker = cluster.fork();
+        this.clusterWorkers.set(newWorker.process.pid!, newWorker);
+        newWorker.on('message', this.handleWorkerMessage.bind(this));
+        this.logger.info(`Worker ${newWorker.process.pid} started`, 'Cluster');
       });
 
       // Master process callback
@@ -1367,29 +1047,13 @@ export class Moro extends EventEmitter {
       process.env.UV_THREADPOOL_SIZE = '64';
 
       // 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
-        applyLoggingConfiguration(undefined, { level: 'warn' }); // Only warnings and errors
+        this.config.logging.level = 'warn'; // Only warnings and errors
       }
 
-      // Research-based memory optimization for workers
-      const os = require('os');
-      const totalMemoryGB = os.totalmem() / (1024 * 1024 * 1024);
-      const workerCount = Object.keys(require('cluster').workers || {}).length || 1;
-
-      // Conservative memory allocation
-      const heapSizePerWorkerMB = Math.min(
-        Math.floor(((totalMemoryGB * 1024) / workerCount) * 0.8), // 80% of available memory
-        1536 // Cap at 1.5GB (GC efficiency threshold from research)
-      );
-
-      process.env.NODE_OPTIONS = `--max-old-space-size=${heapSizePerWorkerMB}`;
-
-      this.logger.debug(
-        `Worker memory allocated: ${heapSizePerWorkerMB}MB heap (${workerCount} workers, ${totalMemoryGB.toFixed(1)}GB total)`,
-        'Worker'
-      );
+      // Memory optimization for workers
+      process.env.NODE_OPTIONS = '--max-old-space-size=1024'; // Limit memory per worker
 
       // Optimize V8 flags for better performance (Rust-level optimizations)
       if (process.env.NODE_ENV === 'production') {
@@ -1485,7 +1149,7 @@ export class Moro extends EventEmitter {
     }
   }
 
-  // Simple worker message handler
+  // Reusable worker message handler (avoids creating new functions)
   private handleWorkerMessage(message: any): void {
     // Handle inter-worker communication if needed
     if (message.type === 'health-check') {
@@ -1496,58 +1160,6 @@ export class Moro extends EventEmitter {
     // Log other worker messages
     this.logger.debug(`Worker message: ${JSON.stringify(message)}`, 'Cluster');
   }
-
-  /**
-   * Gracefully close the application and clean up resources
-   * This should be called in tests and during shutdown
-   */
-  async close(): Promise<void> {
-    this.logger.debug('Closing Moro application...');
-
-    // Flush logger buffer before shutdown
-    try {
-      // Use flushBuffer for immediate synchronous flush
-      this.logger.flushBuffer();
-    } catch (error) {
-      // Ignore flush errors during shutdown
-    }
-
-    // Close the core framework with timeout
-    if (this.coreFramework && (this.coreFramework as any).httpServer) {
-      try {
-        await Promise.race([
-          new Promise<void>(resolve => {
-            (this.coreFramework as any).httpServer.close(() => {
-              resolve();
-            });
-          }),
-          new Promise<void>(resolve => setTimeout(resolve, 2000)), // 2 second timeout
-        ]);
-      } catch (error) {
-        // Force close if graceful close fails
-        this.logger.warn('Force closing HTTP server due to timeout');
-      }
-    }
-
-    // Clean up module discovery watchers
-    if (this.moduleDiscovery && typeof this.moduleDiscovery.cleanup === 'function') {
-      try {
-        this.moduleDiscovery.cleanup();
-      } catch (error) {
-        // Ignore cleanup errors
-      }
-    }
-
-    // Clean up event listeners
-    try {
-      this.eventBus.removeAllListeners();
-      this.removeAllListeners();
-    } catch (error) {
-      // Ignore cleanup errors
-    }
-
-    this.logger.debug('Moro application closed successfully');
-  }
 }
 
 // Export convenience function