@webtypen/webframez-core 0.0.46 → 0.0.48

package/lib/LambdaApplication.d.ts

@@ -4,7 +4,7 @@ export declare class LambdaApplication {
      */
     boot(event: any, context: any, options?: any): Promise<void | {
         statusCode: number;
-        body: string;
+        body: any;
         headers: {
             [key: string]: string;
         };

package/lib/Router/Router.d.ts

@@ -108,7 +108,7 @@ declare class RouterFacade {
      */
     handleRequest(req: null | IncomingMessage, res: null | ServerResponse, options?: any): Promise<void | {
         statusCode: number;
-        body: string;
+        body: any;
         headers: {
             [key: string]: string;
         };

package/lib/Router/Router.js

@@ -190,8 +190,12 @@ class RouterFacade {
             if (!req && this.mode === "aws-lambda" && options && options.event) {
                 customRequest = {
                     method: options.event.requestContext.http.method,
-                    url: options.event.requestContext.http.path,
+                    url: options.event.rawPath +
+                        (options.event.rawQueryString && options.event.rawQueryString.trim() !== '' ?
+                            "?" + options.event.rawQueryString
+                            : ""),
                     headers: options.event.headers,
+                    urlParams: options.event.queryStringParameters ? options.event.queryStringParameters : {},
                 };
             }
             if (!this.kernel) {
@@ -223,16 +227,18 @@ class RouterFacade {
                     })
                     : null;
             const urlParams = {};
-            if (req && req.url && req.url.indexOf("?") > 0) {
-                const temp = req.url.substring(req.url.indexOf("?") + 1);
-                if (temp && temp.trim() !== "") {
-                    const entries = temp.split("&");
-                    for (let entry of entries) {
-                        if (entry.indexOf("=") > 0) {
-                            urlParams[entry.substring(0, entry.indexOf("="))] = entry.substring(entry.indexOf("=") + 1);
-                        }
-                        else {
-                            urlParams[entry] = true;
+            if (!customRequest) {
+                if (req && req.url && req.url.indexOf("?") > 0) {
+                    const temp = req.url.substring(req.url.indexOf("?") + 1);
+                    if (temp && temp.trim() !== "") {
+                        const entries = temp.split("&");
+                        for (let entry of entries) {
+                            if (entry.indexOf("=") > 0) {
+                                urlParams[entry.substring(0, entry.indexOf("="))] = entry.substring(entry.indexOf("=") + 1);
+                            }
+                            else {
+                                urlParams[entry] = true;
+                            }
                         }
                     }
                 }
@@ -251,7 +257,8 @@ class RouterFacade {
                             : {},
                     bodyPlain: bodyPlain,
                     params: route && route.params ? route.params : {},
-                    urlParams: urlParams,
+                    url: customRequest.url,
+                    urlParams: customRequest.urlParams,
                     headers: customRequest.headers,
                     method: customRequest.method,
                 }
@@ -398,7 +405,7 @@ class RouterFacade {
                     if (this.mode === "aws-lambda") {
                         return {
                             statusCode: response.statusCode,
-                            body: JSON.stringify(response.content),
+                            body: typeof response.content === "object" ? JSON.stringify(response.content) : response.content,
                             headers: response.headers,
                         };
                     }
@@ -414,6 +421,7 @@ class RouterFacade {
                             body: JSON.stringify({
                                 status: "error",
                                 message: "Error running the component ...",
+                                error: e.toString(),
                             }),
                             headers: response.headers,
                         };

package/package.json

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

@@ -227,8 +227,14 @@ class RouterFacade {
     if (!req && this.mode === "aws-lambda" && options && options.event) {
       customRequest = {
         method: options.event.requestContext.http.method,
-        url: options.event.requestContext.http.path,
+        url:
+          options.event.rawPath +
+          (options.event.rawQueryString  && options.event.rawQueryString.trim() !== '' ?
+            "?" + options.event.rawQueryString
+            : ""
+          ),
         headers: options.event.headers,
+        urlParams: options.event.queryStringParameters ? options.event.queryStringParameters : {},
       };
     }
 
@@ -267,17 +273,19 @@ class RouterFacade {
         : null;
 
     const urlParams: any = {};
-    if (req && req.url && req.url.indexOf("?") > 0) {
-      const temp = req.url.substring(req.url.indexOf("?") + 1);
-      if (temp && temp.trim() !== "") {
-        const entries = temp.split("&");
-        for (let entry of entries) {
-          if (entry.indexOf("=") > 0) {
-            urlParams[entry.substring(0, entry.indexOf("="))] = entry.substring(
-              entry.indexOf("=") + 1
-            );
-          } else {
-            urlParams[entry] = true;
+    if (!customRequest) {
+      if (req && req.url && req.url.indexOf("?") > 0) {
+        const temp = req.url.substring(req.url.indexOf("?") + 1);
+        if (temp && temp.trim() !== "") {
+          const entries = temp.split("&");
+          for (let entry of entries) {
+            if (entry.indexOf("=") > 0) {
+              urlParams[entry.substring(0, entry.indexOf("="))] = entry.substring(
+                entry.indexOf("=") + 1
+              );
+            } else {
+              urlParams[entry] = true;
+            }
           }
         }
       }
@@ -299,10 +307,10 @@ class RouterFacade {
                       : bodyPlain
                   )
                 : {},
-
             bodyPlain: bodyPlain,
             params: route && route.params ? route.params : {},
-            urlParams: urlParams,
+            url: customRequest.url,
+            urlParams: customRequest.urlParams,
             headers: customRequest.headers,
             method: customRequest.method,
           }
@@ -472,20 +480,21 @@ class RouterFacade {
         if (this.mode === "aws-lambda") {
           return {
             statusCode: response.statusCode,
-            body: JSON.stringify(response.content),
+            body: typeof response.content === "object" ? JSON.stringify(response.content) : response.content,
             headers: response.headers,
           };
         } else if (res && req) {
           res.end();
           this.requestConsoleLog(req, response.statusCode);
         }
-      } catch (e) {
+      } catch (e: any) {
         if (this.mode === "aws-lambda") {
           return {
             statusCode: 500,
             body: JSON.stringify({
               status: "error",
               message: "Error running the component ...",
+              error: e.toString(),
             }),
             headers: response.headers,
           };