@yolo-croket-dev/core 1.7.30-slowquery.0 → 1.7.30

package/interceptors/rpc.interceptor.js

@@ -213,6 +213,8 @@ let RPCInterceptor = class RPCInterceptor {
             const errInfo = err.errInfo;
             const duration = Date.now() - now;
             let isAck = false;
+            const isTimeoutError = err instanceof Error
+                && (err.name === 'TimeoutError' || (err.message === this.DEFAULT_TIMEOUT_MESSAGE) || err.message === 'TIMEOUT_ERROR');
             /** 파일 객체 처리 */
             (0, functions_1.reWriteFileValue)(arg === null || arg === void 0 ? void 0 : arg.file);
             const abstractAmqpHandlerData = {
@@ -249,19 +251,47 @@ let RPCInterceptor = class RPCInterceptor {
                 }
                 isAck = true;
             }
+            else if (isTimeoutError && reDeliveryCount <= 1) {
+                // 타임아웃 에러일때 1회 재시도 허용
+                msaLogger.debug('타임아웃 에러일때 1회 재시도 허용', { traceId: execInterceptor.traceId }, {
+                    message: err.message,
+                    stack: err.stack,
+                    name: err.name,
+                    response: err.response,
+                    messagePattern: method,
+                    reDeliveryCount,
+                    staticRetryCount,
+                });
+                channel.nack(message, false, true);
+                message.properties.replyTo = undefined; /** replyTo가 존재하면 sendToQueue가 호출되므로, 삭제해주기 */
+                execInterceptor.isMessageAck = true;
+                isAck = true;
+            }
             if (options && options.maxLengthKeys && options.maxLengthKeys.length) {
                 for (const key of options.maxLengthKeys) {
                     this.updateMaxLengthArrayShorten(abstractAmqpHandlerData.arg.payload, key);
                 }
             }
             const sendMessage = Buffer.from(JSON.stringify(abstractAmqpHandlerData));
-            if (!isAck && !execInterceptor.isMessageAck) {
+            if (!isAck) {
+                // 에러 전달
+                msaLogger.error('에러 응답 전송 처리', { traceId: execInterceptor.traceId }, {
+                    error: {
+                        message: err.message,
+                        stack: err.stack,
+                        name: err.name,
+                        response: err.response,
+                        reDeliveryCount,
+                        staticRetryCount,
+                    },
+                    messagePattern: method,
+                });
                 channel.sendToQueue(message.properties.replyTo, sendMessage, { correlationId: message.properties.correlationId });
             }
             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);
-            if (!noAck && !isAck && !execInterceptor.isMessageAck) {
+            if (!noAck && !isAck) {
                 channel.ack(message);
                 execInterceptor.isMessageAck = true;
             }
@@ -306,43 +336,6 @@ let RPCInterceptor = class RPCInterceptor {
                 abortController.abort();
                 return (0, rxjs_1.throwError)(() => new exceptions_1.InternalServerError('TIMEOUT_ERROR', this.DEFAULT_TIMEOUT_MESSAGE));
             },
-        }), 
-        // eslint-disable-next-line consistent-return
-        (0, operators_1.catchError)(async (err) => {
-            const isNackMessage = !execInterceptor.isMessageAck;
-            // timeout 에러 처리
-            const isTimeoutError = err instanceof Error
-                && (err.name === 'TimeoutError' || (err.message === this.DEFAULT_TIMEOUT_MESSAGE) || err.message === 'TIMEOUT_ERROR');
-            if (isTimeoutError) {
-                msaLogger.error(`[타임 아웃] 메시지 감지, ${isNackMessage ? '재전달' : '재전달하지 않음'}처리`, { traceId: execInterceptor.traceId }, {
-                    error: {
-                        message: err.message,
-                        stack: err.stack,
-                        name: err.name,
-                        response: err.response,
-                        isNackMessage,
-                    },
-                    messagePattern: method,
-                });
-            }
-            else {
-                msaLogger.error(`에러 응답 전송 처리, ${isNackMessage ? '재전달' : '재전달하지 않음'}처리`, { traceId: execInterceptor.traceId }, {
-                    error: {
-                        message: err.message,
-                        stack: err.stack,
-                        name: err.name,
-                        response: err.response,
-                        isNackMessage,
-                    },
-                    messagePattern: method,
-                });
-            }
-            if (isNackMessage) {
-                channel.nack(message, false, true);
-                execInterceptor.isMessageAck = true;
-                message.properties.replyTo = undefined; /** replyTo가 존재하면 sendToQueue가 호출되므로, 삭제해주기 */
-            }
-            return new rxjs_1.Observable();
         }), (0, operators_1.tap)({
             next: async (val) => {
                 val.isError = false;

package/package.json

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