navy 4.1.2-rc.2 → 5.0.0

package/lib/errors.js

@@ -1,76 +1,42 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.NavyNotInitialisedError = exports.NavyError = undefined;
-
-var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
-
-var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
-
-var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
-
-var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
-
-var _get2 = require('babel-runtime/helpers/get');
-
-var _get3 = _interopRequireDefault(_get2);
-
-var _inherits2 = require('babel-runtime/helpers/inherits');
-
-var _inherits3 = _interopRequireDefault(_inherits2);
+exports.NavyNotInitialisedError = exports.NavyError = void 0;
 
-var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+var _chalk = _interopRequireDefault(require("chalk"));
 
-var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
-
-var _createClass2 = require('babel-runtime/helpers/createClass');
-
-var _createClass3 = _interopRequireDefault(_createClass2);
-
-var _chalk = require('chalk');
+class NavyError {
+  constructor(message) {
+    this.message = message;
+  }
 
-var _chalk2 = _interopRequireDefault(_chalk);
+  prettyPrint() {
+    console.log();
+    console.log(_chalk.default.bgRed(_chalk.default.bold(' ERROR ')));
+    console.log();
+    console.log(' ' + this.message);
+    console.log();
+  }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+}
 
-var NavyError = exports.NavyError = function () {
-  function NavyError(message) {
-    (0, _classCallCheck3.default)(this, NavyError);
+exports.NavyError = NavyError;
 
-    this.message = message;
+class NavyNotInitialisedError extends NavyError {
+  constructor(navyName) {
+    super('Navy "' + navyName + '" not imported');
   }
 
-  (0, _createClass3.default)(NavyError, [{
-    key: 'prettyPrint',
-    value: function prettyPrint() {
-      console.log();
-      console.log(_chalk2.default.bgRed(_chalk2.default.bold(' ERROR ')));
-      console.log();
-      console.log(' ' + this.message);
-      console.log();
-    }
-  }]);
-  return NavyError;
-}();
-
-var NavyNotInitialisedError = exports.NavyNotInitialisedError = function (_NavyError) {
-  (0, _inherits3.default)(NavyNotInitialisedError, _NavyError);
-
-  function NavyNotInitialisedError(navyName) {
-    (0, _classCallCheck3.default)(this, NavyNotInitialisedError);
-    return (0, _possibleConstructorReturn3.default)(this, (NavyNotInitialisedError.__proto__ || (0, _getPrototypeOf2.default)(NavyNotInitialisedError)).call(this, 'Navy "' + navyName + '" not imported'));
+  prettyPrint() {
+    super.prettyPrint();
+    console.log(' Make sure you\'ve imported the navy with ' + _chalk.default.bold('navy import'));
+    console.log();
   }
 
-  (0, _createClass3.default)(NavyNotInitialisedError, [{
-    key: 'prettyPrint',
-    value: function prettyPrint() {
-      (0, _get3.default)(NavyNotInitialisedError.prototype.__proto__ || (0, _getPrototypeOf2.default)(NavyNotInitialisedError.prototype), 'prettyPrint', this).call(this);
+}
 
-      console.log(' Make sure you\'ve imported the navy with ' + _chalk2.default.bold('navy import'));
-      console.log();
-    }
-  }]);
-  return NavyNotInitialisedError;
-}(NavyError);
+exports.NavyNotInitialisedError = NavyNotInitialisedError;

package/lib/http-proxy.js

@@ -1,173 +1,87 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.reconfigureHTTPProxy = undefined;
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _getIterator2 = require('babel-runtime/core-js/get-iterator');
-
-var _getIterator3 = _interopRequireDefault(_getIterator2);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var updateComposeConfig = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(navies) {
-    var networks, networksConfig, config;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return _dockerClient2.default.listNetworks().filter(function (net) {
-              return net.Name.indexOf('_') !== -1;
-            }) // is docker-compose network?
-            .filter(function (net) {
-              var _iteratorNormalCompletion = true;
-              var _didIteratorError = false;
-              var _iteratorError = undefined;
-
-              try {
-                for (var _iterator = (0, _getIterator3.default)(navies), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-                  var navy = _step.value;
-
-                  if (net.Name.indexOf(navy + '_') === 0) {
-                    return true;
-                  }
-                }
-              } catch (err) {
-                _didIteratorError = true;
-                _iteratorError = err;
-              } finally {
-                try {
-                  if (!_iteratorNormalCompletion && _iterator.return) {
-                    _iterator.return();
-                  }
-                } finally {
-                  if (_didIteratorError) {
-                    throw _iteratorError;
-                  }
-                }
-              }
-
-              return false;
-            });
-
-          case 2:
-            networks = _context.sent;
-            networksConfig = {};
-
-
-            networks.forEach(function (net) {
-              return networksConfig[net.Name] = {
-                external: true
-              };
-            });
-
-            config = {
-              version: '2',
-
-              services: {
-                'nginx-proxy': {
-                  image: 'navycloud/navy-proxy',
-                  ports: ['80:80'],
-                  networks: networks.map(function (net) {
-                    return net.Name;
-                  }),
-                  volumes: ['/var/run/docker.sock:/tmp/docker.sock:ro'],
-                  restart: 'always'
-                }
-              },
-
-              networks: networksConfig
-            };
-            _context.next = 8;
-            return _fs2.default.writeFileAsync(_path2.default.join(_os2.default.tmpdir(), 'navyinternaldockercompose.yml'), _jsYaml2.default.dump(config));
-
-          case 8:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-
-  return function updateComposeConfig(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var reconfigureHTTPProxy = exports.reconfigureHTTPProxy = function () {
-  var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-    var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    return _regenerator2.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            if (opts.navies) {
-              _context2.next = 4;
-              break;
-            }
-
-            _context2.next = 3;
-            return (0, _navy.getLaunchedNavyNames)();
-
-          case 3:
-            opts.navies = _context2.sent;
-
-          case 4:
-            _context2.next = 6;
-            return updateComposeConfig(opts.navies);
-
-          case 6:
-
-            (0, _driverLogging.log)('Configuring HTTP proxy...');
-            _context2.next = 9;
-            return (0, _execAsync.execAsync)('docker-compose', ['-f', _path2.default.join(_os2.default.tmpdir(), 'navyinternaldockercompose.yml'), '-p', 'navyinternal', 'up', '-d']);
-
-          case 9:
-          case 'end':
-            return _context2.stop();
-        }
-      }
-    }, _callee2, this);
-  }));
-
-  return function reconfigureHTTPProxy() {
-    return _ref2.apply(this, arguments);
-  };
-}();
+exports.reconfigureHTTPProxy = reconfigureHTTPProxy;
 
