@yolo-croket-dev/core 1.7.44-slowquery.6 → 1.7.44-slowquery.8

package/functions/abort/abort-context.d.ts

@@ -8,7 +8,6 @@ interface RequestContext {
 export declare class AbortContext {
     private static asyncLocalStorage;
     private static contextCounter;
-    private static pendingAbortCallbacks;
     static run<T>(abortSignal: AbortSignal, requestId: string, callback: (context: RequestContext) => T): T;
     static getCurrentAbortSignal(): AbortSignal | null;
     static getCurrentRequestId(): string | null;
@@ -16,16 +15,7 @@ export declare class AbortContext {
         abortSignal: AbortSignal;
         requestId: string;
     } | null;
-    /**
-     * 컨텍스트 종료 전에 모든 abort 이벤트 리스너가 완료될 때까지 대기
-     */
-    static waitForAbortHandlers(requestId: string): Promise<void>;
-    /**
-     * 이 컨텍스트의 모든 abort 이벤트 처리 완료 후 disable 호출
-     */
-    static disableAfterAbortHandlers(requestId: string): Promise<void>;
     static disable(): void;
-    static disableDeferred(): void;
     static endContext(context?: RequestContext): void;
     static updateContext(updatedData: Partial<RequestContext>): void;
     /**

package/functions/abort/abort-context.js

@@ -12,35 +12,6 @@ class AbortContext {
             createdAt: Date.now(),
             parentContext: currentContext || undefined,
         };
-        // abort 이벤트가 발생할 때까지 대기하는 Promise 생성
-        const abortPromise = new Promise((resolve) => {
-            const checkAbortStatus = () => {
-                if (abortSignal.aborted) {
-                    // 이벤트 루프를 두 번 통과시켜서 모든 abort 리스너가 완료되도록 보장
-                    setTimeout(() => {
-                        setTimeout(() => {
-                            resolve();
-                        }, 0);
-                    }, 0);
-                }
-                else {
-                    // 아직 abort가 발생하지 않았으면 즉시 resolve
-                    resolve();
-                }
-            };
-            abortSignal.addEventListener('abort', checkAbortStatus, { once: true });
-            // abort 이벤트가 이미 발생했는지 확인
-            if (abortSignal.aborted) {
-                checkAbortStatus();
-            }
-            else {
-                // abort가 발생하지 않은 상태라면 즉시 resolve
-                setTimeout(() => {
-                    resolve();
-                }, 0);
-            }
-        });
-        this.pendingAbortCallbacks.set(newContext.requestId, abortPromise);
         return this.asyncLocalStorage.run(newContext, callback.bind(this, newContext));
     }
     static getCurrentAbortSignal() {
@@ -61,31 +32,9 @@ class AbortContext {
         }
         return null;
     }
-    /**
-     * 컨텍스트 종료 전에 모든 abort 이벤트 리스너가 완료될 때까지 대기
-     */
-    static async waitForAbortHandlers(requestId) {
-        const promise = this.pendingAbortCallbacks.get(requestId);
-        if (promise) {
-            await promise;
-            this.pendingAbortCallbacks.delete(requestId);
-        }
-    }
-    /**
-     * 이 컨텍스트의 모든 abort 이벤트 처리 완료 후 disable 호출
-     */
-    static async disableAfterAbortHandlers(requestId) {
-        await this.waitForAbortHandlers(requestId);
-        this.asyncLocalStorage.disable();
-    }
     static disable() {
         this.asyncLocalStorage.disable();
     }
-    static disableDeferred() {
-        setTimeout(() => {
-            this.asyncLocalStorage.disable();
-        }, 0);
-    }
     // 컨텍스트 종료
     // eslint-disable-next-line consistent-return
     static endContext(context) {
@@ -140,5 +89,3 @@ class AbortContext {
 exports.AbortContext = AbortContext;
 AbortContext.asyncLocalStorage = new async_hooks_1.AsyncLocalStorage();
 AbortContext.contextCounter = 0;
-// abort 이벤트 처리를 추적하기 위한 Map
-AbortContext.pendingAbortCallbacks = new Map();

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

@@ -1,23 +1,7 @@
 export declare class ContextPromisePatch {
     private static isPatched;
     private static originalPromise;
-    private static originalSetTimeout;
-    private static originalSetInterval;
-    private static originalClearTimeout;
-    private static originalClearInterval;
-    private static contextTimers;
-    private static timerContextMap;
-    private static contextPromises;
-    /**
-     * 특정 컨텍스트의 모든 타이머 정리
-     */
-    static clearContextTimers(contextId: string): void;
-    /**
-     * 특정 컨텍스트의 모든 Promise가 완료될 때까지 대기
-     */
-    static waitForContextPromises(contextId: string): Promise<void>;
     static patch(): void;
     private static patchPromise;
-    private static patchTimeouts;
     static unpatch(): void;
 }

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

@@ -3,41 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContextPromisePatch = void 0;
 const abort_context_1 = require("./abort-context");
 class ContextPromisePatch {
-    /**
-     * 특정 컨텍스트의 모든 타이머 정리
-     */
-    static clearContextTimers(contextId) {
-        const timers = this.contextTimers.get(contextId);
-        if (timers) {
-            for (const timerId of timers) {
-                this.originalClearTimeout(timerId);
-                this.originalClearInterval(timerId);
-                this.timerContextMap.delete(timerId);
-            }
-            this.contextTimers.delete(contextId);
-        }
-    }
-    /**
-     * 특정 컨텍스트의 모든 Promise가 완료될 때까지 대기
-     */
-    static async waitForContextPromises(contextId) {
-        const promises = this.contextPromises.get(contextId);
-        if (promises && promises.size > 0) {
-            // 모든 Promise가 완료될 때까지 기다림
-            await Promise.allSettled(Array.from(promises));
-        }
-    }
     static patch() {
         if (this.isPatched) {
             return;
         }
         this.originalPromise = global.Promise;
-        this.originalSetTimeout = global.setTimeout;
-        this.originalSetInterval = global.setInterval;
-        this.originalClearTimeout = global.clearTimeout;
-        this.originalClearInterval = global.clearInterval;
         this.patchPromise();
-        this.patchTimeouts();
         this.isPatched = true;
     }
     static patchPromise() {
@@ -57,45 +28,8 @@ class ContextPromisePatch {
                     return Promise.reject(new Error(`REQUEST_ABORTED: Promise가 중단되었습니다 (${contextId})`));
                 }
                 const promise = Reflect.construct(target, args);
-                // abort 이벤트 리스너 추가하여 Promise를 즉시 reject
-                const wrappedPromise = new Promise((resolve, reject) => {
-                    const checkAbort = () => {
-                        if (abortSignal.aborted) {
-                            reject(new Error(`REQUEST_ABORTED: Promise가 중단되었습니다 (${contextId})`));
-                        }
-                    };
-                    // abort 이벤트 리스너 등록
-                    abortSignal.addEventListener('abort', checkAbort);
-                    // 원본 promise가 완료될 때까지 기다림
-                    promise
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        .then((result) => {
-                        abortSignal.removeEventListener('abort', checkAbort);
-                        resolve(result);
-                    })
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        .catch((error) => {
-                        abortSignal.removeEventListener('abort', checkAbort);
-                        reject(error);
-                    });
-                    // 이미 abort된 경우
-                    if (abortSignal.aborted) {
-                        abortSignal.removeEventListener('abort', checkAbort);
-                        reject(new Error(`REQUEST_ABORTED: Promise가 중단되었습니다 (${contextId})`));
-                    }
-                });
-                // Promise 추적 추가
-                if (!ContextPromisePatch.contextPromises.has(contextId)) {
-                    ContextPromisePatch.contextPromises.set(contextId, new Set());
-                }
-                ContextPromisePatch.contextPromises.get(contextId).add(wrappedPromise);
-                // Promise 완료 시 추적에서 제거
-                wrappedPromise.finally(() => {
-                    var _a;
-                    (_a = ContextPromisePatch.contextPromises.get(contextId)) === null || _a === void 0 ? void 0 : _a.delete(wrappedPromise);
-                });
                 // Promise 체인에 자동으로 중단 확인 추가
-                return wrappedPromise.then((result) => {
+                return promise.then((result) => {
                     // 컨텍스트가 여전히 유효한지 확인
                     const currentContextCheck = abort_context_1.AbortContext.getCurrentContext();
                     if (!currentContextCheck || currentContextCheck.requestId !== contextId) {
@@ -169,173 +103,13 @@ class ContextPromisePatch {
             return originalReject.call(global.Promise, reason);
         };
     }
-    static patchTimeouts() {
-        // 각 컨텍스트별로 활성 타이머를 추적
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const activeTimers = new Map();
-        // setTimeout 패치
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        global.setTimeout = (handler, timeout, 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        ...args
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        ) => {
-            const currentContext = abort_context_1.AbortContext.getCurrentContext();
-            if (!currentContext) {
-                // 원본 함수에 args 전달 (타입 안전하게)
-                if (args.length > 0) {
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    return this.originalSetTimeout(handler, timeout, ...args);
-                }
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                return this.originalSetTimeout(handler, timeout);
-            }
-            const abortSignal = currentContext.abortSignal;
-            const contextId = currentContext.requestId;
-            if (abortSignal.aborted) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                throw new Error(`REQUEST_ABORTED: setTimeout이 중단되었습니다 (${contextId})`);
-            }
-            const originalHandler = typeof handler === 'function' ? handler : undefined;
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const wrappedHandler = () => {
-                // 타이머 실행 시점에 abort 여부 확인
-                if (abortSignal.aborted) {
-                    return;
-                }
-                if (originalHandler) {
-                    originalHandler();
-                }
-            };
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const timeoutId = this.originalSetTimeout(wrappedHandler, timeout);
-            activeTimers.set(timeoutId, {
-                contextId,
-                abortSignal,
-            });
-            // 타이머 추적
-            if (!this.contextTimers.has(contextId)) {
-                this.contextTimers.set(contextId, new Set());
-            }
-            this.contextTimers.get(contextId).add(timeoutId);
-            this.timerContextMap.set(timeoutId, contextId);
-            // 클로저로 필요한 정보를 캡처 (컨텍스트가 disable되어도 동작)
-            const capturedContextId = contextId;
-            const capturedActiveTimers = activeTimers;
-            const onAbort = () => {
-                var _a;
-                this.originalClearTimeout(timeoutId);
-                capturedActiveTimers.delete(timeoutId);
-                (_a = this.contextTimers.get(capturedContextId)) === null || _a === void 0 ? void 0 : _a.delete(timeoutId);
-                this.timerContextMap.delete(timeoutId);
-            };
-            abortSignal.addEventListener('abort', onAbort, { once: true });
-            return timeoutId;
-        };
-        // setInterval 패치
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        global.setInterval = (handler, timeout, 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        ...args
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        ) => {
-            const currentContext = abort_context_1.AbortContext.getCurrentContext();
-            if (!currentContext) {
-                // 원본 함수에 args 전달 (타입 안전하게)
-                if (args.length > 0) {
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    return this.originalSetInterval(handler, timeout, ...args);
-                }
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                return this.originalSetInterval(handler, timeout);
-            }
-            const abortSignal = currentContext.abortSignal;
-            const contextId = currentContext.requestId;
-            if (abortSignal.aborted) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                throw new Error(`REQUEST_ABORTED: setInterval이 중단되었습니다 (${contextId})`);
-            }
-            const originalHandler = typeof handler === 'function' ? handler : undefined;
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const wrappedHandler = () => {
-                // 타이머 실행 시점에 abort 여부 확인
-                if (abortSignal.aborted) {
-                    return;
-                }
-                if (originalHandler) {
-                    originalHandler();
-                }
-            };
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const intervalId = this.originalSetInterval(wrappedHandler, timeout);
-            activeTimers.set(intervalId, {
-                contextId,
-                abortSignal,
-            });
-            // 타이머 추적
-            if (!this.contextTimers.has(contextId)) {
-                this.contextTimers.set(contextId, new Set());
-            }
-            this.contextTimers.get(contextId).add(intervalId);
-            this.timerContextMap.set(intervalId, contextId);
-            // 클로저로 필요한 정보를 캡처 (컨텍스트가 disable되어도 동작)
-            const capturedContextId = contextId;
-            const capturedActiveTimers = activeTimers;
-            const onAbort = () => {
-                var _a;
-                this.originalClearInterval(intervalId);
-                capturedActiveTimers.delete(intervalId);
-                (_a = this.contextTimers.get(capturedContextId)) === null || _a === void 0 ? void 0 : _a.delete(intervalId);
-                this.timerContextMap.delete(intervalId);
-            };
-            abortSignal.addEventListener('abort', onAbort, { once: true });
-            return intervalId;
-        };
-        // clearTimeout 패치
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        global.clearTimeout = (timerId) => {
-            var _a;
-            activeTimers.delete(timerId);
-            const contextId = this.timerContextMap.get(timerId);
-            if (contextId) {
-                (_a = this.contextTimers.get(contextId)) === null || _a === void 0 ? void 0 : _a.delete(timerId);
-                this.timerContextMap.delete(timerId);
-            }
-            this.originalClearTimeout(timerId);
-        };
-        // clearInterval 패치
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        global.clearInterval = (timerId) => {
-            var _a;
-            activeTimers.delete(timerId);
-            const contextId = this.timerContextMap.get(timerId);
-            if (contextId) {
-                (_a = this.contextTimers.get(contextId)) === null || _a === void 0 ? void 0 : _a.delete(timerId);
-                this.timerContextMap.delete(timerId);
-            }
-            this.originalClearInterval(timerId);
-        };
-    }
     static unpatch() {
         if (!this.isPatched) {
             return;
         }
         global.Promise = this.originalPromise;
-        global.setTimeout = this.originalSetTimeout;
-        global.setInterval = this.originalSetInterval;
-        global.clearTimeout = this.originalClearTimeout;
-        global.clearInterval = this.originalClearInterval;
         this.isPatched = false;
     }
 }
 exports.ContextPromisePatch = ContextPromisePatch;
 ContextPromisePatch.isPatched = false;
-// 컨텍스트별 활성 타이머 추적 (contextId -> Set<timerId>)
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-ContextPromisePatch.contextTimers = new Map();
-// timerId -> contextId 매핑
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-ContextPromisePatch.timerContextMap = new Map();
-// 컨텍스트별 활성 Promise 추적
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-ContextPromisePatch.contextPromises = new Map();

package/interceptors/rpc.interceptor.js

@@ -57,7 +57,6 @@ let RPCInterceptor = class RPCInterceptor {
         this.gracefulShutdownService = gracefulShutdownService;
         this.DEFAULT_TIMEOUT = 1000 * 60 * 29; // 29분 타임아웃
         this.DEFAULT_TIMEOUT_MESSAGE = '요청이 타임아웃되었습니다.';
-        context_promise_patch_1.ContextPromisePatch.patch();
     }
     maxLengthOverShorten(data) {
         if (typeof data !== 'string') {
@@ -170,6 +169,7 @@ let RPCInterceptor = class RPCInterceptor {
             correlationId,
             isMessageAck: false,
         };
+        context_promise_patch_1.ContextPromisePatch.patch();
         let abortController = new AbortController();
         /** consume 메시지 전부 cancel */
         if (this.gracefulShutdownService.isApplicationExit) {
@@ -355,14 +355,12 @@ let RPCInterceptor = class RPCInterceptor {
                 }
             },
             error: localErrorProcessor,
-        }), (0, operators_1.finalize)(async () => {
+        }), (0, operators_1.finalize)(() => {
             this.gracefulShutdownService.popActiveInterceptors(execInterceptor);
-            // 활성 타이머를 모두 정리
-            context_promise_patch_1.ContextPromisePatch.clearContextTimers(execInterceptor.traceId);
+            setTimeout(() => {
+                functions_1.AbortContext.disable();
+            }, 1000 * 10);
             abortController = null;
-            // 모든 Promise가 완료될 때까지 기다림
-            await context_promise_patch_1.ContextPromisePatch.waitForContextPromises(execInterceptor.traceId);
-            functions_1.AbortContext.disable();
             return rxjs_1.EMPTY;
         })));
     }

package/package.json

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