yakuza0 2.21.0-beta.2 → 2.21.0-beta.6

package/cli/index.js

@@ -168,6 +168,12 @@ var gi = function () {
   };
 }();
 
+var alias = function alias() {
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+  _server.global.__cln_appName__ = options.appName;
+};
+
 var run = exports.run = function () {
   var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(_argv) {
     return _regenerator2.default.wrap(function _callee14$(_context14) {
@@ -219,7 +225,7 @@ var run = exports.run = function () {
                 }, _callee2, undefined);
               }));
 
-              return function (_x3) {
+              return function (_x4) {
                 return _ref5.apply(this, arguments);
               };
             }());
@@ -242,10 +248,11 @@ var run = exports.run = function () {
                               while (1) {
                                 switch (_context3.prev = _context3.next) {
                                   case 0:
-                                    _context3.next = 2;
+                                    alias({ appName: key });
+                                    _context3.next = 3;
                                     return require(params.serverPath)('dev', key);
 
-                                  case 2:
+                                  case 3:
                                   case 'end':
                                     return _context3.stop();
                                 }
@@ -253,7 +260,7 @@ var run = exports.run = function () {
                             }, _callee3, undefined);
                           }));
 
-                          return function (_x5) {
+                          return function (_x6) {
                             return _ref8.apply(this, arguments);
                           };
                         }());
@@ -266,7 +273,7 @@ var run = exports.run = function () {
                 }, _callee4, undefined);
               }));
 
-              return function (_x4) {
+              return function (_x5) {
                 return _ref7.apply(this, arguments);
               };
             }());
@@ -338,7 +345,7 @@ var run = exports.run = function () {
                             }, _callee5, undefined);
                           }));
 
-                          return function (_x7, _x8) {
+                          return function (_x8, _x9) {
                             return _ref12.apply(this, arguments);
                           };
                         }());
@@ -351,7 +358,7 @@ var run = exports.run = function () {
                 }, _callee6, undefined);
               }));
 
-              return function (_x6) {
+              return function (_x7) {
                 return _ref10.apply(this, arguments);
               };
             }());
@@ -369,10 +376,11 @@ var run = exports.run = function () {
                         process.env.NODE_CMD = 'build';
                         // console.log(app);
                         // gi({app: yk0BuildApp});
-                        _context7.next = 4;
+                        alias({ appName: cmd });
+                        _context7.next = 5;
                         return require(params.serverPath)('build', cmd);
 
-                      case 4:
+                      case 5:
                       case 'end':
                         return _context7.stop();
                     }
@@ -380,7 +388,7 @@ var run = exports.run = function () {
                 }, _callee7, undefined);
               }));
 
-              return function (_x9) {
+              return function (_x10) {
                 return _ref13.apply(this, arguments);
               };
             }());
@@ -424,8 +432,9 @@ var run = exports.run = function () {
                   switch (_context9.prev = _context9.next) {
                     case 0:
                       _rimraf2.default.sync(_paths2.default.hardSourceCache);
+                      _rimraf2.default.sync(_paths2.default.ykRootCacheDir);
 
-                    case 1:
+                    case 2:
                     case 'end':
                       return _context9.stop();
                   }
@@ -483,7 +492,7 @@ var run = exports.run = function () {
                 }, _callee10, undefined);
               }));
 
-              return function (_x10, _x11) {
+              return function (_x11, _x12) {
                 return _ref17.apply(this, arguments);
               };
             }()
