@tramvai/module-http-client 2.56.1 → 2.56.5

package/lib/httpClient/httpClientFactory.d.ts

@@ -8,13 +8,13 @@ export declare const httpClientFactory: ({ logger, envManager, appInfo, requestM
     logger: ExtractDependencyType<typeof LOGGER_TOKEN>;
     envManager: ExtractDependencyType<typeof ENV_MANAGER_TOKEN>;
     appInfo: ExtractDependencyType<typeof APP_INFO_TOKEN>;
-    requestManager?: ExtractDependencyType<typeof REQUEST_MANAGER_TOKEN>;
-    headersList?: ExtractDependencyType<typeof API_CLIENT_PASS_HEADERS>;
-    createCache?: ExtractDependencyType<typeof CREATE_CACHE_TOKEN>;
+    requestManager: ExtractDependencyType<typeof REQUEST_MANAGER_TOKEN> | null;
+    headersList: ExtractDependencyType<typeof API_CLIENT_PASS_HEADERS> | null;
+    createCache: ExtractDependencyType<typeof CREATE_CACHE_TOKEN> | null;
     makeRequestRegistry: Map<string, MakeRequest>;
-    agent?: ExtractDependencyType<typeof HTTP_CLIENT_AGENT>;
-    querySerializer?: QuerySerializer;
-    disableCircuitBreaker: ExtractDependencyType<typeof DISABLE_CIRCUIT_BREAKER>;
-    defaultOptions?: Partial<HttpClientFactoryOptions>;
-    commandLineExecutionContext?: ExtractDependencyType<typeof COMMAND_LINE_EXECUTION_CONTEXT_TOKEN>;
+    agent: ExtractDependencyType<typeof HTTP_CLIENT_AGENT> | null;
+    querySerializer?: QuerySerializer | undefined;
+    disableCircuitBreaker: ExtractDependencyType<typeof DISABLE_CIRCUIT_BREAKER> | null;
+    defaultOptions: Partial<HttpClientFactoryOptions> | null;
+    commandLineExecutionContext: ExtractDependencyType<typeof COMMAND_LINE_EXECUTION_CONTEXT_TOKEN> | null;
 }) => ExtractTokenType<typeof HTTP_CLIENT_FACTORY>;

package/lib/index.es.js

@@ -133,7 +133,8 @@ class PapiService extends BaseHttpClient {
         this.di = di;
     }
     async request({ path, query, body }) {
-        const papiRoute = find((papi) => getPapiParameters(papi).path === `/${path}`, this.papi);
+        var _a;
+        const papiRoute = find((papi) => getPapiParameters(papi).path === `/${path}`, (_a = this.papi) !== null && _a !== void 0 ? _a : []);
         if (!papiRoute) {
             throw new Error(`papi handler '${path}' not found`);
         }
@@ -163,7 +164,7 @@ const PapiClientModule = /* @__PURE__ */ Module({
             useClass: PapiService,
             deps: {
                 di: DI_TOKEN,
-                papi: { token: SERVER_MODULE_PAPI_PUBLIC_ROUTE, optional: true, multi: true },
+                papi: { token: SERVER_MODULE_PAPI_PUBLIC_ROUTE, optional: true },
             },
         }),
     ],

package/lib/index.js

@@ -144,7 +144,8 @@ class PapiService extends httpClient.BaseHttpClient {
         this.di = di;
     }
     async request({ path, query, body }) {
-        const papiRoute = find__default["default"]((papi$1) => papi.getPapiParameters(papi$1).path === `/${path}`, this.papi);
+        var _a;
+        const papiRoute = find__default["default"]((papi$1) => papi.getPapiParameters(papi$1).path === `/${path}`, (_a = this.papi) !== null && _a !== void 0 ? _a : []);
         if (!papiRoute) {
             throw new Error(`papi handler '${path}' not found`);
         }
@@ -174,7 +175,7 @@ const PapiClientModule = /* @__PURE__ */ core.Module({
             useClass: PapiService,
             deps: {
                 di: core.DI_TOKEN,
-                papi: { token: tokensServer.SERVER_MODULE_PAPI_PUBLIC_ROUTE, optional: true, multi: true },
+                papi: { token: tokensServer.SERVER_MODULE_PAPI_PUBLIC_ROUTE, optional: true },
             },
         }),
     ],

package/lib/papi/papiService.d.ts

@@ -1,10 +1,11 @@
 import type { DI_TOKEN } from '@tramvai/core';
 import type { HttpClientRequest, HttpClientResponse } from '@tramvai/http-client';
 import { BaseHttpClient } from '@tramvai/http-client';
+import type { ExtractDependencyType } from '@tinkoff/dippy';
 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[];
