yakuza0 2.22.16-beta.2 → 2.22.16

package/cli/index.js

@@ -69,6 +69,10 @@ var _jsonFormat = require('json-format');
 
 var _jsonFormat2 = _interopRequireDefault(_jsonFormat);
 
+var _syncRequest = require('sync-request');
+
+var _syncRequest2 = _interopRequireDefault(_syncRequest);
+
 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 }; }
@@ -360,15 +364,25 @@ 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 _callee6() {
-              var CS, isInner, CLNENV, CLNBUILD, CLNPACK, noCache, CLNWORKERS, TRY_TIMES, CLNVERSION, pkg, NMCI, projectName, obj, imageReleaseName, imageReleaseNameSave, BI, loop;
+              var isTestInner, res, inner, CS, isInner, CLNENV, CLNBUILD, CLNPACK, noCache, CLNWORKERS, TRY_TIMES, CLNVERSION, pkg, NMCI, projectName, obj, imageReleaseName, imageReleaseNameSave, BI, loop;
               return _regenerator2.default.wrap(function _callee6$(_context6) {
                 while (1) {
                   switch (_context6.prev = _context6.next) {
                     case 0:
+                      isTestInner = false;
                       // const {success: isTestInner} = connectionTester.test('fe-repo.inner.px.nfjbill.ren', 5000, 1000)
 
+                      try {
+                        res = (0, _syncRequest2.default)('GET', 'http://fe-dev.inner.px.nfjbill.ren:5803/sys/health-check', {
+                          timeout: 1000
+                        });
+                        inner = JSON.parse(res.getBody('utf8'));
+
+                        isTestInner = inner.data === 'alive';
+                      } catch (e) {}
+
                       CS = (0, _server.gPwd)();
-                      isInner = process.env.CLN_IMAGE_ISINNER === undefined ? _connectionTester2.default.test('fe-repo.inner.px.nfjbill.ren', 5000, 1000).success : process.env.CLN_IMAGE_ISINNER === '1';
+                      isInner = process.env.CLN_IMAGE_ISINNER === undefined ? isTestInner : process.env.CLN_IMAGE_ISINNER === '1';
                       CLNENV = process.env.CLN_IMAGE_ENV || 'local';
                       CLNBUILD = process.env.CLN_IMAGE_BUILD === undefined;
                       CLNPACK = process.env.CLN_IMAGE_PACK === undefined;
@@ -392,7 +406,7 @@ var run = exports.run = function () {
                       BI = isInner ? 'fe-repo.inner.px.nfjbill.ren:5000/cln-server:0.5.8' : 'nfjbill/cln-server:0.5.8';
 
                       if ((0, _commandExists.sync)('docker')) {
-                        _context6.next = 20;
+                        _context6.next = 22;
                         break;
                       }
 
@@ -400,7 +414,7 @@ var run = exports.run = function () {
                       process.exit(1);
                       return _context6.abrupt('return');
 
-                    case 20:
+                    case 22:
                       if (!(0, _commandExists.sync)('pxnpm')) {
                         execCmd(isInner ? 'npm i -g pxnpm --registry=http://fe-repo.inner.px.nfjbill.ren:5507' : 'npm i -g pxnpm');
                       }
@@ -409,7 +423,7 @@ var run = exports.run = function () {
                       }
 
                       if (CLNBUILD) {
-                        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 YK0_server__yk4Addr=http://1.1.1.1 YK0_server__orbAddr=http://1.1.1.1 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);
                       }
 
                       loop = function loop(i) {
@@ -427,10 +441,10 @@ var run = exports.run = function () {
 
                       loop(0);
 
-                      _context6.next = 27;
+                      _context6.next = 29;
                       return (0, _server.delay)(1000);
 
-                    case 27:
+                    case 29:
 
                       if (CLNPACK) {
                         if (!(0, _commandExists.sync)('gzip')) {
@@ -443,7 +457,7 @@ var run = exports.run = function () {
                       _consola2.default.success('Image tar: ' + imageReleaseNameSave + '.tar');
                       _consola2.default.success('Image name: ' + imageReleaseName);
 
-                    case 30:
+                    case 32:
                     case 'end':
                       return _context6.stop();
                   }

package/package.json

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