@@ -528,33 +537,35 @@ var run = exports.run = function () {
                         apps = _ref20.apps;
 
                         if (!['start', 'stop', 'restart', 'lite', 'container'].includes(cmd)) {
-                          _context12.next = 20;
+                          _context12.next = 21;
                           break;
                         }
 
                         _context12.t0 = cmd;
-                        _context12.next = _context12.t0 === 'lite' ? 13 : 16;
+                        _context12.next = _context12.t0 === 'lite' ? 13 : 17;
                         break;
 
                       case 13:
-                        _context12.next = 15;
+                        alias({ appName: apps[0] });
+                        _context12.next = 16;
                         return require(params.serverLite)(cmd);
 
-                      case 15:
-                        return _context12.abrupt('break', 18);
-
                       case 16:
-                        _context12.next = 18;
+                        return _context12.abrupt('break', 19);
+
+                      case 17:
+                        _context12.next = 19;
                         return _server._.asyncMap(apps, function () {
                           var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(key, j) {
                             return _regenerator2.default.wrap(function _callee11$(_context11) {
                               while (1) {
                                 switch (_context11.prev = _context11.next) {
                                   case 0:
-                                    _context11.next = 2;
+                                    alias({ appName: key });
+                                    _context11.next = 3;
                                     return require(params.serverPath)(cmd, key, j !== apps.length - 1);
 
-                                  case 2:
+                                  case 3:
                                   case 'end':
                                     return _context11.stop();
                                 }
@@ -562,20 +573,20 @@ var run = exports.run = function () {
                             }, _callee11, undefined);
                           }));
 
-                          return function (_x14, _x15) {
+                          return function (_x15, _x16) {
                             return _ref21.apply(this, arguments);
                           };
                         }());
 
-                      case 18:
-                        _context12.next = 22;
+                      case 19:
+                        _context12.next = 23;
                         break;
 
-                      case 20:
+                      case 21:
                         console.log('unknown "%s"', cmd);
                         process.exit(2);
 
-                      case 22:
+                      case 23:
                       case 'end':
                         return _context12.stop();
                     }
@@ -583,7 +594,7 @@ var run = exports.run = function () {
                 }, _callee12, undefined);
               }));
 
-              return function (_x12, _x13) {
+              return function (_x13, _x14) {
                 return _ref19.apply(this, arguments);
               };
             }()).on('--help', function () {
@@ -617,7 +628,7 @@ var run = exports.run = function () {
                 }, _callee13, undefined);
               }));
 
-              return function (_x16, _x17) {
+              return function (_x17, _x18) {
                 return _ref22.apply(this, arguments);
               };
             }());
@@ -637,7 +648,7 @@ var run = exports.run = function () {
     }, _callee14, undefined);
   }));
 
-  return function run(_x2) {
+  return function run(_x3) {
     return _ref3.apply(this, arguments);
   };
 }();

package/config/index.js

