yakuza0 2.20.9 → 2.21.0-beta.1

package/config/index.js

@@ -4,81 +4,168 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
-var _config = require('.cache/yakuza0/config.json');
-
-var _config2 = _interopRequireDefault(_config);
-
 var _yakuza = require('yakuza1');
 
 var _encrypt = require('yakuza1/lib/encrypt');
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _conf = require('../utils/conf.js');
 
-var ykConfig = function ykConfig() {
-  var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-  var json = _config2.default;
-
-  var _fresh$opt = (0, _extends3.default)({
-    fresh: true
-  }, opt),
-      cookie = _fresh$opt.cookie,
-      fresh = _fresh$opt.fresh;
+var ec = function ec(cipher) {
+  try {
+    try {
+      cipher = JSON.parse(cipher);
+    } catch (e) {}
+    var c = _encrypt.mixin.symmetry.CBC.decrypt(cipher.es);
+    return JSON.parse(c);
+  } catch (e) {}
+  return {};
+};
 
-  var jtConf = {};
+var safeGet = function safeGet() {
+  var cj = require('.cache/yakuza0/config.json');
+  return ec(cj);
+};
 
-  if ((0, _yakuza.checkServer)() && fresh) {
-    var paths = require('./paths').default;
-    var ykConfigJson = paths.ykConfigJson,
-        read = paths.read;
+var lsGet = function lsGet(key) {
+  var lgc = localStorage.getItem('cln_init');
 
-    json = read(ykConfigJson);
-    json = JSON.parse(json);
+  if (lgc) {
+    var arr = lgc.split("_");
+    if (arr[0] === key) {
+      return arr[1];
+    }
   }
+};
 
-  var str = _encrypt.mixin.symmetry.ECB.decrypt(json.es);
-
-  try {
-    str = JSON.parse(str);
-  } catch (e) {}
-
-  var config = str;
+var lsSet = function lsSet(key, str) {
+  var content = key + '_' + str;
+  localStorage.setItem('cln_init', content);
+};
 
-  _yakuza._.readOnly(_yakuza.global, '__enc_encryptType__', config.security.encrypt);
-  _yakuza._.readOnly(_yakuza.global, '__yConf_ak__', config.ak);
+var ykConfig = function ykConfig() {
+  var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-  if (config.https && process && process.env) {
-    process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = 0;
+  var config = {};
+  if ((0, _yakuza.checkServer)()) {
+    config = safeGet();
+  } else {
+    var c = ec(_encrypt.mixin.symmetry.CBC.decrypt(_yakuza.global.__cln_init__));
+    if (!c.security.isStupid) {
+      if (!_yakuza.global.__yk_conf_mt__) {
+        var lgc = lsGet(c.key);
+
+        var cacheGet = function cacheGet() {
+          var cf = (0, _conf.getConf)(c.basePathMU);
+          lsSet(c.key, cf);
+          return cf;
+        };
+
+        if (!lgc) {
+          config = cacheGet();
+        } else {
+          config = lgc;
+        }
+
+        try {
+          config = _encrypt.mixin.symmetry.CBC.decrypt(config, _encrypt.mixin.getKey(c.key));
+        } catch (e) {
+          config = cacheGet();
+        }
+
+        config = ec(config);
+        _yakuza._.readOnly(_yakuza.global, '__yk_conf_mt__', config);
+      } else {
+        config = _yakuza.global.__yk_conf_mt__;
+      }
+    } else {
+      config = safeGet();
+    }
   }
-
-  // if (cookie) {
-  //   jtConf = Cookies.getByStr(config.variable.backgroundTestCookie, cookie);
-  // } else {
-  //   jtConf = Cookies.get(config.variable.backgroundTestCookie)
+  // console.log(config);
+  // if (!config.security) {
+  //   throw ""
+  // }
+  // let json = {};
+  // const {cookie, fresh} = {
+  //   fresh: true,
+  //   ...opt,
+  // };
+  //
+  // if (checkServer() && fresh) {
+  //   const paths = require('./paths').default;
+  //   const {ykConfigJson, read} = paths;
+  //   json = read(ykConfigJson);
+  //   json = JSON.parse(json);
   // }
   //
-  // if (jtConf && config.backgroundTest) {
-  //   try {
-  //     jtConf = JSON.parse(decodeURIComponent(jtConf));
-  //   } catch (e) {
-  //   }
+  // let str = mixin.symmetry.ECB.decrypt(json.es);
   //
-  //   if (jtConf.baseUrl) {
-  //     config.proxyServer.baseURL = jtConf.baseUrl
-  //   }
-  //   if (jtConf.services) {
-  //     config.proxyServer.base.services = jtConf.services
-  //   }
+  // try {
+  //   str = JSON.parse(str);
+  // } catch (e) {
   // }
 
+  // const config = str;
+
+  _yakuza._.readOnly(_yakuza.global, '__enc_encryptType__', config.security && config.security.encrypt);
+  _yakuza._.readOnly(_yakuza.global, '__yConf_ak__', config.ak);
+
+  if (config.https && process && process.env) {
+    process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0';
+  }
+
   return config;
 };
 
 var yConf = ykConfig({ fresh: false });
 yConf.ykConfig = ykConfig;
 exports.default = yConf;
+
+// import deasync from 'deasync';
+
+// const getCF = () => getConf("aaa").then(result => result).catch(function(error) {
+//   console.log(error);
+// });
+
+// const asyncToSync = (callback) => {
+//   let data = null;
+//   // function doSomething() {
+//   //   callback.then((result) => {
+//   //     data = result;
+//   //   })
+//   // }
+//   // doSomething()
+//   // const ivl = setInterval(function() {
+//   //   console.log(ivl, 11);
+//   //   if (data !== null) {
+//   //     console.log(data, 1);
+//   //     clearInterval(ivl);
+//   //     console.log(ivl, 22);
+//   //   }
+//   // }, 100);
+//
+//   setTimeout(() => {
+//     console.log(1);
+//     callback.then((result) => {
+//       console.log(2);
+//       data = result;
+//     })
+//     console.log(3);
+//   }, 0)
+//
+//   let start = Date.now();
+//   let now = start;
+//   let re = null
+//   while (now - start < 10000) {
+//     now = Date.now();
+//     re = data;
+//     console.log(re);
+//   }
+//   // while(data === null) {
+//   //   console.log(data);
+//   // }
+//
+//   return re
+// }
+
 module.exports = exports['default'];

package/config/paths.js

@@ -108,7 +108,10 @@ var ykConfigJs = appDirectory + (path.sep + 'ykconfig.js');
 var ykConfigJson = ykCacheDir + (path.sep + 'config.json');
 var ykCsrfPrivateKey = ykCacheTmpDir + (path.sep + 'csrfPrivate.key');
 // const ykCsrfPublicKey = ykCacheTmpDir + `${path.sep}public.key`;
-var ykConfigJsonClient = ykCacheDir + (path.sep + 'config_client.json');
+var ykConfigJsonClient = function ykConfigJsonClient(appName) {
+  return ykCacheAppDir + ('' + path.sep + appName + path.sep + 'config_client');
+};
+var ykConfigJsonServer = ykCacheDir + (path.sep + 'config_server');
 var interfereFile = ['' + appNodeModules + path.sep + '.package_versions.json', '' + appNodeModules + path.sep + '.recently_updates.txt'];
 
 mkdir(cacheDir);
@@ -119,7 +122,13 @@ mkdir(ykCacheTmpPub);
 
 // env file
 var envPath = function envPath(env) {
+  var sf = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+
   var suffix = 'config.' + (env || 'default').toLowerCase();
+  if (sf) {
+    // suffix += '.' + sf;
+    suffix += sf;
+  }
   // if (suffix !== 'default') {
   //   suffix = 'config.' + suffix
   // }
@@ -159,6 +168,7 @@ exports.default = {
   ykConfigJs: ykConfigJs,
   ykConfigJson: ykConfigJson,
   ykConfigJsonClient: ykConfigJsonClient,
+  ykConfigJsonServer: ykConfigJsonServer,
   // ykMainConf,
   hardSourceCache: appNodeModules + (path.sep + '.cache'),
   interfereFile: interfereFile,

package/nuxt/head.js

@@ -35,7 +35,9 @@ exports.default = function (config) {
   var pkgHead = {};
 
   if (config.commonConfig.head !== false) {
-    pkgHead = (0, _extends3.default)({}, _config2.default.nuxt && _config2.default.nuxt.head);
+    pkgHead = (0, _extends3.default)({}, _config2.default.nuxt && _config2.default.nuxt.head, {
+      script: [{ src: "/cln/init.js?info=" + (0, _yakuza.gPwd)() }].concat((0, _toConsumableArray3.default)(_config2.default.nuxt && _config2.default.nuxt.head && _config2.default.nuxt.head.script || []))
+    });
   }
 
   _yakuza._.forEach(pkgHead, function (v, key) {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "yakuza0",
-  "version": "2.20.9",
+  "version": "2.21.0-beta.1",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
     "build": "babel --no-babelrc src -d . --presets=env --plugins=transform-runtime,transform-object-rest-spread,add-module-exports",
-    "pub:beta": "npm run build && npm version prerelease --preid=beta && npm publish --tag beta",
+    "pub:beta": "npm run build && npm version prerelease --preid=beta && pxnpm publish --tag beta",
     "pub": "npm run build && npm version patch && npm publish",
     "postinstall": "yk verify commit-init",
     "test": "jest"

package/server/index.js

@@ -392,4 +392,150 @@ exports.default = function () {
   };
 }();
 
+// import normal from './mode/normal';
+// import start from './mode/start';
+// import stop, {stat} from './mode/stop';
+// // import lite from './mode/lite';
+// import address from 'address';
+// import build from './mode/build';
+// import container from './mode/container';
+// import paths from '../config/paths';
+// import yConf from '../config';
+// import chalk from 'chalk';
+// import {_, machineId, md5, global} from 'yakuza1/server';
+// // import getPort from 'get-port';
+// import {curlOrb} from '../utils/curl';
+//
+// const styleLine = () => {
+//   // if (hasProcess) {
+//   console.log('------------');
+//   // }
+// };
+//
+// export default async (mode, appName, notExit) => {
+//   const appHref = [];
+//   const router = yConf.router && yConf.router.config && yConf.router.config[appName];
+//   const isProjectMode = mode === 'start' || mode === 'normal';
+//   const isProdMode = mode === 'start' || mode === 'stop' || mode === 'container';
+//   // let hasProcess = false;
+//   const ports = {};
+//   const appPorts = {};
+//   let pool = _.range(3000, 3500);
+//   let appPool = _.range(26000, 26500);
+//
+//   const appKey = yConf.name + ' => ' + key;
+//   const appPaths = paths.appBuildDir(key, yConf.server.appBuildCacheDirName);
+//   let nuxtConfPath = `${appPaths.appRoot}nuxt.config.js`;
+//   if (isProdMode) {
+//     nuxtConfPath = `${appPaths.appServerRoot}nuxt.config.js`
+//   }
+//
+//   if (paths.access(nuxtConfPath)) {
+//     const conf = {};
+//     conf.appName = key;
+//     conf.appKey = appKey;
+//
+//     conf.appConf = {
+//       ...router,
+//       port: ports[key],
+//       appPort: appPorts[key],
+//       ports,
+//       appPorts,
+//     };
+//
+//     // register
+//     const mId = await machineId();
+//     const svcBaseKey = yConf.ak + yConf.name + yConf.imageKey;
+//     let svcKey = svcBaseKey + yConf.processKey + mId;
+//     if (!yConf.dev) {
+//       svcKey = svcBaseKey + yConf.processKey;
+//     }
+//     if (yConf.inImage) {
+//       svcKey = svcBaseKey;
+//     }
+//
+//     const svcHost = conf.appConf.cHost || conf.appConf.domain || address.ip() || conf.appConf.host;
+//     const svcPort = conf.appConf.cPort || conf.appConf.port;
+//     let svcHostname = svcHost + (svcPort ? ':' + svcPort : '');
+//     if (conf.appConf.cPortHide) {
+//       svcHostname = svcHost;
+//     }
+//     let prefix = 'http://';
+//     if (conf.appConf.cSSL) {
+//       prefix = 'https://'
+//     }
+//     svcHostname = prefix + svcHostname
+//     conf.appConf.svcKey = md5(svcKey);
+//
+//     const baseURL = yConf.router.config[key] && yConf.router.config[key].proxyServer.baseURL
+//
+//     try {
+//       await curlOrb(`/apiv2/support/svc/signIn`, {
+//         method: 'POST',
+//         body: {
+//           mId,
+//           project: yConf.name,
+//           appName: conf.appName,
+//           ak: yConf.ak,
+//           svcHostname,
+//           svcKey: conf.appConf.svcKey,
+//           appCode: conf.appConf.appCode,
+//           baseURL,
+//         },
+//         timeout: yConf.server.infoTimeout,
+//         json: true,
+//       });
+//       // console.log(aaa, 111);
+//     } catch (e) {
+//       // console.log(e);
+//     }
+//
+//     const config = require(nuxtConfPath)(conf);
+//     const options = {
+//       appPaths,
+//       config,
+//     };
+//
+//     switch (mode) {
+//       case 'start':
+//         // console.log('------------');
+//         styleLine();
+//         await start(options);
+//         break;
+//       case 'stop':
+//         styleLine();
+//         await stop({config: {appKey}});
+//         break;
+//       case 'build':
+//         await build(options);
+//         break;
+//       case 'container':
+//         await container(options);
+//         break;
+//       default:
+//         await normal(options);
+//     }
+//
+//     appHref.push(`  - ${key}:   ${chalk.cyan(yConf.server.host + ':' + options.config.appConf.port)}`);
+//   }
+//
+//   if ((mode === 'start' || mode === 'stop') && notExit !== true) {
+//     // styleLine({hasProcess, mode});
+//     styleLine();
+//     process.exit(0);
+//   }
+//
+//   if (yConf.dev || mode === 'container') {
+//     console.log();
+//     consola.ready(
+//       [
+//         `  App running at:`,
+//         ...appHref,
+//       ].join('\n'),
+//     );
+//     console.log();
+//   }
+// }
+
+
 module.exports = exports['default'];