yakuza0 2.22.14 → 2.22.15-beta.1

package/cli/index.js

@@ -5,6 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.run = undefined;
 
+var _stringify = require('babel-runtime/core-js/json/stringify');
+
+var _stringify2 = _interopRequireDefault(_stringify);
+
 var _regenerator = require('babel-runtime/regenerator');
 
 var _regenerator2 = _interopRequireDefault(_regenerator);
@@ -55,6 +59,12 @@ var _verify = require('../utils/verify');
 
 var _server = require('yakuza1/server');
 
+var _commandExists = require('command-exists');
+
+var _connectionTester = require('connection-tester');
+
+var _connectionTester2 = _interopRequireDefault(_connectionTester);
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -62,8 +72,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 process.env.YK_USAGE = 'CLI';
 
 var _require = require('child_process'),
-    spawnSync = _require.spawnSync,
+    execSync = _require.execSync,
     spawn = _require.spawn;
+
 // const util = require('util');
 // const spawn = util.promisify(require('child_process').spawn);
 
@@ -193,11 +204,15 @@ var alias = function alias() {
   _server.global.__cln_appName__ = options.appName;
 };
 
+var execCmd = function execCmd(cmd) {
+  execSync(cmd, { shell: true, stdio: 'inherit' });
+};
+
 var run = exports.run = function () {
-  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(_argv) {
-    return _regenerator2.default.wrap(function _callee14$(_context14) {
+  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(_argv) {
+    return _regenerator2.default.wrap(function _callee15$(_context15) {
       while (1) {
-        switch (_context14.prev = _context14.next) {
+        switch (_context15.prev = _context15.next) {
           case 0:
             _commander2.default.version(_package2.default.version, '-v, --version');
 
@@ -306,18 +321,89 @@ var run = exports.run = function () {
               };
             }());
 
+            _commander2.default.command('image').description('Build image.').option('-nc, --no-cache', 'Do not use cache when building the image').action((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+              var _connectionTester$tes, isInner, CS, CLNENV, noCache, CLNWORKERS, CLNVERSION, pkg, NMCI, projectName, obj, imageReleaseName, imageReleaseNameSave, BI;
+
+              return _regenerator2.default.wrap(function _callee5$(_context5) {
+                while (1) {
+                  switch (_context5.prev = _context5.next) {
+                    case 0:
+                      _connectionTester$tes = _connectionTester2.default.test('fe-repo.inner.px.nfjbill.ren', 5000, 1000), isInner = _connectionTester$tes.success;
+                      CS = (0, _server.gPwd)();
+                      CLNENV = process.env.CLN_IMAGE_ENV || 'docker';
+                      noCache = process.env.NO_CACHE === '1';
+                      CLNWORKERS = process.env.CLN_IMAGE_WORKERS || '2';
+                      CLNVERSION = process.env.CLN_IMAGE_VERSION || CS;
+                      pkg = _paths2.default.read(_paths2.default.appPackageJson);
+                      NMCI = 'nm_' + (0, _server.md5)(pkg).substring(0, 6);
+                      projectName = 'cln_img';
+
+                      try {
+                        obj = JSON.parse(pkg);
+
+                        projectName = obj.name;
+                        NMCI = 'nm_' + (0, _server.md5)((0, _stringify2.default)(obj.dependencies) + (0, _stringify2.default)(obj.peerDependencies) + (0, _stringify2.default)(obj.devDependencies)).substring(0, 6);
+                        CLNVERSION = process.env.CLN_IMAGE_VERSION || obj.version;
+                      } catch (e) {}
+                      imageReleaseName = projectName + ':' + CLNVERSION;
+                      imageReleaseNameSave = projectName + '_' + CLNVERSION;
+                      BI = isInner ? 'fe-repo.inner.px.nfjbill.ren:5000/cln-server:0.5.4' : 'nfjbill/cln-server:0.5.4';
+
+                      if ((0, _commandExists.sync)('docker')) {
+                        _context5.next = 17;
+                        break;
+                      }
+
+                      _consola2.default.error('docker must be installed!');
+                      process.exit(1);
+                      return _context5.abrupt('return');
+
+                    case 17:
+                      if (!(0, _commandExists.sync)('pxnpm')) {
+                        execCmd(isInner ? 'npm i -g pxnpm --registry=http://fe-repo.inner.px.nfjbill.ren:5507' : 'npm i -g pxnpm');
+                      }
+                      if (!(0, _commandExists.sync)('cross-env')) {
+                        execCmd('pxnpm i -g cross-env');
+                      }
+
+                      execCmd('cross-env YK_ENV=' + CLNENV + ' YK_SERVER_ENV=' + CLNENV + ' YK_VERSIONSHA=' + CS + ' YK_DOCKERNAME=' + CS + ' YK_MACHINE_TYPE=workstation YK0_env=docker pxnpm run build -workers=' + CLNWORKERS);
+                      execCmd('cross-env DOCKER_BUILDKIT=1 docker build ' + (noCache ? '--no-cache' : '') + ' -f ' + _paths2.default.ykRootImage + 'Dockerfile --build-arg BASE_IMAGE=' + BI + ' --build-arg YK_VERSIONSHA=' + CS + ' --build-arg YK_ENV=' + CLNENV + ' --build-arg NPM_MODULES_CACHE_ID=' + NMCI + ' -t ' + imageReleaseName + ' .');
+
+                      _context5.next = 23;
+                      return (0, _server.delay)(1000);
+
+                    case 23:
+
+                      if (!(0, _commandExists.sync)('gzip')) {
+                        execCmd('docker save > ' + imageReleaseNameSave + '.tar ' + imageReleaseName);
+                      } else {
+                        execCmd('docker save ' + imageReleaseName + ' | gzip >' + imageReleaseNameSave + '.tar');
+                      }
+
+                      _consola2.default.info('Image tar: ' + imageReleaseNameSave + '.tar');
+                      _consola2.default.info('Image name: ' + imageReleaseName);
+                      _consola2.default.info('Image production completed！');
+
+                    case 27:
+                    case 'end':
+                      return _context5.stop();
+                  }
+                }
+              }, _callee5, undefined);
+            })));
+
             _commander2.default.command('build').description('build a model').option('-y0ba, --yk0-build-app <appName>', 'Building a specified application').option('-e, --env <envName>', 'yk server env')
             // .action(async ({app}) => {
             .action(function () {
-              var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_ref9) {
-                var yk0BuildApp = _ref9.yk0BuildApp,
-                    env = _ref9.env;
+              var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(_ref10) {
+                var yk0BuildApp = _ref10.yk0BuildApp,
+                    env = _ref10.env;
 
-                var _ref11, apps, workers, cpuLen, i, run;
+                var _ref12, apps, workers, cpuLen, i, run;
 
-                return _regenerator2.default.wrap(function _callee6$(_context6) {
+                return _regenerator2.default.wrap(function _callee7$(_context7) {
                   while (1) {
-                    switch (_context6.prev = _context6.next) {
+                    switch (_context7.prev = _context7.next) {
                       case 0:
                         // process.env.NODE_ENV = 'production';
                         // process.env.NODE_CMD = 'build';
@@ -327,12 +413,12 @@ var run = exports.run = function () {
                         _consola2.default.log('In the preparation...');
                         process.env.NODE_ENV = 'production';
                         process.env.NODE_CMD = 'build';
-                        _context6.next = 5;
+                        _context7.next = 5;
                         return gi({ app: yk0BuildApp, ykServerEnv: env });
 
                       case 5:
-                        _ref11 = _context6.sent;
-                        apps = _ref11.apps;
+                        _ref12 = _context7.sent;
+                        apps = _ref12.apps;
                         workers = process.env.npm_config_workers;
                         cpuLen = _os2.default.cpus().length;
 
@@ -355,10 +441,10 @@ var run = exports.run = function () {
                         };
 
                         _server._.asyncMap(apps, function () {
-                          var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(key, j) {
-                            return _regenerator2.default.wrap(function _callee5$(_context5) {
+                          var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(key, j) {
+                            return _regenerator2.default.wrap(function _callee6$(_context6) {
                               while (1) {
-                                switch (_context5.prev = _context5.next) {
+                                switch (_context6.prev = _context6.next) {
                                   case 0:
                                     if (j < cpuLen) {
                                       i = j;
@@ -367,27 +453,27 @@ var run = exports.run = function () {
 
                                   case 1:
                                   case 'end':
-                                    return _context5.stop();
+                                    return _context6.stop();
                                 }
                               }
-                            }, _callee5, undefined);
+                            }, _callee6, undefined);
                           }));
 
                           return function (_x8, _x9) {
-                            return _ref12.apply(this, arguments);
+                            return _ref13.apply(this, arguments);
                           };
                         }());
 
                       case 13:
                       case 'end':
-                        return _context6.stop();
+                        return _context7.stop();
                     }
                   }
-                }, _callee6, undefined);
+                }, _callee7, undefined);
               }));
 
               return function (_x7) {
-                return _ref10.apply(this, arguments);
+                return _ref11.apply(this, arguments);
               };
             }());
 
@@ -395,131 +481,131 @@ var run = exports.run = function () {
             // .option('-y0ba, --yk0-build-app <appName>', 'Building a specified application')
             // .action(async ({app}) => {
             .action(function () {
-              var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(cmd) {
-                return _regenerator2.default.wrap(function _callee7$(_context7) {
+              var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(cmd) {
+                return _regenerator2.default.wrap(function _callee8$(_context8) {
                   while (1) {
-                    switch (_context7.prev = _context7.next) {
+                    switch (_context8.prev = _context8.next) {
                       case 0:
                         process.env.NODE_ENV = 'production';
                         process.env.NODE_CMD = 'build';
                         // console.log(app);
                         // gi({app: yk0BuildApp});
                         alias({ appName: cmd });
-                        _context7.next = 5;
+                        _context8.next = 5;
                         return require(params.serverPath)('build', cmd);
 
                       case 5:
                       case 'end':
-                        return _context7.stop();
+                        return _context8.stop();
                     }
                   }
-                }, _callee7, undefined);
+                }, _callee8, undefined);
               }));
 
               return function (_x10) {
-                return _ref13.apply(this, arguments);
+                return _ref14.apply(this, arguments);
               };
             }());
 
-            _commander2.default.command('generate').alias('g').description('generate a model').action((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
-              return _regenerator2.default.wrap(function _callee8$(_context8) {
+            _commander2.default.command('generate').alias('g').description('generate a model').action((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
+              return _regenerator2.default.wrap(function _callee9$(_context9) {
                 while (1) {
-                  switch (_context8.prev = _context8.next) {
+                  switch (_context9.prev = _context9.next) {
                     case 0:
                       process.env.NODE_ENV = 'production';
-                      _context8.next = 3;
+                      _context9.next = 3;
                       return gi();
 
                     case 3:
-                      _context8.prev = 3;
-                      _context8.next = 6;
+                      _context9.prev = 3;
+                      _context9.next = 6;
                       return nuxtCli.run(['generate']);
 
                     case 6:
-                      _context8.next = 12;
+                      _context9.next = 12;
                       break;
 
                     case 8:
-                      _context8.prev = 8;
-                      _context8.t0 = _context8['catch'](3);
+                      _context9.prev = 8;
+                      _context9.t0 = _context9['catch'](3);
 
-                      _consola2.default.fatal(_context8.t0);
+                      _consola2.default.fatal(_context9.t0);
                       process.exit(2);
 
                     case 12:
                     case 'end':
-                      return _context8.stop();
+                      return _context9.stop();
                   }
                 }
-              }, _callee8, undefined, [[3, 8]]);
+              }, _callee9, undefined, [[3, 8]]);
             })));
 
-            _commander2.default.command('clean').description('clean cache').action((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
-              return _regenerator2.default.wrap(function _callee9$(_context9) {
+            _commander2.default.command('clean').description('clean cache').action((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
+              return _regenerator2.default.wrap(function _callee10$(_context10) {
                 while (1) {
-                  switch (_context9.prev = _context9.next) {
+                  switch (_context10.prev = _context10.next) {
                     case 0:
                       _rimraf2.default.sync(_paths2.default.hardSourceCache);
                       _rimraf2.default.sync(_paths2.default.ykRootCacheDir);
 
                     case 2:
                     case 'end':
-                      return _context9.stop();
+                      return _context10.stop();
                   }
                 }
-              }, _callee9, undefined);
+              }, _callee10, undefined);
             })));
 
             _commander2.default.command('verify <cmd>').option('-ed, --edit <envName>', 'commit file').option('-m, --msg <msg>', 'commit msg').option('-y0ba, --yk0-build-app <appName>', 'Building a specified application').option('-e, --env <envName>', 'yk server env').description('husky').action(function () {
-              var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(cmd, _ref16) {
-                var edit = _ref16.edit,
-                    msg = _ref16.msg,
-                    yk0BuildApp = _ref16.yk0BuildApp,
-                    env = _ref16.env;
-                return _regenerator2.default.wrap(function _callee10$(_context10) {
+              var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(cmd, _ref17) {
+                var edit = _ref17.edit,
+                    msg = _ref17.msg,
+                    yk0BuildApp = _ref17.yk0BuildApp,
+                    env = _ref17.env;
+                return _regenerator2.default.wrap(function _callee11$(_context11) {
                   while (1) {
-                    switch (_context10.prev = _context10.next) {
+                    switch (_context11.prev = _context11.next) {
                       case 0:
                         alias({ appName: "__common" });
 
                         if (!(cmd !== "commit-init")) {
-                          _context10.next = 4;
+                          _context11.next = 4;
                           break;
                         }
 
-                        _context10.next = 4;
+                        _context11.next = 4;
                         return gi({ app: yk0BuildApp, ykServerEnv: env, appsNoneExit: false });
 
                       case 4:
-                        _context10.t0 = cmd;
-                        _context10.next = _context10.t0 === "commit-init" ? 7 : 8;
+                        _context11.t0 = cmd;
+                        _context11.next = _context11.t0 === "commit-init" ? 7 : 8;
                         break;
 
                       case 7:
-                        return _context10.abrupt('break', 14);
+                        return _context11.abrupt('break', 14);
 
                       case 8:
-                        _context10.next = 10;
+                        _context11.next = 10;
                         return (0, _verify.commitEsLint)({ edit: edit });
 
                       case 10:
-                        _context10.next = 12;
+                        _context11.next = 12;
                         return (0, _verify.commitStyleLint)({ edit: edit });
 
                       case 12:
-                        _context10.next = 14;
+                        _context11.next = 14;
                         return (0, _verify.commitMsg)({ edit: msg });
 
                       case 14:
                       case 'end':
-                        return _context10.stop();
+                        return _context11.stop();
                     }
                   }
-                }, _callee10, undefined);
+                }, _callee11, undefined);
               }));
 
               return function (_x11, _x12) {
-                return _ref17.apply(this, arguments);
+                return _ref18.apply(this, arguments);
               };
             }()
             // case "commit-eslint":
@@ -534,78 +620,78 @@ var run = exports.run = function () {
             );
 
             _commander2.default.command('server <cmd>').alias('s').option('-y0ba, --yk0-build-app <appName>', 'Building a specified application').option('-e, --env <envName>', 'yk server env').description('service control').action(function () {
-              var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(cmd, _ref18) {
-                var yk0BuildApp = _ref18.yk0BuildApp,
-                    env = _ref18.env;
+              var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(cmd, _ref19) {
+                var yk0BuildApp = _ref19.yk0BuildApp,
+                    env = _ref19.env;
 
-                var _ref20, apps;
+                var _ref21, apps;
 
-                return _regenerator2.default.wrap(function _callee12$(_context12) {
+                return _regenerator2.default.wrap(function _callee13$(_context13) {
                   while (1) {
-                    switch (_context12.prev = _context12.next) {
+                    switch (_context13.prev = _context13.next) {
                       case 0:
                         if (!(_os2.default.platform() === 'win32')) {
-                          _context12.next = 3;
+                          _context13.next = 3;
                           break;
                         }
 
                         _consola2.default.error(_msg.errMsg['os.win32.cmd.server']);
-                        return _context12.abrupt('return');
+                        return _context13.abrupt('return');
 
                       case 3:
                         process.env.NODE_ENV = 'production';
                         process.env.NODE_CMD = 'server ' + cmd;
-                        _context12.next = 7;
+                        _context13.next = 7;
                         return gi({ app: yk0BuildApp, ykServerEnv: env });
 
                       case 7:
-                        _ref20 = _context12.sent;
-                        apps = _ref20.apps;
+                        _ref21 = _context13.sent;
+                        apps = _ref21.apps;
 
                         if (!['start', 'stop', 'restart', 'lite', 'container'].includes(cmd)) {
-                          _context12.next = 21;
+                          _context13.next = 21;
                           break;
                         }
 
-                        _context12.t0 = cmd;
-                        _context12.next = _context12.t0 === 'lite' ? 13 : 17;
+                        _context13.t0 = cmd;
+                        _context13.next = _context13.t0 === 'lite' ? 13 : 17;
                         break;
 
                       case 13:
                         alias({ appName: apps[0] });
-                        _context12.next = 16;
+                        _context13.next = 16;
                         return require(params.serverLite)(cmd);
 
                       case 16:
-                        return _context12.abrupt('break', 19);
+                        return _context13.abrupt('break', 19);
 
                       case 17:
-                        _context12.next = 19;
+                        _context13.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) {
+                          var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(key, j) {
+                            return _regenerator2.default.wrap(function _callee12$(_context12) {
                               while (1) {
-                                switch (_context11.prev = _context11.next) {
+                                switch (_context12.prev = _context12.next) {
                                   case 0:
                                     alias({ appName: key });
-                                    _context11.next = 3;
+                                    _context12.next = 3;
                                     return require(params.serverPath)(cmd, key, j !== apps.length - 1);
 
                                   case 3:
                                   case 'end':
-                                    return _context11.stop();
+                                    return _context12.stop();
                                 }
                               }
-                            }, _callee11, undefined);
+                            }, _callee12, undefined);
                           }));
 
                           return function (_x15, _x16) {
-                            return _ref21.apply(this, arguments);
+                            return _ref22.apply(this, arguments);
                           };
                         }());
 
                       case 19:
-                        _context12.next = 23;
+                        _context13.next = 23;
                         break;
 
                       case 21:
@@ -614,14 +700,14 @@ var run = exports.run = function () {
 
                       case 23:
                       case 'end':
-                        return _context12.stop();
+                        return _context13.stop();
                     }
                   }
-                }, _callee12, undefined);
+                }, _callee13, undefined);
               }));
 
               return function (_x13, _x14) {
-                return _ref19.apply(this, arguments);
+                return _ref20.apply(this, arguments);
               };
             }()).on('--help', function () {
               console.log('');
@@ -633,29 +719,29 @@ var run = exports.run = function () {
             });
 
             _commander2.default.command('publish').alias('pub').description('Publish to server').action(function () {
-              var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(env, options) {
-                return _regenerator2.default.wrap(function _callee13$(_context13) {
+              var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(env, options) {
+                return _regenerator2.default.wrap(function _callee14$(_context14) {
                   while (1) {
-                    switch (_context13.prev = _context13.next) {
+                    switch (_context14.prev = _context14.next) {
                       case 0:
                         process.env.NODE_TYPE = 'publish';
-                        _context13.next = 3;
+                        _context14.next = 3;
                         return gi();
 
                       case 3:
-                        _context13.next = 5;
+                        _context14.next = 5;
                         return require('../utils/deployment')();
 
                       case 5:
                       case 'end':
-                        return _context13.stop();
+                        return _context14.stop();
                     }
                   }
-                }, _callee13, undefined);
+                }, _callee14, undefined);
               }));
 
               return function (_x17, _x18) {
-                return _ref22.apply(this, arguments);
+                return _ref23.apply(this, arguments);
               };
             }());
 
@@ -666,12 +752,12 @@ var run = exports.run = function () {
 
             _commander2.default.parse(process.argv);
 
-          case 12:
+          case 13:
           case 'end':
-            return _context14.stop();
+            return _context15.stop();
         }
       }
-    }, _callee14, undefined);
+    }, _callee15, undefined);
   }));
 
   return function run(_x3) {

package/config/paths.js

@@ -103,6 +103,7 @@ 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 ykRootImage = ykRoot + ('image' + path.sep);
 var cacheDir = appNodeModules + (path.sep + '.cache');
 var ykCacheDir = cacheDir + (path.sep + 'yakuza0');
 var ykRootCacheDir = ykRoot + '.cache';
@@ -182,6 +183,7 @@ exports.default = {
   ykTemplate: ykTemplate,
   ykNuxtBuild: ykNuxtBuild,
   ykCert: ykCert,
+  ykRootImage: ykRootImage,
   nuxtConf: appDirectory + (path.sep + 'nuxt.config.js'),
   appAtSameDir: appDirectory + (path.sep + '..' + path.sep),
   ykCacheDir: ykCacheDir,

package/image/.dockerignore

@@ -0,0 +1,63 @@
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+/build
+/.next
+/.yk
+/src
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+# System Files
+.DS_Store
+.env
+Thumbs.db
+/package-*
+/pkg
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# nuxt
+.nuxt
+.svn
+.git
+sw.*
+dist
+/app.admin
+Dockerfile
+docker-compose.yml
+

package/image/Dockerfile

@@ -0,0 +1,18 @@
+ARG BASE_IMAGE
+FROM $BASE_IMAGE
+
+ARG YK_DOCKERNAME
+ENV YK_DOCKERNAME $YK_DOCKERNAME
+ARG YK_ENV
+ENV YK_ENV $YK_ENV
+ARG YK_ENV
+ENV YK_SERVER_ENV $YK_ENV
+
+ADD ./package.json ./package.json
+
+ARG NPM_MODULES_CACHE_ID
+RUN --mount=type=cache,target=./node_modules,id=$NPM_MODULES_CACHE_ID,sharing=locked pxnpm i
+
+ADD ./.ykServer ./.ykServer
+ADD ./config ./config
+ADD ./common.static ./common.static

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.22.14",
+  "version": "2.22.15-beta.1",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
@@ -46,8 +46,10 @@
     "cli-progress": "^2.1.1",
     "clipboardy": "^1.2.3",
     "colors": "^1.4.0",
+    "command-exists": "^1.2.9",
     "commander": "^2.19.0",
     "compression": "^1.7.4",
+    "connection-tester": "^0.2.1",
     "consola": "^2.10.1",
     "core-js": "3.10.1",
     "css-loader": "^5.2.7",

package/server/proxy/tire.js

@@ -84,7 +84,7 @@ exports.default = function () {
   var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(_ref) {
     var config = _ref.config;
 
-    var appConf, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _headers;
+    var appConf, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _headers, basePath;
 
     return _regenerator2.default.wrap(function _callee3$(_context3) {
       while (1) {
@@ -414,16 +414,17 @@ exports.default = function () {
             });
 
             if (_config2.default.security.isTire) {
-              app.use('/apiv1', createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
+              basePath = _server._.bothAddFix(config.appConf.server.basePath, "/");
+
+              app.use(basePath + "apiv1", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
                 target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
                 headers: (_headers = {}, (0, _defineProperty3.default)(_headers, _def.variable.ipHeader, '127.0.0.1'), (0, _defineProperty3.default)(_headers, _def.variable.childKeyHeader, _config2.default.childKey), (0, _defineProperty3.default)(_headers, _def.variable.appCodeHeader, config.appConf.appCode), (0, _defineProperty3.default)(_headers, _def.variable.appKeyHeader, config.appKey), _headers),
-                pathRewrite: {
-                  '^/apiv1': "/" + _config2.default.proxyServer.apiKey + "/" + _config2.default.name + "/client/backend" // rewrite path
-                }
+                pathRewrite: (0, _defineProperty3.default)({}, "^" + basePath + "apiv1", "/" + _config2.default.proxyServer.apiKey + "/" + _config2.default.name + "/client/backend")
               })));
 
-              app.use('/apiv2', createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
-                target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort
+              app.use(basePath + "apiv2", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
+                target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
+                pathRewrite: (0, _defineProperty3.default)({}, "^" + basePath + "apiv2", "/apiv2")
               })));
             }