@yolo-croket-dev/core 1.7.25-slowquery.11 → 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가 없으면 기본 처리
@@ -346,11 +355,10 @@ let RPCInterceptor = class RPCInterceptor {
             // logger.debug(`=> (${traceId}): ${JSON.stringify(this.keyCutter(JSON.stringify(content)))}`);
         }
         this.gracefulShutdownService.pushActiveInterceptors(execInterceptor);
-        const abort$ = (0, rxjs_1.fromEvent)(abortController.signal, 'abort');
         // eslint-disable-next-line consistent-return
         return next
             .handle()
-            .pipe((0, operators_1.takeUntil)(abort$), 
+            .pipe(
         // timeout(1000 * 60 * 29), // 30분 타임아웃
         (0, operators_1.timeout)(1000 * 3), // 30분 타임아웃
         (0, operators_1.tap)({

package/package.json

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