navy 4.1.2-rc.2 → 5.0.0

package/lib/cli/doctor/util.js

@@ -1,108 +1,41 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.catchInvariant = exports.start = exports.fix = undefined;
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
-
-var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+exports.start = exports.fix = exports.catchInvariant = void 0;
 
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+var _util = _interopRequireDefault(require("util"));
 
-var _util = require('util');
+var _invariant = _interopRequireDefault(require("invariant"));
 
-var _util2 = _interopRequireDefault(_util);
+var _chalk = _interopRequireDefault(require("chalk"));
 
-var _invariant = require('invariant');
-
-var _invariant2 = _interopRequireDefault(_invariant);
+const fix = async (message, ...params) => {
+  (0, _invariant.default)(params.length > 0, "DOCTOR_FIX_NO_PARAMS: Expected params to be passed to doctor fix");
+  const fixCallback = params[params.length - 1];
+  console.log(_chalk.default.yellow('----->', _util.default.format(message, ...params.slice(0, -1))));
+  await fixCallback();
+};
 
-var _chalk = require('chalk');
+exports.fix = fix;
 
-var _chalk2 = _interopRequireDefault(_chalk);
+const start = message => {
+  console.log(_chalk.default.dim('----->', message));
+};
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+exports.start = start;
 
-var fix = exports.fix = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(message) {
-    for (var _len = arguments.length, params = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      params[_key - 1] = arguments[_key];
+const catchInvariant = async (code, fn, catchCallback) => {
+  try {
+    await fn();
+  } catch (ex) {
+    if (ex.name === 'Invariant Violation' && ex.message.indexOf(code) === 0) {
+      await catchCallback();
     }
-
-    var fixCallback;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            (0, _invariant2.default)(params.length > 0, 'DOCTOR_FIX_NO_PARAMS: Expected params to be passed to doctor fix');
-
-            fixCallback = params[params.length - 1];
-
-
-            console.log(_chalk2.default.yellow('----->', _util2.default.format.apply(_util2.default, [message].concat((0, _toConsumableArray3.default)(params.slice(0, -1))))));
-            _context.next = 5;
-            return fixCallback();
-
-          case 5:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, undefined);
-  }));
-
-  return function fix(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var start = exports.start = function start(message) {
-  console.log(_chalk2.default.dim('----->', message));
+  }
 };
 
-var catchInvariant = exports.catchInvariant = function () {
-  var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(code, fn, catchCallback) {
-    return _regenerator2.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.prev = 0;
-            _context2.next = 3;
-            return fn();
-
-          case 3:
-            _context2.next = 10;
-            break;
-
-          case 5:
-            _context2.prev = 5;
-            _context2.t0 = _context2['catch'](0);
-
-            if (!(_context2.t0.name === 'Invariant Violation' && _context2.t0.message.indexOf(code) === 0)) {
-              _context2.next = 10;
-              break;
-            }
-
-            _context2.next = 10;
-            return catchCallback();
-
-          case 10:
-          case 'end':
-            return _context2.stop();
-        }
-      }
-    }, _callee2, undefined, [[0, 5]]);
-  }));
-
-  return function catchInvariant(_x2, _x3, _x4) {
-    return _ref2.apply(this, arguments);
-  };
-}();
+exports.catchInvariant = catchInvariant;

package/lib/cli/external-ip.js

@@ -1,48 +1,18 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _regenerator = require('babel-runtime/regenerator');
+var _config = require("../config");
 
-var _regenerator2 = _interopRequireDefault(_regenerator);
+var _externalIp = require("../util/external-ip");
 
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+var _default = async () => {
+  const config = await (0, _config.getConfig)();
+  console.log(await (0, _externalIp.getExternalIP)(config.externalIP));
+};
 
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _config = require('../config');
-
-var _externalIp = require('../util/external-ip');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
-  var config;
-  return _regenerator2.default.wrap(function _callee$(_context) {
-    while (1) {
-      switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return (0, _config.getConfig)();
-
-        case 2:
-          config = _context.sent;
-          _context.t0 = console;
-          _context.next = 6;
-          return (0, _externalIp.getExternalIP)(config.externalIP);
-
-        case 6:
-          _context.t1 = _context.sent;
-
-          _context.t0.log.call(_context.t0, _context.t1);
-
-        case 8:
-        case 'end':
-          return _context.stop();
-      }
-    }
-  }, _callee, undefined);
-}));
+exports.default = _default;
 module.exports = exports.default;

package/lib/cli/health.js

@@ -1,94 +1,45 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
-
-var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _chalk = require('chalk');
-
-var _chalk2 = _interopRequireDefault(_chalk);
-
-var _ = require('../');
-
-var _table = require('../util/table');
+var _chalk = _interopRequireDefault(require("chalk"));
 
