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

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

@@ -1,12 +1,9 @@
 /// <reference types="node" />
-/// <reference types="node" />
 interface RequestContext {
     abortSignal: AbortSignal;
     requestId: string;
     createdAt: number;
     parentContext?: RequestContext;
-    abortHandler?: () => void;
-    timerId?: NodeJS.Timeout;
 }
 export declare class AbortContext {
     private static asyncLocalStorage;
@@ -18,6 +15,7 @@ export declare class AbortContext {
         abortSignal: AbortSignal;
         requestId: string;
     } | null;
+    static disable(): void;
     static endContext(context?: RequestContext): void;
     static updateContext(updatedData: Partial<RequestContext>): void;
     /**

package/functions/abort/abort-context.js

@@ -32,24 +32,17 @@ class AbortContext {
         }
         return null;
     }
+    static disable() {
+        this.asyncLocalStorage.disable();
+    }
     // 컨텍스트 종료
     // eslint-disable-next-line consistent-return
     static endContext(context) {
         const selectContext = context || this.asyncLocalStorage.getStore();
-        console.log('selectContext', selectContext);
         if (selectContext) {
-            if (selectContext.abortHandler) {
-                console.log('selectContext.abortHandler', selectContext.abortHandler);
-                selectContext.abortSignal.removeEventListener('abort', selectContext.abortHandler || (() => { }));
-            }
-            if (selectContext.timerId) {
-                console.log('selectContext.timerId', selectContext.timerId);
-                clearTimeout(selectContext.timerId);
-            }
             this.asyncLocalStorage.disable();
             // parent context가 있으면 전부 종료
             if (selectContext.parentContext) {
-                console.log('selectContext.parentContext', selectContext.parentContext);
                 return this.endContext(selectContext.parentContext);
             }
         }
@@ -58,7 +51,6 @@ class AbortContext {
     static updateContext(updatedData) {
         const currentContext = this.asyncLocalStorage.getStore();
         if (!currentContext) {
-            console.log('currentContext not found');
             return;
         }
         // 업데이트할 데이터만 갱신
@@ -67,7 +59,6 @@ class AbortContext {
             ...updatedData,
             updatedAt: Date.now(), // `updatedAt` 값을 갱신
         };
-        console.log('currentContext update!', currentContext, updatedContext);
         // 업데이트된 컨텍스트를 다시 저장
         this.asyncLocalStorage.enterWith(updatedContext);
     }

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

@@ -3,14 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContextPromisePatch = void 0;
 const abort_context_1 = require("./abort-context");
 class ContextPromisePatch {
-    // private static originalSetTimeout: typeof setTimeout;
     static patch() {
         if (this.isPatched) {
             return;
         }
         this.originalPromise = global.Promise;
         this.patchPromise();
-        // this.patchSetTimeout();
         this.isPatched = true;
     }
     static patchPromise() {
@@ -105,57 +103,11 @@ class ContextPromisePatch {
             return originalReject.call(global.Promise, reason);
         };
     }
-    // private static patchSetTimeout(): void {
-    //   this.originalSetTimeout = global.setTimeout;
-    //   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    //   (global as any).setTimeout = (callback: () => void, delay: number, ...args: unknown[]) => {
-    //     const currentContext = AbortContext.getCurrentContext();
-    //     if (!currentContext) {
-    //       return (this.originalSetTimeout as (...args: unknown[]) => unknown)(
-    //         callback,
-    //         delay,
-    //         ...args as [unknown],
-    //       );
-    //     }
-    //     const abortSignal: AbortSignal = currentContext.abortSignal;
-    //     const contextId: string = currentContext.requestId;
-    //     if (abortSignal.aborted) {
-    //       throw new Error(`REQUEST_ABORTED: setTimeout이 중단되었습니다 (${contextId})`);
-    //     }
-    //     const wrappedCallback = () => {
-    //       // 컨텍스트가 여전히 유효한지 확인
-    //       const currentContextCheck = AbortContext.getCurrentContext();
-    //       if (!currentContextCheck || currentContextCheck.requestId !== contextId) {
-    //         // 컨텍스트가 변경되었으면 원본 콜백 실행
-    //         // eslint-disable-next-line prefer-spread
-    //         callback.apply(null, args as []);
-    //         return;
-    //       }
-    //       if (abortSignal.aborted) {
-    //         throw new Error(`REQUEST_ABORTED: setTimeout 콜백이 중단되었습니다 (${contextId})`);
-    //       }
-    //       // eslint-disable-next-line prefer-spread
-    //       callback.apply(null, args as []);
-    //     };
-    //     const timerId = this.originalSetTimeout(wrappedCallback, delay, ...args as []);
-    //     // 중단 이벤트 리스너 등록
-    //     const abortHandler = () => {
-    //       clearTimeout(timerId);
-    //     };
-    //     abortSignal.addEventListener('abort', abortHandler, { once: true });
-    //     AbortContext.updateContext({
-    //       abortHandler,
-    //       timerId,
-    //     });
-    //     return timerId;
-    //   };
-    // }
     static unpatch() {
         if (!this.isPatched) {
             return;
         }
         global.Promise = this.originalPromise;
-        // global.setTimeout = this.originalSetTimeout;
         this.isPatched = false;
     }
 }

package/functions/abort/index.d.ts

@@ -1,3 +1,2 @@
 export * from './abort';
 export * from './abort-context';
-export * from './enhanced-promise-patch';

package/functions/abort/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./abort"), exports);
 __exportStar(require("./abort-context"), exports);
-__exportStar(require("./enhanced-promise-patch"), exports);

package/interceptors/rpc.interceptor.js

@@ -329,7 +329,7 @@ let RPCInterceptor = RPCInterceptor_1 = class RPCInterceptor {
         }
         this.gracefulShutdownService.pushActiveInterceptors(execInterceptor);
         // eslint-disable-next-line consistent-return
-        return functions_1.AbortContext.run(abortController.signal, execInterceptor.traceId, (context) => next
+        return functions_1.AbortContext.run(abortController.signal, execInterceptor.traceId, () => next
             .handle()
             .pipe((0, operators_1.timeout)({
             each: this.DEFAULT_TIMEOUT,
@@ -361,11 +361,7 @@ let RPCInterceptor = RPCInterceptor_1 = class RPCInterceptor {
             error: localErrorProcessor,
         }), (0, operators_1.finalize)(() => {
             this.gracefulShutdownService.popActiveInterceptors(execInterceptor);
-            console.log('finalize called', execInterceptor.traceId);
-            console.log('before endContext', context);
-            functions_1.AbortContext.endContext(context);
-            console.log('after endContext');
-            functions_1.AbortContext.endContext();
+            functions_1.AbortContext.disable();
             abortController = null;
             return rxjs_1.EMPTY;
         })));

package/package.json

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

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

@@ -1,17 +0,0 @@
-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;
-}

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

@@ -1,115 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnhancedPromisePatch = void 0;
-const abort_1 = require("./abort");
-class EnhancedPromisePatch {
-    static patch() {
-        if (this.isPatched) {
-            return;
-        }
-        this.patchPromise();
-        this.patchSetTimeout();
-        this.isPatched = true;
-    }
-    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;
-    }
-    /**
-     * 현재 패치 상태 확인
-     * @returns 패치 여부
-     */
-    static getPatchStatus() {
-        return this.isPatched;
-    }
-}
-exports.EnhancedPromisePatch = EnhancedPromisePatch;
-EnhancedPromisePatch.isPatched = false;