@yolo-croket-dev/core 1.7.25-slowquery.20 → 1.7.25-slowquery.22

package/interceptors/rpc.interceptor.d.ts

@@ -5,7 +5,7 @@ import { GracefulShutdownService } from '../modules/graceful-shutdown/graceful-s
 export declare class RPCInterceptor implements NestInterceptor {
     private readonly reflector;
     private readonly gracefulShutdownService;
-    protected readonly DEFAULT_TIMEOUT: number;
+    protected readonly DEFAULT_TIMEOUT = 1000;
     protected readonly DEFAULT_TIMEOUT_MESSAGE = "\uC694\uCCAD\uC774 \uD0C0\uC784\uC544\uC6C3\uB418\uC5C8\uC2B5\uB2C8\uB2E4.";
     constructor(reflector: Reflector, gracefulShutdownService: GracefulShutdownService);
     private maxLengthOverShorten;

package/interceptors/rpc.interceptor.js

@@ -54,7 +54,8 @@ let RPCInterceptor = class RPCInterceptor {
     constructor(reflector, gracefulShutdownService) {
         this.reflector = reflector;
         this.gracefulShutdownService = gracefulShutdownService;
-        this.DEFAULT_TIMEOUT = 1000 * 60 * 29; // 29분 타임아웃
+        this.DEFAULT_TIMEOUT = 1000; // 29분 타임아웃
+        // protected readonly DEFAULT_TIMEOUT = 1000 * 60 * 29; // 29분 타임아웃
         this.DEFAULT_TIMEOUT_MESSAGE = '요청이 타임아웃되었습니다.';
     }
     maxLengthOverShorten(data) {
@@ -296,10 +297,23 @@ let RPCInterceptor = class RPCInterceptor {
             .pipe((0, operators_1.timeout)({
             each: this.DEFAULT_TIMEOUT,
             with: () => {
+                console.log('RPCInterceptor timeout 발생');
                 msaLogger.error('RPCInterceptor timeout 발생', { traceId: execInterceptor.traceId }, { message: this.DEFAULT_TIMEOUT_MESSAGE });
                 abortController.abort();
-                throw new Error(this.DEFAULT_TIMEOUT_MESSAGE);
+                return (0, rxjs_1.throwError)(() => new Error(this.DEFAULT_TIMEOUT_MESSAGE));
             },
+        }), (0, operators_1.catchError)((error) => {
+            // eslint-disable-next-line no-console
+            console.log('AbortInterceptor: 에러 발생', {
+                error: error.message,
+                isAborted: abortController.signal.aborted,
+            });
+            // abort된 경우와 일반 에러를 구분
+            if (abortController.signal.aborted) {
+                return (0, rxjs_1.throwError)(() => new Error(`REQUEST_ABORTED: ${this.DEFAULT_TIMEOUT_MESSAGE}`));
+            }
+            // 다음 handler로 넘기고싶다.
+            return next.handle();
         }), (0, operators_1.tap)({
             next: async (val) => {
                 val.isError = false;
@@ -325,6 +339,7 @@ let RPCInterceptor = class RPCInterceptor {
         // eslint-disable-next-line consistent-return
         (0, operators_1.catchError)(async (err) => {
             // timeout 에러 처리
+            console.log('RPCInterceptor catchError 발생', err);
             const isTimeoutError = err instanceof Error && (err.name === 'TimeoutError' || err.message === this.DEFAULT_TIMEOUT_MESSAGE);
             if (isTimeoutError) {
                 msaLogger.error('[타임 아웃] 메시지 재전송 처리', { traceId: execInterceptor.traceId }, {

package/package.json

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