@gravity-ui/gateway 3.1.2-alpha.0 → 3.1.4-alpha.0

package/build/components/grpc.js

@@ -71,14 +71,14 @@ function getCredentialsMap(caCertificatePath) {
     };
 }
 exports.getCredentialsMap = getCredentialsMap;
-function decodeResponse(response, packageRoot, ctx, encodedFields = [], ErrorConstructor) {
+function decodeResponse(response, packageRoot, ctx, encodedFields = [], ErrorConstructor, decodeAnyMessageProtoLoaderOptions) {
     const systemFields = ['metadata', 'response', 'error.details'];
     [...systemFields, ...encodedFields].forEach((fieldName) => {
         try {
             const parsedFieldName = fieldName.replace(/\.\*$/, '');
             const fieldValue = lodash_1.default.get(response, parsedFieldName);
             if (fieldValue) {
-                lodash_1.default.set(response, parsedFieldName, (0, grpc_1.decodeAnyMessageRecursively)(packageRoot, fieldValue));
+                lodash_1.default.set(response, parsedFieldName, (0, grpc_1.decodeAnyMessageRecursively)(packageRoot, fieldValue, decodeAnyMessageProtoLoaderOptions));
             }
         }
         catch (error) {
@@ -301,15 +301,15 @@ async function getServiceInstance(root, config, endpointData, grpcOptions, crede
     }
     return serviceInstance;
 }
-async function getResponseData({ config, response, ctx, packageRoot, args, ErrorConstructor, }) {
+async function getResponseData({ config, response, ctx, packageRoot, args, ErrorConstructor, decodeAnyMessageProtoLoaderOptions, }) {
     // Handle operation's runtime protocol buffers
     if (response) {
         const encodedFields = config.encodedFields;
         if (Array.isArray(response)) {
-            response.forEach((responseItem) => decodeResponse(responseItem, packageRoot, ctx, encodedFields, ErrorConstructor));
+            response.forEach((responseItem) => decodeResponse(responseItem, packageRoot, ctx, encodedFields, ErrorConstructor, decodeAnyMessageProtoLoaderOptions));
         }
         else if (typeof response === 'object') {
-            decodeResponse(response, packageRoot, ctx, encodedFields, ErrorConstructor);
+            decodeResponse(response, packageRoot, ctx, encodedFields, ErrorConstructor, decodeAnyMessageProtoLoaderOptions);
         }
     }
     let responseData = response;
@@ -526,7 +526,7 @@ function createGrpcAction({ root, credentials }, endpoints, config, serviceKey,
                         ctx.log('ServerStream error', {
                             debugHeaders: (0, common_2.sanitizeDebugHeaders)(debugHeaders),
                         });
-                        processError(new parse_error_1.GrpcError('ClientReadableStream error', (0, parse_error_1.parseGrpcError)(error, root, lang), error));
+                        processError(new parse_error_1.GrpcError('ClientReadableStream error', (0, parse_error_1.parseGrpcError)(error, root, lang, config.decodeAnyMessageProtoLoaderOptions), error));
                     });
                     stream.on('status', (status) => {
                         ctx.log('ServerStream status changed', status);
@@ -566,7 +566,7 @@ function createGrpcAction({ root, credentials }, endpoints, config, serviceKey,
                         ctx.log('BidiStream error', {
                             debugHeaders: (0, common_2.sanitizeDebugHeaders)(debugHeaders),
                         });
-                        processError(new parse_error_1.GrpcError('BidiStream error', (0, parse_error_1.parseGrpcError)(error, root, lang), error));
+                        processError(new parse_error_1.GrpcError('BidiStream error', (0, parse_error_1.parseGrpcError)(error, root, lang, config.decodeAnyMessageProtoLoaderOptions), error));
                     });
                     stream.on('status', (status) => {
                         ctx.log('BidiStream status changed', status);
@@ -618,7 +618,7 @@ function createGrpcAction({ root, credentials }, endpoints, config, serviceKey,
                                 return;
                             }
                             if (error) {
-                                reject(new parse_error_1.GrpcError('gRPC request error', (0, parse_error_1.parseGrpcError)(error, root, lang), error));
+                                reject(new parse_error_1.GrpcError('gRPC request error', (0, parse_error_1.parseGrpcError)(error, root, lang, config.decodeAnyMessageProtoLoaderOptions), error));
                                 return;
                             }
                             const responseData = await getResponseData({
@@ -628,6 +628,7 @@ function createGrpcAction({ root, credentials }, endpoints, config, serviceKey,
                                 args,
                                 packageRoot: root,
                                 ErrorConstructor,
+                                decodeAnyMessageProtoLoaderOptions: config.decodeAnyMessageProtoLoaderOptions,
                             });
                             const responseHeaders = {};
                             if (config.proxyResponseHeaders) {

package/build/constants.d.ts

@@ -23,7 +23,6 @@ export declare const DEFAULT_GRPC_OPTIONS: {
 export declare const DEFAULT_PROTO_LOADER_OPTIONS: {
     longs: StringConstructor;
     enums: StringConstructor;
-    bytes: StringConstructor;
     defaults: boolean;
     oneofs: boolean;
 };

package/build/constants.js

@@ -66,7 +66,6 @@ exports.DEFAULT_GRPC_OPTIONS = {
 exports.DEFAULT_PROTO_LOADER_OPTIONS = {
     longs: String,
     enums: String,
-    bytes: String,
     defaults: true,
     oneofs: true,
 };

package/build/models/common.d.ts

@@ -4,6 +4,7 @@ import { ClientDuplexStream, ClientReadableStream, ClientWritableStream } from '
 import { HandlerType } from '@grpc/grpc-js/build/src/server-call';
 import { AxiosInterceptorManager, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
 import type { Request, Response } from 'express';
+import * as protobufjs from 'protobufjs';
 import type { GrpcContext } from '../components/grpc';
 import { Lang } from '../constants';
 import { GatewayContext } from './context';
@@ -141,6 +142,7 @@ export interface ApiServiceBaseGrpcActionConfig<Context extends GatewayContext,
     secureWithoutRootCert?: boolean;
     encodedFields?: string[];
     type?: HandlerType;
+    decodeAnyMessageProtoLoaderOptions?: protobufjs.IConversionOptions;
 }
 export interface ApiServiceFileGrpcActionConfig<Context extends GatewayContext, TOutput, TParams, TTransformed> extends ApiServiceBaseGrpcActionConfig<Context, TOutput, TParams, TTransformed> {
     protoPath: string;

package/build/utils/grpc.d.ts

@@ -1,5 +1,5 @@
 import * as grpc from '@grpc/grpc-js';
 import * as protobufjs from 'protobufjs';
-export declare function decodeAnyMessageRecursively(root: protobufjs.Root, message?: unknown): unknown;
+export declare function decodeAnyMessageRecursively(root: protobufjs.Root, message?: unknown, decodeAnyMessageProtoLoaderOptions?: protobufjs.IConversionOptions): unknown;
 export declare function isRetryableError(error?: grpc.ServiceError): boolean;
 export declare function isRecreateServiceError(error?: grpc.ServiceError): boolean;

package/build/utils/grpc.js

@@ -6,16 +6,16 @@ const constants_1 = require("../constants");
 function isEncodedMessage(message) {
     return Boolean(message.type_url && message.value);
 }
-function decodeAnyMessageRecursively(root, message) {
+function decodeAnyMessageRecursively(root, message, decodeAnyMessageProtoLoaderOptions) {
     if (!message || typeof message !== 'object') {
         return message;
     }
     if (Array.isArray(message)) {
-        return message.map((innerMessage) => decodeAnyMessageRecursively(root, innerMessage));
+        return message.map((innerMessage) => decodeAnyMessageRecursively(root, innerMessage, decodeAnyMessageProtoLoaderOptions));
     }
     if (typeof message === 'object' && !isEncodedMessage(message)) {
         return Object.entries(message).reduce((res, [key, value]) => {
-            res[key] = decodeAnyMessageRecursively(root, value);
+            res[key] = decodeAnyMessageRecursively(root, value, decodeAnyMessageProtoLoaderOptions);
             return res;
         }, {});
     }
@@ -25,8 +25,8 @@ function decodeAnyMessageRecursively(root, message) {
     }
     const typeName = message.type_url.substring(lastSlashIndex + 1);
     const type = root.lookupType(typeName);
-    const decodedMessage = type.toObject(type.decode(message.value), constants_1.DEFAULT_PROTO_LOADER_OPTIONS);
-    return decodeAnyMessageRecursively(root, decodedMessage);
+    const decodedMessage = type.toObject(type.decode(message.value), Object.assign(Object.assign({}, constants_1.DEFAULT_PROTO_LOADER_OPTIONS), decodeAnyMessageProtoLoaderOptions));
+    return decodeAnyMessageRecursively(root, decodedMessage, decodeAnyMessageProtoLoaderOptions);
 }
 exports.decodeAnyMessageRecursively = decodeAnyMessageRecursively;
 function isRetryableError(error) {

package/build/utils/parse-error.d.ts

@@ -17,7 +17,7 @@ export declare function parseMixedError(e: Error & {
     };
 };
 export declare function parseRestError(error: any, lang?: string): GatewayError;
-export declare function parseGrpcError(error: grpc.ServiceError, packageRoot: protobufjs.Root, lang?: Lang): GatewayError;
+export declare function parseGrpcError(error: grpc.ServiceError, packageRoot: protobufjs.Root, lang?: Lang, decodeAnyMessageProtoLoaderOptions?: protobufjs.IConversionOptions): GatewayError;
 export declare class GrpcError extends Error {
     private parsedError;
     private rawError;

package/build/utils/parse-error.js

@@ -135,7 +135,7 @@ function parseRestError(error, lang) {
     };
 }
 exports.parseRestError = parseRestError;
-function decodeGrpcStatusMessage(metadata, packageRoot) {
+function decodeGrpcStatusMessage(metadata, packageRoot, decodeAnyMessageProtoLoaderOptions) {
     const statusMessageBin = metadata.get('grpc-status-details-bin')[0];
     if (!statusMessageBin) {
         return undefined;
@@ -143,9 +143,9 @@ function decodeGrpcStatusMessage(metadata, packageRoot) {
     return (0, grpc_1.decodeAnyMessageRecursively)(packageRoot, {
         type_url: 'type.googleapis.com/google.rpc.Status',
         value: statusMessageBin,
-    });
+    }, decodeAnyMessageProtoLoaderOptions);
 }
-function parseGrpcError(error, packageRoot, lang = constants_1.Lang.Ru) {
+function parseGrpcError(error, packageRoot, lang = constants_1.Lang.Ru, decodeAnyMessageProtoLoaderOptions) {
     let title = lang === constants_1.Lang.Ru ? 'Ошибка' : 'Error';
     if (error.code === 7) {
         // Always redefine title for Access denied errors
@@ -156,7 +156,7 @@ function parseGrpcError(error, packageRoot, lang = constants_1.Lang.Ru) {
     let details;
     if (error.metadata) {
         try {
-            const statusMessage = decodeGrpcStatusMessage(error.metadata, packageRoot);
+            const statusMessage = decodeGrpcStatusMessage(error.metadata, packageRoot, decodeAnyMessageProtoLoaderOptions);
             if (statusMessage) {
                 code = statusMessage.code;
                 description = statusMessage.message;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/gateway",
-  "version": "3.1.2-alpha.0",
+  "version": "3.1.4-alpha.0",
   "description": "",
   "license": "MIT",
   "main": "build/index.js",