@webtypen/webframez-core 0.0.18 → 0.0.20

package/lib/Commands/BuildFinishCommand.d.ts

@@ -0,0 +1,6 @@
+import { ConsoleCommand } from "./ConsoleCommand";
+export declare class BuildFinishCommand extends ConsoleCommand {
+    static signature: string;
+    static description: string;
+    handle(): Promise<void>;
+}

package/lib/Commands/BuildFinishCommand.js

@@ -0,0 +1,50 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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.BuildFinishCommand = void 0;
+const child_process_1 = require("child_process");
+const fs_1 = __importDefault(require("fs"));
+const ConsoleCommand_1 = require("./ConsoleCommand");
+class BuildFinishCommand extends ConsoleCommand_1.ConsoleCommand {
+    handle() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const buildDir = process.cwd() + "/build";
+            const nodeModulesDir = process.cwd() + "/node_modules";
+            if (!fs_1.default.existsSync(buildDir)) {
+                throw new Error("Missing build folder `" + buildDir + "` ...");
+            }
+            if (!fs_1.default.existsSync(nodeModulesDir)) {
+                throw new Error("Missing node_modules folder `" + nodeModulesDir + "` ...");
+            }
+            // Prepare node_modules/
+            if (fs_1.default.existsSync(buildDir + "/node_modules")) {
+                (0, child_process_1.execSync)("rm -rf " + buildDir + "/node_modules");
+            }
+            (0, child_process_1.execSync)("cp -r " + nodeModulesDir + " " + buildDir + "/node_modules");
+            // Prepare files
+            const copyFiles = [".env", "package.json", "package-lock.json", "README.md", ".gitignore"];
+            for (let file of copyFiles) {
+                if (fs_1.default.existsSync(buildDir + "/" + file)) {
+                    (0, child_process_1.execSync)("rm " + buildDir + "/" + file);
+                }
+                if (fs_1.default.existsSync(buildDir + "/" + file)) {
+                    (0, child_process_1.execSync)("cp " + process.cwd() + "/" + file + " " + buildDir + "/" + file);
+                }
+            }
+        });
+    }
+}
+exports.BuildFinishCommand = BuildFinishCommand;
+BuildFinishCommand.signature = "build";
+BuildFinishCommand.description = "Creates a new production-build";

package/lib/Commands/ConsoleCommand.d.ts

@@ -0,0 +1,5 @@
+export declare class ConsoleCommand {
+    static signature: string;
+    static description?: string;
+    handle(): Promise<void>;
+}

package/lib/Commands/ConsoleCommand.js

@@ -0,0 +1,18 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConsoleCommand = void 0;
+class ConsoleCommand {
+    handle() {
+        return __awaiter(this, void 0, void 0, function* () { });
+    }
+}
+exports.ConsoleCommand = ConsoleCommand;

package/lib/ConsoleApplication.d.ts

@@ -0,0 +1,6 @@
+export declare class ConsoleApplication {
+    /**
+     * Init the routes and start the http-server
+     */
+    boot(options?: any): void;
+}

package/lib/ConsoleApplication.js

