@yolo-croket-dev/core 1.7.25-slowquery.0 → 1.7.25-slowquery.1

package/interceptors/rpc.interceptor.js

@@ -179,7 +179,7 @@ let RPCInterceptor = class RPCInterceptor {
         const arg = args[0];
         const rmq = args[1];
         // 메시지에서 AbortController 가져오기
-        const abortController = rmq.abortController;
+        const abortController = rmq.args[0].abortController;
         //  const messageId = (rmq as any).messageId;
         //  if (!abortController) {
         //    // AbortController가 없으면 기본 처리
@@ -391,7 +391,8 @@ let RPCInterceptor = class RPCInterceptor {
             // timeout 에러 처리
             const isTimeoutError = err instanceof Error && err.name === 'TimeoutError';
             if (isTimeoutError) {
-                if (abortController && abortController.signal.aborted) {
+                if (abortController) {
+                    abortController.abort();
                     throw new Error('Message aborted due to timeout');
                 }
                 msaLogger.error('[타임 아웃] 메시지 재전송 처리', { traceId: execInterceptor.traceId }, {

package/modules/graceful-shutdown/graceful-shutdown.rmq.js

@@ -48,6 +48,7 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
         this.messageAbortControllers.set(messageId, abortController);
         // 타임아웃 설정
         const timeoutId = setTimeout(() => {
+            console.log(`Message timeout: ${messageId}`);
             abortController.abort();
             this.cleanupMessage(messageId);
         }, RMQ_DEFAULT_MESSAGE_TIMEOUT_MS);
@@ -57,9 +58,40 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
             // AbortController를 메시지에 추가
             // eslint-disable-next-line no-param-reassign, @typescript-eslint/no-explicit-any
             message.abortController = abortController;
-            // eslint-disable-next-line no-param-reassign, @typescript-eslint/no-explicit-any
+            // eslint-disable-next-line no-param-reassign
             message.messageId = messageId;
-            return await super.handleMessage(message, channel);
+            // abort 상태 확인
+            if (abortController.signal.aborted) {
+                console.log(`Message already aborted: ${messageId}`);
+                this.cleanupMessage(messageId);
+                this.runningMessages -= 1;
+                return;
+            }
+            // Promise.race를 사용하여 abort와 handleMessage 경쟁
+            const handleMessagePromise = super.handleMessage(message, channel);
+            const abortPromise = new Promise((_, reject) => {
+                // 1초마다 abort 상태를 확인
+                const interval = setInterval(() => {
+                    if (abortController.signal.aborted) {
+                        reject(new Error(`Message aborted: ${messageId}`));
+                        clearInterval(interval);
+                    }
+                }, 1000);
+            });
+            // 둘 중 하나가 먼저 완료되면 그 결과를 반환
+            await Promise.race([
+                handleMessagePromise,
+                abortPromise,
+            ]);
+        }
+        catch (error) {
+            if (error.message.includes('Message aborted')) {
+                console.log(`Message processing aborted: ${messageId}`);
+                // abort로 인한 에러는 정상적으로 처리된 것으로 간주
+            }
+            else {
+                throw error;
+            }
         }
         finally {
             this.cleanupMessage(messageId);

package/package.json

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