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

package/interceptors/rpc.interceptor.js

@@ -296,61 +296,68 @@ let RPCInterceptor = class RPCInterceptor {
             .pipe((0, operators_1.timeout)({
             each: this.DEFAULT_TIMEOUT,
             with: () => {
-                msaLogger.error('RPCInterceptor timeout 발생', { traceId: execInterceptor.traceId }, { message: this.DEFAULT_TIMEOUT_MESSAGE });
+                msaLogger.error('RPCInterceptor timeout 발생', { traceId: execInterceptor.traceId }, {
+                    message: this.DEFAULT_TIMEOUT_MESSAGE,
+                    messagePattern: method,
+                    durationMs: Date.now() - now,
+                    reDeliveryCount,
+                    staticRetryCount,
+                });
                 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);
-            console.log('isTimeoutError: ', isTimeoutError);
-            console.log('err.name: ', err.name);
-            console.log('err.message: ', 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('[타임 아웃] 메시지 재전송 처리', { traceId: execInterceptor.traceId }, {
+                msaLogger.error(`[타임 아웃] 메시지 감지, ${isNackMessage ? '재전달' : '재전달하지 않음'}처리`, { traceId: execInterceptor.traceId }, {
                     error: {
                         message: err.message,
                         stack: err.stack,
                         name: err.name,
                         response: err.response,
+                        isNackMessage,
                     },
+                    messagePattern: method,
                 });
-                if (!execInterceptor.isMessageAck) {
-                    channel.nack(message, false, true);
-                    execInterceptor.isMessageAck = true;
-                    message.properties.replyTo = undefined; /** replyTo가 존재하면 sendToQueue가 호출되므로, 삭제해주기 */
-                    msaLogger.debug('TimeoutError occurred, message requeued called', { traceId: execInterceptor.traceId });
-                    return new rxjs_1.Observable();
-                }
             }
             else {
-                msaLogger.error('에러 응답 전송 처리', { traceId: execInterceptor.traceId }, {
+                msaLogger.error(`에러 응답 전송 처리, ${isNackMessage ? '재전달' : '재전달하지 않음'}처리`, { traceId: execInterceptor.traceId }, {
                     error: {
                         message: err.message,
                         stack: err.stack,
                         name: err.name,
                         response: err.response,
+                        isNackMessage,
                     },
+                    messagePattern: method,
                 });
-                return new rxjs_1.Observable();
             }
+            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-slowquery.0",
+  "version": "1.7.29",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",