@webtypen/webframez-core 0.0.29 → 0.0.30

package/.prettierrc

@@ -0,0 +1 @@
+{ "printWidth": 140 }

package/lib/LambdaApplication.d.ts

@@ -1,11 +1,9 @@
 export declare class LambdaApplication {
-    private server;
     /**
-     * Init the routes and start the http-server
+     * Init the routes and handle the request
      */
-    boot(event: any, context: any, options?: any): {
-        status: string;
-        mode: string;
-        event: any;
-    };
+    boot(event: any, context: any, options?: any): Promise<void | {
+        statusCode: number;
+        body: string;
+    }>;
 }

package/lib/LambdaApplication.js

@@ -5,7 +5,7 @@ const Config_1 = require("./Config");
 const Router_1 = require("./Router/Router");
 class LambdaApplication {
     /**
-     * Init the routes and start the http-server
+     * Init the routes and handle the request
      */
     boot(event, context, options) {
         if (options && options.config) {
@@ -18,7 +18,7 @@ class LambdaApplication {
             kernel: options && options.kernel ? options.kernel : null,
             basename: options && options.basename ? options.basename : null,
         });
-        return { status: "success", mode: "lambda", event: event };
+        return Router_1.Router.handleRequest(null, null, { event: event });
     }
 }
 exports.LambdaApplication = LambdaApplication;

package/lib/Router/Router.d.ts

@@ -85,7 +85,7 @@ declare class RouterFacade {
      * @param req
      * @returns
      */
-    dissolve(req: IncomingMessage): RouteObject | null;
+    dissolve(req: IncomingMessage | any | null): RouteObject | null;
     /**
      * Dissolves the matching route based on the request-url and an object of routes
      *
@@ -106,7 +106,10 @@ declare class RouterFacade {
      * @param req
      * @param res
      */
-    handleRequest(req: IncomingMessage, res: ServerResponse): Promise<void>;
+    handleRequest(req: null | IncomingMessage, res: null | ServerResponse, options?: any): Promise<void | {
+        statusCode: number;
+        body: string;
+    }>;
     requestConsoleLog(req: IncomingMessage, httpCode: number): void;
 }
 export declare const Router: RouterFacade;

package/lib/Router/Router.js