@@ -4,12 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
 var _yakuza = require('yakuza1');
 
 var _encrypt = require('yakuza1/lib/encrypt');
 
 var _conf = require('../utils/conf.js');
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 var ec = function ec(cipher) {
   try {
     try {
@@ -21,8 +27,30 @@ var ec = function ec(cipher) {
   return {};
 };
 
-var safeGet = function safeGet() {
-  var cj = require('.cache/yakuza0/config.json');
+var safeGet = function safeGet(options) {
+  // const cj = require(`.cache/yakuza0/config.json`);
+  // if (options.key) {
+  //
+  // }
+  // const
+  // console.log(`.cache/yakuza0/app/${options.key}/config.json`, 1122);
+  // const cj = require(`.cache/yakuza0/app/${options.key}/config.json`);
+  // const cj = require(`.cache/yakuza0/config.json`);
+
+  var cj = {};
+  if ((0, _yakuza.checkServer)()) {
+    var paths = require('./paths').default;
+    var ycp = paths.ykConfigJsonClient(options.appName);
+    var str = paths.read(ycp.conf);
+    cj = JSON.parse(str);
+  } else {
+    var wp = require.context('yakuza0/.cache/', true, /\.json$/);
+    wp.keys().forEach(function (key) {
+      if (key.indexOf(options.appName) !== -1) {
+        cj = wp(key);
+      }
+    });
+  }
   return ec(cj);
 };
 
@@ -45,11 +73,16 @@ var lsSet = function lsSet(key, str) {
 var ykConfig = function ykConfig() {
   var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
+  var options = (0, _extends3.default)({
+    appName: _yakuza.global.__cln_appName__
+  }, opt);
+
   var config = {};
   if ((0, _yakuza.checkServer)()) {
-    config = safeGet();
+    config = safeGet(options);
   } else {
     var c = ec(_encrypt.mixin.symmetry.CBC.decrypt(_yakuza.global.__cln_init__));
+    options.appName = c.appName;
     if (!c.security.isStupid) {
       if (!_yakuza.global.__yk_conf_mt__) {
         var lgc = lsGet(c.key);
@@ -79,7 +112,7 @@ var ykConfig = function ykConfig() {
         config = _yakuza.global.__yk_conf_mt__;
       }
     } else {
-      config = safeGet();
+      config = safeGet(options);
     }
   }
 

package/config/paths.js

@@ -94,29 +94,37 @@ var appNodeModules = resolveApp('node_modules');
 var appGit = resolveApp('../../.git'); // postinstall运行 cwd根目录有差别
 var gitHooksDir = appGit + (path.sep + 'hooks');
 var gitHooksCommitMsg = gitHooksDir + (path.sep + 'commit-msg');
-var ykRoot = path.join(__dirname, '../');
+// console.log(__dirname, process.cwd(), fs.realpathSync('.'), path.resolve(), path.resolve(path.dirname('')));
+var ykRoot = path.join(process.cwd(), './node_modules/yakuza0/');
+// const ykRoot = path.join(__dirname, '../');
 var ykLite = ykRoot + ('server' + path.sep + 'mode' + path.sep + 'lite.js');
 var ykTemplate = ykRoot + ('template' + path.sep);
 var ykNuxtBuild = ykRoot + ('nuxt' + path.sep + 'build' + path.sep);
 var ykCert = ykRoot + ('cert' + path.sep);
 var cacheDir = appNodeModules + (path.sep + '.cache');
 var ykCacheDir = cacheDir + (path.sep + 'yakuza0');
+var ykRootCacheDir = ykRoot + '.cache';
 var ykCacheTmpDir = ykCacheDir + (path.sep + 'tmp');
 var ykCacheAppDir = ykCacheDir + (path.sep + 'app');
 var ykCacheTmpPub = ykCacheTmpDir + (path.sep + 'pub');
 var ykConfigJs = appDirectory + (path.sep + 'ykconfig.js');
-var ykConfigJson = ykCacheDir + (path.sep + 'config.json');
+// const ykConfigJson = ykCacheDir + `${path.sep}config.json`;
 var ykCsrfPrivateKey = ykCacheTmpDir + (path.sep + 'csrfPrivate.key');
 // const ykCsrfPublicKey = ykCacheTmpDir + `${path.sep}public.key`;
 var ykConfigJsonClient = function ykConfigJsonClient(appName) {
-  var dir = ykCacheAppDir + ('' + path.sep + appName);
-  var file = '' + dir + path.sep + 'config_client';
+  var dir = ykRootCacheDir + ('' + path.sep + appName);
+  var confClient = '' + dir + path.sep + 'config_client';
+
+  var conf = '' + dir + path.sep + 'config.json';
+  var confServer = '' + dir + path.sep + 'config_server';
   return {
     dir: dir,
-    file: file
+    conf: conf,
+    confClient: confClient,
+    confServer: confServer
   };
 };
-var ykConfigJsonServer = ykCacheDir + (path.sep + 'config_server');
+// const ykConfigJsonServer = ykCacheDir + `${path.sep}config_server`;
 var interfereFile = ['' + appNodeModules + path.sep + '.package_versions.json', '' + appNodeModules + path.sep + '.recently_updates.txt'];
 
 mkdir(cacheDir);
@@ -167,13 +175,14 @@ exports.default = {
   nuxtConf: appDirectory + (path.sep + 'nuxt.config.js'),
   appAtSameDir: appDirectory + (path.sep + '..' + path.sep),
   ykCacheDir: ykCacheDir,
+  ykRootCacheDir: ykRootCacheDir,
   ykCacheTmpDir: ykCacheTmpDir,
   ykCacheAppDir: ykCacheAppDir,
   ykCacheTmpPub: ykCacheTmpPub,
   ykConfigJs: ykConfigJs,
-  ykConfigJson: ykConfigJson,
+  // ykConfigJson,
   ykConfigJsonClient: ykConfigJsonClient,
-  ykConfigJsonServer: ykConfigJsonServer,
+  // ykConfigJsonServer,
   // ykMainConf,
   hardSourceCache: appNodeModules + (path.sep + '.cache'),
   interfereFile: interfereFile,

package/nuxt/style.js

@@ -37,7 +37,7 @@ exports.default = function (config) {
 
   config.buildModules = ['@rdc/nuxtjs-style-resources'];
 
-  console.warn = function () {};
+  // console.warn = () => {};
   if (stylelint.enabled) {
     var sm = ['yakuza0/nuxt/buildModules/stylelint', stylelint.options];
     config.buildModules.push(sm);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.21.0-beta.2",
+  "version": "2.21.0-beta.6",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
@@ -48,6 +48,7 @@
     "compression": "^1.7.4",
     "consola": "^2.10.1",
     "core-js": "3.10.1",
+    "css-loader": "^5.2.7",
     "download": "^7.1.0",
     "eslint": "^7.2.0",
     "eslint-friendly-formatter": "^3.0.0",
@@ -75,6 +76,10 @@
     "node-ssh": "5",
     "path-match": "^1.2.4",
     "pm2": "^4.2.0",
+    "postcss": "^8.4.5",
+    "postcss-import": "^13.0.0",
+    "postcss-loader": "^4.3.0",
+    "postcss-url": "^10.1.3",
     "react-dev-utils": "^11.0.4",
     "require-from-string": "^2.0.2",
     "rimraf": "^2.6.3",
@@ -97,12 +102,12 @@
     "tcp-port-used": "^1.0.1",
     "ua-parser-js": "^0.7.20",
     "v8-compile-cache": "^2.0.2",
-    "yakuza1": "2.6.6"
+    "yakuza1": "2.6.7"
   },
   "peerDependencies": {
     "@rdc/nuxt": "2.15.8-0",
     "core-js": "3.10.1",
     "eslint": "7.2.0",
-    "yakuza1": "2.6.6"
+    "yakuza1": "2.6.7"
   }
 }

package/server/proxy/csrf.js

@@ -375,43 +375,45 @@ exports.default = function () {
             // cln init
             app.use(function () {
               var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx, next) {
-                var str, _str;
+                var ycp, str, _str;
 
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                   while (1) {
                     switch (_context2.prev = _context2.next) {
                       case 0:
+                        ycp = _paths2.default.ykConfigJsonClient(config.appName);
+
                         if (!(ctx.method.toUpperCase() === 'GET' && ctx.path === config.appConf.server.basePathMU + 'cln/init.js')) {
-                          _context2.next = 7;
+                          _context2.next = 8;
                           break;
                         }
 
                         (0, _control.noCache)(ctx);
-                        str = _paths2.default.read(_paths2.default.ykConfigJsonClient(config.appName).file);
+                        str = _paths2.default.read(ycp.confClient);
 
                         ctx.status = 200;
                         ctx.body = str;
-                        _context2.next = 15;
+                        _context2.next = 16;
                         break;
 
-                      case 7:
+                      case 8:
                         if (!(ctx.method.toUpperCase() === 'POST' && ctx.path === config.appConf.server.basePathMU + 'cln/init')) {
-                          _context2.next = 13;
+                          _context2.next = 14;
                           break;
                         }
 
-                        _str = _paths2.default.read(_paths2.default.ykConfigJsonServer);
+                        _str = _paths2.default.read(ycp.confServer);
 
                         ctx.status = 200;
                         ctx.body = _str;
-                        _context2.next = 15;
+                        _context2.next = 16;
                         break;
 
-                      case 13:
-                        _context2.next = 15;
+                      case 14:
+                        _context2.next = 16;
                         return next();
 
-                      case 15:
+                      case 16:
                       case 'end':
                         return _context2.stop();
                     }

package/utils/inclusive.js

@@ -185,7 +185,7 @@ var render = function () {
         ykServerEnv = _ref.ykServerEnv,
         ykPkg = _ref.pkg;
 
-    var _ykConfig, ykConf, processEnv, aliasDir, conf, cspLoop, setConfValue, setConfCSP, setConf, hostname, port, ykServer, orbAddr, appPortUsed, tip, confStr, serverConfCipher, scKey, serverConfStr, serverConfStrTrans;
+    var _ykConfig, ykConf, processEnv, aliasDir, conf, cspLoop, setConfValue, setConfCSP, setConf, hostname, port, ykServer, orbAddr, tip;
 
     return _regenerator2.default.wrap(function _callee2$(_context2) {
       while (1) {
@@ -473,7 +473,7 @@ var render = function () {
                     enabled: false,
                     eslint: {
                       enabled: true,
-                      test: ['vue', 'js'],
+                      test: ['vue'],
                       include: [],
                       exclude: [],
                       autoFixes: false,
@@ -624,44 +624,6 @@ var render = function () {
 
             setConf(mainConfFn(), mainConfFn(ykServerEnv), ykConf);
 
-            _context2.t0 = conf.dkyMode;
-            _context2.next = _context2.t0 === "dev" ? 12 : _context2.t0 === "prod" ? 14 : _context2.t0 === "stupid" ? 19 : _context2.t0 === "tire" ? 24 : 29;
-            break;
-
-          case 12:
-            // conf.security.encrypt = "none";
-            // conf.security.stupid = false;
-            // conf.security.helmet = true;
-            // conf.server.f5Offline = false;
-            conf.security.isDev = true;
-            return _context2.abrupt('break', 29);
-
-          case 14:
-            conf.security.encrypt = "sm";
-            conf.security.stupid = false;
-            conf.security.helmet = true;
-            // conf.server.f5Offline = false;
-            conf.security.isProd = true;
-            return _context2.abrupt('break', 29);
-
-          case 19:
-            conf.security.encrypt = "sm";
-            conf.security.stupid = true;
-            conf.security.helmet = true;
-            // conf.server.f5Offline = false;
-            conf.security.isStupid = true;
-            return _context2.abrupt('break', 29);
-
-          case 24:
-            conf.security.encrypt = "none";
-            conf.security.stupid = false;
-            conf.security.helmet = false;
-            // conf.server.f5Offline = false;
-            conf.security.isTire = true;
-            return _context2.abrupt('break', 29);
-
-          case 29:
-
             if (ykConf.https) {
               conf.server.protocol = 'https:';
             }
@@ -714,6 +676,44 @@ var render = function () {
               }
             });
 
+            _context2.t0 = conf.dkyMode;
+            _context2.next = _context2.t0 === "dev" ? 16 : _context2.t0 === "prod" ? 18 : _context2.t0 === "stupid" ? 23 : _context2.t0 === "tire" ? 28 : 33;
+            break;
+
+          case 16:
+            // conf.security.encrypt = "none";
+            // conf.security.stupid = false;
+            // conf.security.helmet = true;
+            // conf.server.f5Offline = false;
+            conf.security.isDev = true;
+            return _context2.abrupt('break', 33);
+
+          case 18:
+            conf.security.encrypt = "sm";
+            conf.security.stupid = false;
+            conf.security.helmet = true;
+            // conf.server.f5Offline = false;
+            conf.security.isProd = true;
+            return _context2.abrupt('break', 33);
+
+          case 23:
+            conf.security.encrypt = "sm";
+            conf.security.stupid = true;
+            conf.security.helmet = true;
+            // conf.server.f5Offline = false;
+            conf.security.isStupid = true;
+            return _context2.abrupt('break', 33);
+
+          case 28:
+            conf.security.encrypt = "none";
+            conf.security.stupid = false;
+            conf.security.helmet = false;
+            // conf.server.f5Offline = false;
+            conf.security.isTire = true;
+            return _context2.abrupt('break', 33);
+
+          case 33:
+
             // conf.router.config['app.examples'].enabled = true;
             if (conf.server.yk4Addr) {
               conf.server.orbAddr = conf.server.yk4Addr;
@@ -791,8 +791,8 @@ var render = function () {
 
             conf.server.csp.imgSrc = _yakuza._.uniq([].concat((0, _toConsumableArray3.default)(conf.server.csp.imgSrc || []), (0, _toConsumableArray3.default)(conf.server.tfs.fastdfs.domain)));
 
-            appPortUsed = [];
-            _context2.next = 51;
+            // const appPortUsed = [];
+            _context2.next = 50;
             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;
@@ -872,44 +872,47 @@ var render = function () {
                           v.port = typeof v.imagePort === 'number' ? v.imagePort : 80;
                         }
 
+                        v.proxyServer.ws.key = _yakuza._.trimStart(v.server.basePathMU, "/") + "api-ws";
+                        // console.log(v.proxyServer.ws.key, key);
+                        // console.log(v.server.basePathMU, v.proxyServer.ws.key, _.trimStart(v.server.basePathMU, "/"), key);
                         _context.t0 = v.port;
 
                         if (_context.t0) {
-                          _context.next = 26;
+                          _context.next = 27;
                           break;
                         }
 
-                        _context.next = 25;
+                        _context.next = 26;
                         return (0, _getPort2.default)({ port: pool });
 
-                      case 25:
+                      case 26:
                         _context.t0 = _context.sent;
 
-                      case 26:
+                      case 27:
                         v.port = _context.t0;
 
                         pool = _yakuza._.without(pool, v.port);
 
                         if (!v.server.generate.enabled) {
-                          _context.next = 34;
+                          _context.next = 35;
                           break;
                         }
 
-                        _context.next = 31;
+                        _context.next = 32;
                         return (0, _getPort2.default)({ port: appPool });
 
-                      case 31:
+                      case 32:
                         _context.t1 = _context.sent;
-                        _context.next = 35;
+                        _context.next = 36;
                         break;
 
-                      case 34:
+                      case 35:
                         _context.t1 = v.port;
 
-                      case 35:
+                      case 36:
                         v.appPort = _context.t1;
 
-                        appPortUsed.push(v.appPort);
+                        // appPortUsed.push(v.appPort);
                         appPool = _yakuza._.without(appPool, v.appPort);
 
                         // console.log(v.appPort);
@@ -938,7 +941,7 @@ var render = function () {
                           }
                         }
 
-                        conf.router.config[key] = v;
+                        conf.router.config[key] = _yakuza._.cloneDeep(v);
 
                       case 41:
                       case 'end':
@@ -953,7 +956,7 @@ var render = function () {
               };
             }());
 
-          case 51:
+          case 50:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -972,34 +975,6 @@ var render = function () {
                 err = true;
                 _consola2.default.error(_msg.errMsg['name.none']);
               }
-              // switch (process.env.NODE_TYPE) {
-              //   case 'publish':
-              //     if (!_.isArray(conf.publish)) {
-              //       conf.publish = [conf.publish];
-              //     }
-              //
-              //     conf.publish.forEach(publish => {
-              //       if (!publish.remoteDir) {
-              //         consola.error(errMsg['publish.connect.remoteDir']);
-              //         err = true;
-              //       }
-              //       if (!publish.localDir) {
-              //         // consola.info(errMsg['publish.connect.localDir']);
-              //       }
-              //     });
-              //     break;
-              //   default:
-              //     // if (!conf.proxyServer.baseURL) {
-              //     //   conf.proxyServer.baseURL = conf.proxyServer.gateway[conf.proxyServer.baseKey];
-              //     // }
-              //
-              //     if (!conf.name) {
-              //       err = true;
-              //       consola.error(errMsg['name.none']);
-              //     }
-              //
-              //   // conf.proxyServer.services.$ = conf.proxyServer.services.$ || conf.proxyServer.baseURL;
-              // }
 
               if (err) {
                 process.exit();
@@ -1031,22 +1006,27 @@ var render = function () {
             // const es = mixin.symmetry.ECB.encrypt(JSON.stringify(conf));
             // fs.writeFileSync(ykConfigJson, JSON.stringify({es}), 'utf8');
 
-            confStr = (0, _stringify2.default)(conf);
-            serverConfCipher = _encrypt.mixin.symmetry.CBC.encrypt(confStr);
+            // const confStr = JSON.stringify(conf);
+            // const serverConfCipher = mixin.symmetry.CBC.encrypt(confStr);
 
             // let omitStr = JSON.stringify(_.omit(conf, ['versionSha', 'cmd']));
             // appPortUsed.forEach(p => {
             //   omitStr = omitStr.replace(p.toString(), '');
             // })
-
-            scKey = (0, _yakuza.md5)(confStr).substring(2, 8);
-
+            // const scKey = md5(confStr).substring(2, 8);
 
             _yakuza._.forEach(conf.router.config, function (v, k) {
               if (v.enabled) {
+                conf.proxyServer = v.proxyServer;
+                conf.server = v.server;
+                var confStr = (0, _stringify2.default)(conf);
+                var serverConfCipher = _encrypt.mixin.symmetry.CBC.encrypt(confStr);
+                var scKey = (0, _yakuza.md5)(confStr).substring(2, 8);
+
                 var clientConfStr = _encrypt.mixin.symmetry.CBC.encrypt((0, _stringify2.default)({
                   key: scKey,
                   basePathMU: v.server.basePathMU,
+                  appName: k,
                   security: {
                     isStupid: conf.security.isStupid
                   }
@@ -1055,15 +1035,19 @@ var render = function () {
                 var clientConfStrTrans = _encrypt.mixin.symmetry.CBC.encrypt(clientConfStrCipher);
                 var ycp = ykConfigJsonClient(k);
                 mkdir(ycp.dir);
-                _fs2.default.writeFileSync(ycp.file, 'var __cln_init__ = "' + clientConfStrTrans + '"', 'utf8');
+                _fs2.default.writeFileSync(ycp.confClient, 'var __cln_init__ = "' + clientConfStrTrans + '"', 'utf8');
+
+                var serverConfStr = (0, _stringify2.default)({ es: serverConfCipher });
+                var serverConfStrTrans = _encrypt.mixin.symmetry.CBC.encrypt(serverConfStr, _encrypt.mixin.getKey(scKey));
+                _fs2.default.writeFileSync(ycp.conf, serverConfStr, 'utf8');
+                _fs2.default.writeFileSync(ycp.confServer, serverConfStrTrans, 'utf8');
               }
             });
 
-            serverConfStr = (0, _stringify2.default)({ es: serverConfCipher });
-            serverConfStrTrans = _encrypt.mixin.symmetry.CBC.encrypt(serverConfStr, _encrypt.mixin.getKey(scKey));
-
-            _fs2.default.writeFileSync(ykConfigJson, serverConfStr, 'utf8');
-            _fs2.default.writeFileSync(ykConfigJsonServer, serverConfStrTrans, 'utf8');
+            // const serverConfStr = JSON.stringify({es: serverConfCipher})
+            // const serverConfStrTrans = mixin.symmetry.CBC.encrypt(serverConfStr, mixin.getKey(scKey))
+            // fs.writeFileSync(ykConfigJson, serverConfStr, 'utf8');
+            // fs.writeFileSync(ykConfigJsonServer, serverConfStrTrans, 'utf8');
             // await setYk0Conf(orbAddr, scKey, serverConfStrTrans);
 
             // if (conf.https) {
@@ -1072,7 +1056,7 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 65:
+          case 57:
           case 'end':
             return _context2.stop();
         }