opticore-webapp 1.0.46 → 1.0.48
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.cjs
CHANGED
|
@@ -251,14 +251,18 @@ var import_process = __toESM(require("process"), 1);
|
|
|
251
251
|
var envPath = import_process.default.cwd() + "/config/env/.env";
|
|
252
252
|
|
|
253
253
|
// src/application/service/core.service.ts
|
|
254
|
+
var import_opticore_server_logger = require("opticore-server-logger");
|
|
254
255
|
var CoreService = class {
|
|
255
256
|
loggerConfig;
|
|
257
|
+
serverLogger;
|
|
256
258
|
localLanguage;
|
|
257
259
|
environnementPath;
|
|
258
260
|
translateWebAppCoreLanguageLoader;
|
|
259
261
|
constructor(localLang, environnementPath) {
|
|
260
262
|
containerDependency.register("TranslateWebAppCoreLanguageLoader", new TranslateWebAppCoreLanguageLoader());
|
|
263
|
+
containerDependency.register("serverLogger", new import_opticore_server_logger.serverLogger());
|
|
261
264
|
this.translateWebAppCoreLanguageLoader = Inject("TranslateWebAppCoreLanguageLoader");
|
|
265
|
+
this.serverLogger = Inject("serverLogger");
|
|
262
266
|
this.loggerConfig = new import_opticore_logger2.LoggerCore(loggerConfig(environnementPath));
|
|
263
267
|
this.environnementPath = environnementPath;
|
|
264
268
|
this.localLanguage = localLang;
|
|
@@ -394,7 +398,7 @@ var CoreService = class {
|
|
|
394
398
|
try {
|
|
395
399
|
this.translateWebAppCoreLanguageLoader.translateLanguageLoader(this.localLanguage, this.environnementPath);
|
|
396
400
|
const getEnvironnement = (0, import_opticore_env_access2.getEnvironnementValue)(this.environnementPath);
|
|
397
|
-
const msg5 = getEnvironnement.protocolTransfert === "" ?
|
|
401
|
+
const msg5 = getEnvironnement.protocolTransfert === "" ? import_ansi_colors3.default.underline(`http://${host}:${port}`) : import_ansi_colors3.default.underline(`${getEnvironnement.protocolTransfert}://${host}:${port}`);
|
|
398
402
|
const messages = [
|
|
399
403
|
import_opticore_translator3.TranslationLoader.t("webServerListening", this.localLanguage),
|
|
400
404
|
import_opticore_translator3.TranslationLoader.t("webServerUsingNodeVersion", this.localLanguage, { nodeVersion: this.getVersions().nodeVersion }),
|
|
@@ -414,6 +418,13 @@ var CoreService = class {
|
|
|
414
418
|
});
|
|
415
419
|
console.log(border);
|
|
416
420
|
console.log("\n");
|
|
421
|
+
this.serverLogger.serverLog({
|
|
422
|
+
timestamp: (/* @__PURE__ */ new Date()).toString(),
|
|
423
|
+
level: "SERVER",
|
|
424
|
+
title: import_opticore_translator3.TranslationLoader.t("serverRunningTitle", this.localLanguage),
|
|
425
|
+
typeName: import_opticore_translator3.TranslationLoader.t("opticoreServerTypeName", this.localLanguage),
|
|
426
|
+
message: import_opticore_translator3.TranslationLoader.t("serverRunningAt", this.localLanguage, { server: msg5 })
|
|
427
|
+
});
|
|
417
428
|
} catch (err) {
|
|
418
429
|
SLogger(this.environnementPath).error({
|
|
419
430
|
message: err.message,
|
|
@@ -487,10 +498,29 @@ var SServerStartError = (err, environnementPath) => {
|
|
|
487
498
|
|
|
488
499
|
// src/core/webServer.core.ts
|
|
489
500
|
var import_opticore_request_call_event = require("opticore-request-call-event");
|
|
490
|
-
var
|
|
501
|
+
var import_opticore_inject_dependency2 = require("opticore-inject-dependency");
|
|
491
502
|
var import_opticore_http_response4 = require("opticore-http-response");
|
|
492
503
|
var import_opticore_translator4 = require("opticore-translator");
|
|
493
504
|
var import_opticore_mysqldb = require("opticore-mysqldb");
|
|
505
|
+
|
|
506
|
+
// src/core/providers/dependencies.provider.ts
|
|
507
|
+
var import_opticore_inject_dependency = require("opticore-inject-dependency");
|
|
508
|
+
|
|
509
|
+
// src/application/service/dependencies.service.ts
|
|
510
|
+
var dependencies = [
|
|
511
|
+
{
|
|
512
|
+
key: "translateWebAppCoreLanguageLoader",
|
|
513
|
+
factory: () => new TranslateWebAppCoreLanguageLoader(),
|
|
514
|
+
scope: "singleton"
|
|
515
|
+
}
|
|
516
|
+
];
|
|
517
|
+
|
|
518
|
+
// src/core/providers/dependencies.provider.ts
|
|
519
|
+
var dependenciesContainerProvider = (localLang) => {
|
|
520
|
+
return new import_opticore_inject_dependency.SContainer(localLang, dependencies);
|
|
521
|
+
};
|
|
522
|
+
|
|
523
|
+
// src/core/webServer.core.ts
|
|
494
524
|
var WebServerCore = class {
|
|
495
525
|
serverUtility;
|
|
496
526
|
expressApp = (0, import_opticore_express2.express)();
|
|
@@ -503,9 +533,7 @@ var WebServerCore = class {
|
|
|
503
533
|
translateWebAppCoreLanguageLoader;
|
|
504
534
|
dependenciesRegistered = false;
|
|
505
535
|
constructor(app, loggerConfig2, localLanguage, environnementPath, corsOriginOptions) {
|
|
506
|
-
|
|
507
|
-
this.translateWebAppCoreLanguageLoader = Inject("TranslateWebAppCoreLanguageLoader");
|
|
508
|
-
this.translateWebAppCoreLanguageLoader.translateLanguageLoader(localLanguage, environnementPath);
|
|
536
|
+
this.translateWebAppCoreLanguageLoader = dependenciesContainerProvider(localLanguage).resolve("translateWebAppCoreLanguageLoader");
|
|
509
537
|
this.stackTraceErrorHandling(localLanguage);
|
|
510
538
|
this.getEnvironnement = (0, import_opticore_env_access3.getEnvironnementValue)(environnementPath);
|
|
511
539
|
this.routerExpressApp = app;
|
|
@@ -520,11 +548,11 @@ var WebServerCore = class {
|
|
|
520
548
|
this.serverListenEvent = new import_opticore_catch_exception_error4.ServerListenEventError(localLanguage);
|
|
521
549
|
this.serverUtility = new CoreService(localLanguage, environnementPath);
|
|
522
550
|
}
|
|
523
|
-
registerDependencies(
|
|
551
|
+
registerDependencies(dependencies2) {
|
|
524
552
|
try {
|
|
525
553
|
if (this.dependenciesRegistered) return;
|
|
526
554
|
containerDependency.register("TranslateWebAppCoreLanguageLoader", new TranslateWebAppCoreLanguageLoader());
|
|
527
|
-
|
|
555
|
+
dependencies2.forEach((value, key) => {
|
|
528
556
|
containerDependency.register(key, value);
|
|
529
557
|
});
|
|
530
558
|
this.dependenciesRegistered = true;
|
|
@@ -559,9 +587,10 @@ var WebServerCore = class {
|
|
|
559
587
|
return this.expressApp.listen(
|
|
560
588
|
Number(this.getEnvironnement.appPort),
|
|
561
589
|
() => {
|
|
590
|
+
this.translateWebAppCoreLanguageLoader.translateLanguageLoader(this.localLanguage, this.environnementPath);
|
|
562
591
|
try {
|
|
563
592
|
mySQL.databaseConnexionChecker(this.getEnvironnement);
|
|
564
|
-
new
|
|
593
|
+
new import_opticore_inject_dependency2.SContainer(this.localLanguage, dependenciesProvider);
|
|
565
594
|
this.expressApp.use(import_opticore_express2.express.static(path3.join(import_node_process3.default.cwd(), "public/template")));
|
|
566
595
|
this.registerRoutes(routers);
|
|
567
596
|
} catch (err) {
|
package/dist/index.js
CHANGED
|
@@ -214,14 +214,18 @@ import process2 from "process";
|
|
|
214
214
|
var envPath = process2.cwd() + "/config/env/.env";
|
|
215
215
|
|
|
216
216
|
// src/application/service/core.service.ts
|
|
217
|
+
import { serverLogger } from "opticore-server-logger";
|
|
217
218
|
var CoreService = class {
|
|
218
219
|
loggerConfig;
|
|
220
|
+
serverLogger;
|
|
219
221
|
localLanguage;
|
|
220
222
|
environnementPath;
|
|
221
223
|
translateWebAppCoreLanguageLoader;
|
|
222
224
|
constructor(localLang, environnementPath) {
|
|
223
225
|
containerDependency.register("TranslateWebAppCoreLanguageLoader", new TranslateWebAppCoreLanguageLoader());
|
|
226
|
+
containerDependency.register("serverLogger", new serverLogger());
|
|
224
227
|
this.translateWebAppCoreLanguageLoader = Inject("TranslateWebAppCoreLanguageLoader");
|
|
228
|
+
this.serverLogger = Inject("serverLogger");
|
|
225
229
|
this.loggerConfig = new LoggerCore2(loggerConfig(environnementPath));
|
|
226
230
|
this.environnementPath = environnementPath;
|
|
227
231
|
this.localLanguage = localLang;
|
|
@@ -357,7 +361,7 @@ var CoreService = class {
|
|
|
357
361
|
try {
|
|
358
362
|
this.translateWebAppCoreLanguageLoader.translateLanguageLoader(this.localLanguage, this.environnementPath);
|
|
359
363
|
const getEnvironnement = getEnvironnementValue2(this.environnementPath);
|
|
360
|
-
const msg5 = getEnvironnement.protocolTransfert === "" ?
|
|
364
|
+
const msg5 = getEnvironnement.protocolTransfert === "" ? colors3.underline(`http://${host}:${port}`) : colors3.underline(`${getEnvironnement.protocolTransfert}://${host}:${port}`);
|
|
361
365
|
const messages = [
|
|
362
366
|
TranslationLoader3.t("webServerListening", this.localLanguage),
|
|
363
367
|
TranslationLoader3.t("webServerUsingNodeVersion", this.localLanguage, { nodeVersion: this.getVersions().nodeVersion }),
|
|
@@ -377,6 +381,13 @@ var CoreService = class {
|
|
|
377
381
|
});
|
|
378
382
|
console.log(border);
|
|
379
383
|
console.log("\n");
|
|
384
|
+
this.serverLogger.serverLog({
|
|
385
|
+
timestamp: (/* @__PURE__ */ new Date()).toString(),
|
|
386
|
+
level: "SERVER",
|
|
387
|
+
title: TranslationLoader3.t("serverRunningTitle", this.localLanguage),
|
|
388
|
+
typeName: TranslationLoader3.t("opticoreServerTypeName", this.localLanguage),
|
|
389
|
+
message: TranslationLoader3.t("serverRunningAt", this.localLanguage, { server: msg5 })
|
|
390
|
+
});
|
|
380
391
|
} catch (err) {
|
|
381
392
|
SLogger(this.environnementPath).error({
|
|
382
393
|
message: err.message,
|
|
@@ -453,10 +464,29 @@ var SServerStartError = (err, environnementPath) => {
|
|
|
453
464
|
|
|
454
465
|
// src/core/webServer.core.ts
|
|
455
466
|
import { requestCallsEvent } from "opticore-request-call-event";
|
|
456
|
-
import { SContainer } from "opticore-inject-dependency";
|
|
467
|
+
import { SContainer as SContainer2 } from "opticore-inject-dependency";
|
|
457
468
|
import { HttpStatusCode as HttpStatusCode4 } from "opticore-http-response";
|
|
458
469
|
import { TranslationLoader as TranslationLoader4 } from "opticore-translator";
|
|
459
470
|
import { OptiCoreMySQLDriver } from "opticore-mysqldb";
|
|
471
|
+
|
|
472
|
+
// src/core/providers/dependencies.provider.ts
|
|
473
|
+
import { SContainer } from "opticore-inject-dependency";
|
|
474
|
+
|
|
475
|
+
// src/application/service/dependencies.service.ts
|
|
476
|
+
var dependencies = [
|
|
477
|
+
{
|
|
478
|
+
key: "translateWebAppCoreLanguageLoader",
|
|
479
|
+
factory: () => new TranslateWebAppCoreLanguageLoader(),
|
|
480
|
+
scope: "singleton"
|
|
481
|
+
}
|
|
482
|
+
];
|
|
483
|
+
|
|
484
|
+
// src/core/providers/dependencies.provider.ts
|
|
485
|
+
var dependenciesContainerProvider = (localLang) => {
|
|
486
|
+
return new SContainer(localLang, dependencies);
|
|
487
|
+
};
|
|
488
|
+
|
|
489
|
+
// src/core/webServer.core.ts
|
|
460
490
|
var WebServerCore = class {
|
|
461
491
|
serverUtility;
|
|
462
492
|
expressApp = express2();
|
|
@@ -469,9 +499,7 @@ var WebServerCore = class {
|
|
|
469
499
|
translateWebAppCoreLanguageLoader;
|
|
470
500
|
dependenciesRegistered = false;
|
|
471
501
|
constructor(app, loggerConfig2, localLanguage, environnementPath, corsOriginOptions) {
|
|
472
|
-
|
|
473
|
-
this.translateWebAppCoreLanguageLoader = Inject("TranslateWebAppCoreLanguageLoader");
|
|
474
|
-
this.translateWebAppCoreLanguageLoader.translateLanguageLoader(localLanguage, environnementPath);
|
|
502
|
+
this.translateWebAppCoreLanguageLoader = dependenciesContainerProvider(localLanguage).resolve("translateWebAppCoreLanguageLoader");
|
|
475
503
|
this.stackTraceErrorHandling(localLanguage);
|
|
476
504
|
this.getEnvironnement = getEnvironnementValue3(environnementPath);
|
|
477
505
|
this.routerExpressApp = app;
|
|
@@ -486,11 +514,11 @@ var WebServerCore = class {
|
|
|
486
514
|
this.serverListenEvent = new ServerListenEventError2(localLanguage);
|
|
487
515
|
this.serverUtility = new CoreService(localLanguage, environnementPath);
|
|
488
516
|
}
|
|
489
|
-
registerDependencies(
|
|
517
|
+
registerDependencies(dependencies2) {
|
|
490
518
|
try {
|
|
491
519
|
if (this.dependenciesRegistered) return;
|
|
492
520
|
containerDependency.register("TranslateWebAppCoreLanguageLoader", new TranslateWebAppCoreLanguageLoader());
|
|
493
|
-
|
|
521
|
+
dependencies2.forEach((value, key) => {
|
|
494
522
|
containerDependency.register(key, value);
|
|
495
523
|
});
|
|
496
524
|
this.dependenciesRegistered = true;
|
|
@@ -525,9 +553,10 @@ var WebServerCore = class {
|
|
|
525
553
|
return this.expressApp.listen(
|
|
526
554
|
Number(this.getEnvironnement.appPort),
|
|
527
555
|
() => {
|
|
556
|
+
this.translateWebAppCoreLanguageLoader.translateLanguageLoader(this.localLanguage, this.environnementPath);
|
|
528
557
|
try {
|
|
529
558
|
mySQL.databaseConnexionChecker(this.getEnvironnement);
|
|
530
|
-
new
|
|
559
|
+
new SContainer2(this.localLanguage, dependenciesProvider);
|
|
531
560
|
this.expressApp.use(express2.static(path3.join(process4.cwd(), "public/template")));
|
|
532
561
|
this.registerRoutes(routers);
|
|
533
562
|
} catch (err) {
|
|
@@ -3,6 +3,9 @@
|
|
|
3
3
|
"webServerListening": "[OK] Web server listening",
|
|
4
4
|
"webServerUsingNodeVersion": "The Web server is using Node.js version {nodeVersion}",
|
|
5
5
|
"startTime": "Startup time : {startTime}",
|
|
6
|
+
"serverRunningAt": "Server is running at : {server}",
|
|
7
|
+
"serverRunningTitle": "Server running",
|
|
8
|
+
"opticoreServerTypeName": "OptiCore server",
|
|
6
9
|
"runningModeDev": "development",
|
|
7
10
|
"runningModeProd": "production",
|
|
8
11
|
"totalMemoryAllocated": "Resident Set Size - total memory allocated for the process execution",
|
|
@@ -3,6 +3,9 @@
|
|
|
3
3
|
"webServerListening": "[OK] Le serveur web écoute",
|
|
4
4
|
"webServerUsingNodeVersion": "Le serveur Web utilise la version Node.js {nodeVersion}",
|
|
5
5
|
"startTime": "Temps de démarrage : {startTime}",
|
|
6
|
+
"serverRunningAt": "Le serveur est en cours d'exécution sur : {server}",
|
|
7
|
+
"serverRunningTitle": "Serveur est en cours d'exécution",
|
|
8
|
+
"opticoreServerTypeName": "Serveur OptiCore",
|
|
6
9
|
"runningModeDev": "développement",
|
|
7
10
|
"runningModeProd": "production",
|
|
8
11
|
"totalMemoryAllocated": "Taille de l'ensemble résident - mémoire totale allouée à l'exécution du processus",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "opticore-webapp",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.48",
|
|
4
4
|
"description": "wep server",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.mjs",
|
|
@@ -29,11 +29,11 @@
|
|
|
29
29
|
"cors": "^2.8.5",
|
|
30
30
|
"dotenv": "^16.5.0",
|
|
31
31
|
"gradient-string": "^3.0.0",
|
|
32
|
-
"opticore-catch-exception-error": "^1.0.
|
|
33
|
-
"opticore-env-access": "^1.0.
|
|
32
|
+
"opticore-catch-exception-error": "^1.0.22",
|
|
33
|
+
"opticore-env-access": "^1.0.7",
|
|
34
34
|
"opticore-express": "^1.0.3",
|
|
35
35
|
"opticore-http-response": "^1.0.3",
|
|
36
|
-
"opticore-inject-dependency": "^1.0.
|
|
36
|
+
"opticore-inject-dependency": "^1.0.11",
|
|
37
37
|
"opticore-logger": "^1.0.17",
|
|
38
38
|
"opticore-mysqldb": "^1.0.25",
|
|
39
39
|
"opticore-request-call-event": "^1.0.2",
|