@morojs/moro 1.5.16 → 1.6.0

package/src/core/framework.ts

@@ -5,18 +5,20 @@ import {
   createServer as createHttp2Server,
 } from 'http2';
 import { EventEmitter } from 'events';
-import { MoroHttpServer, HttpRequest, HttpResponse, middleware } from './http';
-import { Router } from './http';
-import { Container } from './utilities';
-import { ModuleLoader } from './modules';
-import { WebSocketManager } from './networking';
-import { CircuitBreaker } from './utilities';
-import { MoroEventBus } from './events';
-import { createFrameworkLogger, logger as globalLogger } from './logger';
-import { ModuleConfig, InternalRouteDefinition } from '../types/module';
-import { LogLevel, LoggerOptions } from '../types/logger';
-import { MoroOptions as CoreMoroOptions } from '../types/core';
-import { WebSocketAdapter, WebSocketAdapterOptions } from './networking/websocket-adapter';
+import { MoroHttpServer, HttpRequest, HttpResponse, middleware } from './http/index.js';
+import { UWebSocketsHttpServer } from './http/uws-http-server.js';
+import { Router } from './http/router.js';
+import { Container } from './utilities/container.js';
+import { ModuleLoader } from './modules/index.js';
+import { WebSocketManager } from './networking/websocket-manager.js';
+import { CircuitBreaker } from './utilities/circuit-breaker.js';
+import { isPackageAvailable } from './utilities/package-utils.js';
+import { MoroEventBus } from './events/index.js';
+import { createFrameworkLogger, logger as globalLogger } from './logger/index.js';
+import { ModuleConfig, InternalRouteDefinition } from '../types/module.js';
+import { LogLevel, LoggerOptions } from '../types/logger.js';
+import { MoroOptions as CoreMoroOptions } from '../types/core.js';
+import { WebSocketAdapter, WebSocketAdapterOptions } from './networking/websocket-adapter.js';
 
 // Extended MoroOptions that includes both core options and framework-specific options
 export interface MoroOptions extends CoreMoroOptions {
@@ -39,8 +41,8 @@ export interface MoroOptions extends CoreMoroOptions {
 }
 
 export class Moro extends EventEmitter {
-  private httpServer: MoroHttpServer;
-  private server: Server | any; // HTTP/2 server type
+  private httpServer: MoroHttpServer | UWebSocketsHttpServer;
+  private server: Server | any; // HTTP/2 server type or uWebSockets app
   private websocketAdapter?: WebSocketAdapter;
   private container: Container;
   private moduleLoader: ModuleLoader;
@@ -53,6 +55,9 @@ export class Moro extends EventEmitter {
   private logger: any;
   private options: MoroOptions;
   private config: any;
+  private usingUWebSockets = false;
+  // WebSocket initialization promise to handle async adapter detection
+  private websocketSetupPromise: Promise<void> | null = null;
 
   constructor(options: MoroOptions = {}) {
     super();
@@ -77,10 +82,33 @@ export class Moro extends EventEmitter {
     // Initialize framework logger after global configuration
     this.logger = createFrameworkLogger('Core');
 
-    this.httpServer = new MoroHttpServer();
+    // Check if uWebSockets should be used for HTTP and WebSocket
+    const useUWebSockets = this.config.server?.useUWebSockets || false;
+
+    if (useUWebSockets) {
+      try {
+        // Try to use uWebSockets for ultra-high performance HTTP and WebSocket
+        const sslOptions = this.config.server?.ssl || options.https;
+        this.httpServer = new UWebSocketsHttpServer({ ssl: sslOptions });
+        this.server = (this.httpServer as UWebSocketsHttpServer).getApp();
+        this.usingUWebSockets = true;
+        this.logger.info('uWebSockets HTTP+WebSocket server created', 'ServerInit');
+      } catch (error) {
+        // Fallback to standard HTTP/1.1 if uWebSockets fails to load
+        this.logger.warn(
+          'uWebSockets failed to initialize, falling back to Node.js http.Server. ' +
+            'Error: ' +
+            (error instanceof Error ? error.message : String(error)),
+          'ServerInit'
+        );
+        this.usingUWebSockets = false;
+        this.httpServer = new MoroHttpServer();
+        this.server = (this.httpServer as MoroHttpServer).getServer();
+      }
+    } else if (options.http2) {
+      // Use HTTP/2
+      this.httpServer = new MoroHttpServer();
 
-    // Create HTTP/2 or HTTP/1.1 server based on options
-    if (options.http2) {
       if (options.https) {
         this.server = createHttp2SecureServer(options.https);
       } else {
@@ -95,12 +123,14 @@ export class Moro extends EventEmitter {
         req.url = headers[':path'];
         req.method = headers[':method'];
         req.headers = headers;
-        this.httpServer['handleRequest'](req, res);
+        (this.httpServer as MoroHttpServer)['handleRequest'](req, res);
       });
 
       this.logger.info('HTTP/2 server created', 'ServerInit');
     } else {
-      this.server = this.httpServer.getServer();
+      // Use standard HTTP/1.1
+      this.httpServer = new MoroHttpServer();
+      this.server = (this.httpServer as MoroHttpServer).getServer();
     }
 
     this.container = new Container();
@@ -111,7 +141,8 @@ export class Moro extends EventEmitter {
       this.config.websocket.enabled ||
       (options.websocket && typeof options.websocket === 'object')
     ) {
-      this.setupWebSockets(options.websocket || {});
+      // Store the promise so we can await it before using websockets
+      this.websocketSetupPromise = this.setupWebSockets(options.websocket || {});
     }
 
     // Initialize enterprise event bus
@@ -184,29 +215,47 @@ export class Moro extends EventEmitter {
    */
   private async setupWebSockets(wsConfig: any): Promise<void> {
     try {
-      // Use provided adapter or try to auto-detect
-      if (wsConfig.adapter) {
-        this.websocketAdapter = wsConfig.adapter;
+      // If using uWebSockets HTTP server, automatically use uWebSockets for WebSocket too
+      if (this.usingUWebSockets) {
+        const { UWebSocketsAdapter } = await import('./networking/adapters/index.js');
+        this.websocketAdapter = new UWebSocketsAdapter();
+
+        // For uWebSockets, we need to integrate with the existing app
+        const uwsHttpServer = this.httpServer as UWebSocketsHttpServer;
+        await this.websocketAdapter.initialize(uwsHttpServer.getApp(), wsConfig.options);
+
+        this.logger.info(
+          'uWebSockets adapter initialized (integrated with HTTP server)',
+          'WebSocketSetup'
+        );
       } else {
-        this.websocketAdapter = (await this.detectWebSocketAdapter()) || undefined;
+        // Use provided adapter or try to auto-detect
+        if (wsConfig.adapter) {
+          this.websocketAdapter = wsConfig.adapter;
+        } else {
+          this.websocketAdapter = (await this.detectWebSocketAdapter()) || undefined;
+        }
+
+        if (this.websocketAdapter) {
+          await this.websocketAdapter.initialize(this.server, wsConfig.options);
+
+          this.logger.info(
+            `WebSocket adapter initialized: ${this.websocketAdapter.getAdapterName()}`,
+            'WebSocketSetup'
+          );
+        }
       }
 
+      // Configure adapter features (if adapter was created)
       if (this.websocketAdapter) {
-        await this.websocketAdapter.initialize(this.server, wsConfig.options);
         this.websocketManager = new WebSocketManager(this.websocketAdapter, this.container);
 
-        // Configure adapter features
         if (wsConfig.compression) {
           this.websocketAdapter.setCompression(true);
         }
         if (wsConfig.customIdGenerator) {
           this.websocketAdapter.setCustomIdGenerator(wsConfig.customIdGenerator);
         }
-
-        this.logger.info(
-          `WebSocket adapter initialized: ${this.websocketAdapter.getAdapterName()}`,
-          'WebSocketSetup'
-        );
       }
     } catch (error) {
       this.logger.warn(
@@ -219,26 +268,72 @@ export class Moro extends EventEmitter {
 
   /**
    * Auto-detect available WebSocket adapter
+   * Tests if the library is actually installed by checking require.resolve
    */
   private async detectWebSocketAdapter(): Promise<WebSocketAdapter | null> {
-    // Try socket.io first
-    try {
-      const { SocketIOAdapter } = await import('./networking/adapters');
-      return new SocketIOAdapter();
-    } catch {
-      // socket.io not available
+    // Check if adapter is specified in config
+    if (this.config.websocket?.adapter) {
+      const adapterType = this.config.websocket.adapter;
+
+      if (adapterType === 'uws' && isPackageAvailable('uWebSockets.js')) {
+        try {
+          const { UWebSocketsAdapter } = await import('./networking/adapters/index.js');
+          return new UWebSocketsAdapter();
+        } catch {
+          this.logger.warn('uWebSockets.js specified but failed to load', 'AdapterDetection');
+        }
+      } else if (adapterType === 'socket.io' && isPackageAvailable('socket.io')) {
+        try {
+          const { SocketIOAdapter } = await import('./networking/adapters/index.js');
+          return new SocketIOAdapter();
+        } catch {
+          this.logger.warn('socket.io specified but failed to load', 'AdapterDetection');
+        }
+      } else if (adapterType === 'ws' && isPackageAvailable('ws')) {
+        try {
+          const { WSAdapter } = await import('./networking/adapters/index.js');
+          return new WSAdapter();
+        } catch {
+          this.logger.warn('ws specified but failed to load', 'AdapterDetection');
+        }
+      }
     }
 
-    // Try native ws library
-    try {
-      const { WSAdapter } = await import('./networking/adapters');
-      return new WSAdapter();
-    } catch {
-      // ws not available
+    // Auto-detect: Try uWebSockets.js first (highest performance)
+    if (isPackageAvailable('uWebSockets.js')) {
+      try {
+        const { UWebSocketsAdapter } = await import('./networking/adapters/index.js');
+        this.logger.debug('uWebSockets.js detected and loaded', 'AdapterDetection');
+        return new UWebSocketsAdapter();
+      } catch {
+        // Failed to load adapter
+      }
+    }
+
+    // Try socket.io second
+    if (isPackageAvailable('socket.io')) {
+      try {
+        const { SocketIOAdapter } = await import('./networking/adapters/index.js');
+        this.logger.debug('socket.io detected and loaded', 'AdapterDetection');
+        return new SocketIOAdapter();
+      } catch {
+        // Failed to load adapter
+      }
+    }
+
+    // Try native ws library last
+    if (isPackageAvailable('ws')) {
+      try {
+        const { WSAdapter } = await import('./networking/adapters/index.js');
+        this.logger.debug('ws detected and loaded', 'AdapterDetection');
+        return new WSAdapter();
+      } catch {
+        // Failed to load adapter
+      }
     }
 
     this.logger.warn(
-      'No WebSocket adapter found. Install socket.io or ws for WebSocket support',
+      'No WebSocket adapter found. Install uWebSockets.js, socket.io, or ws for WebSocket support',
       'AdapterDetection'
     );
     return null;
@@ -317,6 +412,15 @@ export class Moro extends EventEmitter {
     return this.websocketAdapter;
   }
 
+  /**
+   * Ensure WebSocket setup is complete (for async adapter detection)
+   */
+  async ensureWebSocketReady(): Promise<void> {
+    if (this.websocketSetupPromise) {
+      await this.websocketSetupPromise;
+    }
+  }
+
   /**
    * Get the WebSocket manager
    */
@@ -619,22 +723,61 @@ export class Moro extends EventEmitter {
     this.logger.debug(`Mounting router for basePath: ${basePath}`, 'Router');
 
     // Enterprise-grade middleware integration with performance optimization
+    // IMPORTANT: Module middleware runs AFTER user middleware (like auth) to ensure proper order
     this.httpServer.use(async (req: HttpRequest, res: HttpResponse, next: () => void) => {
       if (req.path.startsWith(basePath)) {
         this.logger.debug(`Module middleware handling: ${req.method} ${req.path}`, 'Middleware', {
           basePath,
         });
 
+        // Mark this request as being handled by a module
+        (req as any).__moduleBasePath = basePath;
+        (req as any).__moduleRouter = router;
+
+        // Continue to next middleware (including auth) first
+        next();
+      } else {
+        next();
+      }
+    });
+
+    this.logger.info(`Router mounted for ${basePath}`, 'Router');
+  }
+
+  private finalModuleHandlerSetup = false;
+
+  // Setup final module handler that runs after all user middleware
+  setupFinalModuleHandler(): void {
+    // Prevent duplicate setup
+    if (this.finalModuleHandlerSetup) {
+      this.logger.debug('Final module handler already set up, skipping', 'ModuleSystem');
+      return;
+    }
+    this.finalModuleHandlerSetup = true;
+
+    this.logger.info(
+      'Setting up final module handler to run after user middleware',
+      'ModuleSystem'
+    );
+
+    this.httpServer.use(async (req: HttpRequest, res: HttpResponse, next: () => void) => {
+      // Check if this request was marked for module handling
+      const moduleBasePath = (req as any).__moduleBasePath;
+      const moduleRouter = (req as any).__moduleRouter;
+
+      if (moduleBasePath && moduleRouter && !res.headersSent) {
+        this.logger.debug(`Final module handler processing: ${req.method} ${req.path}`, 'Router');
+
         try {
-          const handled = await router.handle(req, res, basePath);
-          this.logger.debug(`Route handled: ${handled}`, 'Router');
+          const handled = await moduleRouter.handle(req, res, moduleBasePath);
+          this.logger.debug(`Route handled by module: ${handled}`, 'Router');
 
           if (!handled) {
             next(); // Let other middleware handle it
           }
           // If handled, the router already sent the response, so don't call next()
         } catch (error) {
-          this.logger.error('Router error', 'Router', {
+          this.logger.error('Module router error', 'Router', {
             error: error instanceof Error ? error.message : String(error),
           });
           if (!res.headersSent) {
@@ -645,8 +788,6 @@ export class Moro extends EventEmitter {
         next();
       }
     });
-
-    this.logger.info(`Router mounted for ${basePath}`, 'Router');
   }
 
   private async setupWebSocketHandlers(config: ModuleConfig): Promise<void> {

package/src/core/http/http-server.ts

@@ -1,9 +1,17 @@
 // src/core/http-server.ts
 import { IncomingMessage, ServerResponse, createServer, Server } from 'http';
 import * as zlib from 'zlib';
+import { createReadStream } from 'fs';
+import * as crypto from 'crypto';
 import { promisify } from 'util';
-import { createFrameworkLogger } from '../logger';
-import { HttpRequest, HttpResponse, HttpHandler, Middleware, RouteEntry } from '../../types/http';
+import { createFrameworkLogger } from '../logger/index.js';
+import {
+  HttpRequest,
+  HttpResponse,
+  HttpHandler,
+  Middleware,
+  RouteEntry,
+} from '../../types/http.js';
 
 const gzip = promisify(zlib.gzip);
 const deflate = promisify(zlib.deflate);
@@ -285,64 +293,6 @@ export class MoroHttpServer {
       // Execute handler
       await route.handler(httpReq, httpRes);
     } catch (error) {
-      // Handle JWT-specific errors gracefully
-      if (
-        error instanceof Error &&
-        (error.name === 'TokenExpiredError' ||
-          error.name === 'JsonWebTokenError' ||
-          error.name === 'NotBeforeError')
-      ) {
-        this.logger.debug('JWT authentication error', 'RequestHandler', {
-          errorType: error.name,
-          errorMessage: error.message,
-          requestPath: req.url,
-          requestMethod: req.method,
-          requestId: httpReq.requestId,
-        });
-
-        if (!httpRes.headersSent) {
-          if (typeof httpRes.status === 'function' && typeof httpRes.json === 'function') {
-            if (error.name === 'TokenExpiredError') {
-              httpRes.status(401).json({
-                success: false,
-                error: 'Token expired',
-                message: 'Your session has expired. Please sign in again.',
-                requestId: httpReq.requestId,
-                expiredAt: (error as any).expiredAt,
-              });
-            } else if (error.name === 'JsonWebTokenError') {
-              httpRes.status(401).json({
-                success: false,
-                error: 'Invalid token',
-                message: 'The provided authentication token is invalid.',
-                requestId: httpReq.requestId,
-              });
-            } else if (error.name === 'NotBeforeError') {
-              httpRes.status(401).json({
-                success: false,
-                error: 'Token not ready',
-                message: 'The authentication token is not yet valid.',
-                requestId: httpReq.requestId,
-                availableAt: (error as any).date,
-              });
-            }
-          } else {
-            // Fallback for non-enhanced response objects
-            httpRes.statusCode = 401;
-            httpRes.setHeader('Content-Type', 'application/json');
-            httpRes.end(
-              JSON.stringify({
-                success: false,
-                error: 'Authentication failed',
-                message: 'JWT authentication error occurred.',
-                requestId: httpReq.requestId,
-              })
-            );
-          }
-        }
-        return;
-      }
-
       // Debug: Log the actual error and where it came from
       this.logger.debug('Request error details', 'RequestHandler', {
         errorType: typeof error,
@@ -1074,101 +1024,11 @@ export class MoroHttpServer {
                 if (!nextCalled) next();
               })
               .catch(error => {
-                // Handle JWT errors in async middleware
-                if (
-                  error instanceof Error &&
-                  (error.name === 'TokenExpiredError' ||
-                    error.name === 'JsonWebTokenError' ||
-                    error.name === 'NotBeforeError')
-                ) {
-                  if (!res.headersSent) {
-                    if (typeof res.status === 'function' && typeof res.json === 'function') {
-                      if (error.name === 'TokenExpiredError') {
-                        res.status(401).json({
-                          success: false,
-                          error: 'Token expired',
-                          message: 'Your session has expired. Please sign in again.',
-                          expiredAt: (error as any).expiredAt,
-                        });
-                      } else if (error.name === 'JsonWebTokenError') {
-                        res.status(401).json({
-                          success: false,
-                          error: 'Invalid token',
-                          message: 'The provided authentication token is invalid.',
-                        });
-                      } else if (error.name === 'NotBeforeError') {
-                        res.status(401).json({
-                          success: false,
-                          error: 'Token not ready',
-                          message: 'The authentication token is not yet valid.',
-                          availableAt: (error as any).date,
-                        });
-                      }
-                    } else {
-                      res.statusCode = 401;
-                      res.setHeader('Content-Type', 'application/json');
-                      res.end(
-                        JSON.stringify({
-                          success: false,
-                          error: 'Authentication failed',
-                          message: 'JWT authentication error occurred.',
-                        })
-                      );
-                    }
-                  }
-                  resolve(); // Continue middleware chain
-                } else {
-                  reject(error);
-                }
+                reject(error);
               });
           }
         } catch (error) {
-          // Handle JWT errors in sync middleware
-          if (
-            error instanceof Error &&
-            (error.name === 'TokenExpiredError' ||
-              error.name === 'JsonWebTokenError' ||
-              error.name === 'NotBeforeError')
-          ) {
-            if (!res.headersSent) {
-              if (typeof res.status === 'function' && typeof res.json === 'function') {
-                if (error.name === 'TokenExpiredError') {
-                  res.status(401).json({
-                    success: false,
-                    error: 'Token expired',
-                    message: 'Your session has expired. Please sign in again.',
-                    expiredAt: (error as any).expiredAt,
-                  });
-                } else if (error.name === 'JsonWebTokenError') {
-                  res.status(401).json({
-                    success: false,
-                    error: 'Invalid token',
-                    message: 'The provided authentication token is invalid.',
-                  });
-                } else if (error.name === 'NotBeforeError') {
-                  res.status(401).json({
-                    success: false,
-                    error: 'Token not ready',
-                    message: 'The authentication token is not yet valid.',
-                    availableAt: (error as any).date,
-                  });
-                }
-              } else {
-                res.statusCode = 401;
-                res.setHeader('Content-Type', 'application/json');
-                res.end(
-                  JSON.stringify({
-                    success: false,
-                    error: 'Authentication failed',
-                    message: 'JWT authentication error occurred.',
-                  })
-                );
-              }
-            }
-            resolve(); // Continue middleware chain
-          } else {
-            reject(error);
-          }
+          reject(error);
         }
       });
     }
@@ -1281,7 +1141,6 @@ export const middleware = {
   },
 
   compression: (options: { threshold?: number; level?: number } = {}): Middleware => {
-    const zlib = require('zlib');
     const threshold = options.threshold || 1024;
     const level = options.level || 6;
 
@@ -1867,7 +1726,7 @@ export const middleware = {
             res.setHeader('Content-Length', chunkSize);
 
             // Stream the range
-            const stream = require('fs').createReadStream(filePath, {
+            const stream = createReadStream(filePath, {
               start,
               end,
             });
@@ -1885,12 +1744,12 @@ export const middleware = {
               res.write(`\r\n--${boundary}\r\n`);
               res.write(`Content-Range: bytes ${start}-${end}/${fileSize}\r\n\r\n`);
 
-              const stream = require('fs').createReadStream(filePath, {
+              const stream = createReadStream(filePath, {
                 start,
                 end,
               });
-              await new Promise(resolve => {
-                stream.on('end', resolve);
+              await new Promise<void>(resolve => {
+                stream.on('end', () => resolve());
                 stream.pipe(res, { end: false });
               });
             }
@@ -1924,7 +1783,6 @@ export const middleware = {
     const ignoreMethods = options.ignoreMethods || ['GET', 'HEAD', 'OPTIONS'];
 
     const generateToken = () => {
-      const crypto = require('crypto');
       return crypto.randomBytes(tokenLength).toString('hex');
     };
 
@@ -2013,7 +1871,6 @@ export const middleware = {
       // Generate nonce if requested
       let nonce: string | undefined;
       if (options.nonce) {
-        const crypto = require('crypto');
         nonce = crypto.randomBytes(16).toString('base64');
         (req as any).cspNonce = nonce;
       }

package/src/core/http/index.ts

@@ -1,6 +1,7 @@
 // HTTP System - Centralized Exports
-export { MoroHttpServer, middleware } from './http-server';
-export { Router } from './router';
+export { MoroHttpServer, middleware } from './http-server.js';
+export { UWebSocketsHttpServer } from './uws-http-server.js';
+export { Router } from './router.js';
 
 // Type exports
-export type { HttpRequest, HttpResponse, HttpHandler, Middleware } from '../../types/http';
+export type { HttpRequest, HttpResponse, HttpHandler, Middleware } from '../../types/http.js';

package/src/core/http/router.ts

@@ -5,8 +5,8 @@ import {
   HttpHandler,
   Middleware,
   RouteDefinition,
-} from '../../types/http';
-import { createFrameworkLogger } from '../logger';
+} from '../../types/http.js';
+import { createFrameworkLogger } from '../logger/index.js';
 
 export class Router {
   private routes: RouteDefinition[] = [];