@yolo-croket-dev/core 1.10.0-jun.2-beta.1 → 1.10.1

package/interceptors/logging-service.interceptor.js

@@ -39,11 +39,22 @@ const common_1 = require("@nestjs/common");
 const msa_logger_1 = __importStar(require("@yolo-croket-dev/msa-logger"));
 const operators_1 = require("rxjs/operators");
 const dd_trace_1 = __importDefault(require("dd-trace"));
+const rmq_diagnostics_function_1 = require("../functions/rmq-diagnostics.function");
 const redact_auth_data_function_1 = require("../functions/redact-auth-data.function");
 const grpc_param_metadata_function_1 = require("../functions/grpc-param-metadata.function");
 const { SERVER_NAME } = process.env;
 const msaLogger = new msa_logger_1.default(msa_logger_1.ServerTypeEnum.SERVICE);
 const MAX_CUT_LENGTH = 500;
+function readErrorProperty(error, key) {
+    if (error === null || error === undefined)
+        return undefined;
+    try {
+        return Reflect.get(Object(error), key);
+    }
+    catch {
+        return undefined;
+    }
+}
 dd_trace_1.default.init();
 let LoggingServiceInterceptor = class LoggingServiceInterceptor {
     keyCutter(data) {
@@ -108,6 +119,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
             pattern = content.pattern;
             payload = context.switchToHttp().getRequest().payload;
         }
+        const connection = isGrpc ? undefined : (0, rmq_diagnostics_function_1.getRmqDiagnosticSnapshot)(rmqContext.getChannelRef());
         const pastParam = JSON.parse(JSON.stringify(param));
         const pastFrom = pastParam.from || '-';
         const pastFroms = pastParam.froms || [pastFrom];
@@ -171,22 +183,47 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                 loggingSpan.finish();
             }
         })).pipe((0, operators_1.catchError)((error) => {
+            const diagnostic = connection ? (0, msa_logger_1.normalizeDiagnosticError)(error, 'service_error') : undefined;
+            const frame = diagnostic === null || diagnostic === void 0 ? void 0 : diagnostic.details.errors[0];
+            const subMessageValue = readErrorProperty(error, 'subMessage');
+            let subMessage = typeof subMessageValue === 'string' ? subMessageValue : undefined;
+            if (subMessage && diagnostic)
+                subMessage = (0, msa_logger_1.sanitizeDiagnosticText)(subMessage);
+            const messageValue = readErrorProperty(error, 'message');
+            const errorMessage = (frame === null || frame === void 0 ? void 0 : frame.message) || (typeof messageValue === 'string' ? messageValue : undefined)
+                || (typeof error === 'string' ? error : undefined);
+            const nameValue = readErrorProperty(error, 'name');
+            const errorName = (frame === null || frame === void 0 ? void 0 : frame.name) || (typeof nameValue === 'string' ? nameValue : 'UNKNOWN_ERROR');
+            const stackValue = readErrorProperty(error, 'stack');
+            const errorStack = (frame === null || frame === void 0 ? void 0 : frame.stack) || (typeof stackValue === 'string' ? stackValue : undefined);
+            const statusValue = readErrorProperty(error, 'status');
+            const status = typeof statusValue === 'number' ? statusValue : 500;
+            const errOption = readErrorProperty(error, 'errOption');
             if (loggingSpan) {
                 loggingSpan.setTag('error', true);
-                loggingSpan.setTag('error.message', error.message);
-                loggingSpan.setTag('error.status', error.status);
-                loggingSpan.setTag('error.subMessage', error.subMessage);
-                loggingSpan.setTag('error.stack', error.stack);
-                loggingSpan.setTag('error.type', error.constructor.name);
+                loggingSpan.setTag('error.message', errorMessage);
+                loggingSpan.setTag('error.status', status);
+                loggingSpan.setTag('error.subMessage', subMessage);
+                loggingSpan.setTag('error.stack', errorStack);
+                loggingSpan.setTag('error.type', errorName);
             }
             msaLogger.printExceptionFliterService({
+                diagnosticInfo: diagnostic ? {
+                    ...diagnostic.diagnosticInfo,
+                    ...(0, rmq_diagnostics_function_1.getRmqDiagnosticSnapshot)(rmqContext.getChannelRef()),
+                    event: 'handler_failed',
+                    messagePattern: (0, msa_logger_1.sanitizeDiagnosticText)(pattern).slice(0, 240),
+                    elapsedMs: Date.now() - now,
+                    startGeneration: connection === null || connection === void 0 ? void 0 : connection.generation,
+                    startConnectionState: connection === null || connection === void 0 ? void 0 : connection.connectionState,
+                } : undefined,
                 traceId,
                 errInfo: {
-                    errType: error.subMessage ? error.message : error.name,
-                    message: error.subMessage ? error.subMessage : error.message,
-                    status: error.status,
-                    stack: error.stack,
-                    errOption: error.errOption,
+                    errType: subMessage ? errorMessage || errorName : errorName,
+                    message: subMessage || errorMessage,
+                    status,
+                    stack: errorStack,
+                    errOption,
                 },
                 messageBrokerInfo: {
                     messagePatten: pattern,
@@ -196,12 +233,12 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     from: pastFrom,
                     froms: pastFroms,
                 },
-            });
+            }, diagnostic === null || diagnostic === void 0 ? void 0 : diagnostic.details);
             const elapsed = Date.now() - now;
             msaLogger.printOutService({
                 traceId,
                 responseInfo: {
-                    status: error.status,
+                    status,
                     ms: elapsed,
                 },
                 messageBrokerInfo: {
@@ -220,7 +257,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.js

@@ -48,6 +48,7 @@ const functions_1 = require("../functions");
 const exceptions_1 = require("../exceptions");
 const context_promise_patch_1 = require("../functions/abort/context-promise-patch");
 const graceful_shutdown_service_1 = require("../modules/graceful-shutdown/graceful-shutdown.service");
+const rmq_diagnostics_function_1 = require("../functions/rmq-diagnostics.function");
 const msaLogger = new msa_logger_1.default(msa_logger_1.ServerTypeEnum.SERVICE);
 // const MAX_CUT_LENGTH = 500;
 const MAX_LENGTH = 300;
@@ -154,6 +155,7 @@ let RPCInterceptor = class RPCInterceptor {
         const arg = args[0];
         const rmq = args[1];
         const channel = rmq.getChannelRef();
+        const startConnection = (0, rmq_diagnostics_function_1.getRmqDiagnosticSnapshot)(channel);
         const message = rmq.getMessage();
         const now = Date.now();
         const content = JSON.parse(message.content.toString());
@@ -206,7 +208,7 @@ let RPCInterceptor = class RPCInterceptor {
         }
         const noAck = message.fields.routingKey.includes('ASYNC');
         let localErrorProcessor = async (err) => {
-            var _a;
+            var _a, _b;
             const errMsg = err.response ? err.response : err.message;
             const status = err.status ? err.status : 500;
             const errType = err.errType;
@@ -278,10 +280,28 @@ let RPCInterceptor = class RPCInterceptor {
                 }
             }
             const sendMessage = Buffer.from(JSON.stringify(abstractAmqpHandlerData));
-            if (!isAck) {
+            const diagnostic = startConnection
+                ? (0, msa_logger_1.normalizeDiagnosticError)(err, isTimeoutError ? 'response_timeout' : 'service_error') : undefined;
+            const diagnosticInfo = diagnostic ? {
+                ...diagnostic.diagnosticInfo,
+                ...(0, rmq_diagnostics_function_1.getRmqDiagnosticSnapshot)(channel),
+                event: 'handler_failed',
+                messagePattern: (0, msa_logger_1.sanitizeDiagnosticText)(String(method)).slice(0, 240),
+                elapsedMs: duration,
+                startGeneration: startConnection === null || startConnection === void 0 ? void 0 : startConnection.generation,
+                startConnectionState: startConnection === null || startConnection === void 0 ? void 0 : startConnection.connectionState,
+            } : undefined;
+            if (!isAck || diagnostic) {
                 const currentContext = functions_1.AbortContext.getCurrentContext();
-                // 에러 전달
-                msaLogger.warn('에러 응답 전송 처리', { traceId: execInterceptor.traceId }, {
+                msaLogger.warn(isAck ? 'RPCInterceptor 오류 처리' : '에러 응답 전송 처리', {
+                    traceId: execInterceptor.traceId,
+                    diagnosticInfo,
+                }, diagnostic ? {
+                    error: diagnostic.details,
+                    reDeliveryCount,
+                    staticRetryCount,
+                    currentContext: (_a = currentContext === null || currentContext === void 0 ? void 0 : currentContext.requestId) !== null && _a !== void 0 ? _a : null,
+                } : {
                     error: {
                         message: err.message,
                         stack: err.stack,
@@ -293,11 +313,13 @@ let RPCInterceptor = class RPCInterceptor {
                     messagePattern: method,
                     currentContext: currentContext && currentContext.requestId ? currentContext.requestId : null,
                 });
+            }
+            if (!isAck) {
                 channel.sendToQueue(message.properties.replyTo, sendMessage, { correlationId: message.properties.correlationId });
             }
             const messageContent = message.content.toString();
             /** 파일 객체 처리 */
-            (0, functions_1.reWriteFileValue)((_a = messageContent === null || messageContent === void 0 ? void 0 : messageContent.data) === null || _a === void 0 ? void 0 : _a.file);
+            (0, functions_1.reWriteFileValue)((_b = messageContent === null || messageContent === void 0 ? void 0 : messageContent.data) === null || _b === void 0 ? void 0 : _b.file);
             if (!noAck && !isAck) {
                 channel.ack(message);
                 execInterceptor.isMessageAck = true;
@@ -370,9 +392,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: '에러 종류 식별자',
@@ -102,4 +103,3 @@ __decorate([
     }),
     __metadata("design:type", Number)
 ], ErrInfo.prototype, "retryAfterSeconds", void 0);
-exports.ErrInfo = ErrInfo;

package/interfaces/http.d.ts

@@ -1,5 +1,5 @@
-import { Method } from 'axios';
 import { ErrInfo } from './exception';
+type RequestLogMethod = 'GET' | 'DELETE' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'PATCH' | 'PURGE' | 'LINK' | 'UNLINK';
 export interface ExternalTokenValue {
     provider: string;
     client_id: string;
@@ -16,7 +16,7 @@ export interface DeviceRequest {
 export interface RequestLog {
     query?: unknown;
     body?: unknown;
-    method: Method;
+    method: RequestLogMethod | Lowercase<RequestLogMethod>;
     endpoint: string;
 }
 /** 최신 에러 정보 */
@@ -98,3 +98,4 @@ export interface ExternalResponseNormalize<T> {
 export interface ResponseAction {
     result: boolean;
 }
+export {};

package/interfaces/log-level.enum.js

@@ -21,4 +21,4 @@ var LogLevelEnum;
     LogLevelEnum["DEBUG"] = "debug";
     LogLevelEnum["WARN"] = "warn";
     LogLevelEnum["ERROR"] = "error";
-})(LogLevelEnum = exports.LogLevelEnum || (exports.LogLevelEnum = {}));
+})(LogLevelEnum || (exports.LogLevelEnum = LogLevelEnum = {}));

package/interfaces/msa-exception.d.ts

@@ -1,6 +1,10 @@
 import { HttpException } from '@nestjs/common';
 import { LogLevelEnum } from './log-level.enum';
 import type { ErrAction } from './exception';
+export declare enum MsaExceptionMessageAckBehaviorEnum {
+    ACK = "ACK",
+    NACK = "NACK"
+}
 export interface MsaExceptionOption {
     /**
      * 로그 레벨
@@ -8,6 +12,12 @@ export interface MsaExceptionOption {
      * - 기본값은 ERROR 입니다.
      * */
     logErrorLevel?: LogLevelEnum;
+    /**
+     * 메시지 consumer 실패 시 ACK/NACK override 옵션
+     * - 현재는 amqp-rabbit-mq subscribe consumer에서만 해석합니다.
+     * - option이 없으면 consumer handler의 기본 errorBehavior를 따릅니다.
+     */
+    messageAckBehavior?: MsaExceptionMessageAckBehaviorEnum;
 }
 /**
  * @author jun
@@ -27,7 +37,7 @@ export interface MsaException {
     errOption?: MsaExceptionOption;
 }
 /** HttpException과 MsaException을 결합한 타입 */
-export declare type MsaHttpException = MsaException & HttpException;
+export type MsaHttpException = MsaException & HttpException;
 /**
  * @description MsaException 타입 가드
  * @param error 검사할 에러 객체

package/interfaces/msa-exception.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMsaException = void 0;
+exports.isMsaException = exports.MsaExceptionMessageAckBehaviorEnum = void 0;
 const common_1 = require("@nestjs/common");
+var MsaExceptionMessageAckBehaviorEnum;
+(function (MsaExceptionMessageAckBehaviorEnum) {
+    MsaExceptionMessageAckBehaviorEnum["ACK"] = "ACK";
+    MsaExceptionMessageAckBehaviorEnum["NACK"] = "NACK";
+})(MsaExceptionMessageAckBehaviorEnum || (exports.MsaExceptionMessageAckBehaviorEnum = MsaExceptionMessageAckBehaviorEnum = {}));
 /**
  * @description MsaException 타입 가드
  * @param error 검사할 에러 객체

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

@@ -48,7 +48,8 @@ let GracefulShutdownModule = class GracefulShutdownModule {
         msaLogger.info('GracefulShutdownService.onModuleDestroy: all interceptors finished, shutting down', { traceId: 'ON_MODULE_DESTROY' });
     }
 };
-GracefulShutdownModule = __decorate([
+exports.GracefulShutdownModule = GracefulShutdownModule;
+exports.GracefulShutdownModule = GracefulShutdownModule = __decorate([
     (0, common_1.Global)(),
     (0, common_1.Module)({
         providers: [graceful_shutdown_service_1.GracefulShutdownService],
@@ -56,4 +57,3 @@ GracefulShutdownModule = __decorate([
     }),
     __metadata("design:paramtypes", [graceful_shutdown_service_1.GracefulShutdownService])
 ], GracefulShutdownModule);
-exports.GracefulShutdownModule = GracefulShutdownModule;

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

@@ -1,18 +1,26 @@
-import { RmqOptions, ServerRMQ } from '@nestjs/microservices';
-import { Channel } from 'amqp-connection-manager';
-import { ConsumeMessage } from 'amqplib';
-export declare type GracefulRmqOptions = RmqOptions['options'] & {
+import { ServerRMQ } from '@nestjs/microservices';
+import type { RmqOptions } from '@nestjs/microservices';
+import type { Channel } from 'amqp-connection-manager';
+import type { ConsumeMessage } from 'amqplib';
+export type GracefulRmqOptions = RmqOptions['options'] & {
     waitingEndingHandlersTimeoutMs?: number;
     waitingEndingHandlersIntervalMs?: number;
 };
+/**
+ * @author jun
+ * @description RabbitMQ 연결 식별 정보와 graceful shutdown을 제공하는 RMQ 서버
+ * @process 연결 옵션에 추적 가능한 connection_name을 추가한 뒤 메시지 종료를 보장한다.
+ */
 export declare class GracefulServerRMQ extends ServerRMQ {
     protected readonly options: GracefulRmqOptions;
+    private readonly observation?;
     protected runningMessages: number;
     protected closing: boolean;
     protected consumerTag: string | null;
     protected readonly waitingEndingHandlersTimeoutMs: number;
     protected readonly waitingEndingHandlersIntervalMs: number;
     constructor(options: GracefulRmqOptions);
+    createClient(): any;
     setupChannel(channel: Channel, callback: () => void): Promise<void>;
     protected waitingHandlers(): Promise<void>;
     handleMessage(message: ConsumeMessage, channel: Channel): Promise<void>;

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

@@ -1,27 +1,88 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GracefulServerRMQ = void 0;
 const microservices_1 = require("@nestjs/microservices");
+const os_1 = __importDefault(require("os"));
 const node_util_1 = require("node:util");
+const rmq_diagnostics_function_1 = require("../../functions/rmq-diagnostics.function");
 const sleep = (0, node_util_1.promisify)(setTimeout);
 const RMQ_DEFAULT_WAITING_ENDING_HANDLERS_TIMEOUT_MS = 5000;
 const RMQ_DEFAULT_WAITING_ENDING_HANDLERS_INTERVAL_MS = 500;
+const RMQ_UNKNOWN_CONNECTION_IDENTITY = 'unknown';
+function createRmqConnectionName(queue) {
+    const environment = process.env.ENV || process.env.NODE_ENV || RMQ_UNKNOWN_CONNECTION_IDENTITY;
+    const owner = process.env.RMQ_OWNER || process.env.USER || process.env.USERNAME || RMQ_UNKNOWN_CONNECTION_IDENTITY;
+    return [
+        queue || RMQ_UNKNOWN_CONNECTION_IDENTITY,
+        environment,
+        owner,
+        os_1.default.hostname(),
+        `pid-${process.pid}`,
+    ].join('/');
+}
+function addRmqConnectionName(options) {
+    var _a;
+    const connectionOptions = (_a = options.socketOptions) === null || _a === void 0 ? void 0 : _a.connectionOptions;
+    const configuredClientProperties = connectionOptions === null || connectionOptions === void 0 ? void 0 : connectionOptions.clientProperties;
+    const clientProperties = configuredClientProperties
+        && typeof configuredClientProperties === 'object'
+        && !Array.isArray(configuredClientProperties)
+        ? configuredClientProperties
+        : {};
+    const configuredConnectionName = clientProperties.connection_name;
+    const connectionName = typeof configuredConnectionName === 'string' && configuredConnectionName.trim()
+        ? configuredConnectionName
+        : createRmqConnectionName(options.queue);
+    return {
+        ...options,
+        socketOptions: {
+            ...options.socketOptions,
+            connectionOptions: {
+                ...connectionOptions,
+                clientProperties: {
+                    ...clientProperties,
+                    connection_name: connectionName,
+                },
+            },
+        },
+    };
+}
+/**
+ * @author jun
+ * @description RabbitMQ 연결 식별 정보와 graceful shutdown을 제공하는 RMQ 서버
+ * @process 연결 옵션에 추적 가능한 connection_name을 추가한 뒤 메시지 종료를 보장한다.
+ */
 class GracefulServerRMQ extends microservices_1.ServerRMQ {
     constructor(options) {
-        super(options);
-        this.options = options;
+        const observation = (0, rmq_diagnostics_function_1.isRmqDiagnosticsEnabled)() ? (0, rmq_diagnostics_function_1.createRmqObserver)(options, 'consumer') : undefined;
+        const optionsWithConnectionName = observation
+            ? (0, rmq_diagnostics_function_1.withRmqConnectionName)(options, observation) : addRmqConnectionName(options);
+        super(optionsWithConnectionName);
         this.runningMessages = 0;
         this.closing = false;
         this.consumerTag = null;
+        this.options = optionsWithConnectionName;
+        this.observation = observation;
         this.waitingEndingHandlersTimeoutMs = this.getOptionsProp(this.options, 'waitingEndingHandlersTimeoutMs')
             || RMQ_DEFAULT_WAITING_ENDING_HANDLERS_TIMEOUT_MS;
         this.waitingEndingHandlersIntervalMs = this.getOptionsProp(this.options, 'waitingEndingHandlersIntervalMs')
             || RMQ_DEFAULT_WAITING_ENDING_HANDLERS_INTERVAL_MS;
     }
+    createClient() {
+        var _a;
+        const client = super.createClient();
+        (_a = this.observation) === null || _a === void 0 ? void 0 : _a.observe(client);
+        return client;
+    }
     async setupChannel(channel, callback) {
         if (this.closing) {
             return;
         }
+        if (this.observation)
+            (0, rmq_diagnostics_function_1.registerRmqObservation)(channel, this.observation);
         if (!this.queueOptions.noAssert) {
             await channel.assertQueue(this.queue, this.queueOptions);
         }
@@ -42,18 +103,24 @@ class GracefulServerRMQ extends microservices_1.ServerRMQ {
         });
     }
     async close() {
+        var _a;
         this.closing = true;
-        if (this.channel) {
-            await this.channel.removeSetup(undefined, (channel) => channel.cancel(this.consumerTag));
+        try {
+            if (this.channel) {
+                await this.channel.removeSetup(undefined, (channel) => channel.cancel(this.consumerTag));
+            }
+            this.consumerTag = null;
+            await Promise.race([
+                this.waitingHandlers(),
+                this.waitingEndingHandlersTimeoutMs > 0
+                    && sleep(this.waitingEndingHandlersTimeoutMs),
+            ]);
+            this.runningMessages = 0;
+            await super.close();
+        }
+        finally {
+            (_a = this.observation) === null || _a === void 0 ? void 0 : _a.close();
         }
-        this.consumerTag = null;
-        await Promise.race([
-            this.waitingHandlers(),
-            this.waitingEndingHandlersTimeoutMs > 0
-                && sleep(this.waitingEndingHandlersTimeoutMs),
-        ]);
-        this.runningMessages = 0;
-        super.close();
     }
 }
 exports.GracefulServerRMQ = GracefulServerRMQ;

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

@@ -133,7 +133,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.10.0-jun.2-beta.1",
+  "version": "1.10.1",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@yolo-croket-dev/logger": "^1.0.15",
-    "@yolo-croket-dev/msa-logger": "^3.5.0",
+    "@yolo-croket-dev/msa-logger": "3.5.3",
     "@yolo-croket-dev/redis": "^1.0.25",
     "axios": "^1.1.3",
     "randomstring": "^1.2.2",

package/pipes/rpc-validation.pipe.js

@@ -36,8 +36,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;

package/tests/amqp-handler-timeout.test.cjs

@@ -0,0 +1,47 @@
+const assert = require('node:assert/strict');
+const test = require('node:test');
+const { Observable } = require('rxjs');
+
+const { AmqpHandler, HttpExceptionCustom } = require('../functions/amqp-handler.function.js');
+
+test('param.timeout이 지나면 AMQP Observable 구독을 해제한다', async () => {
+  let isUnsubscribed = false;
+  const client = {
+    send() {
+      return new Observable(() => () => {
+        isUnsubscribed = true;
+      });
+    },
+  };
+
+  await assert.rejects(
+    AmqpHandler(client, 'test.timeout', {
+      payload: {},
+      param: {
+        traceId: 'trace-id',
+        timeout: 5,
+      },
+    }),
+    (error) => {
+      assert.equal(error instanceof HttpExceptionCustom, true);
+      assert.equal(error.errInfo.type, 'TIMEOUT_ERROR');
+      return true;
+    },
+  );
+
+  assert.equal(isUnsubscribed, true);
+});
+
+test('응답이 먼저 완료되면 기존 AMQP 응답을 반환한다', async () => {
+  const client = {
+    send() {
+      return new Observable((subscriber) => {
+        subscriber.next({ isError: false, data: { ok: true } });
+        subscriber.complete();
+      });
+    },
+  };
+
+  const result = await AmqpHandler(client, 'test.success', { payload: {}, param: { traceId: 'trace-id', timeout: 50 } });
+  assert.deepEqual(result, { data: { ok: true } });
+});