yakuza0 2.23.19 → 2.23.20-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.23.19",
+  "version": "2.23.20-beta.1",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {

package/server/proxy/tire.js

@@ -71,8 +71,17 @@ var _require = require('http-proxy-middleware'),
 
 var autoRefreshCapacity = {};
 
-var getCacheKey = function getCacheKey(str) {
-  return str.split('?')[0];
+var getCacheKey = function getCacheKey(req) {
+  var str = "";
+  if (req) {
+    if (req.url) {
+      str += req.url.split('?')[0];
+    }
+    if (req.headers) {
+      str += (0, _server.md5)(req.headers["User-Agent".toLowerCase()]);
+    }
+  }
+  return str;
 };
 
 var spiBody = function spiBody(appConf) {
@@ -321,7 +330,7 @@ exports.default = function () {
 
             app.use(function (req, res, next) {
               if (_config2.default.security.isTire) {
-                var data = (0, _secCache.secCacheGet)(getCacheKey(req.url));
+                var data = (0, _secCache.secCacheGet)(getCacheKey(req));
 
                 if (data) {
                   var isHasCookie = false;
@@ -346,7 +355,7 @@ exports.default = function () {
                 var isSet = req.get("x-gen-set");
 
                 if (isSet !== "true") {
-                  var _data = (0, _secCache.secCacheGet)(getCacheKey(req.url));
+                  var _data = (0, _secCache.secCacheGet)(getCacheKey(req));
                   // res.header("Connection", "close");
                   // console.log(req.url, "all");
 
@@ -363,6 +372,7 @@ exports.default = function () {
                     // res.send(data.body);
                   } else {
                     // console.log(req.url, "sec nooo~");
+                    var userAgentMd5 = (0, _server.md5)(req.get('User-Agent'));
                     var extIndex = req.url.lastIndexOf('.');
                     if (!apiVer(req.url) && extIndex === -1) {
                       var _extends2;
@@ -373,6 +383,7 @@ exports.default = function () {
                           url: req.url,
                           project: _config2.default.name,
                           app: config.appName,
+                          userAgentMd5: userAgentMd5,
 
                           personality: server.generate.personality,
                           domain: appConf.cookieDomain || _server.Cookies.getDefCookieDomain(req && req.headers && req.headers.host || ''),
@@ -520,6 +531,7 @@ exports.default = function () {
               ws: true,
               // pathRewrite: {['^/' + server.basePath + '/api-ws'] : '/api-ws'},
               onProxyRes: function onProxyRes(proxyRes, req, res) {
+                var userAgentMd5 = (0, _server.md5)(req.headers["User-Agent".toLowerCase()]);
                 var isDoc = ['text/html; charset=utf-8'].includes((proxyRes.headers['content-type'] || '').toLowerCase());
 
                 // cache ---
@@ -582,7 +594,7 @@ exports.default = function () {
                       body = Buffer.concat(body);
 
                       if (isTireSave || isLibSave || isFastDfs(req.url)) {
-                        (0, _secCache.secCacheSet)(getCacheKey(req.url), {
+                        (0, _secCache.secCacheSet)(getCacheKey(req), {
                           body: body,
                           resHeaders: proxyRes.headers,
                           status: res.statusCode
@@ -601,6 +613,7 @@ exports.default = function () {
                             project: _config2.default.name,
                             app: config.appName,
                             url: req.url,
+                            userAgentMd5: userAgentMd5,
 
                             personality: server.generate.personality,
                             host: pHost,

package/utils/inclusive.js

@@ -395,7 +395,8 @@ var render = function () {
                 compress: {
                   threshold: 1024,
                   gzip: true,
-                  brotli: false
+                  brotli: false,
+                  br: false
                   // ...(mainConf.server && mainConf.server.compress ? mainConf.server.compress : {}),
                   // ...(ykConf.server && ykConf.server.compress ? ykConf.server.compress : {})
                 },