-var _os = require('os');
+var _os = _interopRequireDefault(require("os"));
 
-var _os2 = _interopRequireDefault(_os);
+var _path = _interopRequireDefault(require("path"));
 
-var _path = require('path');
+var _jsYaml = _interopRequireDefault(require("js-yaml"));
 
-var _path2 = _interopRequireDefault(_path);
+var _dockerClient = _interopRequireDefault(require("./util/docker-client"));
 
-var _jsYaml = require('js-yaml');
+var _fs = _interopRequireDefault(require("fs"));
 
-var _jsYaml2 = _interopRequireDefault(_jsYaml);
+var _https = require("./util/https");
 
-var _dockerClient = require('./util/docker-client');
+var _execAsync = require("./util/exec-async");
 
-var _dockerClient2 = _interopRequireDefault(_dockerClient);
+var _driverLogging = require("./driver-logging");
 
-var _fs = require('./util/fs');
+var _navy = require("./navy");
 
-var _fs2 = _interopRequireDefault(_fs);
-
-var _execAsync = require('./util/exec-async');
-
-var _driverLogging = require('./driver-logging');
-
-var _navy = require('./navy');
+async function updateComposeConfig(navies) {
+  const networks = await _dockerClient.default.listNetworks().filter(net => net.Name.indexOf('_') !== -1) // is docker-compose network?
+  .filter(net => {
+    for (const navy of navies) {
+      if (net.Name.indexOf(navy + '_') === 0) {
+        return true;
+      }
+    }
+
+    return false;
+  });
+  const networksConfig = {};
+  networks.forEach(net => networksConfig[net.Name] = {
+    external: true
+  });
+  const ports = ['80:80'];
+  const volumes = ['/var/run/docker.sock:/tmp/docker.sock:ro']; // Enable HTTPS for services that
+  // match crt file names in tlsRootCaDir
+
+  const certsPath = await (0, _https.getCertsPath)(true);
+
+  if (certsPath) {
+    ports.push('443:443');
+    volumes.push(`${certsPath}:/etc/nginx/certs`);
+    volumes.push(`${certsPath}:/etc/nginx/dhparam`); // to persist DH params
+  }
+
+  const config = {
+    version: '2',
+    services: {
+      'nginx-proxy': {
+        image: 'navycloud/navy-proxy',
+        ports,
+        networks: networks.map(net => net.Name),
+        volumes,
+        restart: 'always'
+      }
+    },
+    networks: networksConfig
+  };
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+  _fs.default.writeFileSync(_path.default.join(_os.default.tmpdir(), 'navyinternaldockercompose.yml'), _jsYaml.default.dump(config));
+}
+
+async function reconfigureHTTPProxy(opts = {}) {
+  const navyInternalYamlFile = _path.default.join(_os.default.tmpdir(), 'navyinternaldockercompose.yml');
+
+  if (opts.restart) {
+    // proxy needs to be recreated to detect changes (deletes) in /etc/nginx/certs
+    if (_fs.default.existsSync(navyInternalYamlFile)) {
+      (0, _driverLogging.log)('Restarting HTTP proxy...');
+      await (0, _execAsync.execAsync)('docker-compose', ['-f', navyInternalYamlFile, '-p', 'navyinternal', 'rm', '-s', '-f', 'nginx-proxy']);
+    }
+  }
+
+  if (!opts.navies) opts.navies = await (0, _navy.getLaunchedNavyNames)();
+  await updateComposeConfig(opts.navies);
+  (0, _driverLogging.log)('Configuring HTTP proxy...');
+  await (0, _execAsync.execAsync)('docker-compose', ['-f', navyInternalYamlFile, '-p', 'navyinternal', 'up', '-d']);
+}

