framework-do-dede 0.0.38 → 0.0.40

package/dist/handlers/controller.handler.js

@@ -1,5 +1,5 @@
 import { Registry } from "../di/registry";
-import { ServerError } from "../http";
+import { InternalServerError } from "../http";
 export default class ControllerHandler {
     constructor(httpServer, port) {
         for (const { instance, instanceMethod, middlewares, method, route, statusCode, params, query, validation, offLogs, metricsHandlers } of this.registryControllers()) {
@@ -42,8 +42,12 @@ export default class ControllerHandler {
                 let middlewareData = {};
                 if (middlewares) {
                     for (const middleware of middlewares) {
-                        const middlewareResult = await middleware.execute({ headers: input.headers, ...mergedParams });
-                        middlewareData = { ...middlewareResult, ...middlewareData };
+                        try {
+                            const middlewareResult = await middleware.execute({ headers: input.headers, ...mergedParams });
+                            middlewareData = { ...middlewareResult, ...middlewareData };
+                        }
+                        catch (error) {
+                        }
                     }
                 }
                 const request = { headers: input.headers, data: mergedParams, middlewareData };
@@ -51,13 +55,15 @@ export default class ControllerHandler {
                     const response = await instance[instanceMethod](mergedParams, request);
                     if (!offLogs)
                         console.log('\x1b[32m%s\x1b[0m', `✅ [LOG] Finish: "${logger.handler.instance}.${logger.handler.method}:" - ${requestMetrics.elapsedTime}ms`);
+                    console.log('response = ', response);
                     return response;
                 }
                 catch (error) {
                     if (!offLogs)
                         console.log('\x1b[31m%s\x1b[0m', `❌ [LOG] Erro: "${logger.handler.instance}.${logger.handler.method}:" - error: ${error.message}`);
-                    requestMetrics.error = this.extractError(error);
-                    throw error;
+                    const capturedError = this.extractError(error);
+                    requestMetrics.error = capturedError;
+                    return capturedError;
                 }
                 finally {
                     requestMetrics.endTime = performance.now();
@@ -70,6 +76,12 @@ export default class ControllerHandler {
         }
         httpServer.listen(port);
     }
+    // if (error instanceof ServerError) {
+    //     res.status(error.getStatusCode())
+    //     throw error;
+    // } 
+    // res.status(500)
+    // throw new InternalServerError(error.message, this.defaultMessageError)
     registryControllers() {
         const registryControllers = Registry.resolve('controllers');
         const controllers = [];
@@ -122,16 +134,10 @@ export default class ControllerHandler {
         return filter;
     }
     extractError(error) {
-        let statusCode;
-        if (error instanceof ServerError)
-            statusCode = error.getStatusCode();
-        else
-            statusCode = 500;
         return {
-            stack: error.stack?.toString(),
-            originalMessage: error.message,
             message: error.message,
-            statusCode
+            statusCode: error.getStatusCode(),
+            unexpectedError: error instanceof InternalServerError ? error.getUnexpectedError() : undefined,
         };
     }
 }

package/dist/http/HttpServer.d.ts

@@ -19,10 +19,11 @@ type FrameworkWeb = {
 export default abstract class HttpServer {
     protected framework: FrameworkWeb;
     protected frameworkName: string;
-    protected defaultMessageError: string;
+    private defaultMessageError;
     constructor(framework: FrameworkWeb, frameworkName: 'elysia' | 'express');
     use(middleware: CallableFunction): HttpServer;
     register(httpServerParams: HttpServerParams, handler: CallableFunction): void;
+    setDefaultMessageError(message: string): void;
     listen(port: number): void;
     private mountRoute;
     private elysia;

package/dist/http/HttpServer.js

@@ -1,9 +1,9 @@
 import { FrameworkError } from "./FrameworkError";
-import { ServerError } from "./ServerError";
+import { InternalServerError, ServerError } from "./ServerError";
 export default class HttpServer {
     framework;
     frameworkName;
-    defaultMessageError = 'Ops, An unexpected error occurred';
+    defaultMessageError = '';
     constructor(framework, frameworkName) {
         if (frameworkName !== 'elysia' && frameworkName !== 'express')
             throw new FrameworkError('Framework not supported');
@@ -20,6 +20,9 @@ export default class HttpServer {
             return this.elysia(httpServerParams, route, handler);
         return this.express(httpServerParams, route, handler);
     }
+    setDefaultMessageError(message) {
+        this.defaultMessageError = message;
+    }
     listen(port) {
         this.framework.listen(port);
     }
@@ -50,16 +53,10 @@ export default class HttpServer {
             catch (error) {
                 if (error instanceof ServerError) {
                     set.status = error.getStatusCode();
-                    return {
-                        error: error.message,
-                        statusCode: error.getStatusCode()
-                    };
+                    throw error;
                 }
                 set.status = 500;
-                return {
-                    error: this.defaultMessageError,
-                    statusCode: 500
-                };
+                throw new InternalServerError(error.message, this.defaultMessageError);
             }
         });
     }
@@ -78,15 +75,21 @@ export default class HttpServer {
             }
             catch (error) {
                 if (error instanceof ServerError) {
-                    return res.status(error.getStatusCode()).json({
-                        error: error.message,
-                        statusCode: error.getStatusCode()
-                    });
+                    res.status(error.getStatusCode());
+                    throw error;
                 }
-                return res.status(500).json({
-                    error: this.defaultMessageError,
-                    statusCode: 500
-                });
+                res.status(500);
+                throw new InternalServerError(error.message, this.defaultMessageError);
+                // if (error instanceof ServerError) {
+                //     return res.status(error.getStatusCode()).json({
+                //         error: error.message,
+                //         statusCode: error.getStatusCode()
+                //     })
+                // }
+                // return res.status(500).json({
+                //     error: this.defaultMessageError,
+                //     statusCode: 500
+                // })
             }
         });
     }

package/dist/http/ServerError.d.ts

@@ -21,3 +21,8 @@ export declare class Unauthorized extends ServerError {
 export declare class BadRequest extends ServerError {
     constructor(message: string);
 }
+export declare class InternalServerError extends ServerError {
+    private unexpectedError;
+    constructor(unexpectedError: string, defaultMessage?: string);
+    getUnexpectedError(): string;
+}

package/dist/http/ServerError.js

@@ -39,3 +39,13 @@ export class BadRequest extends ServerError {
         super(message, 400);
     }
 }
+export class InternalServerError extends ServerError {
+    unexpectedError;
+    constructor(unexpectedError, defaultMessage = 'Ops, An unexpected error occurred') {
+        super(defaultMessage, 500);
+        this.unexpectedError = unexpectedError;
+    }
+    getUnexpectedError() {
+        return this.unexpectedError;
+    }
+}

package/dist/http/index.d.ts

@@ -1,3 +1,3 @@
 import HttpServer from "./HttpServer";
-import { ServerError, NotFound, Forbidden, Conflict, Unauthorized, UnprocessableEntity, BadRequest } from "./ServerError";
-export { ServerError, BadRequest, NotFound, Forbidden, Conflict, Unauthorized, UnprocessableEntity, HttpServer };
+import { ServerError, NotFound, Forbidden, Conflict, Unauthorized, UnprocessableEntity, BadRequest, InternalServerError } from "./ServerError";
+export { ServerError, BadRequest, NotFound, Forbidden, Conflict, Unauthorized, UnprocessableEntity, HttpServer, InternalServerError };

package/dist/http/index.js

@@ -1,3 +1,3 @@
 import HttpServer from "./HttpServer";
-import { ServerError, NotFound, Forbidden, Conflict, Unauthorized, UnprocessableEntity, BadRequest } from "./ServerError";
-export { ServerError, BadRequest, NotFound, Forbidden, Conflict, Unauthorized, UnprocessableEntity, HttpServer };
+import { ServerError, NotFound, Forbidden, Conflict, Unauthorized, UnprocessableEntity, BadRequest, InternalServerError } from "./ServerError";
+export { ServerError, BadRequest, NotFound, Forbidden, Conflict, Unauthorized, UnprocessableEntity, HttpServer, InternalServerError };

package/dist/protocols/RequestMetrics.d.ts

@@ -9,10 +9,9 @@ export type RequestMetrics = {
     ip: string;
     contentLength: string;
     error?: {
-        stack: string;
-        originalMessage: string;
         message: string;
         statusCode: number;
+        unexpectedError?: string;
     };
     handler: {
         instance: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framework-do-dede",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",