framework-do-dede 0.0.52 → 0.0.54

package/dist/handlers/controller.handler.js

@@ -1,5 +1,5 @@
 import { Registry } from "../di/registry";
-import { InternalServerError } from "../http";
+import { InternalServerError, ServerError } 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()) {
@@ -8,7 +8,7 @@ export default class ControllerHandler {
                 route,
                 statusCode,
                 params,
-                query
+                query,
             }, async (input) => {
                 const requestMetrics = {
                     date: new Date(),
@@ -57,10 +57,13 @@ export default class ControllerHandler {
                 catch (error) {
                     if (!offLogs)
                         console.log('\x1b[31m%s\x1b[0m', `❌ [LOG] Erro: "${logger.handler.instance}.${logger.handler.method}:" - error: ${error.message}`);
-                    const capturedError = this.extractError(error);
+                    const capturedError = this.extractError(error, httpServer);
                     requestMetrics.error = capturedError;
-                    console.log('capturedError = ', capturedError);
-                    return capturedError;
+                    input.setStatus(capturedError.statusCode);
+                    return {
+                        message: capturedError.message,
+                        statusCode: capturedError.statusCode
+                    };
                 }
                 finally {
                     requestMetrics.endTime = performance.now();
@@ -73,12 +76,6 @@ 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 = [];
@@ -130,7 +127,10 @@ export default class ControllerHandler {
         }
         return filter;
     }
-    extractError(error) {
+    extractError(error, httpServer) {
+        if (error instanceof ServerError) {
+            error = new InternalServerError(error.message, httpServer.getDefaultMessageError());
+        }
         return {
             message: error.message,
             statusCode: error.getStatusCode(),

package/dist/http/HttpServer.d.ts

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

package/dist/http/HttpServer.js

@@ -1,10 +1,8 @@
 import { FrameworkError } from "./FrameworkError";
-import { InternalServerError, ServerError } from "./ServerError";
 export default class HttpServer {
     framework;
     frameworkName;
     defaultMessageError = '';
-    set = null;
     constructor(framework, frameworkName) {
         if (frameworkName !== 'elysia' && frameworkName !== 'express')
             throw new FrameworkError('Framework not supported');
@@ -17,49 +15,16 @@ export default class HttpServer {
     }
     register(httpServerParams, handler) {
         const route = this.mountRoute(httpServerParams);
-        if (this.frameworkName === 'elysia') {
-            this.test(httpServerParams, route, handler);
-            try {
-                return this.elysia(httpServerParams, route, handler);
-            }
-            catch (error) {
-                if (error instanceof ServerError) {
-                    this.set.status = error.getStatusCode();
-                    throw error;
-                }
-                if (this.set)
-                    this.set.status = 500;
-                throw new InternalServerError(error.message, this.defaultMessageError);
-            }
-            finally {
-                if (this.set)
-                    this.set.status = null;
-            }
-        }
+        if (this.frameworkName === 'elysia')
+            return this.elysia(httpServerParams, route, handler);
         return this.express(httpServerParams, route, handler);
     }
-    async test(httpServerParams, route, handler) {
-        return new Promise((resolve, rejected) => {
-            return resolve(this.elysia(httpServerParams, route, handler));
-        }).then((response) => {
-            if (response instanceof ServerError) {
-                console.log('the response is', response);
-                this.set.status = response.getStatusCode();
-                // throw response;
-            }
-            else {
-                console.log('the response is', response);
-                console.log('set', this.set);
-                if (this.set)
-                    this.set.status = 500;
-                console.log('now set', this.set);
-            }
-        });
-        // this.elysia(httpServerParams, route, handler)
-    }
     setDefaultMessageError(message) {
         this.defaultMessageError = message;
     }
+    getDefaultMessageError() {
+        return this.defaultMessageError;
+    }
     listen(port) {
         this.framework.listen(port);
     }
@@ -78,8 +43,8 @@ export default class HttpServer {
         (this.framework[method])(route, async ({ headers, set, query, params, body, request }) => {
             headers['ip'] = this.framework.server?.requestIP(request).address;
             set.status = httpServerParams.statusCode ?? 200;
-            this.set = set;
             const output = await handler({
+                setStatus: (statusCode) => set.status = statusCode,
                 headers,
                 query,
                 params,
@@ -92,33 +57,14 @@ export default class HttpServer {
         const method = httpServerParams.method;
         this.framework[method](route, async (request, res) => {
             request.headers['ip'] = request.ip;
-            try {
-                const output = await handler({
-                    headers: request.headers,
-                    query: request.query,
-                    params: request.params,
-                    body: request.body
-                });
-                return res.status(httpServerParams.statusCode ?? 200).json(output);
-            }
-            catch (error) {
-                if (error instanceof ServerError) {
-                    res.status(error.getStatusCode());
-                    throw error;
-                }
-                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
-                // })
-            }
+            const output = await handler({
+                setStatus: (statusCode) => res.status(statusCode),
+                headers: request.headers,
+                query: request.query,
+                params: request.params,
+                body: request.body
+            });
+            return res.status(httpServerParams.statusCode ?? 200).json(output);
         });
     }
 }

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import { Dede, Register as DedeRegister, Options as DedeOptions } from './dede';
 import { Controller, Post, Put, Get, Delete, Patch, Validator, Middleware, Auth, Inject, Restrict, Metrics, OffConsoleLog } from './decorators';
 import { BadRequest, Conflict, Forbidden, HttpServer, NotFound, ServerError, Unauthorized, UnprocessableEntity } from './http';
-import { Validation, HttpMiddleware, UseCase, CreateRepository, DeleteRepository, UpdateRepository, RestoreRepository, RequestMetricsHandler, RequestData, RequestMetrics } from './protocols';
+import { Validation, HttpMiddleware, UseCase, CreateRepository, DeleteRepository, UpdateRepository, RestoreRepository, RequestMetricsHandler, RequestData, RequestMetrics, HttpServerError } from './protocols';
 import { Entity } from './domain/Entity';
 declare class UseCaseHandler {
     static load<T extends UseCase<any, any>>(useCaseClass: new (...args: any[]) => T, request?: RequestData): T;
 }
-export { UseCase, HttpMiddleware, Validation, RequestMetricsHandler, RequestMetrics, CreateRepository, DeleteRepository, UpdateRepository, RestoreRepository, RequestData, Dede, DedeRegister, DedeOptions, UseCaseHandler, ServerError, BadRequest, Conflict, Forbidden, HttpServer, NotFound, Unauthorized, UnprocessableEntity, Controller, Post, Put, Get, Delete, Patch, Validator, Middleware, Auth, Inject, Entity, Restrict, Metrics, OffConsoleLog };
+export { UseCase, HttpMiddleware, Validation, RequestMetricsHandler, RequestMetrics, HttpServerError, CreateRepository, DeleteRepository, UpdateRepository, RestoreRepository, RequestData, Dede, DedeRegister, DedeOptions, UseCaseHandler, ServerError, BadRequest, Conflict, Forbidden, HttpServer, NotFound, Unauthorized, UnprocessableEntity, Controller, Post, Put, Get, Delete, Patch, Validator, Middleware, Auth, Inject, Entity, Restrict, Metrics, OffConsoleLog };

package/dist/protocols/HttpServerError.d.ts

@@ -0,0 +1,5 @@
+import { HttpStatusCode } from "../http/HttpServer";
+export interface HttpServerError {
+    message: string;
+    statusCode: HttpStatusCode;
+}

package/dist/protocols/HttpServerError.js

@@ -0,0 +1 @@
+export {};

package/dist/protocols/index.d.ts

@@ -8,4 +8,5 @@ import type { RestoreRepository } from './RestoreRepository';
 import type { RequestMetricsHandler } from './RequestMetricsHandler';
 import type { RequestData } from './RequestData';
 import type { RequestMetrics } from './RequestMetrics';
-export type { RequestData, RequestMetrics, HttpMiddleware, UseCase, Validation, CreateRepository, DeleteRepository, UpdateRepository, RestoreRepository, RequestMetricsHandler };
+import type { HttpServerError } from './HttpServerError';
+export type { RequestData, RequestMetrics, HttpMiddleware, UseCase, Validation, CreateRepository, DeleteRepository, UpdateRepository, RestoreRepository, RequestMetricsHandler, HttpServerError };

package/package.json

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