@yolo-croket-dev/core 1.7.25-slowquery.10 → 1.7.25-slowquery.12

package/interceptors/rpc.interceptor.js

@@ -44,6 +44,7 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const msa_logger_1 = __importStar(require("@yolo-croket-dev/msa-logger"));
 const amqplib_1 = __importDefault(require("amqplib"));
+const abortable_promise_1 = require("@xuchaoqian/abortable-promise");
 // import Logger from '@yolo-croket-dev/logger';
 const functions_1 = require("../functions");
 const exceptions_1 = require("../exceptions");
@@ -179,7 +180,15 @@ let RPCInterceptor = class RPCInterceptor {
         const arg = args[0];
         const rmq = args[1];
         // 메시지에서 AbortController 가져오기
-        const abortController = rmq.args[0].abortController;
+        //  const abortController = (rmq as any).args[0].abortController;
+        const abortController = new AbortController();
+        const handler = context.getHandler();
+        console.log('args: ', args);
+        console.log('context: ', context);
+        const abortablePromise = new abortable_promise_1.AbortablePromise((...args) => handler(...args), abortController.signal);
+        context.handler = abortablePromise;
+        console.log('handler: ', handler);
+        console.log('context: ', context);
         //  const messageId = (rmq as any).messageId;
         //  if (!abortController) {
         //    // AbortController가 없으면 기본 처리
@@ -349,20 +358,7 @@ let RPCInterceptor = class RPCInterceptor {
         // eslint-disable-next-line consistent-return
         return next
             .handle()
-            .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);
-        }), 
+            .pipe(
         // timeout(1000 * 60 * 29), // 30분 타임아웃
         (0, operators_1.timeout)(1000 * 3), // 30분 타임아웃
         (0, operators_1.tap)({
@@ -395,7 +391,6 @@ let RPCInterceptor = class RPCInterceptor {
             if (isTimeoutError) {
                 if (abortController) {
                     abortController.abort();
-                    throw new Error('Message aborted due to timeout');
                 }
                 msaLogger.error('[타임 아웃] 메시지 재전송 처리', { traceId: execInterceptor.traceId }, {
                     error: {

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

@@ -69,7 +69,12 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
                     reject(err);
                 }
             }, abortController.signal);
-            await abortablePromise;
+            abortablePromise.then((val) => {
+                console.log('handleMessage success', val);
+            }).catch((err) => {
+                console.log('handleMessage error', err);
+                throw err;
+            });
         }
         catch (error) {
             if (error.message.includes('Message aborted')) {

package/package.json

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