navy 6.0.0 → 7.0.0-alpha.2

package/lib/util/has-update.js

@@ -1,31 +1,21 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var R = _interopRequireWildcard(require("ramda"));
-
 var _dockerClient = _interopRequireDefault(require("./docker-client"));
-
 var _getFatManifest = _interopRequireDefault(require("../client/registry/get-fat-manifest"));
-
 var _containerImage = require("../domain/container-image");
-
-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); }
-
-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; }
-
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const hasUpdate = async (imageWithTag, currentImageId, navyFile) => {
   const tag = (0, _containerImage.getTagFromImageWithTag)(imageWithTag);
   const image = (0, _containerImage.getImageFromImageWithTag)(imageWithTag);
   const registry = (0, _containerImage.getRegistryFromImage)(image);
   const repository = (0, _containerImage.getRepositoryFromImage)(image);
   const allowUnauthorizedRequest = R.includes(registry, R.path(['ignoreUnauthorizedRequestsForRegistries'], navyFile));
-
   try {
     const {
       RepoDigests
@@ -42,7 +32,5 @@ const hasUpdate = async (imageWithTag, currentImageId, navyFile) => {
     return 'INVALID_REMOTE';
   }
 };
-
-var _default = hasUpdate;
-exports.default = _default;
+var _default = exports.default = hasUpdate;
 module.exports = exports.default;

package/lib/util/https.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,30 +8,19 @@ exports.createCert = createCert;
 exports.generateRootCa = generateRootCa;
 exports.getCertsPath = getCertsPath;
 exports.removeCert = removeCert;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _config = require("../config");
-
 var _errors = require("../errors");
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _nodeForge = require("node-forge");
-
 var _navy = require("../navy");
-
 const debug = require('debug')('navy:https');
-
 function getCertsPath(create = false) {
   const certsPath = _path.default.join((0, _config.getConfigDir)(), 'tls-certs');
-
   if (!_fs.default.existsSync(certsPath)) {
     if (create) {
-      debug(`Create ${certsPath} dir`); // $FlowIgnore
-
+      debug(`Create ${certsPath} dir`);
       _fs.default.mkdirSync(certsPath, {
         recursive: true
       });
@@ -40,20 +28,16 @@ function getCertsPath(create = false) {
       return '';
     }
   }
-
   return certsPath;
 }
-
 async function removeCert(opts) {
   const certsPath = getCertsPath();
   const navy = await (0, _navy.getNavy)(opts.navy);
   const serviceUrl = await navy.url(opts.disable);
   const baseName = serviceUrl.split('//')[1];
   const extensions = ['crt', 'key'];
-
   for (const ext of extensions) {
     const file = `${certsPath}/${baseName}.${ext}`;
-
     if (_fs.default.existsSync(file)) {
       try {
         await _fs.default.unlinkSync(file);
@@ -64,15 +48,11 @@ async function removeCert(opts) {
     }
   }
 }
-
 async function generateRootCa() {
   const tlsRootCaDir = (0, _config.getConfig)().tlsRootCaDir || _config.DEFAULT_TLS_ROOT_CA_DIR;
-
   if (!_fs.default.existsSync(tlsRootCaDir)) {
     debug(`Creating ${tlsRootCaDir} Root CA dir`);
-
     try {
-      // $FlowIgnore
       _fs.default.mkdirSync(tlsRootCaDir, {
         recursive: true
       });
@@ -80,21 +60,15 @@ async function generateRootCa() {
       throw new _errors.NavyError(err);
     }
   }
-
   if (_fs.default.existsSync(`${tlsRootCaDir}/ca.crt`) && _fs.default.existsSync(`${tlsRootCaDir}/ca.key`)) {
-    debug(`Root CA already exists, skipping generation`);
+    debug('Root CA already exists, skipping generation');
     return;
   }
-
   debug('Generating Root CA');
   debug('Generating 2048-bit key-pair...');
-
   const keys = _nodeForge.pki.rsa.generateKeyPair(2048);
-
   debug('Creating self-signed certificate...');
-
   const cert = _nodeForge.pki.createCertificate();
-
   cert.publicKey = keys.publicKey;
   cert.serialNumber = '01';
   cert.validity.notBefore = new Date();
@@ -117,63 +91,47 @@ async function generateRootCa() {
   }, {
     name: 'authorityKeyIdentifier'
   }]);
-
   try {
     // self-sign certificate
-    cert.sign(keys.privateKey, _nodeForge.md.sha256.create()); // PEM-format keys and cert
+    cert.sign(keys.privateKey, _nodeForge.md.sha256.create());
 
+    // PEM-format keys and cert
     const pem = {
       privateKey: _nodeForge.pki.privateKeyToPem(keys.privateKey),
       publicKey: _nodeForge.pki.publicKeyToPem(keys.publicKey),
       certificate: _nodeForge.pki.certificateToPem(cert)
     };
-
     _fs.default.writeFileSync(tlsRootCaDir + '/ca.key', pem.privateKey, {
       mode: 0o400
     });
-
     _fs.default.writeFileSync(tlsRootCaDir + '/ca.pub.key', pem.publicKey, {
       mode: 0o640
     });
-
     _fs.default.writeFileSync(tlsRootCaDir + '/ca.crt', pem.certificate, {
       mode: 0o640
     });
-
     console.log(_chalk.default.green(`✅ CA Certificate created at ${tlsRootCaDir}/ca.crt`));
-    console.log(_chalk.default.yellow(`⚠️  Importing a self-signed CA into a browser/truststore/keychain is not advisable ⚠️`));
+    console.log(_chalk.default.yellow('⚠️  Importing a self-signed CA into a browser/truststore/keychain is not advisable ⚠️'));
   } catch (e) {
     throw new _errors.NavyError(e);
   }
 }
-
 async function createCert(opts) {
   const tlsRootCaDir = (0, _config.getConfig)().tlsRootCaDir || _config.DEFAULT_TLS_ROOT_CA_DIR;
-
   const certName = opts.hostName || opts.serviceUrl.split('//')[1];
   const certsPath = getCertsPath(true);
-
   if (_fs.default.existsSync(`${certsPath}/${certName}.crt`)) {
     debug(`Certificate for ${certName} already exists, skipping generation`);
     return;
   }
-
   await generateRootCa();
-
   const caCertString = _fs.default.readFileSync(`${tlsRootCaDir}/ca.crt`, 'utf8');
-
   const caKeyString = _fs.default.readFileSync(`${tlsRootCaDir}/ca.key`, 'utf8');
-
   debug(`Generating cert for ${certName} in ${certsPath}`);
-
   const privateCAKey = _nodeForge.pki.privateKeyFromPem(caKeyString);
-
   const keys = _nodeForge.pki.rsa.generateKeyPair(2048);
-
   const cert = _nodeForge.pki.createCertificate();
-
   const caCert = _nodeForge.pki.certificateFromPem(caCertString);
-
   cert.publicKey = keys.publicKey;
   cert.serialNumber = Math.floor(Math.random() * (99 - 2) + 2).toString();
   cert.validity.notBefore = new Date();
@@ -187,7 +145,6 @@ async function createCert(opts) {
     name: 'organizationName',
     value: 'navy-dev'
   }];
-
   try {
     cert.setSubject(attrs);
     cert.setIssuer(caCert.subject.attributes);
@@ -195,18 +152,17 @@ async function createCert(opts) {
       name: 'extKeyUsage',
       serverAuth: true
     }]);
-    cert.sign(privateCAKey, _nodeForge.md.sha256.create()); // PEM-format keys and cert
+    cert.sign(privateCAKey, _nodeForge.md.sha256.create());
 
+    // PEM-format keys and cert
     const pem = {
       privateKey: _nodeForge.pki.privateKeyToPem(keys.privateKey),
-      certificate: _nodeForge.pki.certificateToPem(cert) // publicKey: pki.publicKeyToPem(keys.publicKey),
-
+      certificate: _nodeForge.pki.certificateToPem(cert)
+      // publicKey: pki.publicKeyToPem(keys.publicKey),
     };
-
     _fs.default.writeFileSync(`${certsPath}/${certName}.key`, pem.privateKey);
-
-    _fs.default.writeFileSync(`${certsPath}/${certName}.crt`, pem.certificate); // fs.writeFileSync(`${certsPath}/${certName}.pub.key`, pem.publicKey)
-
+    _fs.default.writeFileSync(`${certsPath}/${certName}.crt`, pem.certificate);
+    // fs.writeFileSync(`${certsPath}/${certName}.pub.key`, pem.publicKey)
   } catch (e) {
     throw new _errors.NavyError(e);
   }

package/lib/util/navyrc.js

@@ -1,16 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getNavyRc;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _fs = _interopRequireDefault(require("./fs"));
-
 async function getNavyRc(dir) {
   try {
     return JSON.parse(await _fs.default.readFileAsync(_path.default.join(dir, '.navyrc')));
@@ -18,5 +14,4 @@ async function getNavyRc(dir) {
     return null;
   }
 }
-
 module.exports = exports.default;

package/lib/util/service-host.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,61 +8,45 @@ exports.createHostForService = createHostForService;
 exports.createUrlForService = createUrlForService;
 exports.getNIPSubdomain = getNIPSubdomain;
 exports.getUrlFromService = getUrlFromService;
-
 var _https = require("./https");
-
 var _fs = _interopRequireDefault(require("fs"));
-
 const BASE = 'nip.io';
-
 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);
 }
-
 async function getNIPSubdomain(externalIP) {
   if (!isValidIpv4Addr(externalIP)) {
     // invalid IP address, fallback to local
     return `127.0.0.1.${BASE}`;
   }
-
   return `${externalIP}.${BASE}`;
 }
-
 async function createHostForService(service, navyNormalisedName, externalIP) {
   return `${service}.${navyNormalisedName}.${process.env.NAVY_EXTERNAL_SUBDOMAIN || (await getNIPSubdomain(externalIP))}`;
 }
-
 async function createUrlForService(service, navyNormalisedName, externalIP) {
   const certsPath = (0, _https.getCertsPath)();
   let proto = 'http';
   const baseUrl = await createHostForService(service, navyNormalisedName, externalIP);
-
   if (_fs.default.existsSync(`${certsPath}/${baseUrl}.crt`)) {
     proto = 'https';
   }
-
   return `${proto}://${await createHostForService(service, navyNormalisedName, externalIP)}`;
 }
-
 function getUrlFromService(service) {
   if (!service || !service.raw || !service.raw.Config || !service.raw.Config.Env) {
     return null;
   }
-
   const env = service.raw.Config.Env;
   const certsPath = (0, _https.getCertsPath)();
-
   for (const envVar of env) {
     if (envVar.indexOf('VIRTUAL_HOST=') === 0) {
       let proto = 'http';
-
       if (_fs.default.existsSync(`${certsPath}/${envVar.substring('VIRTUAL_HOST='.length)}.crt`)) {
         proto = 'https';
       }
-
       return proto + '://' + envVar.substring('VIRTUAL_HOST='.length);
     }
   }
-
   return null;
 }

package/lib/util/table.js

@@ -1,26 +1,20 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = table;
-
 var _pad = _interopRequireDefault(require("pad"));
-
 var _stripAnsi = _interopRequireDefault(require("strip-ansi"));
-
 function table(rows) {
   if (rows.length === 0) {
     return '';
   }
-
   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": "6.0.0",
+  "version": "7.0.0-alpha.2",
   "description": "Quick and powerful development environments using Docker and Docker Compose",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -24,29 +24,30 @@
     "url": "https://github.com/moneyhub/navy/issues"
   },
   "homepage": "https://github.com/moneyhub/navy#readme",
+  "engines": {
+    "node": ">=22"
+  },
   "dependencies": {
     "@babel/runtime": "^7",
     "bluebird": "^3.7.2",
-    "chalk": "^1.1.3",
+    "chalk": "^4.1.2",
     "cli-spinners": "^2.6.1",
-    "commander": "^2.20.3",
-    "debug": "^2.2.0",
-    "dockerode": "^3.3.1",
+    "commander": "^12.1.0",
+    "debug": "^4.4.0",
+    "dockerode": "^5.0.0",
     "eventemitter2": "^6.4.5",
-    "inquirer": "^7.3.3",
+    "inquirer": "^8.2.6",
     "invariant": "^2.2.4",
-    "js-yaml": "^3.14.1",
+    "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
-    "mkdirp": "^0.5.5",
     "node-fetch": "^2.6.5",
     "node-forge": "^1.3.0",
-    "opn": "^5.5.0",
+    "open": "^8.4.2",
     "pad": "^3.2.0",
-    "promise-retry": "^1.1.1",
-    "ramda": "^0.28.0",
+    "promise-retry": "^2.0.1",
+    "ramda": "^0.30.1",
     "resolve": "^1.20.0",
-    "rimraf": "^2.7.1",
-    "strip-ansi": "^3.0.1",
+    "strip-ansi": "^6.0.1",
     "www-authenticate": "^0.6.3"
   }
 }