quantum-flow 1.10.2 → 1.10.4

package/dist/app/http/Application.js

@@ -139,7 +139,7 @@ class HttpServer {
             if (isError) {
                 return this.handleError(data, request, response, startTime);
             }
-            if (this.config.interceptor) {
+            if (this.config.interceptor && data) {
                 data = await this.config.interceptor(data, request, response);
             }
             return this.sendResponse(response, data, startTime);
@@ -186,7 +186,10 @@ class HttpServer {
             const instance = new ControllerClass();
             if (typeof instance.handleRequest === 'function') {
                 const data = await instance.handleRequest(request, response);
-                if (data && data.status !== 404) {
+                if (!data) {
+                    return undefined;
+                }
+                if (data?.status !== 404) {
                     return data;
                 }
             }
@@ -197,7 +200,7 @@ class HttpServer {
         };
     }
     async sendResponse(res, data, startTime) {
-        const response = data?.data !== undefined ? data.data : data;
+        console.log(data);
         if (res.headersSent)
             return;
         if (!res.getHeader('Content-Type')) {
@@ -212,7 +215,7 @@ class HttpServer {
         }
         res.setHeader('X-Response-Time', `${Date.now() - startTime}ms`);
         res.statusCode = data.status ?? 200;
-        res.end(JSON.stringify(response));
+        res.end(JSON.stringify(data.data));
     }
     async handleError(error, request, response, startTime) {
         let errorResponse = {
@@ -223,22 +226,20 @@ class HttpServer {
                 stack: error.stack,
             },
         };
-        console.log(errorResponse);
         if (!this.config.errorHandler) {
-            return this.sendResponse(response, errorResponse, startTime);
+            return this.sendResponse(response, (0, _utils_1.stringifyError)(errorResponse), startTime);
         }
         try {
             const intercepted = await this.config.errorHandler(error, request, response);
-            const { status = 500, ...rest } = intercepted;
-            if (_constants_1.OK_STATUSES.includes(status)) {
-                errorResponse.status = intercepted.status ?? errorResponse.status;
-                errorResponse.data = rest;
+            let data = intercepted.data ?? intercepted;
+            if (data instanceof Error) {
+                data = (0, _utils_1.stringifyError)(data);
             }
             errorResponse.status = intercepted.status ?? errorResponse.status;
-            errorResponse.data = !intercepted.message ? intercepted : (0, _utils_1.stringifyError)(intercepted);
+            errorResponse.data = data;
         }
         catch (cathed) {
-            Object.assign(errorResponse, cathed);
+            Object.assign(errorResponse, (0, _utils_1.stringifyError)(cathed));
         }
         return this.sendResponse(response, errorResponse, startTime);
     }

package/dist/core/Controller.js

@@ -99,7 +99,7 @@ function Controller(config, middlewares = []) {
                     subPath: Reflect.getMetadata(_constants_1.ROUTE_PREFIX, proto) || '',
                 };
                 const result = await this.routeWalker(context, request, response);
-                return result || { status: 404, message: 'Method Not Found' };
+                return result === null ? { status: 404, message: 'Method Not Found' } : result;
             };
             async routeWalker(context, request, response) {
                 const { controllerInstance, controllerMeta, path, method, subPath } = context;
@@ -185,6 +185,9 @@ function Controller(config, middlewares = []) {
                             response: response,
                             request: request,
                         }).catch((err) => err);
+                        if (!apiResponse) {
+                            return { status: 200 };
+                        }
                         const isError = !_constants_1.OK_STATUSES.includes(apiResponse.status);
                         if (isError) {
                             for (const handler of context.errorHandlerChain?.reverse() || []) {

package/dist/sse/server.js

@@ -75,7 +75,6 @@ class SSEServer {
         for (const controller of this.controllers) {
             if (controller.sse.handlers && controller.sse.handlers[eventType]) {
                 for (const handler of controller.sse.handlers[eventType]) {
-                    console.log(handler);
                     await handler.fn(event).catch(console.log);
                 }
             }

package/dist/utils/controller.js

@@ -195,7 +195,7 @@ const getResponse = async (data) => {
             const classOkStatus = Reflect.getMetadata(_constants_1.OK_METADATA_KEY, prototype);
             !isError && classOkStatus && (data.response.statusCode = classOkStatus);
         }
-        return { status: data.response.statusCode, data: appResponse };
+        return { status: data.response.statusCode, data: appResponse?.data ?? appResponse };
     }
     catch (err) {
         throw err;

package/dist/utils/helper.d.ts

@@ -3,4 +3,4 @@ export declare function matchRoute(pattern: string, path: string): Record<string
 export declare function buildRoutePattern(parts: string[]): string;
 export declare function mergeMiddlewares(...middlewareLists: MiddlewareCB[][]): MiddlewareCB[];
 export declare function mergeInterceptors(...interceptorLists: InterceptorCB[][]): InterceptorCB[];
-export declare const stringifyError: (error: any) => string;
+export declare const stringifyError: (error: any) => any;

package/dist/utils/helper.js

@@ -62,10 +62,10 @@ function mergeInterceptors(...interceptorLists) {
 }
 const stringifyError = (error) => {
     return JSON.stringify({
-        message: error.message,
-        stack: error.stack,
-        status: error.status,
-        code: error.code,
+        message: error?.data?.message ?? error.message,
+        stack: error?.data?.stack ?? error.stack,
+        status: error?.data?.status ?? error.status,
+        code: error?.data?.code ?? error.code,
     }, null, 2);
 };
 exports.stringifyError = stringifyError;

package/package.json

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