yakuza0 2.22.32 → 2.22.33-beta.1

package/package.json

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

package/template/storage.plugin.js

@@ -30,6 +30,10 @@ const shtmlFilterSet = (obj, options) => {
   return shtml(obj, options);
 }
 
+const filterOpt = (options) => {
+  return _.omit(options, ['xssOpt'])
+}
+
 export default async (ctx, inject) => {
   const { $http, $utils, $yk } = ctx;
   const event = {
@@ -42,8 +46,9 @@ export default async (ctx, inject) => {
   const on = {};
 
   if (!yConf.standAlone) {
-    if ($utils.checkServer()) {
+    if ($utils.checkServer() || !yConf.server.heartbeat.enabled) {
       event.set = async (...args) => {
+        console.log(args);
         let [key, data, options] = [null, null, {}];
 
         switch (args.length) {
@@ -53,13 +58,16 @@ export default async (ctx, inject) => {
           case 2:
             [key, data] = args;
             break;
+          case 3:
+            [key, data, options] = args;
+            break;
         }
         data = shtmlFilterSet(data, options);
 
         const result = await $http.post('$/feapiv1/storage/set', {
           key,
           data,
-          options,
+          options: filterOpt(options),
         }, {
           hasHook: [],
         })
@@ -72,7 +80,7 @@ export default async (ctx, inject) => {
           hasHook: [],
           query: {
             key,
-            options,
+            options: filterOpt(options),
           }
         })
 
@@ -86,7 +94,7 @@ export default async (ctx, inject) => {
       event.remove = async (key, options = {}) => {
         const result = await $http.post('$/feapiv1/storage/remove', {
           key,
-          options,
+          options: filterOpt(options),
         }, {
           hasHook: [],
         })
@@ -120,7 +128,7 @@ export default async (ctx, inject) => {
           body: {
             key,
             data,
-            options,
+            options: filterOpt(options),
           }
         })
       };
@@ -129,7 +137,7 @@ export default async (ctx, inject) => {
         const data = await req('storage/get', {
           body: {
             key,
-            options,
+            options: filterOpt(options),
           }
         })
 
@@ -143,7 +151,7 @@ export default async (ctx, inject) => {
       event.remove = async (key, options = {}) => await req('storage/remove', {
         body: {
           key,
-          options,
+          options: filterOpt(options),
         }
       })
     }

package/template/yk.plugin.js

@@ -42,6 +42,7 @@ export default async (ctx, inject) => {
     env: conf.env,
     fe: conf.fe,
     standAlone: appConf.standAlone,
+    dkyMode: yConf.dkyMode,
     // finger: '16',
     browser: { key: '16' },
     hostname: {},

package/utils/inclusive.js

@@ -186,6 +186,10 @@ var checkBool = function checkBool(common, persona) {
   return typeof persona === 'boolean' ? persona : typeof common === 'boolean' && common === true;
 };
 
+var checkBoolSingle = function checkBoolSingle(persona, def) {
+  return typeof persona === 'boolean' ? persona : def;
+};
+
 var pool = _yakuza._.range(3000, 3100);
 var appPool = _yakuza._.range(26000, 26100);
 
@@ -781,7 +785,7 @@ var render = function () {
 
           case 28:
             _context2.t1 = conf.dkyMode;
-            _context2.next = _context2.t1 === "dev" ? 31 : _context2.t1 === "normal" ? 34 : _context2.t1 === "prod" ? 37 : _context2.t1 === "stupid" ? 43 : _context2.t1 === "tire" ? 53 : 58;
+            _context2.next = _context2.t1 === "dev" ? 31 : _context2.t1 === "normal" ? 34 : _context2.t1 === "prod" ? 37 : _context2.t1 === "stupid" ? 43 : _context2.t1 === "tire" ? 53 : 59;
             break;
 
           case 31:
@@ -791,7 +795,7 @@ var render = function () {
             // conf.server.f5Offline = false;
             conf.security.isDev = true;
             conf.dev = true;
-            return _context2.abrupt('break', 58);
+            return _context2.abrupt('break', 59);
 
           case 34:
             // conf.security.encrypt = "none";
@@ -800,7 +804,7 @@ var render = function () {
             // conf.server.f5Offline = false;
             conf.security.isNormal = true;
             conf.dev = false;
-            return _context2.abrupt('break', 58);
+            return _context2.abrupt('break', 59);
 
           case 37:
             conf.security.encrypt = "sm";
@@ -809,21 +813,21 @@ var render = function () {
             // conf.server.f5Offline = false;
             conf.security.isProd = true;
             conf.dev = false;
-            return _context2.abrupt('break', 58);
+            return _context2.abrupt('break', 59);
 
           case 43:
             conf.security.encrypt = "sm";
             conf.security.stupid = true;
             conf.security.helmet = true;
             // conf.server.f5Offline = false;
-            conf.server.f5Offline = typeof conf.server.f5Offline === 'boolean' ? conf.server.f5Offline : true;
+            conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, true);
             conf.security.isStupid = true;
             conf.server.csp.enabled = true;
-            conf.server.csp.strict = typeof conf.server.csp.strict === 'boolean' ? conf.server.csp.strict : true;
-            conf.server.csp.decoration = typeof conf.server.csp.decoration === 'boolean' ? conf.server.csp.decoration : true;
+            conf.server.csp.strict = checkBoolSingle(conf.server.csp.strict, true);
+            conf.server.csp.decoration = checkBoolSingle(conf.server.csp.decoration, true);
             conf.server.sri.enabled = true;
             // conf.dev = false;
-            return _context2.abrupt('break', 58);
+            return _context2.abrupt('break', 59);
 
           case 53:
             conf.security.encrypt = "none";
@@ -831,10 +835,11 @@ var render = function () {
             conf.security.helmet = false;
             // conf.server.f5Offline = false;
             conf.security.isTire = true;
+            conf.server.heartbeat.enabled = checkBoolSingle(conf.server.heartbeat.enabled, false);
             // conf.dev = false;
-            return _context2.abrupt('break', 58);
+            return _context2.abrupt('break', 59);
 
-          case 58:
+          case 59:
 
             // conf.router.config['app.examples'].enabled = true;
             if (conf.server.yk4Addr) {
@@ -934,7 +939,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 79;
+            _context2.next = 80;
             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;
@@ -1119,7 +1124,7 @@ var render = function () {
               };
             }());
 
-          case 79:
+          case 80:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1241,7 +1246,7 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 90:
+          case 91:
           case 'end':
             return _context2.stop();
         }