@yolo-croket-dev/core 1.7.14 → 1.7.16

package/interceptors/rpc.interceptor.d.ts

@@ -5,7 +5,6 @@ import { GracefulShutdownService } from '../modules/graceful-shutdown/graceful-s
 export declare class RPCInterceptor implements NestInterceptor {
     private readonly reflector;
     private readonly gracefulShutdownService;
-    private readonly STATIC_NOT_DEFINE_RETRY_ATTEMPT;
     constructor(reflector: Reflector, gracefulShutdownService: GracefulShutdownService);
     private maxLengthOverShorten;
     private updateMaxLengthArrayShorten;

package/interceptors/rpc.interceptor.js

@@ -52,7 +52,6 @@ let RPCInterceptor = class RPCInterceptor {
     constructor(reflector, gracefulShutdownService) {
         this.reflector = reflector;
         this.gracefulShutdownService = gracefulShutdownService;
-        this.STATIC_NOT_DEFINE_RETRY_ATTEMPT = 3;
     }
     maxLengthOverShorten(data) {
         if (typeof data !== 'string') {
@@ -160,11 +159,11 @@ let RPCInterceptor = class RPCInterceptor {
         if (this.gracefulShutdownService.isApplicationExit) {
             msaLogger.debug('RPCInterceptor isApplicationExit called', { traceId: 'IS_APPLICATION_EXIT' });
             channel.cancel(message.fields.consumerTag);
-            return new rxjs_1.Observable();
+            return rxjs_1.EMPTY;
         }
         if (!staticRetryCount && reDeliveryCount > 0) {
             // 직접 메시지가 재시도 처리가 된 경우에는 로그만 남기고 처리하지 않음
-            msaLogger.debug(`RETRY_COUNT_ZERO_OR_NO_RETRY 발생 전, 재시도 처리 (${reDeliveryCount}/${this.STATIC_NOT_DEFINE_RETRY_ATTEMPT})`, { traceId: ((_b = content.data.param) === null || _b === void 0 ? void 0 : _b.traceId) || 'RETRY_COUNT_ZERO_OR_NO_RETRY' }, {
+            msaLogger.debug('RETRY_COUNT_ZERO_OR_NO_RETRY 발생 전, redelivery 발생', { traceId: ((_b = content.data.param) === null || _b === void 0 ? void 0 : _b.traceId) || 'RETRY_COUNT_ZERO_OR_NO_RETRY' }, {
                 messagePattern: method,
                 properties: message.properties,
                 fields: message.fields,
@@ -172,20 +171,9 @@ let RPCInterceptor = class RPCInterceptor {
                 reDeliveryCount,
                 staticRetryCount,
             });
-            // 무한 재시도가 일어날 수 있으므로 재시도 카운트가 지정되지 않은 이벤트의 경우에는 횟수로 재실행 할 수 있도록
-            if (reDeliveryCount >= this.STATIC_NOT_DEFINE_RETRY_ATTEMPT) {
-                channel.sendToQueue(message.properties.replyTo, Buffer.from(JSON.stringify({
-                    isError: true,
-                    message: 'RETRY_COUNT_ZERO_OR_NO_RETRY',
-                    status: 500,
-                    duration: Date.now() - now,
-                    arg,
-                    timestamp: new Date(),
-                })), { correlationId: message.properties.correlationId });
-                channel.nack(message, false, false); /** 아마도 기본 30분 타임아웃이 지나고 새로 들어오면 발생할 예정, DLQ로 이동 */
-                message.properties.replyTo = undefined; /** replyTo가 존재하면 sendToQueue가 호출되므로, 삭제해주기 */
-                return new rxjs_1.Observable();
-            }
+            channel.nack(message, false, false); /** 아마도 기본 30분 타임아웃이 지나고 새로 들어오면 발생할 예정, DLQ로 이동 */
+            message.properties.replyTo = undefined; /** replyTo가 존재하면 sendToQueue가 호출되므로, 삭제해주기 */
+            return rxjs_1.EMPTY;
         }
         const noAck = message.fields.routingKey.includes('ASYNC');
         let localErrorProcessor = async (err) => {
@@ -252,7 +240,7 @@ let RPCInterceptor = class RPCInterceptor {
             if (!noAck && !isAck) {
                 channel.ack(message);
             }
-            return new rxjs_1.Observable();
+            return rxjs_1.EMPTY;
         };
         localErrorProcessor = localErrorProcessor.bind(this);
         /** 파일 객체 처리 */
@@ -273,7 +261,7 @@ let RPCInterceptor = class RPCInterceptor {
             }
             catch (err) {
                 await localErrorProcessor(err);
-                return new rxjs_1.Observable();
+                return rxjs_1.EMPTY;
             }
         }
         if (content.pattern === 'UPLOAD_FILE') {

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

@@ -25,7 +25,7 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
         if (!this.queueOptions.noAssert) {
             await channel.assertQueue(this.queue, this.queueOptions);
         }
-        await channel.prefetch(this.prefetchCount, this.isGlobalPrefetchCount);
+        await channel.prefetch(this.options.prefetchCount || 0, this.options.isGlobalPrefetchCount);
         const { consumerTag } = await channel.consume(this.queue, (msg) => this.handleMessage(msg, channel), { noAck: false });
         this.consumerTag = consumerTag;
         callback();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.7.14",
+  "version": "1.7.16",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",
@@ -15,7 +15,6 @@
   "license": "UNLICENSED",
   "dependencies": {
     "@nestjs/common": "^8.2.3",
-    "@nestjs/microservices": "9.0.8",
     "@yolo-croket-dev/logger": "^1.0.15",
     "@yolo-croket-dev/msa-logger": "^3.0.4",
     "@yolo-croket-dev/redis": "^1.0.23",