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

package/interceptors/rpc.interceptor.js

@@ -186,7 +186,8 @@ let RPCInterceptor = class RPCInterceptor {
         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('abortablePromise: ', abortablePromise);
+        // (context as any).handler = abortablePromise;
         console.log('handler: ', handler);
         console.log('context: ', context);
         //  const messageId = (rmq as any).messageId;

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

@@ -3,12 +3,9 @@ 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;
-// 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);
@@ -39,55 +36,10 @@ 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();
-        // 타임아웃 설정
-        setTimeout(() => {
-            console.log(`Message timeout: ${messageId}`);
-            abortController.abort(); // Abort with default reason
-        }, RMQ_DEFAULT_MESSAGE_TIMEOUT_MS);
-        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
-            message.messageId = messageId;
-            // 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);
-            abortablePromise.then((val) => {
-                console.log('handleMessage success', val);
-            }).catch((err) => {
-                console.log('handleMessage error', err);
-                throw err;
-            });
-        }
-        catch (error) {
-            if (error.message.includes('Message aborted')) {
-                console.log(`Message processing aborted: ${messageId}`);
-                // abort로 인한 에러는 정상적으로 처리된 것으로 간주
-            }
-            else {
-                throw error;
-            }
-        }
-        finally {
+        return super.handleMessage(message, channel).finally(() => {
             this.runningMessages -= 1;
-        }
+        });
     }
     async close() {
         this.closing = true;

package/package.json

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