yakuza0 2.21.10-beta.21 → 2.21.10-beta.22

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/package.json +3 -3
  2. package/server/proxy/tire.js +36 -26
  3. package/template/http.plugin.js +10 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "yakuza0",
3
- "version": "2.21.10-beta.21",
3
+ "version": "2.21.10-beta.22",
4
4
  "description": "yakuza0 with nuxt",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -105,12 +105,12 @@
105
105
  "tcp-port-used": "^1.0.1",
106
106
  "ua-parser-js": "^0.7.20",
107
107
  "v8-compile-cache": "^2.0.2",
108
- "yakuza1": "2.6.10-beta.3"
108
+ "yakuza1": "2.6.10-beta.4"
109
109
  },
110
110
  "peerDependencies": {
111
111
  "@rdc/nuxt": "2.15.8-0",
112
112
  "core-js": "3.10.1",
113
113
  "eslint": "7.2.0",
114
- "yakuza1": "2.6.10-beta.3"
114
+ "yakuza1": "2.6.10-beta.4"
115
115
  }
116
116
  }
package/server/proxy/tire.js CHANGED
@@ -8,13 +8,9 @@ var _keys = require("babel-runtime/core-js/object/keys");
8
8
 
9
9
  var _keys2 = _interopRequireDefault(_keys);
10
10
 
11
- var _extends2 = require("babel-runtime/helpers/extends");
11
+ var _extends4 = require("babel-runtime/helpers/extends");
12
12
 
13
- var _extends3 = _interopRequireDefault(_extends2);
14
-
15
- var _defineProperty2 = require("babel-runtime/helpers/defineProperty");
16
-
17
- var _defineProperty3 = _interopRequireDefault(_defineProperty2);
13
+ var _extends5 = _interopRequireDefault(_extends4);
18
14
 
19
15
  var _regenerator = require("babel-runtime/regenerator");
20
16
 
@@ -24,6 +20,10 @@ var _stringify = require("babel-runtime/core-js/json/stringify");
24
20
 
25
21
  var _stringify2 = _interopRequireDefault(_stringify);
26
22
 
23
+ var _defineProperty2 = require("babel-runtime/helpers/defineProperty");
24
+
25
+ var _defineProperty3 = _interopRequireDefault(_defineProperty2);
26
+
27
27
  var _asyncToGenerator2 = require("babel-runtime/helpers/asyncToGenerator");
28
28
 
29
29
  var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
