yakuza0 2.23.13 → 2.23.15

package/package.json

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

package/server/proxy/web.js

@@ -130,7 +130,6 @@ exports.default = function () {
               if (local) {
                 app.use(function (ctx, next) {
                   return (0, _mid2.default)('/' + key, (0, _extends3.default)({}, defProxyOpt, {
-                    changeOrigin: true,
                     target: _config2.default.server.orbProtocol.http + '//' + _config2.default.server.orbHost + ':' + _config2.default.server.orbPort + '/' + _config2.default.proxyServer.apiKey + '/' + _config2.default.name,
                     rewrite: function rewrite(path, ctx) {
                       var rsf = path.replace('/' + key + '/', '');

package/utils/inclusive.js

@@ -207,7 +207,7 @@ var render = function () {
         ykPkg = _ref.pkg,
         dkyModeDef = _ref.dkyModeDef;
 
-    var _ykConfig, ykConf, processEnv, imageKeyOrigin, aliasDir, yk0EnvStr, 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, envBase, envMerge, client, content, acmConf, hostname, port, ykServer, orbAddr, directives, tip, serverConfStr;
 
     return _regenerator2.default.wrap(function _callee2$(_context2) {
       while (1) {
@@ -299,7 +299,7 @@ var render = function () {
                 orbPorts: processEnv.ORBPORTS,
                 yk4Addr: '',
                 orbAddr: '',
-                infoTimeout: 1000,
+                infoTimeout: 7000,
                 orbSSL: true,
                 cHost: null,
                 basePath: '/',
@@ -347,7 +347,9 @@ var render = function () {
                   decoration: undefined,
                   corsCheck: true,
                   policies: {},
-                  directives: {}
+                  directives: {},
+                  envType: "def",
+                  env: {}
                 },
                 sri: {
                   enabled: false,
@@ -597,7 +599,7 @@ var render = function () {
                 baseUrl: {},
                 lp: false,
                 options: {
-                  changeOrigin: false,
+                  changeOrigin: true,
                   secure: false,
                   logs: false,
                   logsShowHeader: false
@@ -786,63 +788,79 @@ var render = function () {
               }
             });
 
+            if (conf.server.csp.envType !== "def") {
+              envBase = conf.server.csp.env['base'] || {};
+
+              delete conf.server.csp.env['base'];
+              envMerge = (0, _extends3.default)({}, envBase);
+
+              _yakuza._.forEach(conf.server.csp.env, function (v, key) {
+                if (key === conf.server.csp.envType) {
+                  _yakuza._.forEach(v, function (ev, ek) {
+                    envMerge[ek] = _yakuza._.uniq(_yakuza._.compact(_yakuza._.concat(ev, envMerge[ek])));
+                  });
+                }
+              });
+              conf.server.csp.policies = envMerge;
+            }
+
             if (!conf.server.edas.enabled) {
-              _context2.next = 28;
+              _context2.next = 29;
               break;
             }
 
-            _context2.prev = 16;
+            _context2.prev = 17;
             client = new _acmSdk2.default(conf.server.edas.options);
-            _context2.next = 20;
+            _context2.next = 21;
             return client.getConfig(conf.server.edas.dataId, conf.server.edas.group);
 
-          case 20:
+          case 21:
             content = _context2.sent;
             acmConf = JSON.parse(content);
 
             setConf(acmConf);
-            _context2.next = 28;
+            _context2.next = 29;
             break;
 
-          case 25:
-            _context2.prev = 25;
-            _context2.t0 = _context2['catch'](16);
+          case 26:
+            _context2.prev = 26;
+            _context2.t0 = _context2['catch'](17);
 
             console.log(_context2.t0);
 
-          case 28:
+          case 29:
             _context2.t1 = conf.dkyMode;
-            _context2.next = _context2.t1 === "dev" ? 31 : _context2.t1 === "normal" ? 35 : _context2.t1 === "prod" ? 39 : _context2.t1 === "stupid" ? 46 : _context2.t1 === "tire" ? 56 : 63;
+            _context2.next = _context2.t1 === "dev" ? 32 : _context2.t1 === "normal" ? 36 : _context2.t1 === "prod" ? 40 : _context2.t1 === "stupid" ? 47 : _context2.t1 === "tire" ? 57 : 64;
             break;
 
-          case 31:
+          case 32:
             // conf.security.encrypt = "none";
             // conf.security.stupid = false;
             // conf.security.helmet = true;
             conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
             conf.security.isDev = true;
             conf.dev = true;
-            return _context2.abrupt('break', 63);
+            return _context2.abrupt('break', 64);
 
-          case 35:
+          case 36:
             // conf.security.encrypt = "none";
             // conf.security.stupid = false;
             // conf.security.helmet = true;
             conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
             conf.security.isNormal = true;
             conf.dev = false;
-            return _context2.abrupt('break', 63);
+            return _context2.abrupt('break', 64);
 
-          case 39:
+          case 40:
             conf.security.encrypt = "sm";
             conf.security.stupid = false;
             conf.security.helmet = true;
             conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
             conf.security.isProd = true;
             conf.dev = false;
-            return _context2.abrupt('break', 63);
+            return _context2.abrupt('break', 64);
 
-          case 46:
+          case 47:
             conf.security.encrypt = "sm";
             conf.security.stupid = true;
             conf.security.helmet = true;
@@ -853,9 +871,9 @@ var render = function () {
             conf.server.csp.decoration = checkBoolSingle(conf.server.csp.decoration, true);
             conf.server.sri.enabled = true;
             // conf.dev = false;
-            return _context2.abrupt('break', 63);
+            return _context2.abrupt('break', 64);
 
-          case 56:
+          case 57:
             conf.security.encrypt = "none";
             conf.security.stupid = false;
             conf.security.helmet = false;
@@ -864,9 +882,9 @@ var render = function () {
             // conf.server.heartbeat.enabled = checkBoolSingle(conf.server.heartbeat.enabled, false);
             conf.server.heartbeat.enabled = false;
             // conf.dev = false;
-            return _context2.abrupt('break', 63);
+            return _context2.abrupt('break', 64);
 
-          case 63:
+          case 64:
 
             conf.server.stupid.v23.enabled = conf.server.stupid.standard === 'v23';
             // conf.router.config['app.examples'].enabled = true;
@@ -969,7 +987,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 85;
+            _context2.next = 86;
             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;
@@ -1156,7 +1174,7 @@ var render = function () {
               };
             }());
 
-          case 85:
+          case 86:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1278,12 +1296,12 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 96:
+          case 97:
           case 'end':
             return _context2.stop();
         }
       }
-    }, _callee2, undefined, [[16, 25]]);
+    }, _callee2, undefined, [[17, 26]]);
   }));
 
   return function render(_x) {