@@ -93,7 +93,7 @@ class RouterFacade {
      * @returns
      */
     dissolve(req) {
-        if (!req.url) {
+        if (!req || !req.url) {
             return null;
         }
         if (req.method === "GET") {
@@ -167,11 +167,7 @@ class RouterFacade {
      */
     sendError(res, code, message) {
         res.writeHead(code, { "Content-Type": "text/html" });
-        res.end(message
-            ? message
-            : code === 404
-                ? "Oops! Page not found ..."
-                : "Oops! There was an unexpected error ...");
+        res.end(message ? message : code === 404 ? "Oops! Page not found ..." : "Oops! There was an unexpected error ...");
     }
     /**
      * Processes a request
@@ -179,55 +175,93 @@ class RouterFacade {
      * @param req
      * @param res
      */
-    handleRequest(req, res) {
+    handleRequest(req, res, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            let customRequest = null;
+            if (!req && this.mode === "aws-lambda" && options && options.event) {
+                customRequest = {
+                    method: options.event.requestContext.http.method,
+                    url: options.event.requestContext.http.path,
+                    headers: options.event.requestContext.headers,
+                };
+            }
             if (!this.kernel) {
-                res.end();
+                if (res) {
+                    res.end();
+                }
                 throw new Error("Missing Kernel in Router ...");
             }
-            const route = this.dissolve(req);
+            const route = this.dissolve(customRequest !== null && this.mode === "aws-lambda" ? customRequest : req);
             const response = new Response_1.Response({ mode: this.mode });
-            response.setServerResponse(res);
+            if (res) {
+                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,
-            };
+            const bodyPlain = this.mode === "aws-lambda"
+                ? options && options.event && options.event.body
+                    ? Buffer.concat(options.event.body).toString()
+                    : null
+                : req
+                    ? yield new Promise((resolve) => {
+                        req
+                            .on("data", (chunk) => {
+                            body.push(chunk);
+                        })
+                            .on("end", () => {
+                            resolve(Buffer.concat(body).toString());
+                        });
+                    })
+                    : null;
+            const request = this.mode === "aws-lambda" && customRequest
+                ? {
+                    body: bodyPlain &&
+                        customRequest.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 : {},
+                    headers: customRequest.headers,
+                    method: customRequest.method,
+                }
+                : req
+                    ? {
+                        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,
+                    }
+                    : null;
             // Check-Middleware
-            if (route &&
-                route.options &&
-                route.options.middleware &&
-                route.options.middleware.length > 0) {
+            if (route && route.options && route.options.middleware && route.options.middleware.length > 0) {
                 for (let middlewareKey of route.options.middleware) {
                     const middleware = this.kernel.middleware[middlewareKey];
                     if (!middleware) {
-                        this.requestConsoleLog(req, 500);
-                        return this.sendError(res, 500, "Unknown middleware `" + middlewareKey + "` ...");
+                        if (this.mode === "aws-lambda") {
+                            return {
+                                statusCode: 500,
+                                body: JSON.stringify({ status: "error", message: "Unknown middleware `" + middlewareKey + "` ..." }),
+                            };
+                        }
+                        else if (req && res) {
+                            this.requestConsoleLog(req, 500);
+                            return this.sendError(res, 500, "Unknown middleware `" + middlewareKey + "` ...");
+                        }
                     }
                     try {
                         yield new Promise((resolve, reject) => {
@@ -238,27 +272,34 @@ class RouterFacade {
                             }
                             catch (e) {
                                 console.error(e);
-                                this.requestConsoleLog(req, 500);
-                                return this.sendError(res, 500, "Error in middleware `" + middlewareKey + "` ...");
+                                if (this.mode === "aws-lambda") {
+                                    return {
+                                        statusCode: 500,
+                                        body: JSON.stringify({ status: "error", message: "Middleware run error `" + middlewareKey + "` ..." }),
+                                    };
+                                }
+                                else if (req && res) {
+                                    this.requestConsoleLog(req, 500);
+                                    return this.sendError(res, 500, "Error in middleware `" + middlewareKey + "` ...");
+                                }
                             }
                         });
                     }
                     catch (e) {
                         // Send Middleware-Abort
-                        res.writeHead(e.status, typeof e.data === "object"
-                            ? { "Content-Type": "application/json" }
-                            : { "Content-Type": "text/html" });
-                        res.end(typeof e.data === "object"
-                            ? JSON.stringify(e.data)
-                            : e.data
-                                ? e.data
-                                : " ");
+                        if (this.mode === "aws-lambda") {
+                            return { statusCode: 500, body: JSON.stringify({ status: "error", message: e.data }) };
+                        }
+                        else if (res) {
+                            res.writeHead(e.status, typeof e.data === "object" ? { "Content-Type": "application/json" } : { "Content-Type": "text/html" });
+                            res.end(typeof e.data === "object" ? JSON.stringify(e.data) : e.data ? e.data : " ");
+                        }
                         return;
                     }
                 }
             }
             // Handle OPTIONS-Request
-            if (req.method === "OPTIONS") {
+            if (req && res && req.method === "OPTIONS") {
                 res.statusCode = 200;
                 res.setHeader("Content-Length", "0");
                 res.end();
@@ -270,8 +311,13 @@ class RouterFacade {
                 const split = route.component.split("@");
                 const controller = this.kernel.controller[split[0]];
                 if (!controller) {
-                    res.writeHead(500, { "Content-Type": "text/html" });
-                    res.end("Controller `" + split[0] + "` not found ...");
+                    if (this.mode === "aws-lambda") {
+                        return { statusCode: 500, body: JSON.stringify({ status: "error", message: "Controller `" + split[0] + "` not found ..." }) };
+                    }
+                    else if (res) {
+                        res.writeHead(500, { "Content-Type": "text/html" });
+                        res.end("Controller `" + split[0] + "` not found ...");
+                    }
                     return;
                 }
                 // Set Controller method as route-component
@@ -281,24 +327,38 @@ class RouterFacade {
             if (route && route.component !== undefined) {
                 try {
                     yield route.component(request, response);
-                    res.end();
-                    this.requestConsoleLog(req, 200);
+                    if (this.mode === "aws-lambda") {
+                        return { statusCode: 200, body: JSON.stringify(response.content) };
+                    }
+                    else if (res && req) {
+                        res.end();
+                        this.requestConsoleLog(req, 200);
+                    }
                 }
                 catch (e) {
                     console.error(e);
-                    this.sendError(res, 500);
-                    this.requestConsoleLog(req, 500);
+                    if (this.mode === "aws-lambda") {
+                        return { statusCode: 500, body: JSON.stringify({ status: "error", message: "Error running the component ..." }) };
+                    }
+                    else if (res && req) {
+                        this.sendError(res, 500);
+                        this.requestConsoleLog(req, 500);
+                    }
                 }
             }
             else {
-                this.sendError(res, 404);
-                this.requestConsoleLog(req, 404);
+                if (this.mode === "aws-lambda") {
+                    return { statusCode: 500, body: JSON.stringify({ status: "error", message: "Route component not found ..." }) };
+                }
+                else if (res && req) {
+                    this.sendError(res, 404);
+                    this.requestConsoleLog(req, 404);
+                }
             }
         });
     }
     requestConsoleLog(req, httpCode) {
-        if (Config_1.Config.get("application.router.requests.logConsole") !== true &&
-            !Config_1.Config.get("application.router.requests.logFile")) {
+        if (Config_1.Config.get("application.router.requests.logConsole") !== true && !Config_1.Config.get("application.router.requests.logFile")) {
             return;
         }
         const date = new Date();
@@ -340,9 +400,7 @@ class RouterFacade {
             try {
                 const filepath = Config_1.Config.get("application.router.requests.logFile");
                 if (filepath && filepath.trim() !== "") {
-                    fs_1.default.appendFileSync(filepath.trim().substring(0, 1) === "/"
-                        ? filepath
-                        : process.cwd() + "/" + filepath, logString + "\n");
+                    fs_1.default.appendFileSync(filepath.trim().substring(0, 1) === "/" ? filepath : process.cwd() + "/" + filepath, logString + "\n");
                 }
             }
             catch (e) {

package/package.json

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

package/src/LambdaApplication.ts

@@ -1,12 +1,9 @@
-import http, { Server } from "http";
 import { Config } from "./Config";
 import { Router } from "./Router/Router";
 
 export class LambdaApplication {
-  private server!: Server;
-
   /**
-   * Init the routes and start the http-server
+   * Init the routes and handle the request
    */
   boot(event: any, context: any, options?: any) {
     if (options && options.config) {
@@ -21,6 +18,6 @@ export class LambdaApplication {
       basename: options && options.basename ? options.basename : null,
     });
 
-    return { status: "success", mode: "lambda", event: event };
+    return Router.handleRequest(null, null, { event: event });
   }
 }

package/src/Router/Router.ts

@@ -122,8 +122,8 @@ class RouterFacade {
    * @param req
    * @returns
    */
-  dissolve(req: IncomingMessage): RouteObject | null {
-    if (!req.url) {
+  dissolve(req: IncomingMessage | any | null): RouteObject | null {
+    if (!req || !req.url) {
       return null;
     }
 
@@ -196,13 +196,7 @@ class RouterFacade {
    */
   sendError(res: ServerResponse, code: number, message?: string) {
     res.writeHead(code, { "Content-Type": "text/html" });
-    res.end(
-      message
-        ? message
-        : code === 404
-        ? "Oops! Page not found ..."
-        : "Oops! There was an unexpected error ..."
-    );
+    res.end(message ? message : code === 404 ? "Oops! Page not found ..." : "Oops! There was an unexpected error ...");
   }
 
   /**
@@ -211,65 +205,100 @@ class RouterFacade {
    * @param req
    * @param res
    */
-  async handleRequest(req: IncomingMessage, res: ServerResponse) {
+  async handleRequest(req: null | IncomingMessage, res: null | ServerResponse, options?: any) {
+    let customRequest = null;
+    if (!req && this.mode === "aws-lambda" && options && options.event) {
+      customRequest = {
+        method: options.event.requestContext.http.method,
+        url: options.event.requestContext.http.path,
+        headers: options.event.requestContext.headers,
+      };
+    }
+
     if (!this.kernel) {
-      res.end();
+      if (res) {
+        res.end();
+      }
       throw new Error("Missing Kernel in Router ...");
     }
 
-    const route = this.dissolve(req);
+    const route = this.dissolve(customRequest !== null && this.mode === "aws-lambda" ? customRequest : req);
     const response = new Response({ mode: this.mode });
-    response.setServerResponse(res);
+    if (res) {
+      response.setServerResponse(res);
+    }
 
     // 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,
-    };
+    const bodyPlain: any =
+      this.mode === "aws-lambda"
+        ? options && options.event && options.event.body
+          ? Buffer.concat(options.event.body).toString()
+          : null
+        : req
+        ? await new Promise((resolve: Function) => {
+            req
+              .on("data", (chunk) => {
+                body.push(chunk);
+              })
+              .on("end", () => {
+                resolve(Buffer.concat(body).toString());
+              });
+          })
+        : null;
+
+    const request =
+      this.mode === "aws-lambda" && customRequest
+        ? {
+            body:
+              bodyPlain &&
+              customRequest.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 : {},
+            headers: customRequest.headers,
+            method: customRequest.method,
+          }
+        : req
+        ? {
+            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,
+          }
+        : null;
 
     // Check-Middleware
-    if (
-      route &&
-      route.options &&
-      route.options.middleware &&
-      route.options.middleware.length > 0
-    ) {
+    if (route && route.options && route.options.middleware && route.options.middleware.length > 0) {
       for (let middlewareKey of route.options.middleware) {
         const middleware = this.kernel.middleware[middlewareKey];
         if (!middleware) {
-          this.requestConsoleLog(req, 500);
-          return this.sendError(
-            res,
-            500,
-            "Unknown middleware `" + middlewareKey + "` ..."
-          );
+          if (this.mode === "aws-lambda") {
+            return {
+              statusCode: 500,
+              body: JSON.stringify({ status: "error", message: "Unknown middleware `" + middlewareKey + "` ..." }),
+            };
+          } else if (req && res) {
+            this.requestConsoleLog(req, 500);
+            return this.sendError(res, 500, "Unknown middleware `" + middlewareKey + "` ...");
+          }
         }
 
         try {
@@ -286,36 +315,32 @@ class RouterFacade {
             } catch (e) {
               console.error(e);
 
-              this.requestConsoleLog(req, 500);
-              return this.sendError(
-                res,
-                500,
-                "Error in middleware `" + middlewareKey + "` ..."
-              );
+              if (this.mode === "aws-lambda") {
+                return {
+                  statusCode: 500,
+                  body: JSON.stringify({ status: "error", message: "Middleware run error `" + middlewareKey + "` ..." }),
+                };
+              } else if (req && res) {
+                this.requestConsoleLog(req, 500);
+                return this.sendError(res, 500, "Error in middleware `" + middlewareKey + "` ...");
+              }
             }
           });
         } catch (e: any) {
           // Send Middleware-Abort
-          res.writeHead(
-            e.status,
-            typeof e.data === "object"
-              ? { "Content-Type": "application/json" }
-              : { "Content-Type": "text/html" }
-          );
-          res.end(
-            typeof e.data === "object"
-              ? JSON.stringify(e.data)
-              : e.data
-              ? e.data
-              : " "
-          );
+          if (this.mode === "aws-lambda") {
+            return { statusCode: 500, body: JSON.stringify({ status: "error", message: e.data }) };
+          } else if (res) {
+            res.writeHead(e.status, typeof e.data === "object" ? { "Content-Type": "application/json" } : { "Content-Type": "text/html" });
+            res.end(typeof e.data === "object" ? JSON.stringify(e.data) : e.data ? e.data : " ");
+          }
           return;
         }
       }
     }
 
     // Handle OPTIONS-Request
-    if (req.method === "OPTIONS") {
+    if (req && res && req.method === "OPTIONS") {
       res.statusCode = 200;
       res.setHeader("Content-Length", "0");
       res.end();
@@ -328,8 +353,13 @@ class RouterFacade {
       const split = route.component.split("@");
       const controller = this.kernel.controller[split[0]];
       if (!controller) {
-        res.writeHead(500, { "Content-Type": "text/html" });
-        res.end("Controller `" + split[0] + "` not found ...");
+        if (this.mode === "aws-lambda") {
+          return { statusCode: 500, body: JSON.stringify({ status: "error", message: "Controller `" + split[0] + "` not found ..." }) };
+        } else if (res) {
+          res.writeHead(500, { "Content-Type": "text/html" });
+          res.end("Controller `" + split[0] + "` not found ...");
+        }
+
         return;
       }
 
@@ -341,24 +371,35 @@ class RouterFacade {
     if (route && route.component !== undefined) {
       try {
         await route.component(request, response);
-        res.end();
-        this.requestConsoleLog(req, 200);
+
+        if (this.mode === "aws-lambda") {
+          return { statusCode: 200, body: JSON.stringify(response.content) };
+        } else if (res && req) {
+          res.end();
+          this.requestConsoleLog(req, 200);
+        }
       } catch (e) {
         console.error(e);
-        this.sendError(res, 500);
-        this.requestConsoleLog(req, 500);
+
+        if (this.mode === "aws-lambda") {
+          return { statusCode: 500, body: JSON.stringify({ status: "error", message: "Error running the component ..." }) };
+        } else if (res && req) {
+          this.sendError(res, 500);
+          this.requestConsoleLog(req, 500);
+        }
       }
     } else {
-      this.sendError(res, 404);
-      this.requestConsoleLog(req, 404);
+      if (this.mode === "aws-lambda") {
+        return { statusCode: 500, body: JSON.stringify({ status: "error", message: "Route component not found ..." }) };
+      } else if (res && req) {
+        this.sendError(res, 404);
+        this.requestConsoleLog(req, 404);
+      }
     }
   }
 
   requestConsoleLog(req: IncomingMessage, httpCode: number) {
-    if (
-      Config.get("application.router.requests.logConsole") !== true &&
-      !Config.get("application.router.requests.logFile")
-    ) {
+    if (Config.get("application.router.requests.logConsole") !== true && !Config.get("application.router.requests.logFile")) {
       return;
     }
 
@@ -404,12 +445,7 @@ class RouterFacade {
       try {
         const filepath = Config.get("application.router.requests.logFile");
         if (filepath && filepath.trim() !== "") {
-          fs.appendFileSync(
-            filepath.trim().substring(0, 1) === "/"
-              ? filepath
-              : process.cwd() + "/" + filepath,
-            logString + "\n"
-          );
+          fs.appendFileSync(filepath.trim().substring(0, 1) === "/" ? filepath : process.cwd() + "/" + filepath, logString + "\n");
         }
       } catch (e) {
         console.error(e);