package/lib/index.js

@@ -1,59 +1,56 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.middlewareHelpers = exports.NavyError = exports.Service = exports.getLaunchedNavyNames = exports.getLaunchedNavies = exports.getNavy = exports.Navy = undefined;
-
-var _navy = require('./navy');
-
-Object.defineProperty(exports, 'Navy', {
+Object.defineProperty(exports, "Navy", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _navy.Navy;
   }
 });
-Object.defineProperty(exports, 'getNavy', {
+Object.defineProperty(exports, "NavyError", {
   enumerable: true,
-  get: function get() {
-    return _navy.getNavy;
+  get: function () {
+    return _errors.NavyError;
   }
 });
-Object.defineProperty(exports, 'getLaunchedNavies', {
+exports.Service = void 0;
+Object.defineProperty(exports, "getLaunchedNavies", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _navy.getLaunchedNavies;
   }
 });
-Object.defineProperty(exports, 'getLaunchedNavyNames', {
+Object.defineProperty(exports, "getLaunchedNavyNames", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _navy.getLaunchedNavyNames;
   }
 });
-
-var _errors = require('./errors');
-
-Object.defineProperty(exports, 'NavyError', {
+Object.defineProperty(exports, "getNavy", {
   enumerable: true,
-  get: function get() {
-    return _errors.NavyError;
+  get: function () {
+    return _navy.getNavy;
   }
 });
-
-var _helpers = require('./middleware/helpers');
-
-Object.defineProperty(exports, 'middlewareHelpers', {
+Object.defineProperty(exports, "middlewareHelpers", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _helpers.middlewareHelpers;
   }
 });
 
-var _service = require('./service');
+var _navy = require("./navy");
+
+var _Service = _interopRequireWildcard(require("./service"));
+
+exports.Service = _Service;
+
+var _errors = require("./errors");
 
-var _Service = _interopRequireWildcard(_service);
+var _helpers = require("./middleware/helpers");
 
-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 _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-exports.Service = _Service;
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/lib/middleware/add-service-proxy-config.js

@@ -0,0 +1,76 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _lodash = require("lodash");
+
+var _serviceHost = require("../util/service-host");
+
+var _https = require("../util/https");
+
+const getServiceHTTPProxyConfig = (serviceName, navyFile) => {
+  if (navyFile && navyFile.httpProxy && navyFile.httpProxy[serviceName]) {
+    return navyFile.httpProxy[serviceName];
+  }
+
+  return null;
+};
+
+const serviceGetAutoProxyPortOr80 = (service, navyFile) => {
+  const autoPorts = navyFile && Array.isArray(navyFile.httpProxyAutoPorts) && navyFile.httpProxyAutoPorts || ['80'];
+  return service.ports && (0, _lodash.find)(autoPorts, autoPort => {
+    const autoPortString = autoPort.toString();
+    return (0, _lodash.find)(service.ports, portDefinition => {
+      // In older versions of Docker Compose `ports` could just be an array of string/number,
+      // but it's changed to e.g. {target: "80"}
+      const port = typeof portDefinition === 'object' && 'target' in portDefinition ? portDefinition.target : portDefinition;
+      const portString = port.toString();
+      return portString === autoPortString || portString.startsWith(`${autoPortString}:`) || portString.startsWith(`${autoPortString}/`);
+    });
+  });
+};
+
+var _default = navy => async (config, state) => {
+  const navyFile = await navy.getNavyFile();
+  const services = {};
+  const externalIP = await navy.externalIP();
+  await Promise.all(Object.keys(config.services).map(async serviceName => {
+    const service = config.services[serviceName];
+    let proxyConfig = getServiceHTTPProxyConfig(serviceName, navyFile); // proxy port 80 even without service config, or a different port with config httpProxyAutoPorts
+
+    if (!proxyConfig) {
+      const autoPort = serviceGetAutoProxyPortOr80(service, navyFile);
+
+      if (autoPort) {
+        proxyConfig = {
+          port: parseInt(autoPort)
+        };
+      }
+    }
+
+    if (proxyConfig) {
+      const hostName = await (0, _serviceHost.createHostForService)(serviceName, navy.normalisedName, externalIP);
+      if (proxyConfig.enableHttps) await (0, _https.createCert)({
+        hostName
+      });
+      return services[serviceName] = { ...service,
+        environment: {
+          'VIRTUAL_HOST': hostName,
+          'VIRTUAL_PORT': proxyConfig.port,
+          ...service.environment
+        }
+      };
+    }
+
+    return services[serviceName] = service;
+  }));
+  return { ...config,
+    services
+  };
+};
+
+exports.default = _default;
+module.exports = exports.default;

package/lib/middleware/develop.js

@@ -1,37 +1,23 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _keys = require('babel-runtime/core-js/object/keys');
-
-var _keys2 = _interopRequireDefault(_keys);
-
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
-var _helpers = require('./helpers');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _helpers = require("./helpers");
 
 function rewriteService(service, serviceName, serviceState) {
   if (!serviceState || !serviceState._develop) return service;
-
-  var _serviceState = serviceState;
-
-  return (0, _extends3.default)({}, service, {
+  const _serviceState = serviceState;
+  return { ...service,
     stdin_open: true,
-    volumes: _helpers.middlewareHelpers.addVolumes(service, (0, _keys2.default)(serviceState._develop.mounts).map(function (local) {
-      return local + ':' + _serviceState._develop.mounts[local];
-    })),
+    volumes: _helpers.middlewareHelpers.addVolumes(service, Object.keys(serviceState._develop.mounts).map(local => `${local}:${_serviceState._develop.mounts[local]}`)),
     command: serviceState._develop.command ? serviceState._develop.command : service.command
-  });
+  };
 }
 
-exports.default = function (config, state) {
-  return _helpers.middlewareHelpers.rewriteServicesWithState(config, state, rewriteService);
-};
+var _default = (config, state) => _helpers.middlewareHelpers.rewriteServicesWithState(config, state, rewriteService);
 
+exports.default = _default;
 module.exports = exports.default;

package/lib/middleware/helpers.js

@@ -1,42 +1,37 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.middlewareHelpers = undefined;
+exports.middlewareHelpers = void 0;
 
-var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
+var _lodash = require("lodash");
 
-var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
-
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
-var _lodash = require('lodash');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var middlewareHelpers = exports.middlewareHelpers = {
-  rewriteServices: function rewriteServices(config, serviceMapperFn) {
-    return (0, _extends3.default)({}, config, {
+const middlewareHelpers = {
+  rewriteServices(config, serviceMapperFn) {
+    return { ...config,
       services: (0, _lodash.mapValues)(config.services || {}, serviceMapperFn)
-    });
+    };
   },
-  rewriteServicesWithState: function rewriteServicesWithState(config, state, serviceMapperFn) {
-    var normalisedState = state || { services: {} };
+
+  rewriteServicesWithState(config, state, serviceMapperFn) {
+    const normalisedState = state || {
+      services: {}
+    };
 
     function mapperFn(service, serviceName) {
       return serviceMapperFn(service, serviceName, normalisedState.services[serviceName]);
     }
 
-    return (0, _extends3.default)({}, config, {
+    return { ...config,
       services: (0, _lodash.mapValues)(config.services || {}, mapperFn)
-    });
+    };
   },
-  addVolumes: function addVolumes(service, volumes) {
-    var normalisedVolumes = service.volumes || [];
 
-    return [].concat((0, _toConsumableArray3.default)(normalisedVolumes), (0, _toConsumableArray3.default)(volumes));
+  addVolumes(service, volumes) {
+    const normalisedVolumes = service.volumes || [];
+    return [...normalisedVolumes, ...volumes];
   }
-};
+
+};
+exports.middlewareHelpers = middlewareHelpers;