@yolo-croket-dev/core 1.7.38-slowquery.1 → 1.7.38-slowquery.3

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

@@ -1,10 +1,12 @@
 /// <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;

package/functions/abort/abort-context.js

@@ -36,11 +36,20 @@ class AbortContext {
     // eslint-disable-next-line consistent-return
     static endContext(context) {
         const selectContext = context || this.asyncLocalStorage.getStore();
+        console.log('selectContext', selectContext);
         if (selectContext) {
-            selectContext.abortSignal.removeEventListener('abort', selectContext.abortHandler || (() => { }));
+            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);
             }
         }
@@ -49,6 +58,7 @@ class AbortContext {
     static updateContext(updatedData) {
         const currentContext = this.asyncLocalStorage.getStore();
         if (!currentContext) {
+            console.log('currentContext not found');
             return;
         }
         // 업데이트할 데이터만 갱신
@@ -57,6 +67,7 @@ class AbortContext {
             ...updatedData,
             updatedAt: Date.now(), // `updatedAt` 값을 갱신
         };
+        console.log('currentContext update!', currentContext, updatedContext);
         // 업데이트된 컨텍스트를 다시 저장
         this.asyncLocalStorage.enterWith(updatedContext);
     }

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

@@ -138,7 +138,10 @@ class ContextPromisePatch {
                 clearTimeout(timerId);
             };
             abortSignal.addEventListener('abort', abortHandler, { once: true });
-            abort_context_1.AbortContext.updateContext({ abortHandler });
+            abort_context_1.AbortContext.updateContext({
+                abortHandler,
+                timerId,
+            });
             return timerId;
         };
     }

package/interceptors/rpc.interceptor.js

@@ -58,6 +58,10 @@ let RPCInterceptor = RPCInterceptor_1 = class RPCInterceptor {
         this.gracefulShutdownService = gracefulShutdownService;
         this.DEFAULT_TIMEOUT = 1000 * 60 * 29; // 29분 타임아웃
         this.DEFAULT_TIMEOUT_MESSAGE = '요청이 타임아웃되었습니다.';
+        if (!RPCInterceptor_1.isPatched) {
+            context_promise_patch_1.ContextPromisePatch.patch();
+            RPCInterceptor_1.isPatched = true;
+        }
     }
     maxLengthOverShorten(data) {
         if (typeof data !== 'string') {
@@ -323,10 +327,6 @@ let RPCInterceptor = RPCInterceptor_1 = class RPCInterceptor {
                 return new rxjs_1.Observable();
             }
         }
-        if (!RPCInterceptor_1.isPatched) {
-            context_promise_patch_1.ContextPromisePatch.patch();
-            RPCInterceptor_1.isPatched = true;
-        }
         this.gracefulShutdownService.pushActiveInterceptors(execInterceptor);
         // eslint-disable-next-line consistent-return
         return functions_1.AbortContext.run(abortController.signal, execInterceptor.traceId, () => next
@@ -361,9 +361,7 @@ let RPCInterceptor = RPCInterceptor_1 = class RPCInterceptor {
             error: localErrorProcessor,
         }), (0, operators_1.finalize)(() => {
             this.gracefulShutdownService.popActiveInterceptors(execInterceptor);
-            if (abortController.signal) {
-                abortController.signal.removeEventListener('abort', () => { });
-            }
+            console.log('finalize called', execInterceptor.traceId);
             functions_1.AbortContext.endContext();
             abortController = null;
             return new rxjs_1.Observable();

package/package.json

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