-var _table2 = _interopRequireDefault(_table);
+var _ = require("../");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _table = _interopRequireDefault(require("../util/table"));
 
 function getStatus(service, state) {
-  var health = service.raw && service.raw.State.Health;
+  const health = service.raw && service.raw.State.Health;
 
   if (!health) {
     return '-';
   }
 
-  var statusString = health.Status === 'healthy' ? _chalk2.default.green('✔ Healthy') : _chalk2.default.red('• Unhealthy');
-
+  const statusString = health.Status === 'healthy' ? _chalk.default.green('✔ Healthy') : _chalk.default.red('• Unhealthy');
   return statusString;
 }
 
 function getHistory(service, state) {
-  var health = service.raw && service.raw.State.Health;
+  const health = service.raw && service.raw.State.Health;
 
   if (!health) {
     return '-';
   }
 
-  var history = health.Log;
-
-  return history.map(function (record) {
-    return record.ExitCode === 0 ? _chalk2.default.green('█') : _chalk2.default.red('x');
-  }).join(' ');
+  const history = health.Log;
+  return history.map(record => record.ExitCode === 0 ? _chalk.default.green('█') : _chalk.default.red('x')).join(' ');
 }
 
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(opts) {
-    var navy, ps, state;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            navy = (0, _.getNavy)(opts.navy);
-            _context.next = 3;
-            return navy.ps();
-
-          case 3:
-            ps = _context.sent;
-            _context.next = 6;
-            return navy.getState();
-
-          case 6:
-            state = _context.sent;
-
-
-            console.log((0, _table2.default)([['NAME', 'STATUS', 'HISTORY']].concat((0, _toConsumableArray3.default)(ps.map(function (service) {
-              return [service.name, getStatus(service, state), getHistory(service, state)];
-            })))));
-
-          case 8:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-
-  return function (_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+async function _default(opts) {
+  const navy = (0, _.getNavy)(opts.navy);
+  const ps = await navy.ps();
+  const state = await navy.getState();
+  console.log((0, _table.default)([['NAME', 'STATUS', 'HISTORY'], ...ps.map(service => [service.name, getStatus(service, state), getHistory(service, state)])]));
+}
 
 module.exports = exports.default;

package/lib/cli/https.js

@@ -0,0 +1,92 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _errors = require("../errors");
+
+var _navy = require("../navy");
+
+var _config = require("../config");
+
+var _httpProxy = require("../http-proxy");
+
+var _https = require("../util/https");
+
+var _fs = _interopRequireDefault(require("fs"));
+
+async function _default(services, opts) {
+  const tlsRootCaDir = (0, _config.getConfig)().tlsRootCaDir || _config.DEFAULT_TLS_ROOT_CA_DIR;
+
+  const configDir = (0, _config.getConfigDir)();
+
+  if (opts.disable) {
+    await (0, _https.removeCert)(opts);
+    await (0, _httpProxy.reconfigureHTTPProxy)({
+      restart: true
+    });
+    console.log();
+    console.log(_chalk.default.green(`✅ HTTPS for service ${opts.disable} is now disabled`));
+    console.log();
+    return;
+  }
+
+  if (!services || services.length === 0) {
+    if (!_fs.default.existsSync(`${configDir}/tls-certs`)) return;
+
+    const files = _fs.default.readdirSync(`${configDir}/tls-certs`);
+
+    const urls = files.filter(file => file.endsWith('.crt')).map(crt => {
+      return `https://${crt.replace('.crt', '')}`;
+    });
+
+    for (const url of urls) {
+      console.log(`${url}`);
+    }
+
+    return;
+  }
+
+  if (!_fs.default.existsSync(`${tlsRootCaDir}/ca.crt`) || !_fs.default.existsSync(`${tlsRootCaDir}/ca.key`)) {
+    await (0, _https.generateRootCa)();
+  }
+
+  const navy = await (0, _navy.getNavy)(opts.navy);
+  await navy.ensurePluginsLoaded();
+  const availableServices = await navy.getAvailableServiceNames();
+  const httpsReadyServices = [];
+
+  for (const service of services) {
+    if (!availableServices.includes(service)) {
+      console.log(`❌ ${service} not found, skipping`);
+      continue;
+    }
+
+    const serviceUrl = await navy.url(service);
+
+    try {
+      await (0, _https.createCert)({
+        serviceUrl
+      });
+      httpsReadyServices.push(service);
+    } catch (error) {
+      console.log(error);
+      throw new _errors.NavyError(`Could not generate TLS cert for ${service}`);
+    }
+  }
+
+  await (0, _httpProxy.reconfigureHTTPProxy)({
+    restart: true
+  });
+  console.log();
+  console.log(_chalk.default.green(`✅ Service(s) ${httpsReadyServices.join(', ')} now accessible via HTTPS🔒`));
+  console.log();
+}
+
+module.exports = exports.default;

package/lib/cli/import.js

@@ -1,75 +1,38 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
-
-var _chalk = require('chalk');
-
-var _chalk2 = _interopRequireDefault(_chalk);
-
-var _fs = require('../util/fs');
-
-var _fs2 = _interopRequireDefault(_fs);
-
-var _ = require('../');
-
-var _configProvider = require('../config-provider');
+var _path = _interopRequireDefault(require("path"));
 
-var _util = require('./util');
+var _chalk = _interopRequireDefault(require("chalk"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _fs = _interopRequireDefault(require("../util/fs"));
 
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(opts) {
-    var navy, boatAsciiArt, initialiseOpts;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            navy = (0, _.getNavy)(opts.navy);
-            boatAsciiArt = _fs2.default.readFileSync(_path2.default.join(__dirname, '../../resources/sailing-boat.txt')).toString();
-            _context.next = 4;
-            return (0, _configProvider.getImportOptionsForCLI)(opts);
+var _ = require("../");
 
-          case 4:
-            initialiseOpts = _context.sent;
-            _context.next = 7;
-            return (0, _util.importNavy)(navy, initialiseOpts);
+var _configProvider = require("../config-provider");
 
-          case 7:
+var _util = require("./util");
 
-            console.log(' You can now use ' + _chalk2.default.bold('navy') + ' commands from any directory to control this Navy.');
-            console.log();
+async function _default(opts) {
+  const navy = (0, _.getNavy)(opts.navy);
 
-            if (process.stdout.isTTY) {
-              console.log(boatAsciiArt);
-              console.log();
-            }
+  const boatAsciiArt = _fs.default.readFileSync(_path.default.join(__dirname, '../../resources/sailing-boat.txt')).toString();
 
-          case 10:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
+  const initialiseOpts = await (0, _configProvider.getImportOptionsForCLI)(opts);
+  await (0, _util.importNavy)(navy, initialiseOpts);
+  console.log(` You can now use ${_chalk.default.bold('navy')} commands from any directory to control this Navy.`);
+  console.log();
 
-  return function (_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+  if (process.stdout.isTTY) {
+    console.log(boatAsciiArt);
+    console.log();
+  }
+}
 
 module.exports = exports.default;

package/lib/cli/index.js

@@ -1,27 +1,21 @@
-'use strict';
+"use strict";
 
-var _package = require('../../package.json');
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _package2 = _interopRequireDefault(_package);
+var _package = _interopRequireDefault(require("../../package.json"));
 
-var _program = require('./program');
+var _program = _interopRequireDefault(require("./program"));
 
-var _program2 = _interopRequireDefault(_program);
+var _errors = require("../errors");
 
-var _errors = require('../errors');
+const debug = require('debug')('navy:cli');
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+_program.default.version(_package.default.version);
 
-var debug = require('debug')('navy:cli');
-
-_program2.default.version(_package2.default.version);
-
-_program2.default.command('help').alias('*').action(function () {
-  return _program2.default.help();
-});
+_program.default.command('help').alias('*').action(() => _program.default.help());
 
 try {
-  _program2.default.parse(process.argv);
+  _program.default.parse(process.argv);
 } catch (ex) {
   if (ex instanceof _errors.NavyError) {
     ex.prettyPrint();
@@ -32,6 +26,6 @@ try {
 
 debug('Invoked CLI action');
 
-if (_program2.default.args.length === 0) {
-  _program2.default.help();
+if (_program.default.args.length === 0) {
+  _program.default.help();
 }

package/lib/cli/lan-ip.js

@@ -1,71 +1,29 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _chalk = require('chalk');
-
-var _chalk2 = _interopRequireDefault(_chalk);
-
-var _getLanIp = require('../util/get-lan-ip');
-
-var _config = require('../config');
-
-var _reconfigure = require('./util/reconfigure');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(navy) {
-    var lanIP;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return (0, _getLanIp.getLANIP)();
-
-          case 2:
-            lanIP = _context.sent;
-            _context.next = 5;
-            return (0, _config.setConfig)((0, _extends3.default)({}, (0, _config.getConfig)(), {
-              externalIP: lanIP
-            }));
-
-          case 5:
-            _context.next = 7;
-            return (0, _reconfigure.reconfigureAllNavies)();
+var _chalk = _interopRequireDefault(require("chalk"));
 
-          case 7:
+var _getLanIp = require("../util/get-lan-ip");
 
-            console.log();
-            console.log(_chalk2.default.green(' \u2714 Now using your LAN IP address (' + lanIP + ')'));
-            console.log();
+var _config = require("../config");
 
-          case 10:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
+var _reconfigure = require("./util/reconfigure");
 
-  return function (_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+async function _default(navy) {
+  const lanIP = await (0, _getLanIp.getLANIP)();
+  await (0, _config.setConfig)({ ...(0, _config.getConfig)(),
+    externalIP: lanIP
+  });
+  await (0, _reconfigure.reconfigureAllNavies)();
+  console.log();
+  console.log(_chalk.default.green(` ✔ Now using your LAN IP address (${lanIP})`));
+  console.log();
+}
 
 module.exports = exports.default;