@@ -0,0 +1,46 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConsoleApplication = void 0;
+const { Command } = require("commander");
+const Config_1 = require("./Config");
+const BuildFinishCommand_1 = require("./Commands/BuildFinishCommand");
+class ConsoleApplication {
+    /**
+     * 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]);
+            }
+        }
+        const program = new Command();
+        program.name("webframez console").description("CLI to some JavaScript string utilities").version("0.0.1");
+        const systemCommands = [BuildFinishCommand_1.BuildFinishCommand];
+        for (let command of systemCommands) {
+            if (!command.signature) {
+                continue;
+            }
+            const consoleCommand = new Command(command.signature);
+            if (command.description && command.description.trim() !== "") {
+                consoleCommand.description(command.description);
+            }
+            consoleCommand.action(() => __awaiter(this, void 0, void 0, function* () {
+                const service = yield new command();
+                return yield service.handle();
+            }));
+            program.addCommand(consoleCommand);
+        }
+        program.parse();
+    }
+}
+exports.ConsoleApplication = ConsoleApplication;

package/lib/Router/Router.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Router = void 0;
+const fs_1 = __importDefault(require("fs"));
 const qs_1 = __importDefault(require("qs"));
 const Response_1 = require("./Response");
 const Config_1 = require("../Config");
@@ -270,7 +271,7 @@ class RouterFacade {
                 }
                 // Set Controller method as route-component
                 const controllerInstance = new controller();
-                route.component = controllerInstance[split[1]];
+                route.component = controllerInstance[split[1]].bind(controllerInstance);
             }
             if (route && route.component !== undefined) {
                 try {
@@ -291,7 +292,8 @@ class RouterFacade {
         });
     }
     requestConsoleLog(req, httpCode) {
-        if (Config_1.Config.get("application.router.requests.logConsole") !== true) {
+        if (Config_1.Config.get("application.router.requests.logConsole") !== true &&
+            !Config_1.Config.get("application.router.requests.logFile")) {
             return;
         }
         const date = new Date();
@@ -305,7 +307,7 @@ class RouterFacade {
                     : req.socket && req.socket.remoteAddress
                         ? req.socket.remoteAddress
                         : null;
-        console.log('{ date: "' +
+        const logString = '{ date: "' +
             date.getFullYear() +
             "-" +
             (month < 10 ? "0" + month : month) +
@@ -325,7 +327,23 @@ class RouterFacade {
             ip +
             '", httpcode: ' +
             httpCode.toString() +
-            " }");
+            " }";
+        if (Config_1.Config.get("application.router.requests.logConsole")) {
+            console.log(logString);
+        }
+        if (Config_1.Config.get("application.router.requests.logFile")) {
+            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");
+                }
+            }
+            catch (e) {
+                console.error(e);
+            }
+        }
     }
 }
 exports.Router = new RouterFacade();

package/lib/index.d.ts

@@ -3,6 +3,7 @@ export * from "./BaseKernelWeb";
 export * from "./BaseKernelConsole";
 export * from "./Controller/Controller";
 export * from "./Database/Model";
+export * from "./ConsoleApplication";
 export * from "./WebApplication";
 export * from "./Router/Route";
 export * from "./Router/Request";

package/lib/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./BaseKernelWeb"), exports);
 __exportStar(require("./BaseKernelConsole"), exports);
 __exportStar(require("./Controller/Controller"), exports);
 __exportStar(require("./Database/Model"), exports);
+__exportStar(require("./ConsoleApplication"), exports);
 __exportStar(require("./WebApplication"), exports);
 __exportStar(require("./Router/Route"), exports);
 __exportStar(require("./Router/Request"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-core",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
   "homepage": "https://webtypen.de/",
   "license": "MIT",
@@ -31,6 +31,7 @@
   "dependencies": {
     "dotenv": "^8.2.0",
     "lodash": "^4.17.20",
+    "commander": "^9.4.1",
     "qs": "^6.11.0"
   }
 }

package/src/Commands/BuildFinishCommand.ts

@@ -0,0 +1,38 @@
+import { exec, execSync } from "child_process";
+import fs from "fs";
+import { ConsoleCommand } from "./ConsoleCommand";
+
+export class BuildFinishCommand extends ConsoleCommand {
+    static signature = "build";
+    static description = "Creates a new production-build";
+
+    async handle() {
+        const buildDir = process.cwd() + "/build";
+        const nodeModulesDir = process.cwd() + "/node_modules";
+        if (!fs.existsSync(buildDir)) {
+            throw new Error("Missing build folder `" + buildDir + "` ...");
+        }
+
+        if (!fs.existsSync(nodeModulesDir)) {
+            throw new Error("Missing node_modules folder `" + nodeModulesDir + "` ...");
+        }
+
+        // Prepare node_modules/
+        if (fs.existsSync(buildDir + "/node_modules")) {
+            execSync("rm -rf " + buildDir + "/node_modules");
+        }
+        execSync("cp -r " + nodeModulesDir + " " + buildDir + "/node_modules");
+
+        // Prepare files
+        const copyFiles = [".env", "package.json", "package-lock.json", "README.md", ".gitignore"];
+        for (let file of copyFiles) {
+            if (fs.existsSync(buildDir + "/" + file)) {
+                execSync("rm " + buildDir + "/" + file);
+            }
+
+            if (fs.existsSync(buildDir + "/" + file)) {
+                execSync("cp " + process.cwd() + "/" + file + " " + buildDir + "/" + file);
+            }
+        }
+    }
+}

package/src/Commands/ConsoleCommand.ts

@@ -0,0 +1,6 @@
+export class ConsoleCommand {
+    static signature: string;
+    static description?: string;
+
+    async handle() {}
+}

package/src/ConsoleApplication.ts

@@ -0,0 +1,38 @@
+const { Command } = require("commander");
+import { Config } from "./Config";
+import { BuildFinishCommand } from "./Commands/BuildFinishCommand";
+
+export class ConsoleApplication {
+    /**
+     * 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]);
+            }
+        }
+
+        const program = new Command();
+        program.name("webframez console").description("CLI to some JavaScript string utilities").version("0.0.1");
+
+        const systemCommands = [BuildFinishCommand];
+        for (let command of systemCommands) {
+            if (!command.signature) {
+                continue;
+            }
+
+            const consoleCommand = new Command(command.signature);
+            if (command.description && command.description.trim() !== "") {
+                consoleCommand.description(command.description);
+            }
+            consoleCommand.action(async () => {
+                const service = await new command();
+                return await service.handle();
+            });
+            program.addCommand(consoleCommand);
+        }
+
+        program.parse();
+    }
+}

package/src/Router/Router.ts

@@ -1,3 +1,4 @@
+import fs from "fs";
 import qs from "qs";
 import { IncomingMessage, ServerResponse } from "http";
 import { Response } from "./Response";
@@ -328,7 +329,7 @@ class RouterFacade {
 
       // Set Controller method as route-component
       const controllerInstance = new controller();
-      route.component = controllerInstance[split[1]];
+      route.component = controllerInstance[split[1]].bind(controllerInstance);
     }
 
     if (route && route.component !== undefined) {
@@ -348,7 +349,10 @@ class RouterFacade {
   }
 
   requestConsoleLog(req: IncomingMessage, httpCode: number) {
-    if (Config.get("application.router.requests.logConsole") !== true) {
+    if (
+      Config.get("application.router.requests.logConsole") !== true &&
+      !Config.get("application.router.requests.logFile")
+    ) {
       return;
     }
 
@@ -363,30 +367,48 @@ class RouterFacade {
       : req.socket && req.socket.remoteAddress
       ? req.socket.remoteAddress
       : null;
-
-    console.log(
+    const logString =
       '{ 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 +
-        '", httpcode: ' +
-        httpCode.toString() +
-        " }"
-    );
+      date.getFullYear() +
+      "-" +
+      (month < 10 ? "0" + month : month) +
+      "-" +
+      date.getDate() +
+      " " +
+      (date.getHours() + 1) +
+      ":" +
+      date.getMinutes() +
+      ":" +
+      date.getSeconds() +
+      '", method: "' +
+      req.method +
+      '", url: "' +
+      req.url +
+      '", ip: "' +
+      ip +
+      '", httpcode: ' +
+      httpCode.toString() +
+      " }";
+
+    if (Config.get("application.router.requests.logConsole")) {
+      console.log(logString);
+    }
+
+    if (Config.get("application.router.requests.logFile")) {
+      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"
+          );
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    }
   }
 }
 

package/src/index.ts

@@ -3,6 +3,7 @@ export * from "./BaseKernelWeb";
 export * from "./BaseKernelConsole";
 export * from "./Controller/Controller";
 export * from "./Database/Model";
+export * from "./ConsoleApplication";
 export * from "./WebApplication";
 export * from "./Router/Route";
 export * from "./Router/Request";