@webtypen/webframez-core 0.0.15 → 0.0.17

package/lib/Router/Request.d.ts

@@ -1,4 +1,5 @@
 export type Request = {
+    [key: string]: any;
     body?: any;
     bodyPlain?: any;
     params: object;

package/lib/Router/Router.js

@@ -177,12 +177,42 @@ class RouterFacade {
      */
     handleRequest(req, res) {
         return __awaiter(this, void 0, void 0, function* () {
-            const route = this.dissolve(req);
-            const response = new Response_1.Response();
-            response.setServerResponse(res);
             if (!this.kernel) {
                 throw new Error("Missing Kernel in Router ...");
             }
+            const route = this.dissolve(req);
+            const response = new Response_1.Response();
+            response.setServerResponse(res);
+            // Load Body
+            let body = [];
+            const bodyPlain = yield new Promise((resolve) => {
+                req
+                    .on("data", (chunk) => {
+                    body.push(chunk);
+                })
+                    .on("end", () => {
+                    resolve(Buffer.concat(body).toString());
+                });
+            });
+            const request = {
+                body: bodyPlain &&
+                    req.headers["content-type"] === "application/json" &&
+                    (bodyPlain.trim().substring(0, 1) === "[" ||
+                        bodyPlain.trim().substring(0, 1) === "{")
+                    ? JSON.parse(bodyPlain)
+                    : bodyPlain
+                        ? qs_1.default.parse(bodyPlain)
+                        : {},
+                bodyPlain: bodyPlain,
+                params: route && route.params ? route.params : {},
+                httpVersionMajor: req.httpVersionMajor,
+                httpVersionMinor: req.httpVersionMinor,
+                httpVersion: req.httpVersion,
+                headers: req.headers,
+                rawHeaders: req.rawHeaders,
+                url: req.url,
+                method: req.method,
+            };
             // Check-Middleware
             if (route &&
                 route.options &&
@@ -198,7 +228,7 @@ class RouterFacade {
                             try {
                                 middleware(resolve, (status, data) => {
                                     reject({ status: status, data: data });
-                                }, req, response);
+                                }, request, response);
                             }
                             catch (e) {
                                 console.error(e);
@@ -241,36 +271,8 @@ class RouterFacade {
                 route.component = controllerInstance[split[1]];
             }
             if (route && route.component !== undefined) {
-                let body = [];
-                const bodyPlain = yield new Promise((resolve) => {
-                    req
-                        .on("data", (chunk) => {
-                        body.push(chunk);
-                    })
-                        .on("end", () => {
-                        resolve(Buffer.concat(body).toString());
-                    });
-                });
                 try {
-                    yield route.component({
-                        body: bodyPlain &&
-                            req.headers["content-type"] === "application/json" &&
-                            (bodyPlain.trim().substring(0, 1) === "[" ||
-                                bodyPlain.trim().substring(0, 1) === "{")
-                            ? JSON.parse(bodyPlain)
-                            : bodyPlain
-                                ? qs_1.default.parse(bodyPlain)
-                                : {},
-                        bodyPlain: bodyPlain,
-                        params: route.params,
-                        httpVersionMajor: req.httpVersionMajor,
-                        httpVersionMinor: req.httpVersionMinor,
-                        httpVersion: req.httpVersion,
-                        headers: req.headers,
-                        rawHeaders: req.rawHeaders,
-                        url: req.url,
-                        method: req.method,
-                    }, response);
+                    yield route.component(request, response);
                     res.end();
                 }
                 catch (e) {
@@ -287,6 +289,36 @@ class RouterFacade {
         if (Config_1.Config.get("router.requests.logConsole") !== true) {
             return;
         }
+        const date = new Date();
+        const month = date.getMonth() + 1;
+        const ip = req.headers["x-forwarded-for"]
+            ? req.headers["x-forwarded-for"]
+            : req.headers["x-forwarded"]
+                ? req.headers["x-forwarded"]
+                : req.headers["forwarded-for"]
+                    ? req.headers["forwarded-for"]
+                    : req.socket && req.socket.remoteAddress
+                        ? req.socket.remoteAddress
+                        : null;
+        console.log('{ 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 +
+            '" }');
     }
 }
 exports.Router = new RouterFacade();

package/package.json

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

package/src/Router/Request.ts

@@ -1,4 +1,5 @@
 export type Request = {
+  [key: string]: any;
   body?: any;
   bodyPlain?: any;
   params: object;

package/src/Router/Router.ts

@@ -207,13 +207,46 @@ class RouterFacade {
    * @param res
    */
   async handleRequest(req: IncomingMessage, res: ServerResponse) {
+    if (!this.kernel) {
+      throw new Error("Missing Kernel in Router ...");
+    }
+
     const route = this.dissolve(req);
     const response = new Response();
     response.setServerResponse(res);
 
-    if (!this.kernel) {
-      throw new Error("Missing Kernel in Router ...");
-    }
+    // Load Body
+    let body: any = [];
+    const bodyPlain: any = await new Promise((resolve: Function) => {
+      req
+        .on("data", (chunk) => {
+          body.push(chunk);
+        })
+        .on("end", () => {
+          resolve(Buffer.concat(body).toString());
+        });
+    });
+
+    const request = {
+      body:
+        bodyPlain &&
+        req.headers["content-type"] === "application/json" &&
+        (bodyPlain.trim().substring(0, 1) === "[" ||
+          bodyPlain.trim().substring(0, 1) === "{")
+          ? JSON.parse(bodyPlain)
+          : bodyPlain
+          ? qs.parse(bodyPlain)
+          : {},
+      bodyPlain: bodyPlain,
+      params: route && route.params ? route.params : {},
+      httpVersionMajor: req.httpVersionMajor,
+      httpVersionMinor: req.httpVersionMinor,
+      httpVersion: req.httpVersion,
+      headers: req.headers,
+      rawHeaders: req.rawHeaders,
+      url: req.url,
+      method: req.method,
+    };
 
     // Check-Middleware
     if (
@@ -240,7 +273,7 @@ class RouterFacade {
                 (status: number, data: any) => {
                   reject({ status: status, data: data });
                 },
-                req,
+                request,
                 response
               );
             } catch (e) {
@@ -297,41 +330,8 @@ class RouterFacade {
     }
 
     if (route && route.component !== undefined) {
-      let body: any = [];
-      const bodyPlain: any = await new Promise((resolve: Function) => {
-        req
-          .on("data", (chunk) => {
-            body.push(chunk);
-          })
-          .on("end", () => {
-            resolve(Buffer.concat(body).toString());
-          });
-      });
-
       try {
-        await route.component(
-          {
-            body:
-              bodyPlain &&
-              req.headers["content-type"] === "application/json" &&
-              (bodyPlain.trim().substring(0, 1) === "[" ||
-                bodyPlain.trim().substring(0, 1) === "{")
-                ? JSON.parse(bodyPlain)
-                : bodyPlain
-                ? qs.parse(bodyPlain)
-                : {},
-            bodyPlain: bodyPlain,
-            params: route.params,
-            httpVersionMajor: req.httpVersionMajor,
-            httpVersionMinor: req.httpVersionMinor,
-            httpVersion: req.httpVersion,
-            headers: req.headers,
-            rawHeaders: req.rawHeaders,
-            url: req.url,
-            method: req.method,
-          },
-          response
-        );
+        await route.component(request, response);
         res.end();
       } catch (e) {
         console.error(e);
@@ -346,6 +346,40 @@ class RouterFacade {
     if (Config.get("router.requests.logConsole") !== true) {
       return;
     }
+
+    const date = new Date();
+    const month = date.getMonth() + 1;
+    const ip = req.headers["x-forwarded-for"]
+      ? req.headers["x-forwarded-for"]
+      : req.headers["x-forwarded"]
+      ? req.headers["x-forwarded"]
+      : req.headers["forwarded-for"]
+      ? req.headers["forwarded-for"]
+      : req.socket && req.socket.remoteAddress
+      ? req.socket.remoteAddress
+      : null;
+
+    console.log(
+      '{ 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 +
+        '" }'
+    );
   }
 }