@yolo-croket-dev/core 1.4.52-jun.15 → 1.4.52-jun.2

package/interceptors/logging-service.interceptor.js

@@ -30,12 +30,10 @@ 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,25 +68,18 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         return data;
     }
     intercept(context, next) {
-        var _a;
         const now = Date.now();
-        // const args = context.getArgs();
-        const rmqContext = context.switchToRpc().getContext();
-        const originalMessage = rmqContext.getMessage();
+        const args = context.getArgs();
+        const rmq = args[1];
         const ctx = context.switchToHttp();
         const request = ctx.getRequest();
-        // console.log('channel', channel);
-        // console.log('originalMessage', originalMessage);
-        // console.log('originalMessage.properties', originalMessage.properties);
-        // console.log('originalMessage.properties.headers', originalMessage.properties.headers);
-        const originalcontent = originalMessage.content;
-        const content = JSON.parse(originalcontent.toString());
+        const message = rmq.getMessage();
+        // const now = Date.now();
+        const content = JSON.parse(message.content.toString());
         const traceId = content.data.param ? content.data.param.traceId : '-';
-        const from = ((_a = content.data.param) === null || _a === void 0 ? void 0 : _a.from) || '-';
-        /** from 값 변경 */
-        content.data.param.from = `${SERVER_NAME}: ${content.pattern}`;
-        console.log('hi@', content);
-        originalMessage.content = Buffer.from(JSON.stringify(content));
+        console.log('intercept 시작 request', request);
+        console.log('intercept 시작 message', message);
+        console.log('intercept 시작 content', content);
         msaLogger.printInputInterceptorService({
             traceId,
             messageBrokerInfo: {
@@ -96,7 +87,6 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                 payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
             },
             paramInfo: request.param,
-            traceInfo: { from },
         });
         return next.handle()
             .pipe((0, operators_1.tap)(() => {
@@ -107,11 +97,6 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     status: 200,
                     ms: elapsed,
                 },
-                messageBrokerInfo: {
-                    messagePatten: content.pattern,
-                    payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
-                },
-                traceInfo: { from },
             });
         })).pipe((0, operators_1.catchError)((error) => {
             msaLogger.printExceptionFliterService({
@@ -122,11 +107,6 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     message: error.subMessage,
                     stack: error.stack,
                 },
-                messageBrokerInfo: {
-                    messagePatten: content.pattern,
-                    payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
-                },
-                traceInfo: { from },
             });
             const elapsed = Date.now() - now;
             msaLogger.printOutService({
@@ -135,17 +115,12 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     status: error.status,
                     ms: elapsed,
                 },
-                messageBrokerInfo: {
-                    messagePatten: content.pattern,
-                    payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
-                },
-                traceInfo: { from },
             });
             throw error;
         }));
     }
 };
-exports.LoggingServiceInterceptor = LoggingServiceInterceptor;
-exports.LoggingServiceInterceptor = LoggingServiceInterceptor = __decorate([
+LoggingServiceInterceptor = __decorate([
     (0, common_1.Injectable)()
 ], LoggingServiceInterceptor);
+exports.LoggingServiceInterceptor = LoggingServiceInterceptor;

package/interceptors/rpc.interceptor.js

@@ -10,7 +10,6 @@ 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");
@@ -166,10 +165,7 @@ 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가 호출되므로, 삭제해주기 */
@@ -260,8 +256,8 @@ let RPCInterceptor = class RPCInterceptor {
         }));
     }
 };
-exports.RPCInterceptor = RPCInterceptor;
-exports.RPCInterceptor = RPCInterceptor = __decorate([
+RPCInterceptor = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [core_1.Reflector])
 ], RPCInterceptor);
+exports.RPCInterceptor = RPCInterceptor;

package/interfaces/exception.js

@@ -18,10 +18,9 @@ var ErrActionTypeEnum;
     ErrActionTypeEnum["LEGACY_SHOW_TOAST"] = "LEGACY_SHOW_TOAST";
     ErrActionTypeEnum["FORCE_UPDATE"] = "FORCE_UPDATE";
     ErrActionTypeEnum["UPDATE_ACCESS_TOKEN"] = "UPDATE_ACCESS_TOKEN";
-})(ErrActionTypeEnum || (exports.ErrActionTypeEnum = ErrActionTypeEnum = {}));
+})(ErrActionTypeEnum = exports.ErrActionTypeEnum || (exports.ErrActionTypeEnum = {}));
 class ErrAction {
 }
-exports.ErrAction = ErrAction;
 __decorate([
     (0, swagger_1.ApiProperty)({
         description: '액션 타입',
@@ -58,9 +57,9 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], ErrAction.prototype, "webViewUrl", void 0);
+exports.ErrAction = ErrAction;
 class ErrInfo {
 }
-exports.ErrInfo = ErrInfo;
 __decorate([
     (0, swagger_1.ApiProperty)({
         description: '에러 종류 식별자',
@@ -82,3 +81,4 @@ __decorate([
     }),
     __metadata("design:type", ErrAction)
 ], ErrInfo.prototype, "action", void 0);
+exports.ErrInfo = ErrInfo;

package/modules/redis.module.js

@@ -15,10 +15,10 @@ const redisProvider = {
 };
 let RedisModule = class RedisModule {
 };
-exports.RedisModule = RedisModule;
-exports.RedisModule = RedisModule = __decorate([
+RedisModule = __decorate([
     (0, common_1.Module)({
         providers: [redisProvider],
         exports: [redisProvider],
     })
 ], RedisModule);
+exports.RedisModule = RedisModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.4.52-jun.15",
+  "version": "1.4.52-jun.2",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",
@@ -17,7 +17,6 @@
     "@nestjs/common": "^8.2.3",
     "@nestjs/microservices": "9.0.8",
     "@yolo-croket-dev/logger": "^1.0.15",
-    "@yolo-croket-dev/msa-logger": "^2.1.0",
     "@yolo-croket-dev/redis": "^1.0.23",
     "@yolo-croket-dev/swagger": "^0.0.7",
     "axios": "^1.1.3",

package/pipes/rpc-validation.pipe.js

@@ -31,8 +31,8 @@ let ValidationPipe = class ValidationPipe {
         return value;
     }
 };
-exports.ValidationPipe = ValidationPipe;
-exports.ValidationPipe = ValidationPipe = __decorate([
+ValidationPipe = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [Object])
 ], ValidationPipe);
+exports.ValidationPipe = ValidationPipe;