@yolo-croket-dev/core 1.7.17 → 1.7.18-slowquery.1

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

@@ -7,6 +7,8 @@ export declare class RPCInterceptor implements NestInterceptor {
     private readonly gracefulShutdownService;
     constructor(reflector: Reflector, gracefulShutdownService: GracefulShutdownService);
     private maxLengthOverShorten;
+    /** 메시지가 재전송되었을때에, 재시도 Count가 명시되어 있지 않을때에 처리 할지 여부를 결정하는 함수 */
+    isRedeliveryMessage(replyTo: string, traceId: string): Promise<boolean>;
     private updateMaxLengthArrayShorten;
     intercept(context: ExecutionContext, next: CallHandler): Promise<Observable<unknown>>;
 }

package/interceptors/rpc.interceptor.js

@@ -31,6 +31,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RPCInterceptor = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -40,6 +43,7 @@ const core_1 = require("@nestjs/core");
 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"));
 // import Logger from '@yolo-croket-dev/logger';
 const functions_1 = require("../functions");
 const exceptions_1 = require("../exceptions");
@@ -62,6 +66,40 @@ let RPCInterceptor = class RPCInterceptor {
         }
         return data;
     }
+    /** 메시지가 재전송되었을때에, 재시도 Count가 명시되어 있지 않을때에 처리 할지 여부를 결정하는 함수 */
+    async isRedeliveryMessage(replyTo, traceId) {
+        let connection;
+        let channel;
+        let isRedeliveryProcess = false;
+        const AMQP_URL = process.env.AMQP_URL;
+        if (!AMQP_URL || !AMQP_URL.length || !replyTo.length) {
+            return false;
+        }
+        try {
+            connection = await amqplib_1.default.connect(AMQP_URL);
+            channel = await connection.createChannel();
+            const isQueueExist = await channel.checkQueue(replyTo);
+            if (isQueueExist) {
+                isRedeliveryProcess = true;
+            }
+            await channel.close();
+        }
+        catch (err) {
+            const error = err;
+            const logParam = {
+                message: error.message,
+                stack: error.stack,
+            };
+            msaLogger.error('isRedeliveryMessage error', { traceId }, logParam);
+            isRedeliveryProcess = false;
+        }
+        finally {
+            if (connection) {
+                await connection.close();
+            }
+        }
+        return isRedeliveryProcess;
+    }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     updateMaxLengthArrayShorten(obj, path) {
         const keys = path.split('.');
@@ -135,7 +173,7 @@ let RPCInterceptor = class RPCInterceptor {
     //   return data;
     // }
     async intercept(context, next) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const options = this.reflector.get('rpcInterceptorScope', context.getHandler());
         const args = context.getArgs();
         const arg = args[0];
@@ -162,7 +200,6 @@ let RPCInterceptor = class RPCInterceptor {
             return rxjs_1.EMPTY;
         }
         if (!staticRetryCount && reDeliveryCount > 0) {
-            // 직접 메시지가 재시도 처리가 된 경우에는 로그만 남기고 처리하지 않음
             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,
@@ -171,9 +208,22 @@ let RPCInterceptor = class RPCInterceptor {
                 reDeliveryCount,
                 staticRetryCount,
             });
-            channel.nack(message, false, false); /** 아마도 기본 30분 타임아웃이 지나고 새로 들어오면 발생할 예정, DLQ로 이동 */
-            message.properties.replyTo = undefined; /** replyTo가 존재하면 sendToQueue가 호출되므로, 삭제해주기 */
-            return rxjs_1.EMPTY;
+            const isRedeliveryMessage = await this.isRedeliveryMessage(message.properties.replyTo, execInterceptor.traceId);
+            if (!isRedeliveryMessage || reDeliveryCount > 5) {
+                msaLogger.debug('isRedeliveryMessage RETRY_COUNT_ZERO_OR_NO_RETRY false', { traceId: ((_c = content.data.param) === null || _c === void 0 ? void 0 : _c.traceId) || 'RETRY_COUNT_ZERO_OR_NO_RETRY' });
+                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();
+            }
+            msaLogger.debug('isRedeliveryMessage RETRY_COUNT_ZERO_OR_NO_RETRY true, 재처리하여 전달토록 하기', { traceId: ((_d = content.data.param) === null || _d === void 0 ? void 0 : _d.traceId) || 'RETRY_COUNT_ZERO_OR_NO_RETRY' });
         }
         const noAck = message.fields.routingKey.includes('ASYNC');
         let localErrorProcessor = async (err) => {
@@ -244,7 +294,7 @@ let RPCInterceptor = class RPCInterceptor {
         };
         localErrorProcessor = localErrorProcessor.bind(this);
         /** 파일 객체 처리 */
-        (0, functions_1.reWriteFileValue)((_c = content === null || content === void 0 ? void 0 : content.data) === null || _c === void 0 ? void 0 : _c.file);
+        (0, functions_1.reWriteFileValue)((_e = content === null || content === void 0 ? void 0 : content.data) === null || _e === void 0 ? void 0 : _e.file);
         if (options) {
             if (options.maxLengthKeys && options.maxLengthKeys.length) {
                 for (const key of options.maxLengthKeys) {
@@ -297,14 +347,21 @@ let RPCInterceptor = class RPCInterceptor {
                 }
             },
             error: localErrorProcessor,
+        }), (0, operators_1.catchError)(async (err) => {
+            // timeout 에러 처리
+            msaLogger.error('Timeout occurred, requeuing message', { traceId: execInterceptor.traceId }, { error: err });
+            // 메시지를 Requeue
+            channel.nack(message, false, true);
+            // 에러를 다시 throw하여 상위에서 처리할 수 있도록 함
+            throw err;
         }), (0, operators_1.finalize)(() => {
             this.gracefulShutdownService.popActiveInterceptors(execInterceptor);
         }));
     }
 };
-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.17",
+  "version": "1.7.18-slowquery.1",
   "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;