@yolo-croket-dev/core 1.7.45-slowquery.2 → 1.7.46-beta.0

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

@@ -39,7 +39,7 @@ class AbortContext {
     // AsyncLocalStorage는 각 async 작업의 컨텍스트를 자동으로 관리하므로
     // 명시적으로 disable()을 호출할 필요가 없습니다.
     // disable()을 호출하면 전체 인스턴스가 비활성화되어 이후 요청에 문제가 생깁니다.
-    static endContext(_context) {
+    static endContext() {
         // 컨텍스트는 async 작업이 완료되면 자동으로 정리됩니다.
         // 명시적인 cleanup은 필요하지 않습니다.
     }

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

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

@@ -0,0 +1,115 @@
+"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;

package/functions/amqp-call-manager.function.js

@@ -58,7 +58,7 @@ class AmqpManagement {
             return result.data;
         }
         catch (err) {
-            msaLogger.error(`ThrowWrapppingCall[${funcName}] error: traceId=${param.traceId}`, { traceId: param.traceId }, { param });
+            msaLogger.warn(`ThrowWrapppingCall[${funcName}] error: traceId=${param.traceId}`, { traceId: param.traceId }, { param });
             if (options && options.isErrorThrowing) {
                 throw err;
             }

package/functions/amqp-handler.function.js

@@ -62,7 +62,7 @@ async function AmqpHandler(client, messagePattern, payload) {
             });
         }
         else {
-            msaLogger.error('AMQP_HANDLER_ERROR', { traceId: ((_d = payload === null || payload === void 0 ? void 0 : payload.param) === null || _d === void 0 ? void 0 : _d.traceId) || '-' }, { err });
+            msaLogger.warn('AMQP_HANDLER_ERROR', { traceId: ((_d = payload === null || payload === void 0 ? void 0 : payload.param) === null || _d === void 0 ? void 0 : _d.traceId) || '-' }, { err });
             throw err;
         }
     }

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' });
@@ -278,7 +278,7 @@ let RPCInterceptor = class RPCInterceptor {
             if (!isAck) {
                 const currentContext = functions_1.AbortContext.getCurrentContext();
                 // 에러 전달
-                msaLogger.error('에러 응답 전송 처리', { traceId: execInterceptor.traceId }, {
+                msaLogger.warn('에러 응답 전송 처리', { traceId: execInterceptor.traceId }, {
                     error: {
                         message: err.message,
                         stack: err.stack,
@@ -325,49 +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 });
-                    }
+        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.2",
+  "version": "1.7.46-beta.0",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",
@@ -17,7 +17,7 @@
     "@nestjs/common": "^8.2.3",
     "@nestjs/swagger": "5",
     "@yolo-croket-dev/logger": "^1.0.15",
-    "@yolo-croket-dev/msa-logger": "^3.1.1",
+    "@yolo-croket-dev/msa-logger": "^3.2.2",
     "@yolo-croket-dev/redis": "^1.0.25",
     "axios": "^1.1.3",
     "dd-trace": "^5.46.0",