quantum-flow 1.20.7 → 2.0.0

package/README.md

@@ -45,6 +45,8 @@ import {
   Response,
   Status,
   ANY,
+  IRequest,
+  IResponse
 } from 'quantum-flow/core';
 import {IsString} from  'class-validator'
 import { Catch, Cors, Sanitize, Use, SANITIZER } from 'quantum-flow/middlewares';
@@ -81,8 +83,8 @@ export class User {
     @Query() query: Record<string, string | string[]>,
     @Headers() headers: Record<string, string | string[]>,
     @Params(ParamDTO, 'param') params: string,
-    @Request() req: HttpRequest,
-    @Response() resp: ServerResponse,
+    @Request() req: IResponse,
+    @Response() resp: IRequest,
     @InjectWS() ws: IWebSocketService,
   ) {}
 
@@ -148,7 +150,7 @@ Use `LambdaAdapter` to convert API Gateway events to requests and responses. Cre
 ```typescript
 Example Lambda handler creation
 import { LambdaAdapter, LambdaRequest, LambdaResponse } from 'quantum-flow/aws';
-import { Request, Query, Headers, Params, Response } from  'quantum-flow/core'
+import { Request, Query, Headers, Params, Response, IResponse, IRequest } from  'quantum-flow/core'
 
 @Controller({ prefix: 'user' })
 class UserController {
@@ -156,8 +158,8 @@ class UserController {
     @Query() query: Record<string, string | string[]>,
     @Headers() headers: Record<string, string | string[]>,
     @Params(ParamDTO, 'param') params: string,
-    @Request() req: LambdaRequest,
-    @Response() res: LambdaResponse
+    @Request() req: IRequest,
+    @Response() res: IResponse
   ) { }
 }
 const lambdaAdapter = new LambdaAdapter(UserController);
@@ -175,12 +177,12 @@ Enable WebSocket in the server configuration and register WebSocket controllers.
 
 ## Enabling WebSocket Support in Server
 
-To enable WS support, configure your HTTP server with the `enabled: true` option and register controllers that use SSE.
+To enable WS support, configure your HTTP server with the `path: string` option and register controllers that use SSE.
 
 Example server setup:
 
 ```typescript