+    di: ExtractDependencyType<typeof DI_TOKEN>;
+    papi: ExtractDependencyType<typeof SERVER_MODULE_PAPI_PUBLIC_ROUTE> | null;
 }
 export declare class PapiService extends BaseHttpClient {
     papi: Deps['papi'];

package/lib/test/unit/testApi.d.ts

@@ -5,7 +5,7 @@ type Options = Parameters<typeof getDiWrapper>[0] & {
 };
 export declare const testApi: (options: Options) => {
     di: import("@tinkoff/dippy").Container;
-    fetchMock: jest.Mock<any, unknown[]>;
+    fetchMock: jest.Mock<Promise<import("node-fetch").Response>, [url: import("node-fetch").RequestInfo, init?: import("node-fetch").RequestInit | undefined]>;
     mockJsonResponse: (body: Record<string, any>, init?: ResponseInit) => Promise<void>;
     clearCaches: () => void;
 };

package/lib/utils/fillHeaders.browser.d.ts

@@ -1,2 +1,3 @@
-export declare const fillHeaders: (deps: any) => (params: any) => any;
-export declare const fillHeaderIp: (deps: any) => (params: any) => any;
+import type { HttpClientRequest } from '@tramvai/http-client';
+export declare const fillHeaders: (deps: any) => (params: HttpClientRequest) => HttpClientRequest;
+export declare const fillHeaderIp: (deps: any) => (params: HttpClientRequest) => HttpClientRequest;

package/lib/utils/fillHeaders.d.ts

@@ -3,9 +3,9 @@ import type { API_CLIENT_PASS_HEADERS } from '@tramvai/tokens-http-client';
 import type { HttpClientRequest } from '@tramvai/http-client';
 import type { ExtractDependencyType } from '@tinkoff/dippy';
 export declare const fillHeaderIp: ({ requestManager, }: {
-    requestManager?: ExtractDependencyType<typeof REQUEST_MANAGER_TOKEN>;
+    requestManager: ExtractDependencyType<typeof REQUEST_MANAGER_TOKEN> | null;
 }) => (params: HttpClientRequest) => HttpClientRequest;
 export declare const fillHeaders: ({ requestManager, headersList, }: {
-    requestManager?: ExtractDependencyType<typeof REQUEST_MANAGER_TOKEN>;
-    headersList: ExtractDependencyType<typeof API_CLIENT_PASS_HEADERS>;
+    requestManager: ExtractDependencyType<typeof REQUEST_MANAGER_TOKEN> | null;
+    headersList: ExtractDependencyType<typeof API_CLIENT_PASS_HEADERS> | null;
 }) => (params: HttpClientRequest) => HttpClientRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-http-client",
-  "version": "2.56.1",
+  "version": "2.56.5",
   "initialVersion": "0.58.99",
   "description": "",
   "main": "lib/index.js",
@@ -27,25 +27,26 @@
   },
   "dependencies": {
     "@tramvai/http-client": "0.2.5",
-    "@tramvai/tinkoff-request-http-client-adapter": "0.9.133",
-    "@tramvai/tokens-http-client": "2.56.1",
-    "@tramvai/tokens-common": "2.56.1",
-    "@tramvai/tokens-server": "2.56.1",
-    "@tramvai/tokens-server-private": "2.56.1"
+    "@tramvai/tinkoff-request-http-client-adapter": "0.9.137",
+    "@tramvai/tokens-http-client": "2.56.5",
+    "@tramvai/tokens-common": "2.56.5",
+    "@tramvai/tokens-server": "2.56.5",
+    "@tramvai/tokens-server-private": "2.56.5"
   },
   "devDependencies": {
     "@tinkoff/request-core": "^0.9.2",
-    "@tinkoff/request-plugin-protocol-http": "^0.11.6"
+    "@tinkoff/request-plugin-protocol-http": "^0.11.6",
+    "@types/node-fetch": "^2.6.2"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "2.56.1",
-    "@tramvai/module-common": "2.56.1",
-    "@tramvai/papi": "2.56.1",
-    "@tramvai/test-helpers": "2.56.1",
-    "@tramvai/test-unit": "2.56.1",
-    "@tramvai/test-mocks": "2.56.1",
-    "@tinkoff/dippy": "0.8.10",
+    "@tramvai/core": "2.56.5",
+    "@tramvai/module-common": "2.56.5",
+    "@tramvai/papi": "2.56.5",
+    "@tramvai/test-helpers": "2.56.5",
+    "@tramvai/test-unit": "2.56.5",
+    "@tramvai/test-mocks": "2.56.5",
+    "@tinkoff/dippy": "0.8.11",
     "node-fetch": "^2.6.1",
     "tslib": "^2.4.0"
   },

package/tests.d.ts

@@ -6,7 +6,10 @@ type Options = Parameters<typeof getDiWrapper>[0] & {
 };
 declare const testApi: (options: Options) => {
     di: import("@tinkoff/dippy").Container;
-    fetchMock: jest.Mock<any, unknown[]>;
+    fetchMock: jest.Mock<Promise<import("node-fetch").Response>, [
+        url: import("node-fetch").RequestInfo,
+        init?: import("node-fetch").RequestInit | undefined
+    ]>;
     mockJsonResponse: (body: Record<string, any>, init?: ResponseInit) => Promise<void>;
     clearCaches: () => void;
 };

package/tests.js

@@ -148,7 +148,8 @@ class PapiService extends httpClient.BaseHttpClient {
         this.di = di;
     }
     async request({ path, query, body }) {
-        const papiRoute = find__default["default"]((papi$1) => papi.getPapiParameters(papi$1).path === `/${path}`, this.papi);
+        var _a;
+        const papiRoute = find__default["default"]((papi$1) => papi.getPapiParameters(papi$1).path === `/${path}`, (_a = this.papi) !== null && _a !== void 0 ? _a : []);
         if (!papiRoute) {
             throw new Error(`papi handler '${path}' not found`);
         }
@@ -178,7 +179,7 @@ const PapiClientModule = /* @__PURE__ */ core.Module({
             useClass: PapiService,
             deps: {
                 di: core.DI_TOKEN,
-                papi: { token: tokensServer.SERVER_MODULE_PAPI_PUBLIC_ROUTE, optional: true, multi: true },
+                papi: { token: tokensServer.SERVER_MODULE_PAPI_PUBLIC_ROUTE, optional: true },
             },
         }),
     ],