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

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가 없으면 기본 처리
@@ -349,23 +349,25 @@ let RPCInterceptor = class RPCInterceptor {
         // eslint-disable-next-line consistent-return
         return next
             .handle()
-            .pipe(
-        // AbortController 신호 감지
-        (0, operators_1.takeUntil)(new rxjs_1.Observable(subscriber => {
-            const abortHandler = () => {
-                subscriber.next();
-                subscriber.complete();
-            };
-            abortController.signal.addEventListener('abort', abortHandler, { once: true });
-            // 정리 함수
-            return () => {
-                abortController.signal.removeEventListener('abort', abortHandler);
-            };
-        })), 
+            .pipe((0, operators_1.switchMap)((val) => {
+            console.log('switchMap called', val);
+            if (abortController === null || abortController === void 0 ? void 0 : abortController.signal.aborted) {
+                console.log('RPC Interceptor: Service execution aborted');
+                return (0, rxjs_1.throwError)(() => new Error('Service execution aborted'));
+            }
+            // // AbortController를 컨텍스트에 주입
+            // const request = context.switchToRpc().getData();
+            // if (request && typeof request === 'object') {
+            //   (request as any).abortController = abortController;
+            //   (request as any).abortSignal = abortController?.signal;
+            // }
+            return (0, rxjs_1.of)(val);
+        }), 
         // timeout(1000 * 60 * 29), // 30분 타임아웃
-        (0, operators_1.timeout)(1000 * 2), // 30분 타임아웃
+        (0, operators_1.timeout)(1000 * 3), // 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,7 +393,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.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { RmqOptions, ServerRMQ } from '@nestjs/microservices';
 import { Channel } from 'amqp-connection-manager';
 import { ConsumeMessage } from 'amqplib';
@@ -14,14 +12,9 @@ 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,6 +3,7 @@ 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;
@@ -15,10 +16,6 @@ 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')
@@ -45,56 +42,50 @@ 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);
         // 타임아웃 설정
-        const timeoutId = setTimeout(() => {
-            abortController.abort();
-            this.cleanupMessage(messageId);
+        setTimeout(() => {
+            console.log(`Message timeout: ${messageId}`);
+            abortController.abort(); // Abort with default reason
         }, RMQ_DEFAULT_MESSAGE_TIMEOUT_MS);
-        this.messageTimeouts.set(messageId, timeoutId);
+        console.log('timeout 설정');
         this.runningMessages += 1;
         try {
             // 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.runningMessages -= 1;
+                return;
+            }
+            const abortablePromise = new abortable_promise_1.AbortablePromise((resolve, reject) => {
+                try {
+                    super.handleMessage(message, channel);
+                }
+                catch (err) {
+                    reject(err);
+                }
+            }, abortController.signal);
+            await abortablePromise;
+        }
+        catch (error) {
+            if (error.message.includes('Message aborted')) {
+                console.log(`Message processing aborted: ${messageId}`);
+                // abort로 인한 에러는 정상적으로 처리된 것으로 간주
+            }
+            else {
+                throw error;
+            }
         }
         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.0",
+  "version": "1.7.25-slowquery.10",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",
@@ -15,6 +15,7 @@
   "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",