@gravity-ui/gateway 4.11.0 → 4.12.0

package/build/components/mixed.d.ts

@@ -1,10 +1,11 @@
-import { ApiActionConfig, ApiByScope, ApiServiceMixedActionConfig, GatewayConfig, GatewayRequest, GatewayResponse, SchemasByScope } from '../models/common';
+import { ApiActionConfig, ApiByScope, ApiServiceMixedActionConfig, GatewayConfig, GatewayRequest, GatewayResponse, SchemasByScope, SendStats } from '../models/common';
 import { GatewayContext } from '../models/context';
 import { AppErrorConstructor } from '../models/error';
 import type { GrpcContext } from './grpc';
 export declare function createMixedAction<TSchema extends SchemasByScope, Context extends GatewayContext, Req extends GatewayRequest<Context>, Res extends GatewayResponse>(config: ApiServiceMixedActionConfig<Context, Req, Res, any, any, any>, api: ApiByScope<TSchema, Context, Req, Res>, serviceName: string, actionName: string, extra: {
     config: GatewayConfig<Context, Req, Res>;
     grpcContext: GrpcContext;
+    sendStats?: SendStats<Context>;
 }, ErrorConstructor: AppErrorConstructor): (actionConfig: ApiActionConfig<Context, any>) => Promise<{
     responseData: any;
     debugHeaders: {};

package/build/components/mixed.js

@@ -16,9 +16,23 @@ const constants_1 = require("../constants");
 const common_1 = require("../utils/common");
 const create_context_api_1 = require("../utils/create-context-api");
 const parse_error_1 = require("../utils/parse-error");
+const redact_sensitive_headers_1 = require("../utils/redact-sensitive-headers");
+function getMixedResponseSize(data, ctx, ErrorConstructor) {
+    var _a;
+    let responseSize = 0;
+    try {
+        responseSize = constants_1.ECMA_STRING_SIZE * ((_a = JSON.stringify(data)) === null || _a === void 0 ? void 0 : _a.length);
+    }
+    catch (error) {
+        (0, common_1.handleError)(ErrorConstructor, error, ctx, 'Calculate response size failed');
+    }
+    return responseSize;
+}
 function createMixedAction(config, api, serviceName, actionName, extra, ErrorConstructor) {
     return async (actionConfig) => {
+        var _a, _b, _c;
         const { args } = actionConfig, context = __rest(actionConfig, ["args"]);
+        const { requestId, headers: requestHeaders, ctx: parentCtx, userId } = actionConfig;
         const ctx = actionConfig.ctx.create(`Gateway ${serviceName} ${actionName} [mixed]`, {
             tags: {
                 action: actionName,
@@ -27,15 +41,30 @@ function createMixedAction(config, api, serviceName, actionName, extra, ErrorCon
             },
         });
         const contextApi = (0, create_context_api_1.generateContextApi)(api, Object.assign(Object.assign({}, context), { ctx }));
+        const startRequestTime = Date.now();
+        const requestData = {
+            timestamp: startRequestTime,
+            service: serviceName,
+            action: actionName,
+            requestId: requestId || '',
+            requestMethod: '',
+            requestUrl: '',
+            traceId: ((_a = ctx.getTraceId) === null || _a === void 0 ? void 0 : _a.call(ctx)) || '',
+            userId: userId || '',
+        };
         try {
             const responseData = await config(contextApi, args, Object.assign(Object.assign({ headers: actionConfig.headers, lang: actionConfig.headers[constants_1.DEFAULT_LANG_HEADER] || constants_1.Lang.Ru, ctx }, extra), { abortSignal: actionConfig.abortSignal }));
             ctx.log('Request completed');
+            (_b = extra.sendStats) === null || _b === void 0 ? void 0 : _b.call(extra, Object.assign(Object.assign({}, requestData), { requestTime: Date.now() - startRequestTime, responseSize: getMixedResponseSize(responseData, ctx, ErrorConstructor), restStatus: 200 }), (0, redact_sensitive_headers_1.redactSensitiveHeaders)(parentCtx, requestHeaders), parentCtx, { debugHeaders: {} });
             return {
                 responseData,
                 debugHeaders: {},
             };
         }
         catch (e) {
+            const errorData = e instanceof Object && 'error' in e ? e.error : e;
+            const restStatus = (errorData === null || errorData === void 0 ? void 0 : errorData.status) || 500;
+            (_c = extra.sendStats) === null || _c === void 0 ? void 0 : _c.call(extra, Object.assign(Object.assign({}, requestData), { requestTime: Date.now() - startRequestTime, responseSize: getMixedResponseSize(errorData, ctx, ErrorConstructor), restStatus }), (0, redact_sensitive_headers_1.redactSensitiveHeaders)(parentCtx, requestHeaders), parentCtx, { debugHeaders: {} });
             if (e instanceof Object && 'error' in e) {
                 (0, common_1.handleError)(ErrorConstructor, e, ctx, 'Request failed', {
                     actionName,

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) {
@@ -306,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 }));

package/build/index.js

@@ -69,7 +69,7 @@ function createApiAction(schema, config, serviceKey, actionName, api, grpcContex
     const env = config.env || '';
     if (isMixedActionConfig(action)) {
         const resultServiceName = serviceName || serviceKey;
-        return (0, mixed_1.createMixedAction)(action, api, resultServiceName, actionName, { config, grpcContext }, config.ErrorConstructor);
+        return (0, mixed_1.createMixedAction)(action, api, resultServiceName, actionName, { config, grpcContext, sendStats: config.sendStats }, config.ErrorConstructor);
     }
     const endpointsConfig = lodash_1.default.get(serviceSchema.endpoints, [installation, env]);
     if (isRestActionConfig(action)) {

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.11.0",
+  "version": "4.12.0",
   "description": "",
   "license": "MIT",
   "main": "build/index.js",