@yolo-croket-dev/core 1.9.7-slowquery.9 → 1.9.7

package/decorators/grpc-param.decorator.d.ts

@@ -0,0 +1 @@
+export declare const GrpcParam: (...dataOrPipes: unknown[]) => ParameterDecorator;

package/decorators/grpc-param.decorator.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GrpcParam = void 0;
+const common_1 = require("@nestjs/common");
+exports.GrpcParam = (0, common_1.createParamDecorator)((data, ctx) => {
+    const metadata = ctx.switchToRpc().getContext();
+    const param = metadata.get('param');
+    if (!param || !param[0]) {
+        return null;
+    }
+    return JSON.parse(param[0]);
+});

package/decorators/index.d.ts

@@ -1,2 +1,3 @@
 export * from './rpc-interceptor-scope.decorator';
 export * from './rpc-transform.decorator';
+export * from './grpc-param.decorator';

package/decorators/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./rpc-interceptor-scope.decorator"), exports);
 __exportStar(require("./rpc-transform.decorator"), exports);
+__exportStar(require("./grpc-param.decorator"), exports);

package/interceptors/logging-service.interceptor.js

@@ -41,12 +41,6 @@ const operators_1 = require("rxjs/operators");
 const dd_trace_1 = __importDefault(require("dd-trace"));
 const { SERVER_NAME } = process.env;
 const msaLogger = new msa_logger_1.default(msa_logger_1.ServerTypeEnum.SERVICE);
-// interface IContent {
-//   pattern: string;
-//   data: IRequest;
-//   /** 무슨 아이디인지 모르겠음 */
-//   id: string;
-// }
 const MAX_CUT_LENGTH = 500;
 dd_trace_1.default.init();
 let LoggingServiceInterceptor = class LoggingServiceInterceptor {
@@ -89,24 +83,16 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         const metadata = args[1];
         const isGrpc = !rmqContext.getMessage;
         let param;
-        let pastFrom;
-        let pastFroms;
         let originalMessage;
         let pattern; /** @xxx: Grpc: path , Mq: 메시지 패턴명 */
         let payload;
-        let pastFromForMetadata;
-        let pastFromsForMetadata;
-        let pastFromForMessage;
-        let pastFromsForMessage;
         if (isGrpc) {
-            param = metadata.get('param') || {
+            param = JSON.parse(metadata.get('param')[0] || {
                 param: {
                     from: '-',
                     froms: '-',
                 },
-            };
-            pastFromForMetadata = metadata.get('from') || '-';
-            pastFromsForMetadata = metadata.get('froms') || [pastFrom];
+            });
             originalMessage = args[0];
             const gRPCArg = args[2];
             pattern = gRPCArg.path;
@@ -114,49 +100,26 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         }
         else {
             param = data.param;
-            pastFromForMessage = param.from ? JSON.parse(JSON.stringify(param.from)) : '-';
-            pastFromsForMessage = param.froms ? JSON.parse(JSON.stringify(param.froms)) : [pastFrom];
             originalMessage = rmqContext.getMessage();
-            pattern = originalMessage.messagePattern;
-            // const originalcontent = originalMessage.content;
-            // const content = JSON.parse(originalcontent.toString()) as IContent;
-            payload = context.switchToHttp().getRequest().data;
-        }
-        // @TODO: 삭제
-        if (pastFromForMetadata && pastFromsForMetadata) {
-            pastFrom = [
-                ...(pastFromForMessage || []),
-                ...(pastFromForMetadata || []),
-            ];
-            pastFroms = [
-                ...(pastFromsForMessage || []),
-                ...(pastFromsForMetadata || []),
-            ];
-        }
-        else if (pastFromForMessage && pastFromsForMessage) {
-            pastFrom = [
-                ...(pastFromForMetadata || []),
-                ...(pastFromForMessage || []),
-            ];
-            pastFroms = [
-                ...(pastFromsForMetadata || []),
-                ...(pastFromsForMessage || []),
-            ];
+            const originalcontent = originalMessage.content;
+            const content = JSON.parse(originalcontent.toString());
+            pattern = content.pattern;
+            payload = context.switchToHttp().getRequest().payload;
         }
-        // const pastFrom = data.param.from ? JSON.parse(JSON.stringify(data.param.from)) : '-';
-        // const pastFroms = data.param.froms ? JSON.parse(JSON.stringify(data.param.froms)) : [pastFrom];
-        // const originalMessage = rmqContext.getMessage();
-        // const ctx = context.switchToHttp();
-        // const request = ctx.getRequest() as IRequest;
         const pastParam = JSON.parse(JSON.stringify(param));
+        const pastFrom = pastParam.from || '-';
+        const pastFroms = pastParam.froms || [pastFrom];
         const traceId = param ? param.traceId : '-';
         /** from 변경 */
         const tmpFrom = `${SERVER_NAME}: ${pattern}`;
         const tmpFroms = JSON.parse(JSON.stringify(pastFroms));
         tmpFroms.push(tmpFrom);
         if (isGrpc) {
-            metadata.set('from', JSON.stringify(tmpFrom));
-            metadata.set('froms', JSON.stringify(tmpFroms));
+            metadata.set('param', JSON.stringify({
+                ...pastParam,
+                from: tmpFrom,
+                froms: tmpFroms,
+            }));
         }
         else {
             data.param.from = tmpFrom;

package/package.json

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

package/util.d.ts

@@ -1 +1,3 @@
 export declare function generateRandom(length: number, charset?: string): string;
+/** host에서 port를 추출합니다. */
+export declare function getPortFromHost(host: string): number | undefined;

package/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateRandom = void 0;
+exports.getPortFromHost = exports.generateRandom = void 0;
 const randomstring_1 = require("randomstring");
 function generateRandom(length, charset) {
     return (0, randomstring_1.generate)({
@@ -9,3 +9,9 @@ function generateRandom(length, charset) {
     });
 }
 exports.generateRandom = generateRandom;
+/** host에서 port를 추출합니다. */
+function getPortFromHost(host) {
+    const port = host.split(':')[1];
+    return port ? parseInt(port, 10) : undefined;
+}
+exports.getPortFromHost = getPortFromHost;