@ccci/micro-server 1.0.45 → 1.0.47

package/dist/index.js

@@ -87526,7 +87526,7 @@ var logger = import_winston.default.createLogger({
     if (typeof info.message === "object") {
       info.message = JSON.stringify(info.message, null, 3);
     }
-    return `${info.timestamp} - [${info.level}]: ${info.message} ${JSON.stringify(info.metadata)}`;
+    return `[${info.level}]${info.timestamp}: ${info.message}`;
   })),
   transports: [new import_winston.default.transports.Console]
 });
@@ -87637,32 +87637,35 @@ var ISSUER = process.env.JWT_ISSUER ? process.env.JWT_ISSUER : "*.service";
 var UNSECURED_DIR = ["dev", "public"];
 
 class RouterFactory {
-  constructor(app, pathName, folderName = "routes", context = "api") {
-    try {
-      Logger.info("Create API Routes...\n");
-      fs2.readdirSync(folderName).forEach((dir) => {
-        let isUnsecure = UNSECURED_DIR.findIndex((x) => x === dir) > -1;
-        var routerDir = path.join(folderName, dir);
-        fs2.readdirSync(routerDir).forEach((file) => {
-          let fullName = path.join(routerDir, file);
-          if (file.toLowerCase().indexOf(".js") || file.toLowerCase().indexOf(".ts")) {
-            let fileName = fullName.replace(folderName, context).replace(".js", "").replace(".ts", "").split("\\").join("/");
-            let endpoint = `/${fileName}`;
-            let routeFile = `${pathName}/${fullName}`;
-            import(routeFile).then((routerClass) => {
-              let router = new routerClass.default;
-              app.use(endpoint, (req, res, next) => this.authenticate(req, res, next, isUnsecure || router.grantPublicAccess), router.getRoutes());
-              Logger.info("Initializing endpoint:", endpoint);
-            });
-          }
+  static async init(app, pathName, folderName = "routes", context = "api") {
+    return new Promise((resolve, reject) => {
+      try {
+        Logger.info("Create API Routes...\n");
+        fs2.readdirSync(folderName).forEach((dir) => {
+          let isUnsecure = UNSECURED_DIR.findIndex((x) => x === dir) > -1;
+          var routerDir = path.join(folderName, dir);
+          fs2.readdirSync(routerDir).forEach((file) => {
+            let fullName = path.join(routerDir, file);
+            if (file.toLowerCase().indexOf(".js") || file.toLowerCase().indexOf(".ts")) {
+              let fileName = fullName.replace(folderName, context).replace(".js", "").replace(".ts", "").split("\\").join("/");
+              let endpoint = `/${fileName}`;
+              let routeFile = `${pathName}/${fullName}`;
+              import(routeFile).then((routerClass) => {
+                let router = new routerClass.default;
+                app.use(endpoint, (req, res, next) => RouterFactory.authenticate(req, res, next, isUnsecure || router.grantPublicAccess), router.getRoutes());
+                Logger.info("Initializing endpoint:", endpoint);
+              });
+            }
+          });
+          resolve();
         });
-      });
-    } catch (error) {
-      Logger.error(error);
-      throw error;
-    }
+      } catch (error) {
+        Logger.error(error);
+        reject(error);
+      }
+    });
   }
-  authenticate(req, res, next, grantPublicAccess = false) {
+  static authenticate(req, res, next, grantPublicAccess = false) {
     try {
       let bearerToken = req.headers.authorization;
       if (bearerToken && bearerToken != null && bearerToken != "null") {
@@ -87741,7 +87744,6 @@ class ApplicationServer {
   static app;
   static async bootstrap(port, options) {
     ApplicationServer.app = import_express.default();
-    Logger.info("Setting up application middlewares...\n");
     ApplicationServer.app.use(import_cors.default());
     ApplicationServer.app.use(helmet());
     ApplicationServer.app.use(import_express.default.json());
@@ -87752,13 +87754,13 @@ class ApplicationServer {
     ApplicationServer.app.get("/", (req, resp) => {
       return resp.sendFile(path3.resolve("index.html"));
     });
-    new RouterFactory(ApplicationServer.app, process.cwd(), "routes");
+    RouterFactory.init(ApplicationServer.app, process.cwd(), "routes");
     const server = ApplicationServer.app.listen(port, () => {
       Logger.info(`API Sever ready at: http://127.0.0.1:${port}\n`);
+      if (options?.enableWebSocket) {
+        new WebSocketServer(options?.websocketPort, process.cwd(), options?.websocketDir);
+      }
     });
-    if (options?.enableWebSocket) {
-      new WebSocketServer(options?.websocketPort, process.cwd(), options?.websocketDir);
-    }
   }
   getInstance() {
     return ApplicationServer.app;

package/dist/utils/RouterFactory.d.ts

@@ -6,7 +6,7 @@ export default class RouterFactory {
      * @param pathName root path of the application
      * @param folderName path of the routers (default: routes)
      */
-    constructor(app: Application, pathName: string, folderName?: string, context?: string);
-    authenticate(req: Request, res: Response, next: NextFunction, grantPublicAccess?: boolean): Response<any, Record<string, any>> | undefined;
+    static init(app: Application, pathName: string, folderName?: string, context?: string): Promise<void>;
+    static authenticate(req: Request, res: Response, next: NextFunction, grantPublicAccess?: boolean): Response<any, Record<string, any>> | undefined;
 }
 //# sourceMappingURL=RouterFactory.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccci/micro-server",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "module": "index.ts",
   "type": "module",
   "main": "dist/index.js",