@tramvai/module-http-client 2.22.0 → 2.24.3

package/lib/index.es.js

@@ -14,7 +14,8 @@ 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';
+import { REQUEST, RESPONSE, FASTIFY_REQUEST, FASTIFY_RESPONSE } from '@tramvai/module-common';
+import { PAPI_EXECUTOR } from '@tramvai/tokens-server-private';
 
 const fillHeaderIp = ({ requestManager, }) => {
     if (!requestManager) {
@@ -132,34 +133,35 @@ class PapiService extends BaseHttpClient {
         this.di = di;
     }
     async request({ path, query, body }) {
-        var _a;
         const papiRoute = find((papi) => getPapiParameters(papi).path === `/${path}`, this.papi);
         if (!papiRoute) {
             throw new Error(`papi handler '${path}' not found`);
         }
-        const papi = getPapiParameters(papiRoute);
-        let rootDeps = {};
-        if (papi.rootDeps) {
-            rootDeps = this.di.getOfDeps(papi.rootDeps);
-            rootDeps = papi.mapRootDeps ? papi.mapRootDeps(rootDeps) : rootDeps;
-        }
-        const childDI = createChildContainer(this.di);
+        getPapiParameters(papiRoute);
         const req = { headers: { host: 'localhost' }, cookies: {}, query, body };
         const res = {};
-        childDI.register({
-            provide: REQUEST,
-            useValue: req,
-        });
-        childDI.register({
-            provide: RESPONSE,
-            useValue: res,
-        });
-        const payload = await getPapiParameters(papiRoute).handler({
-            ...rootDeps,
-            ...childDI.getOfDeps((_a = papi.deps) !== null && _a !== void 0 ? _a : {}),
-            req,
-            res,
-        });
+        const fastifyReq = { raw: req };
+        const fastifyRes = { raw: res };
+        const childDi = createChildContainer(this.di, [
+            {
+                provide: REQUEST,
+                useValue: req,
+            },
+            {
+                provide: RESPONSE,
+                useValue: res,
+            },
+            {
+                provide: FASTIFY_REQUEST,
+                useValue: fastifyReq,
+            },
+            {
+                provide: FASTIFY_RESPONSE,
+                useValue: fastifyRes,
+            },
+        ]);
+        const papiExecutor = childDi.get(PAPI_EXECUTOR);
+        const payload = await papiExecutor(papiRoute);
         return { payload, status: 200, headers: {} };
     }
 }

package/lib/index.js

@@ -17,6 +17,7 @@ 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 tokensServerPrivate = require('@tramvai/tokens-server-private');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -143,34 +144,35 @@ class PapiService extends httpClient.BaseHttpClient {
         this.di = di;
     }
     async request({ path, query, body }) {
-        var _a;
         const papiRoute = find__default["default"]((papi$1) => papi.getPapiParameters(papi$1).path === `/${path}`, this.papi);
         if (!papiRoute) {
             throw new Error(`papi handler '${path}' not found`);
         }
-        const papi$1 = papi.getPapiParameters(papiRoute);
-        let rootDeps = {};
-        if (papi$1.rootDeps) {
-            rootDeps = this.di.getOfDeps(papi$1.rootDeps);
-            rootDeps = papi$1.mapRootDeps ? papi$1.mapRootDeps(rootDeps) : rootDeps;
-        }
-        const childDI = dippy.createChildContainer(this.di);
+        papi.getPapiParameters(papiRoute);
         const req = { headers: { host: 'localhost' }, cookies: {}, query, body };
         const res = {};
-        childDI.register({
-            provide: moduleCommon.REQUEST,
-            useValue: req,
-        });
-        childDI.register({
-            provide: moduleCommon.RESPONSE,
-            useValue: res,
-        });
-        const payload = await papi.getPapiParameters(papiRoute).handler({
-            ...rootDeps,
-            ...childDI.getOfDeps((_a = papi$1.deps) !== null && _a !== void 0 ? _a : {}),
-            req,
-            res,
-        });
+        const fastifyReq = { raw: req };
+        const fastifyRes = { raw: res };
+        const childDi = dippy.createChildContainer(this.di, [
+            {
+                provide: moduleCommon.REQUEST,
+                useValue: req,
+            },
+            {
+                provide: moduleCommon.RESPONSE,
+                useValue: res,
+            },
+            {
+                provide: moduleCommon.FASTIFY_REQUEST,
+                useValue: fastifyReq,
+            },
+            {
+                provide: moduleCommon.FASTIFY_RESPONSE,
+                useValue: fastifyRes,
+            },
+        ]);
+        const papiExecutor = childDi.get(tokensServerPrivate.PAPI_EXECUTOR);
+        const payload = await papiExecutor(papiRoute);
         return { payload, status: 200, headers: {} };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-http-client",
-  "version": "2.22.0",
+  "version": "2.24.3",
   "initialVersion": "0.58.99",
   "description": "",
   "main": "lib/index.js",
@@ -27,10 +27,11 @@
   },
   "dependencies": {
     "@tramvai/http-client": "0.2.2",
-    "@tramvai/tinkoff-request-http-client-adapter": "0.9.55",
-    "@tramvai/tokens-http-client": "2.22.0",
-    "@tramvai/tokens-common": "2.22.0",
-    "@tramvai/tokens-server": "2.22.0"
+    "@tramvai/tinkoff-request-http-client-adapter": "0.9.60",
+    "@tramvai/tokens-http-client": "2.24.3",
+    "@tramvai/tokens-common": "2.24.3",
+    "@tramvai/tokens-server": "2.24.3",
+    "@tramvai/tokens-server-private": "2.24.3"
   },
   "devDependencies": {
     "@tinkoff/request-core": "^0.9.2",
@@ -38,12 +39,12 @@
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "2.22.0",
-    "@tramvai/module-common": "2.22.0",
-    "@tramvai/papi": "2.22.0",
-    "@tramvai/test-helpers": "2.22.0",
-    "@tramvai/test-mocks": "2.22.0",
-    "@tinkoff/dippy": "0.8.2",
+    "@tramvai/core": "2.24.3",
+    "@tramvai/module-common": "2.24.3",
+    "@tramvai/papi": "2.24.3",
+    "@tramvai/test-helpers": "2.24.3",
+    "@tramvai/test-mocks": "2.24.3",
+    "@tinkoff/dippy": "0.8.3",
     "node-fetch": "^2.6.1",
     "tslib": "^2.0.3"
   },

package/tests.js

@@ -20,6 +20,7 @@ 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 tokensServerPrivate = require('@tramvai/tokens-server-private');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -147,34 +148,35 @@ class PapiService extends httpClient.BaseHttpClient {
         this.di = di;
     }
     async request({ path, query, body }) {
-        var _a;
         const papiRoute = find__default["default"]((papi$1) => papi.getPapiParameters(papi$1).path === `/${path}`, this.papi);
         if (!papiRoute) {
             throw new Error(`papi handler '${path}' not found`);
         }
-        const papi$1 = papi.getPapiParameters(papiRoute);
-        let rootDeps = {};
-        if (papi$1.rootDeps) {
-            rootDeps = this.di.getOfDeps(papi$1.rootDeps);
-            rootDeps = papi$1.mapRootDeps ? papi$1.mapRootDeps(rootDeps) : rootDeps;
-        }
-        const childDI = dippy.createChildContainer(this.di);
+        papi.getPapiParameters(papiRoute);
         const req = { headers: { host: 'localhost' }, cookies: {}, query, body };
         const res = {};
-        childDI.register({
-            provide: moduleCommon.REQUEST,
-            useValue: req,
-        });
-        childDI.register({
-            provide: moduleCommon.RESPONSE,
-            useValue: res,
-        });
-        const payload = await papi.getPapiParameters(papiRoute).handler({
-            ...rootDeps,
-            ...childDI.getOfDeps((_a = papi$1.deps) !== null && _a !== void 0 ? _a : {}),
-            req,
-            res,
-        });
+        const fastifyReq = { raw: req };
+        const fastifyRes = { raw: res };
+        const childDi = dippy.createChildContainer(this.di, [
+            {
+                provide: moduleCommon.REQUEST,
+                useValue: req,
+            },
+            {
+                provide: moduleCommon.RESPONSE,
+                useValue: res,
+            },
+            {
+                provide: moduleCommon.FASTIFY_REQUEST,
+                useValue: fastifyReq,
+            },
+            {
+                provide: moduleCommon.FASTIFY_RESPONSE,
+                useValue: fastifyRes,
+            },
+        ]);
+        const papiExecutor = childDi.get(tokensServerPrivate.PAPI_EXECUTOR);
+        const payload = await papiExecutor(papiRoute);
         return { payload, status: 200, headers: {} };
     }
 }