@gravity-ui/gateway 2.5.3 → 2.5.4

package/build/components/grpc.js

@@ -75,16 +75,10 @@ function decodeResponse(response, packageRoot, ctx, encodedFields = [], ErrorCon
     const systemFields = ['metadata', 'response', 'error.details'];
     [...systemFields, ...encodedFields].forEach((fieldName) => {
         try {
-            const traverseRegExp = /\.\*$/;
-            const needTraverse = traverseRegExp.test(fieldName);
-            const parsedFieldName = needTraverse
-                ? fieldName.replace(traverseRegExp, '')
-                : fieldName;
+            const parsedFieldName = fieldName.replace(/\.\*$/, '');
             const fieldValue = lodash_1.default.get(response, parsedFieldName);
             if (fieldValue) {
-                lodash_1.default.set(response, parsedFieldName, needTraverse
-                    ? (0, grpc_1.traverseAnyMessage)(packageRoot, fieldValue)
-                    : (0, grpc_1.decodeAnyMessageRecursively)(packageRoot, fieldValue));
+                lodash_1.default.set(response, parsedFieldName, (0, grpc_1.decodeAnyMessageRecursively)(packageRoot, fieldValue));
             }
         }
         catch (error) {

package/build/utils/grpc.d.ts

@@ -1,15 +1,5 @@
-/// <reference types="node" />
 import * as grpc from '@grpc/grpc-js';
 import * as protobufjs from 'protobufjs';
-export declare function decodeAnyMessageRecursively(root: protobufjs.Root, message?: {
-    type_url?: string;
-    value?: Buffer;
-}): {
-    type_url?: string | undefined;
-    value?: Buffer | undefined;
-} | {
-    [k: string]: any;
-} | undefined;
-export declare function traverseAnyMessage(root: protobufjs.Root, message?: any): any;
+export declare function decodeAnyMessageRecursively(root: protobufjs.Root, message?: unknown): unknown;
 export declare function isRetryableError(error?: grpc.ServiceError): boolean;
 export declare function isRecreateServiceError(error?: grpc.ServiceError): boolean;

package/build/utils/grpc.js

@@ -1,49 +1,34 @@
 "use strict";
 /* eslint-disable camelcase */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRecreateServiceError = exports.isRetryableError = exports.traverseAnyMessage = exports.decodeAnyMessageRecursively = void 0;
+exports.isRecreateServiceError = exports.isRetryableError = exports.decodeAnyMessageRecursively = void 0;
 const constants_1 = require("../constants");
+function isEncodedMessage(message) {
+    return Boolean(message.type_url && message.value);
+}
 function decodeAnyMessageRecursively(root, message) {
-    if (!message || !message.type_url || !message.value) {
+    if (!message || typeof message !== 'object') {
         return message;
     }
+    if (Array.isArray(message)) {
+        return message.map((innerMessage) => decodeAnyMessageRecursively(root, innerMessage));
+    }
+    if (typeof message === 'object' && !isEncodedMessage(message)) {
+        return Object.entries(message).reduce((res, [key, value]) => {
+            res[key] = decodeAnyMessageRecursively(root, value);
+            return res;
+        }, {});
+    }
     const lastSlashIndex = message.type_url.lastIndexOf('/');
     if (lastSlashIndex < 0) {
         return message;
     }
     const typeName = message.type_url.substring(lastSlashIndex + 1);
     const type = root.lookupType(typeName);
-    const data = type.toObject(type.decode(message.value), constants_1.DEFAULT_PROTO_LOADER_OPTIONS);
-    Object.keys(data).forEach((key) => {
-        if (Array.isArray(data[key])) {
-            data[key] = data[key].map((item) => decodeAnyMessageRecursively(root, item));
-        }
-        else {
-            data[key] = decodeAnyMessageRecursively(root, data[key]);
-        }
-    });
-    return data;
+    const decodedMessage = type.toObject(type.decode(message.value), constants_1.DEFAULT_PROTO_LOADER_OPTIONS);
+    return decodeAnyMessageRecursively(root, decodedMessage);
 }
 exports.decodeAnyMessageRecursively = decodeAnyMessageRecursively;
-function traverseAnyMessage(root, message) {
-    if (!message) {
-        return message;
-    }
-    if (Array.isArray(message)) {
-        return message.map((item) => {
-            return traverseAnyMessage(root, item);
-        });
-    }
-    if (typeof message === 'object') {
-        Object.keys(message).forEach((key) => {
-            if (message[key]) {
-                message[key] = traverseAnyMessage(root, message[key]);
-            }
-        });
-    }
-    return decodeAnyMessageRecursively(root, message);
-}
-exports.traverseAnyMessage = traverseAnyMessage;
 function isRetryableError(error) {
     if (!error) {
         return false;

package/package.json

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