@yolo-croket-dev/core 1.7.45-slowquery.1 → 1.7.45

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

@@ -16,7 +16,7 @@ export declare class AbortContext {
         requestId: string;
     } | null;
     static disable(): void;
-    static endContext(context?: RequestContext): void;
+    static endContext(): void;
     static updateContext(updatedData: Partial<RequestContext>): void;
     /**
      * 컨텍스트가 유효한지 확인

package/functions/abort/abort-context.js

@@ -36,16 +36,12 @@ class AbortContext {
         this.asyncLocalStorage.disable();
     }
     // 컨텍스트 종료
-    // eslint-disable-next-line consistent-return
-    static endContext(context) {
-        const selectContext = context || this.asyncLocalStorage.getStore();
-        if (selectContext) {
-            this.asyncLocalStorage.disable();
-            // parent context가 있으면 전부 종료
-            if (selectContext.parentContext) {
-                return this.endContext(selectContext.parentContext);
-            }
-        }
+    // AsyncLocalStorage는 각 async 작업의 컨텍스트를 자동으로 관리하므로
+    // 명시적으로 disable()을 호출할 필요가 없습니다.
+    // disable()을 호출하면 전체 인스턴스가 비활성화되어 이후 요청에 문제가 생깁니다.
+    static endContext() {
+        // 컨텍스트는 async 작업이 완료되면 자동으로 정리됩니다.
+        // 명시적인 cleanup은 필요하지 않습니다.
     }
     // 현재 컨텍스트를 업데이트하는 방법
     static updateContext(updatedData) {

package/interceptors/rpc.interceptor.js

@@ -170,7 +170,7 @@ let RPCInterceptor = class RPCInterceptor {
             isMessageAck: false,
         };
         context_promise_patch_1.ContextPromisePatch.patch();
-        const abortController = new AbortController();
+        let abortController = new AbortController();
         /** consume 메시지 전부 cancel */
         if (this.gracefulShutdownService.isApplicationExit) {
             msaLogger.debug('RPCInterceptor isApplicationExit called', { traceId: 'IS_APPLICATION_EXIT' });
@@ -325,60 +325,46 @@ let RPCInterceptor = class RPCInterceptor {
         }
         this.gracefulShutdownService.pushActiveInterceptors(execInterceptor);
         // eslint-disable-next-line consistent-return
-        return functions_1.AbortContext.run(abortController.signal, execInterceptor.traceId, () => {
-            const context = functions_1.AbortContext.getCurrentContext();
-            return next
-                .handle()
-                .pipe((0, operators_1.timeout)({
-                each: this.DEFAULT_TIMEOUT,
-                with: () => {
-                    msaLogger.error('RPCInterceptor timeout 발생', { traceId: execInterceptor.traceId }, {
-                        message: this.DEFAULT_TIMEOUT_MESSAGE,
-                        messagePattern: method,
-                        durationMs: Date.now() - now,
-                        reDeliveryCount,
-                        staticRetryCount,
-                    });
-                    abortController.abort();
-                    return (0, rxjs_1.throwError)(() => new exceptions_1.InternalServerError('TIMEOUT_ERROR', this.DEFAULT_TIMEOUT_MESSAGE));
-                },
-            }), (0, operators_1.tap)({
-                next: async (val) => {
-                    val.isError = false;
-                    /** 만약 응답데이터중 isRequeue가 true라면, 다시 재처리 하도록 함 */
-                    if (val.data && val.data.isRequeue) {
-                        channel.nack(message, false, true);
-                        execInterceptor.isMessageAck = true;
-                        return;
-                    }
-                    if (!noAck) {
-                        execInterceptor.isMessageAck = true;
-                        channel.ack(message);
-                    }
-                },
-                error: localErrorProcessor,
-            }), (0, operators_1.finalize)(() => {
-                this.gracefulShutdownService.popActiveInterceptors(execInterceptor);
-                const isAborted = abortController === null || abortController === void 0 ? void 0 : abortController.signal.aborted;
-                if (context) {
-                    if (isAborted) {
-                        msaLogger.debug('RPCInterceptor context end', { traceId: execInterceptor.traceId }, { context: context.requestId });
-                    }
-                    functions_1.AbortContext.endContext();
-                    // Promise 체인이 완전히 완료될 때까지 지연 후 disable
-                    // setTimeout으로 여러 번 이벤트 루프를 통과시켜서 모든 Promise.then() 체인이 완료되도록 함
-                    setTimeout(() => {
-                        setTimeout(() => {
-                            setTimeout(() => {
-                                console.log('RPCInterceptor context disable');
-                                functions_1.AbortContext.disable();
-                            }, 0);
-                        }, 0);
-                    }, 0);
+        return functions_1.AbortContext.run(abortController.signal, execInterceptor.traceId, () => next
+            .handle()
+            .pipe((0, operators_1.timeout)({
+            each: this.DEFAULT_TIMEOUT,
+            with: () => {
+                msaLogger.error('RPCInterceptor timeout 발생', { traceId: execInterceptor.traceId }, {
+                    message: this.DEFAULT_TIMEOUT_MESSAGE,
+                    messagePattern: method,
+                    durationMs: Date.now() - now,
+                    reDeliveryCount,
+                    staticRetryCount,
+                });
+                abortController.abort();
+                return (0, rxjs_1.throwError)(() => new exceptions_1.InternalServerError('TIMEOUT_ERROR', this.DEFAULT_TIMEOUT_MESSAGE));
+            },
+        }), (0, operators_1.tap)({
+            next: async (val) => {
+                val.isError = false;
+                /** 만약 응답데이터중 isRequeue가 true라면, 다시 재처리 하도록 함 */
+                if (val.data && val.data.isRequeue) {
+                    channel.nack(message, false, true);
+                    execInterceptor.isMessageAck = true;
+                    return;
                 }
-                return rxjs_1.EMPTY;
-            }));
-        });
+                if (!noAck) {
+                    execInterceptor.isMessageAck = true;
+                    channel.ack(message);
+                }
+            },
+            error: localErrorProcessor,
+        }), (0, operators_1.finalize)(() => {
+            this.gracefulShutdownService.popActiveInterceptors(execInterceptor);
+            const isAborted = abortController === null || abortController === void 0 ? void 0 : abortController.signal.aborted;
+            if (isAborted) {
+                msaLogger.debug('RPCInterceptor context end', { traceId: execInterceptor.traceId }, { isAborted });
+                functions_1.AbortContext.endContext();
+                abortController = null;
+            }
+            return rxjs_1.EMPTY;
+        })));
     }
 };
 exports.RPCInterceptor = RPCInterceptor;

package/package.json

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