@icd-iot-aicf/nestjs-logger 0.0.28 → 0.0.30
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/common/helper/response.d.ts +1 -0
- package/dist/common/helper/response.js +6 -0
- package/dist/common/helper/response.js.map +1 -1
- package/dist/common/helper/tools.js +14 -6
- package/dist/common/helper/tools.js.map +1 -1
- package/dist/common/helper/tools.service.d.ts +10 -0
- package/dist/common/helper/tools.service.js +152 -0
- package/dist/common/helper/tools.service.js.map +1 -0
- package/dist/common/internal-logs-info.module.js +4 -2
- package/dist/common/internal-logs-info.module.js.map +1 -1
- package/dist/common/service/logger-debug/logger-debug-lib.service.d.ts +6 -0
- package/dist/common/service/logger-debug/logger-debug-lib.service.js +35 -0
- package/dist/common/service/logger-debug/logger-debug-lib.service.js.map +1 -0
- package/dist/config/app-log-config.service.js +2 -0
- package/dist/config/app-log-config.service.js.map +1 -1
- package/dist/config/configurations.d.ts +5 -0
- package/dist/config/configurations.js +6 -1
- package/dist/config/configurations.js.map +1 -1
- package/dist/logger/aicf/dtos/aicf-manual.dto.d.ts +26 -1
- package/dist/logger/aicf/dtos/aicf-manual.dto.js +37 -1
- package/dist/logger/aicf/dtos/aicf-manual.dto.js.map +1 -1
- package/dist/logger/aicf/dtos/aicf.dto.d.ts +3 -0
- package/dist/logger/aicf/middleware/aicf.middleware.d.ts +3 -1
- package/dist/logger/aicf/middleware/aicf.middleware.js +8 -3
- package/dist/logger/aicf/middleware/aicf.middleware.js.map +1 -1
- package/dist/logger/cloudron/dtos/cauldron-manual.dto.d.ts +34 -6
- package/dist/logger/cloudron/dtos/cauldron-manual.dto.js +42 -1
- package/dist/logger/cloudron/dtos/cauldron-manual.dto.js.map +1 -1
- package/dist/logger/cloudron/dtos/cauldron.dto.d.ts +4 -1
- package/dist/logger/cloudron/dtos/cauldron.dto.js +4 -6
- package/dist/logger/cloudron/dtos/cauldron.dto.js.map +1 -1
- package/dist/logger/cloudron/middleware/cloudron.middleware.d.ts +6 -2
- package/dist/logger/cloudron/middleware/cloudron.middleware.js +28 -14
- package/dist/logger/cloudron/middleware/cloudron.middleware.js.map +1 -1
- package/dist/logger/cloudron/services/cloudron-summary-logs.service.js +1 -1
- package/dist/logger/cloudron/services/cloudron-summary-logs.service.js.map +1 -1
- package/dist/logger/core/dtos/core.dto.d.ts +4 -0
- package/dist/logger/core/dtos/core.dto.js +6 -0
- package/dist/logger/core/dtos/core.dto.js.map +1 -1
- package/dist/logger/core/enum/enum.d.ts +12 -4
- package/dist/logger/core/enum/enum.js +20 -7
- package/dist/logger/core/enum/enum.js.map +1 -1
- package/dist/logger/core/interceptors/http.interceptor.js +3 -1
- package/dist/logger/core/interceptors/http.interceptor.js.map +1 -1
- package/dist/logger/core/middleware/http-logs-middleware.service.d.ts +5 -1
- package/dist/logger/core/middleware/http-logs-middleware.service.js +10 -4
- package/dist/logger/core/middleware/http-logs-middleware.service.js.map +1 -1
- package/dist/logger/logger.module.js.map +1 -1
- package/dist/metrics/metrics.middleware.d.ts +3 -1
- package/dist/metrics/metrics.middleware.js +6 -4
- package/dist/metrics/metrics.middleware.js.map +1 -1
- package/dist/metrics/metrics.module.js +2 -0
- package/dist/metrics/metrics.module.js.map +1 -1
- package/dist/metrics/metrics.service.js +1 -0
- package/dist/metrics/metrics.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,15 @@
|
|
|
1
|
-
import { CDetailLog, CSummaryLog, IDetailLog, ILogCustom } from './cauldron.dto';
|
|
1
|
+
import { CDetailLog, CSummaryLog, IActivityLog, IDetailLog, ILogCustom } from './cauldron.dto';
|
|
2
2
|
import { NextFunction } from 'express';
|
|
3
3
|
import { AppLogConfig } from '../../../config/configurations';
|
|
4
|
+
export interface AppLogicInfo {
|
|
5
|
+
type: string;
|
|
6
|
+
message: string;
|
|
7
|
+
source: Record<string, any>;
|
|
8
|
+
}
|
|
9
|
+
export interface Custom1LogicInfo {
|
|
10
|
+
activity: IActivityLog;
|
|
11
|
+
appLogic: AppLogicInfo;
|
|
12
|
+
}
|
|
4
13
|
export interface IManualDetailLog<T> {
|
|
5
14
|
systemTimestamp: string;
|
|
6
15
|
logType: string;
|
|
@@ -8,9 +17,9 @@ export interface IManualDetailLog<T> {
|
|
|
8
17
|
namespace: string;
|
|
9
18
|
applicationName: string;
|
|
10
19
|
containerId: string;
|
|
11
|
-
sessionId: string
|
|
12
|
-
tid: string
|
|
13
|
-
identity
|
|
20
|
+
sessionId: string;
|
|
21
|
+
tid: string;
|
|
22
|
+
identity?: string;
|
|
14
23
|
custom1: T;
|
|
15
24
|
}
|
|
16
25
|
export interface ConnectionInfo {
|
|
@@ -52,8 +61,27 @@ export declare class CManualConnection implements IManualDetailLog<{
|
|
|
52
61
|
logLevel: string;
|
|
53
62
|
logType: string;
|
|
54
63
|
namespace: string;
|
|
55
|
-
sessionId: string
|
|
64
|
+
sessionId: string;
|
|
56
65
|
systemTimestamp: string;
|
|
57
|
-
tid: string
|
|
66
|
+
tid: string;
|
|
58
67
|
constructor(connectionInfo: ConnectionInfo, appConfig?: AppLogConfig);
|
|
59
68
|
}
|
|
69
|
+
export declare class CDetailLogic implements IManualDetailLog<Custom1LogicInfo> {
|
|
70
|
+
systemTimestamp: any;
|
|
71
|
+
logType: string;
|
|
72
|
+
logLevel: string;
|
|
73
|
+
namespace: string;
|
|
74
|
+
applicationName: string;
|
|
75
|
+
containerId: string;
|
|
76
|
+
sessionId: string;
|
|
77
|
+
tid: string;
|
|
78
|
+
identity?: string;
|
|
79
|
+
custom1: Custom1LogicInfo;
|
|
80
|
+
constructor(data: any);
|
|
81
|
+
}
|
|
82
|
+
export declare class CAppLogic implements AppLogicInfo {
|
|
83
|
+
message: string;
|
|
84
|
+
source: Record<string, any>;
|
|
85
|
+
type: string;
|
|
86
|
+
constructor(data: any);
|
|
87
|
+
}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.CManualConnection = exports.CManualSummary = exports.CManualDetail = exports.CDetailManaulLogWithPushSummary = void 0;
|
|
6
|
+
exports.CAppLogic = exports.CDetailLogic = exports.CManualConnection = exports.CManualSummary = exports.CManualDetail = exports.CDetailManaulLogWithPushSummary = void 0;
|
|
7
7
|
const app_log_config_service_1 = require("../../../config/app-log-config.service");
|
|
8
8
|
const tracnsaction_info_1 = require("../../../common/async-storage/tracnsaction-info");
|
|
9
9
|
const microtime_1 = __importDefault(require("microtime"));
|
|
@@ -93,4 +93,45 @@ class CManualConnection {
|
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
exports.CManualConnection = CManualConnection;
|
|
96
|
+
class CDetailLogic {
|
|
97
|
+
constructor(data) {
|
|
98
|
+
const appConfig = app_log_config_service_1.AppLogConfigService.getConfig();
|
|
99
|
+
const transactionRefInfo = tracnsaction_info_1.transactionInfoLocalStorage.getStore();
|
|
100
|
+
const startTime = data.startTime || microtime_1.default.now();
|
|
101
|
+
const endTime = data.endTime || microtime_1.default.now();
|
|
102
|
+
this.systemTimestamp = `${(0, main_1.dayJs)().format('DD/MM/YYYY HH:mm:ss.SSS')}`;
|
|
103
|
+
this.logType = cauldron_dto_1.LogType.DETAIL;
|
|
104
|
+
this.logLevel = cauldron_dto_1.LogLevel.INFO;
|
|
105
|
+
this.namespace = appConfig.appName || null;
|
|
106
|
+
this.applicationName = appConfig.componentName || null;
|
|
107
|
+
this.containerId = os_1.default.hostname();
|
|
108
|
+
this.sessionId = transactionRefInfo.sessionId;
|
|
109
|
+
this.tid = transactionRefInfo.transactionId;
|
|
110
|
+
this.custom1 = {
|
|
111
|
+
activity: new cauldron_dto_1.CActivityLog({ startTime, endTime }),
|
|
112
|
+
appLogic: new CAppLogic(data),
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
exports.CDetailLogic = CDetailLogic;
|
|
117
|
+
class CAppLogic {
|
|
118
|
+
constructor(data) {
|
|
119
|
+
if (typeof data.message === 'string') {
|
|
120
|
+
try {
|
|
121
|
+
const jsonInfo = JSON.parse(data.message);
|
|
122
|
+
this.message = jsonInfo.message || {};
|
|
123
|
+
this.source = jsonInfo.source || 'none';
|
|
124
|
+
this.type = jsonInfo.type || 'none';
|
|
125
|
+
}
|
|
126
|
+
catch (e) { }
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
const logicInfo = data.appLogic || {};
|
|
130
|
+
this.message = logicInfo.message || 'none';
|
|
131
|
+
this.source = logicInfo.source || {};
|
|
132
|
+
this.type = logicInfo.type || 'none';
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
exports.CAppLogic = CAppLogic;
|
|
96
137
|
//# sourceMappingURL=cauldron-manual.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cauldron-manual.dto.js","sourceRoot":"","sources":["../../../../src/logger/cloudron/dtos/cauldron-manual.dto.ts"],"names":[],"mappings":";;;;;;AAAA,mFAA6E;AAC7E,uFAA8F;AAC9F,0DAAkC;AAClC,wCAAsC;AACtC,4CAAoB;AACpB,uGAAuG;AACvG,0EAG8C;AAC9C,6FAAqF;AACrF,iDAUwB;
|
|
1
|
+
{"version":3,"file":"cauldron-manual.dto.js","sourceRoot":"","sources":["../../../../src/logger/cloudron/dtos/cauldron-manual.dto.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,10 @@ export declare class CSummaryLog implements ISummaryLog {
|
|
|
16
16
|
usageTime: number;
|
|
17
17
|
custom: any;
|
|
18
18
|
custom2?: ILogCustom2;
|
|
19
|
-
constructor(req: Request, res:
|
|
19
|
+
constructor(req: Request, res: {
|
|
20
|
+
resultCode: string;
|
|
21
|
+
resultDesc: string;
|
|
22
|
+
}, activityData: ActivityData);
|
|
20
23
|
}
|
|
21
24
|
export declare class CDetailLog implements IDetailLog {
|
|
22
25
|
systemTimestamp: any;
|
|
@@ -9,10 +9,8 @@ const os_1 = __importDefault(require("os"));
|
|
|
9
9
|
const tools_1 = require("../../../utils/tools");
|
|
10
10
|
const app_log_config_service_1 = require("../../../config/app-log-config.service");
|
|
11
11
|
const global_function_1 = require("../../core/functions/global-function");
|
|
12
|
-
const tools_2 = require("../../../common/helper/tools");
|
|
13
12
|
class CSummaryLog {
|
|
14
|
-
constructor(req, res, activityData
|
|
15
|
-
const { resultCode, resultDesc } = (0, tools_2.mapResultCode)(res, statusCode);
|
|
13
|
+
constructor(req, res, activityData) {
|
|
16
14
|
const appConfig = app_log_config_service_1.AppLogConfigService.getConfig();
|
|
17
15
|
const transactionInfo = (0, global_function_1.GetTransactionReference)();
|
|
18
16
|
this.systemTimestamp = `${(0, main_1.dayJs)().format('DD/MM/YYYY HH:mm:ss.SSS')}`;
|
|
@@ -22,9 +20,9 @@ class CSummaryLog {
|
|
|
22
20
|
this.containerId = os_1.default.hostname();
|
|
23
21
|
this.sessionId = transactionInfo.sessionId || null;
|
|
24
22
|
this.tid = req.headers['x-ais-orderref'] || null;
|
|
25
|
-
this.cmdName = transactionInfo.recordName ||
|
|
26
|
-
this.resultCode = resultCode;
|
|
27
|
-
this.resultDesc = resultDesc;
|
|
23
|
+
this.cmdName = transactionInfo.recordName || null;
|
|
24
|
+
this.resultCode = res.resultCode;
|
|
25
|
+
this.resultDesc = res.resultDesc;
|
|
28
26
|
this.reqTimestamp = `${(0, main_1.dayJs)((0, tools_1.changeMicroToMilli)(activityData.startTime)).format('DD/MM/YYYY HH:mm:ss.SSS')}`;
|
|
29
27
|
this.resTimestamp = `${(0, main_1.dayJs)((0, tools_1.changeMicroToMilli)(activityData.endTime)).format('DD/MM/YYYY HH:mm:ss.SSS')}`;
|
|
30
28
|
this.usageTime = (0, tools_1.calculateDifferentTimeMicroToMilli)(activityData.startTime, activityData.endTime);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cauldron.dto.js","sourceRoot":"","sources":["../../../../src/logger/cloudron/dtos/cauldron.dto.ts"],"names":[],"mappings":";;;;;;AAAA,wCAAsC;AACtC,4CAAoB;AAEpB,gDAI8B;AAC9B,mFAA6E;AAC7E,0EAA+E;AAC/E,
|
|
1
|
+
{"version":3,"file":"cauldron.dto.js","sourceRoot":"","sources":["../../../../src/logger/cloudron/dtos/cauldron.dto.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,13 @@ import { NestMiddleware } from '@nestjs/common';
|
|
|
2
2
|
import { CustomLoggerService } from '../../logger.service';
|
|
3
3
|
import { CloudronSummaryLogsService } from '../services/cloudron-summary-logs.service';
|
|
4
4
|
import { NextFunction, Request, Response } from 'express';
|
|
5
|
+
import { ToolsService } from '../../../common/helper/tools.service';
|
|
6
|
+
import { LoggerDebugLibService } from '../../../common/service/logger-debug/logger-debug-lib.service';
|
|
5
7
|
export declare class CloudronMiddleware implements NestMiddleware {
|
|
6
8
|
private readonly logger;
|
|
7
|
-
private externalSummaryService;
|
|
8
|
-
|
|
9
|
+
private readonly externalSummaryService;
|
|
10
|
+
private readonly toolsService;
|
|
11
|
+
private readonly loggerDebug;
|
|
12
|
+
constructor(logger: CustomLoggerService, externalSummaryService: CloudronSummaryLogsService, toolsService: ToolsService, loggerDebug: LoggerDebugLibService);
|
|
9
13
|
use(req: Request, res: Response, next: NextFunction): void;
|
|
10
14
|
}
|
|
@@ -22,10 +22,14 @@ const microtime_1 = __importDefault(require("microtime"));
|
|
|
22
22
|
const global_function_1 = require("../../core/functions/global-function");
|
|
23
23
|
const aicf_dto_1 = require("../../aicf/dtos/aicf.dto");
|
|
24
24
|
const summaryEndpoint_info_1 = require("../../../common/async-storage/summaryEndpoint-info");
|
|
25
|
+
const tools_service_1 = require("../../../common/helper/tools.service");
|
|
26
|
+
const logger_debug_lib_service_1 = require("../../../common/service/logger-debug/logger-debug-lib.service");
|
|
25
27
|
let CloudronMiddleware = class CloudronMiddleware {
|
|
26
|
-
constructor(logger, externalSummaryService) {
|
|
28
|
+
constructor(logger, externalSummaryService, toolsService, loggerDebug) {
|
|
27
29
|
this.logger = logger;
|
|
28
30
|
this.externalSummaryService = externalSummaryService;
|
|
31
|
+
this.toolsService = toolsService;
|
|
32
|
+
this.loggerDebug = loggerDebug;
|
|
29
33
|
}
|
|
30
34
|
use(req, res, next) {
|
|
31
35
|
const startTime = microtime_1.default.now();
|
|
@@ -34,28 +38,36 @@ let CloudronMiddleware = class CloudronMiddleware {
|
|
|
34
38
|
const chunks = [];
|
|
35
39
|
const originalWrite = res.write;
|
|
36
40
|
const originalEnd = res.end;
|
|
41
|
+
let buffer;
|
|
37
42
|
res.write = (...args) => {
|
|
43
|
+
this.loggerDebug.debug(`res.write args: `, args);
|
|
38
44
|
chunks.push(Buffer.from(args[0]));
|
|
45
|
+
this.loggerDebug.debug(`res.write chunks: `, chunks);
|
|
39
46
|
return originalWrite.apply(res, args);
|
|
40
47
|
};
|
|
41
48
|
res.end = (...args) => {
|
|
49
|
+
this.loggerDebug.debug(`res.end: `, args);
|
|
42
50
|
if (args[0]) {
|
|
43
51
|
chunks.push(Buffer.from(args[0]));
|
|
44
52
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
const activityData = {
|
|
49
|
-
startTime,
|
|
50
|
-
endTime,
|
|
51
|
-
};
|
|
52
|
-
const summary = new cauldron_dto_1.CSummaryLog(req, buffer, activityData, res.statusCode);
|
|
53
|
-
summary.custom = this.externalSummaryService.getCustomSummaryCloudron();
|
|
54
|
-
this.logger.log(summary);
|
|
55
|
-
this.logger.log(new cauldron_dto_1.CDetailLog(req, buffer, activityData));
|
|
56
|
-
});
|
|
53
|
+
this.loggerDebug.debug(`chunks: `, chunks);
|
|
54
|
+
buffer = Buffer.concat(chunks).toString('utf8');
|
|
55
|
+
this.loggerDebug.debug(`buffer: `, buffer);
|
|
57
56
|
return originalEnd.apply(res, args);
|
|
58
57
|
};
|
|
58
|
+
res.on('finish', () => {
|
|
59
|
+
this.loggerDebug.debug(`res.finish: `, res.statusCode);
|
|
60
|
+
const endTime = microtime_1.default.now();
|
|
61
|
+
const activityData = {
|
|
62
|
+
startTime,
|
|
63
|
+
endTime,
|
|
64
|
+
};
|
|
65
|
+
const resultFormat = this.toolsService.mapResultCode(buffer, res.statusCode);
|
|
66
|
+
const summary = new cauldron_dto_1.CSummaryLog(req, resultFormat, activityData);
|
|
67
|
+
summary.custom = this.externalSummaryService.getCustomSummaryCloudron();
|
|
68
|
+
this.logger.log(summary);
|
|
69
|
+
this.logger.log(new cauldron_dto_1.CDetailLog(req, buffer, activityData));
|
|
70
|
+
});
|
|
59
71
|
(0, global_function_1.SetTransactionReference)({
|
|
60
72
|
transactionId: req.headers['x-ais-orderref'],
|
|
61
73
|
sessionId: sessionId,
|
|
@@ -71,6 +83,8 @@ exports.CloudronMiddleware = CloudronMiddleware;
|
|
|
71
83
|
exports.CloudronMiddleware = CloudronMiddleware = __decorate([
|
|
72
84
|
(0, common_1.Injectable)(),
|
|
73
85
|
__metadata("design:paramtypes", [logger_service_1.CustomLoggerService,
|
|
74
|
-
cloudron_summary_logs_service_1.CloudronSummaryLogsService
|
|
86
|
+
cloudron_summary_logs_service_1.CloudronSummaryLogsService,
|
|
87
|
+
tools_service_1.ToolsService,
|
|
88
|
+
logger_debug_lib_service_1.LoggerDebugLibService])
|
|
75
89
|
], CloudronMiddleware);
|
|
76
90
|
//# sourceMappingURL=cloudron.middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudron.middleware.js","sourceRoot":"","sources":["../../../../src/logger/cloudron/middleware/cloudron.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,yDAA2D;AAC3D,6FAAuF;AAEvF,gDAAmD;AACnD,uDAA6E;AAC7E,0DAAkC;AAClC,0EAA+E;AAC/E,uDAAuD;AACvD,6FAAsF;AAG/
|
|
1
|
+
{"version":3,"file":"cloudron.middleware.js","sourceRoot":"","sources":["../../../../src/logger/cloudron/middleware/cloudron.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,yDAA2D;AAC3D,6FAAuF;AAEvF,gDAAmD;AACnD,uDAA6E;AAC7E,0DAAkC;AAClC,0EAA+E;AAC/E,uDAAuD;AACvD,6FAAsF;AACtF,wEAAoE;AACpE,4GAAsG;AAG/F,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YACmB,MAA2B,EAC3B,sBAAkD,EAClD,YAA0B,EAC1B,WAAkC;QAHlC,WAAM,GAAN,MAAM,CAAqB;QAC3B,2BAAsB,GAAtB,sBAAsB,CAA4B;QAClD,iBAAY,GAAZ,YAAY,CAAc;QAC1B,gBAAW,GAAX,WAAW,CAAuB;IAClD,CAAC;IAEJ,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACjD,MAAM,SAAS,GAAG,mBAAS,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;QACvC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,IAAA,mBAAW,GAAE,CAAC;QAEhD,MAAM,MAAM,GAAU,EAAE,CAAC;QACzB,MAAM,aAAa,GAAG,GAAG,CAAC,KAAK,CAAC;QAChC,MAAM,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC;QAC5B,IAAI,MAAc,CAAC;QACnB,GAAG,CAAC,KAAK,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;YAC7B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;YAEjD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;YACrD,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACxC,CAAC,CAAC;QACF,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;YAC3B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAE1C,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;gBACZ,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpC,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAE3C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAChD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC3C,OAAO,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC,CAAC;QAEF,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACpB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;YAEvD,MAAM,OAAO,GAAG,mBAAS,CAAC,GAAG,EAAE,CAAC;YAChC,MAAM,YAAY,GAAiB;gBACjC,SAAS;gBACT,OAAO;aACR,CAAC;YACF,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAClD,MAAM,EACN,GAAG,CAAC,UAAU,CACf,CAAC;YAEF,MAAM,OAAO,GAAG,IAAI,0BAAW,CAAC,GAAG,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;YACjE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,wBAAwB,EAAE,CAAC;YACxE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,yBAAU,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,IAAA,yCAAuB,EACrB;YACE,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAW;YACtD,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,sBAAW,CAAC,IAAI;YACxB,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAW;YACxD,gBAAgB,EAAE,SAAS;SAC5B,EACD,GAAG,EAAE;YACH,OAAO,uCAAgB,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC,CACF,CAAC;IACJ,CAAC;CACF,CAAA;AArEY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAGgB,oCAAmB;QACH,0DAA0B;QACpC,4BAAY;QACb,gDAAqB;GAL1C,kBAAkB,CAqE9B"}
|
|
@@ -15,7 +15,7 @@ const summaryEndpoint_info_1 = require("../../../common/async-storage/summaryEnd
|
|
|
15
15
|
let CloudronSummaryLogsService = class CloudronSummaryLogsService {
|
|
16
16
|
constructor() { }
|
|
17
17
|
getCustomSummaryCloudron() {
|
|
18
|
-
const currentSummary = summaryEndpoint_info_1.summaryInfoLocal.getStore();
|
|
18
|
+
const currentSummary = summaryEndpoint_info_1.summaryInfoLocal.getStore() || [];
|
|
19
19
|
if (currentSummary.length) {
|
|
20
20
|
return {
|
|
21
21
|
endPointSummary: currentSummary.map((edrDetail, index) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudron-summary-logs.service.js","sourceRoot":"","sources":["../../../../src/logger/cloudron/services/cloudron-summary-logs.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,6FAG4D;AAGrD,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IACrC,gBAAe,CAAC;IAChB,wBAAwB;QACtB,MAAM,cAAc,GAAqB,uCAAgB,CAAC,QAAQ,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"cloudron-summary-logs.service.js","sourceRoot":"","sources":["../../../../src/logger/cloudron/services/cloudron-summary-logs.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,6FAG4D;AAGrD,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IACrC,gBAAe,CAAC;IAChB,wBAAwB;QACtB,MAAM,cAAc,GAAqB,uCAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;QAC3E,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;YAC1B,OAAO;gBACL,eAAe,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;oBACvD,OAAO;wBACL,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE;wBAC1B,YAAY,EAAE,SAAS,CAAC,YAAY;wBACpC,WAAW,EAAE,SAAS,CAAC,WAAW;wBAClC,WAAW,EAAE,SAAS,CAAC,WAAW;wBAClC,cAAc,EAAE,SAAS,CAAC,cAAc;qBACzC,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,mBAAmB,CAAC,SAAiB,EAAE,SAAyB;QAE9D,IAAA,sCAAe,EAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;CACF,CAAA;AAxBY,gEAA0B;qCAA1B,0BAA0B;IADtC,IAAA,mBAAU,GAAE;;GACA,0BAA0B,CAwBtC"}
|
|
@@ -49,5 +49,9 @@ export interface DBRequestObject {
|
|
|
49
49
|
method: string;
|
|
50
50
|
payload: Record<string, any>;
|
|
51
51
|
}
|
|
52
|
+
export declare enum LOGIC_TYPE {
|
|
53
|
+
FUNCTION = "FUNCTION",
|
|
54
|
+
CHECKPOINT = "CHECKPOINT"
|
|
55
|
+
}
|
|
52
56
|
export type RequestObject = HTTPRequestObject | AMQPRequestObject | MQTTRequestObject | COAPRequestObject | DBRequestObject;
|
|
53
57
|
export type ResponseObject = HTTPResponseObject | AMQPResponseObject | MQTTResponseObject | COAPResponseObject;
|
|
@@ -1,3 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LOGIC_TYPE = void 0;
|
|
4
|
+
var LOGIC_TYPE;
|
|
5
|
+
(function (LOGIC_TYPE) {
|
|
6
|
+
LOGIC_TYPE["FUNCTION"] = "FUNCTION";
|
|
7
|
+
LOGIC_TYPE["CHECKPOINT"] = "CHECKPOINT";
|
|
8
|
+
})(LOGIC_TYPE || (exports.LOGIC_TYPE = LOGIC_TYPE = {}));
|
|
3
9
|
//# sourceMappingURL=core.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.dto.js","sourceRoot":"","sources":["../../../../src/logger/core/dtos/core.dto.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"core.dto.js","sourceRoot":"","sources":["../../../../src/logger/core/dtos/core.dto.ts"],"names":[],"mappings":";;;AA8DA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,mCAAqB,CAAA;IACrB,uCAAyB,CAAA;AAC3B,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB"}
|
|
@@ -6,7 +6,7 @@ export interface BasicInfoDebug {
|
|
|
6
6
|
endTime?: number;
|
|
7
7
|
additionalInfo?: any;
|
|
8
8
|
}
|
|
9
|
-
export interface
|
|
9
|
+
export interface ConnectionInformation {
|
|
10
10
|
message: string;
|
|
11
11
|
protocol: string;
|
|
12
12
|
source: string;
|
|
@@ -15,6 +15,13 @@ export interface AdvancedInfoDebug<REQ, RES> extends BasicInfoDebug {
|
|
|
15
15
|
requestObject?: REQ;
|
|
16
16
|
responseObject?: RES;
|
|
17
17
|
}
|
|
18
|
+
export interface LogicActionInfo extends BasicInfoDebug {
|
|
19
|
+
appLogic: {
|
|
20
|
+
type: string;
|
|
21
|
+
message: string;
|
|
22
|
+
source: Record<string, any>;
|
|
23
|
+
};
|
|
24
|
+
}
|
|
18
25
|
export declare class CoreLogSummaryDto {
|
|
19
26
|
static getInstance(commonOperationStatus?: CommonOperationStatus): {
|
|
20
27
|
detail?: any;
|
|
@@ -47,7 +54,8 @@ export declare class KafkaAction {
|
|
|
47
54
|
private static mapModel;
|
|
48
55
|
}
|
|
49
56
|
export declare class LogicAction {
|
|
50
|
-
static
|
|
57
|
+
static FUNCTION(detailLogs: LogicActionInfo): any;
|
|
58
|
+
static CHECKPOINT(detailLogs: LogicActionInfo): any;
|
|
51
59
|
private static mapModel;
|
|
52
60
|
}
|
|
53
61
|
export declare class ExceptionAction {
|
|
@@ -55,7 +63,7 @@ export declare class ExceptionAction {
|
|
|
55
63
|
private static mapModel;
|
|
56
64
|
}
|
|
57
65
|
export declare class ConnectionAction {
|
|
58
|
-
static CONNECTED(detailLogs:
|
|
59
|
-
static DISCONNECTED(detailLogs:
|
|
66
|
+
static CONNECTED(detailLogs: ConnectionInformation): any;
|
|
67
|
+
static DISCONNECTED(detailLogs: ConnectionInformation): any;
|
|
60
68
|
private static mapModel;
|
|
61
69
|
}
|
|
@@ -11,6 +11,7 @@ const aicf_manual_dto_1 = require("../../aicf/dtos/aicf-manual.dto");
|
|
|
11
11
|
const cauldron_manual_dto_1 = require("../../cloudron/dtos/cauldron-manual.dto");
|
|
12
12
|
const microtime_1 = __importDefault(require("microtime"));
|
|
13
13
|
const response_1 = require("../../../common/helper/response");
|
|
14
|
+
const core_dto_1 = require("../dtos/core.dto");
|
|
14
15
|
const tracnsaction_info_1 = require("../../../common/async-storage/tracnsaction-info");
|
|
15
16
|
class CoreLogSummaryDto {
|
|
16
17
|
static getInstance(commonOperationStatus) {
|
|
@@ -195,14 +196,26 @@ class KafkaAction {
|
|
|
195
196
|
}
|
|
196
197
|
exports.KafkaAction = KafkaAction;
|
|
197
198
|
class LogicAction {
|
|
198
|
-
static
|
|
199
|
-
return this.mapModel(detailLogs);
|
|
199
|
+
static FUNCTION(detailLogs) {
|
|
200
|
+
return this.mapModel(core_dto_1.LOGIC_TYPE.FUNCTION, detailLogs);
|
|
200
201
|
}
|
|
201
|
-
static
|
|
202
|
+
static CHECKPOINT(detailLogs) {
|
|
203
|
+
return this.mapModel(core_dto_1.LOGIC_TYPE.CHECKPOINT, detailLogs);
|
|
204
|
+
}
|
|
205
|
+
static mapModel(logicType, detailLogs) {
|
|
202
206
|
try {
|
|
203
207
|
detailLogs.recordSubType = aicf_dto_1.RECORD_SUB_TYPE.APP_LOGIC;
|
|
204
208
|
detailLogs.action = aicf_dto_1.ACTION_TYPE.APP_LOGIC;
|
|
205
|
-
|
|
209
|
+
detailLogs.subAction = logicType;
|
|
210
|
+
const config = app_log_config_service_1.AppLogConfigService.getConfig().format;
|
|
211
|
+
switch (config) {
|
|
212
|
+
case configurations_1.FORMAT_TYPE.AICF:
|
|
213
|
+
return new aicf_manual_dto_1.AicfLogicDto(detailLogs);
|
|
214
|
+
case configurations_1.FORMAT_TYPE.CLOUDRON:
|
|
215
|
+
return new cauldron_manual_dto_1.CDetailLogic(detailLogs);
|
|
216
|
+
default:
|
|
217
|
+
return {};
|
|
218
|
+
}
|
|
206
219
|
}
|
|
207
220
|
catch (e) {
|
|
208
221
|
console.log(e);
|
|
@@ -230,12 +243,12 @@ class ExceptionAction {
|
|
|
230
243
|
exports.ExceptionAction = ExceptionAction;
|
|
231
244
|
class ConnectionAction {
|
|
232
245
|
static CONNECTED(detailLogs) {
|
|
233
|
-
return this.mapModel(
|
|
246
|
+
return this.mapModel('CONNECTED', detailLogs);
|
|
234
247
|
}
|
|
235
248
|
static DISCONNECTED(detailLogs) {
|
|
236
|
-
return this.mapModel(
|
|
249
|
+
return this.mapModel('DISCONNECTED', detailLogs);
|
|
237
250
|
}
|
|
238
|
-
static mapModel(
|
|
251
|
+
static mapModel(connectType, detailLogs) {
|
|
239
252
|
try {
|
|
240
253
|
detailLogs.recordSubType = connectType;
|
|
241
254
|
detailLogs.action = 'CONNECTION';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../../src/logger/core/enum/enum.ts"],"names":[],"mappings":";;;;;;AAAA,mFAA6E;AAC7E,mEAA6D;AAC7D,uDAMkC;AAElC,
|
|
1
|
+
{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../../src/logger/core/enum/enum.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,9 @@ let HttpInterceptor = class HttpInterceptor {
|
|
|
17
17
|
transactionId: headers['x-ais-orderref'],
|
|
18
18
|
originSession: headers['x-origin-session'],
|
|
19
19
|
}, () => {
|
|
20
|
-
return next.handle()
|
|
20
|
+
return next.handle().pipe((response) => {
|
|
21
|
+
return response;
|
|
22
|
+
});
|
|
21
23
|
});
|
|
22
24
|
}
|
|
23
25
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.interceptor.js","sourceRoot":"","sources":["../../../../src/logger/core/interceptors/http.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAKwB;AAExB,kEAAuE;AAGhE,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,SAAS,CAAC,OAAyB,EAAE,IAAiB;QACpD,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAEhC,OAAO,IAAA,yCAAuB,EAC5B;YACE,aAAa,EAAE,OAAO,CAAC,gBAAgB,CAAC;YACxC,aAAa,EAAE,OAAO,CAAC,kBAAkB,CAAC;SAC3C,EACD,GAAG,EAAE;YACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"http.interceptor.js","sourceRoot":"","sources":["../../../../src/logger/core/interceptors/http.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAKwB;AAExB,kEAAuE;AAGhE,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,SAAS,CAAC,OAAyB,EAAE,IAAiB;QACpD,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAEhC,OAAO,IAAA,yCAAuB,EAC5B;YACE,aAAa,EAAE,OAAO,CAAC,gBAAgB,CAAC;YACxC,aAAa,EAAE,OAAO,CAAC,kBAAkB,CAAC;SAC3C,EACD,GAAG,EAAE;YACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACrC,OAAO,QAAQ,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC,CACF,CAAC;IACJ,CAAC;CACF,CAAA;AAjBY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;GACA,eAAe,CAiB3B"}
|
|
@@ -4,12 +4,16 @@ import { ContextService } from '../../../common/service/common/context.service';
|
|
|
4
4
|
import { FORMAT_TYPE } from '../../../config/configurations';
|
|
5
5
|
import { Request, Response } from 'express';
|
|
6
6
|
import { CloudronSummaryLogsService } from '../../cloudron/services/cloudron-summary-logs.service';
|
|
7
|
+
import { ToolsService } from '../../../common/helper/tools.service';
|
|
8
|
+
import { LoggerDebugLibService } from '../../../common/service/logger-debug/logger-debug-lib.service';
|
|
7
9
|
export declare class HTTPLogsMiddleware implements NestMiddleware {
|
|
8
10
|
private readonly logger;
|
|
9
11
|
private readonly contextService;
|
|
10
12
|
private readonly externalSummaryService;
|
|
13
|
+
private readonly toolsService;
|
|
14
|
+
private readonly loggerDebug;
|
|
11
15
|
coreMiddleware: NestMiddleware;
|
|
12
16
|
format: FORMAT_TYPE;
|
|
13
|
-
constructor(logger: CustomLoggerService, contextService: ContextService, externalSummaryService: CloudronSummaryLogsService);
|
|
17
|
+
constructor(logger: CustomLoggerService, contextService: ContextService, externalSummaryService: CloudronSummaryLogsService, toolsService: ToolsService, loggerDebug: LoggerDebugLibService);
|
|
14
18
|
use(req: Request, res: Response, next: () => void): void;
|
|
15
19
|
}
|
|
@@ -19,18 +19,22 @@ const aicf_middleware_1 = require("../../aicf/middleware/aicf.middleware");
|
|
|
19
19
|
const cloudron_middleware_1 = require("../../cloudron/middleware/cloudron.middleware");
|
|
20
20
|
const cloudron_summary_logs_service_1 = require("../../cloudron/services/cloudron-summary-logs.service");
|
|
21
21
|
const esb_middleware_1 = require("../../esb/middleware/esb.middleware");
|
|
22
|
+
const tools_service_1 = require("../../../common/helper/tools.service");
|
|
23
|
+
const logger_debug_lib_service_1 = require("../../../common/service/logger-debug/logger-debug-lib.service");
|
|
22
24
|
let HTTPLogsMiddleware = class HTTPLogsMiddleware {
|
|
23
|
-
constructor(logger, contextService, externalSummaryService) {
|
|
25
|
+
constructor(logger, contextService, externalSummaryService, toolsService, loggerDebug) {
|
|
24
26
|
this.logger = logger;
|
|
25
27
|
this.contextService = contextService;
|
|
26
28
|
this.externalSummaryService = externalSummaryService;
|
|
29
|
+
this.toolsService = toolsService;
|
|
30
|
+
this.loggerDebug = loggerDebug;
|
|
27
31
|
this.format = app_log_config_service_1.AppLogConfigService.getConfig().format;
|
|
28
32
|
switch (this.format) {
|
|
29
33
|
case configurations_1.FORMAT_TYPE.AICF:
|
|
30
|
-
this.coreMiddleware = new aicf_middleware_1.AicfMiddleware(this.logger);
|
|
34
|
+
this.coreMiddleware = new aicf_middleware_1.AicfMiddleware(this.logger, this.loggerDebug);
|
|
31
35
|
break;
|
|
32
36
|
case configurations_1.FORMAT_TYPE.CLOUDRON:
|
|
33
|
-
this.coreMiddleware = new cloudron_middleware_1.CloudronMiddleware(this.logger, this.externalSummaryService);
|
|
37
|
+
this.coreMiddleware = new cloudron_middleware_1.CloudronMiddleware(this.logger, this.externalSummaryService, this.toolsService, this.loggerDebug);
|
|
34
38
|
break;
|
|
35
39
|
case configurations_1.FORMAT_TYPE.ESB:
|
|
36
40
|
this.coreMiddleware = new esb_middleware_1.EsbMiddleware(this.logger, this.contextService);
|
|
@@ -50,6 +54,8 @@ exports.HTTPLogsMiddleware = HTTPLogsMiddleware = __decorate([
|
|
|
50
54
|
(0, common_1.Injectable)(),
|
|
51
55
|
__metadata("design:paramtypes", [logger_service_1.CustomLoggerService,
|
|
52
56
|
context_service_1.ContextService,
|
|
53
|
-
cloudron_summary_logs_service_1.CloudronSummaryLogsService
|
|
57
|
+
cloudron_summary_logs_service_1.CloudronSummaryLogsService,
|
|
58
|
+
tools_service_1.ToolsService,
|
|
59
|
+
logger_debug_lib_service_1.LoggerDebugLibService])
|
|
54
60
|
], HTTPLogsMiddleware);
|
|
55
61
|
//# sourceMappingURL=http-logs-middleware.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-logs-middleware.service.js","sourceRoot":"","sources":["../../../../src/logger/core/middleware/http-logs-middleware.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAC5D,yDAA2D;AAC3D,oFAAgF;AAChF,mFAA6E;AAC7E,mEAA6D;AAE7D,2EAAuE;AACvE,uFAAmF;AACnF,yGAAmG;AACnG,wEAAoE;
|
|
1
|
+
{"version":3,"file":"http-logs-middleware.service.js","sourceRoot":"","sources":["../../../../src/logger/core/middleware/http-logs-middleware.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAC5D,yDAA2D;AAC3D,oFAAgF;AAChF,mFAA6E;AAC7E,mEAA6D;AAE7D,2EAAuE;AACvE,uFAAmF;AACnF,yGAAmG;AACnG,wEAAoE;AACpE,wEAAoE;AACpE,4GAAsG;AAG/F,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAG7B,YACmB,MAA2B,EAC3B,cAA8B,EAC9B,sBAAkD,EAClD,YAA0B,EAC1B,WAAkC;QAJlC,WAAM,GAAN,MAAM,CAAqB;QAC3B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,2BAAsB,GAAtB,sBAAsB,CAA4B;QAClD,iBAAY,GAAZ,YAAY,CAAc;QAC1B,gBAAW,GAAX,WAAW,CAAuB;QAEnD,IAAI,CAAC,MAAM,GAAG,4CAAmB,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC;QACrD,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;YACpB,KAAK,4BAAW,CAAC,IAAI;gBACnB,IAAI,CAAC,cAAc,GAAG,IAAI,gCAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;gBACxE,MAAM;YACR,KAAK,4BAAW,CAAC,QAAQ;gBACvB,IAAI,CAAC,cAAc,GAAG,IAAI,wCAAkB,CAC1C,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,sBAAsB,EAC3B,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,WAAW,CACjB,CAAC;gBACF,MAAM;YACR,KAAK,4BAAW,CAAC,GAAG;gBAClB,IAAI,CAAC,cAAc,GAAG,IAAI,8BAAa,CACrC,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,cAAc,CACpB,CAAC;gBACF,MAAM;YACR;gBACE,MAAM;QACV,CAAC;IACH,CAAC;IACD,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB;QAC/C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE;YAC3B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAC1C,CAAC,EAAE,IAAI,GAAG,EAAe,CAAC,CAAC;IAC7B,CAAC;CACF,CAAA;AAtCY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAKgB,oCAAmB;QACX,gCAAc;QACN,0DAA0B;QACpC,4BAAY;QACb,gDAAqB;GAR1C,kBAAkB,CAsC9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.module.js","sourceRoot":"","sources":["../../src/logger/logger.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,qDAAuD;AACvD,6CAAgD;AAChD,qGAA+F;AAC/F,qGAA+F;AAC/F,mFAA6E;AAC7E,qFAAgF;AAChF,uFAAmF;AACnF,wEAAoE;AACpE,wFAAkF;AAClF,2EAAuE;AACvE,iFAA4E;AAC5E,uEAAmE;AACnE,iGAAoF;
|
|
1
|
+
{"version":3,"file":"logger.module.js","sourceRoot":"","sources":["../../src/logger/logger.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,qDAAuD;AACvD,6CAAgD;AAChD,qGAA+F;AAC/F,qGAA+F;AAC/F,mFAA6E;AAC7E,qFAAgF;AAChF,uFAAmF;AACnF,wEAAoE;AACpE,wFAAkF;AAClF,2EAAuE;AACvE,iFAA4E;AAC5E,uEAAmE;AACnE,iGAAoF;AA+B7E,IAAM,YAAY,GAAlB,MAAM,YAAY;CAAG,CAAA;AAAf,oCAAY;uBAAZ,YAAY;IA7BxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,YAAY,EAAE,kDAAsB,CAAC;QAC/C,SAAS,EAAE;YACT,oCAAmB;YACnB;gBACE,OAAO,EAAE,+BAAiB;gBAC1B,QAAQ,EAAE,IAAI,+BAAiB,EAAE;aAClC;YACD,0DAA0B;YAC1B,0DAA0B;YAC1B,2CAAmB;YACnB,0CAAmB;YACnB,gCAAc;YACd,kDAAsB;YACtB,0DAA0B;YAC1B,kCAAe;YACf,2CAAmB;YACnB,iDAAkB;YAClB,gCAAc;SACf;QACD,OAAO,EAAE;YACP,oCAAmB;YACnB,+BAAiB;YACjB,2CAAmB;YACnB,0DAA0B;YAC1B,kDAAsB;YACtB,iDAAkB;SACnB;KACF,CAAC;GACW,YAAY,CAAG"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { NestMiddleware } from '@nestjs/common';
|
|
2
2
|
import { Request, Response, NextFunction } from 'express';
|
|
3
3
|
import { MetricsService } from './metrics.service';
|
|
4
|
+
import { ToolsService } from '../common/helper/tools.service';
|
|
4
5
|
export declare class HTTPMetricsMiddleware implements NestMiddleware {
|
|
5
6
|
private readonly metricsService;
|
|
6
|
-
|
|
7
|
+
private readonly toolsService;
|
|
8
|
+
constructor(metricsService: MetricsService, toolsService: ToolsService);
|
|
7
9
|
private activeRequests;
|
|
8
10
|
private maxConcurrentRequests;
|
|
9
11
|
getMaxConcurrentRequests(): number;
|
|
@@ -13,10 +13,11 @@ exports.AMQPMetricsMiddleware = exports.HTTPMetricsMiddleware = void 0;
|
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const metrics_service_1 = require("./metrics.service");
|
|
15
15
|
const tracnsaction_info_1 = require("../common/async-storage/tracnsaction-info");
|
|
16
|
-
const
|
|
16
|
+
const tools_service_1 = require("../common/helper/tools.service");
|
|
17
17
|
let HTTPMetricsMiddleware = class HTTPMetricsMiddleware {
|
|
18
|
-
constructor(metricsService) {
|
|
18
|
+
constructor(metricsService, toolsService) {
|
|
19
19
|
this.metricsService = metricsService;
|
|
20
|
+
this.toolsService = toolsService;
|
|
20
21
|
this.activeRequests = 0;
|
|
21
22
|
this.maxConcurrentRequests = 0;
|
|
22
23
|
}
|
|
@@ -47,7 +48,7 @@ let HTTPMetricsMiddleware = class HTTPMetricsMiddleware {
|
|
|
47
48
|
res.on('finish', () => {
|
|
48
49
|
this.activeRequests--;
|
|
49
50
|
const elapsedTimeSec = (new Date().getTime() - startTime) / 1000;
|
|
50
|
-
this.metricsService.incrementMetricsRequest(tracnsaction_info_1.transactionInfoLocalStorage.getStore().recordName, req.method,
|
|
51
|
+
this.metricsService.incrementMetricsRequest(tracnsaction_info_1.transactionInfoLocalStorage.getStore().recordName, req.method, this.toolsService.mapStatusCodeMetric(res.statusCode, responseBody), elapsedTimeSec, this.maxConcurrentRequests, this.activeRequests);
|
|
51
52
|
});
|
|
52
53
|
next();
|
|
53
54
|
}
|
|
@@ -55,7 +56,8 @@ let HTTPMetricsMiddleware = class HTTPMetricsMiddleware {
|
|
|
55
56
|
exports.HTTPMetricsMiddleware = HTTPMetricsMiddleware;
|
|
56
57
|
exports.HTTPMetricsMiddleware = HTTPMetricsMiddleware = __decorate([
|
|
57
58
|
(0, common_1.Injectable)(),
|
|
58
|
-
__metadata("design:paramtypes", [metrics_service_1.MetricsService
|
|
59
|
+
__metadata("design:paramtypes", [metrics_service_1.MetricsService,
|
|
60
|
+
tools_service_1.ToolsService])
|
|
59
61
|
], HTTPMetricsMiddleware);
|
|
60
62
|
let AMQPMetricsMiddleware = class AMQPMetricsMiddleware {
|
|
61
63
|
constructor(metricsService) {
|