@yolo-croket-dev/core 1.5.1-jun.7 → 1.5.1

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,14 +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: '해당 메시지 패턴은 존재하지 않습니다.',
             });
         }
         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

@@ -35,7 +35,6 @@ exports.LoggingServiceInterceptor = void 0;
 const common_1 = require("@nestjs/common");
 const msa_logger_1 = __importStar(require("@yolo-croket-dev/msa-logger"));
 const operators_1 = require("rxjs/operators");
-const { SERVER_NAME } = process.env;
 const msaLogger = new msa_logger_1.default(msa_logger_1.ServerTypeEnum.SERVICE);
 const MAX_CUT_LENGTH = 500;
 let LoggingServiceInterceptor = class LoggingServiceInterceptor {
@@ -70,22 +69,17 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         return data;
     }
     intercept(context, next) {
+        var _a;
         const now = Date.now();
         // const args = context.getArgs();
         const rmqContext = context.switchToRpc().getContext();
-        const data = context.switchToRpc().getData();
-        const from = data.param.from || '-';
-        const froms = data.param.froms || [from];
         const originalMessage = rmqContext.getMessage();
         const ctx = context.switchToHttp();
         const request = ctx.getRequest();
         const originalcontent = originalMessage.content;
         const content = JSON.parse(originalcontent.toString());
         const traceId = content.data.param ? content.data.param.traceId : '-';
-        /** from 변경 */
-        const tmpFrom = `${SERVER_NAME}: ${content.pattern}`;
-        data.param.from = tmpFrom;
-        froms.push(tmpFrom);
+        const from = ((_a = content.data.param) === null || _a === void 0 ? void 0 : _a.from) || '-';
         msaLogger.printInputInterceptorService({
             traceId,
             messageBrokerInfo: {
@@ -93,10 +87,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                 payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
             },
             paramInfo: request.param,
-            traceInfo: {
-                from,
-                froms,
-            },
+            traceInfo: { from },
         });
         return next.handle()
             .pipe((0, operators_1.tap)(() => {
@@ -111,10 +102,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     messagePatten: content.pattern,
                     payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
                 },
-                traceInfo: {
-                    from,
-                    froms,
-                },
+                traceInfo: { from },
             });
         })).pipe((0, operators_1.catchError)((error) => {
             msaLogger.printExceptionFliterService({
@@ -129,10 +117,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     messagePatten: content.pattern,
                     payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
                 },
-                traceInfo: {
-                    from,
-                    froms,
-                },
+                traceInfo: { from },
             });
             const elapsed = Date.now() - now;
             msaLogger.printOutService({
@@ -145,10 +130,7 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
                     messagePatten: content.pattern,
                     payload: JSON.stringify(this.keyCutter(JSON.stringify(request.payload))),
                 },
-                traceInfo: {
-                    from,
-                    froms,
-                },
+                traceInfo: { from },
             });
             throw error;
         }));

package/interfaces/http.d.ts

@@ -33,7 +33,6 @@ export interface AbstractParam {
     retryCount?: number;
     /** 이전 호출자 */
     from?: string;
-    froms?: string[];
 }
 export interface File {
     [key: string]: FileValue | FileValue[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.5.1-jun.7",
+  "version": "1.5.1",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",
@@ -17,7 +17,7 @@
     "@nestjs/common": "^8.2.3",
     "@nestjs/microservices": "9.0.8",
     "@yolo-croket-dev/logger": "^1.0.15",
-    "@yolo-croket-dev/msa-logger": "^3.0.1",
+    "@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",