-@Server( {websocketPath:'/ws',    websocket: { enabled: true } })
+@Server( { websocket: { path:'/ws' } })
 ```
 
 ## Injecting WebSocket events in Controller
@@ -308,19 +310,19 @@ import { OnSSEConnection, OnSSEError, OnSSEClose } from 'quantum-flow/sse';
 @Controller('user')
 export class User {
   @OnSSEConnection()
-  async onsseconnection(@Request() req: any, @Response() res: any) {
+  async onsseconnection(@Request() req, @Response() res) {
     console.log('SSE connection established');
     return req.body;
   }
 
   @OnSSEError()
-  async onsseerror(@Request() req: any, @Response() res: any) {
+  async onsseerror(@Request() req, @Response() res) {
     console.log('SSE error occurred');
     return req.body;
   }
 
   @OnSSEClose()
-  async onsseclose(@Request() req: any, @Response() res: any) {
+  async onsseclose(@Request() req, @Response() res) {
     console.log('SSE connection closed');
     return req.body;
   }
@@ -455,9 +457,8 @@ yarn add type-graphql graphql graphql-yoga @graphql-yoga/subscriptions
 ```typescript
 @Server({
   controllers: [/* your REST controllers */],
-  websocketPath:'/ws',  //GraphQL subscriptions uses same ws server as  main application
   graphql: {                   // GraphQL endpoint (default: '/graphql')
-    playground: true,                  // Enable GraphQL Playground
+    path: '/graphql',                  // Enable GraphQL Playground
     resolvers: [UserResolver, MessageResolver], // Your resolver classes
     pubSub: pubSub,                    // Your PubSub instance (required for subscriptions)
   },

package/dist/app/aws/lambda.js

@@ -4,7 +4,6 @@ exports.LambdaAdapter = void 0;
 const _constants_1 = require("../../constants.js");
 const _utils_1 = require("../../utils/index.js");
 const plugin_1 = require("../plugin");
-const utils_1 = require("./utils");
 class LambdaAdapter extends plugin_1.Plugin {
     handler;
     controllers = [];
@@ -12,15 +11,14 @@ class LambdaAdapter extends plugin_1.Plugin {
     constructor(Controller) {
         super();
         this.controllers.push(Controller);
-        this.handler = this.createHandler(Controller);
+        this.handler = this.createHandler();
     }
-    createHandler(Controller) {
+    createHandler() {
         return async (event, context) => {
-            this.controllers.push(Controller);
             await this.callPluginHook('beforeRequest', event, context);
-            const eventType = (0, utils_1.getEventType)(event);
-            const request = new utils_1.LRequest(event, context);
-            const response = new utils_1.LResponse();
+            const eventType = (0, _utils_1.getEventType)(event);
+            const request = _utils_1.RequestFactory.fromLambda(event, context);
+            const response = _utils_1.ResponseFactory.forLambda(request);
             return this.runControllers({
                 context,
                 event,
@@ -52,25 +50,20 @@ class LambdaAdapter extends plugin_1.Plugin {
                 }
                 await this.callPluginHook('beforeRoute', request, response);
                 processed = await instance.handleRequest(request, response);
-                if (processed.routeMatch)
+                if (processed)
                     break;
             }
             catch (error) {
-                return this.handleError(error, event, context);
+                return this.handleError(error, request);
             }
         }
-        if (!processed?.routeMatch) {
-            response.statusCode = 404;
-            return this.toLambdaResponse({ data: 'Route not found' }, request, response, eventType);
+        if ((0, _utils_1.getErrorType)(response?.data).isError) {
+            return this.handleError(processed?.data, request);
         }
-        if ((0, _utils_1.getErrorType)(processed?.data).isError) {
-            return this.handleError(processed?.data, event, context);
-        }
-        console.log(processed);
         return this.toLambdaResponse(processed?.data, request, response, eventType);
     }
     toLambdaResponse(data, request, response, eventType) {
-        const statusCode = data?.status ?? response?.statusCode ?? 200;
+        const statusCode = data?.status ?? response?.status ?? 200;
         const headers = {
             'Content-Type': 'application/json',
             'X-Request-Id': request.requestId,
@@ -126,18 +119,21 @@ class LambdaAdapter extends plugin_1.Plugin {
                 return { statusCode, headers, body };
         }
     }
-    handleError(error, event, context) {
-        let serialized = (0, _utils_1.serializeError)(error);
-        const eventType = (0, utils_1.getEventType)(event);
-        const statusCode = serialized.status || 500;
-        const body = JSON.stringify({
-            success: false,
-            message: serialized.message || 'Internal Server Error',
-            requestId: context.awsRequestId,
+    handleError(error, request) {
+        const config = {
+            includeStack: process.env.NODE_ENV !== 'production',
+            logErrors: true,
+        };
+        let serialized = new _utils_1.ApplicationError(error, {
+            meta: request,
+            config,
         });
+        const eventType = (0, _utils_1.getEventType)(request.getLambdaEvent());
+        const statusCode = serialized.status || 500;
+        const body = JSON.stringify(serialized);
         const headers = {
             'Content-Type': 'application/json',
-            'X-Request-Id': context.awsRequestId,
+            'X-Request-Id': request.requestId,
             'Access-Control-Allow-Origin': '*',
             'Access-Control-Allow-Credentials': 'true',
         };

package/dist/app/aws/lambda.js.map

@@ -1 +1 @@
-{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../src/app/aws/lambda.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE3C,mCAAkE;AAElE,sCAAmC;AACnC,mCAA4D;AAE5D,MAAa,aAAc,SAAQ,eAAM;IACvC,OAAO,CAAU;IACjB,WAAW,GAAsB,EAAE,CAAC;IACpC,OAAO,GAAmB,EAAE,CAAC;IAC7B,YAAY,UAA2B;QACrC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAChD,CAAC;IAEO,aAAa,CAAC,UAA2B;QAC/C,OAAO,KAAK,EAAE,KAAkB,EAAE,OAAgB,EAAE,EAAE;YACpD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAElC,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;YAE3D,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC;YAEtC,MAAM,OAAO,GAAG,IAAI,gBAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC7C,MAAM,QAAQ,GAAG,IAAI,iBAAS,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,cAAc,CAAC;gBACzB,OAAO;gBACP,KAAK;gBACL,SAAS;gBACT,OAAO;gBACP,QAAQ;aACT,CAAC,CAAC;QACL,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,IAM5B;QACC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAC9D,IAAI,SAAS,CAAC;QAEd,KAAK,MAAM,eAAe,IAAI,IAAI,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;YACrD,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;YAEvC,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,0BAAa,EAAE,QAAQ,CAAC,CAAC;gBAE1D,IAAI,WAAW,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gBACtD,IAAI,IAAI,EAAE,CAAC;oBACT,WAAW,GAAG,IAAA,mBAAU,EAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;gBACpD,CAAC;gBAED,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;oBAC3B,OAAO,IAAI,CAAC,gBAAgB,CAC1B,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,0BAA0B,EAAE,EACpD,OAAO,EACP,QAAQ,EACR,SAAS,CACV,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC,WAAW,CAAC,QAAQ,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;oBACnD,OAAO,IAAI,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;gBAC9E,CAAC;gBACD,IAAI,OAAO,QAAQ,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;oBACjD,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBAC/D,CAAC;gBAED,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAE5D,SAAS,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAE5D,IAAI,SAAS,CAAC,UAAU;oBAAE,MAAM;YAClC,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;QAED,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE,CAAC;YAC3B,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC;YAC1B,OAAO,IAAI,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC1F,CAAC;QAED,IAAI,IAAA,qBAAY,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEvB,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC9E,CAAC;IAEO,gBAAgB,CACtB,IAA4B,EAC5B,OAAiB,EACjB,QAAmB,EACnB,SAAiB;QAEjB,MAAM,UAAU,GAAG,IAAI,EAAE,MAAM,IAAI,QAAQ,EAAE,UAAU,IAAI,GAAG,CAAC;QAC/D,MAAM,OAAO,GAA2B;YACtC,cAAc,EAAE,kBAAkB;YAClC,cAAc,EAAE,OAAO,CAAC,SAAS;YACjC,GAAG,QAAQ,CAAC,OAAO;SACpB,CAAC;QAEF,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5E,IAAI,MAA0B,CAAC;QAE/B,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;gBAChC,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,YAAY,CAAC;YACxB,CAAC;QACH,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,6BAA6B,CAAC,GAAG,MAAM,CAAC;YAChD,OAAO,CAAC,kCAAkC,CAAC,GAAG,MAAM,CAAC;YACrD,OAAO,CAAC,8BAA8B,CAAC,GAAG,6BAA6B,CAAC;YACxE,OAAO,CAAC,8BAA8B,CAAC;gBACrC,sEAAsE,CAAC;QAC3E,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC1B,OAAO,EAAE,UAAU,GAAG,GAAG;YACzB,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,KAAK,IAAI,IAAI;YACvC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG;YACrB,UAAU;YACV,OAAO;YACP,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,KAAK,IAAI,IAAI;YACvC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC;QAEF,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QACxD,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,MAAM;gBACT,OAAO,EAAE,GAAG,cAAc,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;YAEvD,KAAK,MAAM;gBACT,OAAO;oBACL,GAAG,cAAc;oBACjB,OAAO,EAAE,OAAO,CAAC,OAAO;wBACtB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC;wBAClF,CAAC,CAAC,SAAS;iBACd,CAAC;YAEJ,KAAK,KAAK;gBACR,OAAO;oBACL,GAAG,cAAc;oBACjB,OAAO,EAAE,OAAO,CAAC,OAAO;wBACtB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC;wBAClF,CAAC,CAAC,SAAS;iBACd,CAAC;YAEJ;gBACE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACzC,CAAC;IACH,CAAC;IAEO,WAAW,CAAC,KAAU,EAAE,KAAkB,EAAE,OAAgB;QAClE,IAAI,UAAU,GAAG,IAAA,uBAAc,EAAC,KAAK,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,IAAI,GAAG,CAAC;QAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC1B,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,uBAAuB;YACtD,SAAS,EAAE,OAAO,CAAC,YAAY;SAChC,CAAC,CAAC;QAEH,MAAM,OAAO,GAA2B;YACtC,cAAc,EAAE,kBAAkB;YAClC,cAAc,EAAE,OAAO,CAAC,YAAY;YACpC,6BAA6B,EAAE,GAAG;YAClC,kCAAkC,EAAE,MAAM;SAC3C,CAAC;QAEF,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,MAAM;gBACT,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;YAC/D;gBACE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACzC,CAAC;IACH,CAAC;CACF;AA1LD,sCA0LC"}
+{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../src/app/aws/lambda.ts"],"names":[],"mappings":"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"}

package/dist/app/aws/utils/request.d.ts

@@ -17,9 +17,11 @@ export declare class LRequest implements LambdaRequest {
     requestId: string;
     stage?: string;
     userAgent: string;
-    sourceIp: string;
     event: LambdaEvent;
     context: Context;
+    id: string;
+    ip: string;
     constructor(lambdaEvent: LambdaEvent, context: Context);
+    sourceIp: string;
     end(): void;
 }

package/dist/app/aws/utils/request.js

@@ -19,9 +19,10 @@ class LRequest {
     requestId;
     stage;
     userAgent;
-    sourceIp;
     event;
     context;
+    id;
+    ip;
     constructor(lambdaEvent, context) {
         const event = (0, helpers_1.normalizeEvent)(lambdaEvent, (0, helpers_1.getEventType)(lambdaEvent));
         const query = {};
@@ -88,12 +89,14 @@ class LRequest {
         this.requestId = context.awsRequestId;
         this.requestUrl = url;
         this.stage = event.requestContext?.stage || '$default';
-        this.sourceIp = (0, helpers_1.getSourceIp)(event);
+        this.ip = (0, helpers_1.getSourceIp)(event);
+        this.id = context.awsRequestId;
         this.userAgent =
             typeof event.headers['user-agent'] === 'string'
                 ? event.headers['user-agent']
                 : event.headers['user-agent']?.[0] || 'unknown';
     }
+    sourceIp;
     end() {
         console.log('NOT implemented for  lambda');
     }

package/dist/app/aws/utils/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../src/app/aws/utils/request.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../src/app/aws/utils/request.ts"],"names":[],"mappings":"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"}

package/dist/app/aws/utils/response.d.ts

@@ -1,5 +1,6 @@
 import { CookieOptions, LambdaResponse } from '../../../types/index.js';
 export declare class LResponse implements LambdaResponse {
+    cookies?: string[] | undefined;
     private _statusCode;
     private _headers;
     body: any;
@@ -15,6 +16,7 @@ export declare class LResponse implements LambdaResponse {
     private _updateCookieHeader;
     setHeader(name: string, value: string): void;
     set statusCode(code: number);
+    set status(code: number);
     get statusCode(): number;
     get headers(): Record<string, string>;
 }

package/dist/app/aws/utils/response.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LResponse = void 0;
 class LResponse {
+    cookies;
     _statusCode = 200;
     _headers = {};
     body = null;
@@ -58,6 +59,9 @@ class LResponse {
     set statusCode(code) {
         this._statusCode = code;
     }
+    set status(code) {
+        this._statusCode = code;
+    }
     get statusCode() {
         return this._statusCode;
     }

package/dist/app/aws/utils/response.js.map

@@ -1 +1 @@
-{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../../src/app/aws/utils/response.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../../src/app/aws/utils/response.ts"],"names":[],"mappings":"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"}

package/dist/app/http/Application.d.ts

@@ -6,13 +6,14 @@ export declare class HttpServer extends Plugin implements IHttpServer {
     private isRunning;
     private sse?;
     private websocket?;
-    private websocketPath;
     controllers: ControllerType[];
     middlewares: MiddlewareCB[];
     app: http.Server;
     plugins: HttpPlugin[];
     allContriollers: ControllerType[];
+    staticMiddlewares: any;
     constructor(configOrClass: new (...args: any[]) => any);
+    setUpWebsocket(): void;
     private collectControllers;
     private logConfig;
     listen(port?: number, host?: string): Promise<http.Server>;
@@ -22,11 +23,9 @@ export declare class HttpServer extends Plugin implements IHttpServer {
         config: ServerConfig;
     };
     private requestHandler;
-    private createRequest;
     private beforeRequest;
     private runController;
     private sendResponse;
-    private handleError;
     private setupGraphQL;
     use(middleware: MiddlewareCB): this;
 }

package/dist/app/http/Application.js

@@ -20,31 +20,29 @@ class HttpServer extends plugin_1.Plugin {
     isRunning = false;
     sse;
     websocket;
-    websocketPath = '/ws';
     controllers = [];
     middlewares = [];
     app;
     plugins = [];
     allContriollers = [];
+    staticMiddlewares = [];
     constructor(configOrClass) {
         super();
         this.config = (0, _utils_1.resolveConfig)(configOrClass);
-        if (this.config.websocketPath) {
-            this.websocketPath = this.config.websocketPath;
-        }
         this.middlewares = this.middlewares.concat(this.config.middlewares ?? []);
         this.controllers = this.collectControllers(this.config.controllers ?? []);
-        const app = http_1.default.createServer(this.requestHandler.bind(this));
+        this.app = http_1.default.createServer(this.requestHandler.bind(this));
         for (const st of this.config.statics ?? []) {
             const staticMw = (0, _utils_1.staticMiddleware)(st.path, st.options);
-            this.middlewares?.unshift(staticMw);
+            this.staticMiddlewares.push(staticMw);
+        }
+        if (this.config.websocket && this.config.graphql) {
+            throw new Error(`You  cant't use custom websocket with graphql`);
         }
-        if (this.config.websocket?.enabled || this.config.graphql?.pubSub) {
-            this.websocket = new server_2.WebSocketServer(app, { path: this.websocketPath });
-            this.websocket.registerControllers(this.controllers);
-            service_2.WebSocketService.getInstance().initialize(this.websocket);
+        if (this.config.websocket) {
+            this.setUpWebsocket();
         }
-        if (this.config.graphql && this.config.graphql?.resolvers?.length) {
+        if (this.config.graphql) {
             this.setupGraphQL();
         }
         if (this.config.sse?.enabled) {
@@ -52,9 +50,13 @@ class HttpServer extends plugin_1.Plugin {
             this.sse.registerControllers(this.controllers);
             service_1.SSEService.getInstance().initialize(this.sse);
         }
-        this.app = app;
         this.logConfig();
     }
+    setUpWebsocket() {
+        this.websocket = new server_2.WebSocketServer(this.app, { path: this.config.websocket?.path ?? '/ws' });
+        this.websocket.registerControllers(this.controllers);
+        service_2.WebSocketService.getInstance().initialize(this.websocket);
+    }
     collectControllers(controllers = []) {
         const result = [];
         for (const ControllerClass of controllers) {
@@ -84,7 +86,7 @@ class HttpServer extends plugin_1.Plugin {
 ║  📍 Host: ${this.config.host}                       
 ║  🔌 Port: ${this.config.port}                         
 ║  🔌 Websocket: ${!!this.config.websocket && this.config.graphql?.pubSub}                         
-║  🔌 Websocket path prefix: ${this.config.websocketPath}                       
+║  🔌 Websocket path prefix: ${this.config.websocket?.path ?? '/ws'}                       
 ║  🔧 Global Middlewares: ${this.middlewares?.length || 0}                   
 ║  🔧 Error handler: ${!this.config.errorHandler}                   
 ║  🎯 Global Interceptors: ${!!this.config.interceptor?.length}                   
@@ -142,135 +144,95 @@ class HttpServer extends plugin_1.Plugin {
         });
     }
     status() {
-        return {
-            running: this.isRunning,
-            config: this.config,
-        };
+        return { running: this.isRunning, config: this.config };
     }
-    async requestHandler(req, response) {
+    async requestHandler(req, res) {
         const startTime = Date.now();
-        let request;
+        const request = await _utils_1.RequestFactory.fromHttp(req);
+        const response = _utils_1.ResponseFactory.forHttp(res, request);
         try {
             await this.callPluginHook('beforeRequest', req);
         }
-        catch (data) {
-            return this.sendResponse(response, { status: 500, data }, startTime);
-        }
-        try {
-            request = await this.createRequest(req);
-        }
-        catch (err) {
-            return this.sendResponse(response, { status: 500, data: err.message }, startTime);
+        catch (error) {
+            response.status = 500;
+            response.data = error;
+            return this.sendResponse(request, response, startTime);
         }
+        if (response.headersSent)
+            return;
         try {
-            let handledCors = { permitted: true, continue: true };
-            if (this.config.cors) {
-                handledCors = (0, _utils_1.handleCORS)(request, response, this.config.cors);
-            }
+            let handledCors = this.config.cors
+                ? (0, _utils_1.handleCORS)(request, response, this.config.cors)
+                : { permitted: true, continue: true };
             if (!handledCors.permitted) {
-                return this.sendResponse(response, { status: 403, message: 'CORS: Origin not allowed' }, startTime, request);
+                response.status = 403;
+                response.data = 'CORS: Origin not allowed';
+                return this.sendResponse(request, response, startTime);
             }
             if (!handledCors.continue && handledCors.permitted) {
-                return this.sendResponse(response, { status: 204 }, startTime, request);
+                response.status = 204;
+                return this.sendResponse(request, response, startTime);
             }
             await this.beforeRequest(request, response);
-            if (response.headersSent) {
+            if (response.headersSent)
                 return;
-            }
             await this.callPluginHook('beforeRoute', request, response);
-            let controllerResponse = await this.runController(request, response);
-            if (!controllerResponse.routeMatch) {
-                return this.sendResponse(response, { status: 404, data: 'Route not found' }, Date.now(), request);
-            }
-            const isError = (0, _utils_1.getErrorType)(controllerResponse.data).isError || !_constants_1.OK_STATUSES.includes(response.statusCode);
-            if (isError) {
-                return this.handleError(controllerResponse.data, request, response, startTime);
-            }
-            if (this.config.interceptor && controllerResponse) {
-                controllerResponse.data = await this.config.interceptor(controllerResponse, request, response);
-            }
-            return this.sendResponse(response, { status: response.statusCode ?? 200, data: controllerResponse.data }, startTime, request);
+            if (response.headersSent)
+                return;
+            await this.runController(request, response);
+            return this.sendResponse(request, response, startTime);
         }
         catch (error) {
-            return this.handleError(error, request, response, startTime);
+            response.error(error);
+            return this.sendResponse(request, response, startTime);
         }
     }
-    async createRequest(req) {
-        const rawBody = await (0, _utils_1.collectRawBody)(req);
-        const parseRequest = {
-            body: rawBody,
-            headers: req.headers,
-            isBase64Encoded: false,
-        };
-        const parsedBody = (0, _utils_1.ParseBody)(parseRequest);
-        const protocol = req.headers['x-forwarded-proto'] || 'http';
-        const host = req.headers.host || 'localhost';
-        const fullUrl = `${protocol}://${host}${req.url}`;
-        const requestUrl = new URL(fullUrl);
-        const parsedRequest = {
-            method: req.method?.toUpperCase(),
-            requestUrl,
-            headers: req.headers,
-            body: parsedBody,
-            rawBody: rawBody,
-            query: (0, _utils_1.ParseQuery)(requestUrl),
-            params: {},
-            cookies: (0, _utils_1.ParseCookies)(req),
-            isBase64Encoded: false,
-            _startTime: Date.now(),
-        };
-        Object.assign(req, parsedRequest);
-        return req;
-    }
     async beforeRequest(request, response) {
         (0, _utils_1.sanitizeRequest)(request, this.config.sanitizers ?? []);
+        for (const middleware of this.staticMiddlewares) {
+            await middleware(request.raw, response.raw, _utils_1.NextFunction);
+        }
+        if (response.raw.headersSent) {
+            return;
+        }
         for (const middleware of this.middlewares?.reverse() || []) {
-            await middleware(request, response, _utils_1.NextFN);
+            await middleware(request, response, _utils_1.NextFunction);
         }
     }
     async runController(request, response) {
         for (const ControllerClass of this.controllers ?? []) {
             const instance = new ControllerClass();
             if (typeof instance.handleRequest === 'function') {
-                const handlerResponse = await instance.handleRequest(request, response);
-                if (handlerResponse.routeMatch) {
-                    return handlerResponse;
+                const done = await instance.handleRequest(request, response);
+                if (done) {
+                    break;
                 }
             }
         }
-        return {};
     }
-    async sendResponse(res, responseData, startTime, appRequest) {
-        if (res.headersSent)
+    async sendResponse(request, response, startTime) {
+        if (response.headersSent)
             return;
-        const { status, data } = responseData;
-        if (!res.getHeader('Content-Type')) {
-            res.setHeader('Content-Type', 'application/json');
-        }
-        res.setHeader('X-Response-Time', `${Date.now() - startTime}ms`);
-        res.statusCode = status ?? data.status ?? 200;
-        res.end(JSON.stringify(data));
-        await this.callPluginHook('afterResponse', appRequest, res);
-    }
-    async handleError(error, request, response, startTime) {
-        let serialized = (0, _utils_1.serializeError)(error);
-        if (!this.config.errorHandler) {
-            return this.sendResponse(response, { data: serialized }, startTime);
+        if (!response.getHeader('Content-Type')) {
+            response.setHeader('Content-Type', 'application/json');
         }
+        response.setHeader('X-Response-Time', `${Date.now() - startTime}ms`);
         try {
-            const intercepted = await this.config.errorHandler(error, request, response);
-            let data = intercepted.data ?? intercepted;
-            if (data instanceof Error) {
-                data = (0, _utils_1.serializeError)(data);
-            }
-            serialized = data ?? serialized;
+            response.end(response.data);
+            await this.callPluginHook('afterResponse', request, response);
+        }
+        catch (err) {
+            response.status = 500;
+            response.error(err);
+            response.end(err);
         }
-        catch (cathed) { }
-        return this.sendResponse(response, { data: serialized }, startTime, request);
     }
     async setupGraphQL() {
         if (!this.config.graphql || !this.config.graphql?.resolvers?.length)
             return;
+        const graphqlWsServer = new server_2.WebSocketServer(this.app, {
+            path: this.config.graphql.path ?? '/graphql',
+        });
         const schemaConfig = {
             resolvers: this.config.graphql?.resolvers,
             validate: true,
@@ -283,15 +245,19 @@ class HttpServer extends plugin_1.Plugin {
             schema,
             context: (ctx) => {
                 const req = ctx.request ?? ctx.req;
-                return { req, headers: req?.headers, pubSub: this.config.graphql?.pubSub };
+                return {
+                    request: req.raw,
+                    headers: req?.headers,
+                    pubSub: this.config.graphql?.pubSub ?? (0, graphql_yoga_1.createPubSub)(),
+                };
             },
             graphiql: !!this.config.graphql?.playground,
         });
         if (this.config.graphql.pubSub) {
-            (0, ws_1.useServer)({ schema, context: () => ({ pubSub: this.config.graphql?.pubSub }) }, this.websocket.wss);
+            (0, ws_1.useServer)({ schema, context: () => ({ pubSub: this.config.graphql?.pubSub }) }, graphqlWsServer.wss);
             this.use(async (req, res) => {
-                if (req.requestUrl.pathname?.startsWith(this.websocketPath)) {
-                    return yoga(req, res);
+                if (req.requestUrl.pathname?.startsWith('/graphql')) {
+                    await yoga(req.raw, res.raw);
                 }
             });
         }