@yolo-croket-dev/core 1.4.52-jun.12 → 1.4.52-jun.14

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.
Files changed (3) hide show
  1. package/interceptors/logging-service.interceptor.js +17 -29
  2. package/interceptors/rpc.interceptor.js +5 -1
  3. package/package.json +1 -1
package/interceptors/logging-service.interceptor.js CHANGED
@@ -30,10 +30,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
30
30
  };
31
31
  Object.defineProperty(exports, "__esModule", { value: true });
32
32
  exports.LoggingServiceInterceptor = void 0;
33
+ /* eslint-disable @typescript-eslint/no-explicit-any */
33
34
  /* eslint-disable no-param-reassign */
34
35
  const common_1 = require("@nestjs/common");
35
36
  const msa_logger_1 = __importStar(require("@yolo-croket-dev/msa-logger"));
36
37
  const operators_1 = require("rxjs/operators");
38
+ const { SERVER_NAME } = process.env;
37
39
  const msaLogger = new msa_logger_1.default(msa_logger_1.ServerTypeEnum.SERVICE);
38
40
  const MAX_CUT_LENGTH = 500;
39
41
  let LoggingServiceInterceptor = class LoggingServiceInterceptor {
@@ -70,27 +72,22 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
70
72
  intercept(context, next) {
71
73
  var _a;
72
74
  const now = Date.now();
73
- const args = context.getArgs();
75
+ // const args = context.getArgs();
74
76
  const rmqContext = context.switchToRpc().getContext();
75
- const channel = rmqContext.getChannelRef();
76
77
  const originalMessage = rmqContext.getMessage();
77
- console.log('channel', channel);
78
- console.log('originalMessage', originalMessage);
79
- console.log('originalMessage.properties', originalMessage.properties);
80
- console.log('originalMessage.properties.headers', originalMessage.properties.headers);
78
+ // console.log('channel', channel);
79
+ // console.log('originalMessage', originalMessage);
80
+ // console.log('originalMessage.properties', originalMessage.properties);
81
+ // console.log('originalMessage.properties.headers', originalMessage.properties.headers);
81
82
  const originalcontent = originalMessage.content;
82
- const originalcontent2 = JSON.parse(originalcontent.toString());
83
- console.log('originalcontent2', originalcontent2);
84
- originalcontent2.data.param.from = 'zzz';
85
- originalMessage.content = Buffer.from(JSON.stringify(originalcontent2));
86
- const rmq = args[1];
87
- const ctx = context.switchToHttp();
88
- const request = ctx.getRequest();
89
- const message = rmq.getMessage();
90
- // const now = Date.now();
91
- const content = JSON.parse(message.content.toString());
83
+ const content = JSON.parse(originalcontent.toString());
92
84
  const traceId = content.data.param ? content.data.param.traceId : '-';
93
85
  const from = ((_a = content.data.param) === null || _a === void 0 ? void 0 : _a.from) || '-';
86
+ /** from 값 변경 */
87
+ content.data.param.from = `${SERVER_NAME}: ${content.pattern}`;
88
+ originalMessage.content = Buffer.from(JSON.stringify(content));
89
+ const ctx = context.switchToHttp();
90
+ const request = ctx.getRequest();
94
91
  msaLogger.printInputInterceptorService({
95
92
  traceId,
96
93
  messageBrokerInfo: {
@@ -98,14 +95,11 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
98
95
  payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
99
96
  },
100
97
  paramInfo: request.param,
101
- traceInfo: {
102
- from,
103
- }
98
+ traceInfo: { from },
104
99
  });
105
100
  return next.handle()
106
101
  .pipe((0, operators_1.tap)(() => {
107
102
  const elapsed = Date.now() - now;
108
- console.log('와이 출력안되니', content.pattern, from);
109
103
  msaLogger.printOutService({
110
104
  traceId,
111
105
  responseInfo: {
@@ -116,9 +110,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
116
110
  messagePatten: content.pattern,
117
111
  payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
118
112
  },
119
- traceInfo: {
120
- from,
121
- }
113
+ traceInfo: { from },
122
114
  });
123
115
  })).pipe((0, operators_1.catchError)((error) => {
124
116
  msaLogger.printExceptionFliterService({
@@ -133,9 +125,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
133
125
  messagePatten: content.pattern,
134
126
  payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
135
127
  },
136
- traceInfo: {
137
- from,
138
- }
128
+ traceInfo: { from },
139
129
  });
140
130
  const elapsed = Date.now() - now;
141
131
  msaLogger.printOutService({
@@ -148,9 +138,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
148
138
  messagePatten: content.pattern,
149
139
  payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
150
140
  },
151
- traceInfo: {
152
- from,
153
- }
141
+ traceInfo: { from },
154
142
  });
155
143
  throw error;
156
144
  }));
package/interceptors/rpc.interceptor.js CHANGED
@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.RPCInterceptor = void 0;
13
+ /* eslint-disable @typescript-eslint/no-explicit-any */
13
14
  /* eslint-disable no-param-reassign */
14
15
  const common_1 = require("@nestjs/common");
15
16
  const core_1 = require("@nestjs/core");
@@ -165,7 +166,10 @@ let RPCInterceptor = class RPCInterceptor {
165
166
  errMessage,
166
167
  errAction,
167
168
  };
168
- if (!Number.isNaN(staticRetryCount) && staticRetryCount && err.isRetry !== false) { /** 재시도 로직이 필요한 경우, 0보다 커야 정의된것. 기본값이 0, isRetry값이 false로 정의된 에러가 아니라면 전부 재시도 */
169
+ if (!Number.isNaN(staticRetryCount)
170
+ && staticRetryCount
171
+ && err.isRetry !== false) {
172
+ /** 재시도 로직이 필요한 경우, 0보다 커야 정의된것. 기본값이 0, isRetry값이 false로 정의된 에러가 아니라면 전부 재시도 */
169
173
  if (reDeliveryCount <= (staticRetryCount - 1)) { /** 재시도 횟수가 있고, 재시도 횟수보다 적을 경우, 0부터 카운팅 되므로 -1 */
170
174
  channel.nack(message, false, true);
171
175
  message.properties.replyTo = undefined; /** replyTo가 존재하면 sendToQueue가 호출되므로, 삭제해주기 */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yolo-croket-dev/core",
3
- "version": "1.4.52-jun.12",
3
+ "version": "1.4.52-jun.14",
4
4
  "author": "Yolo Co., Ltd.",
5
5
  "description": "Yolo commonization module",
6
6
  "main": "index.js",