@yolo-croket-dev/core 1.7.25-slowquery.5 → 1.7.25-slowquery.7

package/interceptors/rpc.interceptor.js

@@ -349,23 +349,22 @@ let RPCInterceptor = class RPCInterceptor {
         // eslint-disable-next-line consistent-return
         return next
             .handle()
-            .pipe(
-        // AbortController 신호 감지
-        (0, operators_1.takeUntil)(new rxjs_1.Observable(subscriber => {
-            const abortHandler = () => {
-                console.log('RPC Interceptor abortHandler called');
-                subscriber.next();
-                subscriber.complete();
-            };
-            console.log('RPC Interceptor abortHandler addEventListener');
-            abortController.signal.addEventListener('abort', abortHandler, { once: true });
-            // 정리 함수
-            return () => {
-                abortController.signal.removeEventListener('abort', abortHandler);
-            };
-        })), 
+            .pipe((0, operators_1.switchMap)((val) => {
+            console.log('switchMap called', val);
+            if (abortController === null || abortController === void 0 ? void 0 : abortController.signal.aborted) {
+                console.log('RPC Interceptor: Service execution aborted');
+                return (0, rxjs_1.throwError)(() => new Error('Service execution aborted'));
+            }
+            // // AbortController를 컨텍스트에 주입
+            // const request = context.switchToRpc().getData();
+            // if (request && typeof request === 'object') {
+            //   (request as any).abortController = abortController;
+            //   (request as any).abortSignal = abortController?.signal;
+            // }
+            return (0, rxjs_1.of)(val);
+        }), 
         // timeout(1000 * 60 * 29), // 30분 타임아웃
-        (0, operators_1.timeout)(1000 * 30), // 30분 타임아웃
+        (0, operators_1.timeout)(1000 * 3), // 30분 타임아웃
         (0, operators_1.tap)({
             next: async (val) => {
                 console.log('RPC Interceptor next called');

package/modules/graceful-shutdown/graceful-shutdown.rmq.js

@@ -61,13 +61,7 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
                 this.runningMessages -= 1;
                 return;
             }
-            const abortablePromise = new abortable_promise_1.AbortablePromise((resolve, reject) => {
-                super.handleMessage(message, channel).then((val) => {
-                    resolve(val);
-                }).catch((err) => {
-                    reject(err);
-                });
-            }, abortController.signal);
+            const abortablePromise = new abortable_promise_1.AbortablePromise(() => super.handleMessage(message, channel), abortController.signal);
             await abortablePromise;
         }
         catch (error) {

package/package.json

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