@tramvai/module-http-client 1.64.0 → 1.65.0

package/lib/index.es.js

@@ -12,9 +12,10 @@ import flatten from '@tinkoff/utils/array/flatten';
 import pick from '@tinkoff/utils/object/pick';
 import { SERVER_MODULE_PAPI_PUBLIC_ROUTE } from '@tramvai/tokens-server';
 import find from '@tinkoff/utils/array/find';
+import { BaseHttpClient } from '@tramvai/http-client';
+export * from '@tramvai/http-client';
 import { getPapiParameters } from '@tramvai/papi';
 import { REQUEST, RESPONSE } from '@tramvai/module-common';
-export * from '@tramvai/http-client';
 
 const fillHeaderIp = ({ requestManager, }) => {
     if (!requestManager) {
@@ -136,8 +137,9 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
     };
 };
 
-class PapiService {
+class PapiService extends BaseHttpClient {
     constructor({ papi, di }) {
+        super();
         this.papi = flatten(papi || []);
         this.di = di;
     }
@@ -172,40 +174,6 @@ class PapiService {
         });
         return { payload, status: 200, headers: {} };
     }
-    get(path, payload, config) {
-        return this.request({
-            path,
-            ...payload,
-            ...config,
-            method: 'GET',
-        });
-    }
-    post(path, payload, config) {
-        return this.request({
-            path,
-            requestType: 'json',
-            ...payload,
-            ...config,
-            method: 'POST',
-        });
-    }
-    put(path, payload, config) {
-        return this.request({
-            path,
-            requestType: 'json',
-            ...payload,
-            ...config,
-            method: 'PUT',
-        });
-    }
-    delete(path, payload, config) {
-        return this.request({
-            path,
-            ...payload,
-            ...config,
-            method: 'DELETE',
-        });
-    }
 }
 
 let PapiClientModule = class PapiClientModule {

package/lib/index.js

@@ -15,9 +15,9 @@ var flatten = require('@tinkoff/utils/array/flatten');
 var pick = require('@tinkoff/utils/object/pick');
 var tokensServer = require('@tramvai/tokens-server');
 var find = require('@tinkoff/utils/array/find');
+var httpClient = require('@tramvai/http-client');
 var papi = require('@tramvai/papi');
 var moduleCommon = require('@tramvai/module-common');
-var httpClient = require('@tramvai/http-client');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -148,8 +148,9 @@ const httpClientFactory = ({ logger, envManager, appInfo, requestManager, header
     };
 };
 
-class PapiService {
+class PapiService extends httpClient.BaseHttpClient {
     constructor({ papi, di }) {
+        super();
         this.papi = flatten__default["default"](papi || []);
         this.di = di;
     }
@@ -184,40 +185,6 @@ class PapiService {
         });
         return { payload, status: 200, headers: {} };
     }
-    get(path, payload, config) {
-        return this.request({
-            path,
-            ...payload,
-            ...config,
-            method: 'GET',
-        });
-    }
-    post(path, payload, config) {
-        return this.request({
-            path,
-            requestType: 'json',
-            ...payload,
-            ...config,
-            method: 'POST',
-        });
-    }
-    put(path, payload, config) {
-        return this.request({
-            path,
-            requestType: 'json',
-            ...payload,
-            ...config,
-            method: 'PUT',
-        });
-    }
-    delete(path, payload, config) {
-        return this.request({
-            path,
-            ...payload,
-            ...config,
-            method: 'DELETE',
-        });
-    }
 }
 
 let PapiClientModule = class PapiClientModule {

package/lib/papi/papiService.d.ts

@@ -1,17 +1,14 @@
 import type { DI_TOKEN } from '@tramvai/core';
 import type { HttpClientRequest, HttpClientResponse } from '@tramvai/http-client';
+import { BaseHttpClient } from '@tramvai/http-client';
 import type { SERVER_MODULE_PAPI_PUBLIC_ROUTE } from '@tramvai/tokens-server';
 export interface Deps {
     di: typeof DI_TOKEN;
     papi?: typeof SERVER_MODULE_PAPI_PUBLIC_ROUTE[];
 }
-export declare class PapiService {
+export declare class PapiService extends BaseHttpClient {
     papi: Deps['papi'];
     di: Deps['di'];
     constructor({ papi, di }: Deps);
     request<R = any>({ path, query, body }: HttpClientRequest): Promise<HttpClientResponse<R>>;
-    get<R = any>(path: string, payload?: Pick<HttpClientRequest, 'query' | 'headers'>, config?: Omit<HttpClientRequest, 'url' | 'query' | 'body' | 'headers'>): Promise<HttpClientResponse<R>>;
-    post<R = any>(path: string, payload?: Pick<HttpClientRequest, 'query' | 'body' | 'headers'>, config?: Omit<HttpClientRequest, 'url' | 'query' | 'body' | 'headers'>): Promise<HttpClientResponse<R>>;
-    put<R = any>(path: string, payload?: Pick<HttpClientRequest, 'query' | 'body' | 'headers'>, config?: Omit<HttpClientRequest, 'url' | 'query' | 'body' | 'headers'>): Promise<HttpClientResponse<R>>;
-    delete<R = any>(path: string, payload?: Pick<HttpClientRequest, 'query' | 'headers'>, config?: Omit<HttpClientRequest, 'url' | 'query' | 'body' | 'headers'>): Promise<HttpClientResponse<R>>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-http-client",
-  "version": "1.64.0",
+  "version": "1.65.0",
   "initialVersion": "0.58.99",
   "description": "",
   "main": "lib/index.js",
@@ -25,21 +25,21 @@
   },
   "dependencies": {
     "@tramvai/http-client": "0.1.25",
-    "@tramvai/tinkoff-request-http-client-adapter": "0.8.258",
-    "@tramvai/tokens-http-client": "1.64.0",
-    "@tramvai/tokens-common": "1.64.0",
-    "@tramvai/tokens-server": "1.64.0"
+    "@tramvai/tinkoff-request-http-client-adapter": "0.8.259",
+    "@tramvai/tokens-http-client": "1.65.0",
+    "@tramvai/tokens-common": "1.65.0",
+    "@tramvai/tokens-server": "1.65.0"
   },
   "devDependencies": {
     "@tinkoff/request-core": "^0.8.9"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "1.64.0",
-    "@tramvai/module-common": "1.64.0",
-    "@tramvai/papi": "1.64.0",
-    "@tramvai/test-helpers": "1.64.0",
-    "@tramvai/test-mocks": "1.64.0",
+    "@tramvai/core": "1.65.0",
+    "@tramvai/module-common": "1.65.0",
+    "@tramvai/papi": "1.65.0",
+    "@tramvai/test-helpers": "1.65.0",
+    "@tramvai/test-mocks": "1.65.0",
     "@tinkoff/dippy": "0.7.38",
     "node-fetch": "^2.6.1",
     "tslib": "^2.0.3"