@@ -69,7 +69,7 @@ exports.default = function () {
69
69
  var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(_ref) {
70
70
  var config = _ref.config;
71
71
 
72
- var appConf, appName, server, pIp, pHost, timeout, isFastDfs, apiVer, getUc, build, baseConfig, app, _headers2;
72
+ var appConf, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _headers;
73
73
 
74
74
  return _regenerator2.default.wrap(function _callee3$(_context3) {
75
75
  while (1) {
@@ -81,9 +81,19 @@ exports.default = function () {
81
81
  pIp = _server.ip.address();
82
82
  pHost = server.protocol + "//" + pIp + ":" + appConf.port;
83
83
  timeout = _config2.default.server.infoTimeout + 5000;
84
+ commonHeaders = {};
85
+
86
+ getHeader = function getHeader(req) {
87
+ if (req && req.headers) {
88
+ var _ref3;
89
+
90
+ return _ref3 = {}, (0, _defineProperty3.default)(_ref3, _def.variable.guRouteGroupHeader, req.headers[_def.variable.guRouteGroupHeader] === undefined ? commonHeaders[_def.variable.guRouteGroupHeader] : req.headers[_def.variable.guRouteGroupHeader]), (0, _defineProperty3.default)(_ref3, _def.variable.guRouteNameHeader, req.headers[_def.variable.guRouteNameHeader] === undefined ? commonHeaders[_def.variable.guRouteNameHeader] : req.headers[_def.variable.guRouteNameHeader]), (0, _defineProperty3.default)(_ref3, _def.variable.guRouteVerHeader, req.headers[_def.variable.guRouteVerHeader] === undefined ? commonHeaders[_def.variable.guRouteVerHeader] : req.headers[_def.variable.guRouteVerHeader]), _ref3;
91
+ }
92
+ return {};
93
+ };
84
94
 
85
95
  if (!server.generate.enabled) {
86
- _context3.next = 24;
96
+ _context3.next = 26;
87
97
  break;
88
98
  }
89
99
 
@@ -102,7 +112,7 @@ exports.default = function () {
102
112
  // }
103
113
 
104
114
  getUc = function () {
105
- var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(req, res) {
115
+ var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(req, res) {
106
116
  var ucBody, defDomain, bodyStr, Cookie, ucHeaders, hs, rs, resCookie;
107
117
  return _regenerator2.default.wrap(function _callee$(_context) {
108
118
  while (1) {
@@ -156,12 +166,12 @@ exports.default = function () {
156
166
  }));
157
167
 
158
168
  return function getUc(_x2, _x3) {
159
- return _ref3.apply(this, arguments);
169
+ return _ref4.apply(this, arguments);
160
170
  };
161
171
  }();
162
172
 
163
173
  build = function () {
164
- var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
174
+ var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
165
175
  return _regenerator2.default.wrap(function _callee2$(_context2) {
166
176
  while (1) {
167
177
  switch (_context2.prev = _context2.next) {
@@ -198,19 +208,19 @@ exports.default = function () {
198
208
  }));
199
209
 
200
210
  return function build() {
201
- return _ref4.apply(this, arguments);
211
+ return _ref5.apply(this, arguments);
202
212
  };
203
213
  }();
204
214
 
205
215
  if (_config2.default.security.isTire) {
206
- _context3.next = 14;
216
+ _context3.next = 16;
207
217
  break;
208
218
  }
209
219
 
210
- _context3.next = 14;
220
+ _context3.next = 16;
211
221
  return build();
212
222
 
213
- case 14:
223
+ case 16:
214
224
  baseConfig = {
215
225
  // changeOrigin: true,
216
226
  secure: false,
@@ -235,6 +245,7 @@ exports.default = function () {
235
245
  (0, _secCache.secCacheClear)();
236
246
  res.status(404).send("The page was not found ~~");
237
247
  } else {
248
+ commonHeaders = getHeader(req);
238
249
  next();
239
250
  }
240
251
  });
@@ -300,10 +311,9 @@ exports.default = function () {
300
311
  timeout: timeout,
301
312
  json: true,
302
313
  resolveWithFullResponse: true,
303
- headers: (0, _defineProperty3.default)({
304
- // Cookie: Cookies.koaGetCookieStr({req}),
314
+ headers: (0, _extends5.default)({}, commonHeaders, (0, _defineProperty3.default)({
305
315
  Cookie: req.get("cookie")
306
- }, _def.variable.childKeyHeader, _config2.default.childKey)
316
+ }, _def.variable.childKeyHeader, _config2.default.childKey))
307
317
  }).then(function (response) {
308
318
  // console.log(response);
309
319
  var data = response.body;
@@ -312,7 +322,7 @@ exports.default = function () {
312
322
  // console.log(req.url, "req res have");
313
323
  data.body = Buffer.from(data.body);
314
324
  if (response.headers['set-cookie']) {
315
- data.resHeaders = (0, _extends3.default)({}, data.resHeaders, {
325
+ data.resHeaders = (0, _extends5.default)({}, data.resHeaders, {
316
326
  'set-cookie': response.headers['set-cookie']
317
327
  });
318
328
  }
@@ -366,15 +376,15 @@ exports.default = function () {
366
376
  });
367
377
 
368
378
  if (_config2.default.security.isTire) {
369
- app.use('/apiv1', createProxyMiddleware((0, _extends3.default)({}, baseConfig, {
379
+ app.use('/apiv1', createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
370
380
  target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
371
- headers: (_headers2 = {}, (0, _defineProperty3.default)(_headers2, _def.variable.ipHeader, '127.0.0.1'), (0, _defineProperty3.default)(_headers2, _def.variable.appCodeHeader, config.appConf.appCode), _headers2),
381
+ headers: (_headers = {}, (0, _defineProperty3.default)(_headers, _def.variable.ipHeader, '127.0.0.1'), (0, _defineProperty3.default)(_headers, _def.variable.appCodeHeader, config.appConf.appCode), _headers),
372
382
  pathRewrite: {
373
383
  '^/apiv1': "/" + _config2.default.proxyServer.apiKey + "/" + _config2.default.name + "/client/backend" // rewrite path
374
384
  }
375
385
  })));
376
386
 
377
- app.use('/apiv2', createProxyMiddleware((0, _extends3.default)({}, baseConfig, {
387
+ app.use('/apiv2', createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
378
388
  target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort
379
389
  })));
380
390
  }
@@ -384,7 +394,7 @@ exports.default = function () {
384
394
  // app.use(`/_nuxt`, express.static(clientPath))
385
395
  // app.use(`${_.bothAddFix(server.basePath, "/")}_nuxt`, express.static(clientPath))
386
396
 
387
- app.use('/', createProxyMiddleware((0, _extends3.default)({}, baseConfig, {
397
+ app.use('/', createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
388
398
  target: "http://127.0.0.1:" + config.appConf.appPort,
389
399
  ws: true,
390
400
  onProxyRes: function onProxyRes(proxyRes, req, res) {
@@ -480,10 +490,10 @@ exports.default = function () {
480
490
  },
481
491
  timeout: timeout,
482
492
  json: true,
483
- headers: (0, _defineProperty3.default)({
493
+ headers: (0, _extends5.default)({}, commonHeaders, (0, _defineProperty3.default)({
484
494
  // Cookie: Cookies.koaGetCookieStr({req}),
485
495
  Cookie: req.get("cookie")
486
- }, _def.variable.childKeyHeader, _config2.default.childKey)
496
+ }, _def.variable.childKeyHeader, _config2.default.childKey))
487
497
  }).then(function () {}).catch(function (e) {});
488
498
  }
489
499
  }
@@ -524,7 +534,7 @@ exports.default = function () {
524
534
  }, server.generate.maxAge * 1000);
525
535
  }
526
536
 
527
- case 24:
537
+ case 26:
528
538
  case "end":
529
539
  return _context3.stop();
530
540
  }
package/template/http.plugin.js CHANGED
@@ -57,8 +57,16 @@ export default (ctx, inject) => {
57
57
  // Don't accept brotli encoding because Node can't parse it
58
58
  defaults.headers['accept-encoding'] = 'gzip, deflate';
59
59
 
60
- const {getClientIP} = require("yakuza1/server");
61
- defaults.headers[variable.adjoinIpHeader] = getClientIP(req, {stupid: true});
60
+ if (req) {
61
+ const {getClientIP} = require('yakuza1/server');
62
+ defaults.headers[variable.adjoinIpHeader] = getClientIP(req, {stupid: true});
63
+
64
+ if (req.headers) {
65
+ defaults.headers[variable.guRouteGroupHeader] = req.headers[variable.guRouteGroupHeader];
66
+ defaults.headers[variable.guRouteNameHeader] = req.headers[variable.guRouteNameHeader];
67
+ defaults.headers[variable.guRouteVerHeader] = req.headers[variable.guRouteVerHeader];
68
+ }
69
+ }
62
70
  }
63
71
  // Create new HTTP instance
64
72
  const http = urlib({