yakuza0 2.21.3-beta.0 → 2.21.3

package/cli/index.js

@@ -87,14 +87,14 @@ var gi = function () {
   var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-    var app, dkyMode, ykServerEnv, enabledAll, appsNoneExit, apps, _ref2, conf;
+    var app, dkyModeDef, ykServerEnv, enabledAll, appsNoneExit, apps, _ref2, conf;
 
     return _regenerator2.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             app = options.app || process.env.npm_config_yk0_build_app || process.env.npm_config_y0ba;
-            dkyMode = process.env.NODE_ENV === 'development' ? 'dev' : 'normal';
+            dkyModeDef = process.env.NODE_ENV === 'development' ? 'dev' : 'normal';
             ykServerEnv = process.env.YK_SERVER_ENV || options.ykServerEnv || 'local';
             enabledAll = process.env.YK_MACHINE_TYPE === 'workstation';
             appsNoneExit = typeof options.appsNoneExit === 'boolean' ? options.appsNoneExit : true;
@@ -123,7 +123,7 @@ var gi = function () {
               enabledAll: enabledAll,
               ykServerEnv: ykServerEnv,
               pkg: _package2.default,
-              dkyMode: dkyMode
+              dkyModeDef: dkyModeDef
             });
 
           case 11:
@@ -139,7 +139,7 @@ var gi = function () {
                   enabledAll: enabledAll,
                   ykServerEnv: ykServerEnv,
                   pkg: _package2.default,
-                  dkyMode: 'dev'
+                  dkyModeDef: 'dev'
                 }).then();
               }, { event: "change" });
             }

package/config/index.js

