@tramvai/tinkoff-request-http-client-adapter 0.9.229 → 0.9.233

package/lib/createTinkoffRequest.browser.js

@@ -12,7 +12,7 @@ import { createAgent } from './agent/createAgent.browser.browser.js';
 
 const defaultAgent = createAgent();
 function createTinkoffRequest(options) {
-    const { logger, name, disableCache, enableCircuitBreaker, createCache, cacheTime = 30000, defaultTimeout, validator, errorValidator, errorModificator, circuitBreakerOptions = {}, getCacheKey, lruOptions = { max: 1000, maxAge: cacheTime }, agent, querySerializer, retryOptions, ...defaults } = options;
+    const { logger, name, disableCache, enableCircuitBreaker, createCache, cacheTime = 30000, defaultTimeout, validator, errorValidator, errorModificator, circuitBreakerOptions = {}, getCacheKey, lruOptions = { max: 1000, maxAge: cacheTime }, agent, querySerializer, retryOptions, interceptors, ...defaults } = options;
     const log = logger && logger(`${name}:initialization`);
     const plugins = [];
     plugins.push({

package/lib/createTinkoffRequest.es.js

@@ -12,7 +12,7 @@ import { createAgent } from './agent/createAgent.es.js';
 
 const defaultAgent = createAgent();
 function createTinkoffRequest(options) {
-    const { logger, name, disableCache, enableCircuitBreaker, createCache, cacheTime = 30000, defaultTimeout, validator, errorValidator, errorModificator, circuitBreakerOptions = {}, getCacheKey, lruOptions = { max: 1000, maxAge: cacheTime }, agent, querySerializer, retryOptions, ...defaults } = options;
+    const { logger, name, disableCache, enableCircuitBreaker, createCache, cacheTime = 30000, defaultTimeout, validator, errorValidator, errorModificator, circuitBreakerOptions = {}, getCacheKey, lruOptions = { max: 1000, maxAge: cacheTime }, agent, querySerializer, retryOptions, interceptors, ...defaults } = options;
     const log = logger && logger(`${name}:initialization`);
     const plugins = [];
     plugins.push({

package/lib/createTinkoffRequest.js

@@ -29,7 +29,7 @@ var retry__default = /*#__PURE__*/_interopDefaultLegacy(retry);
 
 const defaultAgent = createAgent.createAgent();
 function createTinkoffRequest(options) {
-    const { logger, name, disableCache, enableCircuitBreaker, createCache, cacheTime = 30000, defaultTimeout, validator, errorValidator, errorModificator, circuitBreakerOptions = {}, getCacheKey, lruOptions = { max: 1000, maxAge: cacheTime }, agent, querySerializer, retryOptions, ...defaults } = options;
+    const { logger, name, disableCache, enableCircuitBreaker, createCache, cacheTime = 30000, defaultTimeout, validator, errorValidator, errorModificator, circuitBreakerOptions = {}, getCacheKey, lruOptions = { max: 1000, maxAge: cacheTime }, agent, querySerializer, retryOptions, interceptors, ...defaults } = options;
     const log = logger && logger(`${name}:initialization`);
     const plugins = [];
     plugins.push({

package/lib/httpClientAdapter.browser.js

@@ -5,49 +5,62 @@ import { mergeOptions } from './mergeOptions.browser.js';
 class HttpClientAdapter extends BaseHttpClient {
     constructor({ options, makeRequest, }) {
         super();
+        // eslint-disable-next-line sort-class-members/sort-class-members
+        this._processMakeRequest = async (reqAfterInterceptors, { modifyRequest, modifyResponse, modifyError, }) => {
+            const { method, body, requestType, ...adaptedReq } = modifyRequest
+                ? modifyRequest(reqAfterInterceptors)
+                : reqAfterInterceptors;
+            if (method) {
+                adaptedReq.httpMethod = method;
+            }
+            if (body) {
+                adaptedReq.payload = body;
+            }
+            if (requestType) {
+                adaptedReq.type = requestType;
+            }
+            const res = this.makeRequest(adaptedReq);
+            try {
+                const payload = await res;
+                const status = getStatus(res);
+                const headers = getHeaders(res);
+                const resToModify = {
+                    payload,
+                    status,
+                    headers,
+                };
+                return modifyResponse ? modifyResponse(resToModify) : resToModify;
+            }
+            catch (error) {
+                const meta = res.getExternalMeta();
+                const status = getStatus(res);
+                const headers = getHeaders(res);
+                // Useful for logging
+                const errorWithMeta = Object.assign(error, {
+                    __meta: meta,
+                    status,
+                    headers,
+                });
+                throw modifyError ? modifyError(errorWithMeta, adaptedReq) : errorWithMeta;
+            }
+        };
         this.options = options;
         this.makeRequest = makeRequest;
     }
-    async request(req) {
+    request(req) {
         // применяем дефолтные опции до вызова modifyRequest на объекте запроса
         const optionsWithDefaults = mergeOptions(this.options, req);
-        const { modifyRequest, modifyResponse, modifyError, ...reqWithDefaults } = optionsWithDefaults;
-        const { method, body, requestType, ...adaptedReq } = modifyRequest
-            ? modifyRequest(reqWithDefaults)
-            : reqWithDefaults;
-        if (method) {
-            adaptedReq.httpMethod = method;
-        }
-        if (body) {
-            adaptedReq.payload = body;
-        }
-        if (requestType) {
-            adaptedReq.type = requestType;
-        }
-        const res = this.makeRequest(adaptedReq);
-        try {
-            const payload = await res;
-            const status = getStatus(res);
-            const headers = getHeaders(res);
-            const resToModify = {
-                payload,
-                status,
-                headers,
-            };
-            return modifyResponse ? modifyResponse(resToModify) : resToModify;
-        }
-        catch (error) {
-            const meta = res.getExternalMeta();
-            const status = getStatus(res);
-            const headers = getHeaders(res);
-            // Useful for logging
-            const errorWithMeta = Object.assign(error, {
-                __meta: meta,
-                status,
-                headers,
+        const { modifyRequest, modifyResponse, modifyError, interceptors, ...reqWithDefaults } = optionsWithDefaults;
+        let _next = (_req) => this._processMakeRequest(_req, { modifyRequest, modifyResponse, modifyError });
+        if (interceptors) {
+            Array.from(interceptors)
+                .reverse()
+                .forEach((interceptor) => {
+                const _prevNext = _next;
+                _next = (_req) => interceptor(_req, _prevNext);
             });
-            throw modifyError ? modifyError(errorWithMeta, adaptedReq) : errorWithMeta;
         }
+        return _next(reqWithDefaults);
     }
     fork(forkOptions = {}, mergeOptionsConfig = {}) {
         return new HttpClientAdapter({

package/lib/httpClientAdapter.d.ts

@@ -12,4 +12,5 @@ export declare class HttpClientAdapter extends BaseHttpClient implements HttpCli
     fork(forkOptions?: HttpClientRequest, mergeOptionsConfig?: {
         replace?: boolean;
     }): HttpClientAdapter;
+    private _processMakeRequest;
 }

package/lib/httpClientAdapter.es.js

@@ -5,49 +5,62 @@ import { mergeOptions } from './mergeOptions.es.js';
 class HttpClientAdapter extends BaseHttpClient {
     constructor({ options, makeRequest, }) {
         super();
+        // eslint-disable-next-line sort-class-members/sort-class-members
+        this._processMakeRequest = async (reqAfterInterceptors, { modifyRequest, modifyResponse, modifyError, }) => {
+            const { method, body, requestType, ...adaptedReq } = modifyRequest
+                ? modifyRequest(reqAfterInterceptors)
+                : reqAfterInterceptors;
+            if (method) {
+                adaptedReq.httpMethod = method;
+            }
+            if (body) {
+                adaptedReq.payload = body;
+            }
+            if (requestType) {
+                adaptedReq.type = requestType;
+            }
+            const res = this.makeRequest(adaptedReq);
+            try {
+                const payload = await res;
+                const status = getStatus(res);
+                const headers = getHeaders(res);
+                const resToModify = {
+                    payload,
+                    status,
+                    headers,
+                };
+                return modifyResponse ? modifyResponse(resToModify) : resToModify;
+            }
+            catch (error) {
+                const meta = res.getExternalMeta();
+                const status = getStatus(res);
+                const headers = getHeaders(res);
+                // Useful for logging
+                const errorWithMeta = Object.assign(error, {
+                    __meta: meta,
+                    status,
+                    headers,
+                });
+                throw modifyError ? modifyError(errorWithMeta, adaptedReq) : errorWithMeta;
+            }
+        };
         this.options = options;
         this.makeRequest = makeRequest;
     }
-    async request(req) {
+    request(req) {
         // применяем дефолтные опции до вызова modifyRequest на объекте запроса
         const optionsWithDefaults = mergeOptions(this.options, req);
-        const { modifyRequest, modifyResponse, modifyError, ...reqWithDefaults } = optionsWithDefaults;
-        const { method, body, requestType, ...adaptedReq } = modifyRequest
-            ? modifyRequest(reqWithDefaults)
-            : reqWithDefaults;
-        if (method) {
-            adaptedReq.httpMethod = method;
-        }
-        if (body) {
-            adaptedReq.payload = body;
-        }
-        if (requestType) {
-            adaptedReq.type = requestType;
-        }
-        const res = this.makeRequest(adaptedReq);
-        try {
-            const payload = await res;
-            const status = getStatus(res);
-            const headers = getHeaders(res);
-            const resToModify = {
-                payload,
-                status,
-                headers,
-            };
-            return modifyResponse ? modifyResponse(resToModify) : resToModify;
-        }
-        catch (error) {
-            const meta = res.getExternalMeta();
-            const status = getStatus(res);
-            const headers = getHeaders(res);
-            // Useful for logging
-            const errorWithMeta = Object.assign(error, {
-                __meta: meta,
-                status,
-                headers,
+        const { modifyRequest, modifyResponse, modifyError, interceptors, ...reqWithDefaults } = optionsWithDefaults;
+        let _next = (_req) => this._processMakeRequest(_req, { modifyRequest, modifyResponse, modifyError });
+        if (interceptors) {
+            Array.from(interceptors)
+                .reverse()
+                .forEach((interceptor) => {
+                const _prevNext = _next;
+                _next = (_req) => interceptor(_req, _prevNext);
             });
-            throw modifyError ? modifyError(errorWithMeta, adaptedReq) : errorWithMeta;
         }
+        return _next(reqWithDefaults);
     }
     fork(forkOptions = {}, mergeOptionsConfig = {}) {
         return new HttpClientAdapter({

package/lib/httpClientAdapter.js

@@ -9,49 +9,62 @@ var mergeOptions = require('./mergeOptions.js');
 class HttpClientAdapter extends httpClient.BaseHttpClient {
     constructor({ options, makeRequest, }) {
         super();
+        // eslint-disable-next-line sort-class-members/sort-class-members
+        this._processMakeRequest = async (reqAfterInterceptors, { modifyRequest, modifyResponse, modifyError, }) => {
+            const { method, body, requestType, ...adaptedReq } = modifyRequest
+                ? modifyRequest(reqAfterInterceptors)
+                : reqAfterInterceptors;
+            if (method) {
+                adaptedReq.httpMethod = method;
+            }
+            if (body) {
+                adaptedReq.payload = body;
+            }
+            if (requestType) {
+                adaptedReq.type = requestType;
+            }
+            const res = this.makeRequest(adaptedReq);
+            try {
+                const payload = await res;
+                const status = http.getStatus(res);
+                const headers = http.getHeaders(res);
+                const resToModify = {
+                    payload,
+                    status,
+                    headers,
+                };
+                return modifyResponse ? modifyResponse(resToModify) : resToModify;
+            }
+            catch (error) {
+                const meta = res.getExternalMeta();
+                const status = http.getStatus(res);
+                const headers = http.getHeaders(res);
+                // Useful for logging
+                const errorWithMeta = Object.assign(error, {
+                    __meta: meta,
+                    status,
+                    headers,
+                });
+                throw modifyError ? modifyError(errorWithMeta, adaptedReq) : errorWithMeta;
+            }
+        };
         this.options = options;
         this.makeRequest = makeRequest;
     }
-    async request(req) {
+    request(req) {
         // применяем дефолтные опции до вызова modifyRequest на объекте запроса
         const optionsWithDefaults = mergeOptions.mergeOptions(this.options, req);
-        const { modifyRequest, modifyResponse, modifyError, ...reqWithDefaults } = optionsWithDefaults;
-        const { method, body, requestType, ...adaptedReq } = modifyRequest
-            ? modifyRequest(reqWithDefaults)
-            : reqWithDefaults;
-        if (method) {
-            adaptedReq.httpMethod = method;
-        }
-        if (body) {
-            adaptedReq.payload = body;
-        }
-        if (requestType) {
-            adaptedReq.type = requestType;
-        }
-        const res = this.makeRequest(adaptedReq);
-        try {
-            const payload = await res;
-            const status = http.getStatus(res);
-            const headers = http.getHeaders(res);
-            const resToModify = {
-                payload,
-                status,
-                headers,
-            };
-            return modifyResponse ? modifyResponse(resToModify) : resToModify;
-        }
-        catch (error) {
-            const meta = res.getExternalMeta();
-            const status = http.getStatus(res);
-            const headers = http.getHeaders(res);
-            // Useful for logging
-            const errorWithMeta = Object.assign(error, {
-                __meta: meta,
-                status,
-                headers,
+        const { modifyRequest, modifyResponse, modifyError, interceptors, ...reqWithDefaults } = optionsWithDefaults;
+        let _next = (_req) => this._processMakeRequest(_req, { modifyRequest, modifyResponse, modifyError });
+        if (interceptors) {
+            Array.from(interceptors)
+                .reverse()
+                .forEach((interceptor) => {
+                const _prevNext = _next;
+                _next = (_req) => interceptor(_req, _prevNext);
             });
-            throw modifyError ? modifyError(errorWithMeta, adaptedReq) : errorWithMeta;
         }
+        return _next(reqWithDefaults);
     }
     fork(forkOptions = {}, mergeOptionsConfig = {}) {
         return new HttpClientAdapter({

package/lib/mergeOptions.browser.js

@@ -23,6 +23,7 @@ function mergeOptions(options, nextOptions, config) {
             ...options.headers,
             ...nextOptions.headers,
         },
+        interceptors: [...(options.interceptors || []), ...(nextOptions.interceptors || [])],
     };
     const composeModifier = (modifier) => {
         if (options[modifier] && nextOptions[modifier]) {

package/lib/mergeOptions.es.js

@@ -23,6 +23,7 @@ function mergeOptions(options, nextOptions, config) {
             ...options.headers,
             ...nextOptions.headers,
         },
+        interceptors: [...(options.interceptors || []), ...(nextOptions.interceptors || [])],
     };
     const composeModifier = (modifier) => {
         if (options[modifier] && nextOptions[modifier]) {

package/lib/mergeOptions.js

@@ -31,6 +31,7 @@ function mergeOptions(options, nextOptions, config) {
             ...options.headers,
             ...nextOptions.headers,
         },
+        interceptors: [...(options.interceptors || []), ...(nextOptions.interceptors || [])],
     };
     const composeModifier = (modifier) => {
         if (options[modifier] && nextOptions[modifier]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/tinkoff-request-http-client-adapter",
-  "version": "0.9.229",
+  "version": "0.9.233",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -30,8 +30,8 @@
     "@tinkoff/request-plugin-validate": "^0.9.2",
     "@tinkoff/request-plugin-retry": "^0.2.3",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/http-client": "0.2.8",
-    "@tramvai/tokens-common": "2.90.0",
+    "@tramvai/http-client": "0.2.9",
+    "@tramvai/tokens-common": "2.92.0",
     "tslib": "^2.4.0"
   },
   "sideEffects": false,