navy 4.1.2-rc.2 → 5.0.0

package/lib/util/service-host.js

@@ -1,123 +1,48 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createUrlForService = exports.createHostForService = exports.getNIPSubdomain = undefined;
-
-var _getIterator2 = require('babel-runtime/core-js/get-iterator');
-
-var _getIterator3 = _interopRequireDefault(_getIterator2);
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+exports.createHostForService = createHostForService;
+exports.createUrlForService = createUrlForService;
+exports.getNIPSubdomain = getNIPSubdomain;
+exports.getUrlFromService = getUrlFromService;
 
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+var _https = require("./https");
 
-var getNIPSubdomain = exports.getNIPSubdomain = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(externalIP) {
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (isValidIpv4Addr(externalIP)) {
-              _context.next = 2;
-              break;
-            }
+var _fs = _interopRequireDefault(require("fs"));
 
-            return _context.abrupt('return', '127.0.0.1.' + BASE);
+const BASE = 'nip.io';
 
-          case 2:
-            return _context.abrupt('return', externalIP + '.' + BASE);
+function isValidIpv4Addr(ip) {
+  return /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/g.test(ip);
+}
 
-          case 3:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-
-  return function getNIPSubdomain(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var createHostForService = exports.createHostForService = function () {
-  var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(service, navyNormalisedName, externalIP) {
-    return _regenerator2.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.t0 = service + '.' + navyNormalisedName + '.';
-            _context2.t1 = process.env.NAVY_EXTERNAL_SUBDOMAIN;
-
-            if (_context2.t1) {
-              _context2.next = 6;
-              break;
-            }
-
-            _context2.next = 5;
-            return getNIPSubdomain(externalIP);
-
-          case 5:
-            _context2.t1 = _context2.sent;
-
-          case 6:
-            _context2.t2 = _context2.t1;
-            return _context2.abrupt('return', _context2.t0 + _context2.t2);
-
-          case 8:
-          case 'end':
-            return _context2.stop();
-        }
-      }
-    }, _callee2, this);
-  }));
-
-  return function createHostForService(_x2, _x3, _x4) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
-var createUrlForService = exports.createUrlForService = function () {
-  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(service, navyNormalisedName, externalIP) {
-    return _regenerator2.default.wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.next = 2;
-            return createHostForService(service, navyNormalisedName, externalIP);
-
-          case 2:
-            _context3.t0 = _context3.sent;
-            return _context3.abrupt('return', 'http://' + _context3.t0);
-
-          case 4:
-          case 'end':
-            return _context3.stop();
-        }
-      }
-    }, _callee3, this);
-  }));
+async function getNIPSubdomain(externalIP) {
+  if (!isValidIpv4Addr(externalIP)) {
+    // invalid IP address, fallback to local
+    return `127.0.0.1.${BASE}`;
+  }
 
-  return function createUrlForService(_x5, _x6, _x7) {
-    return _ref3.apply(this, arguments);
-  };
-}();
+  return `${externalIP}.${BASE}`;
+}
 
