@webtypen/webframez-core 0.0.11 → 0.0.13

package/lib/Router/Router.d.ts

@@ -9,6 +9,10 @@ type RouteObject = {
     params: object;
 };
 declare class RouterFacade {
+    /**
+     * Basename
+     */
+    basename: string | null;
     /**
      * GET Route Store
      */
@@ -57,7 +61,7 @@ declare class RouterFacade {
      * Load the application-routes
      *
      */
-    init(): void;
+    init(options?: any): void;
     /**
      * Register a route
      *

package/lib/Router/Router.js

@@ -19,6 +19,10 @@ const Response_1 = require("./Response");
 const Kernel_1 = require("../../../../../app/Kernel");
 class RouterFacade {
     constructor() {
+        /**
+         * Basename
+         */
+        this.basename = null;
         /**
          * GET Route Store
          */
@@ -40,7 +44,8 @@ class RouterFacade {
      * Load the application-routes
      *
      */
-    init() {
+    init(options) {
+        this.basename = options && options.basename ? options.basename : null;
         // Load routes
         require(process.cwd() + "/app/routes");
     }
@@ -53,6 +58,9 @@ class RouterFacade {
      * @param options
      */
     register(type, path, component, options) {
+        if (this.basename) {
+            path = this.basename + path;
+        }
         if (type === "GET") {
             this.routesGET[path] = {
                 path: path,
@@ -91,16 +99,16 @@ class RouterFacade {
             return this.dissolveRoute(this.routesDELETE, req.url);
         }
         else if (req.method === "OPTIONS") {
-            if (req.headers['access-control-request-method'] === 'GET') {
+            if (req.headers["access-control-request-method"] === "GET") {
                 return this.dissolveRoute(this.routesGET, req.url);
             }
-            else if (req.headers['access-control-request-method'] === 'POST') {
+            else if (req.headers["access-control-request-method"] === "POST") {
                 return this.dissolveRoute(this.routesPOST, req.url);
             }
-            else if (req.headers['access-control-request-method'] === 'PUT') {
+            else if (req.headers["access-control-request-method"] === "PUT") {
                 return this.dissolveRoute(this.routesPUT, req.url);
             }
-            else if (req.headers['access-control-request-method'] === 'DELETE') {
+            else if (req.headers["access-control-request-method"] === "DELETE") {
                 return this.dissolveRoute(this.routesDELETE, req.url);
             }
         }
@@ -206,7 +214,7 @@ class RouterFacade {
             // Handle OPTIONS-Request
             if (req.method === "OPTIONS") {
                 res.statusCode = 200;
-                res.setHeader('Content-Length', '0');
+                res.setHeader("Content-Length", "0");
                 res.end();
                 return;
             }
@@ -238,7 +246,8 @@ class RouterFacade {
                     yield route.component({
                         body: bodyPlain &&
                             req.headers["content-type"] === "application/json" &&
-                            (bodyPlain.trim().substring(0, 1) === "[" || bodyPlain.trim().substring(0, 1) === "{")
+                            (bodyPlain.trim().substring(0, 1) === "[" ||
+                                bodyPlain.trim().substring(0, 1) === "{")
                             ? JSON.parse(bodyPlain)
                             : bodyPlain
                                 ? qs_1.default.parse(bodyPlain)

package/lib/WebApplication.d.ts

@@ -3,5 +3,5 @@ export declare class WebApplication {
     /**
      * Init the routes and start the http-server
      */
-    boot(): void;
+    boot(options?: any): void;
 }

package/lib/WebApplication.js

@@ -10,14 +10,15 @@ class WebApplication {
     /**
      * Init the routes and start the http-server
      */
-    boot() {
+    boot(options) {
         Router_1.Router.init();
+        const port = options && options.port ? options.port : 3000;
         this.server = http_1.default
             .createServer((req, res) => {
             Router_1.Router.handleRequest(req, res);
         })
-            .listen(3000, () => {
-            console.log("Server started and listening on port 3000");
+            .listen(port, () => {
+            console.log("Server started and listening on port " + port);
         });
     }
 }

package/package.json

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

@@ -12,6 +12,11 @@ type RouteObject = {
 };
 
 class RouterFacade {
+  /**
+   * Basename
+   */
+  basename: string | null = null;
+
   /**
    * GET Route Store
    */
@@ -64,7 +69,9 @@ class RouterFacade {
    * Load the application-routes
    *
    */
-  init() {
+  init(options?: any) {
+    this.basename = options && options.basename ? options.basename : null;
+
     // Load routes
     require(process.cwd() + "/app/routes");
   }
@@ -78,6 +85,10 @@ class RouterFacade {
    * @param options
    */
   register(type: string, path: string, component: any, options: object) {
+    if (this.basename) {
+      path = this.basename + path;
+    }
+
     if (type === "GET") {
       this.routesGET[path] = {
         path: path,
@@ -113,13 +124,13 @@ class RouterFacade {
     } else if (req.method === "DELETE") {
       return this.dissolveRoute(this.routesDELETE, req.url);
     } else if (req.method === "OPTIONS") {
-      if (req.headers['access-control-request-method'] === 'GET') {
+      if (req.headers["access-control-request-method"] === "GET") {
         return this.dissolveRoute(this.routesGET, req.url);
-      } else if(req.headers['access-control-request-method'] === 'POST') {
+      } else if (req.headers["access-control-request-method"] === "POST") {
         return this.dissolveRoute(this.routesPOST, req.url);
-      } else if(req.headers['access-control-request-method'] === 'PUT') {
+      } else if (req.headers["access-control-request-method"] === "PUT") {
         return this.dissolveRoute(this.routesPUT, req.url);
-      } else if(req.headers['access-control-request-method'] === 'DELETE') {
+      } else if (req.headers["access-control-request-method"] === "DELETE") {
         return this.dissolveRoute(this.routesDELETE, req.url);
       }
     }
@@ -189,10 +200,10 @@ class RouterFacade {
    * @param res
    */
   async handleRequest(req: IncomingMessage, res: ServerResponse) {
-    const route = this.dissolve(req);    
+    const route = this.dissolve(req);
     const response = new Response();
     response.setServerResponse(res);
-    
+
     // Check-Middleware
     if (
       route &&
@@ -210,7 +221,6 @@ class RouterFacade {
           );
         }
 
-
         try {
           await new Promise((resolve, reject) => {
             try {
@@ -254,10 +264,10 @@ class RouterFacade {
 
     // Handle OPTIONS-Request
     if (req.method === "OPTIONS") {
-        res.statusCode = 200;
-        res.setHeader('Content-Length', '0');
-        res.end();
-        return;
+      res.statusCode = 200;
+      res.setHeader("Content-Length", "0");
+      res.end();
+      return;
     }
 
     // Resolve route-component (handle controller definition)
@@ -291,13 +301,14 @@ class RouterFacade {
         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 &&
+              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,

package/src/WebApplication.ts

@@ -7,15 +7,16 @@ export class WebApplication {
   /**
    * Init the routes and start the http-server
    */
-  boot() {
+  boot(options?: any) {
     Router.init();
 
+    const port = options && options.port ? options.port : 3000;
     this.server = http
       .createServer((req, res) => {
         Router.handleRequest(req, res);
       })
-      .listen(3000, () => {
-        console.log("Server started and listening on port 3000");
+      .listen(port, () => {
+        console.log("Server started and listening on port " + port);
       });
   }
 }