akeyless-server-commons 1.0.192 → 1.0.194
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/cjs/helpers/start.d.ts +2 -2
- package/dist/cjs/helpers/start.js +26 -5
- package/dist/cjs/helpers/start.js.map +1 -1
- package/dist/cjs/managers/logger_manager.d.ts +2 -0
- package/dist/cjs/managers/logger_manager.js +21 -5
- package/dist/cjs/managers/logger_manager.js.map +1 -1
- package/dist/cjs/types/interfaces/global.d.ts +1 -0
- package/dist/esm/helpers/start.d.ts +2 -2
- package/dist/esm/helpers/start.js +26 -5
- package/dist/esm/helpers/start.js.map +1 -1
- package/dist/esm/managers/logger_manager.d.ts +2 -0
- package/dist/esm/managers/logger_manager.js +21 -5
- package/dist/esm/managers/logger_manager.js.map +1 -1
- package/dist/esm/types/interfaces/global.d.ts +1 -0
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Express } from "express";
|
|
2
2
|
import { AppOptions, MainRouter } from "../types";
|
|
3
|
-
export declare const start_server: (main_router: MainRouter, project_name: string, version: string,
|
|
4
|
-
export declare const basic_init: (main_router: MainRouter, project_name: string, version: string,
|
|
3
|
+
export declare const start_server: (main_router: MainRouter, project_name: string, version: string, options?: AppOptions) => Promise<Express>;
|
|
4
|
+
export declare const basic_init: (main_router: MainRouter, project_name: string, version: string, options?: AppOptions) => Promise<Express>;
|
|
@@ -20,10 +20,13 @@ const _1 = require("./");
|
|
|
20
20
|
const error_handling_1 = require("../middlewares/error_handling");
|
|
21
21
|
const middlewares_1 = require("../middlewares");
|
|
22
22
|
const initialize_1 = require("./redis/initialize");
|
|
23
|
-
const
|
|
24
|
-
|
|
23
|
+
const axios_1 = __importDefault(require("axios"));
|
|
24
|
+
const https_1 = __importDefault(require("https"));
|
|
25
|
+
const http_1 = __importDefault(require("http"));
|
|
26
|
+
const start_server = (main_router_1, project_name_1, version_1, ...args_1) => __awaiter(void 0, [main_router_1, project_name_1, version_1, ...args_1], void 0, function* (main_router, project_name, version, options = {}) {
|
|
25
27
|
let env_data = (0, _1.init_env_variables)(["mode"]);
|
|
26
|
-
|
|
28
|
+
const { port = Number(env_data.port), log_requests, initialize_redis = true, enable_axios_keep_alive = true } = options;
|
|
29
|
+
const app = (0, express_1.default)();
|
|
27
30
|
app.use((0, cors_1.default)());
|
|
28
31
|
app.use(express_1.default.json({ limit: "10mb" }));
|
|
29
32
|
app.use(express_1.default.urlencoded({ limit: "10mb", extended: true }));
|
|
@@ -31,6 +34,9 @@ const start_server = (main_router_1, project_name_1, version_1, ...args_1) => __
|
|
|
31
34
|
app.use((0, middlewares_1.request_logger)(log_requests || {}));
|
|
32
35
|
main_router(app);
|
|
33
36
|
app.use(error_handling_1.error_handler);
|
|
37
|
+
if (enable_axios_keep_alive) {
|
|
38
|
+
keep_axios_alive();
|
|
39
|
+
}
|
|
34
40
|
return new Promise((resolve) => {
|
|
35
41
|
app.listen(port, () => __awaiter(void 0, void 0, void 0, function* () {
|
|
36
42
|
managers_1.logger.log(`Server is running at http://localhost:${port}`);
|
|
@@ -49,9 +55,10 @@ const start_server = (main_router_1, project_name_1, version_1, ...args_1) => __
|
|
|
49
55
|
});
|
|
50
56
|
});
|
|
51
57
|
exports.start_server = start_server;
|
|
52
|
-
const basic_init = (main_router_1, project_name_1, version_1, ...args_1) => __awaiter(void 0, [main_router_1, project_name_1, version_1, ...args_1], void 0, function* (main_router, project_name, version,
|
|
58
|
+
const basic_init = (main_router_1, project_name_1, version_1, ...args_1) => __awaiter(void 0, [main_router_1, project_name_1, version_1, ...args_1], void 0, function* (main_router, project_name, version, options = {}) {
|
|
59
|
+
const { init_snapshot_options } = options;
|
|
53
60
|
try {
|
|
54
|
-
const app = yield (0, exports.start_server)(main_router, project_name, version,
|
|
61
|
+
const app = yield (0, exports.start_server)(main_router, project_name, version, options);
|
|
55
62
|
yield (0, _1.init_snapshots)(init_snapshot_options);
|
|
56
63
|
return app;
|
|
57
64
|
}
|
|
@@ -61,4 +68,18 @@ const basic_init = (main_router_1, project_name_1, version_1, ...args_1) => __aw
|
|
|
61
68
|
}
|
|
62
69
|
});
|
|
63
70
|
exports.basic_init = basic_init;
|
|
71
|
+
const keep_axios_alive = () => {
|
|
72
|
+
axios_1.default.defaults.httpsAgent = new https_1.default.Agent({
|
|
73
|
+
keepAlive: true,
|
|
74
|
+
maxSockets: 100,
|
|
75
|
+
maxFreeSockets: 20,
|
|
76
|
+
timeout: 60000,
|
|
77
|
+
});
|
|
78
|
+
axios_1.default.defaults.httpAgent = new http_1.default.Agent({
|
|
79
|
+
keepAlive: true,
|
|
80
|
+
maxSockets: 100,
|
|
81
|
+
maxFreeSockets: 20,
|
|
82
|
+
timeout: 60000,
|
|
83
|
+
});
|
|
84
|
+
};
|
|
64
85
|
//# sourceMappingURL=start.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/helpers/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sDAA2C;AAC3C,gDAAwB;AACxB,0CAAqC;AACrC,yBAAwD;AAExD,kEAA8D;AAC9D,gDAAsE;AACtE,mDAAgD;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/helpers/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,8 @@ declare class LoggerManager {
|
|
|
4
4
|
private constructor();
|
|
5
5
|
static getInstance(): LoggerManager;
|
|
6
6
|
private get_date;
|
|
7
|
+
private is_gcp;
|
|
8
|
+
private emit;
|
|
7
9
|
log(msg: string, data?: TObject<any> | any[]): void;
|
|
8
10
|
error(msg: string, data?: any): void;
|
|
9
11
|
warn(msg: string, data?: any): void;
|
|
@@ -19,6 +19,18 @@ class LoggerManager {
|
|
|
19
19
|
get_date() {
|
|
20
20
|
return (0, moment_timezone_1.default)().tz("Asia/Jerusalem").format("DD/MM/YYYY HH:mm:ss.SS");
|
|
21
21
|
}
|
|
22
|
+
is_gcp() {
|
|
23
|
+
return !!(process.env.KUBERNETES_SERVICE_HOST || process.env.K_SERVICE);
|
|
24
|
+
}
|
|
25
|
+
emit(severity, text) {
|
|
26
|
+
if (this.is_gcp()) {
|
|
27
|
+
// GCP: structured JSON on stdout so Cloud Logging reads `severity`, not the stream
|
|
28
|
+
console.log(JSON.stringify({ severity, message: text }));
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
const method = severity === "ERROR" ? console.error : severity === "WARNING" ? console.warn : console.log;
|
|
32
|
+
method(text);
|
|
33
|
+
}
|
|
22
34
|
log(msg, data) {
|
|
23
35
|
const is_table = !process.env.KUBERNETES_SERVICE_HOST &&
|
|
24
36
|
Array.isArray(data) &&
|
|
@@ -35,24 +47,28 @@ class LoggerManager {
|
|
|
35
47
|
console.table(data);
|
|
36
48
|
return;
|
|
37
49
|
}
|
|
38
|
-
|
|
50
|
+
const text = `${this.get_date()} - ${msg}${data === undefined ? "" : `: ${(0, lodash_1.isObject)(data) || Array.isArray(data) ? JSON.stringify(data) : data}`}`;
|
|
51
|
+
this.emit("INFO", text);
|
|
39
52
|
}
|
|
40
53
|
error(msg, data) {
|
|
41
54
|
var _a;
|
|
55
|
+
let text;
|
|
42
56
|
if (axios_1.default.isAxiosError(data)) {
|
|
43
57
|
if (!!((_a = data.response) === null || _a === void 0 ? void 0 : _a.data)) {
|
|
44
|
-
|
|
58
|
+
text = `${this.get_date()} - ${msg}, axios error: ${data.message}, data: ${JSON.stringify(data)}`;
|
|
45
59
|
}
|
|
46
60
|
else {
|
|
47
|
-
|
|
61
|
+
text = `${this.get_date()} - ${msg}, axios error: ${data.message}`;
|
|
48
62
|
}
|
|
49
63
|
}
|
|
50
64
|
else {
|
|
51
|
-
|
|
65
|
+
text = `${this.get_date()} - ${msg}${data === undefined ? "" : `: ${JSON.stringify((0, helpers_1.parse_error)(data))}`}`;
|
|
52
66
|
}
|
|
67
|
+
this.emit("ERROR", text);
|
|
53
68
|
}
|
|
54
69
|
warn(msg, data) {
|
|
55
|
-
|
|
70
|
+
const text = `${this.get_date()} - ${msg}${data === undefined ? "" : `: ${JSON.stringify(data)}`}`;
|
|
71
|
+
this.emit("WARNING", text);
|
|
56
72
|
}
|
|
57
73
|
}
|
|
58
74
|
exports.logger = LoggerManager.getInstance();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger_manager.js","sourceRoot":"","sources":["../../../src/managers/logger_manager.ts"],"names":[],"mappings":";;;;;;AAAA,sEAA8C;AAE9C,kDAA0B;AAC1B,mCAAkC;AAClC,wCAAyC;AAEzC,MAAM,aAAa;IAEf,gBAAuB,CAAC;IACjB,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC1B,aAAa,CAAC,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;QACjD,CAAC;QACD,OAAO,aAAa,CAAC,QAAQ,CAAC;IAClC,CAAC;IACO,QAAQ;QACZ,OAAO,IAAA,yBAAe,GAAE,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;IACnF,CAAC;IACM,GAAG,CAAC,GAAW,EAAE,IAA2B;QAC/C,MAAM,QAAQ,GACV,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB;YACpC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YACnB,IAAI,CAAC,MAAM,GAAG,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjD,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;gBAC7G,CAAC;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACtD,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAChD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpB,OAAO;QACX,CAAC;QACD,
|
|
1
|
+
{"version":3,"file":"logger_manager.js","sourceRoot":"","sources":["../../../src/managers/logger_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Express } from "express";
|
|
2
2
|
import { AppOptions, MainRouter } from "../types";
|
|
3
|
-
export declare const start_server: (main_router: MainRouter, project_name: string, version: string,
|
|
4
|
-
export declare const basic_init: (main_router: MainRouter, project_name: string, version: string,
|
|
3
|
+
export declare const start_server: (main_router: MainRouter, project_name: string, version: string, options?: AppOptions) => Promise<Express>;
|
|
4
|
+
export declare const basic_init: (main_router: MainRouter, project_name: string, version: string, options?: AppOptions) => Promise<Express>;
|
|
@@ -14,10 +14,13 @@ import { init_env_variables, init_snapshots } from "./";
|
|
|
14
14
|
import { error_handler } from "../middlewares/error_handling";
|
|
15
15
|
import { request_logger, trim_body_middleware } from "../middlewares";
|
|
16
16
|
import { init_redis } from "./redis/initialize";
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
import axios from "axios";
|
|
18
|
+
import https from "https";
|
|
19
|
+
import http from "http";
|
|
20
|
+
export const start_server = (main_router_1, project_name_1, version_1, ...args_1) => __awaiter(void 0, [main_router_1, project_name_1, version_1, ...args_1], void 0, function* (main_router, project_name, version, options = {}) {
|
|
19
21
|
let env_data = init_env_variables(["mode"]);
|
|
20
|
-
|
|
22
|
+
const { port = Number(env_data.port), log_requests, initialize_redis = true, enable_axios_keep_alive = true } = options;
|
|
23
|
+
const app = express();
|
|
21
24
|
app.use(cors());
|
|
22
25
|
app.use(express.json({ limit: "10mb" }));
|
|
23
26
|
app.use(express.urlencoded({ limit: "10mb", extended: true }));
|
|
@@ -25,6 +28,9 @@ export const start_server = (main_router_1, project_name_1, version_1, ...args_1
|
|
|
25
28
|
app.use(request_logger(log_requests || {}));
|
|
26
29
|
main_router(app);
|
|
27
30
|
app.use(error_handler);
|
|
31
|
+
if (enable_axios_keep_alive) {
|
|
32
|
+
keep_axios_alive();
|
|
33
|
+
}
|
|
28
34
|
return new Promise((resolve) => {
|
|
29
35
|
app.listen(port, () => __awaiter(void 0, void 0, void 0, function* () {
|
|
30
36
|
logger.log(`Server is running at http://localhost:${port}`);
|
|
@@ -42,9 +48,10 @@ export const start_server = (main_router_1, project_name_1, version_1, ...args_1
|
|
|
42
48
|
}));
|
|
43
49
|
});
|
|
44
50
|
});
|
|
45
|
-
export const basic_init = (main_router_1, project_name_1, version_1, ...args_1) => __awaiter(void 0, [main_router_1, project_name_1, version_1, ...args_1], void 0, function* (main_router, project_name, version,
|
|
51
|
+
export const basic_init = (main_router_1, project_name_1, version_1, ...args_1) => __awaiter(void 0, [main_router_1, project_name_1, version_1, ...args_1], void 0, function* (main_router, project_name, version, options = {}) {
|
|
52
|
+
const { init_snapshot_options } = options;
|
|
46
53
|
try {
|
|
47
|
-
const app = yield start_server(main_router, project_name, version,
|
|
54
|
+
const app = yield start_server(main_router, project_name, version, options);
|
|
48
55
|
yield init_snapshots(init_snapshot_options);
|
|
49
56
|
return app;
|
|
50
57
|
}
|
|
@@ -53,4 +60,18 @@ export const basic_init = (main_router_1, project_name_1, version_1, ...args_1)
|
|
|
53
60
|
process.exit(1);
|
|
54
61
|
}
|
|
55
62
|
});
|
|
63
|
+
const keep_axios_alive = () => {
|
|
64
|
+
axios.defaults.httpsAgent = new https.Agent({
|
|
65
|
+
keepAlive: true,
|
|
66
|
+
maxSockets: 100,
|
|
67
|
+
maxFreeSockets: 20,
|
|
68
|
+
timeout: 60000,
|
|
69
|
+
});
|
|
70
|
+
axios.defaults.httpAgent = new http.Agent({
|
|
71
|
+
keepAlive: true,
|
|
72
|
+
maxSockets: 100,
|
|
73
|
+
maxFreeSockets: 20,
|
|
74
|
+
timeout: 60000,
|
|
75
|
+
});
|
|
76
|
+
};
|
|
56
77
|
//# sourceMappingURL=start.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/helpers/start.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,OAAoB,MAAM,SAAS,CAAC;AAC3C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/helpers/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,8 @@ declare class LoggerManager {
|
|
|
4
4
|
private constructor();
|
|
5
5
|
static getInstance(): LoggerManager;
|
|
6
6
|
private get_date;
|
|
7
|
+
private is_gcp;
|
|
8
|
+
private emit;
|
|
7
9
|
log(msg: string, data?: TObject<any> | any[]): void;
|
|
8
10
|
error(msg: string, data?: any): void;
|
|
9
11
|
warn(msg: string, data?: any): void;
|
|
@@ -13,6 +13,18 @@ class LoggerManager {
|
|
|
13
13
|
get_date() {
|
|
14
14
|
return moment_timezone().tz("Asia/Jerusalem").format("DD/MM/YYYY HH:mm:ss.SS");
|
|
15
15
|
}
|
|
16
|
+
is_gcp() {
|
|
17
|
+
return !!(process.env.KUBERNETES_SERVICE_HOST || process.env.K_SERVICE);
|
|
18
|
+
}
|
|
19
|
+
emit(severity, text) {
|
|
20
|
+
if (this.is_gcp()) {
|
|
21
|
+
// GCP: structured JSON on stdout so Cloud Logging reads `severity`, not the stream
|
|
22
|
+
console.log(JSON.stringify({ severity, message: text }));
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
const method = severity === "ERROR" ? console.error : severity === "WARNING" ? console.warn : console.log;
|
|
26
|
+
method(text);
|
|
27
|
+
}
|
|
16
28
|
log(msg, data) {
|
|
17
29
|
const is_table = !process.env.KUBERNETES_SERVICE_HOST &&
|
|
18
30
|
Array.isArray(data) &&
|
|
@@ -29,24 +41,28 @@ class LoggerManager {
|
|
|
29
41
|
console.table(data);
|
|
30
42
|
return;
|
|
31
43
|
}
|
|
32
|
-
|
|
44
|
+
const text = `${this.get_date()} - ${msg}${data === undefined ? "" : `: ${isObject(data) || Array.isArray(data) ? JSON.stringify(data) : data}`}`;
|
|
45
|
+
this.emit("INFO", text);
|
|
33
46
|
}
|
|
34
47
|
error(msg, data) {
|
|
35
48
|
var _a;
|
|
49
|
+
let text;
|
|
36
50
|
if (axios.isAxiosError(data)) {
|
|
37
51
|
if (!!((_a = data.response) === null || _a === void 0 ? void 0 : _a.data)) {
|
|
38
|
-
|
|
52
|
+
text = `${this.get_date()} - ${msg}, axios error: ${data.message}, data: ${JSON.stringify(data)}`;
|
|
39
53
|
}
|
|
40
54
|
else {
|
|
41
|
-
|
|
55
|
+
text = `${this.get_date()} - ${msg}, axios error: ${data.message}`;
|
|
42
56
|
}
|
|
43
57
|
}
|
|
44
58
|
else {
|
|
45
|
-
|
|
59
|
+
text = `${this.get_date()} - ${msg}${data === undefined ? "" : `: ${JSON.stringify(parse_error(data))}`}`;
|
|
46
60
|
}
|
|
61
|
+
this.emit("ERROR", text);
|
|
47
62
|
}
|
|
48
63
|
warn(msg, data) {
|
|
49
|
-
|
|
64
|
+
const text = `${this.get_date()} - ${msg}${data === undefined ? "" : `: ${JSON.stringify(data)}`}`;
|
|
65
|
+
this.emit("WARNING", text);
|
|
50
66
|
}
|
|
51
67
|
}
|
|
52
68
|
export const logger = LoggerManager.getInstance();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger_manager.js","sourceRoot":"","sources":["../../../src/managers/logger_manager.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,iBAAiB,CAAC;AAE9C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,aAAa;IAEf,gBAAuB,CAAC;IACjB,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC1B,aAAa,CAAC,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;QACjD,CAAC;QACD,OAAO,aAAa,CAAC,QAAQ,CAAC;IAClC,CAAC;IACO,QAAQ;QACZ,OAAO,eAAe,EAAE,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;IACnF,CAAC;IACM,GAAG,CAAC,GAAW,EAAE,IAA2B;QAC/C,MAAM,QAAQ,GACV,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB;YACpC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YACnB,IAAI,CAAC,MAAM,GAAG,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjD,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;gBAC7G,CAAC;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACtD,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAChD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpB,OAAO;QACX,CAAC;QACD,
|
|
1
|
+
{"version":3,"file":"logger_manager.js","sourceRoot":"","sources":["../../../src/managers/logger_manager.ts"],"names":[],"mappings":"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"}
|