@gravity-ui/gateway 3.0.3 → 3.0.4

package/build/components/rest.js

@@ -96,8 +96,8 @@ function createRestAction(endpoints, config, serviceKey, actionName, options, Er
             ? endpointData.path
             : endpointData;
         const endpointAxiosConfig = (0, common_1.isExtendedRestActionEndpoint)(endpointData)
-            ? endpointData.axiosConfig || {}
-            : {};
+            ? endpointData.axiosConfig
+            : undefined;
         const pathArgs = config.validationSchema
             ? (0, validate_1.encodePathParams)(args)
             : (0, validate_1.getPathArgsProxy)(args, options.encodePathArgs);
@@ -196,9 +196,9 @@ 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 || Object.keys(endpointAxiosConfig).length > 0) {
-            const customActionAxiosConfig = Object.assign(Object.assign({}, ((options === null || options === void 0 ? void 0 : options.axiosConfig) || {})), endpointAxiosConfig);
+        const customActionTimeout = (_e = (_d = (_c = actionConfig.timeout) !== null && _c !== void 0 ? _c : config.timeout) !== null && _d !== void 0 ? _d : endpointAxiosConfig === null || endpointAxiosConfig === void 0 ? void 0 : endpointAxiosConfig.timeout) !== null && _e !== void 0 ? _e : timeout;
+        if (actionConfig.timeout || 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, customActionAxiosConfig);
         }
         headers['x-request-timeout'] = customActionTimeout !== null && customActionTimeout !== void 0 ? customActionTimeout : constants_1.DEFAULT_TIMEOUT;
@@ -231,17 +231,6 @@ 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/utils/axios.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAxiosClient = void 0;
 const axios_1 = __importDefault(require("axios"));
 const axios_retry_1 = __importDefault(require("axios-retry"));
+const lodash_1 = __importDefault(require("lodash"));
 const constants_1 = require("../constants");
 function getAxiosClient(timeout = constants_1.DEFAULT_TIMEOUT, retries = 0, axiosConfig = constants_1.DEFAULT_AXIOS_OPTIONS) {
     const client = axios_1.default.create(Object.assign(Object.assign({}, axiosConfig), { timeout }));
@@ -18,6 +19,9 @@ function getAxiosClient(timeout = constants_1.DEFAULT_TIMEOUT, retries = 0, axio
             }
             return axios_retry_1.default.isNetworkError(error) || axios_retry_1.default.isRetryableError(error);
         },
+        onRetry: (retryCount, _error, requestConfig) => {
+            lodash_1.default.set(requestConfig, ['headers', 'x-request-attempt'], retryCount);
+        },
     });
     return client;
 }

package/package.json

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