opticore-webapp 1.0.57 → 1.0.58
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 +107 -149
- package/dist/index.d.cts +0 -2
- package/dist/index.d.ts +0 -2
- package/dist/index.js +106 -145
- package/package.json +4 -3
package/dist/index.cjs
CHANGED
|
@@ -35,12 +35,8 @@ __export(index_exports, {
|
|
|
35
35
|
});
|
|
36
36
|
module.exports = __toCommonJS(index_exports);
|
|
37
37
|
|
|
38
|
-
// node_modules/tsup/assets/cjs_shims.js
|
|
39
|
-
var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
|
|
40
|
-
var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
|
|
41
|
-
|
|
42
38
|
// src/core/webServer.core.ts
|
|
43
|
-
var
|
|
39
|
+
var path2 = __toESM(require("path"), 1);
|
|
44
40
|
var import_node_process3 = __toESM(require("process"), 1);
|
|
45
41
|
var import_cors = __toESM(require("cors"), 1);
|
|
46
42
|
var import_opticore_catch_exception_error4 = require("opticore-catch-exception-error");
|
|
@@ -105,13 +101,13 @@ function eventProcessHandler(localeLanguage) {
|
|
|
105
101
|
// src/application/service/core.service.ts
|
|
106
102
|
var import_node_process2 = __toESM(require("process"), 1);
|
|
107
103
|
var import_chalk = __toESM(require("chalk"), 1);
|
|
108
|
-
var
|
|
104
|
+
var path = __toESM(require("path"), 1);
|
|
109
105
|
var fs = __toESM(require("fs"), 1);
|
|
110
106
|
var import_ansi_colors3 = __toESM(require("ansi-colors"), 1);
|
|
111
|
-
var
|
|
112
|
-
var
|
|
107
|
+
var import_opticore_http_response = require("opticore-http-response");
|
|
108
|
+
var import_opticore_translator2 = require("opticore-translator");
|
|
113
109
|
var import_opticore_env_access2 = require("opticore-env-access");
|
|
114
|
-
var
|
|
110
|
+
var import_opticore_logger3 = require("opticore-logger");
|
|
115
111
|
|
|
116
112
|
// src/core/helpers/modulesLoaded.utils.ts
|
|
117
113
|
var import_ansi_colors2 = __toESM(require("ansi-colors"), 1);
|
|
@@ -189,10 +185,9 @@ var loggerConfig = (envDir) => {
|
|
|
189
185
|
};
|
|
190
186
|
};
|
|
191
187
|
|
|
192
|
-
// src/
|
|
193
|
-
var
|
|
194
|
-
var
|
|
195
|
-
var import_opticore_translator2 = require("opticore-translator");
|
|
188
|
+
// src/utils/envPath.utils.ts
|
|
189
|
+
var import_process = __toESM(require("process"), 1);
|
|
190
|
+
var envPath = import_process.default.cwd() + "/config/env/.env";
|
|
196
191
|
|
|
197
192
|
// src/application/service/logger.service.ts
|
|
198
193
|
var import_opticore_logger = require("opticore-logger");
|
|
@@ -200,69 +195,53 @@ var SLogger = (environmentPath) => {
|
|
|
200
195
|
return new import_opticore_logger.LoggerCore(loggerConfig(environmentPath));
|
|
201
196
|
};
|
|
202
197
|
|
|
203
|
-
// src/core/
|
|
204
|
-
var
|
|
205
|
-
var TranslateWebAppCoreLanguageLoader = class {
|
|
206
|
-
translateLanguageLoader(localLang, environmentPath) {
|
|
207
|
-
try {
|
|
208
|
-
const require2 = (0, import_module.createRequire)(importMetaUrl);
|
|
209
|
-
const packagePath = import_path.default.dirname(require2.resolve("opticore-webapp"));
|
|
210
|
-
const translateMsgJsonFilePath = import_path.default.join(packagePath, "utils", "translations");
|
|
211
|
-
import_opticore_translator2.TranslationLoader.loadTranslations(translateMsgJsonFilePath);
|
|
212
|
-
} catch (error) {
|
|
213
|
-
SLogger(environmentPath).error(this.handleError(error, localLang));
|
|
214
|
-
}
|
|
215
|
-
}
|
|
216
|
-
handleError(error, localLang) {
|
|
217
|
-
return {
|
|
218
|
-
message: import_opticore_translator2.TranslationLoader.t(error.message, localLang),
|
|
219
|
-
title: import_opticore_translator2.TranslationLoader.t("readdir", localLang),
|
|
220
|
-
errorType: import_opticore_translator2.TranslationLoader.t("ENOENT:NoSuchFileOrDir", localLang),
|
|
221
|
-
stackTrace: error.stack,
|
|
222
|
-
httpCodeValue: import_opticore_http_response.HttpStatusCode.INTERNAL_SERVER_ERROR
|
|
223
|
-
};
|
|
224
|
-
}
|
|
225
|
-
};
|
|
198
|
+
// src/core/providers/dependencies.provider.ts
|
|
199
|
+
var import_opticore_dependency_inject = require("opticore-dependency-inject");
|
|
226
200
|
|
|
227
|
-
// src/
|
|
228
|
-
var
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
}
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
}
|
|
241
|
-
return this.dependencies.get(key);
|
|
201
|
+
// src/application/service/dependencies.service.ts
|
|
202
|
+
var import_opticore_logger2 = require("opticore-logger");
|
|
203
|
+
var import_opticore_server_logger = require("opticore-server-logger");
|
|
204
|
+
var dependencies = [
|
|
205
|
+
{
|
|
206
|
+
key: "LoggerCore",
|
|
207
|
+
factory: () => new import_opticore_logger2.LoggerCore(),
|
|
208
|
+
scope: "singleton"
|
|
209
|
+
},
|
|
210
|
+
{
|
|
211
|
+
key: "serverLogger",
|
|
212
|
+
factory: () => new import_opticore_server_logger.serverLogger(),
|
|
213
|
+
scope: "singleton"
|
|
242
214
|
}
|
|
243
|
-
|
|
244
|
-
var containerDependency = new Container();
|
|
215
|
+
];
|
|
245
216
|
|
|
246
|
-
// src/core/
|
|
247
|
-
|
|
248
|
-
return
|
|
249
|
-
}
|
|
217
|
+
// src/core/providers/dependencies.provider.ts
|
|
218
|
+
var dependenciesContainerProvider = (localLang) => {
|
|
219
|
+
return new import_opticore_dependency_inject.SContainer(localLang, dependencies);
|
|
220
|
+
};
|
|
250
221
|
|
|
251
|
-
// src/
|
|
252
|
-
var
|
|
253
|
-
var
|
|
222
|
+
// src/application/service/loaderTranslationFile.service.ts
|
|
223
|
+
var import_opticore_loader_translation = require("opticore-loader-translation");
|
|
224
|
+
var loaderTranslationFile = (localLanguage) => {
|
|
225
|
+
return (0, import_opticore_loader_translation.translationLoaderConfig)({
|
|
226
|
+
packageName: "opticore-webapp",
|
|
227
|
+
locationTranslationFile: ["utils", "translations"],
|
|
228
|
+
localLang: localLanguage
|
|
229
|
+
});
|
|
230
|
+
};
|
|
254
231
|
|
|
255
232
|
// src/application/service/core.service.ts
|
|
256
|
-
var import_opticore_server_logger = require("opticore-server-logger");
|
|
257
233
|
var CoreService = class {
|
|
234
|
+
loggerConfig;
|
|
235
|
+
logger;
|
|
236
|
+
serverLogger;
|
|
237
|
+
localLanguage;
|
|
238
|
+
environmentPath;
|
|
258
239
|
constructor(localLang, environmentPath) {
|
|
259
|
-
|
|
260
|
-
containerDependency.register("serverLogger", new import_opticore_server_logger.serverLogger());
|
|
261
|
-
this.translateWebAppCoreLanguageLoader = Inject("TranslateWebAppCoreLanguageLoader");
|
|
262
|
-
this.serverLogger = Inject("serverLogger");
|
|
263
|
-
this.loggerConfig = new import_opticore_logger2.LoggerCore(loggerConfig(environmentPath));
|
|
240
|
+
this.loggerConfig = new import_opticore_logger3.LoggerCore(loggerConfig(environmentPath));
|
|
264
241
|
this.environmentPath = environmentPath;
|
|
265
242
|
this.localLanguage = localLang;
|
|
243
|
+
this.logger = dependenciesContainerProvider(localLang).resolve("LoggerCore");
|
|
244
|
+
this.serverLogger = dependenciesContainerProvider(localLang).resolve("serverLogger");
|
|
266
245
|
}
|
|
267
246
|
/**
|
|
268
247
|
*
|
|
@@ -298,23 +277,23 @@ var CoreService = class {
|
|
|
298
277
|
* and Memory usage system
|
|
299
278
|
*/
|
|
300
279
|
getUsageMemory() {
|
|
301
|
-
|
|
280
|
+
loaderTranslationFile(this.localLanguage);
|
|
302
281
|
const memoryData = import_node_process2.default.memoryUsage();
|
|
303
282
|
const data = {
|
|
304
|
-
[
|
|
305
|
-
[
|
|
306
|
-
[
|
|
307
|
-
[
|
|
308
|
-
[
|
|
309
|
-
[
|
|
283
|
+
[import_opticore_translator2.TranslationLoader.t("totalMemoryAllocated", this.localLanguage)]: this.formatMemoryUsage(memoryData.rss),
|
|
284
|
+
[import_opticore_translator2.TranslationLoader.t("sizeAllocatedHeap", this.localLanguage)]: this.formatMemoryUsage(memoryData.heapTotal),
|
|
285
|
+
[import_opticore_translator2.TranslationLoader.t("memoryUsedExecution", this.localLanguage)]: this.formatMemoryUsage(memoryData.heapUsed),
|
|
286
|
+
[import_opticore_translator2.TranslationLoader.t("externalMemory", this.localLanguage)]: this.formatMemoryUsage(memoryData.external),
|
|
287
|
+
[import_opticore_translator2.TranslationLoader.t("memoryUsageUser", this.localLanguage)]: this.formatMemoryUsage(import_node_process2.default.cpuUsage().user),
|
|
288
|
+
[import_opticore_translator2.TranslationLoader.t("memoryUsageSystem", this.localLanguage)]: this.formatMemoryUsage(import_node_process2.default.cpuUsage().system)
|
|
310
289
|
};
|
|
311
290
|
return {
|
|
312
|
-
"rss": data[
|
|
313
|
-
"heapTotal": data[
|
|
314
|
-
"heapUsed": data[
|
|
315
|
-
"external": data[
|
|
316
|
-
"user": data[
|
|
317
|
-
"system": data[
|
|
291
|
+
"rss": data[import_opticore_translator2.TranslationLoader.t("totalMemoryAllocated", this.localLanguage)],
|
|
292
|
+
"heapTotal": data[import_opticore_translator2.TranslationLoader.t("sizeAllocatedHeap", this.localLanguage)],
|
|
293
|
+
"heapUsed": data[import_opticore_translator2.TranslationLoader.t("memoryUsedExecution", this.localLanguage)],
|
|
294
|
+
"external": data[import_opticore_translator2.TranslationLoader.t("externalMemory", this.localLanguage)],
|
|
295
|
+
"user": data[import_opticore_translator2.TranslationLoader.t("memoryUsageUser", this.localLanguage)],
|
|
296
|
+
"system": data[import_opticore_translator2.TranslationLoader.t("memoryUsageSystem", this.localLanguage)],
|
|
318
297
|
"pid": import_node_process2.default.pid
|
|
319
298
|
};
|
|
320
299
|
}
|
|
@@ -326,7 +305,7 @@ var CoreService = class {
|
|
|
326
305
|
const endTime = import_node_process2.default.hrtime(startTime);
|
|
327
306
|
const executionTime = (endTime[0] * 1e9 + endTime[1]) / 1e6;
|
|
328
307
|
return {
|
|
329
|
-
"projectPath":
|
|
308
|
+
"projectPath": path.join(import_node_process2.default.cwd()),
|
|
330
309
|
"startingTime": `${executionTime.toFixed(5)} ms`
|
|
331
310
|
};
|
|
332
311
|
}
|
|
@@ -339,7 +318,7 @@ var CoreService = class {
|
|
|
339
318
|
*/
|
|
340
319
|
getEnvFileLoading(filePath) {
|
|
341
320
|
try {
|
|
342
|
-
const fullPath =
|
|
321
|
+
const fullPath = path.resolve(import_node_process2.default.cwd(), filePath);
|
|
343
322
|
if (fs.existsSync(fullPath)) {
|
|
344
323
|
const env = fs.readFileSync(fullPath, "utf-8");
|
|
345
324
|
const lines = env.split("\n");
|
|
@@ -357,7 +336,7 @@ var CoreService = class {
|
|
|
357
336
|
title: "EnvFileLoading",
|
|
358
337
|
errorType: err.code,
|
|
359
338
|
stackTrace: err.stack,
|
|
360
|
-
httpCodeValue:
|
|
339
|
+
httpCodeValue: import_opticore_http_response.HttpStatusCode.INTERNAL_SERVER_ERROR
|
|
361
340
|
});
|
|
362
341
|
}
|
|
363
342
|
}
|
|
@@ -370,16 +349,16 @@ var CoreService = class {
|
|
|
370
349
|
*/
|
|
371
350
|
getServerRunningMode(development, production) {
|
|
372
351
|
try {
|
|
373
|
-
|
|
352
|
+
loaderTranslationFile(this.localLanguage);
|
|
374
353
|
this.getEnvFileLoading(".env");
|
|
375
|
-
const env = (0, import_opticore_env_access2.getEnvironnementValue)(
|
|
354
|
+
const env = (0, import_opticore_env_access2.getEnvironnementValue)(path.join(envPath));
|
|
376
355
|
const isDevelopment = env.devEnv === development && env.prodEnv === "";
|
|
377
356
|
if (isDevelopment) {
|
|
378
|
-
return `${
|
|
357
|
+
return `${import_opticore_translator2.TranslationLoader.t("serverRunning", this.localLanguage)} ${import_ansi_colors3.default.bgBlue(`${import_ansi_colors3.default.bold(`${development}`)}`)} mode`;
|
|
379
358
|
} else if (!isDevelopment) {
|
|
380
|
-
return `${
|
|
359
|
+
return `${import_opticore_translator2.TranslationLoader.t("serverRunning", this.localLanguage)} ${import_ansi_colors3.default.bgBlue(`${import_ansi_colors3.default.bold(`${production}`)}`)} mode`;
|
|
381
360
|
} else {
|
|
382
|
-
return `${
|
|
361
|
+
return `${import_opticore_translator2.TranslationLoader.t("serverRunning", this.localLanguage)} ${import_ansi_colors3.default.bgBlue(`${import_ansi_colors3.default.bold(`${development}`)}`)} mode`;
|
|
383
362
|
}
|
|
384
363
|
} catch (err) {
|
|
385
364
|
SLogger(this.environmentPath).error({
|
|
@@ -387,25 +366,25 @@ var CoreService = class {
|
|
|
387
366
|
title: "serverRunning mode",
|
|
388
367
|
errorType: err.code,
|
|
389
368
|
stackTrace: err.stack,
|
|
390
|
-
httpCodeValue:
|
|
369
|
+
httpCodeValue: import_opticore_http_response.HttpStatusCode.INTERNAL_SERVER_ERROR
|
|
391
370
|
});
|
|
392
371
|
}
|
|
393
372
|
}
|
|
394
373
|
infoServer(nodeVersion, startingTime, host, port) {
|
|
395
374
|
try {
|
|
396
|
-
|
|
397
|
-
const
|
|
398
|
-
const msg5 =
|
|
375
|
+
loaderTranslationFile(this.localLanguage);
|
|
376
|
+
const getEnvironment = (0, import_opticore_env_access2.getEnvironnementValue)(this.environmentPath);
|
|
377
|
+
const msg5 = getEnvironment.protocolTransfert === "" ? import_ansi_colors3.default.underline(`http://${host}:${port}`) : import_ansi_colors3.default.underline(`${getEnvironment.protocolTransfert}://${host}:${port}`);
|
|
399
378
|
const messages = [
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
this.getServerRunningMode(
|
|
379
|
+
import_opticore_translator2.TranslationLoader.t("webServerListening", this.localLanguage),
|
|
380
|
+
import_opticore_translator2.TranslationLoader.t("webServerUsingNodeVersion", this.localLanguage, { nodeVersion: this.getVersions().nodeVersion }),
|
|
381
|
+
import_opticore_translator2.TranslationLoader.t("startTime", this.localLanguage, { startTime: this.getProjectInfo().startingTime }),
|
|
382
|
+
this.getServerRunningMode(import_opticore_translator2.TranslationLoader.t("runningModeDev", this.localLanguage), import_opticore_translator2.TranslationLoader.t("runningModeProd", this.localLanguage))
|
|
404
383
|
];
|
|
405
384
|
const maxLength = Math.max(...messages.map((m) => {
|
|
406
385
|
return m.replace(/\u001b\[[0-9]{1,2}m/g, "").length;
|
|
407
386
|
})) + 4;
|
|
408
|
-
console.log(import_chalk.default.blackBright(`Tailing Web Server log file (${
|
|
387
|
+
console.log(import_chalk.default.blackBright(`Tailing Web Server log file (${path.join(path.basename(import_node_process2.default.cwd()), "logs", "app.log")})`));
|
|
409
388
|
const border = import_chalk.default.bgGreen.white(" ".repeat(maxLength));
|
|
410
389
|
console.log(border);
|
|
411
390
|
messages.forEach((msg) => {
|
|
@@ -418,9 +397,9 @@ var CoreService = class {
|
|
|
418
397
|
this.serverLogger.serverLog({
|
|
419
398
|
timestamp: (/* @__PURE__ */ new Date()).toString(),
|
|
420
399
|
level: "SERVER",
|
|
421
|
-
title:
|
|
422
|
-
typeName:
|
|
423
|
-
message:
|
|
400
|
+
title: import_opticore_translator2.TranslationLoader.t("serverRunningTitle", this.localLanguage),
|
|
401
|
+
typeName: import_opticore_translator2.TranslationLoader.t("opticoreServerTypeName", this.localLanguage),
|
|
402
|
+
message: import_opticore_translator2.TranslationLoader.t("serverRunningAt", this.localLanguage, { server: msg5 })
|
|
424
403
|
});
|
|
425
404
|
} catch (err) {
|
|
426
405
|
SLogger(this.environmentPath).error({
|
|
@@ -428,12 +407,12 @@ var CoreService = class {
|
|
|
428
407
|
title: "server",
|
|
429
408
|
errorType: err.code,
|
|
430
409
|
stackTrace: err.stack,
|
|
431
|
-
httpCodeValue:
|
|
410
|
+
httpCodeValue: import_opticore_http_response.HttpStatusCode.INTERNAL_SERVER_ERROR
|
|
432
411
|
});
|
|
433
412
|
}
|
|
434
413
|
}
|
|
435
414
|
coreListenerEventLoaderModuleService(kernelModule) {
|
|
436
|
-
|
|
415
|
+
loaderTranslationFile(this.localLanguage);
|
|
437
416
|
let router = [];
|
|
438
417
|
let dbCon;
|
|
439
418
|
kernelModule.forEach((module2) => {
|
|
@@ -450,9 +429,9 @@ var CoreService = class {
|
|
|
450
429
|
})();
|
|
451
430
|
} else {
|
|
452
431
|
const stackTrace = STraceError(
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
432
|
+
import_opticore_translator2.TranslationLoader.t("loadedModulesError", this.localLanguage),
|
|
433
|
+
import_opticore_translator2.TranslationLoader.t("loadedModules", this.localLanguage),
|
|
434
|
+
import_opticore_http_response.HttpStatusCode.NOT_ACCEPTABLE,
|
|
456
435
|
true
|
|
457
436
|
);
|
|
458
437
|
throw new Error(stackTrace.message);
|
|
@@ -462,7 +441,7 @@ var CoreService = class {
|
|
|
462
441
|
|
|
463
442
|
// src/application/service/serverStartError.service.ts
|
|
464
443
|
var import_opticore_catch_exception_error3 = require("opticore-catch-exception-error");
|
|
465
|
-
var
|
|
444
|
+
var import_opticore_http_response2 = require("opticore-http-response");
|
|
466
445
|
var SServerStartError = (err, environnementPath) => {
|
|
467
446
|
if (err.name) {
|
|
468
447
|
for (const [key, code] of Object.entries(import_opticore_catch_exception_error3.CErrorName)) {
|
|
@@ -472,7 +451,7 @@ var SServerStartError = (err, environnementPath) => {
|
|
|
472
451
|
title: code,
|
|
473
452
|
errorType: code,
|
|
474
453
|
stackTrace: err.stack,
|
|
475
|
-
httpCodeValue:
|
|
454
|
+
httpCodeValue: import_opticore_http_response2.HttpStatusCode.INTERNAL_SERVER_ERROR
|
|
476
455
|
});
|
|
477
456
|
break;
|
|
478
457
|
}
|
|
@@ -485,7 +464,7 @@ var SServerStartError = (err, environnementPath) => {
|
|
|
485
464
|
title: code,
|
|
486
465
|
errorType: key,
|
|
487
466
|
stackTrace: err.stack,
|
|
488
|
-
httpCodeValue:
|
|
467
|
+
httpCodeValue: import_opticore_http_response2.HttpStatusCode.INTERNAL_SERVER_ERROR
|
|
489
468
|
});
|
|
490
469
|
break;
|
|
491
470
|
}
|
|
@@ -496,32 +475,18 @@ var SServerStartError = (err, environnementPath) => {
|
|
|
496
475
|
// src/core/webServer.core.ts
|
|
497
476
|
var import_opticore_request_call_event = require("opticore-request-call-event");
|
|
498
477
|
var import_opticore_dependency_inject2 = require("opticore-dependency-inject");
|
|
499
|
-
var
|
|
500
|
-
var
|
|
501
|
-
|
|
502
|
-
// src/core/providers/dependencies.provider.ts
|
|
503
|
-
var import_opticore_dependency_inject = require("opticore-dependency-inject");
|
|
504
|
-
|
|
505
|
-
// src/application/service/dependencies.service.ts
|
|
506
|
-
var dependencies = [
|
|
507
|
-
{
|
|
508
|
-
key: "translateWebAppCoreLanguageLoader",
|
|
509
|
-
factory: () => new TranslateWebAppCoreLanguageLoader(),
|
|
510
|
-
scope: "singleton"
|
|
511
|
-
}
|
|
512
|
-
];
|
|
513
|
-
|
|
514
|
-
// src/core/providers/dependencies.provider.ts
|
|
515
|
-
var dependenciesContainerProvider = (localLang) => {
|
|
516
|
-
return new import_opticore_dependency_inject.SContainer(localLang, dependencies);
|
|
517
|
-
};
|
|
518
|
-
|
|
519
|
-
// src/core/webServer.core.ts
|
|
478
|
+
var import_opticore_http_response3 = require("opticore-http-response");
|
|
479
|
+
var import_opticore_translator3 = require("opticore-translator");
|
|
520
480
|
var WebServerCore = class {
|
|
481
|
+
serverUtility;
|
|
482
|
+
expressApp = (0, import_opticore_express2.express)();
|
|
483
|
+
localLanguage;
|
|
484
|
+
loggerConfig;
|
|
485
|
+
routerExpressApp;
|
|
486
|
+
getEnvironment;
|
|
487
|
+
environmentPath;
|
|
488
|
+
serverListenEvent;
|
|
521
489
|
constructor(app, loggerConfig2, localLanguage, environmentPath, corsOriginOptions) {
|
|
522
|
-
this.expressApp = (0, import_opticore_express2.express)();
|
|
523
|
-
this.dependenciesRegistered = false;
|
|
524
|
-
this.translateWebAppCoreLanguageLoader = dependenciesContainerProvider(localLanguage).resolve("translateWebAppCoreLanguageLoader");
|
|
525
490
|
this.stackTraceErrorHandling(localLanguage);
|
|
526
491
|
this.getEnvironment = (0, import_opticore_env_access3.getEnvironnementValue)(environmentPath);
|
|
527
492
|
this.routerExpressApp = app;
|
|
@@ -538,26 +503,19 @@ var WebServerCore = class {
|
|
|
538
503
|
}
|
|
539
504
|
registerDependencies(dependencies2) {
|
|
540
505
|
try {
|
|
541
|
-
|
|
542
|
-
return;
|
|
543
|
-
}
|
|
544
|
-
containerDependency.register("TranslateWebAppCoreLanguageLoader", new TranslateWebAppCoreLanguageLoader());
|
|
545
|
-
dependencies2.forEach((value, key) => {
|
|
546
|
-
containerDependency.register(key, value);
|
|
547
|
-
});
|
|
548
|
-
this.dependenciesRegistered = true;
|
|
506
|
+
dependenciesContainerProvider(this.localLanguage).getServices();
|
|
549
507
|
} catch (err) {
|
|
550
508
|
SLogger(this.environmentPath).error({
|
|
551
509
|
message: err.message,
|
|
552
510
|
title: "Register Dependencies",
|
|
553
511
|
errorType: err.code,
|
|
554
512
|
stackTrace: err.stack,
|
|
555
|
-
httpCodeValue:
|
|
513
|
+
httpCodeValue: import_opticore_http_response3.HttpStatusCode.INTERNAL_SERVER_ERROR
|
|
556
514
|
});
|
|
557
515
|
}
|
|
558
516
|
}
|
|
559
517
|
onStartServer(routers, databaseCallback, dependenciesProvider) {
|
|
560
|
-
|
|
518
|
+
loaderTranslationFile(this.localLanguage);
|
|
561
519
|
if (this.getEnvironment.appPort === "" && Number(this.getEnvironment.appPort) === 0) {
|
|
562
520
|
this.serverListenEvent.hostPortUndefined(Number(this.getEnvironment.appPort));
|
|
563
521
|
} else if (this.getEnvironment.appHost === "") {
|
|
@@ -566,21 +524,21 @@ var WebServerCore = class {
|
|
|
566
524
|
this.serverListenEvent.portUndefined();
|
|
567
525
|
} else if (this.localLanguage === "") {
|
|
568
526
|
SLogger(this.environmentPath).error({
|
|
569
|
-
message:
|
|
570
|
-
title:
|
|
571
|
-
errorType:
|
|
527
|
+
message: import_opticore_translator3.TranslationLoader.t("noDefaultLocalLang", this.localLanguage),
|
|
528
|
+
title: import_opticore_translator3.TranslationLoader.t("noLocalLang", this.localLanguage),
|
|
529
|
+
errorType: import_opticore_translator3.TranslationLoader.t("localLangMissing", this.localLanguage),
|
|
572
530
|
stackTrace: void 0,
|
|
573
|
-
httpCodeValue:
|
|
531
|
+
httpCodeValue: import_opticore_http_response3.HttpStatusCode.NOT_FOUND
|
|
574
532
|
});
|
|
575
533
|
} else {
|
|
576
534
|
return this.expressApp.listen(
|
|
577
535
|
Number(this.getEnvironment.appPort),
|
|
578
536
|
() => {
|
|
579
|
-
|
|
537
|
+
loaderTranslationFile(this.localLanguage);
|
|
580
538
|
try {
|
|
581
539
|
databaseCallback(this.getEnvironment);
|
|
582
540
|
new import_opticore_dependency_inject2.SContainer(this.localLanguage, dependenciesProvider);
|
|
583
|
-
this.expressApp.use(import_opticore_express2.express.static(
|
|
541
|
+
this.expressApp.use(import_opticore_express2.express.static(path2.join(import_node_process3.default.cwd(), "public/template")));
|
|
584
542
|
this.registerRoutes(routers);
|
|
585
543
|
} catch (err) {
|
|
586
544
|
SServerStartError(err, this.environmentPath);
|
|
@@ -590,7 +548,7 @@ var WebServerCore = class {
|
|
|
590
548
|
}
|
|
591
549
|
}
|
|
592
550
|
onListeningOnServerEvent(serverWeb) {
|
|
593
|
-
|
|
551
|
+
loaderTranslationFile(this.localLanguage);
|
|
594
552
|
serverWeb.on(import_opticore_catch_exception_error4.CEventNameError.error, (err) => {
|
|
595
553
|
this.serverListenEvent.onEventError(err);
|
|
596
554
|
}).on(import_opticore_catch_exception_error4.CEventNameError.close, () => {
|
|
@@ -602,7 +560,7 @@ var WebServerCore = class {
|
|
|
602
560
|
});
|
|
603
561
|
}
|
|
604
562
|
onRequestOnServerEvent(serverWeb) {
|
|
605
|
-
|
|
563
|
+
loaderTranslationFile(this.localLanguage);
|
|
606
564
|
serverWeb.on(import_opticore_catch_exception_error4.CEventNameError.request, (req, res) => {
|
|
607
565
|
(0, import_opticore_request_call_event.requestCallsEvent)(
|
|
608
566
|
req,
|
package/dist/index.d.cts
CHANGED
|
@@ -22,8 +22,6 @@ declare class WebServerCore {
|
|
|
22
22
|
private readonly getEnvironment;
|
|
23
23
|
private readonly environmentPath;
|
|
24
24
|
private serverListenEvent;
|
|
25
|
-
private translateWebAppCoreLanguageLoader;
|
|
26
|
-
private dependenciesRegistered;
|
|
27
25
|
constructor(app: express.Application, loggerConfig: LoggerCore, localLanguage: string, environmentPath: any, corsOriginOptions?: Partial<CorsOptions>);
|
|
28
26
|
registerDependencies(dependencies: Map<TDependencyKey, any>): void;
|
|
29
27
|
onStartServer(routers: TFeatureRoutes[], databaseCallback: (env: any) => void, dependenciesProvider?: TDependency[]): any;
|
package/dist/index.d.ts
CHANGED
|
@@ -22,8 +22,6 @@ declare class WebServerCore {
|
|
|
22
22
|
private readonly getEnvironment;
|
|
23
23
|
private readonly environmentPath;
|
|
24
24
|
private serverListenEvent;
|
|
25
|
-
private translateWebAppCoreLanguageLoader;
|
|
26
|
-
private dependenciesRegistered;
|
|
27
25
|
constructor(app: express.Application, loggerConfig: LoggerCore, localLanguage: string, environmentPath: any, corsOriginOptions?: Partial<CorsOptions>);
|
|
28
26
|
registerDependencies(dependencies: Map<TDependencyKey, any>): void;
|
|
29
27
|
onStartServer(routers: TFeatureRoutes[], databaseCallback: (env: any) => void, dependenciesProvider?: TDependency[]): any;
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// src/core/webServer.core.ts
|
|
2
|
-
import * as
|
|
2
|
+
import * as path2 from "path";
|
|
3
3
|
import process4 from "node:process";
|
|
4
4
|
import corsOrigin from "cors";
|
|
5
5
|
import { CEventNameError as eventName2, ServerListenEventError as ServerListenEventError2 } from "opticore-catch-exception-error";
|
|
@@ -68,13 +68,13 @@ function eventProcessHandler(localeLanguage) {
|
|
|
68
68
|
// src/application/service/core.service.ts
|
|
69
69
|
import process3 from "node:process";
|
|
70
70
|
import chalk from "chalk";
|
|
71
|
-
import * as
|
|
71
|
+
import * as path from "path";
|
|
72
72
|
import * as fs from "fs";
|
|
73
73
|
import colors3 from "ansi-colors";
|
|
74
|
-
import { HttpStatusCode
|
|
75
|
-
import { TranslationLoader as
|
|
74
|
+
import { HttpStatusCode, HttpStatusCode as status } from "opticore-http-response";
|
|
75
|
+
import { TranslationLoader as TranslationLoader2 } from "opticore-translator";
|
|
76
76
|
import { getEnvironnementValue as getEnvironnementValue2 } from "opticore-env-access";
|
|
77
|
-
import { LoggerCore as
|
|
77
|
+
import { LoggerCore as LoggerCore3 } from "opticore-logger";
|
|
78
78
|
|
|
79
79
|
// src/core/helpers/modulesLoaded.utils.ts
|
|
80
80
|
import colors2 from "ansi-colors";
|
|
@@ -152,10 +152,9 @@ var loggerConfig = (envDir) => {
|
|
|
152
152
|
};
|
|
153
153
|
};
|
|
154
154
|
|
|
155
|
-
// src/
|
|
156
|
-
import
|
|
157
|
-
|
|
158
|
-
import { TranslationLoader as TranslationLoader2 } from "opticore-translator";
|
|
155
|
+
// src/utils/envPath.utils.ts
|
|
156
|
+
import process2 from "process";
|
|
157
|
+
var envPath = process2.cwd() + "/config/env/.env";
|
|
159
158
|
|
|
160
159
|
// src/application/service/logger.service.ts
|
|
161
160
|
import { LoggerCore } from "opticore-logger";
|
|
@@ -163,70 +162,53 @@ var SLogger = (environmentPath) => {
|
|
|
163
162
|
return new LoggerCore(loggerConfig(environmentPath));
|
|
164
163
|
};
|
|
165
164
|
|
|
166
|
-
// src/core/
|
|
167
|
-
import {
|
|
168
|
-
var import_meta = {};
|
|
169
|
-
var TranslateWebAppCoreLanguageLoader = class {
|
|
170
|
-
translateLanguageLoader(localLang, environmentPath) {
|
|
171
|
-
try {
|
|
172
|
-
const require2 = createRequire(import_meta.url);
|
|
173
|
-
const packagePath = path.dirname(require2.resolve("opticore-webapp"));
|
|
174
|
-
const translateMsgJsonFilePath = path.join(packagePath, "utils", "translations");
|
|
175
|
-
TranslationLoader2.loadTranslations(translateMsgJsonFilePath);
|
|
176
|
-
} catch (error) {
|
|
177
|
-
SLogger(environmentPath).error(this.handleError(error, localLang));
|
|
178
|
-
}
|
|
179
|
-
}
|
|
180
|
-
handleError(error, localLang) {
|
|
181
|
-
return {
|
|
182
|
-
message: TranslationLoader2.t(error.message, localLang),
|
|
183
|
-
title: TranslationLoader2.t("readdir", localLang),
|
|
184
|
-
errorType: TranslationLoader2.t("ENOENT:NoSuchFileOrDir", localLang),
|
|
185
|
-
stackTrace: error.stack,
|
|
186
|
-
httpCodeValue: HttpStatusCode.INTERNAL_SERVER_ERROR
|
|
187
|
-
};
|
|
188
|
-
}
|
|
189
|
-
};
|
|
165
|
+
// src/core/providers/dependencies.provider.ts
|
|
166
|
+
import { SContainer } from "opticore-dependency-inject";
|
|
190
167
|
|
|
191
|
-
// src/
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
}
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
}
|
|
205
|
-
return this.dependencies.get(key);
|
|
168
|
+
// src/application/service/dependencies.service.ts
|
|
169
|
+
import { LoggerCore as LoggerCore2 } from "opticore-logger";
|
|
170
|
+
import { serverLogger } from "opticore-server-logger";
|
|
171
|
+
var dependencies = [
|
|
172
|
+
{
|
|
173
|
+
key: "LoggerCore",
|
|
174
|
+
factory: () => new LoggerCore2(),
|
|
175
|
+
scope: "singleton"
|
|
176
|
+
},
|
|
177
|
+
{
|
|
178
|
+
key: "serverLogger",
|
|
179
|
+
factory: () => new serverLogger(),
|
|
180
|
+
scope: "singleton"
|
|
206
181
|
}
|
|
207
|
-
|
|
208
|
-
var containerDependency = new Container();
|
|
182
|
+
];
|
|
209
183
|
|
|
210
|
-
// src/core/
|
|
211
|
-
|
|
212
|
-
return
|
|
213
|
-
}
|
|
184
|
+
// src/core/providers/dependencies.provider.ts
|
|
185
|
+
var dependenciesContainerProvider = (localLang) => {
|
|
186
|
+
return new SContainer(localLang, dependencies);
|
|
187
|
+
};
|
|
214
188
|
|
|
215
|
-
// src/
|
|
216
|
-
import
|
|
217
|
-
var
|
|
189
|
+
// src/application/service/loaderTranslationFile.service.ts
|
|
190
|
+
import { translationLoaderConfig } from "opticore-loader-translation";
|
|
191
|
+
var loaderTranslationFile = (localLanguage) => {
|
|
192
|
+
return translationLoaderConfig({
|
|
193
|
+
packageName: "opticore-webapp",
|
|
194
|
+
locationTranslationFile: ["utils", "translations"],
|
|
195
|
+
localLang: localLanguage
|
|
196
|
+
});
|
|
197
|
+
};
|
|
218
198
|
|
|
219
199
|
// src/application/service/core.service.ts
|
|
220
|
-
import { serverLogger } from "opticore-server-logger";
|
|
221
200
|
var CoreService = class {
|
|
201
|
+
loggerConfig;
|
|
202
|
+
logger;
|
|
203
|
+
serverLogger;
|
|
204
|
+
localLanguage;
|
|
205
|
+
environmentPath;
|
|
222
206
|
constructor(localLang, environmentPath) {
|
|
223
|
-
|
|
224
|
-
containerDependency.register("serverLogger", new serverLogger());
|
|
225
|
-
this.translateWebAppCoreLanguageLoader = Inject("TranslateWebAppCoreLanguageLoader");
|
|
226
|
-
this.serverLogger = Inject("serverLogger");
|
|
227
|
-
this.loggerConfig = new LoggerCore2(loggerConfig(environmentPath));
|
|
207
|
+
this.loggerConfig = new LoggerCore3(loggerConfig(environmentPath));
|
|
228
208
|
this.environmentPath = environmentPath;
|
|
229
209
|
this.localLanguage = localLang;
|
|
210
|
+
this.logger = dependenciesContainerProvider(localLang).resolve("LoggerCore");
|
|
211
|
+
this.serverLogger = dependenciesContainerProvider(localLang).resolve("serverLogger");
|
|
230
212
|
}
|
|
231
213
|
/**
|
|
232
214
|
*
|
|
@@ -262,23 +244,23 @@ var CoreService = class {
|
|
|
262
244
|
* and Memory usage system
|
|
263
245
|
*/
|
|
264
246
|
getUsageMemory() {
|
|
265
|
-
|
|
247
|
+
loaderTranslationFile(this.localLanguage);
|
|
266
248
|
const memoryData = process3.memoryUsage();
|
|
267
249
|
const data = {
|
|
268
|
-
[
|
|
269
|
-
[
|
|
270
|
-
[
|
|
271
|
-
[
|
|
272
|
-
[
|
|
273
|
-
[
|
|
250
|
+
[TranslationLoader2.t("totalMemoryAllocated", this.localLanguage)]: this.formatMemoryUsage(memoryData.rss),
|
|
251
|
+
[TranslationLoader2.t("sizeAllocatedHeap", this.localLanguage)]: this.formatMemoryUsage(memoryData.heapTotal),
|
|
252
|
+
[TranslationLoader2.t("memoryUsedExecution", this.localLanguage)]: this.formatMemoryUsage(memoryData.heapUsed),
|
|
253
|
+
[TranslationLoader2.t("externalMemory", this.localLanguage)]: this.formatMemoryUsage(memoryData.external),
|
|
254
|
+
[TranslationLoader2.t("memoryUsageUser", this.localLanguage)]: this.formatMemoryUsage(process3.cpuUsage().user),
|
|
255
|
+
[TranslationLoader2.t("memoryUsageSystem", this.localLanguage)]: this.formatMemoryUsage(process3.cpuUsage().system)
|
|
274
256
|
};
|
|
275
257
|
return {
|
|
276
|
-
"rss": data[
|
|
277
|
-
"heapTotal": data[
|
|
278
|
-
"heapUsed": data[
|
|
279
|
-
"external": data[
|
|
280
|
-
"user": data[
|
|
281
|
-
"system": data[
|
|
258
|
+
"rss": data[TranslationLoader2.t("totalMemoryAllocated", this.localLanguage)],
|
|
259
|
+
"heapTotal": data[TranslationLoader2.t("sizeAllocatedHeap", this.localLanguage)],
|
|
260
|
+
"heapUsed": data[TranslationLoader2.t("memoryUsedExecution", this.localLanguage)],
|
|
261
|
+
"external": data[TranslationLoader2.t("externalMemory", this.localLanguage)],
|
|
262
|
+
"user": data[TranslationLoader2.t("memoryUsageUser", this.localLanguage)],
|
|
263
|
+
"system": data[TranslationLoader2.t("memoryUsageSystem", this.localLanguage)],
|
|
282
264
|
"pid": process3.pid
|
|
283
265
|
};
|
|
284
266
|
}
|
|
@@ -290,7 +272,7 @@ var CoreService = class {
|
|
|
290
272
|
const endTime = process3.hrtime(startTime);
|
|
291
273
|
const executionTime = (endTime[0] * 1e9 + endTime[1]) / 1e6;
|
|
292
274
|
return {
|
|
293
|
-
"projectPath":
|
|
275
|
+
"projectPath": path.join(process3.cwd()),
|
|
294
276
|
"startingTime": `${executionTime.toFixed(5)} ms`
|
|
295
277
|
};
|
|
296
278
|
}
|
|
@@ -303,7 +285,7 @@ var CoreService = class {
|
|
|
303
285
|
*/
|
|
304
286
|
getEnvFileLoading(filePath) {
|
|
305
287
|
try {
|
|
306
|
-
const fullPath =
|
|
288
|
+
const fullPath = path.resolve(process3.cwd(), filePath);
|
|
307
289
|
if (fs.existsSync(fullPath)) {
|
|
308
290
|
const env = fs.readFileSync(fullPath, "utf-8");
|
|
309
291
|
const lines = env.split("\n");
|
|
@@ -321,7 +303,7 @@ var CoreService = class {
|
|
|
321
303
|
title: "EnvFileLoading",
|
|
322
304
|
errorType: err.code,
|
|
323
305
|
stackTrace: err.stack,
|
|
324
|
-
httpCodeValue:
|
|
306
|
+
httpCodeValue: HttpStatusCode.INTERNAL_SERVER_ERROR
|
|
325
307
|
});
|
|
326
308
|
}
|
|
327
309
|
}
|
|
@@ -334,16 +316,16 @@ var CoreService = class {
|
|
|
334
316
|
*/
|
|
335
317
|
getServerRunningMode(development, production) {
|
|
336
318
|
try {
|
|
337
|
-
|
|
319
|
+
loaderTranslationFile(this.localLanguage);
|
|
338
320
|
this.getEnvFileLoading(".env");
|
|
339
|
-
const env = getEnvironnementValue2(
|
|
321
|
+
const env = getEnvironnementValue2(path.join(envPath));
|
|
340
322
|
const isDevelopment = env.devEnv === development && env.prodEnv === "";
|
|
341
323
|
if (isDevelopment) {
|
|
342
|
-
return `${
|
|
324
|
+
return `${TranslationLoader2.t("serverRunning", this.localLanguage)} ${colors3.bgBlue(`${colors3.bold(`${development}`)}`)} mode`;
|
|
343
325
|
} else if (!isDevelopment) {
|
|
344
|
-
return `${
|
|
326
|
+
return `${TranslationLoader2.t("serverRunning", this.localLanguage)} ${colors3.bgBlue(`${colors3.bold(`${production}`)}`)} mode`;
|
|
345
327
|
} else {
|
|
346
|
-
return `${
|
|
328
|
+
return `${TranslationLoader2.t("serverRunning", this.localLanguage)} ${colors3.bgBlue(`${colors3.bold(`${development}`)}`)} mode`;
|
|
347
329
|
}
|
|
348
330
|
} catch (err) {
|
|
349
331
|
SLogger(this.environmentPath).error({
|
|
@@ -351,25 +333,25 @@ var CoreService = class {
|
|
|
351
333
|
title: "serverRunning mode",
|
|
352
334
|
errorType: err.code,
|
|
353
335
|
stackTrace: err.stack,
|
|
354
|
-
httpCodeValue:
|
|
336
|
+
httpCodeValue: HttpStatusCode.INTERNAL_SERVER_ERROR
|
|
355
337
|
});
|
|
356
338
|
}
|
|
357
339
|
}
|
|
358
340
|
infoServer(nodeVersion, startingTime, host, port) {
|
|
359
341
|
try {
|
|
360
|
-
|
|
361
|
-
const
|
|
362
|
-
const msg5 =
|
|
342
|
+
loaderTranslationFile(this.localLanguage);
|
|
343
|
+
const getEnvironment = getEnvironnementValue2(this.environmentPath);
|
|
344
|
+
const msg5 = getEnvironment.protocolTransfert === "" ? colors3.underline(`http://${host}:${port}`) : colors3.underline(`${getEnvironment.protocolTransfert}://${host}:${port}`);
|
|
363
345
|
const messages = [
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
this.getServerRunningMode(
|
|
346
|
+
TranslationLoader2.t("webServerListening", this.localLanguage),
|
|
347
|
+
TranslationLoader2.t("webServerUsingNodeVersion", this.localLanguage, { nodeVersion: this.getVersions().nodeVersion }),
|
|
348
|
+
TranslationLoader2.t("startTime", this.localLanguage, { startTime: this.getProjectInfo().startingTime }),
|
|
349
|
+
this.getServerRunningMode(TranslationLoader2.t("runningModeDev", this.localLanguage), TranslationLoader2.t("runningModeProd", this.localLanguage))
|
|
368
350
|
];
|
|
369
351
|
const maxLength = Math.max(...messages.map((m) => {
|
|
370
352
|
return m.replace(/\u001b\[[0-9]{1,2}m/g, "").length;
|
|
371
353
|
})) + 4;
|
|
372
|
-
console.log(chalk.blackBright(`Tailing Web Server log file (${
|
|
354
|
+
console.log(chalk.blackBright(`Tailing Web Server log file (${path.join(path.basename(process3.cwd()), "logs", "app.log")})`));
|
|
373
355
|
const border = chalk.bgGreen.white(" ".repeat(maxLength));
|
|
374
356
|
console.log(border);
|
|
375
357
|
messages.forEach((msg) => {
|
|
@@ -382,9 +364,9 @@ var CoreService = class {
|
|
|
382
364
|
this.serverLogger.serverLog({
|
|
383
365
|
timestamp: (/* @__PURE__ */ new Date()).toString(),
|
|
384
366
|
level: "SERVER",
|
|
385
|
-
title:
|
|
386
|
-
typeName:
|
|
387
|
-
message:
|
|
367
|
+
title: TranslationLoader2.t("serverRunningTitle", this.localLanguage),
|
|
368
|
+
typeName: TranslationLoader2.t("opticoreServerTypeName", this.localLanguage),
|
|
369
|
+
message: TranslationLoader2.t("serverRunningAt", this.localLanguage, { server: msg5 })
|
|
388
370
|
});
|
|
389
371
|
} catch (err) {
|
|
390
372
|
SLogger(this.environmentPath).error({
|
|
@@ -392,12 +374,12 @@ var CoreService = class {
|
|
|
392
374
|
title: "server",
|
|
393
375
|
errorType: err.code,
|
|
394
376
|
stackTrace: err.stack,
|
|
395
|
-
httpCodeValue:
|
|
377
|
+
httpCodeValue: HttpStatusCode.INTERNAL_SERVER_ERROR
|
|
396
378
|
});
|
|
397
379
|
}
|
|
398
380
|
}
|
|
399
381
|
coreListenerEventLoaderModuleService(kernelModule) {
|
|
400
|
-
|
|
382
|
+
loaderTranslationFile(this.localLanguage);
|
|
401
383
|
let router = [];
|
|
402
384
|
let dbCon;
|
|
403
385
|
kernelModule.forEach((module) => {
|
|
@@ -414,8 +396,8 @@ var CoreService = class {
|
|
|
414
396
|
})();
|
|
415
397
|
} else {
|
|
416
398
|
const stackTrace = STraceError(
|
|
417
|
-
|
|
418
|
-
|
|
399
|
+
TranslationLoader2.t("loadedModulesError", this.localLanguage),
|
|
400
|
+
TranslationLoader2.t("loadedModules", this.localLanguage),
|
|
419
401
|
status.NOT_ACCEPTABLE,
|
|
420
402
|
true
|
|
421
403
|
);
|
|
@@ -429,7 +411,7 @@ import {
|
|
|
429
411
|
CCodeError,
|
|
430
412
|
CErrorName
|
|
431
413
|
} from "opticore-catch-exception-error";
|
|
432
|
-
import { HttpStatusCode as
|
|
414
|
+
import { HttpStatusCode as HttpStatusCode2 } from "opticore-http-response";
|
|
433
415
|
var SServerStartError = (err, environnementPath) => {
|
|
434
416
|
if (err.name) {
|
|
435
417
|
for (const [key, code] of Object.entries(CErrorName)) {
|
|
@@ -439,7 +421,7 @@ var SServerStartError = (err, environnementPath) => {
|
|
|
439
421
|
title: code,
|
|
440
422
|
errorType: code,
|
|
441
423
|
stackTrace: err.stack,
|
|
442
|
-
httpCodeValue:
|
|
424
|
+
httpCodeValue: HttpStatusCode2.INTERNAL_SERVER_ERROR
|
|
443
425
|
});
|
|
444
426
|
break;
|
|
445
427
|
}
|
|
@@ -452,7 +434,7 @@ var SServerStartError = (err, environnementPath) => {
|
|
|
452
434
|
title: code,
|
|
453
435
|
errorType: key,
|
|
454
436
|
stackTrace: err.stack,
|
|
455
|
-
httpCodeValue:
|
|
437
|
+
httpCodeValue: HttpStatusCode2.INTERNAL_SERVER_ERROR
|
|
456
438
|
});
|
|
457
439
|
break;
|
|
458
440
|
}
|
|
@@ -463,32 +445,18 @@ var SServerStartError = (err, environnementPath) => {
|
|
|
463
445
|
// src/core/webServer.core.ts
|
|
464
446
|
import { requestCallsEvent } from "opticore-request-call-event";
|
|
465
447
|
import { SContainer as SContainer2 } from "opticore-dependency-inject";
|
|
466
|
-
import { HttpStatusCode as
|
|
467
|
-
import { TranslationLoader as
|
|
468
|
-
|
|
469
|
-
// src/core/providers/dependencies.provider.ts
|
|
470
|
-
import { SContainer } from "opticore-dependency-inject";
|
|
471
|
-
|
|
472
|
-
// src/application/service/dependencies.service.ts
|
|
473
|
-
var dependencies = [
|
|
474
|
-
{
|
|
475
|
-
key: "translateWebAppCoreLanguageLoader",
|
|
476
|
-
factory: () => new TranslateWebAppCoreLanguageLoader(),
|
|
477
|
-
scope: "singleton"
|
|
478
|
-
}
|
|
479
|
-
];
|
|
480
|
-
|
|
481
|
-
// src/core/providers/dependencies.provider.ts
|
|
482
|
-
var dependenciesContainerProvider = (localLang) => {
|
|
483
|
-
return new SContainer(localLang, dependencies);
|
|
484
|
-
};
|
|
485
|
-
|
|
486
|
-
// src/core/webServer.core.ts
|
|
448
|
+
import { HttpStatusCode as HttpStatusCode3 } from "opticore-http-response";
|
|
449
|
+
import { TranslationLoader as TranslationLoader3 } from "opticore-translator";
|
|
487
450
|
var WebServerCore = class {
|
|
451
|
+
serverUtility;
|
|
452
|
+
expressApp = express2();
|
|
453
|
+
localLanguage;
|
|
454
|
+
loggerConfig;
|
|
455
|
+
routerExpressApp;
|
|
456
|
+
getEnvironment;
|
|
457
|
+
environmentPath;
|
|
458
|
+
serverListenEvent;
|
|
488
459
|
constructor(app, loggerConfig2, localLanguage, environmentPath, corsOriginOptions) {
|
|
489
|
-
this.expressApp = express2();
|
|
490
|
-
this.dependenciesRegistered = false;
|
|
491
|
-
this.translateWebAppCoreLanguageLoader = dependenciesContainerProvider(localLanguage).resolve("translateWebAppCoreLanguageLoader");
|
|
492
460
|
this.stackTraceErrorHandling(localLanguage);
|
|
493
461
|
this.getEnvironment = getEnvironnementValue3(environmentPath);
|
|
494
462
|
this.routerExpressApp = app;
|
|
@@ -505,26 +473,19 @@ var WebServerCore = class {
|
|
|
505
473
|
}
|
|
506
474
|
registerDependencies(dependencies2) {
|
|
507
475
|
try {
|
|
508
|
-
|
|
509
|
-
return;
|
|
510
|
-
}
|
|
511
|
-
containerDependency.register("TranslateWebAppCoreLanguageLoader", new TranslateWebAppCoreLanguageLoader());
|
|
512
|
-
dependencies2.forEach((value, key) => {
|
|
513
|
-
containerDependency.register(key, value);
|
|
514
|
-
});
|
|
515
|
-
this.dependenciesRegistered = true;
|
|
476
|
+
dependenciesContainerProvider(this.localLanguage).getServices();
|
|
516
477
|
} catch (err) {
|
|
517
478
|
SLogger(this.environmentPath).error({
|
|
518
479
|
message: err.message,
|
|
519
480
|
title: "Register Dependencies",
|
|
520
481
|
errorType: err.code,
|
|
521
482
|
stackTrace: err.stack,
|
|
522
|
-
httpCodeValue:
|
|
483
|
+
httpCodeValue: HttpStatusCode3.INTERNAL_SERVER_ERROR
|
|
523
484
|
});
|
|
524
485
|
}
|
|
525
486
|
}
|
|
526
487
|
onStartServer(routers, databaseCallback, dependenciesProvider) {
|
|
527
|
-
|
|
488
|
+
loaderTranslationFile(this.localLanguage);
|
|
528
489
|
if (this.getEnvironment.appPort === "" && Number(this.getEnvironment.appPort) === 0) {
|
|
529
490
|
this.serverListenEvent.hostPortUndefined(Number(this.getEnvironment.appPort));
|
|
530
491
|
} else if (this.getEnvironment.appHost === "") {
|
|
@@ -533,21 +494,21 @@ var WebServerCore = class {
|
|
|
533
494
|
this.serverListenEvent.portUndefined();
|
|
534
495
|
} else if (this.localLanguage === "") {
|
|
535
496
|
SLogger(this.environmentPath).error({
|
|
536
|
-
message:
|
|
537
|
-
title:
|
|
538
|
-
errorType:
|
|
497
|
+
message: TranslationLoader3.t("noDefaultLocalLang", this.localLanguage),
|
|
498
|
+
title: TranslationLoader3.t("noLocalLang", this.localLanguage),
|
|
499
|
+
errorType: TranslationLoader3.t("localLangMissing", this.localLanguage),
|
|
539
500
|
stackTrace: void 0,
|
|
540
|
-
httpCodeValue:
|
|
501
|
+
httpCodeValue: HttpStatusCode3.NOT_FOUND
|
|
541
502
|
});
|
|
542
503
|
} else {
|
|
543
504
|
return this.expressApp.listen(
|
|
544
505
|
Number(this.getEnvironment.appPort),
|
|
545
506
|
() => {
|
|
546
|
-
|
|
507
|
+
loaderTranslationFile(this.localLanguage);
|
|
547
508
|
try {
|
|
548
509
|
databaseCallback(this.getEnvironment);
|
|
549
510
|
new SContainer2(this.localLanguage, dependenciesProvider);
|
|
550
|
-
this.expressApp.use(express2.static(
|
|
511
|
+
this.expressApp.use(express2.static(path2.join(process4.cwd(), "public/template")));
|
|
551
512
|
this.registerRoutes(routers);
|
|
552
513
|
} catch (err) {
|
|
553
514
|
SServerStartError(err, this.environmentPath);
|
|
@@ -557,7 +518,7 @@ var WebServerCore = class {
|
|
|
557
518
|
}
|
|
558
519
|
}
|
|
559
520
|
onListeningOnServerEvent(serverWeb) {
|
|
560
|
-
|
|
521
|
+
loaderTranslationFile(this.localLanguage);
|
|
561
522
|
serverWeb.on(eventName2.error, (err) => {
|
|
562
523
|
this.serverListenEvent.onEventError(err);
|
|
563
524
|
}).on(eventName2.close, () => {
|
|
@@ -569,7 +530,7 @@ var WebServerCore = class {
|
|
|
569
530
|
});
|
|
570
531
|
}
|
|
571
532
|
onRequestOnServerEvent(serverWeb) {
|
|
572
|
-
|
|
533
|
+
loaderTranslationFile(this.localLanguage);
|
|
573
534
|
serverWeb.on(eventName2.request, (req, res) => {
|
|
574
535
|
requestCallsEvent(
|
|
575
536
|
req,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "opticore-webapp",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.58",
|
|
4
4
|
"description": "wep server",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.mjs",
|
|
@@ -34,12 +34,13 @@
|
|
|
34
34
|
"dotenv": "^16.5.0",
|
|
35
35
|
"gradient-string": "^3.0.0",
|
|
36
36
|
"opticore-catch-exception-error": "^1.0.25",
|
|
37
|
+
"opticore-dependency-inject": "^1.0.2",
|
|
37
38
|
"opticore-env-access": "^1.0.7",
|
|
38
39
|
"opticore-express": "^1.0.3",
|
|
39
40
|
"opticore-http-response": "^1.0.3",
|
|
40
|
-
"opticore-
|
|
41
|
+
"opticore-loader-translation": "^1.0.1",
|
|
41
42
|
"opticore-logger": "^1.0.17",
|
|
42
|
-
"opticore-request-call-event": "^1.0.
|
|
43
|
+
"opticore-request-call-event": "^1.0.3",
|
|
43
44
|
"opticore-router": "^1.0.16",
|
|
44
45
|
"opticore-server-logger": "^1.0.2",
|
|
45
46
|
"opticore-translator": "^1.0.10",
|