@gravity-ui/gateway 2.5.1 → 2.5.2

package/build/components/grpc.js

@@ -45,13 +45,7 @@ const parse_error_1 = require("../utils/parse-error");
 const proto_path_resolver_1 = require("../utils/proto-path-resolver");
 const redact_sensitive_headers_1 = require("../utils/redact-sensitive-headers");
 const validate_1 = require("../utils/validate");
-const reflectLoaderOptions = {
-    longs: String,
-    enums: String,
-    defaults: true,
-    oneofs: true,
-};
-const grpcLoaderOptions = Object.assign(Object.assign({}, reflectLoaderOptions), { includeDirs: [path_1.default.join(__dirname, '../../proto')] });
+const grpcLoaderOptions = Object.assign(Object.assign({}, constants_1.DEFAULT_PROTO_LOADER_OPTIONS), { includeDirs: [path_1.default.join(__dirname, '../../proto')] });
 function createRoot(includeGrpcPaths) {
     const root = new protobufjs.Root();
     root.loadSync(path_1.default.resolve(__dirname, '../../proto/google/rpc/code.proto'));
@@ -270,7 +264,7 @@ async function getServiceInstanceReflect(config, endpointData, grpcOptions, cred
         loadedRoot = await (0, grpc_reflection_1.getCachedReflectionRoot)(actionEndpoint, config.protoKey, creds, combinedGrpcOptions);
     }
     const descriptor = loadedRoot.toDescriptor('proto3');
-    const definition = protoLoader.loadFileDescriptorSetFromObject(descriptor, reflectLoaderOptions);
+    const definition = protoLoader.loadFileDescriptorSetFromObject(descriptor, constants_1.DEFAULT_PROTO_LOADER_OPTIONS);
     const packageObject = grpc.loadPackageDefinition(definition);
     const Service = lodash_1.default.get(packageObject, config.protoKey);
     const serviceInstance = new Service(actionEndpoint, creds, combinedGrpcOptions);

package/build/constants.d.ts

@@ -20,6 +20,12 @@ export declare const DEFAULT_GRPC_OPTIONS: {
     'grpc.keepalive_timeout_ms': number;
     'grpc.keepalive_permit_without_calls': number;
 };
+export declare const DEFAULT_PROTO_LOADER_OPTIONS: {
+    longs: StringConstructor;
+    enums: StringConstructor;
+    defaults: boolean;
+    oneofs: boolean;
+};
 /**
  * Byte sizes are taken from ECMAScript Language Specification
  * http://www.ecma-international.org/ecma-262/5.1/

package/build/constants.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AXIOS_RETRY_NAMESPACE = exports.DEFAULT_VALIDATION_SCHEMA = exports.RECREATE_SERVICE_CODES = exports.RETRYABLE_STATUS_CODES = exports.ANY_ACTION_SYMBOL = exports.ECMA_STRING_SIZE = exports.DEFAULT_GRPC_OPTIONS = exports.DEFAULT_AXIOS_OPTIONS = exports.DEFAULT_PROXY_HEADERS = exports.DEFAULT_LANG_HEADER = exports.DEFAULT_TIMEOUT = exports.Lang = exports.VERSION = void 0;
+exports.AXIOS_RETRY_NAMESPACE = exports.DEFAULT_VALIDATION_SCHEMA = exports.RECREATE_SERVICE_CODES = exports.RETRYABLE_STATUS_CODES = exports.ANY_ACTION_SYMBOL = exports.ECMA_STRING_SIZE = exports.DEFAULT_PROTO_LOADER_OPTIONS = exports.DEFAULT_GRPC_OPTIONS = exports.DEFAULT_AXIOS_OPTIONS = exports.DEFAULT_PROXY_HEADERS = exports.DEFAULT_LANG_HEADER = exports.DEFAULT_TIMEOUT = exports.Lang = exports.VERSION = void 0;
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
 const grpc = __importStar(require("@grpc/grpc-js"));
@@ -63,6 +63,12 @@ exports.DEFAULT_GRPC_OPTIONS = {
     'grpc.keepalive_timeout_ms': 1000,
     'grpc.keepalive_permit_without_calls': 1,
 };
+exports.DEFAULT_PROTO_LOADER_OPTIONS = {
+    longs: String,
+    enums: String,
+    defaults: true,
+    oneofs: true,
+};
 /**
  * Byte sizes are taken from ECMAScript Language Specification
  * http://www.ecma-international.org/ecma-262/5.1/

package/build/utils/grpc.js

@@ -13,7 +13,7 @@ function decodeAnyMessageRecursively(root, message) {
     }
     const typeName = message.type_url.substring(lastSlashIndex + 1);
     const type = root.lookupType(typeName);
-    const data = type.decode(message.value).toJSON();
+    const data = type.toObject(type.decode(message.value), constants_1.DEFAULT_PROTO_LOADER_OPTIONS);
     Object.keys(data).forEach((key) => {
         data[key] = decodeAnyMessageRecursively(root, data[key]);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/gateway",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "",
   "license": "MIT",
   "main": "build/index.js",