@tramvai/module-http-client 6.68.4 → 6.77.2

package/lib/index.es.js

@@ -3,6 +3,7 @@ export { httpClientFactory } from './httpClient/httpClientFactory.es.js';
 import '@tramvai/core';
 import '@tramvai/tokens-server';
 export * from '@tramvai/tokens-http-client';
+import '@tramvai/tokens-common';
 export { PapiService } from './papi/papiService.es.js';
 export { fillHeaderIp, fillHeaders } from './utils/fillHeaders.es.js';
 export * from '@tramvai/http-client';

package/lib/index.js

@@ -7,6 +7,7 @@ var httpClientFactory = require('./httpClient/httpClientFactory.js');
 require('@tramvai/core');
 require('@tramvai/tokens-server');
 var tokensHttpClient = require('@tramvai/tokens-http-client');
+require('@tramvai/tokens-common');
 var papiService = require('./papi/papiService.js');
 var fillHeaders = require('./utils/fillHeaders.js');
 var httpClient = require('@tramvai/http-client');

package/lib/papi/papiService.d.ts

@@ -3,14 +3,22 @@ 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';
+import { ASYNC_LOCAL_STORAGE_TOKEN } from '@tramvai/tokens-common';
+declare module '@tramvai/tokens-common' {
+    interface AsyncLocalStorageState {
+        tramvaiRequestDi?: ExtractDependencyType<typeof DI_TOKEN>;
+    }
+}
 export interface Deps {
     di: ExtractDependencyType<typeof DI_TOKEN>;
     papi: ExtractDependencyType<typeof SERVER_MODULE_PAPI_PUBLIC_ROUTE> | null;
+    storage: ExtractDependencyType<typeof ASYNC_LOCAL_STORAGE_TOKEN>;
 }
 export declare class PapiService extends BaseHttpClient {
     papi: Deps['papi'];
     di: Deps['di'];
-    constructor({ papi, di }: Deps);
+    storage: Deps['storage'];
+    constructor({ papi, di, storage }: Deps);
     request<R = any>({ path, query, body, headers, }: HttpClientRequest): Promise<HttpClientResponse<R>>;
 }
 //# sourceMappingURL=papiService.d.ts.map

package/lib/papi/papiService.es.js

@@ -12,10 +12,12 @@ import { getPathParams } from '../utils/getPathParams.es.js';
 class PapiService extends BaseHttpClient {
     papi;
     di;
-    constructor({ papi, di }) {
+    storage;
+    constructor({ papi, di, storage }) {
         super();
         this.papi = flatten(papi || []);
         this.di = di;
+        this.storage = storage;
     }
     async request({ path, query, body, headers, }) {
         const pathWithLeadingSlash = path?.startsWith('/') ? path : `/${path}`;
@@ -42,7 +44,11 @@ class PapiService extends BaseHttpClient {
             },
         ]);
         const papiExecutor = childDi.get(PAPI_EXECUTOR);
-        const payload = await papiExecutor(papiRoute);
+        const payload = await this.storage.run({
+            tramvaiRequestDi: childDi,
+        }, () => {
+            return papiExecutor(papiRoute);
+        });
         return { payload, status: 200, headers: {} };
     }
 }

package/lib/papi/papiService.js

@@ -21,10 +21,12 @@ var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
 class PapiService extends httpClient.BaseHttpClient {
     papi;
     di;
-    constructor({ papi, di }) {
+    storage;
+    constructor({ papi, di, storage }) {
         super();
         this.papi = flatten__default["default"](papi || []);
         this.di = di;
+        this.storage = storage;
     }
     async request({ path, query, body, headers, }) {
         const pathWithLeadingSlash = path?.startsWith('/') ? path : `/${path}`;
@@ -51,7 +53,11 @@ class PapiService extends httpClient.BaseHttpClient {
             },
         ]);
         const papiExecutor = childDi.get(tokensServerPrivate.PAPI_EXECUTOR);
-        const payload = await papiExecutor(papiRoute);
+        const payload = await this.storage.run({
+            tramvaiRequestDi: childDi,
+        }, () => {
+            return papiExecutor(papiRoute);
+        });
         return { payload, status: 200, headers: {} };
     }
 }

package/lib/papiClientModule.es.js

