@gravity-ui/gateway 4.12.0 → 4.12.1

package/build/components/grpc.js

@@ -549,6 +549,10 @@ function createGrpcAction({ root, credentials }, endpoints, config, serviceKey,
             const timeout = (_c = (_b = (_a = actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.timeout) !== null && _a !== void 0 ? _a : config === null || config === void 0 ? void 0 : config.timeout) !== null && _b !== void 0 ? _b : options === null || options === void 0 ? void 0 : options.timeout) !== null && _c !== void 0 ? _c : constants_1.DEFAULT_TIMEOUT;
             let serviceOptions = createServiceOptions(timeout);
             const { body = null } = params !== null && params !== void 0 ? params : { body: args };
+            // protobufjs >=7.5.5 rejects null/undefined request payloads with
+            // ".<Type>: object expected" (any message with fields; >=8.x even for
+            // empty messages). An empty request body must be sent as {}.
+            const requestBody = body !== null && body !== void 0 ? body : {};
             const serviceMetadata = createMetadata({
                 options,
                 actionConfig,
@@ -573,7 +577,7 @@ function createGrpcAction({ root, credentials }, endpoints, config, serviceKey,
                         debugHeaders: (0, common_2.sanitizeDebugHeaders)(debugHeaders),
                     });
                     const actionCall = service[action].bind(service);
-                    const stream = actionCall(body, serviceMetadata, serviceOptions);
+                    const stream = actionCall(requestBody, serviceMetadata, serviceOptions);
                     stopListeningForAbort = (0, grpc_1.listenForAbort)({
                         signal: abortSignal,
                         config,
@@ -666,7 +670,7 @@ function createGrpcAction({ root, credentials }, endpoints, config, serviceKey,
                     let actionCall = service[action].bind(service);
                     const callAction = () => {
                         let trailingMetadata = {};
-                        const call = actionCall(body, serviceMetadata, serviceOptions, async (error, response) => {
+                        const call = actionCall(requestBody, serviceMetadata, serviceOptions, async (error, response) => {
                             var _a, _b;
                             const endRequestTime = Date.now();
                             requestData.requestTime = endRequestTime - startRequestTime;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/gateway",
-  "version": "4.12.0",
+  "version": "4.12.1",
   "description": "",
   "license": "MIT",
   "main": "build/index.js",
@@ -46,7 +46,7 @@
     "axios-retry": "^3.9.1",
     "lodash": "^4.17.21",
     "object-sizeof": "^2.6.5",
-    "protobufjs": "^7.2.5",
+    "protobufjs": "^7.6.4",
     "uuid": "^9.0.0"
   },
   "devDependencies": {

package/patches/protobufjs+7.6.4.patch

@@ -0,0 +1,182 @@
+diff --git a/node_modules/protobufjs/Oops.rej b/node_modules/protobufjs/Oops.rej
+new file mode 100644
+index 0000000..2dd05fc
+--- /dev/null
++++ b/node_modules/protobufjs/Oops.rej
+@@ -0,0 +1,78 @@
++@@ -242,31 +242,12 @@
++     if (!nested)
++         type._edition = edition;
++ 
++-    // gateway patch: record key/value types of map-entry nested types so that
++-    // map fields restored from a descriptor (reflection) become real MapFields.
++-    var mapTypes = {};
++-    if (descriptor.nestedType)
++-        for (i = 0; i < descriptor.nestedType.length; ++i)
++-            if (descriptor.nestedType[i].options && descriptor.nestedType[i].options.mapEntry && descriptor.nestedType[i].field.length === 2)
++-                mapTypes[descriptor.nestedType[i].name] = [
++-                    fromDescriptorType(descriptor.nestedType[i].field[0].type),
++-                    descriptor.nestedType[i].field[1].typeName ? descriptor.nestedType[i].field[1].typeName : fromDescriptorType(descriptor.nestedType[i].field[1].type)
++-                ];
++-
++     /* Oneofs */ if (descriptor.oneofDecl)
++         for (i = 0; i < descriptor.oneofDecl.length; ++i)
++             type.add(OneOf.fromDescriptor(descriptor.oneofDecl[i]));
++     /* Fields */ if (descriptor.field)
++         for (i = 0; i < descriptor.field.length; ++i) {
++-            var fieldTypeName = descriptor.field[i].typeName;
++-            var mapKv = fieldTypeName ? mapTypes[fieldTypeName] : undefined;
++-            if (fieldTypeName && !mapKv) {
++-                // after reflection the typeName may be just the short name
++-                var nameParts = fieldTypeName.split("." + type.name + ".");
++-                if (nameParts.length === 2)
++-                    mapKv = mapTypes[nameParts[1]];
++-            }
++-            var field = Field.fromDescriptor(descriptor.field[i], edition, true, mapKv);
+++            var field = Field.fromDescriptor(descriptor.field[i], edition, true);
++             type.add(field);
++             if (descriptor.field[i].hasOwnProperty("oneofIndex")) // eslint-disable-line no-prototype-builtins
++                 type.oneofsArray[descriptor.field[i].oneofIndex].add(field);
++@@ -276,10 +257,9 @@
++             type.add(Field.fromDescriptor(descriptor.extension[i], edition, true));
++     /* Nested types */ if (descriptor.nestedType)
++         for (i = 0; i < descriptor.nestedType.length; ++i) {
++-            // map-entry types are reconstructed as MapFields above (gateway patch)
++-            if (descriptor.nestedType[i].options && descriptor.nestedType[i].options.mapEntry && descriptor.nestedType[i].field.length === 2)
++-                continue;
++             type.add(Type.fromDescriptor(descriptor.nestedType[i], edition, true, depth + 1));
+++            if (descriptor.nestedType[i].options && descriptor.nestedType[i].options.mapEntry)
+++                type.setOption("map_entry", true);
++         }
++     /* Nested enums */ if (descriptor.enumType)
++         for (i = 0; i < descriptor.enumType.length; ++i)
++@@ -430,10 +410,9 @@
++  * @param {IFieldDescriptorProto|Reader|Uint8Array} descriptor Descriptor
++  * @param {string} [edition="proto2"] The syntax or edition to use
++  * @param {boolean} [nested=false] Whether or not this is a top-level object
++- * @param {string[]} [mapKv] Key & value types for a map field (gateway patch)
++- * @returns {Field|MapField} Field instance
+++ * @returns {Field} Field instance
++  */
++-Field.fromDescriptor = function fromDescriptor(descriptor, edition, nested, mapKv) {
+++Field.fromDescriptor = function fromDescriptor(descriptor, edition, nested) {
++ 
++     // Decode the descriptor message if specified as a buffer:
++     if (typeof descriptor.length === "number")
++@@ -468,16 +447,8 @@
++             throw Error("illegal type name: " + extendee);
++     } else
++         extendee = undefined;
++-    // gateway patch: protobufjs expects camelCased field names, while descriptors
++-    // (reflection) carry the original proto names; build a MapField for map fields.
++-    var fieldName = $protobuf.util.camelCase(descriptor.name.length ? descriptor.name : "field" + descriptor.number);
++-    var field = mapKv ? new MapField(
++-        fieldName,
++-        descriptor.number,
++-        mapKv[0],
++-        mapKv[1]
++-    ) : new Field(
++-        fieldName,
+++    var field = new Field(
+++        descriptor.name.length ? descriptor.name : "field" + descriptor.number,
++         descriptor.number,
++         fieldType,
++         fieldRule,
+diff --git a/node_modules/protobufjs/ext/descriptor/index.js b/node_modules/protobufjs/ext/descriptor/index.js
+index 6ea795b..cdb50c1 100644
+--- a/node_modules/protobufjs/ext/descriptor/index.js
++++ b/node_modules/protobufjs/ext/descriptor/index.js
+@@ -242,12 +242,31 @@ Type.fromDescriptor = function fromDescriptor(descriptor, edition, nested, depth
+     if (!nested)
+         type._edition = edition;
+ 
++    // gateway patch: record key/value types of map-entry nested types so that
++    // map fields restored from a descriptor (reflection) become real MapFields.
++    var mapTypes = {};
++    if (descriptor.nestedType)
++        for (i = 0; i < descriptor.nestedType.length; ++i)
++            if (descriptor.nestedType[i].options && descriptor.nestedType[i].options.mapEntry && descriptor.nestedType[i].field.length === 2)
++                mapTypes[descriptor.nestedType[i].name] = [
++                    fromDescriptorType(descriptor.nestedType[i].field[0].type),
++                    descriptor.nestedType[i].field[1].typeName ? descriptor.nestedType[i].field[1].typeName : fromDescriptorType(descriptor.nestedType[i].field[1].type)
++                ];
++
+     /* Oneofs */ if (descriptor.oneofDecl)
+         for (i = 0; i < descriptor.oneofDecl.length; ++i)
+             type.add(OneOf.fromDescriptor(descriptor.oneofDecl[i]));
+     /* Fields */ if (descriptor.field)
+         for (i = 0; i < descriptor.field.length; ++i) {
+-            var field = Field.fromDescriptor(descriptor.field[i], edition, true);
++            var fieldTypeName = descriptor.field[i].typeName;
++            var mapKv = fieldTypeName ? mapTypes[fieldTypeName] : undefined;
++            if (fieldTypeName && !mapKv) {
++                // after reflection the typeName may be just the short name
++                var nameParts = fieldTypeName.split("." + type.name + ".");
++                if (nameParts.length === 2)
++                    mapKv = mapTypes[nameParts[1]];
++            }
++            var field = Field.fromDescriptor(descriptor.field[i], edition, true, mapKv);
+             type.add(field);
+             if (descriptor.field[i].hasOwnProperty("oneofIndex")) // eslint-disable-line no-prototype-builtins
+                 type.oneofsArray[descriptor.field[i].oneofIndex].add(field);
+@@ -257,9 +276,10 @@ Type.fromDescriptor = function fromDescriptor(descriptor, edition, nested, depth
+             type.add(Field.fromDescriptor(descriptor.extension[i], edition, true));
+     /* Nested types */ if (descriptor.nestedType)
+         for (i = 0; i < descriptor.nestedType.length; ++i) {
++            // map-entry types are reconstructed as MapFields above (gateway patch)
++            if (descriptor.nestedType[i].options && descriptor.nestedType[i].options.mapEntry && descriptor.nestedType[i].field.length === 2)
++                continue;
+             type.add(Type.fromDescriptor(descriptor.nestedType[i], edition, true, depth + 1));
+-            if (descriptor.nestedType[i].options && descriptor.nestedType[i].options.mapEntry)
+-                type.setOption("map_entry", true);
+         }
+     /* Nested enums */ if (descriptor.enumType)
+         for (i = 0; i < descriptor.enumType.length; ++i)
+@@ -410,9 +430,10 @@ Type.prototype.toDescriptor = function toDescriptor(edition) {
+  * @param {IFieldDescriptorProto|Reader|Uint8Array} descriptor Descriptor
+  * @param {string} [edition="proto2"] The syntax or edition to use
+  * @param {boolean} [nested=false] Whether or not this is a top-level object
+- * @returns {Field} Field instance
++ * @param {string[]} [mapKv] Key & value types for a map field (gateway patch)
++ * @returns {Field|MapField} Field instance
+  */
+-Field.fromDescriptor = function fromDescriptor(descriptor, edition, nested) {
++Field.fromDescriptor = function fromDescriptor(descriptor, edition, nested, mapKv) {
+ 
+     // Decode the descriptor message if specified as a buffer:
+     if (typeof descriptor.length === "number")
+@@ -447,8 +468,16 @@ Field.fromDescriptor = function fromDescriptor(descriptor, edition, nested) {
+             throw Error("illegal type name: " + extendee);
+     } else
+         extendee = undefined;
+-    var field = new Field(
+-        descriptor.name.length ? descriptor.name : "field" + descriptor.number,
++    // gateway patch: protobufjs expects camelCased field names, while descriptors
++    // (reflection) carry the original proto names; build a MapField for map fields.
++    var fieldName = $protobuf.util.camelCase(descriptor.name.length ? descriptor.name : "field" + descriptor.number);
++    var field = mapKv ? new MapField(
++        fieldName,
++        descriptor.number,
++        mapKv[0],
++        mapKv[1]
++    ) : new Field(
++        fieldName,
+         descriptor.number,
+         fieldType,
+         fieldRule,
+@@ -909,7 +938,14 @@ function fromDescriptorOptionsRecursive(obj, type) {
+ function fromDescriptorOptions(options, type) {
+     if (!options)
+         return undefined;
+-    return fromDescriptorOptionsRecursive(type.toObject(options), type);
++    var val = fromDescriptorOptionsRecursive(type.toObject(options), type);
++    // gateway patch: keep options that are not declared on the Options type
++    // (e.g. custom proto options) so they survive a reflection round-trip.
++    for (var option in options)
++        if (Object.prototype.hasOwnProperty.call(options, option) &&
++            !type._fieldsArray.some(function (f) { return f.name === option; }))
++            val[underScore(option)] = options[option];
++    return val;
+ }
+ 
+ function toDescriptorOptionsRecursive(obj, type) {

package/patches/protobufjs+7.2.5.patch

@@ -1,107 +0,0 @@
-diff --git a/node_modules/protobufjs/ext/descriptor/index.js b/node_modules/protobufjs/ext/descriptor/index.js
-index 6aafd2a..b8e9f58 100644
---- a/node_modules/protobufjs/ext/descriptor/index.js
-+++ b/node_modules/protobufjs/ext/descriptor/index.js
-@@ -204,6 +204,8 @@ Type.fromDescriptor = function fromDescriptor(descriptor, syntax) {
-     if (typeof descriptor.length === "number")
-         descriptor = exports.DescriptorProto.decode(descriptor);
- 
-+    // record mapTypes for map fields
-+    var mapTypes = {};
-     // Create the message type
-     var type = new Type(descriptor.name.length ? descriptor.name : "Type" + unnamedMessageIndex++, fromDescriptorOptions(descriptor.options, exports.MessageOptions)),
-         i;
-@@ -211,9 +213,34 @@ Type.fromDescriptor = function fromDescriptor(descriptor, syntax) {
-     /* Oneofs */ if (descriptor.oneofDecl)
-         for (i = 0; i < descriptor.oneofDecl.length; ++i)
-             type.add(OneOf.fromDescriptor(descriptor.oneofDecl[i]));
-+    /* Nested types */ if (descriptor.nestedType)
-+        for (i = 0; i < descriptor.nestedType.length; ++i) {
-+            if (descriptor.nestedType[i].options && descriptor.nestedType[i].options.mapEntry && descriptor.nestedType[i].field.length === 2){
-+                mapTypes[descriptor.nestedType[i].name] = [fromDescriptorType(descriptor.nestedType[i].field[0].type), descriptor.nestedType[i].field[1].typeName ? descriptor.nestedType[i].field[1].typeName : fromDescriptorType(descriptor.nestedType[i].field[1].type)];
-+            }else{
-+                type.add(Type.fromDescriptor(descriptor.nestedType[i], syntax));
-+            }
-+        }
-     /* Fields */ if (descriptor.field)
-         for (i = 0; i < descriptor.field.length; ++i) {
--            var field = Field.fromDescriptor(descriptor.field[i], syntax);
-+            var field = null;
-+            while(!field) {
-+                if(descriptor.field[i].typeName) {
-+                    // after reflection in typeName maybe just short type name
-+                    var foundedKvType = mapTypes[descriptor.field[i].typeName];
-+                    if (!foundedKvType) {
-+                        var nameParts = descriptor.field[i].typeName.split("."+type.name+".");
-+                        if (nameParts.length===2) {
-+                            foundedKvType = mapTypes[nameParts[1]];
-+                        }
-+                    }
-+                    if(foundedKvType) {
-+                        field = Field.fromDescriptor(descriptor.field[i], syntax, foundedKvType);
-+                        break;
-+                    }
-+                }
-+                field = Field.fromDescriptor(descriptor.field[i], syntax);
-+            }
-             type.add(field);
-             if (descriptor.field[i].hasOwnProperty("oneofIndex")) // eslint-disable-line no-prototype-builtins
-                 type.oneofsArray[descriptor.field[i].oneofIndex].add(field);
-@@ -221,12 +248,6 @@ Type.fromDescriptor = function fromDescriptor(descriptor, syntax) {
-     /* Extension fields */ if (descriptor.extension)
-         for (i = 0; i < descriptor.extension.length; ++i)
-             type.add(Field.fromDescriptor(descriptor.extension[i], syntax));
--    /* Nested types */ if (descriptor.nestedType)
--        for (i = 0; i < descriptor.nestedType.length; ++i) {
--            type.add(Type.fromDescriptor(descriptor.nestedType[i], syntax));
--            if (descriptor.nestedType[i].options && descriptor.nestedType[i].options.mapEntry)
--                type.setOption("map_entry", true);
--        }
-     /* Nested enums */ if (descriptor.enumType)
-         for (i = 0; i < descriptor.enumType.length; ++i)
-             type.add(Enum.fromDescriptor(descriptor.enumType[i]));
-@@ -375,9 +396,10 @@ var numberRe = /^(?![eE])[0-9]*(?:\.[0-9]*)?(?:[eE][+-]?[0-9]+)?$/;
-  * Creates a field from a descriptor.
-  * @param {IFieldDescriptorProto|Reader|Uint8Array} descriptor Descriptor
-  * @param {string} [syntax="proto2"] Syntax
-- * @returns {Field} Field instance
-+ * @param {string[]} mapKv Key & value types for map field
-+ * @returns {Field|MapField} Field instance
-  */
--Field.fromDescriptor = function fromDescriptor(descriptor, syntax) {
-+Field.fromDescriptor = function fromDescriptor(descriptor, syntax, mapKv) {
- 
-     // Decode the descriptor message if specified as a buffer:
-     if (typeof descriptor.length === "number")
-@@ -407,8 +429,16 @@ Field.fromDescriptor = function fromDescriptor(descriptor, syntax) {
- 	if (descriptor.extendee !== undefined) {
- 		extendee = extendee.length ? extendee : undefined;
- 	}
--    var field = new Field(
--        descriptor.name.length ? descriptor.name : "field" + descriptor.number,
-+
-+    var rawFieldName = descriptor.name.length ? descriptor.name : "field" + descriptor.number;
-+    var fieldName = $protobuf.util.camelCase(rawFieldName);
-+    var field = mapKv ? new MapField(
-+        fieldName,
-+        descriptor.number,
-+        mapKv[0],
-+        mapKv[1]
-+    ) : new Field(
-+        fieldName,
-         descriptor.number,
-         fieldType,
-         fieldRule,
-@@ -816,6 +846,12 @@ function fromDescriptorOptions(options, type) {
-                     val = field.resolvedType.valuesById[val];
-                 out.push(underScore(key), val);
-             }
-+
-+    for (var option in options) {
-+        if (!type._fieldsArray.find(({name}) => name === option) && options.hasOwnProperty(option)) {
-+            out.push(underScore(option), options[option]);
-+        }
-+    }
-     return out.length ? $protobuf.util.toObject(out) : undefined;
- }
-