@@ -101,7 +101,7 @@ var ykConfig = function ykConfig() {
         var lgc = lsGet(c.appName, c.key);
 
         var cacheGet = function cacheGet() {
-          var cf = (0, _conf.getConf)(c.basePathMU);
+          var cf = (0, _conf.getConf)(c.basePathMU, c.key);
           lsSet(c.appName, c.key, cf);
           return cf;
         };

package/nuxt/head.js

@@ -44,7 +44,7 @@ exports.default = function (config) {
 
   if (config.commonConfig.head !== false) {
     pkgHead = (0, _extends3.default)({}, _config2.default.nuxt && _config2.default.nuxt.head, {
-      script: [{ src: "/cln/init.js?info=" + (0, _yakuza.gPwd)(6) }].concat((0, _toConsumableArray3.default)(_config2.default.nuxt && _config2.default.nuxt.head && _config2.default.nuxt.head.script || []))
+      script: [{ src: "/cln/init.js?info=" + (0, _yakuza.md5)(_config2.default.scKey).substring(2, 8) }].concat((0, _toConsumableArray3.default)(_config2.default.nuxt && _config2.default.nuxt.head && _config2.default.nuxt.head.script || []))
     });
   }
 

package/package.json

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

package/server/cache/control.js

@@ -3,32 +3,33 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.noCache = undefined;
+exports.useCache = exports.noCache = undefined;
 
 var _regenerator = require('babel-runtime/regenerator');
 
 var _regenerator2 = _interopRequireDefault(_regenerator);
 
-var _isInteger = require('babel-runtime/core-js/number/is-integer');
-
-var _isInteger2 = _interopRequireDefault(_isInteger);
-
 var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
 
 var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
 
+var _isInteger = require('babel-runtime/core-js/number/is-integer');
+
+var _isInteger2 = _interopRequireDefault(_isInteger);
+
 exports.default = function (defaults) {
   var _this = this;
 
   return function () {
     var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx, next) {
-      var options, cacheControl, include, exclude, isInclude, isExclude;
+      var options, include, exclude, isInclude, isExclude;
       return _regenerator2.default.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               options = ctx.cacheControl || defaults || {};
-              cacheControl = [];
+              // const cacheControl = [];
+
               include = options.include || [];
               exclude = options.exclude || [];
               // const excludeType = options.excludeType || [];
@@ -62,60 +63,13 @@ exports.default = function (defaults) {
               }
 
               if (isInclude) {
-                if (options.private) {
-                  cacheControl.push('private');
-                } else if (options.public) {
-                  cacheControl.push('public');
-                }
-
-                // if (options.noStore) {
-                //   options.noCache = true;
-                //   cacheControl.push('no-store');
-                // }
-                //
-                // if (options.noCache) {
-                //   options.maxAge = 0;
-                //   delete options.sMaxAge;
-                //   cacheControl.push('no-cache');
-                // }
-                //
-                // if (options.noTransform) {
-                //   cacheControl.push('no-transform');
-                // }
-                //
-                // if (options.proxyRevalidate) {
-                //   cacheControl.push('proxy-revalidate');
-                // }
-                //
-                // if (options.mustRevalidate) {
-                //   cacheControl.push('must-revalidate');
-                // } else if (!options.noCache) {
-                //   if (options.staleIfError) {
-                //     cacheControl.push(`stale-if-error=${options.staleIfError}`);
-                //   }
-                //
-                //   if (options.staleWhileRevalidate) {
-                //     cacheControl.push(`stale-while-revalidate=${options.staleWhileRevalidate}`);
-                //   }
-                // }
-
-                if ((0, _isInteger2.default)(options.maxAge)) {
-                  cacheControl.push('max-age=' + options.maxAge);
-                }
-
-                if ((0, _isInteger2.default)(options.sMaxAge)) {
-                  cacheControl.push('s-maxage=' + options.sMaxAge);
-                }
-
-                if (cacheControl.length) {
-                  ctx.set('Cache-Control', cacheControl.join(','));
-                }
+                useCache(ctx, options);
               }
 
-              _context.next = 12;
+              _context.next = 11;
               return next();
 
-            case 12:
+            case 11:
             case 'end':
               return _context.stop();
           }
@@ -138,4 +92,56 @@ var noCache = exports.noCache = function noCache(ctx) {
   ctx.set('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
   ctx.set('Pragma', 'no-cache');
   ctx.set('Expires', '0');
+};
+
+var useCache = exports.useCache = function useCache(ctx, options) {
+  var cacheControl = [];
+  if (options.private) {
+    cacheControl.push('private');
+  } else if (options.public) {
+    cacheControl.push('public');
+  }
+
+  // if (options.noStore) {
+  //   options.noCache = true;
+  //   cacheControl.push('no-store');
+  // }
+  //
+  // if (options.noCache) {
+  //   options.maxAge = 0;
+  //   delete options.sMaxAge;
+  //   cacheControl.push('no-cache');
+  // }
+  //
+  // if (options.noTransform) {
+  //   cacheControl.push('no-transform');
+  // }
+  //
+  // if (options.proxyRevalidate) {
+  //   cacheControl.push('proxy-revalidate');
+  // }
+  //
+  // if (options.mustRevalidate) {
+  //   cacheControl.push('must-revalidate');
+  // } else if (!options.noCache) {
+  //   if (options.staleIfError) {
+  //     cacheControl.push(`stale-if-error=${options.staleIfError}`);
+  //   }
+  //
+  //   if (options.staleWhileRevalidate) {
+  //     cacheControl.push(`stale-while-revalidate=${options.staleWhileRevalidate}`);
+  //   }
+  // }
+
+  if ((0, _isInteger2.default)(options.maxAge)) {
+    cacheControl.push('max-age=' + options.maxAge);
+  }
+
+  if ((0, _isInteger2.default)(options.sMaxAge)) {
+    cacheControl.push('s-maxage=' + options.sMaxAge);
+  }
+
+  if (cacheControl.length) {
+    ctx.set('Cache-Control', cacheControl.join(','));
+  }
 };

package/server/proxy/csrf.js

@@ -174,7 +174,7 @@ exports.default = function () {
   var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(_ref2) {
     var app = _ref2.app,
         config = _ref2.config;
-    var cspConnectSrcVerify, appCp, appCpApiV1, jwtVerC, omConf, cm;
+    var cspConnectSrcVerify, appCp, appCpApiV1, jwtVerC, omConf, clnInitCache, cm;
     return _regenerator2.default.wrap(function _callee13$(_context13) {
       while (1) {
         switch (_context13.prev = _context13.next) {
@@ -379,6 +379,15 @@ exports.default = function () {
             // cln init
             _server.global.__yk_cln_init_client__ = '';
             _server.global.__yk_cln_init_server__ = '';
+
+            clnInitCache = function clnInitCache(ctx) {
+              (0, _control.useCache)(ctx, {
+                maxAge: 60 * 60 * 24 * 66, // 66天
+                sMaxAge: 60 * 60 * 24, // 1天
+                public: true
+              });
+            };
+
             app.use(function () {
               var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx, next) {
                 var ycp;
@@ -393,7 +402,8 @@ exports.default = function () {
                           break;
                         }
 
-                        (0, _control.noCache)(ctx);
+                        // noCache(ctx);
+                        clnInitCache(ctx);
                         _server.global.__yk_cln_init_client__ = _server.global.__yk_cln_init_client__ || _paths2.default.read(ycp.confClient);
                         // const str = paths.read(ycp.confClient);
                         ctx.status = 200;
@@ -403,12 +413,13 @@ exports.default = function () {
                         break;
 
                       case 9:
-                        if (!(ctx.method.toUpperCase() === 'POST' && ctx.path === config.appConf.server.basePathMU + 'cln/init')) {
+                        if (!(ctx.method.toUpperCase() === 'GET' && ctx.path === config.appConf.server.basePathMU + 'cln/ini')) {
                           _context2.next = 16;
                           break;
                         }
 
-                        (0, _control.noCache)(ctx);
+                        // noCache(ctx);
+                        clnInitCache(ctx);
                         // const str = paths.read(ycp.confServer);
                         _server.global.__yk_cln_init_server__ = __yk_cln_init_server__ || _paths2.default.read(ycp.confServer);
                         ctx.status = 200;
@@ -923,7 +934,7 @@ exports.default = function () {
               };
             }());
 
-          case 19:
+          case 20:
           case 'end':
             return _context13.stop();
         }

package/utils/conf.js

@@ -30,12 +30,12 @@ var _yakuza = require('yakuza1');
 // }
 
 // client side
-var getConf = exports.getConf = function getConf(basePathMU) {
+var getConf = exports.getConf = function getConf(basePathMU, scKey) {
   var conf = {};
   if ((0, _yakuza.checkServer)()) {} else {
     var http = new XMLHttpRequest();
-    var url = (basePathMU || '/') + 'cln/init?info=' + (0, _yakuza.gPwd)(6);
-    http.open('POST', url, false);
+    var url = (basePathMU || '/') + 'cln/ini?info=' + scKey;
+    http.open('GET', url, false);
     http.onreadystatechange = function () {
       //Call a function when the state changes.
       if (http.readyState === 4 && http.status === 200) {

package/utils/inclusive.js

@@ -186,7 +186,7 @@ var render = function () {
         enabledAll = _ref.enabledAll,
         ykServerEnv = _ref.ykServerEnv,
         ykPkg = _ref.pkg,
-        dkyMode = _ref.dkyMode;
+        dkyModeDef = _ref.dkyModeDef;
 
     var _ykConfig, ykConf, processEnv, aliasDir, conf, cspLoop, setConfValue, setConfCSP, setConf, hostname, port, ykServer, orbAddr, directives, tip;
 
@@ -203,19 +203,20 @@ var render = function () {
               ak: 'ak_TjfAV7I',
               name: pkg.name,
               group: '',
-              dev: dkyMode === 'dev',
+              dev: dkyModeDef === 'dev',
               cmd: process.env.NODE_CMD,
               processKey: '.' + (0, _yakuza.md5)(appDirectory).substring(2, 18),
               imageKey: (0, _yakuza.md5)((processEnv.YK_DOCKERNAME || '').toString()),
               versionSha: (0, _yakuza.md5)((processEnv.YK_VERSIONSHA || new Date().getTime()).toString()),
               childKey: (0, _yakuza.md5)(appDirectory + pkg.name).substring(0, 6),
+              scKey: '',
               env: ykServerEnv || 'local',
               envYK: processEnv.YK_ENV || 'dev',
               inImage: processEnv.YK0_env === 'docker',
               fe: 'none',
               standAlone: false,
               mode: 'ssr',
-              dkyMode: dkyMode || "normal",
+              dkyMode: dkyModeDef || "normal",
               backgroundTest: false,
               https: false,
               variable: _def.variable,
@@ -1085,9 +1086,15 @@ var render = function () {
               if (v.enabled) {
                 conf.proxyServer = v.proxyServer;
                 conf.server = v.server;
+                var scKeyStr = confStr + conf.childKey;
+                if (conf.inImage) {
+                  scKeyStr = k + conf.imageKey;
+                }
+                var scKey = (0, _yakuza.md5)(scKeyStr).substring(2, 8);
+                conf.scKey = scKey;
+
                 var confStr = (0, _stringify2.default)(conf);
                 var serverConfCipher = _encrypt.mixin.symmetry.CBC.encrypt(confStr);
-                var scKey = (0, _yakuza.md5)(confStr + conf.childKey).substring(2, 8);
 
                 var clientConfStr = _encrypt.mixin.symmetry.CBC.encrypt((0, _stringify2.default)({
                   key: scKey,