quantum-flow 1.3.2 → 1.3.6

package/README.md

@@ -66,7 +66,7 @@ export class User {
     @Body(UserDto) body: UserDto,
     @Query() query: any,
     @Headers() headers: any,
-    @Params() params: any,
+    @Params(ParamDTO, 'param') params: any,
     @Request() req: any,
     @Response() resp: any,
     @InjectWS() ws: IWebSocketService,

package/dist/app/http/Application.js

@@ -36,7 +36,7 @@ class HttpServer extends Socket_1.Socket {
 ║  🔌 Port: ${this.config.port}                         
 ║  🔌 Websocket: ${!!this.config.websocket}                         
 ║  🔧 Global Middlewares: ${this.config.middlewares?.length || 0}                   
-║  🔧 Error middlewares: ${this.config.errorHandler?.length || 0}                   
+║  🔧 Error handler: ${!this.config.errorHandler}                   
 ║  🎯 Global Interceptors: ${!!this.config.interceptor?.length}                   
 ║  📦 Controllers: ${_constants_1.STATISTIC.controllers}                   
 ║  📦 Routes: ${_constants_1.STATISTIC.routes}                   
@@ -103,13 +103,17 @@ class HttpServer extends Socket_1.Socket {
             const request = await this.createRequest(req);
             let appRequest = await this.applyMiddlewares(request, req, res);
             let data = await this.findController(appRequest, req, res);
+            const isError = !_constants_1.OK_STATUSES.includes(data.status);
+            if (isError) {
+                return this.handleError(data, req, res, startTime);
+            }
             if (this.config.interceptor) {
                 data = await this.config.interceptor(data, req, res);
             }
-            await this.sendResponse(res, data, startTime);
+            return this.sendResponse(res, data, startTime);
         }
         catch (error) {
-            await this.handleError(error, req, res, startTime);
+            return this.handleError(error, req, res, startTime);
         }
     }
     async createRequest(req) {
@@ -141,9 +145,7 @@ class HttpServer extends Socket_1.Socket {
         let processed = appRequest;
         for (const middleware of this.config.middlewares?.reverse() || []) {
             const result = await middleware(processed, request, response);
-            if (result) {
-                processed = result;
-            }
+            processed = result ?? processed;
         }
         return processed;
     }

package/dist/core/Controller.d.ts

@@ -1,4 +1,4 @@
-import { AppRequest, ControllerClass, ControllerConfig, ControllerInstance, InterceptorCB, RouteContext } from '../types/index.js';
+import { AppRequest, ControllerClass, ControllerConfig, ControllerInstance, InterceptorCB, MiddlewareCB, RouteContext } from '../types/index.js';
 import { IncomingMessage, ServerResponse } from 'http';
 import 'reflect-metadata';
 /**
@@ -45,8 +45,8 @@ export declare function Controller(config: string | ControllerConfig, middleware
             name: string;
             pathParams: Record<string, string>;
             priority: number;
-            methodMiddlewares: any[];
-            methodInterceptors: any[];
+            methodMiddlewares: MiddlewareCB[];
+            methodInterceptors: InterceptorCB[];
         };
     };
 } & T;

package/dist/core/Controller.js

@@ -92,7 +92,6 @@ function Controller(config, middlewares = []) {
                     return { status, data: appResponse };
                 }
                 catch (err) {
-                    console.error(err);
                     throw err;
                 }
             }
@@ -113,6 +112,7 @@ function Controller(config, middlewares = []) {
                     response,
                     middlewareChain: [],
                     interceptorChain: [],
+                    errorHandlerChain: [Reflect.getMetadata(_constants_1.CATCH, proto)],
                     subPath: Reflect.getMetadata(_constants_1.ROUTE_PREFIX, proto) || '',
                 };
                 const result = await this.routeWalker(context);
@@ -126,7 +126,7 @@ function Controller(config, middlewares = []) {
                         routePrefix: Reflect.getMetadata(_constants_1.ROUTE_PREFIX, SubController.prototype) || '',
                         middlewares: Reflect.getMetadata(_constants_1.MIDDLEWARES, SubController.prototype) || [],
                         interceptor: Reflect.getMetadata(_constants_1.INTERCEPTOR, SubController.prototype),
-                        errorHandler: Reflect.getMetadata(_constants_1.CATCH, SubController.prototype),
+                        errorHandler: Reflect.getMetadata(_constants_1.CATCH, SubController),
                         subControllers: Reflect.getMetadata(_constants_1.CONTROLLERS, SubController.prototype) || [],
                     };
                     const fullSubPath = [subPath, subMeta.routePrefix]
@@ -141,6 +141,7 @@ function Controller(config, middlewares = []) {
                             controllerMeta: subMeta,
                             path,
                             middlewareChain: [...context.middlewareChain, ...controllerMeta.middlewares],
+                            errorHandlerChain: [...context.errorHandlerChain, subMeta.errorHandler].filter((el) => !!el),
                             interceptorChain: [...context.interceptorChain, controllerMeta.interceptor].filter((el) => !!el),
                         });
                         if (subResult && subResult.status !== 404) {
@@ -159,21 +160,23 @@ function Controller(config, middlewares = []) {
                     let payload = { ...context.appRequest, params: pathParams };
                     for (const mw of allMiddlewares) {
                         const mwResult = await mw(payload, context.request, context.response);
-                        payload = { ...payload, ...mwResult };
+                        payload = mwResult ?? payload;
                     }
-                    return this.getResponse({
+                    let apiResponse = await this.getResponse({
                         interceptors: [...context.interceptorChain, controllerMeta.interceptor].filter((el) => !!el),
                         controllerInstance,
                         name,
                         payload,
                         response: context.response,
                         request: context.request,
-                    }).catch((error) => {
-                        if (controllerMeta.errorHandler) {
-                            return controllerMeta.errorHandler(error, context.request, context.response);
+                    }).catch((err) => err);
+                    const isError = !_constants_1.OK_STATUSES.includes(apiResponse.status);
+                    if (isError) {
+                        for (const handler of context.errorHandlerChain?.reverse() || []) {
+                            apiResponse = handler(apiResponse);
                         }
-                        return error;
-                    });
+                    }
+                    return apiResponse;
                 }
                 return null;
             }

package/dist/core/utils/extractors.d.ts

@@ -7,12 +7,12 @@ export declare const Body: (dto?: any) => (target: any, propertyKey: string | sy
  * Parameter decorator to extract route parameters.
  * @param name Optional name of the parameter to extract.
  */
-export declare const Params: (name?: string) => (target: any, propertyKey: string | symbol, parameterIndex: number) => void;
+export declare const Params: (dto?: any, name?: string) => (target: any, propertyKey: string | symbol, parameterIndex: number) => void;
 /**
  * Parameter decorator to extract query parameters.
  * @param name Optional name of the query parameter to extract.
  */
-export declare const Query: (name?: string) => (target: any, propertyKey: string | symbol, parameterIndex: number) => void;
+export declare const Query: (dto?: any, name?: string) => (target: any, propertyKey: string | symbol, parameterIndex: number) => void;
 /**
  * Parameter decorator to inject the entire request object.
  */

package/dist/core/utils/extractors.js

@@ -12,13 +12,13 @@ exports.Body = Body;
  * Parameter decorator to extract route parameters.
  * @param name Optional name of the parameter to extract.
  */
-const Params = (name) => (0, _utils_1.createParamDecorator)('params', undefined, name);
+const Params = (dto, name) => (0, _utils_1.createParamDecorator)('params', typeof dto == 'string' ? undefined : dto, typeof dto == 'string' ? dto : name);
 exports.Params = Params;
 /**
  * Parameter decorator to extract query parameters.
  * @param name Optional name of the query parameter to extract.
  */
-const Query = (name) => (0, _utils_1.createParamDecorator)('query', undefined, name);
+const Query = (dto, name) => (0, _utils_1.createParamDecorator)('query', typeof dto == 'string' ? undefined : dto, typeof dto == 'string' ? dto : name);
 exports.Query = Query;
 /**
  * Parameter decorator to inject the entire request object.

package/dist/examples/controllers/user.js

@@ -59,11 +59,13 @@ exports.User = User = __decorate([
     (0, core_1.Controller)({
         prefix: 'user',
         controllers: [userMetadata_1.UserMetadata],
+        middlewares: [
+            (req) => {
+                return req;
+            },
+        ],
         interceptor: (data, req, res) => {
             return { data, intercepted: true };
         },
-    }),
-    (0, core_1.Catch)((err) => {
-        return { status: 401, err };
     })
 ], User);

package/dist/examples/controllers/userMetadata.js

@@ -13,7 +13,16 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserMetadata = void 0;
+const class_validator_1 = require("class-validator");
 const core_1 = require("quantum-flow/core");
+class DTO {
+    constructor() { }
+    meta;
+}
+__decorate([
+    (0, class_validator_1.IsString)(),
+    __metadata("design:type", String)
+], DTO.prototype, "meta", void 0);
 let UserMetadata = class UserMetadata {
     async getUserMetadata(params) {
         return params;
@@ -21,8 +30,8 @@ let UserMetadata = class UserMetadata {
 };
 exports.UserMetadata = UserMetadata;
 __decorate([
-    (0, core_1.GET)('/:name'),
-    __param(0, (0, core_1.Params)()),
+    (0, core_1.GET)('/:meta'),
+    __param(0, (0, core_1.Params)(DTO, 'meta')),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)

package/dist/examples/server.js

@@ -15,18 +15,23 @@ let Root = class Root {
 Root = __decorate([
     (0, core_1.Controller)({ prefix: 'api', controllers: [user_1.User] })
 ], Root);
-let App = class App {
+let App = 
+// @Catch((error) => ({ status: 400, error }))
+class App {
 };
 App = __decorate([
     (0, http_1.Server)({
         controllers: [Root],
         websocket: { enabled: true },
         interceptor: (data) => data,
+        errorHandler: (err) => {
+            return err;
+        },
     }),
     (0, http_1.Port)(3000),
     (0, core_1.Use)((data) => data),
-    (0, core_1.Use)((data) => data),
-    (0, core_1.Catch)((error) => ({ status: 400, error }))
+    (0, core_1.Use)((data) => data)
+    // @Catch((error) => ({ status: 400, error }))
 ], App);
 const server = new http_1.HttpServer(App);
 server.listen().catch(console.error);

package/dist/types/common.d.ts

@@ -1,5 +1,14 @@
 import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'http';
 type P_Q = Record<string, string | undefined> | null | unknown;
+export interface HttpError extends Error {
+    statusCode?: number;
+    status: number;
+    data?: any;
+    messages?: string[];
+    errors?: Array<{
+        message: string;
+    }>;
+}
 export type AppRequest<B = unknown, Q extends P_Q = unknown, P extends P_Q = unknown> = {
     method: HTTP_METHODS;
     url: URL;
@@ -38,9 +47,9 @@ export type AxiosQuery = {
 export interface IController {
     handleRequest: Router;
 }
-export type MiddlewareCB = (appRequest: AppRequest, request?: IncomingMessage, respinse?: ServerResponse) => Promise<AppRequest> | AppRequest;
+export type MiddlewareCB = (appRequest: AppRequest, request?: IncomingMessage, response?: ServerResponse) => void | Promise<AppRequest> | AppRequest;
 export type InterceptorCB = (data: any, req?: IncomingMessage, res?: ServerResponse) => Promise<unknown> | unknown;
-export type ErrorCB = (error: Error, req?: IncomingMessage, res?: ServerResponse) => Promise<ResponseWithStatus> | ResponseWithStatus;
+export type ErrorCB = (error: HttpError, req?: IncomingMessage, res?: ServerResponse) => Promise<ResponseWithStatus> | ResponseWithStatus;
 export type ParamDecoratorType = 'body' | 'params' | 'query' | 'request' | 'headers' | 'cookies' | 'response' | 'multipart' | 'event' | 'context';
 export interface ParamMetadata {
     index: number;

package/dist/types/controller.d.ts

@@ -33,5 +33,6 @@ export type RouteContext = {
     response?: ServerResponse;
     middlewareChain: MiddlewareCB[];
     interceptorChain: InterceptorCB[];
+    errorHandlerChain: ErrorCB[];
     subPath: string;
 };

package/dist/utils/controller.js

@@ -43,10 +43,10 @@ const executeControllerMethod = async (controller, propertyName, payload, reques
     }
     const prototype = Object.getPrototypeOf(controller);
     const paramMetadata = Reflect.getMetadata(_constants_1.PARAM_METADATA_KEY, prototype, propertyName) || [];
-    const { body, multipart } = getBodyAndMultipart(payload);
     if (paramMetadata.length === 0) {
         return fn.call(controller, payload);
     }
+    const { body, multipart } = getBodyAndMultipart(payload);
     const args = [];
     const wsParams = Reflect.getMetadata(_constants_1.WS_SERVICE_KEY, controller, propertyName) || [];
     const totalParams = Math.max(paramMetadata.length ? Math.max(...paramMetadata.map((p) => p.index)) + 1 : 0, wsParams.length ? Math.max(...wsParams.map((p) => p.index)) + 1 : 0);
@@ -78,7 +78,7 @@ const executeControllerMethod = async (controller, propertyName, payload, reques
             value = response;
         }
         if (_constants_1.TO_VALIDATE.includes(param.type)) {
-            value = await (0, validate_1.validate)(param.dto, value);
+            value = await (0, validate_1.validate)(param.dto, typeof value === 'string' ? { [param.name ?? '']: value } : value);
         }
         args[i] = value;
     }

package/dist/utils/endpoint.js

@@ -8,6 +8,5 @@ function createParamDecorator(type, dto, name) {
         existingParams.push({ index: parameterIndex, type, dto, name });
         existingParams.sort((a, b) => a.index - b.index);
         Reflect.defineMetadata(_constants_1.PARAM_METADATA_KEY, existingParams, target, propertyKey);
-        const saved = Reflect.getMetadata(_constants_1.PARAM_METADATA_KEY, target, propertyKey);
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quantum-flow",
-  "version": "1.3.2",
+  "version": "1.3.6",
   "description": "Decorator-based API framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/validators/Validate.d.ts

@@ -1,3 +0,0 @@
-type ToValidate = 'query' | 'body' | 'params' | 'headers';
-export declare function Validate(param: ToValidate, dtoClass: any): (target: any, propertyKey?: string, descriptor?: PropertyDescriptor) => void;
-export {};

package/dist/validators/Validate.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Validate = Validate;
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const class_validator_1 = require("class-validator");
-function Validate(param, dtoClass) {
-    return function (target, propertyKey, descriptor) {
-        // METHOD DECORATOR
-        if (descriptor) {
-            wrapMethod(descriptor, param, dtoClass);
-            return;
-        }
-        // CLASS DECORATOR
-        const prototype = target.prototype;
-        Object.getOwnPropertyNames(prototype).forEach((method) => {
-            if (method === 'constructor')
-                return;
-            const desc = Object.getOwnPropertyDescriptor(prototype, method);
-            if (!desc || typeof desc.value !== 'function')
-                return;
-            wrapMethod(desc, param, dtoClass);
-            Object.defineProperty(prototype, method, desc);
-        });
-    };
-}
-function wrapMethod(descriptor, param, dtoClass) {
-    const originalMethod = descriptor.value;
-    descriptor.value = async function (...args) {
-        const value = args[0][param];
-        const instance = new dtoClass();
-        Object.entries(value || {}).forEach(([key, val]) => {
-            instance[key] = val;
-        });
-        const errors = await (0, class_validator_1.validate)(instance, { whitelist: true });
-        if (errors.length) {
-            throw { status: 422, message: 'Validation failed', data: errors };
-        }
-        return originalMethod.apply(this, args);
-    };
-}

package/dist/validators/index.d.ts

@@ -1 +0,0 @@
-export * from './Validate';

package/dist/validators/index.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./Validate"), exports);