@webtypen/webframez-core 0.0.14 → 0.0.16

package/lib/BaseKernelConsole.d.ts

@@ -0,0 +1,3 @@
+export declare class BaseKernelConsole {
+    static commands: any;
+}

package/lib/BaseKernelConsole.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseKernelConsole = void 0;
+class BaseKernelConsole {
+}
+exports.BaseKernelConsole = BaseKernelConsole;
+BaseKernelConsole.commands = [];

package/lib/BaseKernelWeb.d.ts

@@ -0,0 +1,9 @@
+import { Controller } from "./Controller/Controller";
+export declare class BaseKernelWeb {
+    static controller: {
+        [key: string]: Controller;
+    };
+    static middleware: {
+        [key: string]: any;
+    };
+}

package/lib/BaseKernelWeb.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseKernelWeb = void 0;
+class BaseKernelWeb {
+}
+exports.BaseKernelWeb = BaseKernelWeb;
+BaseKernelWeb.controller = {};

package/lib/Config.d.ts

@@ -0,0 +1,16 @@
+type ConfigType = {
+    key: string;
+    component: any;
+};
+declare class ConfigFacade {
+    configs: {
+        [key: string]: any;
+    };
+    register(key: string | ConfigType[], component: {
+        [key: string]: any;
+    }): this;
+    get(key: string): any;
+    set(path: string, value: any | null | undefined): this;
+}
+export declare const Config: ConfigFacade;
+export {};

package/lib/Config.js

@@ -0,0 +1,36 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Config = void 0;
+const lodash_1 = __importDefault(require("lodash"));
+class ConfigFacade {
+    constructor() {
+        this.configs = {};
+    }
+    register(key, component) {
+        if (typeof key === "string") {
+            this.configs[key] = component;
+        }
+        else if (Array.isArray(key)) {
+            for (let conf of key) {
+                if (!conf.key || !conf.component) {
+                    continue;
+                }
+                this.configs[conf.key] = conf.component;
+            }
+        }
+        return this;
+    }
+    get(key) {
+        return lodash_1.default.get(this.configs, key);
+    }
+    set(path, value) {
+        const newConfig = Object.assign({}, this.configs);
+        lodash_1.default.set(newConfig, path, value);
+        this.configs = newConfig;
+        return this;
+    }
+}
+exports.Config = new ConfigFacade();

package/lib/Database/DBConnection.js

@@ -8,29 +8,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DBConnection = void 0;
 // @ts-ignore
