yakuza0 2.22.3-beta.0 → 2.22.3-beta.2

package/package.json

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

package/server/proxy/tire.js

@@ -126,7 +126,7 @@ exports.default = function () {
             };
 
             if (!server.generate.enabled) {
-              _context3.next = 26;
+              _context3.next = 25;
               break;
             }
 
@@ -257,31 +257,34 @@ exports.default = function () {
             baseConfig = {
               // changeOrigin: true,
               secure: false,
-              logLevel: 'silent',
+              logLevel: _config2.default.server.generate.logLevel,
               timeout: 99999999
             };
             app = express();
 
 
             app.set('x-powered-by', false);
-            app.use((0, _compression2.default)());
 
-            app.use(function (req, res, next) {
-              var method = req.method.toUpperCase();
-              var path = req.url;
-              if (method === "GET" && path === '/sys/health-check') {
-                res.status(200).send({
-                  response_status: 200,
-                  data: 'alive'
-                });
-              } else if (method === "GET" && path === '/__clearCache') {
-                (0, _secCache.secCacheClear)();
-                res.status(404).send("The page was not found ~~");
-              } else {
-                commonHeaders = getHeader(req);
-                next();
-              }
-            });
+            if (!_config2.default.security.isTire) {
+              app.use((0, _compression2.default)());
+
+              app.use(function (req, res, next) {
+                var method = req.method.toUpperCase();
+                var path = req.url;
+                if (method === "GET" && path === '/sys/health-check') {
+                  res.status(200).send({
+                    response_status: 200,
+                    data: 'alive'
+                  });
+                } else if (method === "GET" && path === '/__clearCache') {
+                  (0, _secCache.secCacheClear)();
+                  res.status(404).send("The page was not found ~~");
+                } else {
+                  commonHeaders = getHeader(req);
+                  next();
+                }
+              });
+            }
 
             app.use(function (req, res, next) {
               if (_config2.default.security.isTire) {
@@ -569,7 +572,7 @@ exports.default = function () {
               }, server.generate.maxAge * 1000);
             }
 
-          case 26:
+          case 25:
           case "end":
             return _context3.stop();
         }

package/utils/inclusive.js

@@ -758,7 +758,7 @@ var render = function () {
 
           case 27:
             _context2.t1 = conf.dkyMode;
-            _context2.next = _context2.t1 === "dev" ? 30 : _context2.t1 === "normal" ? 33 : _context2.t1 === "prod" ? 36 : _context2.t1 === "stupid" ? 42 : _context2.t1 === "tire" ? 50 : 56;
+            _context2.next = _context2.t1 === "dev" ? 30 : _context2.t1 === "normal" ? 33 : _context2.t1 === "prod" ? 36 : _context2.t1 === "stupid" ? 42 : _context2.t1 === "tire" ? 49 : 54;
             break;
 
           case 30:
@@ -768,7 +768,7 @@ var render = function () {
             // conf.server.f5Offline = false;
             conf.security.isDev = true;
             conf.dev = true;
-            return _context2.abrupt('break', 56);
+            return _context2.abrupt('break', 54);
 
           case 33:
             // conf.security.encrypt = "none";
@@ -777,7 +777,7 @@ var render = function () {
             // conf.server.f5Offline = false;
             conf.security.isNormal = true;
             conf.dev = false;
-            return _context2.abrupt('break', 56);
+            return _context2.abrupt('break', 54);
 
           case 36:
             conf.security.encrypt = "sm";
@@ -786,7 +786,7 @@ var render = function () {
             // conf.server.f5Offline = false;
             conf.security.isProd = true;
             conf.dev = false;
-            return _context2.abrupt('break', 56);
+            return _context2.abrupt('break', 54);
 
           case 42:
             conf.security.encrypt = "sm";
@@ -796,19 +796,19 @@ var render = function () {
             conf.security.isStupid = true;
             conf.server.csp.enabled = true;
             conf.server.sri.enabled = true;
-            conf.dev = false;
-            return _context2.abrupt('break', 56);
+            // conf.dev = false;
+            return _context2.abrupt('break', 54);
 
-          case 50:
+          case 49:
             conf.security.encrypt = "none";
             conf.security.stupid = false;
             conf.security.helmet = false;
             // conf.server.f5Offline = false;
             conf.security.isTire = true;
-            conf.dev = false;
-            return _context2.abrupt('break', 56);
+            // conf.dev = false;
+            return _context2.abrupt('break', 54);
 
-          case 56:
+          case 54:
 
             // conf.router.config['app.examples'].enabled = true;
             if (conf.server.yk4Addr) {
@@ -908,7 +908,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 77;
+            _context2.next = 75;
             return _yakuza._.asyncMap(conf.router.config, function () {
               var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(v, key) {
                 var name, arr, length, num;
@@ -957,7 +957,9 @@ var render = function () {
                               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 || []))
                             }
                           },
-                          generate: (0, _extends3.default)({}, conf.server.generate, v.server && v.server.generate, {
+                          generate: (0, _extends3.default)({
+                            logLevel: 'silent'
+                          }, conf.server.generate, v.server && v.server.generate, {
                             exclude: [].concat((0, _toConsumableArray3.default)(conf.server.generate.exclude), (0, _toConsumableArray3.default)(v.server && v.server.generate && v.server.generate.exclude || []))
                           }),
                           sslify: (0, _extends3.default)({}, conf.server.sslify, v.server && v.server.sslify),
@@ -1091,7 +1093,7 @@ var render = function () {
               };
             }());
 
-          case 77:
+          case 75:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1213,7 +1215,7 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 88:
+          case 86:
           case 'end':
             return _context2.stop();
         }

package/utils/secCache.js

@@ -43,7 +43,9 @@ var set = function set(key, value) {
 };
 
 var secCacheSet = exports.secCacheSet = function secCacheSet(key, value) {
-  if (!_config2.default.security.isTire) {
+  if (_config2.default.security.isTire) {
+    _yakuza.global.__secCache_db[key] = value;
+  } else {
     var db = _yakuza.global.__secCache_db;
 
     if ((0, _keys2.default)(db).length < maxKeys) {
@@ -67,13 +69,13 @@ var secCacheSet = exports.secCacheSet = function secCacheSet(key, value) {
         }
       }
     }
-  } else {
-    _yakuza.global.__secCache_db[key] = value;
   }
 };
 
 var secCacheGet = exports.secCacheGet = function secCacheGet(key) {
-  if (!_config2.default.security.isTire) {
+  if (_config2.default.security.isTire) {
+    return _yakuza.global.__secCache_db[key];
+  } else {
     var v = _yakuza.global.__secCache_db[key];
 
     if (v) {
@@ -83,8 +85,6 @@ var secCacheGet = exports.secCacheGet = function secCacheGet(key) {
     }
 
     return v && v.data;
-  } else {
-    return _yakuza.global.__secCache_db[key];
   }
 };