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

package/interceptors/logging-service.interceptor.js

@@ -188,7 +188,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         }));
     }
 };
-exports.LoggingServiceInterceptor = LoggingServiceInterceptor;
-exports.LoggingServiceInterceptor = LoggingServiceInterceptor = __decorate([
+LoggingServiceInterceptor = __decorate([
     (0, common_1.Injectable)()
 ], LoggingServiceInterceptor);
+exports.LoggingServiceInterceptor = LoggingServiceInterceptor;

package/interceptors/rpc.interceptor.js

@@ -178,6 +178,16 @@ let RPCInterceptor = class RPCInterceptor {
         const args = context.getArgs();
         const arg = args[0];
         const rmq = args[1];
+        // 메시지에서 AbortController 가져오기
+        const abortController = rmq.abortController;
+        //  const messageId = (rmq as any).messageId;
+        //  if (!abortController) {
+        //    // AbortController가 없으면 기본 처리
+        //    return next.handle().pipe(
+        //      timeout(1000 * 60 * 29),
+        //      // ... 기존 로직
+        //    );
+        //  }
         const channel = rmq.getChannelRef();
         const message = rmq.getMessage();
         const now = Date.now();
@@ -339,7 +349,21 @@ let RPCInterceptor = class RPCInterceptor {
         // eslint-disable-next-line consistent-return
         return next
             .handle()
-            .pipe((0, operators_1.timeout)(1000 * 60 * 29), // 30분 타임아웃
+            .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);
+            };
+        })), 
+        // timeout(1000 * 60 * 29), // 30분 타임아웃
+        (0, operators_1.timeout)(1000 * 2), // 30분 타임아웃
         (0, operators_1.tap)({
             next: async (val) => {
                 val.isError = false;
@@ -365,20 +389,36 @@ let RPCInterceptor = class RPCInterceptor {
         // eslint-disable-next-line consistent-return
         (0, operators_1.catchError)(async (err) => {
             // timeout 에러 처리
-            msaLogger.error('Timeout occurred, requeuing message', { traceId: execInterceptor.traceId }, {
-                error: {
-                    message: err.message,
-                    stack: err.stack,
-                    name: err.name,
-                    response: err.response,
-                },
-            });
             const isTimeoutError = err instanceof Error && err.name === 'TimeoutError';
-            if (isTimeoutError && !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 });
+            if (isTimeoutError) {
+                if (abortController && abortController.signal.aborted) {
+                    throw new Error('Message aborted due to timeout');
+                }
+                msaLogger.error('[타임 아웃] 메시지 재전송 처리', { traceId: execInterceptor.traceId }, {
+                    error: {
+                        message: err.message,
+                        stack: err.stack,
+                        name: err.name,
+                        response: err.response,
+                    },
+                });
+                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 }, {
+                    error: {
+                        message: err.message,
+                        stack: err.stack,
+                        name: err.name,
+                        response: err.response,
+                    },
+                });
                 return new rxjs_1.Observable();
             }
         }), (0, operators_1.finalize)(() => {
@@ -386,9 +426,9 @@ let RPCInterceptor = class RPCInterceptor {
         }));
     }
 };
-exports.RPCInterceptor = RPCInterceptor;
-exports.RPCInterceptor = RPCInterceptor = __decorate([
+RPCInterceptor = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [core_1.Reflector,
         graceful_shutdown_service_1.GracefulShutdownService])
 ], RPCInterceptor);
+exports.RPCInterceptor = RPCInterceptor;

package/interfaces/exception.js

@@ -18,10 +18,9 @@ var ErrActionTypeEnum;
     ErrActionTypeEnum["LEGACY_SHOW_TOAST"] = "LEGACY_SHOW_TOAST";
     ErrActionTypeEnum["FORCE_UPDATE"] = "FORCE_UPDATE";
     ErrActionTypeEnum["UPDATE_ACCESS_TOKEN"] = "UPDATE_ACCESS_TOKEN";
-})(ErrActionTypeEnum || (exports.ErrActionTypeEnum = ErrActionTypeEnum = {}));
+})(ErrActionTypeEnum = exports.ErrActionTypeEnum || (exports.ErrActionTypeEnum = {}));
 class ErrAction {
 }
