@yolo-croket-dev/core 1.7.17-jun.4 → 1.7.18-slowquery.0

package/exceptions/bad-request.js

@@ -12,7 +12,6 @@ class BadRequest extends common_1.HttpException {
         this.errMessage = null;
         this.errAction = null;
         this.subMessage = errMessage || null;
-        console.log('errAction 데이터를 확인합니다.', errAction);
         // new
         this.errType = errType || null;
         this.errMessage = errMessage || null;

package/functions/amqp-call-manager.function.js

@@ -58,7 +58,6 @@ class AmqpManagement {
             return result.data;
         }
         catch (err) {
-            console.log('call-manager function err 데이터를 확인합니다.', err);
             msaLogger.error(`ThrowWrapppingCall[${funcName}] error: traceId=${param.traceId}`, { traceId: param.traceId }, { param });
             if (options && options.isErrorThrowing) {
                 throw err;

package/functions/amqp-handler.function.js

@@ -20,7 +20,6 @@ async function AmqpHandler(client, messagePattern, payload) {
     let data;
     try {
         data = await (0, rxjs_1.lastValueFrom)(client.send(messagePattern, payload).pipe());
-        console.log('data 데이터를 확인합니다.', data);
         if (data.isError) {
             const status = data.status || 500;
             const subMessage = data.subMessage;
@@ -29,7 +28,6 @@ async function AmqpHandler(client, messagePattern, payload) {
              * 다른 서비스에서 이미 처리가 될 수 있음
              * */
             (0, _1.reWriteFileValue)((_a = data === null || data === void 0 ? void 0 : data.arg) === null || _a === void 0 ? void 0 : _a.file);
-            console.log('data 데이터를 확인합니다. 2', data);
             const errInfo = data.errInfo ? data.errInfo : {
                 message: data.errMessage,
                 type: data.errType,
@@ -46,7 +44,6 @@ async function AmqpHandler(client, messagePattern, payload) {
         }
     }
     catch (err) {
-        console.log('err 데이터를 확인합니다.', err);
         if (typeof err === 'string' && err.includes('There is no matching message handler defined in the remote service.')) {
             msaLogger.error('NOT_EXISTS_MESSAGE_PATTERN', { traceId: ((_b = payload === null || payload === void 0 ? void 0 : payload.param) === null || _b === void 0 ? void 0 : _b.traceId) || '-' }, { err });
             throw new HttpExceptionCustom('해당 메시지 패턴은 존재하지 않습니다.', 404, 'There is no matching message handler defined in the remote service.', {
@@ -59,7 +56,6 @@ async function AmqpHandler(client, messagePattern, payload) {
             throw err;
         }
     }
-    console.log('data를 응답합니다.', data);
     delete data.isError;
     return data;
 }

package/functions/amqp-publish.function.js

@@ -42,7 +42,6 @@ async function AmqpPublish(client, messagePattern, payload, message) {
                 clearInterval(unsubscribeInterval);
                 subscribeValue.unsubscribe();
                 const { isError } = value;
-                console.log('value 데이터를 확인합니다.', value);
                 if (isError) {
                     const result = { ...value };
                     const status = result.status || 500;

package/interceptors/rpc.interceptor.d.ts

@@ -7,6 +7,8 @@ export declare class RPCInterceptor implements NestInterceptor {
     private readonly gracefulShutdownService;
     constructor(reflector: Reflector, gracefulShutdownService: GracefulShutdownService);
     private maxLengthOverShorten;
+    /** 메시지가 재전송되었을때에, 재시도 Count가 명시되어 있지 않을때에 처리 할지 여부를 결정하는 함수 */
+    isRedeliveryMessage(replyTo: string, traceId: string): Promise<boolean>;
     private updateMaxLengthArrayShorten;
     intercept(context: ExecutionContext, next: CallHandler): Promise<Observable<unknown>>;
 }

package/interceptors/rpc.interceptor.js

@@ -31,6 +31,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 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 @typescript-eslint/no-explicit-any */
@@ -40,6 +43,7 @@ const core_1 = require("@nestjs/core");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const msa_logger_1 = __importStar(require("@yolo-croket-dev/msa-logger"));
+const amqplib_1 = __importDefault(require("amqplib"));
 // import Logger from '@yolo-croket-dev/logger';
 const functions_1 = require("../functions");
 const exceptions_1 = require("../exceptions");
@@ -62,6 +66,40 @@ let RPCInterceptor = class RPCInterceptor {
         }
         return data;
     }
+    /** 메시지가 재전송되었을때에, 재시도 Count가 명시되어 있지 않을때에 처리 할지 여부를 결정하는 함수 */
+    async isRedeliveryMessage(replyTo, traceId) {
+        let connection;
+        let channel;
+        let isRedeliveryProcess = false;
+        const AMQP_URL = process.env.AMQP_URL;
+        if (!AMQP_URL || !AMQP_URL.length || !replyTo.length) {
+            return false;
+        }
+        try {
+            connection = await amqplib_1.default.connect(AMQP_URL);
+            channel = await connection.createChannel();
+            const isQueueExist = await channel.checkQueue(replyTo);
+            if (isQueueExist) {
+                isRedeliveryProcess = true;
+            }
+            await channel.close();
+        }
+        catch (err) {
+            const error = err;
+            const logParam = {
+                message: error.message,
+                stack: error.stack,
+            };
+            msaLogger.error('isRedeliveryMessage error', { traceId }, logParam);
+            isRedeliveryProcess = false;
+        }
+        finally {
+            if (connection) {
+                await connection.close();
+            }
+        }
+        return isRedeliveryProcess;
+    }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     updateMaxLengthArrayShorten(obj, path) {
         const keys = path.split('.');
@@ -135,7 +173,7 @@ let RPCInterceptor = class RPCInterceptor {
     //   return data;
     // }
     async intercept(context, next) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const options = this.reflector.get('rpcInterceptorScope', context.getHandler());
         const args = context.getArgs();
         const arg = args[0];
@@ -162,7 +200,6 @@ let RPCInterceptor = class RPCInterceptor {
             return rxjs_1.EMPTY;
         }
         if (!staticRetryCount && reDeliveryCount > 0) {
-            // 직접 메시지가 재시도 처리가 된 경우에는 로그만 남기고 처리하지 않음
             msaLogger.debug('RETRY_COUNT_ZERO_OR_NO_RETRY 발생 전, redelivery 발생', { traceId: ((_b = content.data.param) === null || _b === void 0 ? void 0 : _b.traceId) || 'RETRY_COUNT_ZERO_OR_NO_RETRY' }, {
                 messagePattern: method,
                 properties: message.properties,
@@ -171,9 +208,22 @@ let RPCInterceptor = class RPCInterceptor {
                 reDeliveryCount,
                 staticRetryCount,
             });
-            channel.nack(message, false, false); /** 아마도 기본 30분 타임아웃이 지나고 새로 들어오면 발생할 예정, DLQ로 이동 */
-            message.properties.replyTo = undefined; /** replyTo가 존재하면 sendToQueue가 호출되므로, 삭제해주기 */
-            return rxjs_1.EMPTY;
+            const isRedeliveryMessage = await this.isRedeliveryMessage(message.properties.replyTo, execInterceptor.traceId);
+            if (!isRedeliveryMessage || reDeliveryCount > 5) {
+                msaLogger.debug('isRedeliveryMessage RETRY_COUNT_ZERO_OR_NO_RETRY false', { traceId: ((_c = content.data.param) === null || _c === void 0 ? void 0 : _c.traceId) || 'RETRY_COUNT_ZERO_OR_NO_RETRY' });
+                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();
+            }
+            msaLogger.debug('isRedeliveryMessage RETRY_COUNT_ZERO_OR_NO_RETRY true, 재처리하여 전달토록 하기', { traceId: ((_d = content.data.param) === null || _d === void 0 ? void 0 : _d.traceId) || 'RETRY_COUNT_ZERO_OR_NO_RETRY' });
         }
         const noAck = message.fields.routingKey.includes('ASYNC');
         let localErrorProcessor = async (err) => {
@@ -202,7 +252,6 @@ let RPCInterceptor = class RPCInterceptor {
                 errMessage,
                 errAction,
             };
-            console.log('abstractAmqpHandlerData 데이터를 확인합니다.', abstractAmqpHandlerData);
             if (!Number.isNaN(staticRetryCount)
                 && staticRetryCount
                 && err.isRetry !== false) {
@@ -245,7 +294,7 @@ let RPCInterceptor = class RPCInterceptor {
         };
         localErrorProcessor = localErrorProcessor.bind(this);
         /** 파일 객체 처리 */
-        (0, functions_1.reWriteFileValue)((_c = content === null || content === void 0 ? void 0 : content.data) === null || _c === void 0 ? void 0 : _c.file);
+        (0, functions_1.reWriteFileValue)((_e = content === null || content === void 0 ? void 0 : content.data) === null || _e === void 0 ? void 0 : _e.file);
         if (options) {
             if (options.maxLengthKeys && options.maxLengthKeys.length) {
                 for (const key of options.maxLengthKeys) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.7.17-jun.4",
+  "version": "1.7.18-slowquery.0",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",