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

package/interceptors/logging-service.interceptor.js

@@ -30,10 +30,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoggingServiceInterceptor = void 0;
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-param-reassign */
 const common_1 = require("@nestjs/common");
 const msa_logger_1 = __importStar(require("@yolo-croket-dev/msa-logger"));
 const operators_1 = require("rxjs/operators");
+const { SERVER_NAME } = process.env;
 const msaLogger = new msa_logger_1.default(msa_logger_1.ServerTypeEnum.SERVICE);
 const MAX_CUT_LENGTH = 500;
 let LoggingServiceInterceptor = class LoggingServiceInterceptor {
@@ -70,7 +72,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
     intercept(context, next) {
         var _a;
         const now = Date.now();
-        const args = context.getArgs();
+        // const args = context.getArgs();
         const rmqContext = context.switchToRpc().getContext();
         const channel = rmqContext.getChannelRef();
         const originalMessage = rmqContext.getMessage();
@@ -79,18 +81,13 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         console.log('originalMessage.properties', originalMessage.properties);
         console.log('originalMessage.properties.headers', originalMessage.properties.headers);
         const originalcontent = originalMessage.content;
-        const originalcontent2 = JSON.parse(originalcontent.toString());
-        console.log('originalcontent2', originalcontent2);
-        originalcontent2.data.param.from = 'zzz';
-        originalMessage.content = Buffer.from(JSON.stringify(originalcontent2));
-        const rmq = args[1];
-        const ctx = context.switchToHttp();
-        const request = ctx.getRequest();
-        const message = rmq.getMessage();
-        // const now = Date.now();
-        const content = JSON.parse(message.content.toString());
+        const content = JSON.parse(originalcontent.toString());
         const traceId = content.data.param ? content.data.param.traceId : '-';
         const from = ((_a = content.data.param) === null || _a === void 0 ? void 0 : _a.from) || '-';
+        content.data.param.from = `${SERVER_NAME}: ${content.pattern}`;
+        originalMessage.content = Buffer.from(JSON.stringify(content));
+        const ctx = context.switchToHttp();
+        const request = ctx.getRequest();
         msaLogger.printInputInterceptorService({
             traceId,
             messageBrokerInfo: {
@@ -98,9 +95,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                 payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
             },
             paramInfo: request.param,
-            traceInfo: {
-                from,
-            }
+            traceInfo: { from },
         });
         return next.handle()
             .pipe((0, operators_1.tap)(() => {
@@ -116,9 +111,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     messagePatten: content.pattern,
                     payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
                 },
-                traceInfo: {
-                    from,
-                }
+                traceInfo: { from },
             });
         })).pipe((0, operators_1.catchError)((error) => {
             msaLogger.printExceptionFliterService({
@@ -133,9 +126,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     messagePatten: content.pattern,
                     payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
                 },
-                traceInfo: {
-                    from,
-                }
+                traceInfo: { from },
             });
             const elapsed = Date.now() - now;
             msaLogger.printOutService({
@@ -148,9 +139,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     messagePatten: content.pattern,
                     payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
                 },
-                traceInfo: {
-                    from,
-                }
+                traceInfo: { from },
             });
             throw error;
         }));

package/interceptors/rpc.interceptor.js

@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RPCInterceptor = void 0;
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-param-reassign */
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
@@ -165,7 +166,10 @@ let RPCInterceptor = class RPCInterceptor {
                 errMessage,
                 errAction,
             };
-            if (!Number.isNaN(staticRetryCount) && staticRetryCount && err.isRetry !== false) { /** 재시도 로직이 필요한 경우, 0보다 커야 정의된것. 기본값이 0, isRetry값이 false로 정의된 에러가 아니라면 전부 재시도 */
+            if (!Number.isNaN(staticRetryCount)
+                && staticRetryCount
+                && err.isRetry !== false) {
+                /** 재시도 로직이 필요한 경우, 0보다 커야 정의된것. 기본값이 0, isRetry값이 false로 정의된 에러가 아니라면 전부 재시도 */
                 if (reDeliveryCount <= (staticRetryCount - 1)) { /** 재시도 횟수가 있고, 재시도 횟수보다 적을 경우, 0부터 카운팅 되므로 -1 */
                     channel.nack(message, false, true);
                     message.properties.replyTo = undefined; /** replyTo가 존재하면 sendToQueue가 호출되므로, 삭제해주기 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.4.52-jun.12",
+  "version": "1.4.52-jun.13",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",