-exports.ErrAction = ErrAction;
 __decorate([
     (0, swagger_1.ApiProperty)({
         description: '액션 타입',
@@ -58,9 +57,9 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], ErrAction.prototype, "webViewUrl", void 0);
+exports.ErrAction = ErrAction;
 class ErrInfo {
 }
-exports.ErrInfo = ErrInfo;
 __decorate([
     (0, swagger_1.ApiProperty)({
         description: '에러 종류 식별자',
@@ -82,3 +81,4 @@ __decorate([
     }),
     __metadata("design:type", ErrAction)
 ], ErrInfo.prototype, "action", void 0);
+exports.ErrInfo = ErrInfo;

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

@@ -25,8 +25,7 @@ let GracefulShutdownModule = class GracefulShutdownModule {
         }
     }
 };
-exports.GracefulShutdownModule = GracefulShutdownModule;
-exports.GracefulShutdownModule = GracefulShutdownModule = __decorate([
+GracefulShutdownModule = __decorate([
     (0, common_1.Global)(),
     (0, common_1.Module)({
         providers: [graceful_shutdown_service_1.GracefulShutdownService],
@@ -34,3 +33,4 @@ exports.GracefulShutdownModule = GracefulShutdownModule = __decorate([
     }),
     __metadata("design:paramtypes", [graceful_shutdown_service_1.GracefulShutdownService])
 ], GracefulShutdownModule);
+exports.GracefulShutdownModule = GracefulShutdownModule;

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

@@ -1,7 +1,9 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { RmqOptions, ServerRMQ } from '@nestjs/microservices';
 import { Channel } from 'amqp-connection-manager';
 import { ConsumeMessage } from 'amqplib';
-export type GracefulRmqOptions = RmqOptions['options'] & {
+export declare type GracefulRmqOptions = RmqOptions['options'] & {
     waitingEndingHandlersTimeoutMs?: number;
     waitingEndingHandlersIntervalMs?: number;
 };
@@ -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

@@ -6,6 +6,8 @@ const node_util_1 = require("node:util");
 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;
+// const RMQ_DEFAULT_MESSAGE_TIMEOUT_MS = 1000 * 60 * 29; // 29분
+const RMQ_DEFAULT_MESSAGE_TIMEOUT_MS = 1000 * 2; // 2분
 class GracefulServerRMQ extends microservices_1.ServerRMQ {
     constructor(options) {
         super(options);
@@ -13,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')
@@ -36,13 +42,59 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
         }
     }
     async handleMessage(message, channel) {
+        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);
+        }, RMQ_DEFAULT_MESSAGE_TIMEOUT_MS);
+        this.messageTimeouts.set(messageId, timeoutId);
         this.runningMessages += 1;
-        return super.handleMessage(message, channel).finally(() => {
+        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
+            message.messageId = messageId;
+            return await super.handleMessage(message, channel);
+        }
+        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/modules/graceful-shutdown/graceful-shutdown.service.js

@@ -137,7 +137,7 @@ let GracefulShutdownService = class GracefulShutdownService {
         });
     }
 };
-exports.GracefulShutdownService = GracefulShutdownService;
-exports.GracefulShutdownService = GracefulShutdownService = __decorate([
+GracefulShutdownService = __decorate([
     (0, common_1.Injectable)()
 ], GracefulShutdownService);
+exports.GracefulShutdownService = GracefulShutdownService;

package/modules/redis.module.js

@@ -15,10 +15,10 @@ const redisProvider = {
 };
 let RedisModule = class RedisModule {
 };
-exports.RedisModule = RedisModule;
-exports.RedisModule = RedisModule = __decorate([
+RedisModule = __decorate([
     (0, common_1.Module)({
         providers: [redisProvider],
         exports: [redisProvider],
     })
 ], RedisModule);
+exports.RedisModule = RedisModule;

package/package.json

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

package/pipes/rpc-validation.pipe.js

@@ -31,8 +31,8 @@ let ValidationPipe = class ValidationPipe {
         return value;
     }
 };
-exports.ValidationPipe = ValidationPipe;
-exports.ValidationPipe = ValidationPipe = __decorate([
+ValidationPipe = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [Object])
 ], ValidationPipe);
+exports.ValidationPipe = ValidationPipe;