@yolo-croket-dev/core 1.4.53-slowquery.13 → 1.4.53-slowquery.3

package/interceptors/rpc.interceptor.js

@@ -134,7 +134,7 @@ let RPCInterceptor = class RPCInterceptor {
     //   return data;
     // }
     async intercept(context, next) {
-        var _a, _b;
+        var _a;
         const options = this.reflector.get('rpcInterceptorScope', context.getHandler());
         const args = context.getArgs();
         const arg = args[0];
@@ -146,25 +146,13 @@ let RPCInterceptor = class RPCInterceptor {
         // const traceId = content.data.param ? content.data.param.traceId : null;
         const isInternal = content.data.param ? content.data.param.isInternal : false;
         const isAdmin = content.data.param ? content.data.param.isAdmin : false;
+        // const method = content.pattern;
         const reDeliveryCount = Number(message.properties.headers['x-delivery-count']) || 0; /** 몇번 재전달되었는지 */
         const staticRetryCount = Number(options === null || options === void 0 ? void 0 : options.messageRetryCount) || 0; /** 최대 재시도 갯수 */
-        const method = content.pattern;
-        const correlationId = message.properties.correlationId;
-        const execInterceptor = {
-            method,
-            traceId: ((_a = content.data.param) === null || _a === void 0 ? void 0 : _a.traceId) || '-',
-            correlationId,
-        };
         // const logParam = {
         //   traceId,
         //   method,
         // };
-        /** consume 메시지 전부 cancel */
-        if (this.gracefulShutdownService.isApplicationExit) {
-            msaLogger.debug('RPCInterceptor isApplicationExit called', { traceId: 'IS_APPLICATION_EXIT' });
-            channel.cancel(message.fields.consumerTag);
-            return new rxjs_1.Observable();
-        }
         if (!staticRetryCount && reDeliveryCount > 0) {
             channel.sendToQueue(message.properties.replyTo, Buffer.from(JSON.stringify({
                 isError: true,
@@ -243,7 +231,7 @@ let RPCInterceptor = class RPCInterceptor {
         };
         localErrorProcessor = localErrorProcessor.bind(this);
         /** 파일 객체 처리 */
-        (0, functions_1.reWriteFileValue)((_b = content === null || content === void 0 ? void 0 : content.data) === null || _b === void 0 ? void 0 : _b.file);
+        (0, functions_1.reWriteFileValue)((_a = content === null || content === void 0 ? void 0 : content.data) === null || _a === void 0 ? void 0 : _a.file);
         if (options) {
             if (options.maxLengthKeys && options.maxLengthKeys.length) {
                 for (const key of options.maxLengthKeys) {
@@ -272,12 +260,12 @@ let RPCInterceptor = class RPCInterceptor {
         else {
             // logger.debug(`=> (${traceId}): ${JSON.stringify(this.keyCutter(JSON.stringify(content)))}`);
         }
-        this.gracefulShutdownService.pushActiveInterceptors(execInterceptor);
+        msaLogger.debug('RPCInterceptor IncActiveInterceptors called', { traceId: 'INC_RPC_ACTIVE_INTERCEPTORS' });
+        this.gracefulShutdownService.incActiveInterceptors();
         // eslint-disable-next-line consistent-return
         return next
             .handle()
-            .pipe((0, operators_1.timeout)(1000 * 60 * 30), // 30분 타임아웃
-        (0, operators_1.tap)({
+            .pipe((0, operators_1.tap)({
             next: async (val) => {
                 val.isError = false;
                 // const duration = Date.now() - now;
@@ -297,7 +285,8 @@ let RPCInterceptor = class RPCInterceptor {
             },
             error: localErrorProcessor,
         }), (0, operators_1.finalize)(() => {
-            this.gracefulShutdownService.popActiveInterceptors(execInterceptor);
+            msaLogger.debug('RPCInterceptor DecActiveInterceptors called', { traceId: 'DEC_RPC_ACTIVE_INTERCEPTORS' });
+            this.gracefulShutdownService.decActiveInterceptors();
         }));
     }
 };

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

@@ -13,7 +13,6 @@ let GracefulShutdownModule = class GracefulShutdownModule {
 };
 exports.GracefulShutdownModule = GracefulShutdownModule;
 exports.GracefulShutdownModule = GracefulShutdownModule = __decorate([
-    (0, common_1.Global)(),
     (0, common_1.Module)({
         providers: [graceful_shutdown_service_1.GracefulShutdownService],
         exports: [graceful_shutdown_service_1.GracefulShutdownService],

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

@@ -1,16 +1,8 @@
-import { OnApplicationShutdown, OnModuleDestroy, OnApplicationBootstrap } from '@nestjs/common';
-interface GracefulExecInterceptor {
-    method: string;
-    traceId?: string;
-    correlationId: string;
-}
-export declare class GracefulShutdownService implements OnApplicationShutdown, OnModuleDestroy, OnApplicationBootstrap {
+import { OnApplicationShutdown, OnModuleDestroy } from '@nestjs/common';
+export declare class GracefulShutdownService implements OnApplicationShutdown, OnModuleDestroy {
     private activeInterceptors;
-    isApplicationExit: boolean;
-    onApplicationBootstrap(): void;
-    pushActiveInterceptors(execInterceptor: GracefulExecInterceptor): void;
-    popActiveInterceptors(execInterceptor: GracefulExecInterceptor): void;
+    incActiveInterceptors(): void;
+    decActiveInterceptors(): void;
     onApplicationShutdown(signal?: string): Promise<void>;
     onModuleDestroy(): Promise<void>;
 }
-export {};

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

@@ -35,42 +35,33 @@ 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 = [];
-        this.isApplicationExit = false;
+        this.activeInterceptors = 0;
     }
-    onApplicationBootstrap() {
-        this.activeInterceptors = [];
+    incActiveInterceptors() {
+        this.activeInterceptors += 1;
+        msaLogger.debug(`GracefulShutdownService.incActiveInterceptors: ${this.activeInterceptors}`, { traceId: 'INC_ACTIVE_INTERCEPTORS' });
     }
-    pushActiveInterceptors(execInterceptor) {
-        this.activeInterceptors.push(execInterceptor);
-    }
-    popActiveInterceptors(execInterceptor) {
-        // eslint-disable-next-line max-len
-        this.activeInterceptors = this.activeInterceptors.filter((item) => !(item.method === execInterceptor.method && item.traceId === execInterceptor.traceId && item.correlationId === execInterceptor.correlationId));
+    decActiveInterceptors() {
+        this.activeInterceptors -= 1;
+        msaLogger.debug(`GracefulShutdownService.decActiveInterceptors: ${this.activeInterceptors}`, { traceId: 'DEC_ACTIVE_INTERCEPTORS' });
     }
     async onApplicationShutdown(signal) {
-        console.debug(`GracefulShutdownService.onApplicationShutdown signal=${signal}`, { traceId: 'ON_APPLICATION_SHUTDOWN' });
-        msaLogger.debug(`GracefulShutdownService.onApplicationShutdown signal=${signal}`, { traceId: 'ON_APPLICATION_SHUTDOWN' });
-        process.exit(0);
+        msaLogger.debug(`GracefulShutdownService.onApplicationShutdown: ${signal}`, { traceId: 'ON_APPLICATION_SHUTDOWN' });
+        while (this.activeInterceptors > 0) {
+            // eslint-disable-next-line max-len
+            msaLogger.debug(`GracefulShutdownService.onApplicationShutdown: waiting for ${this.activeInterceptors} interceptors to finish`, { traceId: 'ON_APPLICATION_SHUTDOWN' });
+            await new Promise((resolve) => {
+                setTimeout(resolve, 100);
+            });
+        }
     }
     async onModuleDestroy() {
-        this.isApplicationExit = true;
         msaLogger.debug('GracefulShutdownService.onModuleDestroy', { traceId: 'ON_MODULE_DESTROY' });
-        // eslint-disable-next-line max-len
-        msaLogger.debug('GracefulShutdownService.onModuleDestroy activeInterceptors', { traceId: 'ON_MODULE_DESTROY' }, { activeInterceptors: this.activeInterceptors });
-        // eslint-disable-next-line max-len
-        console.debug('GracefulShutdownService.onModuleDestroy activeInterceptors', { traceId: 'ON_MODULE_DESTROY' }, { activeInterceptors: this.activeInterceptors });
-        let prevExecInterceptorCount = 0;
-        while (this.activeInterceptors.length) {
-            if (prevExecInterceptorCount !== this.activeInterceptors.length) {
-                prevExecInterceptorCount = this.activeInterceptors.length;
-                // eslint-disable-next-line max-len
-                console.log('GracefulShutdownService.onModuleDestroy: waiting for interceptors to finish', { traceId: 'ON_MODULE_DESTROY' }, { activeInterceptors: this.activeInterceptors });
-                // eslint-disable-next-line max-len
-                msaLogger.debug('GracefulShutdownService.onModuleDestroy: waiting for interceptors to finish', { traceId: 'ON_MODULE_DESTROY' }, { activeInterceptors: this.activeInterceptors });
-            }
+        while (this.activeInterceptors > 0) {
+            // eslint-disable-next-line max-len
+            msaLogger.debug(`GracefulShutdownService.onModuleDestroy: waiting for ${this.activeInterceptors} interceptors to finish`, { traceId: 'ON_MODULE_DESTROY' });
             await new Promise((resolve) => {
-                setTimeout(resolve, 1000);
+                setTimeout(resolve, 100);
             });
         }
     }

package/package.json

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

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

@@ -1,20 +0,0 @@
-import { RmqOptions, ServerRMQ } from '@nestjs/microservices';
-import { Channel } from 'amqp-connection-manager';
-import { ConsumeMessage } from 'amqplib';
-export type GracefulRmqOptions = RmqOptions['options'] & {
-    waitingEndingHandlersTimeoutMs?: number;
-    waitingEndingHandlersIntervalMs?: number;
-};
-export declare class GracefulServerRMQ extends ServerRMQ {
-    protected readonly options: GracefulRmqOptions;
-    protected runningMessages: number;
-    protected closing: boolean;
-    protected consumerTag: string | null;
-    protected readonly waitingEndingHandlersTimeoutMs: number;
-    protected readonly waitingEndingHandlersIntervalMs: number;
-    constructor(options: GracefulRmqOptions);
-    setupChannel(channel: Channel, callback: () => void): Promise<void>;
-    protected waitingHandlers(): Promise<void>;
-    handleMessage(message: ConsumeMessage, channel: Channel): Promise<void>;
-    close(): Promise<void>;
-}

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

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GracefulServerRMQ = void 0;
-const microservices_1 = require("@nestjs/microservices");
-const node_util_1 = require("node:util");
-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;
-class GracefulServerRMQ extends microservices_1.ServerRMQ {
-    constructor(options) {
-        super(options);
-        this.options = options;
-        this.runningMessages = 0;
-        this.closing = false;
-        this.consumerTag = null;
-        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;
-    }
-    async setupChannel(channel, callback) {
-        if (this.closing) {
-            return;
-        }
-        if (!this.queueOptions.noAssert) {
-            await channel.assertQueue(this.queue, this.queueOptions);
-        }
-        await channel.prefetch(this.prefetchCount, this.isGlobalPrefetchCount);
-        const { consumerTag } = await channel.consume(this.queue, (msg) => this.handleMessage(msg, channel), { noAck: false });
-        this.consumerTag = consumerTag;
-        callback();
-    }
-    async waitingHandlers() {
-        while (this.runningMessages > 0) {
-            await sleep(this.waitingEndingHandlersIntervalMs);
-        }
-    }
-    async handleMessage(message, channel) {
-        this.runningMessages += 1;
-        return super.handleMessage(message, channel).finally(() => {
-            this.runningMessages -= 1;
-        });
-    }
-    async close() {
-        this.closing = true;
-        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;
-        super.close();
-    }
-}
-exports.GracefulServerRMQ = GracefulServerRMQ;