yakuza0 2.20.2 → 2.20.6

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 (8) hide show
  1. package/config/paths.js +11 -1
  2. package/nuxt/build/index.js +72 -52
  3. package/nuxt/dir.js +4 -0
  4. package/package.json +2 -2
  5. package/server/proxy/conf.js +1 -1
  6. package/server/proxy/tire.js +128 -79
  7. package/utils/curl.js +4 -2
  8. package/utils/inclusive.js +7 -2
package/config/paths.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.chmod = exports.write = exports.read = exports.mkdir = exports.access = undefined;
6
+ exports.chmod = exports.rm = exports.write = exports.read = exports.mkdir = exports.access = undefined;
7
7
 
8
8
  var _extends2 = require('babel-runtime/helpers/extends');
9
9
 
@@ -50,6 +50,15 @@ var write = exports.write = function write(path, str) {
50
50
  } catch (e) {}
51
51
  };
52
52
 
53
+ var rm = exports.rm = function rm(path) {
54
+ try {
55
+ fs.rmSync(path);
56
+ } catch (e) {}
57
+ try {
58
+ fs.rmdirSync(path);
59
+ } catch (e) {}
60
+ };
61
+
53
62
  var chmod = exports.chmod = function chmod(path, mode) {
54
63
  try {
55
64
  fs.chmodSync(path, mode);
@@ -122,6 +131,7 @@ exports.default = {
122
131
  mkdir: mkdir,
123
132
  read: read,
124
133
  write: write,
134
+ rm: rm,
125
135
  chmod: chmod,
126
136
  path: path,
127
137
  root: root,
package/nuxt/build/index.js CHANGED
@@ -60,6 +60,7 @@ _yakuza.global.NUXT_BUILD_FILENAME_INDEX = 0;
60
60
 
61
61
  exports.default = function (config) {
62
62
  var nuxtConf = _config2.default.nuxt;
63
+ var appConf = config.appConf;
63
64
  var extendFn = function extendFn(conf, ctx) {};
64
65
 
65
66
  config.build = (0, _extends3.default)({}, config.build, {
@@ -76,60 +77,63 @@ exports.default = function (config) {
76
77
  })
77
78
  });
78
79
 
80
+ // config.build.extractCSS = true;
79
81
  if (!_config2.default.dev) {
80
- // config.build.extractCSS = true;
81
- config.build.optimization = {
82
- splitChunks: {
83
- chunks: 'async',
84
- maxSize: 666 * 1024,
85
- automaticNameDelimiter: '.',
86
- name: true
87
- // cacheGroups: {
88
- // styles: {
89
- // name: 'styles',
90
- // // test: /\.(css|vue)$/,
91
- // // test: /\.(css)$/,
92
- // test: /\.(vue)$/,
93
- // // test: /\.(css|pcss|postcss|styl|stylus|scss|sass|less)$/,
94
- // // chunks: 'all',
95
- // // enforce: true
96
- // }
97
- // }
98
- // chunks: 'async',
99
- // minSize: 30000,
100
- // maxSize: 20000,
101
- // minChunks: 1,
102
- // maxAsyncRequests: 6,
103
- // maxInitialRequests: 3,
104
- // automaticNameDelimiter: '~',
105
- // name: true,
106
- // chunks: 'async',
107
- // minSize: 20000,
108
- // minRemainingSize: 0,
109
- // minChunks: 1,
110
- // maxAsyncRequests: 30,
111
- // maxInitialRequests: 30,
112
- // enforceSizeThreshold: 50000,
113
- // cacheGroups: {
114
- // defaultVendors: {
115
- // test: /[\\/]node_modules[\\/]/,
116
- // priority: -10,
117
- // reuseExistingChunk: true,
118
- // },
119
- // default: {
120
- // minChunks: 2,
121
- // priority: -20,
122
- // reuseExistingChunk: true,
123
- // },
124
- // },
125
- }
126
- // splitChunks: {
127
- // chunks: 'all',
128
- // automaticNameDelimiter: '.',
129
- // name: 'test',
130
- // maxSize : 100,
131
- // }
82
+ config.build.extractCSS = {
83
+ ignoreOrder: false
132
84
  };
85
+ // config.build.optimization = {
86
+ // splitChunks: {
87
+ // chunks: 'async',
88
+ // maxSize: 666 * 1024,
89
+ // automaticNameDelimiter: '.',
90
+ // name: true,
91
+ // // cacheGroups: {
92
+ // // styles: {
93
+ // // name: 'styles',
94
+ // // // test: /\.(css|vue)$/,
95
+ // // // test: /\.(css)$/,
96
+ // // test: /\.(vue)$/,
97
+ // // // test: /\.(css|pcss|postcss|styl|stylus|scss|sass|less)$/,
98
+ // // // chunks: 'all',
99
+ // // // enforce: true
100
+ // // }
101
+ // // }
102
+ // // chunks: 'async',
103
+ // // minSize: 30000,
104
+ // // maxSize: 20000,
105
+ // // minChunks: 1,
106
+ // // maxAsyncRequests: 6,
107
+ // // maxInitialRequests: 3,
108
+ // // automaticNameDelimiter: '~',
109
+ // // name: true,
110
+ // // chunks: 'async',
111
+ // // minSize: 20000,
112
+ // // minRemainingSize: 0,
113
+ // // minChunks: 1,
114
+ // // maxAsyncRequests: 30,
115
+ // // maxInitialRequests: 30,
116
+ // // enforceSizeThreshold: 50000,
117
+ // // cacheGroups: {
118
+ // // defaultVendors: {
119
+ // // test: /[\\/]node_modules[\\/]/,
120
+ // // priority: -10,
121
+ // // reuseExistingChunk: true,
122
+ // // },
123
+ // // default: {
124
+ // // minChunks: 2,
125
+ // // priority: -20,
126
+ // // reuseExistingChunk: true,
127
+ // // },
128
+ // // },
129
+ // },
130
+ // // splitChunks: {
131
+ // // chunks: 'all',
132
+ // // automaticNameDelimiter: '.',
133
+ // // name: 'test',
134
+ // // maxSize : 100,
135
+ // // }
136
+ // };
133
137
  }
134
138
 
135
139
  if (config.build && config.build.extend) {
@@ -168,6 +172,20 @@ exports.default = function (config) {
168
172
  }
169
173
  }
170
174
  });
175
+
176
+ // if (!appConf.server.openHmr) {
177
+ // const hmrIndex = conf.plugins.findIndex(p => {
178
+ // return p.constructor.name === 'HotModuleReplacementPlugin';
179
+ // });
180
+ //
181
+ // if (hmrIndex !== -1) {
182
+ // conf.plugins.splice(hmrIndex, 1)
183
+ // }
184
+ //
185
+ // conf.plugins.forEach(p => {
186
+ // console.log(p.constructor.name);
187
+ // });
188
+ // }
171
189
  };
172
190
 
173
191
  // config.build.vendor = ['babel-polyfill'];
@@ -197,6 +215,8 @@ exports.default = function (config) {
197
215
  // cache: yConf.dev,
198
216
  // hardSource: yConf.dev,
199
217
  // parallel: true,
218
+ // cache: false,
219
+ // hardSource: false,
200
220
  cache: _config2.default.dev,
201
221
  hardSource: _config2.default.dev,
202
222
  "html.minify": {
package/nuxt/dir.js CHANGED
@@ -54,6 +54,10 @@ exports.default = function (config, key) {
54
54
  };
55
55
 
56
56
  _paths2.default.mkdir(appCache);
57
+ // fix jimp-compact
58
+ // const jcp = rootDir + 'node_modules/jimp-compact';
59
+ // paths.rm(jcp);
60
+ // paths.mkdir(jcp);
57
61
 
58
62
  _rimraf2.default.sync(rootDir + '.nuxt');
59
63
  _rimraf2.default.sync(rootDir + 'dist');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "yakuza0",
3
- "version": "2.20.2",
3
+ "version": "2.20.6",
4
4
  "description": "yakuza0 with nuxt",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -27,7 +27,6 @@
27
27
  "@commitlint/load": "^12.1.1",
28
28
  "@commitlint/read": "^12.1.1",
29
29
  "@nuxtjs/eslint-config": "^3.0.0",
30
- "@nuxtjs/pwa": "^3.0.0-beta.19",
31
30
  "@rdc/nuxt": "2.15.8-0",
32
31
  "@rdc/nuxtjs-style-resources": "^1.0.0",
33
32
  "address": "^1.0.3",
@@ -45,6 +44,7 @@
45
44
  "cli-progress": "^2.1.1",
46
45
  "clipboardy": "^1.2.3",
47
46
  "commander": "^2.19.0",
47
+ "compression": "^1.7.4",
48
48
  "consola": "^2.10.1",
49
49
  "core-js": "3.10.1",
50
50
  "download": "^7.1.0",
package/server/proxy/conf.js CHANGED
@@ -161,5 +161,5 @@ var serverHeaders = exports.serverHeaders = function serverHeaders(_ref4) {
161
161
  // console.log(crossParams.nuxtAppName);
162
162
  // console.log(nuxtAppConf);
163
163
  // console.log(nuxtAppConf.server.gray, 123);
164
- return _ref5 = {}, (0, _defineProperty3.default)(_ref5, _def.variable.isDevHeader, { data: conf.dev ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.akHeader, { data: conf.ak, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ipHeader, { data: (0, _server.getClientIP)(req, { stupid: false }) }), (0, _defineProperty3.default)(_ref5, _def.variable.adjoinIpHeader, { data: (0, _server.getClientIP)(req, { stupid: true }) }), (0, _defineProperty3.default)(_ref5, _def.variable.svcKeyHeader, { data: nuxtAppConf.svcKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.domainHeader, { data: nuxtAppConf.domain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieHeader, { data: crossParams.cookie, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieDomainHeader, { data: crossParams.cookieDomain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieSameSiteHeader, { data: conf.server.cookieSameSite, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.appKeyHeader, { data: crossParams.nuxtAppKey }), (0, _defineProperty3.default)(_ref5, _def.variable.appNameHeader, { data: crossParams.nuxtAppName }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptSwitchHeader, { data: encryptSwitch, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptTypeHeader, { data: conf.security.encrypt, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.helmetHeader, { data: conf.security.helmet.toString(), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.projectNameHeader, { data: conf.name, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.shareRuleHeader, { data: (0, _stringify2.default)(conf.shareRule) }), (0, _defineProperty3.default)(_ref5, _def.variable.baseURLHeader, { data: baseURL, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.isHttpsHeader, { data: conf.https ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.appCodeHeader, { data: nuxtAppConf.appCode, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.processKeyHeader, { data: conf.processKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.childKeyHeader, { data: conf.childKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.orbCsrfHeader, { data: verifyTk.csrf, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.f5OfflineHeader, { data: nuxtAppConf.server && nuxtAppConf.server.f5Offline, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.servicesHeader, { data: req.headers[_def.variable.servicesHeader], noWarn: true }), (0, _defineProperty3.default)(_ref5, 'Cookie', { data: _server.Cookies.setByStr((0, _defineProperty3.default)({}, _def.variable.orbCsrfCookie, verifyTk.csrf), req.headers.cookie), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ddosSwitchHeader, { data: crossParams.ddosSwitch || '', noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.yk0VersionHeader, { data: conf.version || '', noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.guRouteGroupHeader, { data: nuxtAppConf.server && nuxtAppConf.server.gray && nuxtAppConf.server.gray.routeGroup || '', noWarn: true }), _ref5;
164
+ return _ref5 = {}, (0, _defineProperty3.default)(_ref5, _def.variable.isDevHeader, { data: conf.dev ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.akHeader, { data: conf.ak, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ipHeader, { data: (0, _server.getClientIP)(req, { stupid: false }) }), (0, _defineProperty3.default)(_ref5, _def.variable.adjoinIpHeader, { data: (0, _server.getClientIP)(req, { stupid: true }) }), (0, _defineProperty3.default)(_ref5, _def.variable.svcKeyHeader, { data: nuxtAppConf.svcKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.domainHeader, { data: nuxtAppConf.domain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieHeader, { data: crossParams.cookie, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieDomainHeader, { data: crossParams.cookieDomain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieSameSiteHeader, { data: conf.server.cookieSameSite, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.appKeyHeader, { data: crossParams.nuxtAppKey }), (0, _defineProperty3.default)(_ref5, _def.variable.appNameHeader, { data: crossParams.nuxtAppName }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptSwitchHeader, { data: encryptSwitch, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptTypeHeader, { data: conf.security.encrypt, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.helmetHeader, { data: conf.security.helmet.toString(), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.projectNameHeader, { data: conf.name, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.shareRuleHeader, { data: (0, _stringify2.default)(conf.shareRule) }), (0, _defineProperty3.default)(_ref5, _def.variable.baseURLHeader, { data: baseURL, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.isHttpsHeader, { data: conf.https ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.appCodeHeader, { data: nuxtAppConf.appCode, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.processKeyHeader, { data: conf.processKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.childKeyHeader, { data: conf.childKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.orbCsrfHeader, { data: verifyTk.csrf, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.f5OfflineHeader, { data: nuxtAppConf.server && nuxtAppConf.server.f5Offline, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.servicesHeader, { data: req.headers[_def.variable.servicesHeader], noWarn: true }), (0, _defineProperty3.default)(_ref5, 'Cookie', { data: _server.Cookies.setByStr((0, _defineProperty3.default)({}, _def.variable.orbCsrfCookie, verifyTk.csrf), req.headers.cookie), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ddosSwitchHeader, { data: crossParams.ddosSwitch || '', noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.yk0VersionHeader, { data: conf.version || '', noWarn: true }), _ref5;
165
165
  };
package/server/proxy/tire.js CHANGED
@@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
 
7
+ var _keys = require("babel-runtime/core-js/object/keys");
8
+
9
+ var _keys2 = _interopRequireDefault(_keys);
10
+
7
11
  var _extends2 = require("babel-runtime/helpers/extends");
8
12
 
9
13
  var _extends3 = _interopRequireDefault(_extends2);
@@ -40,6 +44,10 @@ var _curl = require("../../utils/curl");
40
44
 
41
45
  var _secCache = require("../../utils/secCache");
42
46
 
47
+ var _compression = require("compression");
48
+
49
+ var _compression2 = _interopRequireDefault(_compression);
50
+
43
51
  var _control = require("../cache/control");
44
52
 
45
53
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -59,7 +67,7 @@ exports.default = function () {
59
67
  var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(_ref) {
60
68
  var config = _ref.config;
61
69
 
62
- var appConf, appName, server, pIp, pHost, isFastDfs, apiVer, getUc, build, baseConfig, app, _headers2;
70
+ var appConf, appName, server, pIp, pHost, timeout, isFastDfs, apiVer, getUc, build, baseConfig, app, _headers2;
63
71
 
64
72
  return _regenerator2.default.wrap(function _callee3$(_context3) {
65
73
  while (1) {
@@ -70,9 +78,10 @@ exports.default = function () {
70
78
  server = appConf.server;
71
79
  pIp = _server.ip.address();
72
80
  pHost = server.protocol + "//" + pIp + ":" + appConf.port;
81
+ timeout = _config2.default.server.infoTimeout + 5000;
73
82
 
74
83
  if (!server.generate.enabled) {
75
- _context3.next = 22;
84
+ _context3.next = 24;
76
85
  break;
77
86
  }
78
87
 
@@ -162,9 +171,11 @@ exports.default = function () {
162
171
  body: {
163
172
  url: '/**',
164
173
  project: _config2.default.name,
165
- app: config.appName
174
+ app: config.appName,
175
+
176
+ remove: true
166
177
  },
167
- timeout: _config2.default.server.infoTimeout + 5000,
178
+ timeout: timeout,
168
179
  json: true
169
180
  });
170
181
 
@@ -190,14 +201,14 @@ exports.default = function () {
190
201
  }();
191
202
 
192
203
  if (_config2.default.security.isTire) {
193
- _context3.next = 13;
204
+ _context3.next = 14;
194
205
  break;
195
206
  }
196
207
 
197
- _context3.next = 13;
208
+ _context3.next = 14;
198
209
  return build();
199
210
 
200
- case 13:
211
+ case 14:
201
212
  baseConfig = {
202
213
  // changeOrigin: true,
203
214
  secure: false,
@@ -208,6 +219,7 @@ exports.default = function () {
208
219
 
209
220
 
210
221
  app.set('x-powered-by', false);
222
+ app.use((0, _compression2.default)());
211
223
 
212
224
  app.use(function (req, res, next) {
213
225
  if (req.url !== '/__clearCache') {
@@ -247,73 +259,97 @@ exports.default = function () {
247
259
  next();
248
260
  }
249
261
  } else {
250
- var _data = (0, _secCache.secCacheGet)(getCacheKey(req.url));
251
- // res.header("Connection", "close");
252
- // console.log(req.url, "all");
253
-
254
- if (_data) {
255
- // console.log(req.url, "sec have");
256
- // res.header("Connection", "keep-alive");
257
- _server._.forEach(_data.resHeaders, function (v, key) {
258
- res.header(key, v);
259
- // if (key.toLowerCase() !== 'connection') {
260
- // res.header(key, v);
261
- // }
262
- });
263
- res.status(_data.status).send(_data.body);
264
- // res.send(data.body);
265
- } else {
266
- // console.log(req.url, "sec nooo~");
267
- var extIndex = req.url.lastIndexOf('.');
268
- if (!apiVer(req.url) && extIndex === -1) {
269
- (0, _curl.curlOrb)(server.generate.api.get, {
270
- method: 'POST',
271
- body: {
272
- url: req.url,
273
- project: _config2.default.name,
274
- app: config.appName,
275
-
276
- domain: appConf.cookieDomain || _server.Cookies.getDefCookieDomain(req && req.headers && req.headers.host || ''),
277
- svcKey: appConf.svcKey,
278
- childKey: _config2.default.childKey
279
- },
280
- timeout: _config2.default.server.infoTimeout + 5000,
281
- json: true,
282
- resolveWithFullResponse: true,
283
- headers: (0, _defineProperty3.default)({
284
- Cookie: _server.Cookies.koaGetCookieStr({ req: req })
285
- }, _def.variable.childKeyHeader, _config2.default.childKey)
286
- }).then(function (response) {
287
- // console.log(response);
288
- var data = response.body;
289
- // console.log(req.url, "req res");
290
- if (data) {
291
- // console.log(req.url, "req res have");
292
- data.body = Buffer.from(data.body);
293
- if (response.headers['set-cookie']) {
294
- data.resHeaders = (0, _extends3.default)({}, data.resHeaders, {
295
- 'set-cookie': response.headers['set-cookie']
262
+ var isSet = req.get("x-gen-set");
263
+
264
+ if (isSet !== "true") {
265
+ var _data = (0, _secCache.secCacheGet)(getCacheKey(req.url));
266
+ // res.header("Connection", "close");
267
+ // console.log(req.url, "all");
268
+
269
+ if (_data) {
270
+ // console.log(req.url, "sec have");
271
+ // res.header("Connection", "keep-alive");
272
+ _server._.forEach(_data.resHeaders, function (v, key) {
273
+ res.header(key, v);
274
+ // if (key.toLowerCase() !== 'connection') {
275
+ // res.header(key, v);
276
+ // }
277
+ });
278
+ res.status(_data.status).send(_data.body);
279
+ // res.send(data.body);
280
+ } else {
281
+ // console.log(req.url, "sec nooo~");
282
+ var extIndex = req.url.lastIndexOf('.');
283
+ if (!apiVer(req.url) && extIndex === -1) {
284
+ (0, _curl.curlOrb)(server.generate.api.get, {
285
+ method: 'POST',
286
+ body: {
287
+ url: req.url,
288
+ project: _config2.default.name,
289
+ app: config.appName,
290
+
291
+ personality: server.generate.personality,
292
+ domain: appConf.cookieDomain || _server.Cookies.getDefCookieDomain(req && req.headers && req.headers.host || ''),
293
+ svcKey: appConf.svcKey,
294
+ childKey: _config2.default.childKey
295
+ },
296
+ timeout: timeout,
297
+ json: true,
298
+ resolveWithFullResponse: true,
299
+ headers: (0, _defineProperty3.default)({
300
+ // Cookie: Cookies.koaGetCookieStr({req}),
301
+ Cookie: req.get("cookie")
302
+ }, _def.variable.childKeyHeader, _config2.default.childKey)
303
+ }).then(function (response) {
304
+ // console.log(response);
305
+ var data = response.body;
306
+ // console.log(req.url, "req res");
307
+ if (data) {
308
+ // console.log(req.url, "req res have");
309
+ data.body = Buffer.from(data.body);
310
+ if (response.headers['set-cookie']) {
311
+ data.resHeaders = (0, _extends3.default)({}, data.resHeaders, {
312
+ 'set-cookie': response.headers['set-cookie']
313
+ });
314
+ }
315
+
316
+ // cache ---
317
+ (0, _control.noCache)(res);
318
+
319
+ _server._.forEach(data.resHeaders, function (v, key) {
320
+ res.header(key, v);
321
+ // if (key.toLowerCase() !== 'connection') {
322
+ // res.header(key, v)
323
+ // }
296
324
  });
297
- }
298
- (0, _control.noCache)(res);
299
- _server._.forEach(data.resHeaders, function (v, key) {
300
- res.header(key, v);
301
- // if (key.toLowerCase() !== 'connection') {
302
- // res.header(key, v)
303
- // }
304
- });
305
325
 
306
- res.send(data.body);
307
- } else {
326
+ // res.header("Cache-Control", "public, max-age=66, s-maxage=120")
327
+
328
+ res.send(data.body);
329
+
330
+ if (server.generate.autoRefresh) {
331
+ (0, _curl.curl)("http://127.0.0.1:" + config.appConf.port + req.url, {
332
+ method: 'GET',
333
+ headers: {
334
+ "Cookie": req.get("cookie"),
335
+ "x-gen-set": "true"
336
+ },
337
+ timeout: timeout
338
+ }).then();
339
+ }
340
+ } else {
341
+ next();
342
+ }
343
+ }).catch(function (e) {
344
+ // console.log(e);
308
345
  next();
309
- }
310
- }).catch(function (e) {
311
- // console.log(e);
346
+ });
347
+ } else {
312
348
  next();
313
- });
314
- } else {
315
- next();
349
+ }
316
350
  }
351
+ } else {
352
+ next();
317
353
  }
318
354
  }
319
355
  });
@@ -342,6 +378,8 @@ exports.default = function () {
342
378
  ws: true,
343
379
  onProxyRes: function onProxyRes(proxyRes, req, res) {
344
380
  var isDoc = ['text/html; charset=utf-8'].includes((proxyRes.headers['content-type'] || '').toLowerCase());
381
+
382
+ // cache ---
345
383
  if (isDoc) {
346
384
  proxyRes.headers['Surrogate-Control'] = 'no-store';
347
385
  proxyRes.headers['Cache-Control'] = 'no-store, no-cache, must-revalidate, proxy-revalidate';
@@ -364,23 +402,31 @@ exports.default = function () {
364
402
  server.generate.exclude = server.generate.exclude.split(',');
365
403
  }
366
404
 
367
- if (server.generate.include.length !== 0) {
368
- isCache = false;
369
- server.generate.include.forEach(function (path) {
405
+ if (server.generate.exclude.length !== 0) {
406
+ server.generate.exclude.forEach(function (path) {
370
407
  if ((0, _server.minimatch)(req.url, path)) {
371
- isCache = true;
408
+ isCache = false;
372
409
  }
373
410
  });
374
411
  }
375
412
 
376
- if (server.generate.exclude.length !== 0) {
377
- server.generate.exclude.forEach(function (path) {
378
- if ((0, _server.minimatch)(req.url, path)) {
413
+ if ((0, _keys2.default)(appConf.proxyServer.proxy || []).length > 0) {
414
+ _server._.forEach(appConf.proxyServer.proxy, function (v, path) {
415
+ if ((0, _server.minimatch)(req.url, "/" + path + "*") || (0, _server.minimatch)(req.url, "/" + path + "/**")) {
379
416
  isCache = false;
380
417
  }
381
418
  });
382
419
  }
383
420
 
421
+ if (server.generate.include.length !== 0) {
422
+ isCache = false;
423
+ server.generate.include.forEach(function (path) {
424
+ if ((0, _server.minimatch)(req.url, path)) {
425
+ isCache = true;
426
+ }
427
+ });
428
+ }
429
+
384
430
  var libContentType = ['application/javascript; charset=utf-8', 'text/css; charset=utf-8', 'font/woff', 'image/png', 'image/jpeg', 'image/x-icon'];
385
431
 
386
432
  var isTireSave = _config2.default.security.isTire && isCache && ['text/html; charset=utf-8'].concat(libContentType).includes((proxyRes.headers['content-type'] || '').toLowerCase());
@@ -412,6 +458,8 @@ exports.default = function () {
412
458
  project: _config2.default.name,
413
459
  app: config.appName,
414
460
  url: req.url,
461
+
462
+ personality: server.generate.personality,
415
463
  host: pHost,
416
464
  svcKey: appConf.svcKey,
417
465
  cacheData: (0, _stringify2.default)({
@@ -419,10 +467,11 @@ exports.default = function () {
419
467
  resHeaders: proxyRes.headers
420
468
  })
421
469
  },
422
- timeout: _config2.default.server.infoTimeout + 5000,
470
+ timeout: timeout,
423
471
  json: true,
424
472
  headers: (0, _defineProperty3.default)({
425
- Cookie: _server.Cookies.koaGetCookieStr({ req: req })
473
+ // Cookie: Cookies.koaGetCookieStr({req}),
474
+ Cookie: req.get("cookie")
426
475
  }, _def.variable.childKeyHeader, _config2.default.childKey)
427
476
  }).then(function () {}).catch(function (e) {});
428
477
  }
@@ -464,7 +513,7 @@ exports.default = function () {
464
513
  }, server.generate.maxAge * 1000);
465
514
  }
466
515
 
467
- case 22:
516
+ case 24:
468
517
  case "end":
469
518
  return _context3.stop();
470
519
  }
package/utils/curl.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.curlOrb = undefined;
6
+ exports.curl = exports.curlOrb = undefined;
7
7
 
8
8
  var _regenerator = require("babel-runtime/regenerator");
9
9
 
@@ -51,4 +51,6 @@ var curlOrb = exports.curlOrb = function () {
51
51
  return function curlOrb(_x2) {
52
52
  return _ref.apply(this, arguments);
53
53
  };
54
- }();
54
+ }();
55
+
56
+ exports.curl = _server.curl;
package/utils/inclusive.js CHANGED
@@ -269,6 +269,7 @@ var render = function () {
269
269
  cHost: null,
270
270
  basePath: '/',
271
271
  openBasePath: false,
272
+ // openHmr: true,
272
273
 
273
274
  // docker: false,
274
275
  mockIP: false,
@@ -355,6 +356,8 @@ var render = function () {
355
356
  enabled: false,
356
357
  forceEnabled: false,
357
358
  clearCache: false,
359
+ personality: true,
360
+ autoRefresh: true,
358
361
  maxAge: 60 * 60, // 1小时
359
362
  keepAliveTimeout: 60 * 1000,
360
363
  headersTimeout: 60 * 1000,
@@ -771,7 +774,7 @@ var render = function () {
771
774
  v.env = v.env || conf.env;
772
775
  v.protocol = (v.https ? 'https:' : 'http:') || conf.server.protocol;
773
776
  v.host = v.host || conf.server.host;
774
- v.domain = v.domain || conf.server.domain;
777
+ v.domain = v.domain || v.server && v.server.domain || conf.server.domain;
775
778
  v.cHost = v.cHost || conf.server.cHost;
776
779
  // v.cPortHide = typeof conf.server.cPortHide === 'boolean' ? conf.server.cPortHide :
777
780
  // typeof v.cPortHide === 'boolean' && v.cPortHide === true;
@@ -806,7 +809,9 @@ var render = function () {
806
809
  domain: [].concat((0, _toConsumableArray3.default)(conf.server.tfs.fastdfs.domain), (0, _toConsumableArray3.default)(v.server && v.server.tfs && v.server.tfs.fastdfs && v.server.tfs.fastdfs.domain || []))
807
810
  }
808
811
  },
809
- generate: (0, _extends3.default)({}, conf.server.generate, v.server && v.server.generate),
812
+ generate: (0, _extends3.default)({}, conf.server.generate, v.server && v.server.generate, {
813
+ exclude: [].concat((0, _toConsumableArray3.default)(conf.server.generate.exclude), (0, _toConsumableArray3.default)(v.server && v.server.generate && v.server.generate.exclude || []))
814
+ }),
810
815
  sslify: (0, _extends3.default)({}, conf.server.sslify, v.server && v.server.sslify),
811
816
  gray: (0, _extends3.default)({}, conf.server.gray, v.server && v.server.gray)
812
817
  });