-const database_1 = __importDefault(require("../../../../../config/database"));
+const Config_1 = require("../Config");
 const DBDrivers_1 = require("./DBDrivers");
 class DBConnectionFacade {
     constructor() {
         this.connections = {};
     }
     getConnectionConfig(connection) {
+        const dbconfig = Config_1.Config.get("database");
+        if (!dbconfig) {
+            throw new Error("Missing database-config ...");
+        }
         if (!connection) {
-            connection = database_1.default.defaultConnection;
+            connection = dbconfig.defaultConnection;
         }
         if (!connection ||
-            !database_1.default ||
-            !database_1.default.connections ||
-            !database_1.default.connections[connection]) {
+            !dbconfig ||
+            !dbconfig.connections ||
+            !dbconfig.connections[connection]) {
             throw new Error("No connection given ...");
         }
-        return database_1.default.connections[connection];
+        return dbconfig.connections[connection];
     }
     getConnectionDriver(connection) {
         const config = this.getConnectionConfig(connection);
@@ -44,8 +45,12 @@ class DBConnectionFacade {
     }
     getConnection(connectionName) {
         return __awaiter(this, void 0, void 0, function* () {
+            const dbconfig = Config_1.Config.get("database");
+            if (!dbconfig) {
+                throw new Error("Missing database-config ...");
+            }
             if (!connectionName) {
-                connectionName = database_1.default.defaultConnection;
+                connectionName = dbconfig.defaultConnection;
             }
             if (!connectionName) {
                 return null;

package/lib/Database/QueryBuilder.d.ts

@@ -4,9 +4,9 @@ export declare class QueryBuilder {
     queryTable: string;
     mode: string;
     modelMapping: null;
-    setModelMapping(model?: any | null): void;
-    table(table: string): void;
-    where(column: any, operator: any, value: any): void;
+    setModelMapping(model?: any | null): this;
+    table(table: string): this;
+    where(column: any, operator: any, value: any): this;
     get(options?: any): Promise<any>;
     first(options?: any): Promise<any>;
     delete(options?: {

package/lib/Database/QueryBuilder.js

@@ -21,9 +21,11 @@ class QueryBuilder {
     }
     setModelMapping(model) {
         this.modelMapping = model;
+        return this;
     }
     table(table) {
         this.queryTable = table;
+        return this;
     }
     where(column, operator, value) {
         this.query.push({
@@ -32,6 +34,7 @@ class QueryBuilder {
             operator: operator,
             value: value,
         });
+        return this;
     }
     get(options) {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/Router/Request.d.ts

@@ -1,4 +1,5 @@
 export type Request = {
+    [key: string]: any;
     body?: any;
     bodyPlain?: any;
     params: object;

package/lib/Router/Router.d.ts

@@ -13,6 +13,10 @@ declare class RouterFacade {
      * Basename
      */
     basename: string | null;
+    /**
+     * Kernel-Class
+     */
+    kernel: any | null;
     /**
      * GET Route Store
      */
@@ -99,6 +103,7 @@ declare class RouterFacade {
      * @param res
      */
     handleRequest(req: IncomingMessage, res: ServerResponse): Promise<void>;
+    requestConsoleLog(req: IncomingMessage): void;
 }
 export declare const Router: RouterFacade;
 export {};

package/lib/Router/Router.js

@@ -15,14 +15,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Router = void 0;
 const qs_1 = __importDefault(require("qs"));
 const Response_1 = require("./Response");
-// @ts-ignore
-const Kernel_1 = require("../../../../../app/Kernel");
+const Config_1 = require("../Config");
 class RouterFacade {
     constructor() {
         /**
          * Basename
          */
         this.basename = null;
+        /**
+         * Kernel-Class
+         */
+        this.kernel = null;
         /**
          * GET Route Store
          */
@@ -46,8 +49,11 @@ class RouterFacade {
      */
     init(options) {
         this.basename = options && options.basename ? options.basename : null;
+        this.kernel = options && options.kernel ? options.kernel : null;
         // Load routes
+        console.log("loadRoutes");
         require(process.cwd() + "/app/routes");
+        console.log("finishRoutes");
     }
     /**
      * Register a route
@@ -174,13 +180,16 @@ class RouterFacade {
             const route = this.dissolve(req);
             const response = new Response_1.Response();
             response.setServerResponse(res);
+            if (!this.kernel) {
+                throw new Error("Missing Kernel in Router ...");
+            }
             // Check-Middleware
             if (route &&
                 route.options &&
                 route.options.middleware &&
                 route.options.middleware.length > 0) {
                 for (let middlewareKey of route.options.middleware) {
-                    const middleware = Kernel_1.Kernel.middleware[middlewareKey];
+                    const middleware = this.kernel.middleware[middlewareKey];
                     if (!middleware) {
                         return this.sendError(res, 500, "Unknown middleware `" + middlewareKey + "` ...");
                     }
@@ -221,7 +230,7 @@ class RouterFacade {
             // Resolve route-component (handle controller definition)
             if (route && typeof route.component === "string") {
                 const split = route.component.split("@");
-                const controller = Kernel_1.Kernel.controller[split[0]];
+                const controller = this.kernel.controller[split[0]];
                 if (!controller) {
                     res.writeHead(500, { "Content-Type": "text/html" });
                     res.end("Controller `" + split[0] + "` not found ...");
@@ -274,5 +283,40 @@ class RouterFacade {
             }
         });
     }
+    requestConsoleLog(req) {
+        if (Config_1.Config.get("router.requests.logConsole") !== true) {
+            return;
+        }
+        const date = new Date();
+        const month = date.getMonth() + 1;
+        const ip = req.headers["x-forwarded-for"]
+            ? req.headers["x-forwarded-for"]
+            : req.headers["x-forwarded"]
+                ? req.headers["x-forwarded"]
+                : req.headers["forwarded-for"]
+                    ? req.headers["forwarded-for"]
+                    : req.socket && req.socket.remoteAddress
+                        ? req.socket.remoteAddress
+                        : null;
+        console.log('{ date: "' +
+            date.getFullYear() +
+            "-" +
+            (month < 10 ? "0" + month : month) +
+            "-" +
+            date.getDate() +
+            " " +
+            (date.getHours() + 1) +
+            ":" +
+            date.getMinutes() +
+            ":" +
+            date.getSeconds() +
+            '", method: "' +
+            req.method +
+            '", url: "' +
+            req.url +
+            '", ip: "' +
+            ip +
+            '" }');
+    }
 }
 exports.Router = new RouterFacade();

package/lib/WebApplication.js

@@ -5,13 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebApplication = void 0;
 const http_1 = __importDefault(require("http"));
+const Config_1 = require("./Config");
 const Router_1 = require("./Router/Router");
 class WebApplication {
     /**
      * Init the routes and start the http-server
      */
     boot(options) {
+        if (options && options.config) {
+            for (let key in options.config) {
+                Config_1.Config.register(key, options.config[key]);
+            }
+        }
         Router_1.Router.init({
+            kernel: options && options.kernel ? options.kernel : null,
             basename: options && options.basename ? options.basename : null,
         });
         const port = options && options.port ? options.port : 3000;
@@ -20,7 +27,11 @@ class WebApplication {
             Router_1.Router.handleRequest(req, res);
         })
             .listen(port, () => {
-            console.log("Server started and listening on port " + port);
+            console.log("Server started and listening on port " +
+                port +
+                (options && options.basename
+                    ? " (Basename: " + options && options.basename + ")"
+                    : ""));
         });
     }
 }

package/lib/index.d.ts

@@ -1,4 +1,6 @@
-export * from "./BaseKernel";
+export * from "./Config";
+export * from "./BaseKernelWeb";
+export * from "./BaseKernelConsole";
 export * from "./Controller/Controller";
 export * from "./Database/Model";
 export * from "./WebApplication";

package/lib/index.js

@@ -14,7 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./BaseKernel"), exports);
+__exportStar(require("./Config"), exports);
+__exportStar(require("./BaseKernelWeb"), exports);
+__exportStar(require("./BaseKernelConsole"), exports);
 __exportStar(require("./Controller/Controller"), exports);
 __exportStar(require("./Database/Model"), exports);
 __exportStar(require("./WebApplication"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-core",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
   "homepage": "https://webtypen.de/",
   "license": "MIT",
@@ -22,6 +22,7 @@
     "build:check": "tsc --noEmit"
   },
   "devDependencies": {
+    "@types/lodash": "^4.14.190",
     "@types/node": "^18.11.9",
     "@types/qs": "^6.9.7",
     "ts-node": "^10.9.1",

package/src/BaseKernelConsole.ts

@@ -0,0 +1,3 @@
+export class BaseKernelConsole {
+  static commands: any = [];
+}

package/src/{BaseKernel.ts → BaseKernelWeb.ts}

@@ -1,7 +1,6 @@
 import { Controller } from "./Controller/Controller";
 
-export class BaseKernel {
-  static commands = [];
+export class BaseKernelWeb {
   static controller: { [key: string]: Controller } = {};
   static middleware: { [key: string]: any };
 }

package/src/Config.ts

@@ -0,0 +1,37 @@
+import lodash from "lodash";
+
+type ConfigType = {
+  key: string;
+  component: any;
+};
+
+class ConfigFacade {
+  configs: { [key: string]: any } = {};
+
+  register(key: string | ConfigType[], component: { [key: string]: any }) {
+    if (typeof key === "string") {
+      this.configs[key] = component;
+    } else if (Array.isArray(key)) {
+      for (let conf of key) {
+        if (!conf.key || !conf.component) {
+          continue;
+        }
+        this.configs[conf.key] = conf.component;
+      }
+    }
+    return this;
+  }
+
+  get(key: string) {
+    return lodash.get(this.configs, key);
+  }
+
+  set(path: string, value: any | null | undefined) {
+    const newConfig = { ...this.configs };
+    lodash.set(newConfig, path, value);
+    this.configs = newConfig;
+    return this;
+  }
+}
+
+export const Config = new ConfigFacade();

package/src/Database/DBConnection.ts

@@ -1,5 +1,5 @@
 // @ts-ignore
-import dbconfig from "../../../../../config/database";
+import { Config } from "../Config";
 import { DBDrivers } from "./DBDrivers";
 import { QueryBuilder } from "./QueryBuilder";
 
@@ -7,6 +7,12 @@ class DBConnectionFacade {
   connections: { [key: string]: any } = {};
 
   getConnectionConfig(connection: string) {
+    const dbconfig = Config.get("database");
+
+    if (!dbconfig) {
+      throw new Error("Missing database-config ...");
+    }
+
     if (!connection) {
       connection = dbconfig.defaultConnection;
     }
@@ -36,6 +42,12 @@ class DBConnectionFacade {
   }
 
   async getConnection(connectionName?: string) {
+    const dbconfig = Config.get("database");
+
+    if (!dbconfig) {
+      throw new Error("Missing database-config ...");
+    }
+
     if (!connectionName) {
       connectionName = dbconfig.defaultConnection;
     }

package/src/Database/QueryBuilder.ts

@@ -10,10 +10,12 @@ export class QueryBuilder {
 
   setModelMapping(model?: any | null) {
     this.modelMapping = model;
+    return this;
   }
 
   table(table: string) {
     this.queryTable = table;
+    return this;
   }
 
   where(column: any, operator: any, value: any) {
@@ -23,6 +25,7 @@ export class QueryBuilder {
       operator: operator,
       value: value,
     });
+    return this;
   }
 
   async get(options?: any) {

package/src/Router/Request.ts

@@ -1,4 +1,5 @@
 export type Request = {
+  [key: string]: any;
   body?: any;
   bodyPlain?: any;
   params: object;

package/src/Router/Router.ts

@@ -1,8 +1,7 @@
 import qs from "qs";
 import { IncomingMessage, ServerResponse } from "http";
 import { Response } from "./Response";
-// @ts-ignore
-import { Kernel } from "../../../../../app/Kernel";
+import { Config } from "../Config";
 
 type RouteObject = {
   path: string;
@@ -17,6 +16,11 @@ class RouterFacade {
    */
   basename: string | null = null;
 
+  /**
+   * Kernel-Class
+   */
+  kernel: any | null = null;
+
   /**
    * GET Route Store
    */
@@ -71,9 +75,12 @@ class RouterFacade {
    */
   init(options?: any) {
     this.basename = options && options.basename ? options.basename : null;
+    this.kernel = options && options.kernel ? options.kernel : null;
 
     // Load routes
+    console.log("loadRoutes");
     require(process.cwd() + "/app/routes");
+    console.log("finishRoutes");
   }
 
   /**
@@ -204,6 +211,10 @@ class RouterFacade {
     const response = new Response();
     response.setServerResponse(res);
 
+    if (!this.kernel) {
+      throw new Error("Missing Kernel in Router ...");
+    }
+
     // Check-Middleware
     if (
       route &&
@@ -212,7 +223,7 @@ class RouterFacade {
       route.options.middleware.length > 0
     ) {
       for (let middlewareKey of route.options.middleware) {
-        const middleware = Kernel.middleware[middlewareKey];
+        const middleware = this.kernel.middleware[middlewareKey];
         if (!middleware) {
           return this.sendError(
             res,
@@ -273,7 +284,7 @@ class RouterFacade {
     // Resolve route-component (handle controller definition)
     if (route && typeof route.component === "string") {
       const split = route.component.split("@");
-      const controller = Kernel.controller[split[0]];
+      const controller = this.kernel.controller[split[0]];
       if (!controller) {
         res.writeHead(500, { "Content-Type": "text/html" });
         res.end("Controller `" + split[0] + "` not found ...");
@@ -330,6 +341,46 @@ class RouterFacade {
       this.sendError(res, 404);
     }
   }
+
+  requestConsoleLog(req: IncomingMessage) {
+    if (Config.get("router.requests.logConsole") !== true) {
+      return;
+    }
+
+    const date = new Date();
+    const month = date.getMonth() + 1;
+    const ip = req.headers["x-forwarded-for"]
+      ? req.headers["x-forwarded-for"]
+      : req.headers["x-forwarded"]
+      ? req.headers["x-forwarded"]
+      : req.headers["forwarded-for"]
+      ? req.headers["forwarded-for"]
+      : req.socket && req.socket.remoteAddress
+      ? req.socket.remoteAddress
+      : null;
+
+    console.log(
+      '{ date: "' +
+        date.getFullYear() +
+        "-" +
+        (month < 10 ? "0" + month : month) +
+        "-" +
+        date.getDate() +
+        " " +
+        (date.getHours() + 1) +
+        ":" +
+        date.getMinutes() +
+        ":" +
+        date.getSeconds() +
+        '", method: "' +
+        req.method +
+        '", url: "' +
+        req.url +
+        '", ip: "' +
+        ip +
+        '" }'
+    );
+  }
 }
 
 export const Router = new RouterFacade();

package/src/WebApplication.ts

@@ -1,4 +1,5 @@
 import http, { Server } from "http";
+import { Config } from "./Config";
 import { Router } from "./Router/Router";
 
 export class WebApplication {
@@ -8,7 +9,14 @@ export class WebApplication {
    * Init the routes and start the http-server
    */
   boot(options?: any) {
+    if (options && options.config) {
+      for (let key in options.config) {
+        Config.register(key, options.config[key]);
+      }
+    }
+
     Router.init({
+      kernel: options && options.kernel ? options.kernel : null,
       basename: options && options.basename ? options.basename : null,
     });
 
@@ -18,7 +26,13 @@ export class WebApplication {
         Router.handleRequest(req, res);
       })
       .listen(port, () => {
-        console.log("Server started and listening on port " + port);
+        console.log(
+          "Server started and listening on port " +
+            port +
+            (options && options.basename
+              ? " (Basename: " + options && options.basename + ")"
+              : "")
+        );
       });
   }
 }

package/src/index.ts

@@ -1,4 +1,6 @@
-export * from "./BaseKernel";
+export * from "./Config";
+export * from "./BaseKernelWeb";
+export * from "./BaseKernelConsole";
 export * from "./Controller/Controller";
 export * from "./Database/Model";
 export * from "./WebApplication";