c2-http 1.0.109 → 1.0.111

package/dist/model/Controller.d.ts

@@ -1,6 +1,7 @@
 import { RequestHandler, Router } from "express";
 import { NormalizePathEntry } from "express-prom-bundle";
-export interface IRouteParam {
+import { IControllerOptions } from "./IControllerOptions";
+export interface ISingleRouteParam {
     method: "get" | "post" | "patch" | "delete";
     uri: string;
     middlewareAuthorization?: RequestHandler;
@@ -16,8 +17,8 @@ export declare abstract class Controller {
     prefixRole: string[];
     roles: string[];
     byPass: boolean;
-    constructor(options: any);
-    registerRoute(options: IRouteParam): void;
+    constructor(options: IControllerOptions);
+    registerRoute(options: ISingleRouteParam): void;
 }
 export declare function HttpDispatchHandling(target: any, methodName: string, descriptor: PropertyDescriptor): PropertyDescriptor;
 export declare function HttpDispatchDownload(target: any, methodName: string, descriptor: PropertyDescriptor): PropertyDescriptor;

package/dist/model/Controller.js

@@ -94,45 +94,45 @@ function OpenApi(target) {
     return class extends target {
         constructor() {
             super(); // Chama o construtor da classe original
-            const paths = {};
-            this.routesControlled.forEach((route) => {
-                const methods = {};
-                methods[route.method] = {
-                    tags: [target.name]
-                };
-                if (route.middlewareCheckAuthorization) {
-                    methods[route.method].description = `${methods[route.method].description ?? ""} \nRoles necessárias: ${route.middlewareCheckAuthorization.roles.join(", ")}`;
-                    methods[route.method].security = [
-                        {
-                            OAuth2: route.middlewareCheckAuthorization.roles
-                        }
-                    ];
-                    methods[route.method].responses =
-                        {
-                            "200": {
-                                "content": {
-                                    "application/json": {
-                                        "schema": {
-                                            "type": "object"
-                                        }
-                                    }
-                                }
-                            }
-                        };
-                }
-                const pathsAux = route.uri.replace(/:([^/]+)/g, "{$1}");
-                paths[pathsAux] = {
-                    ...paths[pathsAux],
-                    ...methods
-                };
-            });
-            global.OPEN_API_DOC = {
-                ...global.OPEN_API_DOC,
-                paths: {
-                    ...global.OPEN_API_DOC.paths,
-                    ...paths
-                }
-            };
+            // const paths: { [key: string]: any } = {}
+            // this.forEach((route: any) => {
+            //   const methods: { [key: string]: any } = {}
+            //   methods[route.method] = {
+            //     tags: [target.name]
+            //   }
+            //   if (route.middlewareCheckAuthorization) {
+            //     methods[route.method].description = `${methods[route.method].description ?? ""} \nRoles necessárias: ${route.middlewareCheckAuthorization.roles.join(", ")}`
+            //     methods[route.method].security = [
+            //       {
+            //         OAuth2: route.middlewareCheckAuthorization.roles
+            //       }
+            //     ]
+            //     methods[route.method].responses =
+            //     {
+            //       "200": {
+            //         "content": {
+            //           "application/json": {
+            //             "schema": {
+            //               "type": "object"
+            //             }
+            //           }
+            //         }
+            //       }
+            //     }
+            //   }
+            //   const pathsAux = route.uri.replace(/:([^/]+)/g, "{$1}")
+            //   paths[pathsAux] = {
+            //     ...paths[pathsAux],
+            //     ...methods
+            //   };
+            // });
+            // (global as any).OPEN_API_DOC = {
+            //   ...(global as any).OPEN_API_DOC,
+            //   paths: {
+            //     ...(global as any).OPEN_API_DOC.paths,
+            //     ...paths
+            //   }
+            // }
         }
     };
 }

package/dist/model/Server.d.ts

@@ -1,9 +1,10 @@
-import express, { Router } from "express";
+import express from "express";
+import { Controller } from "./Controller";
 export interface IServerConfig {
     openApiFileOutput: any;
     port: string;
-    routesWithToken: Router[];
-    routes: Router[];
+    closeControllers: Controller[];
+    openControllers: Controller[];
     i18n: any;
 }
 export declare class Server {

package/dist/model/Server.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Server = void 0;
 const c2_util_1 = require("c2-util");
 const express_1 = __importDefault(require("express"));
-const swagger_ui_express_1 = __importDefault(require("swagger-ui-express"));
+const express_prom_bundle_1 = __importDefault(require("express-prom-bundle"));
 const i18n_1 = require("../i18n");
 const MiddlewareGlobals_1 = __importDefault(require("../middleware/global-middleware/MiddlewareGlobals"));
 const MiddlewareJwt_1 = __importDefault(require("../middleware/jwt-middlware/MiddlewareJwt"));
@@ -22,15 +22,25 @@ class Server {
         (0, c2_util_1.log)("LOG_INIT_SERVER", `Initializing server on ${this.config.port}...`);
         (0, i18n_1.initializei18n)(this.config.i18n);
         MiddlewareGlobals_1.default.config(this.app);
-        for (const router of this.config.routes) {
-            this.app.use(router);
+        let pathsToMetrics = [];
+        for (const openController of this.config.openControllers) {
+            this.app.use(openController.router);
+            pathsToMetrics = [...pathsToMetrics, ...openController.normalizedPaths];
         }
-        this.app.use("/docs", swagger_ui_express_1.default.serve, swagger_ui_express_1.default.setup(global.OPEN_API_DOC));
+        // this.app.use("/docs", swaggerUI.serve, swaggerUI.setup((global as any).OPEN_API_DOC))
         (0, c2_util_1.log)("LOG", "Rotas abertas OK");
         this.app.use(MiddlewareJwt_1.default.config);
-        for (const router of this.config.routesWithToken) {
-            this.app.use(router);
+        for (const closeRouter of this.config.closeControllers) {
+            this.app.use(closeRouter.router);
+            pathsToMetrics = [...pathsToMetrics, ...closeRouter.normalizedPaths];
         }
+        const metricsMiddleware = (0, express_prom_bundle_1.default)({
+            includeMethod: true,
+            includePath: true,
+            normalizePath: pathsToMetrics,
+            metricsPath: "/metrics"
+        });
+        this.app.use(metricsMiddleware);
         (0, c2_util_1.log)("LOG", "Rotas fechadas OK");
         this.server = this.app.listen(this.config.port, async () => {
             (0, c2_util_1.log)("LOG_INIT_SERVER", `Server running on port ${this.config.port}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-http",
-  "version": "1.0.109",
+  "version": "1.0.111",
   "description": "Biblioteca Typescript para API NodeJS",
   "repository": "https://cabralsilva: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@github.com/cabralsilva/c2-http.git",
   "author": "Daniel Cabral <cabralconsultoriaemsoftware@gmail.com>",