@@ -1,6 +1,7 @@
 import { Module, provide, Scope, DI_TOKEN } from '@tramvai/core';
 import { SERVER_MODULE_PAPI_PUBLIC_ROUTE } from '@tramvai/tokens-server';
 import { PAPI_SERVICE } from '@tramvai/tokens-http-client';
+import { ASYNC_LOCAL_STORAGE_TOKEN } from '@tramvai/tokens-common';
 import { PapiService } from './papi/papiService.es.js';
 export { PapiService } from './papi/papiService.es.js';
 
@@ -13,6 +14,7 @@ const PapiClientModule = /* @__PURE__ */ Module({
             deps: {
                 di: DI_TOKEN,
                 papi: { token: SERVER_MODULE_PAPI_PUBLIC_ROUTE, optional: true },
+                storage: ASYNC_LOCAL_STORAGE_TOKEN,
             },
         }),
     ],

package/lib/papiClientModule.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var core = require('@tramvai/core');
 var tokensServer = require('@tramvai/tokens-server');
 var tokensHttpClient = require('@tramvai/tokens-http-client');
+var tokensCommon = require('@tramvai/tokens-common');
 var papiService = require('./papi/papiService.js');
 
 const PapiClientModule = /* @__PURE__ */ core.Module({
@@ -16,6 +17,7 @@ const PapiClientModule = /* @__PURE__ */ core.Module({
             deps: {
                 di: core.DI_TOKEN,
                 papi: { token: tokensServer.SERVER_MODULE_PAPI_PUBLIC_ROUTE, optional: true },
+                storage: tokensCommon.ASYNC_LOCAL_STORAGE_TOKEN,
             },
         }),
     ],

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

@@ -1,12 +1,12 @@
-/// <reference types="jest" />
 import { getDiWrapper } from '@tramvai/test-helpers';
 import type { createMockEnvManager } from '@tramvai/test-mocks';
+import type { Mock } from 'jest-mock';
 type Options = Parameters<typeof getDiWrapper>[0] & {
     env?: Parameters<typeof createMockEnvManager>[0];
 };
 export declare const testApi: (options: Options) => {
     di: import("@tinkoff/dippy").Container;
-    fetchMock: jest.Mock<any, any, any>;
+    fetchMock: Mock<import("jest-mock").UnknownFunction>;
     mockJsonResponse: (body: Record<string, any>, { status, headers }?: {
         status?: number | undefined;
         headers?: Record<string, string> | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-http-client",
-  "version": "6.68.4",
+  "version": "6.77.2",
   "initialVersion": "0.58.99",
   "description": "",
   "engines": {
@@ -28,27 +28,30 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@tramvai/http-client": "0.6.0",
-    "@tramvai/tinkoff-request-http-client-adapter": "0.13.122",
-    "@tramvai/tokens-common": "6.68.4",
-    "@tramvai/tokens-http-client": "6.68.4",
-    "@tramvai/tokens-server": "6.68.4",
-    "@tramvai/tokens-server-private": "6.68.4",
+    "@jest/globals": "^29.7.0",
+    "@tramvai/http-client": "0.6.1",
+    "@tramvai/tinkoff-request-http-client-adapter": "0.13.152",
+    "@tramvai/tokens-common": "6.77.2",
+    "@tramvai/tokens-http-client": "6.77.2",
+    "@tramvai/tokens-server": "6.77.2",
+    "@tramvai/tokens-server-private": "6.77.2",
+    "jest": "^29.7.0",
     "undici": "^7.16.0"
   },
   "devDependencies": {
     "@tinkoff/request-core": "^0.10.0",
-    "@tinkoff/request-plugin-protocol-http": "0.15.0"
+    "@tinkoff/request-plugin-protocol-http": "0.16.0",
+    "@tramvai/build": "7.2.1"
   },
   "peerDependencies": {
-    "@tinkoff/dippy": "0.12.3",
+    "@tinkoff/dippy": "0.12.6",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "6.68.4",
-    "@tramvai/module-common": "6.68.4",
-    "@tramvai/papi": "6.68.4",
-    "@tramvai/test-helpers": "6.68.4",
-    "@tramvai/test-mocks": "6.68.4",
-    "@tramvai/test-unit": "6.68.4",
+    "@tramvai/core": "6.77.2",
+    "@tramvai/module-common": "6.77.2",
+    "@tramvai/papi": "6.77.2",
+    "@tramvai/test-helpers": "6.77.2",
+    "@tramvai/test-mocks": "6.77.2",
+    "@tramvai/test-unit": "6.77.2",
     "tslib": "^2.4.0"
   },
   "license": "Apache-2.0",

package/tests.d.ts

@@ -1,12 +1,12 @@
-/// <reference types="jest" />
 import { getDiWrapper } from "@tramvai/test-helpers";
 import { createMockEnvManager } from "@tramvai/test-mocks";
+import { Mock } from "jest-mock";
 type Options = Parameters<typeof getDiWrapper>[0] & {
     env?: Parameters<typeof createMockEnvManager>[0];
 };
 declare const testApi: (options: Options) => {
     di: import("@tinkoff/dippy").Container;
-    fetchMock: jest.Mock<any, any, any>;
+    fetchMock: Mock<import("jest-mock").UnknownFunction>;
     mockJsonResponse: (body: Record<string, any>, { status, headers }?: {
         status?: number | undefined;
         headers?: Record<string, string> | undefined;

package/tests.js

@@ -7,6 +7,7 @@ var testMocks = require('@tramvai/test-mocks');
 var core = require('@tramvai/core');
 var tokensHttpClient = require('@tramvai/tokens-http-client');
 var tokensServer = require('@tramvai/tokens-server');
+var tokensCommon = require('@tramvai/tokens-common');
 var find = require('@tinkoff/utils/array/find');
 var flatten = require('@tinkoff/utils/array/flatten');
 var httpClient = require('@tramvai/http-client');
@@ -15,10 +16,10 @@ var papi = require('@tramvai/papi');
 var tokensServerPrivate = require('@tramvai/tokens-server-private');
 var identity = require('@tinkoff/utils/function/identity');
 var pick = require('@tinkoff/utils/object/pick');
-var tokensCommon = require('@tramvai/tokens-common');
 var isNil = require('@tinkoff/utils/is/nil');
 var compose = require('@tinkoff/utils/function/compose');
 var tinkoffRequestHttpClientAdapter = require('@tramvai/tinkoff-request-http-client-adapter');
+var globals = require('@jest/globals');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -67,10 +68,11 @@ const comparePathWithPattern = (path, pattern) => new RegExp(`^${pattern.replace
 const getPathParams = (path, pattern) => path.match(new RegExp(`^${pattern.replace(/:(\w+)/g, '(?<$1>[^\\/]+)')}$`))?.groups ?? {};
 
 class PapiService extends httpClient.BaseHttpClient {
-    constructor({ papi, di }) {
+    constructor({ papi, di, storage }) {
         super();
         this.papi = flatten__default["default"](papi || []);
         this.di = di;
+        this.storage = storage;
     }
     async request({ path, query, body, headers, }) {
         const pathWithLeadingSlash = path?.startsWith('/') ? path : `/${path}`;
@@ -97,7 +99,11 @@ class PapiService extends httpClient.BaseHttpClient {
             },
         ]);
         const papiExecutor = childDi.get(tokensServerPrivate.PAPI_EXECUTOR);
-        const payload = await papiExecutor(papiRoute);
+        const payload = await this.storage.run({
+            tramvaiRequestDi: childDi,
+        }, () => {
+            return papiExecutor(papiRoute);
+        });
         return { payload, status: 200, headers: {} };
     }
 }
@@ -111,6 +117,7 @@ const PapiClientModule = /* @__PURE__ */ core.Module({
             deps: {
                 di: core.DI_TOKEN,
                 papi: { token: tokensServer.SERVER_MODULE_PAPI_PUBLIC_ROUTE, optional: true },
+                storage: tokensCommon.ASYNC_LOCAL_STORAGE_TOKEN,
             },
         }),
     ],
@@ -359,7 +366,7 @@ const HttpClientModule = /* @__PURE__ */ core.declareModule({
     ],
 });
 
-const fetch = jest.spyOn(require('undici'), 'fetch');
+const fetch = globals.jest.spyOn(require('undici'), 'fetch');
 const testApi = (options) => {
     const caches = [];
     const { modules = [], providers = [], env } = options;