@yolo-croket-dev/core 1.4.53 → 1.5.1-jun.0

package/functions/amqp-call-manager.function.js

@@ -26,12 +26,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AmqpManagement = void 0;
 const msa_logger_1 = __importStar(require("@yolo-croket-dev/msa-logger"));
 const _1 = require(".");
+const { SERVER_NAME } = process.env;
 const msaLogger = new msa_logger_1.default(msa_logger_1.ServerTypeEnum.SERVICE);
 class AmqpManagement {
     constructor(client) {
         this.client = client;
     }
-    paramProcessor(argParam, options) {
+    paramProcessor({ messagePattern, argParam, options, }) {
         const param = { ...argParam };
         if (!options) {
             return param;
@@ -42,13 +43,19 @@ class AmqpManagement {
         if (options.isCreateTraceId) {
             param.traceId = (0, _1.generateTraceId)();
         }
+        /** from 처리 */
+        param.from = `${SERVER_NAME}: ${messagePattern}`;
         return param;
     }
     async call(funcName, messagePattern, payload, argParam, options) {
-        const param = this.paramProcessor(argParam || {
-            traceId: (0, _1.generateTraceId)(),
-            isInternal: true,
-        }, options);
+        const param = this.paramProcessor({
+            argParam: argParam || {
+                traceId: (0, _1.generateTraceId)(),
+                isInternal: true,
+            },
+            messagePattern,
+            options,
+        });
         try {
             const result = await (0, _1.AmqpHandler)(this.client, messagePattern, {
                 payload,
@@ -65,10 +72,14 @@ class AmqpManagement {
         return undefined;
     }
     onlyPublish(funcName, messagePattern, payload, argParam, options) {
-        const param = this.paramProcessor(argParam || {
-            traceId: (0, _1.generateTraceId)(),
-            isInternal: true,
-        }, options);
+        const param = this.paramProcessor({
+            argParam: argParam || {
+                traceId: (0, _1.generateTraceId)(),
+                isInternal: true,
+            },
+            options,
+            messagePattern,
+        });
         this.client.emit(messagePattern, {
             payload,
             param,

package/functions/amqp-handler.function.js

@@ -5,6 +5,7 @@ const common_1 = require("@nestjs/common");
 const rxjs_1 = require("rxjs");
 const msa_logger_1 = require("@yolo-croket-dev/msa-logger");
 const _1 = require(".");
+const { SERVER_NAME } = process.env;
 const msaLogger = new msa_logger_1.MsaLogger(msa_logger_1.ServerTypeEnum.SERVICE);
 class HttpExceptionCustom extends common_1.HttpException {
     constructor(response, status, subMessage, errInfo) {
@@ -16,8 +17,13 @@ class HttpExceptionCustom extends common_1.HttpException {
 exports.HttpExceptionCustom = HttpExceptionCustom;
 // eslint-disable-next-line max-len
 async function AmqpHandler(client, messagePattern, payload) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     let data;
+    /** from 처리 */
+    if (!((_a = payload.param) === null || _a === void 0 ? void 0 : _a.from)) {
+        // eslint-disable-next-line no-param-reassign
+        payload.param.from = `${SERVER_NAME}: ${messagePattern}`;
+    }
     try {
         data = await (0, rxjs_1.lastValueFrom)(client.send(messagePattern, payload).pipe());
         if (data.isError) {
@@ -27,7 +33,7 @@ async function AmqpHandler(client, messagePattern, payload) {
              * 파일 객체 처리
              * 다른 서비스에서 이미 처리가 될 수 있음
              * */
-            (0, _1.reWriteFileValue)((_a = data === null || data === void 0 ? void 0 : data.arg) === null || _a === void 0 ? void 0 : _a.file);
+            (0, _1.reWriteFileValue)((_b = data === null || data === void 0 ? void 0 : data.arg) === null || _b === void 0 ? void 0 : _b.file);
             const errInfo = data.errInfo ? data.errInfo : {
                 message: data.errMessage,
                 type: data.errType,
@@ -45,18 +51,14 @@ async function AmqpHandler(client, messagePattern, payload) {
     }
     catch (err) {
         if (typeof err === 'string' && err.includes('There is no matching message handler defined in the remote service.')) {
-            msaLogger.error('NOT_EXISTS_MESSAGE_PATTERN', {
-                traceId: ((_b = payload === null || payload === void 0 ? void 0 : payload.param) === null || _b === void 0 ? void 0 : _b.traceId) || '-'
-            }, { err });
+            msaLogger.error('NOT_EXISTS_MESSAGE_PATTERN', { traceId: ((_c = payload === null || payload === void 0 ? void 0 : payload.param) === null || _c === void 0 ? void 0 : _c.traceId) || '-' }, { err });
             throw new HttpExceptionCustom('해당 메시지 패턴은 존재하지 않습니다.', 404, 'There is no matching message handler defined in the remote service.', {
                 type: 'NOT_EXISTS_MESSAGE_PATTERN',
-                message: '해당 메시지 패턴은 존재하지 않습니다.'
+                message: '해당 메시지 패턴은 존재하지 않습니다.',
             });
         }
         else {
-            msaLogger.error('AMQP_HANDLER_ERROR', {
-                traceId: ((_c = payload === null || payload === void 0 ? void 0 : payload.param) === null || _c === void 0 ? void 0 : _c.traceId) || '-'
-            }, { err });
+            msaLogger.error('AMQP_HANDLER_ERROR', { traceId: ((_d = payload === null || payload === void 0 ? void 0 : payload.param) === null || _d === void 0 ? void 0 : _d.traceId) || '-' }, { err });
             throw err;
         }
     }

package/interceptors/logging-service.interceptor.js

@@ -30,6 +30,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoggingServiceInterceptor = void 0;
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-param-reassign */
 const common_1 = require("@nestjs/common");
 const msa_logger_1 = __importStar(require("@yolo-croket-dev/msa-logger"));
@@ -68,15 +69,17 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         return data;
     }
     intercept(context, next) {
+        var _a;
         const now = Date.now();
-        const args = context.getArgs();
-        const rmq = args[1];
+        // const args = context.getArgs();
+        const rmqContext = context.switchToRpc().getContext();
+        const originalMessage = rmqContext.getMessage();
         const ctx = context.switchToHttp();
         const request = ctx.getRequest();
-        const message = rmq.getMessage();
-        // const now = Date.now();
-        const content = JSON.parse(message.content.toString());
+        const originalcontent = originalMessage.content;
+        const content = JSON.parse(originalcontent.toString());
         const traceId = content.data.param ? content.data.param.traceId : '-';
+        const from = ((_a = content.data.param) === null || _a === void 0 ? void 0 : _a.from) || '-';
         msaLogger.printInputInterceptorService({
             traceId,
             messageBrokerInfo: {
@@ -84,9 +87,13 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                 payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
             },
             paramInfo: request.param,
+            traceInfo: { from },
         });
         return next.handle()
-            .pipe((0, operators_1.tap)(() => {
+            .pipe((0, operators_1.map)(data => {
+            console.log('@data', data);
+        }), (0, operators_1.tap)(() => {
+            console.log('@top');
             const elapsed = Date.now() - now;
             msaLogger.printOutService({
                 traceId,
@@ -94,6 +101,11 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     status: 200,
                     ms: elapsed,
                 },
+                messageBrokerInfo: {
+                    messagePatten: content.pattern,
+                    payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
+                },
+                traceInfo: { from },
             });
         })).pipe((0, operators_1.catchError)((error) => {
             msaLogger.printExceptionFliterService({
@@ -104,6 +116,11 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     message: error.subMessage,
                     stack: error.stack,
                 },
+                messageBrokerInfo: {
+                    messagePatten: content.pattern,
+                    payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
+                },
+                traceInfo: { from },
             });
             const elapsed = Date.now() - now;
             msaLogger.printOutService({
@@ -112,6 +129,11 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     status: error.status,
                     ms: elapsed,
                 },
+                messageBrokerInfo: {
+                    messagePatten: content.pattern,
+                    payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
+                },
+                traceInfo: { from },
             });
             throw error;
         }));

package/interceptors/rpc.interceptor.js

@@ -33,6 +33,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RPCInterceptor = void 0;
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-param-reassign */
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
@@ -205,8 +206,10 @@ let RPCInterceptor = class RPCInterceptor {
                 errMessage,
                 errAction,
             };
-            // eslint-disable-next-line max-len
-            if (!Number.isNaN(staticRetryCount) && staticRetryCount && err.isRetry !== false) { /** 재시도 로직이 필요한 경우, 0보다 커야 정의된것. 기본값이 0, isRetry값이 false로 정의된 에러가 아니라면 전부 재시도 */
+            if (!Number.isNaN(staticRetryCount)
+                && staticRetryCount
+                && err.isRetry !== false) {
+                /** 재시도 로직이 필요한 경우, 0보다 커야 정의된것. 기본값이 0, isRetry값이 false로 정의된 에러가 아니라면 전부 재시도 */
                 if (reDeliveryCount <= (staticRetryCount - 1)) { /** 재시도 횟수가 있고, 재시도 횟수보다 적을 경우, 0부터 카운팅 되므로 -1 */
                     channel.nack(message, false, true);
                     message.properties.replyTo = undefined; /** replyTo가 존재하면 sendToQueue가 호출되므로, 삭제해주기 */

package/interfaces/http.d.ts

@@ -31,6 +31,8 @@ export interface AbstractParam {
     requestLog?: RequestLog;
     tossRequestId?: string;
     retryCount?: number;
+    /** 이전 호출자 */
+    from?: string;
 }
 export interface File {
     [key: string]: FileValue | FileValue[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.4.53",
+  "version": "1.5.1-jun.0",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",
@@ -17,6 +17,7 @@
     "@nestjs/common": "^8.2.3",
     "@nestjs/microservices": "9.0.8",
     "@yolo-croket-dev/logger": "^1.0.15",
+    "@yolo-croket-dev/msa-logger": "^2.1.0",
     "@yolo-croket-dev/redis": "^1.0.23",
     "@yolo-croket-dev/swagger": "^0.0.7",
     "axios": "^1.1.3",