@yolo-croket-dev/core 1.4.49 → 1.4.51

package/interceptors/rpc.interceptor.d.ts

@@ -6,6 +6,5 @@ export declare class RPCInterceptor implements NestInterceptor {
     constructor(reflector: Reflector);
     private maxLengthOverShorten;
     private updateMaxLengthArrayShorten;
-    private keyCutter;
     intercept(context: ExecutionContext, next: CallHandler): Promise<Observable<unknown>>;
 }

package/interceptors/rpc.interceptor.js

@@ -8,9 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RPCInterceptor = void 0;
 /* eslint-disable no-param-reassign */
@@ -18,11 +15,10 @@ const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const logger_1 = __importDefault(require("@yolo-croket-dev/logger"));
+// import Logger from '@yolo-croket-dev/logger';
 const functions_1 = require("../functions");
 const exceptions_1 = require("../exceptions");
-const logger = logger_1.default.createLogger('RPCInterceptor');
-const MAX_CUT_LENGTH = 500;
+// const MAX_CUT_LENGTH = 500;
 const MAX_LENGTH = 300;
 let RPCInterceptor = class RPCInterceptor {
     constructor(reflector) {
@@ -83,36 +79,32 @@ let RPCInterceptor = class RPCInterceptor {
         }
         return obj;
     }
-    keyCutter(data) {
-        try {
-            if (data) {
-                data = JSON.parse(data);
-            }
-            else {
-                return data;
-            }
-        }
-        catch (err) {
-            return data;
-        }
-        for (const key of Object.keys(data)) {
-            const type = typeof data[key];
-            if (type === 'string') {
-                if (data[key].length > MAX_CUT_LENGTH) {
-                    data[key] = `${data[key].slice(0, MAX_CUT_LENGTH)}...`;
-                }
-            }
-            else if (type === 'object') {
-                if (data[key] === null) {
-                    data[key] = null;
-                }
-                else {
-                    data[key] = this.keyCutter(data[key]);
-                }
-            }
-        }
-        return data;
-    }
+    // private keyCutter(data: string) {
+    //   try {
+    //     if (data) {
+    //       data = JSON.parse(data);
+    //     } else {
+    //       return data;
+    //     }
+    //   } catch (err) {
+    //     return data;
+    //   }
+    //   for (const key of Object.keys(data)) {
+    //     const type = typeof data[key as any];
+    //     if (type === 'string') {
+    //       if (data[key as any].length > MAX_CUT_LENGTH) {
+    //         (data[key as any] as any) = `${data[key as any].slice(0, MAX_CUT_LENGTH)}...`;
+    //       }
+    //     } else if (type === 'object') {
+    //       if (data[key as any] === null) {
+    //         (data[key as any] as any) = null;
+    //       } else {
+    //         (data[key as any] as any) = this.keyCutter(data[key as any]);
+    //       }
+    //     }
+    //   }
+    //   return data;
+    // }
     async intercept(context, next) {
         var _a;
         const options = this.reflector.get('rpcInterceptorScope', context.getHandler());
@@ -123,17 +115,25 @@ let RPCInterceptor = class RPCInterceptor {
         const message = rmq.getMessage();
         const now = Date.now();
         const content = JSON.parse(message.content.toString());
-        const traceId = content.data.param ? content.data.param.traceId : null;
+        // const traceId = content.data.param ? content.data.param.traceId : null;
         const isInternal = content.data.param ? content.data.param.isInternal : false;
         const isAdmin = content.data.param ? content.data.param.isAdmin : false;
-        const method = content.pattern;
+        // const method = content.pattern;
         const reDeliveryCount = Number(message.properties.headers['x-delivery-count']) || 0; /** 몇번 재전달되었는지 */
         const staticRetryCount = Number(options === null || options === void 0 ? void 0 : options.messageRetryCount) || 0; /** 최대 재시도 갯수 */
-        const logParam = {
-            traceId,
-            method,
-        };
+        // const logParam = {
+        //   traceId,
+        //   method,
+        // };
         if (!staticRetryCount && reDeliveryCount > 0) {
+            channel.sendToQueue(message.properties.replyTo, Buffer.from(JSON.stringify({
+                isError: true,
+                message: 'RETRY_COUNT_ZERO_OR_NO_RETRY',
+                status: 500,
+                duration: Date.now() - now,
+                arg,
+                timestamp: new Date(),
+            })), { correlationId: message.properties.correlationId });
             channel.nack(message, false, false); /** 아마도 기본 30분 타임아웃이 지나고 새로 들어오면 발생할 예정, DLQ로 이동 */
             message.properties.replyTo = undefined; /** replyTo가 존재하면 sendToQueue가 호출되므로, 삭제해주기 */
             return new rxjs_1.Observable();
@@ -190,11 +190,11 @@ let RPCInterceptor = class RPCInterceptor {
             const messageContent = message.content.toString();
             /** 파일 객체 처리 */
             (0, functions_1.reWriteFileValue)((_a = messageContent === null || messageContent === void 0 ? void 0 : messageContent.data) === null || _a === void 0 ? void 0 : _a.file);
-            logger.debug(`<= (error:${traceId}): ${JSON.stringify(sendMessage.toString())}`, {
-                ...logParam,
-                duration,
-                isError: true,
-            });
+            // logger.debug(`<= (error:${traceId}): ${JSON.stringify(sendMessage.toString())}`, {
+            //   ...logParam,
+            //   duration,
+            //   isError: true,
+            // });
             if (!noAck && !isAck) {
                 channel.ack(message);
             }
@@ -226,10 +226,10 @@ let RPCInterceptor = class RPCInterceptor {
             if (content.data.payload.file) {
                 content.data.payload.file = `${content.data.payload.file.slice(0, 30)}...`;
             }
-            logger.debug(`=> (${traceId}): ${JSON.stringify(this.keyCutter(JSON.stringify(content)))}`);
+            // logger.debug(`=> (${traceId}): ${JSON.stringify(this.keyCutter(JSON.stringify(content)))}`);
         }
         else {
-            logger.debug(`=> (${traceId}): ${JSON.stringify(this.keyCutter(JSON.stringify(content)))}`);
+            // logger.debug(`=> (${traceId}): ${JSON.stringify(this.keyCutter(JSON.stringify(content)))}`);
         }
         // eslint-disable-next-line consistent-return
         return next
@@ -237,12 +237,12 @@ let RPCInterceptor = class RPCInterceptor {
             .pipe((0, operators_1.tap)({
             next: async (val) => {
                 val.isError = false;
-                const duration = Date.now() - now;
-                logger.debug(`<= (success:${traceId}): ${val.message}`, {
-                    ...logParam,
-                    duration,
-                    isError: val.isError,
-                });
+                // const duration = Date.now() - now;
+                // logger.debug(`<= (success:${traceId}): ${val.message}`, {
+                //   ...logParam,
+                //   duration,
+                //   isError: val.isError,
+                // });
                 /** 만약 응답데이터중 isRequeue가 true라면, 다시 재처리 하도록 함 */
                 if (val.data && val.data.isRequeue) {
                     channel.nack(message, false, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.4.49",
+  "version": "1.4.51",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@nestjs/common": "^8.2.3",
     "@nestjs/microservices": "9.0.8",
-    "@yolo-croket-dev/logger": "^1.0.13",
+    "@yolo-croket-dev/logger": "^1.0.15",
     "@yolo-croket-dev/redis": "^1.0.22",
     "@yolo-croket-dev/swagger": "^0.0.7",
     "axios": "^1.1.3",