@yolo-croket-dev/core 1.7.12-slowquery.1 → 1.7.12

package/interceptors/logging-service.interceptor.js

@@ -188,7 +188,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         }));
     }
 };
-LoggingServiceInterceptor = __decorate([
+exports.LoggingServiceInterceptor = LoggingServiceInterceptor;
+exports.LoggingServiceInterceptor = LoggingServiceInterceptor = __decorate([
     (0, common_1.Injectable)()
 ], LoggingServiceInterceptor);
-exports.LoggingServiceInterceptor = LoggingServiceInterceptor;

package/interceptors/rpc.interceptor.d.ts

@@ -5,6 +5,7 @@ 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,6 +52,7 @@ 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') {
@@ -144,7 +145,6 @@ let RPCInterceptor = class RPCInterceptor {
         const message = rmq.getMessage();
         const now = Date.now();
         const content = JSON.parse(message.content.toString());
-        // const traceId = content.data.param ? content.data.param.traceId : null;
         const isInternal = content.data.param ? content.data.param.isInternal : false;
         const isAdmin = content.data.param ? content.data.param.isAdmin : false;
         const reDeliveryCount = Number(message.properties.headers['x-delivery-count']) || 0; /** 몇번 재전달되었는지 */
@@ -156,10 +156,6 @@ let RPCInterceptor = class RPCInterceptor {
             traceId: ((_a = content.data.param) === null || _a === void 0 ? void 0 : _a.traceId) || '-',
             correlationId,
         };
-        // const logParam = {
-        //   traceId,
-        //   method,
-        // };
         /** consume 메시지 전부 cancel */
         if (this.gracefulShutdownService.isApplicationExit) {
             msaLogger.debug('RPCInterceptor isApplicationExit called', { traceId: 'IS_APPLICATION_EXIT' });
@@ -167,24 +163,29 @@ let RPCInterceptor = class RPCInterceptor {
             return new rxjs_1.Observable();
         }
         if (!staticRetryCount && reDeliveryCount > 0) {
-            msaLogger.debug('RETRY_COUNT_ZERO_OR_NO_RETRY debug param', { 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 발생 전, 재시도 처리 (${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' }, {
+                messagePattern: method,
                 properties: message.properties,
                 fields: message.fields,
                 time: Date.now(),
                 reDeliveryCount,
                 staticRetryCount,
             });
-            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();
+            // 무한 재시도가 일어날 수 있으므로 재시도 카운트가 지정되지 않은 이벤트의 경우에는 횟수로 재실행 할 수 있도록
+            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();
+            }
         }
         const noAck = message.fields.routingKey.includes('ASYNC');
         let localErrorProcessor = async (err) => {
@@ -300,7 +301,6 @@ let RPCInterceptor = class RPCInterceptor {
                 // });
                 /** 만약 응답데이터중 isRequeue가 true라면, 다시 재처리 하도록 함 */
                 if (val.data && val.data.isRequeue) {
-                    message.properties.headers['x-requeue-reason'] = 'RETRY';
                     channel.nack(message, false, true);
                     return;
                 }
@@ -314,9 +314,9 @@ let RPCInterceptor = class RPCInterceptor {
         }));
     }
 };
-RPCInterceptor = __decorate([
+exports.RPCInterceptor = RPCInterceptor;
+exports.RPCInterceptor = RPCInterceptor = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [core_1.Reflector,
         graceful_shutdown_service_1.GracefulShutdownService])
 ], RPCInterceptor);
-exports.RPCInterceptor = RPCInterceptor;

package/interfaces/exception.js

@@ -18,9 +18,10 @@ var ErrActionTypeEnum;
     ErrActionTypeEnum["LEGACY_SHOW_TOAST"] = "LEGACY_SHOW_TOAST";
     ErrActionTypeEnum["FORCE_UPDATE"] = "FORCE_UPDATE";
     ErrActionTypeEnum["UPDATE_ACCESS_TOKEN"] = "UPDATE_ACCESS_TOKEN";
-})(ErrActionTypeEnum = exports.ErrActionTypeEnum || (exports.ErrActionTypeEnum = {}));
+})(ErrActionTypeEnum || (exports.ErrActionTypeEnum = ErrActionTypeEnum = {}));
 class ErrAction {
 }
+exports.ErrAction = ErrAction;
 __decorate([
     (0, swagger_1.ApiProperty)({
         description: '액션 타입',
@@ -57,9 +58,9 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], ErrAction.prototype, "webViewUrl", void 0);
-exports.ErrAction = ErrAction;
 class ErrInfo {
 }
+exports.ErrInfo = ErrInfo;
 __decorate([
     (0, swagger_1.ApiProperty)({
         description: '에러 종류 식별자',
@@ -81,4 +82,3 @@ __decorate([
     }),
     __metadata("design:type", ErrAction)
 ], ErrInfo.prototype, "action", void 0);
-exports.ErrInfo = ErrInfo;

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

@@ -11,11 +11,11 @@ const common_1 = require("@nestjs/common");
 const graceful_shutdown_service_1 = require("./graceful-shutdown.service");
 let GracefulShutdownModule = class GracefulShutdownModule {
 };
-GracefulShutdownModule = __decorate([
+exports.GracefulShutdownModule = GracefulShutdownModule;
+exports.GracefulShutdownModule = GracefulShutdownModule = __decorate([
     (0, common_1.Global)(),
     (0, common_1.Module)({
         providers: [graceful_shutdown_service_1.GracefulShutdownService],
         exports: [graceful_shutdown_service_1.GracefulShutdownService],
     })
 ], GracefulShutdownModule);
-exports.GracefulShutdownModule = GracefulShutdownModule;

package/modules/graceful-shutdown/graceful-shutdown.rmq.d.ts

@@ -1,7 +1,7 @@
 import { RmqOptions, ServerRMQ } from '@nestjs/microservices';
 import { Channel } from 'amqp-connection-manager';
 import { ConsumeMessage } from 'amqplib';
-export declare type GracefulRmqOptions = RmqOptions['options'] & {
+export type GracefulRmqOptions = RmqOptions['options'] & {
     waitingEndingHandlersTimeoutMs?: number;
     waitingEndingHandlersIntervalMs?: number;
 };

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

@@ -94,7 +94,7 @@ let GracefulShutdownService = class GracefulShutdownService {
         }
     }
 };
-GracefulShutdownService = __decorate([
+exports.GracefulShutdownService = GracefulShutdownService;
+exports.GracefulShutdownService = GracefulShutdownService = __decorate([
     (0, common_1.Injectable)()
 ], GracefulShutdownService);
-exports.GracefulShutdownService = GracefulShutdownService;

package/modules/redis.module.js

@@ -15,10 +15,10 @@ const redisProvider = {
 };
 let RedisModule = class RedisModule {
 };
-RedisModule = __decorate([
+exports.RedisModule = RedisModule;
+exports.RedisModule = RedisModule = __decorate([
     (0, common_1.Module)({
         providers: [redisProvider],
         exports: [redisProvider],
     })
 ], RedisModule);
-exports.RedisModule = RedisModule;

package/package.json

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

package/pipes/rpc-validation.pipe.js

@@ -31,8 +31,8 @@ let ValidationPipe = class ValidationPipe {
         return value;
     }
 };
-ValidationPipe = __decorate([
+exports.ValidationPipe = ValidationPipe;
+exports.ValidationPipe = ValidationPipe = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [Object])
 ], ValidationPipe);
-exports.ValidationPipe = ValidationPipe;