@gravity-ui/gateway 2.4.0 → 2.5.1

package/README.md

@@ -124,6 +124,11 @@ interface GatewayConfig {
 }
 ```
 
+#### validationSchema
+
+By default, for path params in rest actions used the following regexp: `/^((?!(\.\.|\?|#|\\|\/)).)*$/i`.
+If the parameter value does not pass validation, the `GATEWAY_INVALID_PARAM_VALUE` value is returned.
+
 ### Usage in Node.js
 
 Upon gateway initialization, in addition to exporting the controller, it also exports an `api` object, which represents the core for executing requests to the backend.

package/build/components/rest.js

@@ -196,11 +196,12 @@ function createRestAction(endpoints, config, serviceKey, actionName, options, Er
         }
         const startRequestTime = Date.now();
         let axiosClient = defaultAxiosClient;
+        const customActionTimeout = (_e = (_d = (_c = actionConfig.timeout) !== null && _c !== void 0 ? _c : config.timeout) !== null && _d !== void 0 ? _d : endpointAxiosConfig.timeout) !== null && _e !== void 0 ? _e : timeout;
         if (actionConfig.timeout || endpointAxiosConfig) {
-            const customActionTimeout = (_e = (_d = (_c = actionConfig.timeout) !== null && _c !== void 0 ? _c : config.timeout) !== null && _d !== void 0 ? _d : endpointAxiosConfig.timeout) !== null && _e !== void 0 ? _e : timeout;
             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, customActionAxiosConfig);
         }
+        headers['x-request-timeout'] = customActionTimeout !== null && customActionTimeout !== void 0 ? customActionTimeout : constants_1.DEFAULT_TIMEOUT;
         ctx.log('Starting request', { debugHeaders: (0, common_1.sanitizeDebugHeaders)(debugHeaders) });
         const requestData = {
             timestamp: startRequestTime,
@@ -228,6 +229,17 @@ function createRestAction(endpoints, config, serviceKey, actionName, options, Er
                 responseType: config.responseType,
             });
         }
+        axiosClient.interceptors.request.use((requestConfig) => {
+            var _a;
+            requestConfig.headers.set('x-request-attempt', 
+            // according this issue https://github.com/softonic/axios-retry/issues/167
+            // 'axios-retry' doesn`t define retryCount field in exported type
+            // however in this issue https://github.com/softonic/axios-retry/issues/75#issuecomment-502151719
+            // people use it
+            // @ts-ignore
+            ((_a = requestConfig[constants_1.AXIOS_RETRY_NAMESPACE]) === null || _a === void 0 ? void 0 : _a.retryCount) || 0);
+            return requestConfig;
+        });
         try {
             const response = await axiosClient.request(requestConfig);
             const responseHeaders = {};

package/build/constants.d.ts

@@ -44,3 +44,4 @@ export declare const DEFAULT_VALIDATION_SCHEMA: {
         })[];
     };
 };
+export declare const AXIOS_RETRY_NAMESPACE = "axios-retry";

package/build/constants.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_VALIDATION_SCHEMA = exports.RECREATE_SERVICE_CODES = exports.RETRYABLE_STATUS_CODES = exports.ANY_ACTION_SYMBOL = exports.ECMA_STRING_SIZE = exports.DEFAULT_GRPC_OPTIONS = exports.DEFAULT_AXIOS_OPTIONS = exports.DEFAULT_PROXY_HEADERS = exports.DEFAULT_LANG_HEADER = exports.DEFAULT_TIMEOUT = exports.Lang = exports.VERSION = void 0;
+exports.AXIOS_RETRY_NAMESPACE = exports.DEFAULT_VALIDATION_SCHEMA = exports.RECREATE_SERVICE_CODES = exports.RETRYABLE_STATUS_CODES = exports.ANY_ACTION_SYMBOL = exports.ECMA_STRING_SIZE = exports.DEFAULT_GRPC_OPTIONS = exports.DEFAULT_AXIOS_OPTIONS = exports.DEFAULT_PROXY_HEADERS = exports.DEFAULT_LANG_HEADER = exports.DEFAULT_TIMEOUT = exports.Lang = exports.VERSION = void 0;
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
 const grpc = __importStar(require("@grpc/grpc-js"));
@@ -99,3 +99,4 @@ exports.DEFAULT_VALIDATION_SCHEMA = {
         ],
     },
 };
+exports.AXIOS_RETRY_NAMESPACE = 'axios-retry';

package/build/utils/validate.js

@@ -29,7 +29,7 @@ function encodePathParams(params) {
 }
 exports.encodePathParams = encodePathParams;
 function getPathParam(value) {
-    return /^((?!(\.\.|\?|#|\\|\/)).)*$/i.test(value) ? value : '';
+    return /^((?!(\.\.|\?|#|\\|\/)).)*$/i.test(value) ? value : 'GATEWAY_INVALID_PARAM_VALUE';
 }
 exports.getPathParam = getPathParam;
 function getPathArgsProxy(args, encodePathArgs) {

package/package.json

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