yakuza0 2.22.20 → 2.22.21-beta.1

package/package.json

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

package/server/mode/start.js

@@ -8,6 +8,10 @@ var _regenerator = require('babel-runtime/regenerator');
 
 var _regenerator2 = _interopRequireDefault(_regenerator);
 
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
 var _promise = require('babel-runtime/core-js/promise');
 
 var _promise2 = _interopRequireDefault(_promise);
@@ -100,10 +104,10 @@ exports.default = function () {
                 _pm2.default.start({
                   name: processName,
                   script: _paths2.default.ykRoot + 'bin/yk.js s lite',
-                  env: {
+                  env: (0, _extends3.default)({
                     NODE_ENV: "production",
                     config: config
-                  },
+                  }, process.env),
                   logDateFormat: 'YYYY-MM-DD HH:mm Z',
                   output: output,
                   error: error,

package/server/proxy/csrf.js

@@ -437,7 +437,8 @@ exports.default = function () {
                         // 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);
+                        // global.__yk_cln_init_server__ = __yk_cln_init_server__ || paths.read(ycp.confServer)
+                        _server.global.__yk_cln_init_server__ = _paths2.default.read(ycp.confServer);
                         ctx.status = 200;
                         ctx.body = _server.global.__yk_cln_init_server__;
                         _context2.next = 18;

package/utils/inclusive.js

@@ -197,7 +197,7 @@ var render = function () {
         ykPkg = _ref.pkg,
         dkyModeDef = _ref.dkyModeDef;
 
-    var _ykConfig, ykConf, processEnv, imageKeyOrigin, aliasDir, conf, cspLoop, setConfValue, setConfCSP, setConf, client, content, acmConf, hostname, port, ykServer, orbAddr, directives, tip, serverConfStr;
+    var _ykConfig, ykConf, processEnv, imageKeyOrigin, aliasDir, yk0EnvStr, conf, cspLoop, setConfValue, setConfCSP, setConf, client, content, acmConf, hostname, port, ykServer, orbAddr, directives, tip, serverConfStr;
 
     return _regenerator2.default.wrap(function _callee2$(_context2) {
       while (1) {
@@ -208,6 +208,7 @@ var render = function () {
             processEnv = process && process.env || {};
             imageKeyOrigin = (0, _yakuza.md5)((processEnv.YK_DOCKERNAME || '').toString());
             aliasDir = aliasFn();
+            yk0EnvStr = '';
             conf = {
               version: ykPkg.version,
               ak: 'ak_TjfAV7I',
@@ -729,6 +730,7 @@ var render = function () {
                 // if (v === "false") {
                 //   v = false;
                 // }
+                yk0EnvStr += key + v;
                 key = key.replace('yk0_', '').replace('YK0_', '').replace(/__ARR/g, '"]').replace(/ARR__/g, '["').replace(/__COLON__/g, ':').replace(/__/g, '.');
 
                 var cipherKey = 'cln_enc__';
@@ -748,62 +750,62 @@ var render = function () {
             });
 
             if (!conf.server.edas.enabled) {
-              _context2.next = 27;
+              _context2.next = 28;
               break;
             }
 
-            _context2.prev = 15;
+            _context2.prev = 16;
             client = new _acmSdk2.default(conf.server.edas.options);
-            _context2.next = 19;
+            _context2.next = 20;
             return client.getConfig(conf.server.edas.dataId, conf.server.edas.group);
 
-          case 19:
+          case 20:
             content = _context2.sent;
             acmConf = JSON.parse(content);
 
             setConf(acmConf);
-            _context2.next = 27;
+            _context2.next = 28;
             break;
 
-          case 24:
-            _context2.prev = 24;
-            _context2.t0 = _context2['catch'](15);
+          case 25:
+            _context2.prev = 25;
+            _context2.t0 = _context2['catch'](16);
 
             console.log(_context2.t0);
 
-          case 27:
+          case 28:
             _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" ? 49 : 54;
+            _context2.next = _context2.t1 === "dev" ? 31 : _context2.t1 === "normal" ? 34 : _context2.t1 === "prod" ? 37 : _context2.t1 === "stupid" ? 43 : _context2.t1 === "tire" ? 50 : 55;
             break;
 
-          case 30:
+          case 31:
             // conf.security.encrypt = "none";
             // conf.security.stupid = false;
             // conf.security.helmet = true;
             // conf.server.f5Offline = false;
             conf.security.isDev = true;
             conf.dev = true;
-            return _context2.abrupt('break', 54);
+            return _context2.abrupt('break', 55);
 
-          case 33:
+          case 34:
             // conf.security.encrypt = "none";
             // conf.security.stupid = false;
             // conf.security.helmet = true;
             // conf.server.f5Offline = false;
             conf.security.isNormal = true;
             conf.dev = false;
-            return _context2.abrupt('break', 54);
+            return _context2.abrupt('break', 55);
 
-          case 36:
+          case 37:
             conf.security.encrypt = "sm";
             conf.security.stupid = false;
             conf.security.helmet = true;
             // conf.server.f5Offline = false;
             conf.security.isProd = true;
             conf.dev = false;
-            return _context2.abrupt('break', 54);
+            return _context2.abrupt('break', 55);
 
-          case 42:
+          case 43:
             conf.security.encrypt = "sm";
             conf.security.stupid = true;
             conf.security.helmet = true;
@@ -812,18 +814,18 @@ var render = function () {
             conf.server.csp.enabled = true;
             conf.server.sri.enabled = true;
             // conf.dev = false;
-            return _context2.abrupt('break', 54);
+            return _context2.abrupt('break', 55);
 
-          case 49:
+          case 50:
             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', 54);
+            return _context2.abrupt('break', 55);
 
-          case 54:
+          case 55:
 
             // conf.router.config['app.examples'].enabled = true;
             if (conf.server.yk4Addr) {
@@ -923,7 +925,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 75;
+            _context2.next = 76;
             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;
@@ -1108,7 +1110,7 @@ var render = function () {
               };
             }());
 
-          case 75:
+          case 76:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1179,7 +1181,7 @@ var render = function () {
                 conf.server = v.server;
                 var scKeyStr = (0, _stringify2.default)(_yakuza._.omit(conf, ["cmd", "versionSha"])) + conf.childKey;
                 if (conf.inImage) {
-                  scKeyStr = k + conf.imageKeyOrigin;
+                  scKeyStr = k + conf.imageKeyOrigin + yk0EnvStr;
                 }
                 var scKey = (0, _yakuza.md5)(scKeyStr).substring(2, 8);
                 conf.scKey = scKey;
@@ -1230,12 +1232,12 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 86:
+          case 87:
           case 'end':
             return _context2.stop();
         }
       }
-    }, _callee2, undefined, [[15, 24]]);
+    }, _callee2, undefined, [[16, 25]]);
   }));
 
   return function render(_x) {