@yolo-croket-dev/core 1.7.25-slowquery.4 → 1.7.25-slowquery.5

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

@@ -17,5 +17,4 @@ export declare class GracefulServerRMQ extends ServerRMQ {
     protected waitingHandlers(): Promise<void>;
     handleMessage(message: ConsumeMessage, channel: Channel): Promise<void>;
     close(): Promise<void>;
-    private executeWithAbortSignal;
 }

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;
@@ -44,7 +45,7 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
         // 타임아웃 설정
         setTimeout(() => {
             console.log(`Message timeout: ${messageId}`);
-            abortController.abort();
+            abortController.abort(); // Abort with default reason
         }, RMQ_DEFAULT_MESSAGE_TIMEOUT_MS);
         console.log('timeout 설정');
         this.runningMessages += 1;
@@ -60,8 +61,14 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
                 this.runningMessages -= 1;
                 return;
             }
-            // Promise.withResolvers를 사용하여 abort signal 감지
-            await this.executeWithAbortSignal(() => super.handleMessage(message, channel), abortController);
+            const abortablePromise = new abortable_promise_1.AbortablePromise((resolve, reject) => {
+                super.handleMessage(message, channel).then((val) => {
+                    resolve(val);
+                }).catch((err) => {
+                    reject(err);
+                });
+            }, abortController.signal);
+            await abortablePromise;
         }
         catch (error) {
             if (error.message.includes('Message aborted')) {
@@ -90,58 +97,5 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
         this.runningMessages = 0;
         super.close();
     }
-    // Promise.withResolvers를 사용한 abort signal 감지
-    async executeWithAbortSignal(task, abortController) {
-        // Promise.withResolvers 사용
-        const { promise, resolve, reject } = Promise.withResolvers();
-        let isAborted = false;
-        let isResolved = false;
-        // eslint-disable-next-line no-undef
-        let checkInterval = null;
-        // Abort 이벤트 리스너
-        const abortHandler = () => {
-            if (!isResolved) {
-                isAborted = true;
-                console.log('Abort signal detected');
-                if (checkInterval)
-                    clearInterval(checkInterval);
-                reject(new Error('Message aborted'));
-            }
-        };
-        // Abort signal 이벤트 리스너 등록
-        // eslint-disable-next-line no-undef
-        abortController.signal.addEventListener('abort', abortHandler, { once: true });
-        // 매우 짧은 간격으로 abort 상태 확인
-        checkInterval = setInterval(() => {
-            if (abortController.signal.aborted && !isResolved) {
-                isAborted = true;
-                clearInterval(checkInterval);
-                // eslint-disable-next-line no-undef
-                abortController.signal.removeEventListener('abort', abortHandler);
-                reject(new Error('Message aborted'));
-            }
-        }, 1); // 1ms마다 확인
-        // 원본 task 실행
-        task()
-            .then((result) => {
-            if (!isAborted && !isResolved) {
-                isResolved = true;
-                if (checkInterval)
-                    clearInterval(checkInterval);
-                abortController.signal.removeEventListener('abort', abortHandler);
-                resolve(result);
-            }
-        })
-            .catch((error) => {
-            if (!isAborted && !isResolved) {
-                isResolved = true;
-                if (checkInterval)
-                    clearInterval(checkInterval);
-                abortController.signal.removeEventListener('abort', abortHandler);
-                reject(error);
-            }
-        });
-        return promise;
-    }
 }
 exports.GracefulServerRMQ = GracefulServerRMQ;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.7.25-slowquery.4",
+  "version": "1.7.25-slowquery.5",
   "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",