@webtypen/webframez-core 0.0.17 → 0.0.18

package/lib/Router/Router.d.ts

@@ -103,7 +103,7 @@ declare class RouterFacade {
      * @param res
      */
     handleRequest(req: IncomingMessage, res: ServerResponse): Promise<void>;
-    requestConsoleLog(req: IncomingMessage): void;
+    requestConsoleLog(req: IncomingMessage, httpCode: number): void;
 }
 export declare const Router: RouterFacade;
 export {};

package/lib/Router/Router.js

@@ -51,9 +51,7 @@ class RouterFacade {
         this.basename = options && options.basename ? options.basename : null;
         this.kernel = options && options.kernel ? options.kernel : null;
         // Load routes
-        console.log("loadRoutes");
         require(process.cwd() + "/app/routes");
-        console.log("finishRoutes");
     }
     /**
      * Register a route
@@ -178,6 +176,7 @@ class RouterFacade {
     handleRequest(req, res) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.kernel) {
+                res.end();
                 throw new Error("Missing Kernel in Router ...");
             }
             const route = this.dissolve(req);
@@ -221,6 +220,7 @@ class RouterFacade {
                 for (let middlewareKey of route.options.middleware) {
                     const middleware = this.kernel.middleware[middlewareKey];
                     if (!middleware) {
+                        this.requestConsoleLog(req, 500);
                         return this.sendError(res, 500, "Unknown middleware `" + middlewareKey + "` ...");
                     }
                     try {
@@ -232,6 +232,7 @@ class RouterFacade {
                             }
                             catch (e) {
                                 console.error(e);
+                                this.requestConsoleLog(req, 500);
                                 return this.sendError(res, 500, "Error in middleware `" + middlewareKey + "` ...");
                             }
                         });
@@ -255,6 +256,7 @@ class RouterFacade {
                 res.statusCode = 200;
                 res.setHeader("Content-Length", "0");
                 res.end();
+                this.requestConsoleLog(req, 200);
                 return;
             }
             // Resolve route-component (handle controller definition)
@@ -274,19 +276,22 @@ class RouterFacade {
                 try {
                     yield route.component(request, response);
                     res.end();
+                    this.requestConsoleLog(req, 200);
                 }
                 catch (e) {
                     console.error(e);
                     this.sendError(res, 500);
+                    this.requestConsoleLog(req, 500);
                 }
             }
             else {
                 this.sendError(res, 404);
+                this.requestConsoleLog(req, 404);
             }
         });
     }
-    requestConsoleLog(req) {
-        if (Config_1.Config.get("router.requests.logConsole") !== true) {
+    requestConsoleLog(req, httpCode) {
+        if (Config_1.Config.get("application.router.requests.logConsole") !== true) {
             return;
         }
         const date = new Date();
@@ -318,7 +323,9 @@ class RouterFacade {
             req.url +
             '", ip: "' +
             ip +
-            '" }');
+            '", httpcode: ' +
+            httpCode.toString() +
+            " }");
     }
 }
 exports.Router = new RouterFacade();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-core",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
   "homepage": "https://webtypen.de/",
   "license": "MIT",

package/src/Router/Router.ts

@@ -78,9 +78,7 @@ class RouterFacade {
     this.kernel = options && options.kernel ? options.kernel : null;
 
     // Load routes
-    console.log("loadRoutes");
     require(process.cwd() + "/app/routes");
-    console.log("finishRoutes");
   }
 
   /**
@@ -208,6 +206,7 @@ class RouterFacade {
    */
   async handleRequest(req: IncomingMessage, res: ServerResponse) {
     if (!this.kernel) {
+      res.end();
       throw new Error("Missing Kernel in Router ...");
     }
 
@@ -258,6 +257,7 @@ class RouterFacade {
       for (let middlewareKey of route.options.middleware) {
         const middleware = this.kernel.middleware[middlewareKey];
         if (!middleware) {
+          this.requestConsoleLog(req, 500);
           return this.sendError(
             res,
             500,
@@ -279,6 +279,7 @@ class RouterFacade {
             } catch (e) {
               console.error(e);
 
+              this.requestConsoleLog(req, 500);
               return this.sendError(
                 res,
                 500,
@@ -311,6 +312,7 @@ class RouterFacade {
       res.statusCode = 200;
       res.setHeader("Content-Length", "0");
       res.end();
+      this.requestConsoleLog(req, 200);
       return;
     }
 
@@ -333,17 +335,20 @@ class RouterFacade {
       try {
         await route.component(request, response);
         res.end();
+        this.requestConsoleLog(req, 200);
       } catch (e) {
         console.error(e);
         this.sendError(res, 500);
+        this.requestConsoleLog(req, 500);
       }
     } else {
       this.sendError(res, 404);
+      this.requestConsoleLog(req, 404);
     }
   }
 
-  requestConsoleLog(req: IncomingMessage) {
-    if (Config.get("router.requests.logConsole") !== true) {
+  requestConsoleLog(req: IncomingMessage, httpCode: number) {
+    if (Config.get("application.router.requests.logConsole") !== true) {
       return;
     }
 
@@ -378,7 +383,9 @@ class RouterFacade {
         req.url +
         '", ip: "' +
         ip +
-        '" }'
+        '", httpcode: ' +
+        httpCode.toString() +
+        " }"
     );
   }
 }