-exports.getUrlFromService = getUrlFromService;
+async function createHostForService(service, navyNormalisedName, externalIP) {
+  return `${service}.${navyNormalisedName}.${process.env.NAVY_EXTERNAL_SUBDOMAIN || (await getNIPSubdomain(externalIP))}`;
+}
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+async function createUrlForService(service, navyNormalisedName, externalIP) {
+  const certsPath = (0, _https.getCertsPath)();
+  let proto = 'http';
+  const baseUrl = await createHostForService(service, navyNormalisedName, externalIP);
 
-var BASE = 'nip.io';
+  if (_fs.default.existsSync(`${certsPath}/${baseUrl}.crt`)) {
+    proto = 'https';
+  }
 
-function isValidIpv4Addr(ip) {
-  return (/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/g.test(ip)
-  );
+  return `${proto}://${await createHostForService(service, navyNormalisedName, externalIP)}`;
 }
 
 function getUrlFromService(service) {
@@ -125,32 +50,18 @@ function getUrlFromService(service) {
     return null;
   }
 
-  var env = service.raw.Config.Env;
+  const env = service.raw.Config.Env;
+  const certsPath = (0, _https.getCertsPath)();
 
-  var _iteratorNormalCompletion = true;
-  var _didIteratorError = false;
-  var _iteratorError = undefined;
+  for (const envVar of env) {
+    if (envVar.indexOf('VIRTUAL_HOST=') === 0) {
+      let proto = 'http';
 
-  try {
-    for (var _iterator = (0, _getIterator3.default)(env), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-      var envVar = _step.value;
-
-      if (envVar.indexOf('VIRTUAL_HOST=') === 0) {
-        return 'http://' + envVar.substring('VIRTUAL_HOST='.length);
-      }
-    }
-  } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
-  } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator.return) {
-        _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
+      if (_fs.default.existsSync(`${certsPath}/${envVar.substring('VIRTUAL_HOST='.length)}.crt`)) {
+        proto = 'https';
       }
+
+      return proto + '://' + envVar.substring('VIRTUAL_HOST='.length);
     }
   }
 

package/lib/util/table.js

@@ -1,36 +1,26 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = table;
 
-var _pad = require('pad');
-
-var _pad2 = _interopRequireDefault(_pad);
-
-var _stripAnsi = require('strip-ansi');
+var _pad = _interopRequireDefault(require("pad"));
 
-var _stripAnsi2 = _interopRequireDefault(_stripAnsi);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _stripAnsi = _interopRequireDefault(require("strip-ansi"));
 
 function table(rows) {
   if (rows.length === 0) {
     return '';
   }
 
-  var cols = rows[0];
-  var colSizes = cols.map(function (col, colIndex) {
-    return rows.reduce(function (currentSize, row) {
-      return currentSize = Math.max(currentSize, (0, _stripAnsi2.default)(row[colIndex] || '').length);
-    }, 0) + 2;
-  });
-
-  return rows.map(function (row) {
-    return row.map(function (col, colIndex) {
-      return (0, _pad2.default)(col || '', colSizes[colIndex], { colors: true });
-    }).join('');
-  }).join('\n');
+  const cols = rows[0];
+  const colSizes = cols.map((col, colIndex) => rows.reduce((currentSize, row) => currentSize = Math.max(currentSize, (0, _stripAnsi.default)(row[colIndex] || '').length), 0) + 2);
+  return rows.map(row => row.map((col, colIndex) => (0, _pad.default)(col || '', colSizes[colIndex], {
+    colors: true
+  })).join('')).join('\n');
 }
+
 module.exports = exports.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "navy",
-  "version": "4.1.2-rc.2",
+  "version": "5.0.0",
   "description": "Quick and powerful development environments using Docker and Docker Compose",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,26 +25,26 @@
   },
   "homepage": "https://github.com/momentumft/navy#readme",
   "dependencies": {
-    "babel-runtime": "^6.6.1",
+    "@babel/runtime": "^7",
     "bluebird": "^3.7.2",
     "chalk": "^1.1.3",
-    "cli-spinners": "^0.1.2",
+    "cli-spinners": "^2.6.1",
     "commander": "^2.20.3",
     "debug": "^2.2.0",
-    "dockerode": "^3.1.0",
-    "eventemitter2": "^1.0.3",
-    "inquirer": "^3.0.6",
+    "dockerode": "^3.3.1",
+    "eventemitter2": "^6.4.5",
+    "inquirer": "^7.3.3",
     "invariant": "^2.2.4",
-    "js-yaml": "^3.13.1",
-    "lodash": "^4.17.15",
-    "mkdirp": "^0.5.3",
+    "js-yaml": "^3.14.1",
+    "lodash": "^4.17.21",
+    "mkdirp": "^0.5.5",
+    "node-forge": "^0.10.0",
     "opn": "^5.5.0",
-    "pad": "^1.0.0",
+    "pad": "^3.2.0",
     "promise-retry": "^1.1.1",
-    "resolve": "^1.15.1",
+    "resolve": "^1.20.0",
     "rimraf": "^2.7.1",
-    "simple-docker-registry-client": "^1.1.0",
+    "simple-docker-registry-client": "^1.1.2",
     "strip-ansi": "^3.0.1"
-  },
-  "gitHead": "c68c17c6ea41bb6e88675f5f8f09270a70e71990"
+  }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Momentum Financial Technology Ltd.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/lib/middleware/add-virtual-hosts.js

