@yolo-croket-dev/core 1.9.13-beta.1 → 1.9.13

package/CHANGELOG.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## 1.9.13-beta.1
-
-- AMQP 요청의 `param.timeout`을 최대 29분 범위에서 적용해 timeout 시 클라이언트 Observable 구독을 해제합니다.
-
 ## 1.9.12-beta.1
 
 - `GracefulServerRMQ`가 RabbitMQ 연결에 queue, environment, owner, hostname, process ID 기반 `connection_name`을 자동으로 추가합니다.

package/functions/amqp-handler.function.js

@@ -17,18 +17,11 @@ class HttpExceptionCustom extends common_1.HttpException {
     }
 }
 exports.HttpExceptionCustom = HttpExceptionCustom;
-function resolveAmqpTimeout(timeoutMs) {
-    if (typeof timeoutMs !== 'number' || !Number.isFinite(timeoutMs) || timeoutMs <= 0) {
-        return DEFAULT_TIMEOUT;
-    }
-    return Math.min(timeoutMs, DEFAULT_TIMEOUT);
-}
 async function AmqpHandler(client, messagePattern, payload) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     let data;
-    const timeoutMs = resolveAmqpTimeout((_a = payload === null || payload === void 0 ? void 0 : payload.param) === null || _a === void 0 ? void 0 : _a.timeout);
     try {
-        data = await (0, rxjs_1.lastValueFrom)(client.send(messagePattern, payload).pipe((0, operators_1.timeout)(timeoutMs)));
+        data = await (0, rxjs_1.lastValueFrom)(client.send(messagePattern, payload).pipe((0, operators_1.timeout)(DEFAULT_TIMEOUT)));
         if (data.isError) {
             const status = data.status || 500;
             const subMessage = data.subMessage;
@@ -36,7 +29,7 @@ async function AmqpHandler(client, messagePattern, payload) {
              * 파일 객체 처리
              * 다른 서비스에서 이미 처리가 될 수 있음
              * */
-            (0, _1.reWriteFileValue)((_b = data === null || data === void 0 ? void 0 : data.arg) === null || _b === void 0 ? void 0 : _b.file);
+            (0, _1.reWriteFileValue)((_a = data === null || data === void 0 ? void 0 : data.arg) === null || _a === void 0 ? void 0 : _a.file);
             const errInfo = data.errInfo ? data.errInfo : {
                 message: data.errMessage,
                 type: data.errType,
@@ -57,7 +50,7 @@ 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: ((_c = payload === null || payload === void 0 ? void 0 : payload.param) === null || _c === void 0 ? void 0 : _c.traceId) || '-',
+                traceId: ((_b = payload === null || payload === void 0 ? void 0 : payload.param) === null || _b === void 0 ? void 0 : _b.traceId) || '-',
                 errInfo: {
                     errType: 'NOT_EXISTS_MESSAGE_PATTERN',
                     message: `${messagePattern} 해당 메시지 패턴은 존재하지 않습니다.`,
@@ -71,7 +64,7 @@ async function AmqpHandler(client, messagePattern, payload) {
         }
         else if (err instanceof rxjs_1.TimeoutError || err.message === DEFAULT_TIMEOUT_MESSAGE) {
             msaLogger.error('TIMEOUT_ERROR', {
-                traceId: ((_d = payload === null || payload === void 0 ? void 0 : payload.param) === null || _d === void 0 ? void 0 : _d.traceId) || '-',
+                traceId: ((_c = payload === null || payload === void 0 ? void 0 : payload.param) === null || _c === void 0 ? void 0 : _c.traceId) || '-',
                 errInfo: {
                     errType: 'TIMEOUT_ERROR',
                     message: DEFAULT_TIMEOUT_MESSAGE,
@@ -84,7 +77,7 @@ async function AmqpHandler(client, messagePattern, payload) {
             });
         }
         else {
-            msaLogger.warn('AMQP_HANDLER_ERROR', { traceId: ((_e = payload === null || payload === void 0 ? void 0 : payload.param) === null || _e === void 0 ? void 0 : _e.traceId) || '-' }, { err });
+            msaLogger.warn('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/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.9.13-beta.1",
+  "version": "1.9.13",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src/**/*.ts",
-    "test": "yarn build && node --test tests/*.test.cjs",
+    "test": "yarn build && node --test tests/graceful-shutdown-rmq.test.cjs",
     "fix": "eslint --fix src/**/*.ts",
     "clean": "tsc --build --clean",
     "prepublishOnly": "npm run build",

package/tests/amqp-handler-timeout.test.cjs

@@ -1,47 +0,0 @@
-const assert = require('node:assert/strict');
-const test = require('node:test');
-const { Observable } = require('rxjs');
-
-const { AmqpHandler, HttpExceptionCustom } = require('../functions/amqp-handler.function.js');
-
-test('param.timeout이 지나면 AMQP Observable 구독을 해제한다', async () => {
-  let isUnsubscribed = false;
-  const client = {
-    send() {
-      return new Observable(() => () => {
-        isUnsubscribed = true;
-      });
-    },
-  };
-
-  await assert.rejects(
-    AmqpHandler(client, 'test.timeout', {
-      payload: {},
-      param: {
-        traceId: 'trace-id',
-        timeout: 5,
-      },
-    }),
-    (error) => {
-      assert.equal(error instanceof HttpExceptionCustom, true);
-      assert.equal(error.errInfo.type, 'TIMEOUT_ERROR');
-      return true;
-    },
-  );
-
-  assert.equal(isUnsubscribed, true);
-});
-
-test('응답이 먼저 완료되면 기존 AMQP 응답을 반환한다', async () => {
-  const client = {
-    send() {
-      return new Observable((subscriber) => {
-        subscriber.next({ isError: false, data: { ok: true } });
-        subscriber.complete();
-      });
-    },
-  };
-
-  const result = await AmqpHandler(client, 'test.success', { payload: {}, param: { traceId: 'trace-id', timeout: 50 } });
-  assert.deepEqual(result, { data: { ok: true } });
-});