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

package/interceptors/rpc.interceptor.js

@@ -255,13 +255,13 @@ let RPCInterceptor = class RPCInterceptor {
                 }
             }
             const sendMessage = Buffer.from(JSON.stringify(abstractAmqpHandlerData));
-            if (!isAck) {
+            if (!isAck && !execInterceptor.isMessageAck) {
                 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) {
+            if (!noAck && !isAck && !execInterceptor.isMessageAck) {
                 channel.ack(message);
                 execInterceptor.isMessageAck = true;
             }
@@ -306,27 +306,13 @@ let RPCInterceptor = class RPCInterceptor {
                 abortController.abort();
                 return (0, rxjs_1.throwError)(() => new exceptions_1.InternalServerError('TIMEOUT_ERROR', this.DEFAULT_TIMEOUT_MESSAGE));
             },
-        }), (0, operators_1.tap)({
-            next: async (val) => {
-                val.isError = false;
-                /** 만약 응답데이터중 isRequeue가 true라면, 다시 재처리 하도록 함 */
-                if (val.data && val.data.isRequeue) {
-                    channel.nack(message, false, true);
-                    execInterceptor.isMessageAck = true;
-                    return;
-                }
-                if (!noAck) {
-                    execInterceptor.isMessageAck = true;
-                    channel.ack(message);
-                }
-            },
-            error: localErrorProcessor,
         }), 
         // 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);
+            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: {
@@ -346,16 +332,32 @@ let RPCInterceptor = class RPCInterceptor {
                         stack: err.stack,
                         name: err.name,
                         response: err.response,
+                        isNackMessage,
                     },
                     messagePattern: method,
                 });
             }
-            if (!execInterceptor.isMessageAck) {
+            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;
+                /** 만약 응답데이터중 isRequeue가 true라면, 다시 재처리 하도록 함 */
+                if (val.data && val.data.isRequeue) {
+                    channel.nack(message, false, true);
+                    execInterceptor.isMessageAck = true;
+                    return;
+                }
+                if (!noAck) {
+                    execInterceptor.isMessageAck = true;
+                    channel.ack(message);
+                }
+            },
+            error: localErrorProcessor,
         }), (0, operators_1.finalize)(() => {
             this.gracefulShutdownService.popActiveInterceptors(execInterceptor);
             abortController.abort();

package/package.json

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