@webtypen/webframez-core 0.0.8 → 0.0.10

package/lib/Router/Router.js

@@ -90,6 +90,20 @@ 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') {
+                return this.dissolveRoute(this.routesGET, req.url);
+            }
+            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') {
+                return this.dissolveRoute(this.routesPUT, req.url);
+            }
+            else if (req.headers['access-control-request-method'] === 'DELETE') {
+                return this.dissolveRoute(this.routesDELETE, req.url);
+            }
+        }
         return null;
     }
     /**
@@ -189,6 +203,13 @@ class RouterFacade {
                     }
                 }
             }
+            // Handle OPTIONS-Request
+            if (req.method === "OPTIONS") {
+                res.statusCode = 200;
+                res.setHeader('Content-Length', '0');
+                res.end();
+                return;
+            }
             // Resolve route-component (handle controller definition)
             if (route && typeof route.component === "string") {
                 const split = route.component.split("@");
@@ -215,7 +236,13 @@ class RouterFacade {
                 });
                 try {
                     yield route.component({
-                        body: bodyPlain ? qs_1.default.parse(bodyPlain) : {},
+                        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,

package/package.json

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

@@ -112,6 +112,16 @@ class RouterFacade {
       return this.dissolveRoute(this.routesPUT, req.url);
     } 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') {
+        return this.dissolveRoute(this.routesGET, req.url);
+      } 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') {
+        return this.dissolveRoute(this.routesPUT, req.url);
+      } else if(req.headers['access-control-request-method'] === 'DELETE') {
+        return this.dissolveRoute(this.routesDELETE, req.url);
+      }
     }
     return null;
   }
@@ -242,6 +252,14 @@ class RouterFacade {
       }
     }
 
+    // Handle OPTIONS-Request
+    if (req.method === "OPTIONS") {
+        res.statusCode = 200;
+        res.setHeader('Content-Length', '0');
+        res.end();
+        return;
+    }
+
     // Resolve route-component (handle controller definition)
     if (route && typeof route.component === "string") {
       const split = route.component.split("@");
@@ -272,7 +290,14 @@ class RouterFacade {
       try {
         await route.component(
           {
-            body: bodyPlain ? qs.parse(bodyPlain) : {},
+            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,