@webtypen/webframez-core 0.0.17 → 0.0.19

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

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Router = void 0;
+const fs_1 = __importDefault(require("fs"));
 const qs_1 = __importDefault(require("qs"));
 const Response_1 = require("./Response");
 const Config_1 = require("../Config");
@@ -51,9 +52,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 +177,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 +221,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 +233,7 @@ class RouterFacade {
                             }
                             catch (e) {
                                 console.error(e);
+                                this.requestConsoleLog(req, 500);
                                 return this.sendError(res, 500, "Error in middleware `" + middlewareKey + "` ...");
                             }
                         });
@@ -255,6 +257,7 @@ class RouterFacade {
                 res.statusCode = 200;
                 res.setHeader("Content-Length", "0");
                 res.end();
+                this.requestConsoleLog(req, 200);
                 return;
             }
             // Resolve route-component (handle controller definition)
@@ -268,25 +271,29 @@ class RouterFacade {
                 }
                 // Set Controller method as route-component
                 const controllerInstance = new controller();
-                route.component = controllerInstance[split[1]];
+                route.component = controllerInstance[split[1]].bind(controllerInstance);
             }
             if (route && route.component !== undefined) {
                 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 &&
+            !Config_1.Config.get("application.router.requests.logFile")) {
             return;
         }
         const date = new Date();
@@ -300,7 +307,7 @@ class RouterFacade {
                     : req.socket && req.socket.remoteAddress
                         ? req.socket.remoteAddress
                         : null;
-        console.log('{ date: "' +
+        const logString = '{ date: "' +
             date.getFullYear() +
             "-" +
             (month < 10 ? "0" + month : month) +
@@ -318,7 +325,25 @@ class RouterFacade {
             req.url +
             '", ip: "' +
             ip +
-            '" }');
+            '", httpcode: ' +
+            httpCode.toString() +
+            " }";
+        if (Config_1.Config.get("application.router.requests.logConsole")) {
+            console.log(logString);
+        }
+        if (Config_1.Config.get("application.router.requests.logFile")) {
+            try {
+                const filepath = Config_1.Config.get("application.router.requests.logFile");
+                if (filepath && filepath.trim() !== "") {
+                    fs_1.default.appendFileSync(filepath.trim().substring(0, 1) === "/"
+                        ? filepath
+                        : process.cwd() + "/" + filepath, logString + "\n");
+                }
+            }
+            catch (e) {
+                console.error(e);
+            }
+        }
     }
 }
 exports.Router = new RouterFacade();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-core",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "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

@@ -1,3 +1,4 @@
+import fs from "fs";
 import qs from "qs";
 import { IncomingMessage, ServerResponse } from "http";
 import { Response } from "./Response";
@@ -78,9 +79,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 +207,7 @@ class RouterFacade {
    */
   async handleRequest(req: IncomingMessage, res: ServerResponse) {
     if (!this.kernel) {
+      res.end();
       throw new Error("Missing Kernel in Router ...");
     }
 
@@ -258,6 +258,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 +280,7 @@ class RouterFacade {
             } catch (e) {
               console.error(e);
 
+              this.requestConsoleLog(req, 500);
               return this.sendError(
                 res,
                 500,
@@ -311,6 +313,7 @@ class RouterFacade {
       res.statusCode = 200;
       res.setHeader("Content-Length", "0");
       res.end();
+      this.requestConsoleLog(req, 200);
       return;
     }
 
@@ -326,24 +329,30 @@ class RouterFacade {
 
       // Set Controller method as route-component
       const controllerInstance = new controller();
-      route.component = controllerInstance[split[1]];
+      route.component = controllerInstance[split[1]].bind(controllerInstance);
     }
 
     if (route && route.component !== undefined) {
       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 &&
+      !Config.get("application.router.requests.logFile")
+    ) {
       return;
     }
 
@@ -358,28 +367,48 @@ class RouterFacade {
       : req.socket && req.socket.remoteAddress
       ? req.socket.remoteAddress
       : null;
-
-    console.log(
+    const logString =
       '{ date: "' +
-        date.getFullYear() +
-        "-" +
-        (month < 10 ? "0" + month : month) +
-        "-" +
-        date.getDate() +
-        " " +
-        (date.getHours() + 1) +
-        ":" +
-        date.getMinutes() +
-        ":" +
-        date.getSeconds() +
-        '", method: "' +
-        req.method +
-        '", url: "' +
-        req.url +
-        '", ip: "' +
-        ip +
-        '" }'
-    );
+      date.getFullYear() +
+      "-" +
+      (month < 10 ? "0" + month : month) +
+      "-" +
+      date.getDate() +
+      " " +
+      (date.getHours() + 1) +
+      ":" +
+      date.getMinutes() +
+      ":" +
+      date.getSeconds() +
+      '", method: "' +
+      req.method +
+      '", url: "' +
+      req.url +
+      '", ip: "' +
+      ip +
+      '", httpcode: ' +
+      httpCode.toString() +
+      " }";
+
+    if (Config.get("application.router.requests.logConsole")) {
+      console.log(logString);
+    }
+
+    if (Config.get("application.router.requests.logFile")) {
+      try {
+        const filepath = Config.get("application.router.requests.logFile");
+        if (filepath && filepath.trim() !== "") {
+          fs.appendFileSync(
+            filepath.trim().substring(0, 1) === "/"
+              ? filepath
+              : process.cwd() + "/" + filepath,
+            logString + "\n"
+          );
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    }
   }
 }