@yolo-croket-dev/core 1.7.25-slowquery.33 → 1.7.25-slowquery.35

package/decorators/abort-event.decorator.js

@@ -3,29 +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[]) {
-        //   const abortablePromise = AbortablePromise.newWithSignal()
-        //   try {
-        //     // const result = await new AbortablePromise(originalMethod.apply(this, args), getCurrentAbortSignal() || undefined);
-        //     const result = await new AbortablePromise(() => originalMethod.apply(this, args), getCurrentAbortSignal() || undefined);
-        //     return result;
-        //   } catch (error) {
-        //     throw error;
-        //   }
-        // };
         descriptor.value = async function (...args) {
-            return originalMethod.apply(this, 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);
         };
-        new abortable_promise_1.AbortablePromise(() => descriptor.value, (0, abort_1.getCurrentAbortSignal)() || undefined);
         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/functions/{abort.d.ts → abort/abort.d.ts}

@@ -46,11 +46,6 @@ export declare function setTimeoutWithAbort(callback: () => void, delay: number,
  * @returns 중단 가능한 Promise
  */
 export declare function repeatWithAbort(task: () => Promise<void> | void, interval: number, abortSignal?: AbortSignal): Promise<void>;
-/**
- * 현재 컨텍스트 정보를 로깅하는 디버그 함수
- * @param message 로그 메시지
- */
-export declare function logAbortContext(message: string): void;
 /**
  * 이벤트 기반으로 중단 가능한 Promise 실행
  * @param promise 원본 Promise

package/functions/{abort.js → abort/abort.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withAbortSignalEventBased = exports.logAbortContext = exports.repeatWithAbort = exports.setTimeoutWithAbort = exports.delayWithAbort = exports.withAbortSignal = exports.throwIfAborted = exports.isAborted = exports.getCurrentAbortSignal = void 0;
+exports.withAbortSignalEventBased = exports.repeatWithAbort = exports.setTimeoutWithAbort = exports.delayWithAbort = exports.withAbortSignal = exports.throwIfAborted = exports.isAborted = exports.getCurrentAbortSignal = void 0;
 const abort_context_1 = require("./abort-context");
 /**
  * 현재 컨텍스트의 AbortSignal을 가져오는 전역 함수
@@ -183,21 +183,6 @@ function repeatWithAbort(task, interval, abortSignal) {
     });
 }
 exports.repeatWithAbort = repeatWithAbort;
-/**
- * 현재 컨텍스트 정보를 로깅하는 디버그 함수
- * @param message 로그 메시지
- */
-function logAbortContext(message) {
-    var _a;
-    const context = abort_context_1.AbortContext.getCurrentContext();
-    // eslint-disable-next-line no-console
-    console.log(`[AbortContext] ${message}`, {
-        requestId: context === null || context === void 0 ? void 0 : context.requestId,
-        isAborted: (_a = context === null || context === void 0 ? void 0 : context.abortSignal) === null || _a === void 0 ? void 0 : _a.aborted,
-        hasSignal: !!(context === null || context === void 0 ? void 0 : context.abortSignal),
-    });
-}
-exports.logAbortContext = logAbortContext;
 /**
  * 이벤트 기반으로 중단 가능한 Promise 실행
  * @param promise 원본 Promise

package/functions/abort/enhanced-promise-patch.d.ts

@@ -0,0 +1,22 @@
+declare global {
+    var Promise: PromiseConstructor;
+}
+export declare class EnhancedPromisePatch {
+    private static isPatched;
+    private static originalPromise;
+    private static originalSetTimeout;
+    static patch(): void;
+    private static patchPromise;
+    private static patchSetTimeout;
+    static unpatch(): void;
+    /**
+     * 현재 패치 상태 확인
+     * @returns 패치 여부
+     */
+    static getPatchStatus(): boolean;
+    /**
+     * 패치된 Promise가 중단 가능한지 테스트
+     * @returns 테스트 결과
+     */
+    static testAbortablePromise(): Promise<boolean>;
+}

package/functions/abort/enhanced-promise-patch.js

@@ -0,0 +1,175 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnhancedPromisePatch = void 0;
+// packages/core/functions/abort/enhanced-promise-patch.ts
+const abort_1 = require("./abort");
+class EnhancedPromisePatch {
+    static patch() {
+        if (this.isPatched) {
+            return;
+        }
+        console.log('Enhanced Promise Patch 시작...');
+        this.patchPromise();
+        this.patchSetTimeout();
+        this.isPatched = true;
+        console.log('Enhanced Promise Patch 적용 완료');
+    }
+    static patchPromise() {
+        this.originalPromise = global.Promise;
+        // Promise 생성자 패치
+        global.Promise = new Proxy(global.Promise, {
+            construct(target, args) {
+                const abortSignal = (0, abort_1.getCurrentAbortSignal)();
+                if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
+                    return Promise.reject(new Error('REQUEST_ABORTED: Promise가 중단되었습니다'));
+                }
+                // target은 Promise 생성자이므로, new 연산자와 함께 사용해야 하며, args는 [executor] 형태의 튜플임을 명시합니다.
+                const promise = Reflect.construct(target, args);
+                if (!abortSignal) {
+                    return promise;
+                }
+                // Promise 체인에 중단 확인 추가
+                return promise.then((result) => {
+                    if (abortSignal.aborted) {
+                        throw new Error('REQUEST_ABORTED: Promise 실행 중 중단되었습니다');
+                    }
+                    return result;
+                }, (error) => {
+                    if (abortSignal.aborted) {
+                        throw new Error('REQUEST_ABORTED: Promise 실행 중 중단되었습니다');
+                    }
+                    throw error;
+                });
+            },
+        });
+        // Promise.resolve 패치
+        const originalResolve = global.Promise.resolve;
+        global.Promise.resolve = (value) => {
+            const abortSignal = (0, abort_1.getCurrentAbortSignal)();
+            if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
+                return Promise.reject(new Error('REQUEST_ABORTED: Promise.resolve가 중단되었습니다'));
+            }
+            const promise = originalResolve.call(global.Promise, value);
+            if (!abortSignal) {
+                return promise;
+            }
+            return promise.then((result) => {
+                if (abortSignal.aborted) {
+                    throw new Error('REQUEST_ABORTED: Promise.resolve 실행 중 중단되었습니다');
+                }
+                return result;
+            }, (error) => {
+                if (abortSignal.aborted) {
+                    throw new Error('REQUEST_ABORTED: Promise.resolve 실행 중 중단되었습니다');
+                }
+                throw error;
+            });
+        };
+        // Promise.reject 패치
+        const originalReject = global.Promise.reject;
+        global.Promise.reject = (reason) => {
+            const abortSignal = (0, abort_1.getCurrentAbortSignal)();
+            if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
+                return Promise.reject(new Error('REQUEST_ABORTED: Promise.reject가 중단되었습니다'));
+            }
+            return originalReject.call(global.Promise, reason);
+        };
+    }
+    static patchSetTimeout() {
+        this.originalSetTimeout = global.setTimeout;
+        // eslint-disable-next-line @typescript-eslint/ban-types
+        global.setTimeout = (callback, delay, ...args) => {
+            const abortSignal = (0, abort_1.getCurrentAbortSignal)();
+            if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
+                throw new Error('REQUEST_ABORTED: setTimeout이 중단되었습니다');
+            }
+            const timerId = this.originalSetTimeout(() => {
+                if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
+                    throw new Error('REQUEST_ABORTED: setTimeout 콜백이 중단되었습니다');
+                }
+                callback(...args);
+            }, delay);
+            if (abortSignal) {
+                const abortHandler = () => {
+                    clearTimeout(timerId);
+                };
+                abortSignal.addEventListener('abort', abortHandler, { once: true });
+            }
+            return timerId;
+        };
+    }
+    static unpatch() {
+        if (!this.isPatched) {
+            return;
+        }
+        global.Promise = this.originalPromise;
+        global.setTimeout = this.originalSetTimeout;
+        this.isPatched = false;
+        console.log('Enhanced Promise Patch 복원 완료');
+    }
+    /**
+     * 현재 패치 상태 확인
+     * @returns 패치 여부
+     */
+    static getPatchStatus() {
+        return this.isPatched;
+    }
+    /**
+     * 패치된 Promise가 중단 가능한지 테스트
+     * @returns 테스트 결과
+     */
+    static async testAbortablePromise() {
+        try {
+            const abortController = new AbortController();
+            // AbortContext를 설정하여 테스트
+            const { AbortContext } = await Promise.resolve().then(() => __importStar(require('./abort-context')));
+            return new Promise((resolve) => {
+                AbortContext.run(abortController.signal, 'test', () => {
+                    const promise = new Promise((resolve) => {
+                        setTimeout(() => resolve('완료'), 1000);
+                    });
+                    // 500ms 후 중단
+                    setTimeout(() => {
+                        abortController.abort();
+                    }, 500);
+                    promise
+                        .then(() => {
+                        resolve(false); // 중단되지 않았음
+                    })
+                        .catch((error) => {
+                        resolve(error.message.includes('REQUEST_ABORTED')); // 중단됨
+                    });
+                });
+            });
+        }
+        catch (error) {
+            console.error('테스트 실패:', error);
+            return false;
+        }
+    }
+}
+exports.EnhancedPromisePatch = EnhancedPromisePatch;
+EnhancedPromisePatch.isPatched = false;

package/functions/abort/index.d.ts

@@ -0,0 +1,2 @@
+export * from './abort';
+export * from './abort-context';

package/functions/abort/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./abort"), exports);
+__exportStar(require("./abort-context"), exports);

package/functions/index.d.ts

@@ -5,4 +5,3 @@ export * from './rewrite-file-value.function';
 export * from './amqp-call-manager.function';
 export * from './extract-redis-url.function';
 export * from './abort';
-export * from './abort-context';

package/functions/index.js

@@ -21,4 +21,3 @@ __exportStar(require("./rewrite-file-value.function"), exports);
 __exportStar(require("./amqp-call-manager.function"), exports);
 __exportStar(require("./extract-redis-url.function"), exports);
 __exportStar(require("./abort"), exports);
-__exportStar(require("./abort-context"), exports);

package/package.json

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