@@ -1,147 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
-var _keys = require('babel-runtime/core-js/object/keys');
-
-var _keys2 = _interopRequireDefault(_keys);
-
-var _promise = require('babel-runtime/core-js/promise');
-
-var _promise2 = _interopRequireDefault(_promise);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _lodash = require('lodash');
-
-var _serviceHost = require('../util/service-host');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var getServiceHTTPProxyConfig = function getServiceHTTPProxyConfig(serviceName, navyFile) {
-  if (navyFile && navyFile.httpProxy && navyFile.httpProxy[serviceName]) {
-    return navyFile.httpProxy[serviceName];
-  }
-
-  return null;
-};
-
-var serviceHasPort80 = function serviceHasPort80(service) {
-  return service.ports && (0, _lodash.find)(service.ports, function (port) {
-    return (
-      // Should handle "80" (short syntax), "80:80" (long syntax), and "80/tcp" (including protocol) formats.
-      port.toString() === '80' || port.toString().startsWith('80:') || port.toString().startsWith('80/')
-    );
-  });
-};
-
-exports.default = function (navy) {
-  return function () {
-    var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(config, state) {
-      var navyFile, services, externalIP;
-      return _regenerator2.default.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return navy.getNavyFile();
-
-            case 2:
-              navyFile = _context2.sent;
-              services = {};
-              _context2.next = 6;
-              return navy.externalIP();
-
-            case 6:
-              externalIP = _context2.sent;
-              _context2.next = 9;
-              return _promise2.default.all((0, _keys2.default)(config.services).map(function () {
-                var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(serviceName) {
-                  var service, proxyConfig;
-                  return _regenerator2.default.wrap(function _callee$(_context) {
-                    while (1) {
-                      switch (_context.prev = _context.next) {
-                        case 0:
-                          service = config.services[serviceName];
-                          proxyConfig = getServiceHTTPProxyConfig(serviceName, navyFile);
-
-                          // proxy port 80 even without config
-
-                          if (!proxyConfig && serviceHasPort80(service)) {
-                            proxyConfig = { port: 80 };
-                          }
-
-                          if (!proxyConfig) {
-                            _context.next = 17;
-                            break;
-                          }
-
-                          _context.t0 = _extends3.default;
-                          _context.t1 = {};
-                          _context.t2 = service;
-                          _context.t3 = _extends3.default;
-                          _context.next = 10;
-                          return (0, _serviceHost.createHostForService)(serviceName, navy.normalisedName, externalIP);
-
-                        case 10:
-                          _context.t4 = _context.sent;
-                          _context.t5 = proxyConfig.port;
-                          _context.t6 = {
-                            'VIRTUAL_HOST': _context.t4,
-                            'VIRTUAL_PORT': _context.t5
-                          };
-                          _context.t7 = service.environment;
-                          _context.t8 = (0, _context.t3)(_context.t6, _context.t7);
-                          _context.t9 = {
-                            environment: _context.t8
-                          };
-                          return _context.abrupt('return', services[serviceName] = (0, _context.t0)(_context.t1, _context.t2, _context.t9));
-
-                        case 17:
-                          return _context.abrupt('return', services[serviceName] = service);
-
-                        case 18:
-                        case 'end':
-                          return _context.stop();
-                      }
-                    }
-                  }, _callee, undefined);
-                }));
-
-                return function (_x3) {
-                  return _ref2.apply(this, arguments);
-                };
-              }()));
-
-            case 9:
-              return _context2.abrupt('return', (0, _extends3.default)({}, config, {
-                services: services
-              }));
-
-            case 10:
-            case 'end':
-              return _context2.stop();
-          }
-        }
-      }, _callee2, undefined);
-    }));
-
-    return function (_x, _x2) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-};
-
-module.exports = exports.default;