@yolo-croket-dev/core 1.4.52-jun.9 → 1.4.53-slowquery.0

package/interceptors/logging-service.interceptor.js

@@ -68,7 +68,6 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         return data;
     }
     intercept(context, next) {
-        var _a;
         const now = Date.now();
         const args = context.getArgs();
         const rmq = args[1];
@@ -78,10 +77,6 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         // const now = Date.now();
         const content = JSON.parse(message.content.toString());
         const traceId = content.data.param ? content.data.param.traceId : '-';
-        const from = ((_a = content.data.param) === null || _a === void 0 ? void 0 : _a.from) || '-';
-        console.log('message.content', message.content);
-        if (content.data.param)
-            content.data.param.from = 'ㅋㅋㅋ';
         msaLogger.printInputInterceptorService({
             traceId,
             messageBrokerInfo: {
@@ -89,27 +84,16 @@ 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)(() => {
             const elapsed = Date.now() - now;
-            console.log('와이 출력안되니', content.pattern, from);
             msaLogger.printOutService({
                 traceId,
                 responseInfo: {
                     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({
@@ -120,13 +104,6 @@ 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({
@@ -135,13 +112,6 @@ 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.d.ts

@@ -1,9 +1,11 @@
 import { ExecutionContext, NestInterceptor, CallHandler } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { Observable } from 'rxjs';
+import { GracefulShutdownService } from '../services';
 export declare class RPCInterceptor implements NestInterceptor {
     private readonly reflector;
-    constructor(reflector: Reflector);
+    private readonly gracefulShutdownService;
+    constructor(reflector: Reflector, gracefulShutdownService: GracefulShutdownService);
     private maxLengthOverShorten;
     private updateMaxLengthArrayShorten;
     intercept(context: ExecutionContext, next: CallHandler): Promise<Observable<unknown>>;

package/interceptors/rpc.interceptor.js

@@ -18,11 +18,13 @@ const operators_1 = require("rxjs/operators");
 // import Logger from '@yolo-croket-dev/logger';
 const functions_1 = require("../functions");
 const exceptions_1 = require("../exceptions");
+const services_1 = require("../services");
 // const MAX_CUT_LENGTH = 500;
 const MAX_LENGTH = 300;
 let RPCInterceptor = class RPCInterceptor {
-    constructor(reflector) {
+    constructor(reflector, gracefulShutdownService) {
         this.reflector = reflector;
+        this.gracefulShutdownService = gracefulShutdownService;
     }
     maxLengthOverShorten(data) {
         if (typeof data !== 'string') {
@@ -165,6 +167,7 @@ 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 (reDeliveryCount <= (staticRetryCount - 1)) { /** 재시도 횟수가 있고, 재시도 횟수보다 적을 경우, 0부터 카운팅 되므로 -1 */
                     channel.nack(message, false, true);
@@ -231,6 +234,7 @@ let RPCInterceptor = class RPCInterceptor {
         else {
             // logger.debug(`=> (${traceId}): ${JSON.stringify(this.keyCutter(JSON.stringify(content)))}`);
         }
+        this.gracefulShutdownService.incActiveInterceptors();
         // eslint-disable-next-line consistent-return
         return next
             .handle()
@@ -253,11 +257,14 @@ let RPCInterceptor = class RPCInterceptor {
                 }
             },
             error: localErrorProcessor,
+        }), (0, operators_1.finalize)(() => {
+            this.gracefulShutdownService.decActiveInterceptors();
         }));
     }
 };
 exports.RPCInterceptor = RPCInterceptor;
 exports.RPCInterceptor = RPCInterceptor = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [core_1.Reflector])
+    __metadata("design:paramtypes", [core_1.Reflector,
+        services_1.GracefulShutdownService])
 ], RPCInterceptor);

package/interfaces/http.d.ts

@@ -31,8 +31,6 @@ 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.52-jun.9",
+  "version": "1.4.53-slowquery.0",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",
@@ -17,7 +17,6 @@
     "@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",

package/services/graceful-shutdown.service.d.ts

@@ -0,0 +1,7 @@
+import { OnApplicationShutdown } from '@nestjs/common';
+export declare class GracefulShutdownService implements OnApplicationShutdown {
+    private activeInterceptors;
+    incActiveInterceptors(): void;
+    decActiveInterceptors(): void;
+    onApplicationShutdown(signal?: string): Promise<void>;
+}

package/services/graceful-shutdown.service.js

@@ -0,0 +1,58 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GracefulShutdownService = void 0;
+const common_1 = require("@nestjs/common");
+const msa_logger_1 = __importStar(require("@yolo-croket-dev/msa-logger"));
+const msaLogger = new msa_logger_1.default(msa_logger_1.ServerTypeEnum.SERVICE);
+let GracefulShutdownService = class GracefulShutdownService {
+    constructor() {
+        this.activeInterceptors = 0;
+    }
+    incActiveInterceptors() {
+        this.activeInterceptors += 1;
+    }
+    decActiveInterceptors() {
+        this.activeInterceptors -= 1;
+    }
+    async onApplicationShutdown(signal) {
+        msaLogger.debug(`GracefulShutdownService.onApplicationShutdown: ${signal}`, { traceId: 'ON_APPLICATION_SHUTDOWN' });
+        while (this.activeInterceptors > 0) {
+            await new Promise((resolve) => {
+                setTimeout(resolve, 100);
+            });
+        }
+    }
+};
+exports.GracefulShutdownService = GracefulShutdownService;
+exports.GracefulShutdownService = GracefulShutdownService = __decorate([
+    (0, common_1.Injectable)()
+], GracefulShutdownService);

package/services/index.d.ts

@@ -0,0 +1 @@
+export * from './graceful-shutdown.service';

package/services/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./graceful-shutdown.service"), exports);