opticore-webapp 1.0.39 → 1.0.40

package/dist/index.cjs

@@ -325,7 +325,8 @@ var CoreService = class {
    */
   getServerRunningMode(development, production) {
     this.getEnvFileLoading(".env");
-    const isDevelopment = import_node_process2.default.env.ENV_DEV === development;
+    const env = (0, import_opticore_env_access2.getEnvironnementValue)(path2.join(import_node_process2.default.cwd(), "config", "env"));
+    const isDevelopment = env.devEnv === development && env.prodEnv === void 0 || env.devEnv === development && env.prodEnv === "";
     if (isDevelopment) {
       return `${import_opticore_translator3.TranslationLoader.t("serverRunning", this.localLanguage)} ${import_ansi_colors3.default.bgBlue(`${import_ansi_colors3.default.bold(`${development}`)}`)} mode`;
     } else {
@@ -333,24 +334,26 @@ var CoreService = class {
     }
   }
   infoServer(nodeVersion, startingTime, host, port) {
-    const paddingLength = 52;
     const getEnvironnement = (0, import_opticore_env_access2.getEnvironnementValue)(this.environnementPath);
-    const msg0 = " ".padEnd(paddingLength, " ");
-    const msg1 = ` ${import_opticore_translator3.TranslationLoader.t("webServerListening", this.localLanguage)}`;
-    const msg2Value = `${import_ansi_colors3.default.bgBlue(`${import_ansi_colors3.default.bold(`${nodeVersion}`)}`)}`;
-    const msg2 = ` ${import_opticore_translator3.TranslationLoader.t("webServerUsingNodeVersion", this.localLanguage)}`;
-    const msg3Value = `${import_ansi_colors3.default.bgBlue(`${import_ansi_colors3.default.bold(`${startingTime}`)}`)}`;
-    const msg3 = ` ${import_opticore_translator3.TranslationLoader.t("startTime", this.localLanguage)}`;
-    const msg4 = ` ${this.getServerRunningMode(`${import_opticore_translator3.TranslationLoader.t("runningModeDev", this.localLanguage)}`, `${import_opticore_translator3.TranslationLoader.t("runningModeProd", this.localLanguage)}`)}`;
     const msg5 = getEnvironnement.protocolTransfert === "" ? ` ${import_ansi_colors3.default.underline(`http://${host}:${port}`)}` : ` ${import_ansi_colors3.default.underline(`${getEnvironnement.protocolTransfert}://${host}:${port}`)}`;
-    console.log(import_chalk.default.bgGreen.white(msg0.padEnd(paddingLength, " ")));
-    console.log(import_chalk.default.bgGreen.white(msg1.padEnd(paddingLength, " ")));
-    console.log(import_chalk.default.bgGreen.white(msg2, msg2Value.padEnd(paddingLength, " ")));
-    console.log(import_chalk.default.bgGreen.white(msg3, msg3Value.padEnd(paddingLength, " ")));
-    console.log(import_chalk.default.bgGreen.white(msg4.padEnd(paddingLength, " ")));
-    console.log(import_chalk.default.bgGreen.white(msg5.padEnd(paddingLength, " ")));
-    console.log(import_chalk.default.bgGreen.white(msg0.padEnd(paddingLength, " ")));
-    console.log(``);
+    const messages = [
+      `${import_opticore_translator3.TranslationLoader.t("webServerListening", this.localLanguage)}`,
+      `${import_opticore_translator3.TranslationLoader.t("webServerUsingNodeVersion", this.localLanguage, { nodeVersion: `${import_ansi_colors3.default.bgBlue(`${import_ansi_colors3.default.bold(`${nodeVersion}`)}`)}` })}`,
+      `${import_opticore_translator3.TranslationLoader.t("startTime", this.localLanguage)}`,
+      `${this.getServerRunningMode(`${import_opticore_translator3.TranslationLoader.t("runningModeDev", this.localLanguage)}`, `${import_opticore_translator3.TranslationLoader.t("runningModeProd", this.localLanguage)}`)}`,
+      msg5
+    ];
+    const maxLength = Math.max(...messages.map((m) => {
+      return m.replace(/\u001b\[[0-9]{1,2}m/g, "").length;
+    })) + 4;
+    const border = import_chalk.default.bgGreen.white(" ".repeat(maxLength));
+    console.log(border);
+    messages.forEach((msg) => {
+      const cleanLength = msg.replace(/\u001b\[[0-9]{1,2}m/g, "").length;
+      const padding = maxLength - cleanLength - 2;
+      console.log(import_chalk.default.bgGreen.white(` ${msg}${" ".repeat(padding)} `));
+    });
+    console.log(border);
   }
   coreListenerEventLoaderModuleService(kernelModule) {
     let router = [];
@@ -402,14 +405,7 @@ var SServerStartError = (err) => {
 
 // src/core/webServer.core.ts
 var import_opticore_request_call_event = require("opticore-request-call-event");
-
-// src/application/service/dependenciesContainer.service.ts
 var import_opticore_inject_dependency = require("opticore-inject-dependency");
-var SDependenciesContainer = (dependenciesProvider, localLanguage) => {
-  return new import_opticore_inject_dependency.SContainer(dependenciesProvider, localLanguage);
-};
-
-// src/core/webServer.core.ts
 var import_opticore_http_response4 = require("opticore-http-response");
 var import_opticore_translator4 = require("opticore-translator");
 var WebServerCore = class {
@@ -458,7 +454,7 @@ var WebServerCore = class {
         () => {
           try {
             dbConnexion;
-            SDependenciesContainer(dependenciesProvider, this.localLanguage);
+            new import_opticore_inject_dependency.SContainer(dependenciesProvider, this.localLanguage);
             this.expressApp.use(import_opticore_express2.express.static(path3.join(import_node_process3.default.cwd(), "public/template")));
             this.registerRoutes(routers);
           } catch (err) {

package/dist/index.js

@@ -290,7 +290,8 @@ var CoreService = class {
    */
   getServerRunningMode(development, production) {
     this.getEnvFileLoading(".env");
-    const isDevelopment = process3.env.ENV_DEV === development;
+    const env = getEnvironnementValue2(path2.join(process3.cwd(), "config", "env"));
+    const isDevelopment = env.devEnv === development && env.prodEnv === void 0 || env.devEnv === development && env.prodEnv === "";
     if (isDevelopment) {
       return `${TranslationLoader3.t("serverRunning", this.localLanguage)} ${colors3.bgBlue(`${colors3.bold(`${development}`)}`)} mode`;
     } else {
@@ -298,24 +299,26 @@ var CoreService = class {
     }
   }
   infoServer(nodeVersion, startingTime, host, port) {
-    const paddingLength = 52;
     const getEnvironnement = getEnvironnementValue2(this.environnementPath);
-    const msg0 = " ".padEnd(paddingLength, " ");
-    const msg1 = ` ${TranslationLoader3.t("webServerListening", this.localLanguage)}`;
-    const msg2Value = `${colors3.bgBlue(`${colors3.bold(`${nodeVersion}`)}`)}`;
-    const msg2 = ` ${TranslationLoader3.t("webServerUsingNodeVersion", this.localLanguage)}`;
-    const msg3Value = `${colors3.bgBlue(`${colors3.bold(`${startingTime}`)}`)}`;
-    const msg3 = ` ${TranslationLoader3.t("startTime", this.localLanguage)}`;
-    const msg4 = ` ${this.getServerRunningMode(`${TranslationLoader3.t("runningModeDev", this.localLanguage)}`, `${TranslationLoader3.t("runningModeProd", this.localLanguage)}`)}`;
     const msg5 = getEnvironnement.protocolTransfert === "" ? ` ${colors3.underline(`http://${host}:${port}`)}` : ` ${colors3.underline(`${getEnvironnement.protocolTransfert}://${host}:${port}`)}`;
-    console.log(chalk.bgGreen.white(msg0.padEnd(paddingLength, " ")));
-    console.log(chalk.bgGreen.white(msg1.padEnd(paddingLength, " ")));
-    console.log(chalk.bgGreen.white(msg2, msg2Value.padEnd(paddingLength, " ")));
-    console.log(chalk.bgGreen.white(msg3, msg3Value.padEnd(paddingLength, " ")));
-    console.log(chalk.bgGreen.white(msg4.padEnd(paddingLength, " ")));
-    console.log(chalk.bgGreen.white(msg5.padEnd(paddingLength, " ")));
-    console.log(chalk.bgGreen.white(msg0.padEnd(paddingLength, " ")));
-    console.log(``);
+    const messages = [
+      `${TranslationLoader3.t("webServerListening", this.localLanguage)}`,
+      `${TranslationLoader3.t("webServerUsingNodeVersion", this.localLanguage, { nodeVersion: `${colors3.bgBlue(`${colors3.bold(`${nodeVersion}`)}`)}` })}`,
+      `${TranslationLoader3.t("startTime", this.localLanguage)}`,
+      `${this.getServerRunningMode(`${TranslationLoader3.t("runningModeDev", this.localLanguage)}`, `${TranslationLoader3.t("runningModeProd", this.localLanguage)}`)}`,
+      msg5
+    ];
+    const maxLength = Math.max(...messages.map((m) => {
+      return m.replace(/\u001b\[[0-9]{1,2}m/g, "").length;
+    })) + 4;
+    const border = chalk.bgGreen.white(" ".repeat(maxLength));
+    console.log(border);
+    messages.forEach((msg) => {
+      const cleanLength = msg.replace(/\u001b\[[0-9]{1,2}m/g, "").length;
+      const padding = maxLength - cleanLength - 2;
+      console.log(chalk.bgGreen.white(` ${msg}${" ".repeat(padding)} `));
+    });
+    console.log(border);
   }
   coreListenerEventLoaderModuleService(kernelModule) {
     let router = [];
@@ -370,14 +373,7 @@ var SServerStartError = (err) => {
 
 // src/core/webServer.core.ts
 import { requestCallsEvent } from "opticore-request-call-event";
-
-// src/application/service/dependenciesContainer.service.ts
 import { SContainer } from "opticore-inject-dependency";
-var SDependenciesContainer = (dependenciesProvider, localLanguage) => {
-  return new SContainer(dependenciesProvider, localLanguage);
-};
-
-// src/core/webServer.core.ts
 import { HttpStatusCode as HttpStatusCode3 } from "opticore-http-response";
 import { TranslationLoader as TranslationLoader4 } from "opticore-translator";
 var WebServerCore = class {
@@ -426,7 +422,7 @@ var WebServerCore = class {
         () => {
           try {
             dbConnexion;
-            SDependenciesContainer(dependenciesProvider, this.localLanguage);
+            new SContainer(dependenciesProvider, this.localLanguage);
             this.expressApp.use(express2.static(path3.join(process4.cwd(), "public/template")));
             this.registerRoutes(routers);
           } catch (err) {

package/dist/utils/translations/message.translation.en.json

@@ -1,8 +1,8 @@
 {
   "serverRunning": "The server is running in",
   "webServerListening": "[OK] Web server listening",
-  "webServerUsingNodeVersion": "The Web server is using Node.js version",
-  "startTime": "Startup time:",
+  "webServerUsingNodeVersion": "The Web server is using Node.js version {nodeVersion}",
+  "startTime": "Startup time : {startTime}",
   "runningModeDev": "development",
   "runningModeProd": "production",
   "totalMemoryAllocated": "Resident Set Size - total memory allocated for the process execution",

package/dist/utils/translations/message.translation.fr.json

@@ -1,8 +1,8 @@
 {
   "serverRunning": "Le serveur est en cours d'exécution en",
   "webServerListening": "[OK] Le serveur web écoute",
-  "webServerUsingNodeVersion": "Le serveur Web utilise la version Node.js",
-  "startTime": "Temps de démarrage :",
+  "webServerUsingNodeVersion": "Le serveur Web utilise la version Node.js {nodeVersion}",
+  "startTime": "Temps de démarrage : {startTime}",
   "runningModeDev": "développement",
   "runningModeProd": "production",
   "totalMemoryAllocated": "Taille de l'ensemble résident - mémoire totale allouée à l'exécution du processus",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opticore-webapp",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "wep server",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -27,7 +27,7 @@
     "ansi-colors": "^4.1.3",
     "chalk": "^5.4.1",
     "cors": "^2.8.5",
-    "dotenv": "^16.4.7",
+    "dotenv": "^16.5.0",
     "gradient-string": "^3.0.0",
     "opticore-catch-exception-error": "^1.0.21",
     "opticore-env-access": "^1.0.6",