@webtypen/webframez-core 0.1.0 → 0.1.1

package/dist/Router/Request.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { IncomingMessage } from "http";
 export declare class Request {
+    [key: string]: any;
     method: string;
     url: string;
     headers: any;

package/dist/Router/Request.js

@@ -1,19 +1,4 @@
 "use strict";
-// export type Request = {
-//   [key: string]: any;
-//   body?: any;
-//   bodyPlain?: any;
-//   params: object;
-//   httpVersionMajor: any;
-//   httpVersionMinor: any;
-//   httpVersion: any;
-//   headers: object;
-//   rawHeaders: object;
-//   url: string;
-//   method: string;
-//   on?: any;
-//   request?: any;
-// };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Request = void 0;
 class Request {

package/dist/Router/Response.js

@@ -67,18 +67,20 @@ class Response {
      * @returns Response
      */
     send(content) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this.content = content;
         if (this.mode === "aws-lambda") {
             // Do nothing ... Store content in variable and use it later ...
         }
         else {
             if (typeof content === "object" && !Buffer.isBuffer(content)) {
-                (_a = this.res) === null || _a === void 0 ? void 0 : _a.setHeader("Content-Type", "application/json");
-                (_b = this.res) === null || _b === void 0 ? void 0 : _b.write(JSON.stringify(content));
+                if (!((_a = this.res) === null || _a === void 0 ? void 0 : _a.headersSent)) {
+                    (_b = this.res) === null || _b === void 0 ? void 0 : _b.setHeader("Content-Type", "application/json");
+                }
+                (_c = this.res) === null || _c === void 0 ? void 0 : _c.write(JSON.stringify(content));
             }
             else {
-                (_c = this.res) === null || _c === void 0 ? void 0 : _c.write(content);
+                (_d = this.res) === null || _d === void 0 ? void 0 : _d.write(content);
             }
         }
         return this;

package/dist/Router/Router.d.ts

@@ -4,7 +4,9 @@ import { Response } from "./Response";
 import { Request } from "./Request";
 type RouteObject = {
     path: string;
-    component: any;
+    component?: any;
+    controller?: any;
+    method_name?: string;
     options: {
         [key: string]: any;
     };
@@ -69,9 +71,17 @@ declare class RouterFacade {
     };
     /**
      * Load the application-routes
-     *
      */
     init(options?: any): void;
+    /**
+     * Dissolves 'MyController@myFunction'
+     *
+     * @param str
+     */
+    dissolveStringComponent(str: string, path: string): {
+        controller: any;
+        method_name: string;
+    };
     /**
      * Register a route
      *

package/dist/Router/Router.js

@@ -50,7 +50,6 @@ class RouterFacade {
     }
     /**
      * Load the application-routes
-     *
      */
     init(options) {
         this.basename = options && options.basename ? options.basename : null;
@@ -64,6 +63,25 @@ class RouterFacade {
             require(process.cwd() + "/app/routes");
         }
     }
+    /**
+     * Dissolves 'MyController@myFunction'
+     *
+     * @param str
+     */
+    dissolveStringComponent(str, path) {
+        const split = str.split("@");
+        if (!split || !split[0] || split[0].trim() === "" || !split[1] || split[1].trim() === "") {
+            throw new Error("Missing Controller Route for '" + path + "'");
+        }
+        const controller = this.kernel.controller[split[0]];
+        if (!controller) {
+            throw new Error("Could not dissvole Controller '" + split[0] + "' from route ' +  path+ '");
+        }
+        return {
+            controller: controller,
+            method_name: split[1],
+        };
+    }
     /**
      * Register a route
      *
@@ -76,33 +94,29 @@ class RouterFacade {
         if (this.basename) {
             path = this.basename + path;
         }
+        let routeConf = {
+            path: path,
+            options: options,
+        };
+        if (typeof component === "string") {
+            const stringComponent = this.dissolveStringComponent(component, path);
+            routeConf.controller = stringComponent.controller;
+            routeConf.method_name = stringComponent.method_name;
+        }
+        else {
+            routeConf.component = component;
+        }
         if (type === "GET") {
-            this.routesGET[path] = {
-                path: path,
-                component: component,
-                options: options,
-            };
+            this.routesGET[path] = routeConf;
         }
         else if (type === "POST") {
-            this.routesPOST[path] = {
-                path: path,
-                component: component,
-                options: options,
-            };
+            this.routesPOST[path] = routeConf;
         }
         else if (type === "PUT") {
-            this.routesPUT[path] = {
-                path: path,
-                component: component,
-                options: options,
-            };
+            this.routesPUT[path] = routeConf;
         }
         else if (type === "DELETE") {
-            this.routesDELETE[path] = {
-                path: path,
-                component: component,
-                options: options,
-            };
+            this.routesDELETE[path] = routeConf;
         }
     }
     /**
@@ -209,7 +223,7 @@ class RouterFacade {
             if (!route) {
                 return this.handleError(request, response, 404, "Not found ...");
             }
-            if (!route.component) {
+            if (!(route.component && typeof route.component === "function") && !(route.controller && route.method_name)) {
                 return this.handleError(request, response, 404, "Missing route function ...");
             }
             try {
@@ -217,7 +231,17 @@ class RouterFacade {
                 if (request.method === "OPTIONS" && !request.skipOptionsForward) {
                     return this.handleReturn(request, response, "");
                 }
-                const result = yield route.component(request, response);
+                let result = null;
+                if (route.controller && route.method_name) {
+                    const controllerInstance = new route.controller();
+                    if (!controllerInstance[route.method_name]) {
+                        return this.handleError(request, response, 404, "Unknown method '" + route.method_name + "'.");
+                    }
+                    result = yield controllerInstance[route.method_name].bind(controllerInstance)(request, response);
+                }
+                else {
+                    result = yield route.component(request, response);
+                }
                 this.handleReturn(request, response, result);
             }
             catch (e) {
@@ -289,7 +313,8 @@ class RouterFacade {
                     // Content-Type Verarbeitung
                     if (contentType.includes("application/json")) {
                         try {
-                            resolve({ plain: body, parsed: JSON.parse(body.toString()) });
+                            const text = body.toString();
+                            resolve({ plain: body, parsed: text && text.trim() !== "" ? JSON.parse(text) : {} });
                         }
                         catch (e) {
                             reject(new Error("Invalid JSON"));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "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,22 +1,7 @@
-// export type Request = {
-//   [key: string]: any;
-//   body?: any;
-//   bodyPlain?: any;
-//   params: object;
-//   httpVersionMajor: any;
-//   httpVersionMinor: any;
-//   httpVersion: any;
-//   headers: object;
-//   rawHeaders: object;
-//   url: string;
-//   method: string;
-//   on?: any;
-//   request?: any;
-// };
-
 import { IncomingMessage } from "http";
 
 export class Request {
+    [key: string]: any;
     method: string = "GET";
     url: string = "";
     headers: any = {};

package/src/Router/Response.ts

@@ -75,7 +75,9 @@ export class Response {
             // Do nothing ... Store content in variable and use it later ...
         } else {
             if (typeof content === "object" && !Buffer.isBuffer(content)) {
-                this.res?.setHeader("Content-Type", "application/json");
+                if (!this.res?.headersSent) {
+                    this.res?.setHeader("Content-Type", "application/json");
+                }
                 this.res?.write(JSON.stringify(content));
             } else {
                 this.res?.write(content);

package/src/Router/Router.ts

@@ -5,7 +5,9 @@ import querystring from "querystring";
 
 type RouteObject = {
     path: string;
-    component: any;
+    component?: any;
+    controller?: any;
+    method_name?: string;
     options: { [key: string]: any };
     params: object;
 };
@@ -76,7 +78,6 @@ class RouterFacade {
 
     /**
      * Load the application-routes
-     *
      */
     init(options?: any) {
         this.basename = options && options.basename ? options.basename : null;
@@ -91,6 +92,29 @@ class RouterFacade {
         }
     }
 
+    /**
+     * Dissolves 'MyController@myFunction'
+     *
+     * @param str
+     */
+    dissolveStringComponent(str: string, path: string) {
+        const split = str.split("@");
+
+        if (!split || !split[0] || split[0].trim() === "" || !split[1] || split[1].trim() === "") {
+            throw new Error("Missing Controller Route for '" + path + "'");
+        }
+
+        const controller = this.kernel.controller[split[0]];
+        if (!controller) {
+            throw new Error("Could not dissvole Controller '" + split[0] + "' from route ' +  path+ '");
+        }
+
+        return {
+            controller: controller,
+            method_name: split[1],
+        };
+    }
+
     /**
      * Register a route
      *
@@ -104,30 +128,27 @@ class RouterFacade {
             path = this.basename + path;
         }
 
+        let routeConf: any = {
+            path: path,
+            options: options,
+        };
+
+        if (typeof component === "string") {
+            const stringComponent = this.dissolveStringComponent(component, path);
+            routeConf.controller = stringComponent.controller;
+            routeConf.method_name = stringComponent.method_name;
+        } else {
+            routeConf.component = component;
+        }
+
         if (type === "GET") {
-            this.routesGET[path] = {
-                path: path,
-                component: component,
-                options: options,
-            };
+            this.routesGET[path] = routeConf;
         } else if (type === "POST") {
-            this.routesPOST[path] = {
-                path: path,
-                component: component,
-                options: options,
-            };
+            this.routesPOST[path] = routeConf;
         } else if (type === "PUT") {
-            this.routesPUT[path] = {
-                path: path,
-                component: component,
-                options: options,
-            };
+            this.routesPUT[path] = routeConf;
         } else if (type === "DELETE") {
-            this.routesDELETE[path] = {
-                path: path,
-                component: component,
-                options: options,
-            };
+            this.routesDELETE[path] = routeConf;
         }
     }
 
@@ -238,7 +259,7 @@ class RouterFacade {
             return this.handleError(request, response, 404, "Not found ...");
         }
 
-        if (!route.component) {
+        if (!(route.component && typeof route.component === "function") && !(route.controller && route.method_name)) {
             return this.handleError(request, response, 404, "Missing route function ...");
         }
 
@@ -249,7 +270,18 @@ class RouterFacade {
                 return this.handleReturn(request, response, "");
             }
 
-            const result = await route.component(request, response);
+            let result = null;
+            if (route.controller && route.method_name) {
+                const controllerInstance = new route.controller();
+
+                if (!controllerInstance[route.method_name]) {
+                    return this.handleError(request, response, 404, "Unknown method '" + route.method_name + "'.");
+                }
+
+                result = await controllerInstance[route.method_name].bind(controllerInstance)(request, response);
+            } else {
+                result = await route.component(request, response);
+            }
             this.handleReturn(request, response, result);
         } catch (e: any) {
             return this.handleError(request, response, 500, e);
@@ -320,7 +352,8 @@ class RouterFacade {
                 // Content-Type Verarbeitung
                 if (contentType.includes("application/json")) {
                     try {
-                        resolve({ plain: body, parsed: JSON.parse(body.toString()) });
+                        const text = body.toString();
+                        resolve({ plain: body, parsed: text && text.trim() !== "" ? JSON.parse(text) : {} });
                     } catch (e) {
                         reject(new Error("Invalid JSON"));
                     }