@yolo-croket-dev/core 1.9.13 → 1.10.0-jun.0

package/filters/grpc-exception.filter.js

@@ -60,6 +60,7 @@ let GrpcExceptionFilter = class GrpcExceptionFilter extends microservices_1.Base
                 message: msaException.errMessage || exception.message,
                 status: httpStatus,
                 action: msaException.errAction,
+                errOption: msaException.errOption,
             };
             metadata.set('error', Buffer.from(JSON.stringify(errInfo)).toString('base64'));
             metadata.set('status', httpStatus.toString());

package/interfaces/msa-exception.d.ts

@@ -1,10 +1,6 @@
 import { HttpException } from '@nestjs/common';
 import { LogLevelEnum } from './log-level.enum';
 import type { ErrAction } from './exception';
-export declare enum MsaExceptionMessageAckBehaviorEnum {
-    ACK = "ACK",
-    NACK = "NACK"
-}
 export interface MsaExceptionOption {
     /**
      * 로그 레벨
@@ -12,12 +8,6 @@ export interface MsaExceptionOption {
      * - 기본값은 ERROR 입니다.
      * */
     logErrorLevel?: LogLevelEnum;
-    /**
-     * 메시지 consumer 실패 시 ACK/NACK override 옵션
-     * - 현재는 amqp-rabbit-mq subscribe consumer에서만 해석합니다.
-     * - option이 없으면 consumer handler의 기본 errorBehavior를 따릅니다.
-     */
-    messageAckBehavior?: MsaExceptionMessageAckBehaviorEnum;
 }
 /**
  * @author jun

package/interfaces/msa-exception.js

@@ -1,12 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMsaException = exports.MsaExceptionMessageAckBehaviorEnum = void 0;
+exports.isMsaException = void 0;
 const common_1 = require("@nestjs/common");
-var MsaExceptionMessageAckBehaviorEnum;
-(function (MsaExceptionMessageAckBehaviorEnum) {
-    MsaExceptionMessageAckBehaviorEnum["ACK"] = "ACK";
-    MsaExceptionMessageAckBehaviorEnum["NACK"] = "NACK";
-})(MsaExceptionMessageAckBehaviorEnum || (exports.MsaExceptionMessageAckBehaviorEnum = MsaExceptionMessageAckBehaviorEnum = {}));
 /**
  * @description MsaException 타입 가드
  * @param error 검사할 에러 객체

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

@@ -1,16 +1,10 @@
-import { ServerRMQ } from '@nestjs/microservices';
-import type { RmqOptions } from '@nestjs/microservices';
-import type { Channel } from 'amqp-connection-manager';
-import type { ConsumeMessage } from 'amqplib';
+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;
 };
-/**
- * @author jun
- * @description RabbitMQ 연결 식별 정보와 graceful shutdown을 제공하는 RMQ 서버
- * @process 연결 옵션에 추적 가능한 connection_name을 추가한 뒤 메시지 종료를 보장한다.
- */
 export declare class GracefulServerRMQ extends ServerRMQ {
     protected readonly options: GracefulRmqOptions;
     protected runningMessages: number;

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

@@ -1,67 +1,18 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GracefulServerRMQ = void 0;
 const microservices_1 = require("@nestjs/microservices");
-const os_1 = __importDefault(require("os"));
 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;
-const RMQ_UNKNOWN_CONNECTION_IDENTITY = 'unknown';
-function createRmqConnectionName(queue) {
-    const environment = process.env.ENV || process.env.NODE_ENV || RMQ_UNKNOWN_CONNECTION_IDENTITY;
-    const owner = process.env.RMQ_OWNER || process.env.USER || process.env.USERNAME || RMQ_UNKNOWN_CONNECTION_IDENTITY;
-    return [
-        queue || RMQ_UNKNOWN_CONNECTION_IDENTITY,
-        environment,
-        owner,
-        os_1.default.hostname(),
-        `pid-${process.pid}`,
-    ].join('/');
-}
-function addRmqConnectionName(options) {
-    var _a;
-    const connectionOptions = (_a = options.socketOptions) === null || _a === void 0 ? void 0 : _a.connectionOptions;
-    const configuredClientProperties = connectionOptions === null || connectionOptions === void 0 ? void 0 : connectionOptions.clientProperties;
-    const clientProperties = configuredClientProperties
-        && typeof configuredClientProperties === 'object'
-        && !Array.isArray(configuredClientProperties)
-        ? configuredClientProperties
-        : {};
-    const configuredConnectionName = clientProperties.connection_name;
-    const connectionName = typeof configuredConnectionName === 'string' && configuredConnectionName.trim()
-        ? configuredConnectionName
-        : createRmqConnectionName(options.queue);
-    return {
-        ...options,
-        socketOptions: {
-            ...options.socketOptions,
-            connectionOptions: {
-                ...connectionOptions,
-                clientProperties: {
-                    ...clientProperties,
-                    connection_name: connectionName,
-                },
-            },
-        },
-    };
-}
-/**
- * @author jun
- * @description RabbitMQ 연결 식별 정보와 graceful shutdown을 제공하는 RMQ 서버
- * @process 연결 옵션에 추적 가능한 connection_name을 추가한 뒤 메시지 종료를 보장한다.
- */
 class GracefulServerRMQ extends microservices_1.ServerRMQ {
     constructor(options) {
-        const optionsWithConnectionName = addRmqConnectionName(options);
-        super(optionsWithConnectionName);
+        super(options);
+        this.options = options;
         this.runningMessages = 0;
         this.closing = false;
         this.consumerTag = null;
-        this.options = optionsWithConnectionName;
         this.waitingEndingHandlersTimeoutMs = this.getOptionsProp(this.options, 'waitingEndingHandlersTimeoutMs')
             || RMQ_DEFAULT_WAITING_ENDING_HANDLERS_TIMEOUT_MS;
         this.waitingEndingHandlersIntervalMs = this.getOptionsProp(this.options, 'waitingEndingHandlersIntervalMs')

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.9.13",
+  "version": "1.10.0-jun.0",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src/**/*.ts",
-    "test": "yarn build && node --test tests/graceful-shutdown-rmq.test.cjs",
     "fix": "eslint --fix src/**/*.ts",
     "clean": "tsc --build --clean",
     "prepublishOnly": "npm run build",
@@ -16,7 +15,9 @@
   "license": "UNLICENSED",
   "peerDependencies": {
     "@nestjs/common": "^11.0.0",
+    "@nestjs/microservices": "^11.0.0",
     "@nestjs/swagger": "^11.0.0",
+    "@grpc/grpc-js": "^1.14.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
     "dd-trace": "^5.0.0"
@@ -32,7 +33,9 @@
   },
   "devDependencies": {
     "@nestjs/common": "^11.1.8",
+    "@nestjs/microservices": "^11.1.8",
     "@nestjs/swagger": "^11.2.1",
+    "@grpc/grpc-js": "^1.14.3",
     "@types/node": "^24.9.1",
     "@types/randomstring": "^1.1.8",
     "@types/uuid": "^8.3.4"

package/util.js

@@ -14,8 +14,10 @@ exports.generateRandom = generateRandom;
 // ex) localhost:50051 => 50051
 function getPortFromHost(host) {
     const specificHost = host.includes('://') ? host.split('://')[1] : host;
-    if (specificHost.includes(':' && specificHost.split(':')[1])) {
-        return parseInt(specificHost.split(':')[1], 10);
+    const port = specificHost.split(':')[1];
+    if (port) {
+        const parsedPort = parseInt(port, 10);
+        return Number.isNaN(parsedPort) ? undefined : parsedPort;
     }
     return undefined;
 }

package/CHANGELOG.md

@@ -1,7 +0,0 @@
-# Changelog
-
-## 1.9.12-beta.1
-
-- `GracefulServerRMQ`가 RabbitMQ 연결에 queue, environment, owner, hostname, process ID 기반 `connection_name`을 자동으로 추가합니다.
-- 호출자가 지정한 `connectionOptions`, `clientProperties`, 유효한 문자열 `connection_name`은 그대로 보존합니다.
-- 문자열이 아닌 `connection_name`은 런타임 오류 없이 자동 생성값으로 대체합니다.

package/tests/graceful-shutdown-rmq.test.cjs

@@ -1,102 +0,0 @@
-const assert = require('node:assert/strict');
-const os = require('node:os');
-const test = require('node:test');
-
-const {
-  GracefulServerRMQ,
-} = require('../modules/graceful-shutdown/graceful-shutdown.rmq.js');
-
-const CONNECTION_NAME_ENV_KEYS = [
-  'ENV',
-  'NODE_ENV',
-  'RMQ_OWNER',
-  'USER',
-  'USERNAME',
-];
-
-function getClientProperties(options) {
-  const server = new GracefulServerRMQ(options);
-  return server.options.socketOptions.connectionOptions.clientProperties;
-}
-
-function runWithEnvironment(environment, callback) {
-  const originalEnvironment = Object.fromEntries(
-    CONNECTION_NAME_ENV_KEYS.map((key) => [key, process.env[key]]),
-  );
-  try {
-    for (const key of CONNECTION_NAME_ENV_KEYS) {
-      delete process.env[key];
-    }
-    Object.assign(process.env, environment);
-    callback();
-  } finally {
-    for (const key of CONNECTION_NAME_ENV_KEYS) {
-      const originalValue = originalEnvironment[key];
-      if (originalValue === undefined) {
-        delete process.env[key];
-      } else {
-        process.env[key] = originalValue;
-      }
-    }
-  }
-}
-
-test('자동 connection_name에 큐와 실행 주체 정보를 포함한다', () => {
-  runWithEnvironment({ ENV: 'release', RMQ_OWNER: 'jun' }, () => {
-    const actualClientProperties = getClientProperties({ queue: 'STORE_ITEM_SERVER' });
-    const expectedConnectionName = `STORE_ITEM_SERVER/release/jun/${os.hostname()}/pid-${process.pid}`;
-    assert.equal(actualClientProperties.connection_name, expectedConnectionName);
-  });
-});
-
-test('기존 connectionOptions와 clientProperties를 보존한다', () => {
-  runWithEnvironment({ NODE_ENV: 'production', USER: 'deploy' }, () => {
-    const inputOptions = {
-      queue: 'USER_SERVICE',
-      socketOptions: {
-        noDelay: true,
-        connectionOptions: {
-          locale: 'ko_KR',
-          clientProperties: {
-            product: 'croket',
-          },
-        },
-      },
-    };
-    const server = new GracefulServerRMQ(inputOptions);
-    assert.equal(server.options.socketOptions.noDelay, true);
-    assert.equal(server.options.socketOptions.connectionOptions.locale, 'ko_KR');
-    assert.equal(server.options.socketOptions.connectionOptions.clientProperties.product, 'croket');
-  });
-});
-
-test('명시적으로 설정한 문자열 connection_name을 보존한다', () => {
-  const actualClientProperties = getClientProperties({
-    queue: 'USER_SERVICE',
-    socketOptions: {
-      connectionOptions: {
-        clientProperties: {
-          connection_name: 'custom-connection-name',
-        },
-      },
-    },
-  });
-  assert.equal(actualClientProperties.connection_name, 'custom-connection-name');
-});
-
-test('문자열이 아닌 connection_name은 자동 생성값으로 대체한다', () => {
-  runWithEnvironment({ ENV: 'release', RMQ_OWNER: 'jun' }, () => {
-    const actualClientProperties = getClientProperties({
-      queue: 'STORE_ITEM_SERVER',
-      socketOptions: {
-        connectionOptions: {
-          clientProperties: {
-            connection_name: 123,
-          },
-        },
-      },
-    });
-    const expectedConnectionName = `STORE_ITEM_SERVER/release/jun/${os.hostname()}/pid-${process.pid}`;
-    assert.equal(actualClientProperties.connection_name, expectedConnectionName);
-  });
-});