@gravity-ui/gateway 4.10.4 → 4.11.1

package/build/components/grpc.js

@@ -515,7 +515,7 @@ function createGrpcAction({ root, credentials }, endpoints, config, serviceKey,
         let stopListeningForAbort = null;
         // eslint-disable-next-line complexity
         return new Promise((resolve, reject) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             let endpointData = (endpoints === null || endpoints === void 0 ? void 0 : endpoints.grpcEndpoint) || (endpoints === null || endpoints === void 0 ? void 0 : endpoints.endpoint);
             if (typeof config.endpoint === 'function') {
                 endpointData = config.endpoint(endpoints, args);
@@ -662,7 +662,7 @@ function createGrpcAction({ root, credentials }, endpoints, config, serviceKey,
                     ctx.log('Starting unary request', {
                         debugHeaders: (0, common_2.sanitizeDebugHeaders)(debugHeaders),
                     });
-                    let retries = (_d = config.retries) !== null && _d !== void 0 ? _d : 0;
+                    let retries = (_e = (_d = actionConfig.retries) !== null && _d !== void 0 ? _d : config.retries) !== null && _e !== void 0 ? _e : 0;
                     let actionCall = service[action].bind(service);
                     const callAction = () => {
                         let trailingMetadata = {};

package/build/components/rest.js

@@ -11,6 +11,7 @@ const constants_1 = require("../constants");
 const axios_1 = require("../utils/axios");
 const common_1 = require("../utils/common");
 const parse_error_1 = require("../utils/parse-error");
+const pipe_through_byte_counter_1 = require("../utils/pipe-through-byte-counter");
 const redact_sensitive_headers_1 = require("../utils/redact-sensitive-headers");
 const validate_1 = require("../utils/validate");
 function getRestResponseSize(data, ctx, ErrorConstructor) {
@@ -39,7 +40,7 @@ function createRestAction(endpoints, config, serviceKey, actionName, options, Er
     const defaultAxiosClient = (0, axios_1.getAxiosClient)(timeout, config === null || config === void 0 ? void 0 : config.retries, (_d = config === null || config === void 0 ? void 0 : config.axiosRetryCondition) !== null && _d !== void 0 ? _d : options === null || options === void 0 ? void 0 : options.axiosRetryCondition, options === null || options === void 0 ? void 0 : options.axiosConfig, options === null || options === void 0 ? void 0 : options.axiosInterceptors);
     /* eslint-disable complexity */
     return async function action(actionConfig) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const { args, requestId, headers: requestHeaders, ctx: parentCtx, authArgs, userId, abortSignal, } = actionConfig;
         const debugHeaders = {};
         const lang = requestHeaders[constants_1.DEFAULT_LANG_HEADER] || constants_1.Lang.Ru; // header might be empty string
@@ -206,9 +207,10 @@ function createRestAction(endpoints, config, serviceKey, actionName, options, Er
         const startRequestTime = Date.now();
         let axiosClient = defaultAxiosClient;
         const customActionTimeout = (_f = (_e = (_d = actionConfig.timeout) !== null && _d !== void 0 ? _d : config.timeout) !== null && _e !== void 0 ? _e : endpointAxiosConfig === null || endpointAxiosConfig === void 0 ? void 0 : endpointAxiosConfig.timeout) !== null && _f !== void 0 ? _f : timeout;
-        if (actionConfig.timeout || endpointAxiosConfig) {
+        const customActionRetries = (_g = actionConfig.retries) !== null && _g !== void 0 ? _g : config.retries;
+        if (actionConfig.timeout || actionConfig.retries || endpointAxiosConfig) {
             const customActionAxiosConfig = Object.assign(Object.assign({}, ((options === null || options === void 0 ? void 0 : options.axiosConfig) || {})), (endpointAxiosConfig || {}));
-            axiosClient = (0, axios_1.getAxiosClient)(customActionTimeout, config === null || config === void 0 ? void 0 : config.retries, options.axiosRetryCondition, customActionAxiosConfig, options === null || options === void 0 ? void 0 : options.axiosInterceptors);
+            axiosClient = (0, axios_1.getAxiosClient)(customActionTimeout, customActionRetries, (_h = config === null || config === void 0 ? void 0 : config.axiosRetryCondition) !== null && _h !== void 0 ? _h : options === null || options === void 0 ? void 0 : options.axiosRetryCondition, customActionAxiosConfig, options === null || options === void 0 ? void 0 : options.axiosInterceptors);
         }
         headers['x-request-timeout'] = customActionTimeout !== null && customActionTimeout !== void 0 ? customActionTimeout : constants_1.DEFAULT_TIMEOUT;
         ctx.log('Starting request', { debugHeaders: (0, common_1.sanitizeDebugHeaders)(debugHeaders) });
@@ -219,7 +221,7 @@ function createRestAction(endpoints, config, serviceKey, actionName, options, Er
             requestId,
             requestMethod: config.method,
             requestUrl: actionURL,
-            traceId: ((_g = ctx.getTraceId) === null || _g === void 0 ? void 0 : _g.call(ctx)) || '',
+            traceId: ((_j = ctx.getTraceId) === null || _j === void 0 ? void 0 : _j.call(ctx)) || '',
             userId: userId || '',
         };
         const requestConfig = {
@@ -246,7 +248,7 @@ function createRestAction(endpoints, config, serviceKey, actionName, options, Er
             const responseHeaders = {};
             const endRequestTime = Date.now();
             requestData.requestTime = endRequestTime - startRequestTime;
-            const actualResponseContentType = (_h = response.headers) === null || _h === void 0 ? void 0 : _h['Content-Type'];
+            const actualResponseContentType = (_k = response.headers) === null || _k === void 0 ? void 0 : _k['Content-Type'];
             const expectedResponseContentType = config.expectedResponseContentType || options.expectedResponseContentType;
             if (actualResponseContentType && expectedResponseContentType) {
                 let isInvalidResponseContentType;
@@ -305,7 +307,16 @@ function createRestAction(endpoints, config, serviceKey, actionName, options, Er
                 }
             }
             if (options === null || options === void 0 ? void 0 : options.sendStats) {
-                options.sendStats(Object.assign(Object.assign({}, requestData), { responseSize: getRestResponseSize(response === null || response === void 0 ? void 0 : response.data, ctx, ErrorConstructor), restStatus: 200 }), (0, redact_sensitive_headers_1.redactSensitiveHeaders)(parentCtx, headers), parentCtx, { debugHeaders: (0, common_1.sanitizeDebugHeaders)(debugHeaders) });
+                const emitStats = (responseSize, restStatus) => {
+                    var _a;
+                    return (_a = options.sendStats) === null || _a === void 0 ? void 0 : _a.call(options, Object.assign(Object.assign({}, requestData), { responseSize, restStatus }), (0, redact_sensitive_headers_1.redactSensitiveHeaders)(parentCtx, headers), parentCtx, { debugHeaders: (0, common_1.sanitizeDebugHeaders)(debugHeaders) });
+                };
+                if (response.data && typeof response.data.pipe === 'function') {
+                    response.data = (0, pipe_through_byte_counter_1.pipeThroughByteCounter)(response.data, (streamedBytes) => emitStats(streamedBytes, 200));
+                }
+                else {
+                    emitStats(getRestResponseSize(response === null || response === void 0 ? void 0 : response.data, ctx, ErrorConstructor), 200);
+                }
             }
             else {
                 ctx.stats(Object.assign(Object.assign({}, requestData), { responseStatus: 200 }));
@@ -343,7 +354,7 @@ function createRestAction(endpoints, config, serviceKey, actionName, options, Er
             }
             const responseStatus = lodash_1.default.get(parsedError, 'status') || lodash_1.default.get(error, 'status', 500);
             if (options === null || options === void 0 ? void 0 : options.sendStats) {
-                options.sendStats(Object.assign(Object.assign({}, requestData), { responseSize: getRestResponseSize((_j = error === null || error === void 0 ? void 0 : error.response) === null || _j === void 0 ? void 0 : _j.data, ctx, ErrorConstructor), restStatus: responseStatus, userId }), (0, redact_sensitive_headers_1.redactSensitiveHeaders)(parentCtx, headers), parentCtx, { debugHeaders: (0, common_1.sanitizeDebugHeaders)(debugHeaders) });
+                options.sendStats(Object.assign(Object.assign({}, requestData), { responseSize: getRestResponseSize((_l = error === null || error === void 0 ? void 0 : error.response) === null || _l === void 0 ? void 0 : _l.data, ctx, ErrorConstructor), restStatus: responseStatus, userId }), (0, redact_sensitive_headers_1.redactSensitiveHeaders)(parentCtx, headers), parentCtx, { debugHeaders: (0, common_1.sanitizeDebugHeaders)(debugHeaders) });
             }
             else {
                 ctx.stats(Object.assign(Object.assign({}, requestData), { responseStatus }));

package/build/models/common.d.ts

@@ -29,6 +29,7 @@ export interface ApiActionConfig<Context extends GatewayContext, TRequestData, T
     args: TRequestData;
     ctx: Context;
     timeout?: number;
+    retries?: number;
     callback?: (response: TResponseData) => void;
     authArgs?: Record<string, unknown>;
     userId?: string;

package/build/utils/pipe-through-byte-counter.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import type { Readable } from 'stream';
+export declare function pipeThroughByteCounter(source: NodeJS.ReadableStream, onFlush: (streamedBytes: number) => void): Readable;

package/build/utils/pipe-through-byte-counter.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pipeThroughByteCounter = void 0;
+const stream_1 = require("stream");
+function pipeThroughByteCounter(source, onFlush) {
+    let streamedBytes = 0;
+    const counter = new stream_1.Transform({
+        transform(chunk, encoding, cb) {
+            if (Buffer.isBuffer(chunk) || chunk instanceof Uint8Array) {
+                streamedBytes += chunk.length;
+            }
+            else if (typeof chunk === 'string') {
+                streamedBytes += Buffer.byteLength(chunk, typeof encoding === 'string' ? encoding : undefined);
+            }
+            cb(null, chunk);
+        },
+        flush(cb) {
+            onFlush(streamedBytes);
+            cb();
+        },
+    });
+    return source.pipe(counter);
+}
+exports.pipeThroughByteCounter = pipeThroughByteCounter;

package/package.json

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