@yolo-croket-dev/core 1.7.25-slowquery.32 → 1.7.25-slowquery.34

package/decorators/abort-event.decorator.js

@@ -3,24 +3,68 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbortEvent = void 0;
 // src/modules/rpc-testing/decorators/abort-event.decorator.ts
 const abort_1 = require("../functions/abort");
-const abortable_promise_1 = require("@xuchaoqian/abortable-promise");
+// import { AbortablePromise } from '@xuchaoqian/abortable-promise';
 /**
  * 이벤트 기반으로 AbortSignal을 감지하는 데코레이터 (Interval 없음)
  */
 function AbortEvent() {
     return function (target, propertyKey, descriptor) {
         const originalMethod = descriptor.value;
-        // eslint-disable-next-line no-param-reassign
-        // descriptor.value = async function (...args: unknown[]) {
-        //   try {
-        //     const result = await new AbortablePromise(originalMethod.apply(this, args), getCurrentAbortSignal() || undefined);
-        //     return result;
-        //   } catch (error) {
-        //     throw error;
-        //   }
-        // };
-        descriptor.value = new abortable_promise_1.AbortablePromise(originalMethod, (0, abort_1.getCurrentAbortSignal)() || undefined);
+        descriptor.value = async function (...args) {
+            const abortSignal = (0, abort_1.getCurrentAbortSignal)();
+            if (!abortSignal) {
+                return originalMethod.apply(this, args);
+            }
+            if (abortSignal.aborted) {
+                throw new Error('REQUEST_ABORTED: 작업이 이미 중단되었습니다');
+            }
+            // AbortablePromise를 사용하여 실제로 중단 가능한 Promise 생성
+            return new AbortablePromise((resolve, reject) => {
+                const abortHandler = () => {
+                    reject(new Error('REQUEST_ABORTED: 작업이 중단되었습니다'));
+                };
+                abortSignal.addEventListener('abort', abortHandler, { once: true });
+                // 원본 메서드 실행
+                originalMethod.apply(this, args)
+                    .then((result) => {
+                    abortSignal.removeEventListener('abort', abortHandler);
+                    resolve(result);
+                })
+                    .catch((error) => {
+                    abortSignal.removeEventListener('abort', abortHandler);
+                    reject(error);
+                });
+            }, abortSignal);
+        };
         return descriptor;
     };
 }
 exports.AbortEvent = AbortEvent;
+// AbortablePromise 클래스
+class AbortablePromise extends Promise {
+    constructor(executor, signal) {
+        super((resolve, reject) => {
+            if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+                reject(new Error('REQUEST_ABORTED: Promise가 이미 중단되었습니다'));
+                return;
+            }
+            const abortHandler = () => {
+                reject(new Error('REQUEST_ABORTED: Promise가 중단되었습니다'));
+            };
+            if (signal) {
+                signal.addEventListener('abort', abortHandler, { once: true });
+            }
+            executor((value) => {
+                if (signal) {
+                    signal.removeEventListener('abort', abortHandler);
+                }
+                resolve(value);
+            }, (reason) => {
+                if (signal) {
+                    signal.removeEventListener('abort', abortHandler);
+                }
+                reject(reason);
+            });
+        });
+    }
+}

package/package.json

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