npm - @yolo-croket-dev/core - Versions diffs - 1.9.7-slowquery.5 → 1.9.7-slowquery.8 - Mend

@yolo-croket-dev/core 1.9.7-slowquery.5 → 1.9.7-slowquery.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/filters/grpc-exception.filter.d.ts +11 -0
package/filters/grpc-exception.filter.js +136 -0
package/filters/index.d.ts +1 -0
package/filters/index.js +17 -0
package/interceptors/logging-service.interceptor.js +36 -6
package/package.json +1 -1

package/filters/grpc-exception.filter.d.ts ADDED Viewed

@@ -0,0 +1,11 @@
+import { ArgumentsHost, ExceptionFilter } from '@nestjs/common';
+import { BaseRpcExceptionFilter } from '@nestjs/microservices';
+import { Observable } from 'rxjs';
+export declare class GrpcExceptionFilter extends BaseRpcExceptionFilter implements ExceptionFilter {
+    private readonly CROKET_EXCEPTION_NAMES;
+    catch(exception: unknown, host: ArgumentsHost): Observable<unknown>;
+    /**
+      * HTTP Status 코드를 gRPC Status 코드로 변환
+      */
+    private convertHttpStatusToGrpcStatus;
+}

package/filters/grpc-exception.filter.js ADDED Viewed

@@ -0,0 +1,136 @@
+"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.GrpcExceptionFilter = void 0;
+const common_1 = require("@nestjs/common");
+const microservices_1 = require("@nestjs/microservices");
+const grpc_js_1 = require("@grpc/grpc-js");
+const CroketExceptions = __importStar(require("@yolo-croket-dev/core/exceptions"));
+/**
+ * CroketExceptions에서 export된 모든 클래스의 constructor 배열 생성
+ */
+const getCroketExceptionClasses = () => Object.values(CroketExceptions).filter((value) => typeof value === 'function' && value.prototype && value.prototype.constructor === value);
+const croketExceptionClasses = getCroketExceptionClasses();
+let GrpcExceptionFilter = class GrpcExceptionFilter extends microservices_1.BaseRpcExceptionFilter {
+    constructor() {
+        super(...arguments);
+        this.CROKET_EXCEPTION_NAMES = croketExceptionClasses.map(d => d.prototype.constructor.name);
+    }
+    catch(exception, host) {
+        var _a;
+        const metadata = new grpc_js_1.Metadata();
+        let grpcStatus;
+        let errorMessage;
+        const className = ((_a = exception === null || exception === void 0 ? void 0 : exception.constructor) === null || _a === void 0 ? void 0 : _a.name) || 'Error';
+        if (this.CROKET_EXCEPTION_NAMES.includes(className)) {
+            const msaException = exception;
+            const httpStatus = exception.getStatus();
+            const errInfo = {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                errType: exception.errType,
+                type: className || exception.constructor.name,
+                message: msaException.errMessage || exception.message,
+                status: httpStatus,
+                action: msaException.errAction,
+            };
+            metadata.set('error', Buffer.from(JSON.stringify(errInfo)).toString('base64'));
+            metadata.set('status', httpStatus.toString());
+            grpcStatus = this.convertHttpStatusToGrpcStatus(httpStatus);
+            errorMessage = msaException.errMessage || exception.message;
+        }
+        else if (exception instanceof microservices_1.RpcException) {
+            const rpcError = exception.getError();
+            grpcStatus = rpcError.code || grpc_js_1.status.INTERNAL;
+            errorMessage = rpcError.message || 'Internal Server Error';
+            if (rpcError.metadata) {
+                const errorMetadata = rpcError.metadata;
+                const keys = errorMetadata.getMap();
+                Object.keys(keys).forEach((key) => {
+                    const value = errorMetadata.get(key);
+                    if (Array.isArray(value)) {
+                        value.forEach((v) => metadata.add(key, v));
+                    }
+                    else {
+                        metadata.set(key, value);
+                    }
+                });
+            }
+        }
+        else {
+            errorMessage = (exception === null || exception === void 0 ? void 0 : exception.message) || 'Internal Server Error';
+            grpcStatus = grpc_js_1.status.INTERNAL;
+        }
+        // BaseRpcExceptionFilter의 catch 메서드를 사용하여 metadata를 포함한 RpcException 생성
+        const rpcException = new microservices_1.RpcException({
+            code: grpcStatus,
+            message: errorMessage,
+            metadata,
+        });
+        return super.catch(rpcException, host);
+    }
+    /**
+      * HTTP Status 코드를 gRPC Status 코드로 변환
+      */
+    convertHttpStatusToGrpcStatus(httpStatus) {
+        switch (httpStatus) {
+            case 200:
+                return grpc_js_1.status.OK;
+            case 400:
+                return grpc_js_1.status.INVALID_ARGUMENT;
+            case 401:
+                return grpc_js_1.status.UNAUTHENTICATED;
+            case 403:
+                return grpc_js_1.status.PERMISSION_DENIED;
+            case 404:
+                return grpc_js_1.status.NOT_FOUND;
+            case 409:
+                return grpc_js_1.status.ALREADY_EXISTS;
+            case 412:
+                return grpc_js_1.status.FAILED_PRECONDITION;
+            case 429:
+                return grpc_js_1.status.RESOURCE_EXHAUSTED;
+            case 500:
+                return grpc_js_1.status.INTERNAL;
+            case 501:
+                return grpc_js_1.status.UNIMPLEMENTED;
+            case 503:
+                return grpc_js_1.status.UNAVAILABLE;
+            case 504:
+                return grpc_js_1.status.DEADLINE_EXCEEDED;
+            default:
+                return grpc_js_1.status.INTERNAL;
+        }
+    }
+};
+exports.GrpcExceptionFilter = GrpcExceptionFilter;
+exports.GrpcExceptionFilter = GrpcExceptionFilter = __decorate([
+    (0, common_1.Catch)()
+], GrpcExceptionFilter);

package/filters/index.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export * from './grpc-exception.filter';

package/filters/index.js ADDED Viewed

@@ -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("./grpc-exception.filter"), exports);

package/interceptors/logging-service.interceptor.js CHANGED Viewed

@@ -94,25 +94,55 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         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: { from: '-', froms: '-' } };
-            pastFrom = metadata.get('from') || '-';
-            pastFroms = metadata.get('froms') || [pastFrom];
+            param = metadata.get('param') || {
+                param: {
+                    from: '-',
+                    froms: '-',
+                },
+            };
+            pastFromForMetadata = metadata.get('from') || '-';
+            pastFromsForMetadata = metadata.get('froms') || [pastFrom];
             originalMessage = args[0];
-            let gRPCArg = args[2];
+            const gRPCArg = args[2];
             pattern = gRPCArg.path;
             payload = data;
         }
         else {
             param = data.param;
-            pastFrom = param.from ? JSON.parse(JSON.stringify(param.from)) : '-';
-            pastFroms = param.froms ? JSON.parse(JSON.stringify(param.froms)) : [pastFrom];
+            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 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();

package/package.json CHANGED Viewed

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