@tramvai/module-mocker 2.22.0 → 2.24.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/server.es.js +21 -12
  2. package/lib/server.js +24 -15
  3. package/package.json +6 -6
package/lib/server.es.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { __decorate } from 'tslib';
2
2
  import { Module, provide, commandLineListTokens, Scope } from '@tramvai/core';
3
3
  import { createPapiMethod } from '@tramvai/papi';
4
- import { LOGGER_TOKEN, ENV_MANAGER_TOKEN } from '@tramvai/module-common';
4
+ import { LOGGER_TOKEN, ENV_MANAGER_TOKEN, FASTIFY_REQUEST, FASTIFY_RESPONSE } from '@tramvai/tokens-common';
5
5
  import { SERVER_MODULE_PAPI_PUBLIC_URL, SERVER_MODULE_PAPI_PUBLIC_ROUTE } from '@tramvai/tokens-server';
6
6
  import { FileSystemMockRepository, Mocker } from '@tinkoff/mocker';
7
7
  import { createToken } from '@tinkoff/dippy';
@@ -110,19 +110,20 @@ MockerModule = MockerModule_1 = __decorate([
110
110
  provide({
111
111
  provide: MOCKER,
112
112
  scope: Scope.SINGLETON,
113
- useFactory: ({ repositories, logger }) => {
113
+ useFactory: ({ repositories, logger, papiUrl }) => {
114
114
  const log = logger('mocker');
115
115
  return new Mocker({
116
116
  repositories,
117
117
  logger: log,
118
- appRoutePrefix: '/mocker',
119
- apiRoutePrefix: '/mocker-api',
118
+ appRoutePrefix: `${papiUrl}/mocker`,
119
+ apiRoutePrefix: `${papiUrl}/mocker-api`,
120
120
  passUnhandledRequests: true,
121
121
  });
122
122
  },
123
123
  deps: {
124
124
  repositories: MOCKER_REPOSITORY,
125
125
  logger: LOGGER_TOKEN,
126
+ papiUrl: SERVER_MODULE_PAPI_PUBLIC_URL,
126
127
  },
127
128
  }),
128
129
  {
@@ -132,11 +133,15 @@ MockerModule = MockerModule_1 = __decorate([
132
133
  return createPapiMethod({
133
134
  method: 'all',
134
135
  path: '/mocker/*',
135
- options: {
136
- respond: false,
136
+ async handler() {
137
+ const { req, res } = this.deps;
138
+ res.hijack();
139
+ // TODO: fix compatibility
140
+ mocker.use(req.raw, res.raw);
137
141
  },
138
- async handler(req, res) {
139
- mocker.use(req, res);
142
+ deps: {
143
+ req: FASTIFY_REQUEST,
144
+ res: FASTIFY_RESPONSE,
140
145
  },
141
146
  });
142
147
  },
@@ -151,11 +156,15 @@ MockerModule = MockerModule_1 = __decorate([
151
156
  return createPapiMethod({
152
157
  method: 'all',
153
158
  path: '/mocker-api/*',
154
- options: {
155
- respond: false,
159
+ async handler() {
160
+ const { req, res } = this.deps;
161
+ // TODO: fix compatibility
162
+ res.hijack();
163
+ mocker.useApi(req.raw, res.raw);
156
164
  },
157
- async handler(req, res) {
158
- mocker.useApi(req, res);
165
+ deps: {
166
+ req: FASTIFY_REQUEST,
167
+ res: FASTIFY_RESPONSE,
159
168
  },
160
169
  });
161
170
  },
package/lib/server.js CHANGED
@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
5
5
  var tslib = require('tslib');
6
6
  var core = require('@tramvai/core');
7
7
  var papi = require('@tramvai/papi');
8
- var moduleCommon = require('@tramvai/module-common');
8
+ var tokensCommon = require('@tramvai/tokens-common');
9
9
  var tokensServer = require('@tramvai/tokens-server');
10
10
  var mocker = require('@tinkoff/mocker');
11
11
  var dippy = require('@tinkoff/dippy');
@@ -73,9 +73,9 @@ exports.MockerModule = MockerModule_1 = tslib.__decorate([
73
73
  },
74
74
  deps: {
75
75
  mocker: MOCKER,
76
- logger: moduleCommon.LOGGER_TOKEN,
76
+ logger: tokensCommon.LOGGER_TOKEN,
77
77
  mockerConfigFactory: MOCKER_CONFIGURATION,
78
- envManager: moduleCommon.ENV_MANAGER_TOKEN,
78
+ envManager: tokensCommon.ENV_MANAGER_TOKEN,
79
79
  papiPublicUrl: tokensServer.SERVER_MODULE_PAPI_PUBLIC_URL,
80
80
  },
81
81
  }),
@@ -114,19 +114,20 @@ exports.MockerModule = MockerModule_1 = tslib.__decorate([
114
114
  core.provide({
115
115
  provide: MOCKER,
116
116
  scope: core.Scope.SINGLETON,
117
- useFactory: ({ repositories, logger }) => {
117
+ useFactory: ({ repositories, logger, papiUrl }) => {
118
118
  const log = logger('mocker');
119
119
  return new mocker.Mocker({
120
120
  repositories,
121
121
  logger: log,
122
- appRoutePrefix: '/mocker',
123
- apiRoutePrefix: '/mocker-api',
122
+ appRoutePrefix: `${papiUrl}/mocker`,
123
+ apiRoutePrefix: `${papiUrl}/mocker-api`,
124
124
  passUnhandledRequests: true,
125
125
  });
126
126
  },
127
127
  deps: {
128
128
  repositories: MOCKER_REPOSITORY,
129
- logger: moduleCommon.LOGGER_TOKEN,
129
+ logger: tokensCommon.LOGGER_TOKEN,
130
+ papiUrl: tokensServer.SERVER_MODULE_PAPI_PUBLIC_URL,
130
131
  },
131
132
  }),
132
133
  {
@@ -136,11 +137,15 @@ exports.MockerModule = MockerModule_1 = tslib.__decorate([
136
137
  return papi.createPapiMethod({
137
138
  method: 'all',
138
139
  path: '/mocker/*',
139
- options: {
140
- respond: false,
140
+ async handler() {
141
+ const { req, res } = this.deps;
142
+ res.hijack();
143
+ // TODO: fix compatibility
144
+ mocker.use(req.raw, res.raw);
141
145
  },
142
- async handler(req, res) {
143
- mocker.use(req, res);
146
+ deps: {
147
+ req: tokensCommon.FASTIFY_REQUEST,
148
+ res: tokensCommon.FASTIFY_RESPONSE,
144
149
  },
145
150
  });
146
151
  },
@@ -155,11 +160,15 @@ exports.MockerModule = MockerModule_1 = tslib.__decorate([
155
160
  return papi.createPapiMethod({
156
161
  method: 'all',
157
162
  path: '/mocker-api/*',
158
- options: {
159
- respond: false,
163
+ async handler() {
164
+ const { req, res } = this.deps;
165
+ // TODO: fix compatibility
166
+ res.hijack();
167
+ mocker.useApi(req.raw, res.raw);
160
168
  },
161
- async handler(req, res) {
162
- mocker.useApi(req, res);
169
+ deps: {
170
+ req: tokensCommon.FASTIFY_REQUEST,
171
+ res: tokensCommon.FASTIFY_RESPONSE,
163
172
  },
164
173
  });
165
174
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/module-mocker",
3
- "version": "2.22.0",
3
+ "version": "2.24.0",
4
4
  "description": "",
5
5
  "main": "./lib/server.js",
6
6
  "browser": "./lib/browser.js",
@@ -20,14 +20,14 @@
20
20
  "build-for-publish": "true"
21
21
  },
22
22
  "dependencies": {
23
- "@tinkoff/mocker": "2.0.2",
23
+ "@tinkoff/mocker": "2.1.0",
24
24
  "tslib": "^2.0.3"
25
25
  },
26
26
  "peerDependencies": {
27
- "@tramvai/core": "2.22.0",
28
- "@tramvai/module-common": "2.22.0",
29
- "@tramvai/papi": "2.22.0",
30
- "@tramvai/tokens-server": "2.22.0",
27
+ "@tramvai/core": "2.24.0",
28
+ "@tramvai/papi": "2.24.0",
29
+ "@tramvai/tokens-common": "2.24.0",
30
+ "@tramvai/tokens-server": "2.24.0",
31
31
  "@tinkoff/dippy": "0.8.2"
32
32
  },
33
33
  "license": "Apache-2.0"