@yolo-croket-dev/core 1.7.25-slowquery.12 → 1.7.25-slowquery.2

package/interceptors/rpc.interceptor.js

@@ -44,7 +44,6 @@ 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"));
-const abortable_promise_1 = require("@xuchaoqian/abortable-promise");
 // import Logger from '@yolo-croket-dev/logger';
 const functions_1 = require("../functions");
 const exceptions_1 = require("../exceptions");
@@ -180,15 +179,7 @@ let RPCInterceptor = class RPCInterceptor {
         const arg = args[0];
         const rmq = args[1];
         // 메시지에서 AbortController 가져오기
-        //  const abortController = (rmq as any).args[0].abortController;
-        const abortController = new AbortController();
-        const handler = context.getHandler();
-        console.log('args: ', args);
-        console.log('context: ', context);
-        const abortablePromise = new abortable_promise_1.AbortablePromise((...args) => handler(...args), abortController.signal);
-        context.handler = abortablePromise;
-        console.log('handler: ', handler);
-        console.log('context: ', context);
+        const abortController = rmq.args[0].abortController;
         //  const messageId = (rmq as any).messageId;
         //  if (!abortController) {
         //    // AbortController가 없으면 기본 처리
@@ -359,11 +350,23 @@ let RPCInterceptor = class RPCInterceptor {
         return next
             .handle()
             .pipe(
+        // AbortController 신호 감지
+        (0, operators_1.takeUntil)(new rxjs_1.Observable(subscriber => {
+            const abortHandler = () => {
+                console.log('RPC Interceptor abortHandler called');
+                subscriber.next();
+                subscriber.complete();
+            };
+            abortController.signal.addEventListener('abort', abortHandler, { once: true });
+            // 정리 함수
+            return () => {
+                abortController.signal.removeEventListener('abort', abortHandler);
+            };
+        })), 
         // timeout(1000 * 60 * 29), // 30분 타임아웃
-        (0, operators_1.timeout)(1000 * 3), // 30분 타임아웃
+        (0, operators_1.timeout)(1000 * 30), // 30분 타임아웃
         (0, operators_1.tap)({
             next: async (val) => {
-                console.log('RPC Interceptor next called');
                 val.isError = false;
                 // const duration = Date.now() - now;
                 // logger.debug(`<= (success:${traceId}): ${val.message}`, {
@@ -391,6 +394,7 @@ let RPCInterceptor = class RPCInterceptor {
             if (isTimeoutError) {
                 if (abortController) {
                     abortController.abort();
+                    throw new Error('Message aborted due to timeout');
                 }
                 msaLogger.error('[타임 아웃] 메시지 재전송 처리', { traceId: execInterceptor.traceId }, {
                     error: {

package/modules/graceful-shutdown/graceful-shutdown.rmq.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { RmqOptions, ServerRMQ } from '@nestjs/microservices';
 import { Channel } from 'amqp-connection-manager';
 import { ConsumeMessage } from 'amqplib';
@@ -12,9 +14,14 @@ export declare class GracefulServerRMQ extends ServerRMQ {
     protected consumerTag: string | null;
     protected readonly waitingEndingHandlersTimeoutMs: number;
     protected readonly waitingEndingHandlersIntervalMs: number;
+    protected messageAbortControllers: Map<string, AbortController>;
+    protected messageTimeouts: Map<string, NodeJS.Timeout>;
     constructor(options: GracefulRmqOptions);
     setupChannel(channel: Channel, callback: () => void): Promise<void>;
     protected waitingHandlers(): Promise<void>;
     handleMessage(message: ConsumeMessage, channel: Channel): Promise<void>;
+    private cleanupMessage;
+    abortMessage(messageId: string): void;
+    abortAllMessages(): void;
     close(): Promise<void>;
 }

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GracefulServerRMQ = void 0;
 const microservices_1 = require("@nestjs/microservices");
 const node_util_1 = require("node:util");
-const abortable_promise_1 = require("@xuchaoqian/abortable-promise");
 const sleep = (0, node_util_1.promisify)(setTimeout);
 const RMQ_DEFAULT_WAITING_ENDING_HANDLERS_TIMEOUT_MS = 5000;
 const RMQ_DEFAULT_WAITING_ENDING_HANDLERS_INTERVAL_MS = 500;
@@ -16,6 +15,10 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
         this.runningMessages = 0;
         this.closing = false;
         this.consumerTag = null;
+        // 메시지별 AbortController 관리
+        this.messageAbortControllers = new Map();
+        // eslint-disable-next-line no-undef
+        this.messageTimeouts = new Map();
         this.waitingEndingHandlersTimeoutMs = this.getOptionsProp(this.options, 'waitingEndingHandlersTimeoutMs')
             || RMQ_DEFAULT_WAITING_ENDING_HANDLERS_TIMEOUT_MS;
         this.waitingEndingHandlersIntervalMs = this.getOptionsProp(this.options, 'waitingEndingHandlersIntervalMs')
@@ -42,12 +45,14 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
         const messageId = message.properties.messageId || message.properties.correlationId || `msg_${Date.now()}_${Math.random()}`;
         // AbortController 생성
         const abortController = new AbortController();
+        this.messageAbortControllers.set(messageId, abortController);
         // 타임아웃 설정
-        setTimeout(() => {
+        const timeoutId = setTimeout(() => {
             console.log(`Message timeout: ${messageId}`);
-            abortController.abort(); // Abort with default reason
+            abortController.abort();
+            this.cleanupMessage(messageId);
         }, RMQ_DEFAULT_MESSAGE_TIMEOUT_MS);
-        console.log('timeout 설정');
+        this.messageTimeouts.set(messageId, timeoutId);
         this.runningMessages += 1;
         try {
             // AbortController를 메시지에 추가
@@ -58,23 +63,26 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
             // abort 상태 확인
             if (abortController.signal.aborted) {
                 console.log(`Message already aborted: ${messageId}`);
+                this.cleanupMessage(messageId);
                 this.runningMessages -= 1;
                 return;
             }
-            const abortablePromise = new abortable_promise_1.AbortablePromise((resolve, reject) => {
-                try {
-                    super.handleMessage(message, channel);
-                }
-                catch (err) {
-                    reject(err);
-                }
-            }, abortController.signal);
-            abortablePromise.then((val) => {
-                console.log('handleMessage success', val);
-            }).catch((err) => {
-                console.log('handleMessage error', err);
-                throw err;
+            // 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')) {
@@ -86,11 +94,39 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
             }
         }
         finally {
+            this.cleanupMessage(messageId);
             this.runningMessages -= 1;
         }
     }
+    cleanupMessage(messageId) {
+        // 타임아웃 정리
+        const timeoutId = this.messageTimeouts.get(messageId);
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+            this.messageTimeouts.delete(messageId);
+        }
+        // AbortController 정리
+        this.messageAbortControllers.delete(messageId);
+    }
+    // 특정 메시지 강제 중단
+    abortMessage(messageId) {
+        const abortController = this.messageAbortControllers.get(messageId);
+        if (abortController) {
+            abortController.abort();
+            this.cleanupMessage(messageId);
+        }
+    }
+    // 모든 실행 중인 메시지 중단
+    abortAllMessages() {
+        for (const [messageId, abortController,] of this.messageAbortControllers) {
+            abortController.abort();
+            this.cleanupMessage(messageId);
+        }
+    }
     async close() {
         this.closing = true;
+        // 모든 실행 중인 메시지 중단
+        this.abortAllMessages();
         if (this.channel) {
             await this.channel.removeSetup(undefined, (channel) => channel.cancel(this.consumerTag));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.7.25-slowquery.12",
+  "version": "1.7.25-slowquery.2",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",
@@ -15,7 +15,6 @@
   "license": "UNLICENSED",
   "dependencies": {
     "@nestjs/common": "^8.2.3",
-    "@xuchaoqian/abortable-promise": "^1.11.2",
     "@yolo-croket-dev/logger": "^1.0.15",
     "@yolo-croket-dev/msa-logger": "^3.0.4",
     "@yolo-croket-dev/redis": "^1.0.23",