lee/caprover
1
0
Fork 0
mirror of https://github.com/caprover/caprover synced 2026-09-23 23:25:38 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

commands converted to ts

Browse Source
This commit is contained in:
Kasra Bigdeli
2019-01-03 23:48:38 -08:00
parent 28b7d8e2d0
commit 8f63c31c9f
39 changed files with 924 additions and 1003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app-cli/built/commands/captainduckduck.js
+28 -33
View File
@@ -1,59 +1,54 @@
#!/usr/bin/env node
const { printError } = require("../utils/messageHandler");
const packagejson = require("../../package.json");
const updateNotifier = require("update-notifier");
const program = require("commander");
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const logout = require("./logout");
const { printError } = require('../utils/messageHandler');
const packagejson = require('../../package.json');
const updateNotifier = require('update-notifier');
const program = require('commander');
updateNotifier({ pkg: packagejson }).notify({ isGlobal: true });
// Command actions
const serversetup = require("./serversetup");
const { login } = require("./login");
const logout = require("./logout");
const list = require("./list");
const deploy = require("./deploy");
const serversetup = require('./serversetup');
const { login } = require('./login');
const list = require('./list');
const deploy = require('./deploy');
// Setup
program.version(packagejson.version).description(packagejson.description);
// Commands
program
.command("serversetup")
.description("Performs necessary actions and prepares your Captain server.")
.command('serversetup')
.description('Performs necessary actions and prepares your Captain server.')
.action(() => {
serversetup();
});
program
.command("login")
.description("Login to a CaptainDuckDuck machine. You can be logged in to multiple machines simultaneously.")
.command('login')
.description('Login to a CaptainDuckDuck machine. You can be logged in to multiple machines simultaneously.')
.action(() => {
login();
});
program
.command("logout")
.description("Logout from a specific Captain machine.")
.action(() => {
program.command('logout').description('Logout from a specific Captain machine.').action(() => {
logout();
});
program
.command("list")
.alias("ls")
.description("List all Captain machines currently logged in.")
.action(() => {
program.command('list').alias('ls').description('List all Captain machines currently logged in.').action(() => {
list();
});
program
.command("deploy")
.command('deploy')
.description("Deploy your app (current directory) to a specific Captain machine. You'll be prompted to choose your Captain machine.")
.option("-t, --tarFile <value>", "Specify file to be uploaded (rather than using git archive)")
.option("-d, --default", "Run with default options")
.option("-s, --stateless", "Run deploy stateless")
.option("-h, --host <value>", "Only for stateless mode: Host of the captain machine")
.option("-a, --appName <value>", "Only for stateless mode: Name of the app")
.option("-p, --pass <value>", "Only for stateless mode: Password for Captain")
.option("-b, --branch <value>", "Only for stateless mode: Branch name (default master)")
.action(options => {
.option('-t, --tarFile <value>', 'Specify file to be uploaded (rather than using git archive)')
.option('-d, --default', 'Run with default options')
.option('-s, --stateless', 'Run deploy stateless')
.option('-h, --host <value>', 'Only for stateless mode: Host of the captain machine')
.option('-a, --appName <value>', 'Only for stateless mode: Name of the app')
.option('-p, --pass <value>', 'Only for stateless mode: Password for Captain')
.option('-b, --branch <value>', 'Only for stateless mode: Branch name (default master)')
.action((options) => {
deploy(options);
});
// Error on unknown commands
program.on("command:*", () => {
const wrongCommands = program.args.join(" ");
program.on('command:*', () => {
const wrongCommands = program.args.join(' ');
printError(`\nInvalid command: ${wrongCommands}\nSee --help for a list of available commands.`, true);
});
program.parse(process.argv);
app-cli/built/commands/captainduckduck.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"captainduckduck.js","sourceRoot":"","sources":["../../src/commands/captainduckduck.js"],"names":[],"mappings":";AAEA,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AACzD,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACjD,MAAM,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AACjD,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;AAEpC,cAAc,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;AAE/D,kBAAkB;AAClB,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAC5C,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AACpC,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAClC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAElC,QAAQ;AACR,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;AAEzE,WAAW;AACX,OAAO;KACJ,OAAO,CAAC,aAAa,CAAC;KACtB,WAAW,CAAC,8DAA8D,CAAC;KAC3E,MAAM,CAAC,GAAG,EAAE;IACX,WAAW,EAAE,CAAA;AACf,CAAC,CAAC,CAAA;AAEJ,OAAO;KACJ,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CACV,+FAA+F,CAChG;KACA,MAAM,CAAC,GAAG,EAAE;IACX,KAAK,EAAE,CAAA;AACT,CAAC,CAAC,CAAA;AAEJ,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,yCAAyC,CAAC;KACtD,MAAM,CAAC,GAAG,EAAE;IACX,MAAM,EAAE,CAAA;AACV,CAAC,CAAC,CAAA;AAEJ,OAAO;KACJ,OAAO,CAAC,MAAM,CAAC;KACf,KAAK,CAAC,IAAI,CAAC;KACX,WAAW,CAAC,gDAAgD,CAAC;KAC7D,MAAM,CAAC,GAAG,EAAE;IACX,IAAI,EAAE,CAAA;AACR,CAAC,CAAC,CAAA;AAEJ,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CACV,uHAAuH,CACxH;KACA,MAAM,CACL,uBAAuB,EACvB,6DAA6D,CAC9D;KACA,MAAM,CAAC,eAAe,EAAE,0BAA0B,CAAC;KACnD,MAAM,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;KACjD,MAAM,CACL,oBAAoB,EACpB,sDAAsD,CACvD;KACA,MAAM,CAAC,uBAAuB,EAAE,0CAA0C,CAAC;KAC3E,MAAM,CAAC,oBAAoB,EAAE,+CAA+C,CAAC;KAC7E,MAAM,CACL,sBAAsB,EACtB,uDAAuD,CACxD;KACA,MAAM,CAAC,OAAO,CAAC,EAAE;IAChB,MAAM,CAAC,OAAO,CAAC,CAAA;AACjB,CAAC,CAAC,CAAA;AAEJ,4BAA4B;AAC5B,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;IAC3B,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE5C,UAAU,CACR,sBAAsB,aAAa,gDAAgD,EACnF,IAAI,CACL,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA"}
{"version":3,"file":"captainduckduck.js","sourceRoot":"","sources":["../../src/commands/captainduckduck.ts"],"names":[],"mappings":";;;AAEA,mCAAoC;AAEpC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAC1D,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAClD,MAAM,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAClD,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAErC,cAAc,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AAEhE,kBAAkB;AAClB,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAC7C,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACrC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEnC,QAAQ;AACR,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;AAE1E,WAAW;AACX,OAAO;KACL,OAAO,CAAC,aAAa,CAAC;KACtB,WAAW,CAAC,8DAA8D,CAAC;KAC3E,MAAM,CAAC,GAAG,EAAE;IACZ,WAAW,EAAE,CAAC;AACf,CAAC,CAAC,CAAC;AAEJ,OAAO;KACL,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,+FAA+F,CAAC;KAC5G,MAAM,CAAC,GAAG,EAAE;IACZ,KAAK,EAAE,CAAC;AACT,CAAC,CAAC,CAAC;AAEJ,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,yCAAyC,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;IAC5F,MAAM,EAAE,CAAC;AACV,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,gDAAgD,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;IAC7G,IAAI,EAAE,CAAC;AACR,CAAC,CAAC,CAAC;AAEH,OAAO;KACL,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CACX,uHAAuH,CACvH;KACA,MAAM,CAAC,uBAAuB,EAAE,6DAA6D,CAAC;KAC9F,MAAM,CAAC,eAAe,EAAE,0BAA0B,CAAC;KACnD,MAAM,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;KACjD,MAAM,CAAC,oBAAoB,EAAE,sDAAsD,CAAC;KACpF,MAAM,CAAC,uBAAuB,EAAE,0CAA0C,CAAC;KAC3E,MAAM,CAAC,oBAAoB,EAAE,+CAA+C,CAAC;KAC7E,MAAM,CAAC,sBAAsB,EAAE,uDAAuD,CAAC;KACvF,MAAM,CAAC,CAAC,OAAY,EAAE,EAAE;IACxB,MAAM,CAAC,OAAO,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC;AAEJ,4BAA4B;AAC5B,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;IAC5B,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE7C,UAAU,CAAC,sBAAsB,aAAa,gDAAgD,EAAE,IAAI,CAAC,CAAC;AACvG,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
app-cli/built/commands/deploy.js
+43 -41
View File
@@ -1,4 +1,5 @@
#!/usr/bin/env node
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -7,18 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
const MachineHelper = require("../helpers/MachineHelper");
const DeployApi = require("../api/DeployApi");
const LoginApi = require("../api/LoginApi");
const { printError, printMessage } = require("../utils/messageHandler");
const { validateIsGitRepository, validateDefinitionFile, optionIsNotGiven, validateAuthentication } = require("../utils/validationsHandler");
const { uploadFile } = require("../utils/fileHelper");
const { gitArchiveFile } = require("../utils/fileHelper");
const fs = require("fs-extra");
const path = require("path");
const inquirer = require("inquirer");
const commandExistsSync = require("command-exists").sync;
const { initMachineFromLocalStorage } = require("../utils/machineUtils");
Object.defineProperty(exports, "__esModule", { value: true });
const MachineHelper_1 = require("../helpers/MachineHelper");
const inquirer = require('inquirer');
const DeployApi = require('../api/DeployApi');
const LoginApi = require('../api/LoginApi');
const { printError, printMessage } = require('../utils/messageHandler');
const { validateIsGitRepository, validateDefinitionFile, optionIsNotGiven, validateAuthentication } = require('../utils/validationsHandler');
const { uploadFile } = require('../utils/fileHelper');
const { gitArchiveFile } = require('../utils/fileHelper');
const fs = require('fs-extra');
const path = require('path');
const commandExistsSync = require('command-exists').sync;
const { initMachineFromLocalStorage } = require('../utils/machineUtils');
function deployAsDefaultValues() {
return __awaiter(this, void 0, void 0, function* () {
try {
@@ -26,13 +28,13 @@ function deployAsDefaultValues() {
if (isValidAuthentication) {
const { appName, branchToPush, machineToDeploy } = DeployApi;
if (!appName || !branchToPush || !machineToDeploy) {
printError("Default deploy failed. There are no default options selected.", true);
printError('Default deploy failed. There are no default options selected.', true);
}
printMessage(`Deploying to ${machineToDeploy.name}`);
deployFromGitProject();
}
else {
printError("Incorrect login details", true);
printError('Incorrect login details', true);
}
}
catch (e) {
@@ -51,14 +53,14 @@ function deployAsStateless(host, appName, branch, pass) {
const data = JSON.parse(response);
const newToken = data.token;
// Update the token to the machine that corresponds (if needed)
MachineHelper.updateMachineAuthToken(name, newToken);
MachineHelper_1.default.updateMachineAuthToken(name, newToken);
if (data) {
printMessage(`Starting stateless deploy to\n${host}\n${branch}\n${appName}`);
deployFromGitProject();
}
}
else {
printError("You are missing parameters for deploying on stateless. <host> <password> <app name> <branch>");
printError('You are missing parameters for deploying on stateless. <host> <password> <app name> <branch>');
}
});
}
@@ -69,11 +71,11 @@ function deployFromTarFile(tarFile) {
if (isValidAuthentication) {
// Send from tar file
const filePath = tarFile;
const gitHash = "sendviatarfile";
const gitHash = 'sendviatarfile';
yield uploadFile(filePath, gitHash);
}
else {
printError("Incorrect login details", true);
printError('Incorrect login details', true);
}
}
catch (e) {
@@ -82,11 +84,11 @@ function deployFromTarFile(tarFile) {
});
}
function deployFromGitProject() {
if (!commandExistsSync("git")) {
if (!commandExistsSync('git')) {
printError("'git' command not found...");
printError("Captain needs 'git' to create tar file of your source files...", true);
}
const zipFileNameToDeploy = "temporary-captain-to-deploy.tar";
const zipFileNameToDeploy = 'temporary-captain-to-deploy.tar';
const zipFileFullPath = path.join(process.cwd(), zipFileNameToDeploy);
printMessage(`Saving tar file to:\n${zipFileFullPath}\n`);
// Removes the temporarly file created
@@ -109,7 +111,7 @@ function deploy(options) {
validateIsGitRepository();
validateDefinitionFile();
}
printMessage("Preparing deployment to Captain...\n");
printMessage('Preparing deployment to Captain...\n');
if (options.default) {
deployAsDefaultValues();
}
@@ -122,38 +124,38 @@ function deploy(options) {
else {
const questions = [
{
type: "list",
name: "captainNameToDeploy",
default: DeployApi.machineToDeploy.name || "",
message: "Select the Captain Machine you want to deploy to:",
choices: MachineHelper.getMachinesAsOptions(),
when: () => optionIsNotGiven(options, "host")
type: 'list',
name: 'captainNameToDeploy',
default: DeployApi.machineToDeploy.name || '',
message: 'Select the Captain Machine you want to deploy to:',
choices: MachineHelper_1.default.getMachinesAsOptions(),
when: () => optionIsNotGiven(options, 'host')
},
{
type: "input",
default: DeployApi.branchToPush || "master",
name: "branchToPush",
type: 'input',
default: DeployApi.branchToPush || 'master',
name: 'branchToPush',
message: "Enter the 'git' branch you would like to deploy:",
when: () => optionIsNotGiven(options, "branch")
when: () => optionIsNotGiven(options, 'branch')
},
{
type: "input",
type: 'input',
default: DeployApi.appName,
name: "appName",
message: "Enter the Captain app name this directory will be deployed to:",
when: () => optionIsNotGiven(options, "appName")
name: 'appName',
message: 'Enter the Captain app name this directory will be deployed to:',
when: () => optionIsNotGiven(options, 'appName')
},
{
type: "confirm",
name: "confirmedToDeploy",
message: "Note that uncommitted files and files in gitignore (if any) will not be pushed to server. Please confirm so that deployment process can start.",
type: 'confirm',
name: 'confirmedToDeploy',
message: 'Note that uncommitted files and files in gitignore (if any) will not be pushed to server. Please confirm so that deployment process can start.',
default: true,
when: () => optionIsNotGiven(options, "stateless")
when: () => optionIsNotGiven(options, 'stateless')
}
];
const answers = yield inquirer.prompt(questions);
if (!answers.confirmedToDeploy && !options.stateless) {
printMessage("\nOperation cancelled by the user...\n");
printMessage('\nOperation cancelled by the user...\n');
process.exit(0);
}
const captainNameToDeploy = answers.captainNameToDeploy;
@@ -171,7 +173,7 @@ function deploy(options) {
deployFromGitProject();
}
else {
printError("Incorrect login details", true);
printError('Incorrect login details', true);
}
}
catch (e) {
app-cli/built/commands/deploy.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
app-cli/built/commands/list.js
+9 -10
View File
@@ -1,19 +1,18 @@
#!/usr/bin/env node
const chalk = require("chalk");
const MachineHelper = require("../helpers/MachineHelper");
const { printMessage } = require("../utils/messageHandler");
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const chalk = require('chalk');
const MachineHelper_1 = require("../helpers/MachineHelper");
const { printMessage } = require('../utils/messageHandler');
function _displayMachine(machine) {
console.log(">> " +
chalk.greenBright(machine.name) +
" at " +
chalk.cyan(machine.baseUrl));
console.log('>> ' + chalk.greenBright(machine.name) + ' at ' + chalk.cyan(machine.baseUrl));
}
function list() {
printMessage("\nLogged in Captain Machines:\n");
MachineHelper.machines.map(machine => {
printMessage('\nLogged in Captain Machines:\n');
MachineHelper_1.default.getMachines().map((machine) => {
_displayMachine(machine);
});
printMessage("");
printMessage('');
}
module.exports = list;
//# sourceMappingURL=list.js.map
app-cli/built/commands/list.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/commands/list.js"],"names":[],"mappings":";AAEA,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;AAC9B,MAAM,aAAa,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACzD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE3D,SAAS,eAAe,CAAC,OAAO;IAC9B,OAAO,CAAC,GAAG,CACT,KAAK;QACH,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;QAC/B,MAAM;QACN,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAC9B,CAAA;AACH,CAAC;AAED,SAAS,IAAI;IACX,YAAY,CAAC,iCAAiC,CAAC,CAAA;IAE/C,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,eAAe,CAAC,OAAO,CAAC,CAAA;IAC1B,CAAC,CAAC,CAAA;IAEF,YAAY,CAAC,EAAE,CAAC,CAAA;AAClB,CAAC;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,CAAA"}
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":";;;AAEA,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,4DAAqD;AAErD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAE5D,SAAS,eAAe,CAAC,OAAiB;IACzC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;AAC7F,CAAC;AAED,SAAS,IAAI;IACZ,YAAY,CAAC,iCAAiC,CAAC,CAAC;IAEhD,uBAAa,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3C,eAAe,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,YAAY,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC"}
app-cli/built/commands/login.js
+41 -39
View File
@@ -1,4 +1,5 @@
#!/usr/bin/env node
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -7,28 +8,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
const MachineHelper = require("../helpers/MachineHelper");
const { printMessage, printGreenMessage, printError } = require("../utils/messageHandler");
const inquirer = require("inquirer");
const DeployApi = require("../api/DeployApi");
const { cleanUpUrl, findDefaultCaptainName } = require("../utils/loginHelpers");
const { SAMPLE_DOMAIN } = require("../utils/constants");
const LoginApi = require("../api/LoginApi");
Object.defineProperty(exports, "__esModule", { value: true });
const MachineHelper_1 = require("../helpers/MachineHelper");
const { printMessage, printGreenMessage, printError } = require('../utils/messageHandler');
const inquirer = require('inquirer');
const DeployApi = require('../api/DeployApi');
const { cleanUpUrl, findDefaultCaptainName } = require('../utils/loginHelpers');
const { SAMPLE_DOMAIN } = require('../utils/constants');
const LoginApi = require('../api/LoginApi');
// In case the token is expired
function requestLogin() {
return __awaiter(this, void 0, void 0, function* () {
const { baseUrl, name } = DeployApi.machineToDeploy;
printMessage("Your auth token is not valid anymore. Try to login again.");
printMessage('Your auth token is not valid anymore. Try to login again.');
const questions = [
{
type: "password",
name: "captainPassword",
message: "Please enter your password for " + baseUrl,
validate: function (value) {
type: 'password',
name: 'captainPassword',
message: 'Please enter your password for ' + baseUrl,
validate: (value) => {
if (value && value.trim()) {
return true;
}
return "Please enter your password for " + baseUrl;
return 'Please enter your password for ' + baseUrl;
}
}
];
@@ -40,26 +42,26 @@ function requestLogin() {
if (!newToken)
return false;
// Update the token to the machine that corresponds
MachineHelper.updateMachineAuthToken(name, newToken);
MachineHelper_1.default.updateMachineAuthToken(name, newToken);
return true;
});
}
function login() {
return __awaiter(this, void 0, void 0, function* () {
printMessage("Login to a Captain Machine");
printMessage('Login to a Captain Machine');
const questions = [
{
type: "input",
type: 'input',
default: SAMPLE_DOMAIN,
name: "captainAddress",
message: "\nEnter address of the Captain machine. \nIt is captain.[your-captain-root-domain] :",
validate: value => {
name: 'captainAddress',
message: '\nEnter address of the Captain machine. \nIt is captain.[your-captain-root-domain] :',
validate: (value) => {
if (value === SAMPLE_DOMAIN) {
return "Enter a valid URL";
return 'Enter a valid URL';
}
if (!cleanUpUrl(value))
return "This is an invalid URL: " + value;
MachineHelper.machines.map(machine => {
return 'This is an invalid URL: ' + value;
MachineHelper_1.default.getMachines().map((machine) => {
if (cleanUpUrl(machine.baseUrl) === cleanUpUrl(value)) {
return `${value} already exist as ${machine.name}. If you want to replace the existing entry, you have to first use <logout> command, and then re-login.`;
}
@@ -67,33 +69,33 @@ function login() {
if (value && value.trim()) {
return true;
}
return "Please enter a valid address.";
return 'Please enter a valid address.';
}
},
{
type: "confirm",
name: "captainHasRootSsl",
message: "Is HTTPS activated for this Captain machine?",
type: 'confirm',
name: 'captainHasRootSsl',
message: 'Is HTTPS activated for this Captain machine?',
default: true
},
{
type: "password",
name: "captainPassword",
message: "Enter your password:",
validate: value => {
type: 'password',
name: 'captainPassword',
message: 'Enter your password:',
validate: (value) => {
if (value && value.trim()) {
return true;
}
return "Please enter your password.";
return 'Please enter your password.';
}
},
{
type: "input",
name: "captainName",
message: "Enter a name for this Captain machine:",
type: 'input',
name: 'captainName',
message: 'Enter a name for this Captain machine:',
default: findDefaultCaptainName(),
validate: value => {
MachineHelper.machines.map(machine => {
validate: (value) => {
MachineHelper_1.default.getMachines().map((machine) => {
if (machine.name === value) {
return `${value} already exist. If you want to replace the existing entry, you have to first use <logout> command, and then re-login.`;
}
@@ -101,13 +103,13 @@ function login() {
if (value.match(/^[-\d\w]+$/i)) {
return true;
}
return "Please enter a Captain Name.";
return 'Please enter a Captain Name.';
}
}
];
const answers = yield inquirer.prompt(questions);
const { captainHasRootSsl, captainPassword, captainAddress, captainName } = answers;
const handleHttp = captainHasRootSsl ? "https://" : "http://";
const handleHttp = captainHasRootSsl ? 'https://' : 'http://';
const baseUrl = `${handleHttp}${cleanUpUrl(captainAddress)}`;
try {
const data = yield LoginApi.loginMachine(baseUrl, captainPassword);
@@ -121,7 +123,7 @@ function login() {
baseUrl,
name: captainName
};
MachineHelper.addMachine(newMachine);
MachineHelper_1.default.addMachine(newMachine);
printGreenMessage(`Logged in successfully to ${baseUrl}`);
printGreenMessage(`Authorization token is now saved as ${captainName} \n`);
}
app-cli/built/commands/login.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.js"],"names":[],"mappings":"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"}
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,4DAAqD;AAErD,MAAM,EAAE,YAAY,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAC3F,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACrC,MAAM,SAAS,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9C,MAAM,EAAE,UAAU,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAChF,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACxD,MAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE5C,+BAA+B;AAC/B,SAAe,YAAY;;QAC1B,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC,eAAe,CAAC;QAEpD,YAAY,CAAC,2DAA2D,CAAC,CAAC;QAE1E,MAAM,SAAS,GAAG;YACjB;gBACC,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,iCAAiC,GAAG,OAAO;gBACpD,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;oBAC3B,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE;wBAC1B,OAAO,IAAI,CAAC;qBACZ;oBAED,OAAO,iCAAiC,GAAG,OAAO,CAAC;gBACpD,CAAC;aACD;SACD,CAAC;QACF,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAG,aAAa,CAAC,eAAe,CAAC;QAC/C,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAChE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAE5B,IAAI,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAC;QAE5B,mDAAmD;QACnD,uBAAa,CAAC,sBAAsB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAErD,OAAO,IAAI,CAAC;IACb,CAAC;CAAA;AAED,SAAe,KAAK;;QACnB,YAAY,CAAC,4BAA4B,CAAC,CAAC;QAE3C,MAAM,SAAS,GAAG;YACjB;gBACC,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,aAAa;gBACtB,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,sFAAsF;gBAC/F,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;oBAC3B,IAAI,KAAK,KAAK,aAAa,EAAE;wBAC5B,OAAO,mBAAmB,CAAC;qBAC3B;oBAED,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;wBAAE,OAAO,0BAA0B,GAAG,KAAK,CAAC;oBAElE,uBAAa,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;wBAC3C,IAAI,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,UAAU,CAAC,KAAK,CAAC,EAAE;4BACtD,OAAO,GAAG,KAAK,qBAAqB,OAAO,CAAC,IAAI,yGAAyG,CAAC;yBAC1J;oBACF,CAAC,CAAC,CAAC;oBAEH,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE;wBAC1B,OAAO,IAAI,CAAC;qBACZ;oBAED,OAAO,+BAA+B,CAAC;gBACxC,CAAC;aACD;YACD;gBACC,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,mBAAmB;gBACzB,OAAO,EAAE,8CAA8C;gBACvD,OAAO,EAAE,IAAI;aACb;YACD;gBACC,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,sBAAsB;gBAC/B,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;oBAC3B,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE;wBAC1B,OAAO,IAAI,CAAC;qBACZ;oBAED,OAAO,6BAA6B,CAAC;gBACtC,CAAC;aACD;YACD;gBACC,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,wCAAwC;gBACjD,OAAO,EAAE,sBAAsB,EAAE;gBACjC,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;oBAC3B,uBAAa,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;wBAC3C,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;4BAC3B,OAAO,GAAG,KAAK,uHAAuH,CAAC;yBACvI;oBACF,CAAC,CAAC,CAAC;oBAEH,IAAI,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;wBAC/B,OAAO,IAAI,CAAC;qBACZ;oBAED,OAAO,8BAA8B,CAAC;gBACvC,CAAC;aACD;SACD,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACjD,MAAM,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QACpF,MAAM,UAAU,GAAG,iBAAiB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9D,MAAM,OAAO,GAAG,GAAG,UAAU,GAAG,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAE7D,IAAI;YACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YACnE,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAElC,0CAA0C;YAC1C,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;aACnD;YAED,MAAM,UAAU,GAAG;gBAClB,SAAS,EAAE,QAAQ,CAAC,KAAK;gBACzB,OAAO;gBACP,IAAI,EAAE,WAAW;aACjB,CAAC;YAEF,uBAAa,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAErC,iBAAiB,CAAC,6BAA6B,OAAO,EAAE,CAAC,CAAC;YAE1D,iBAAiB,CAAC,uCAAuC,WAAW,KAAK,CAAC,CAAC;SAC3E;QAAC,OAAO,KAAK,EAAE;YACf,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;YAE3D,UAAU,CAAC,wCAAwC,WAAW,OAAO,YAAY,EAAE,CAAC,CAAC;SACrF;IACF,CAAC;CAAA;AAED,MAAM,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC"}
app-cli/built/commands/logout.js
+13 -12
View File
@@ -1,4 +1,5 @@
#!/usr/bin/env node
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -7,35 +8,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
const MachineHelper = require("../helpers/MachineHelper");
const { printMessage } = require("../utils/messageHandler");
const inquirer = require("inquirer");
const MachineHelper = require('../helpers/MachineHelper');
const { printMessage } = require('../utils/messageHandler');
const inquirer = require('inquirer');
function generateQuestions() {
const listOfMachines = MachineHelper.getMachinesAsOptions();
return [
{
type: "list",
name: "captainNameToLogout",
message: "Select the Captain Machine you want to logout from:",
type: 'list',
name: 'captainNameToLogout',
message: 'Select the Captain Machine you want to logout from:',
choices: listOfMachines
},
{
type: "confirm",
name: "confirmedToLogout",
message: "Are you sure you want to logout from this Captain machine?",
type: 'confirm',
name: 'confirmedToLogout',
message: 'Are you sure you want to logout from this Captain machine?',
default: false,
when: answers => answers.captainNameToLogout
when: (answers) => answers.captainNameToLogout
}
];
}
function logout() {
return __awaiter(this, void 0, void 0, function* () {
const questions = generateQuestions();
printMessage("Logout from a Captain Machine and clear auth info");
printMessage('Logout from a Captain Machine and clear auth info');
const answers = yield inquirer.prompt(questions);
const { captainNameToLogout } = answers;
if (!captainNameToLogout) {
printMessage("\nOperation cancelled by the user...\n", true);
printMessage('\nOperation cancelled by the user...\n', true);
}
MachineHelper.logoutMachine(captainNameToLogout);
});
app-cli/built/commands/logout.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/commands/logout.js"],"names":[],"mappings":";;;;;;;;;AAEA,MAAM,aAAa,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACzD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAC3D,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAEpC,SAAS,iBAAiB;IACxB,MAAM,cAAc,GAAG,aAAa,CAAC,oBAAoB,EAAE,CAAA;IAE3D,OAAO;QACL;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,qDAAqD;YAC9D,OAAO,EAAE,cAAc;SACxB;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,4DAA4D;YACrE,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,mBAAmB;SAC7C;KACF,CAAA;AACH,CAAC;AAED,SAAe,MAAM;;QACnB,MAAM,SAAS,GAAG,iBAAiB,EAAE,CAAA;QAErC,YAAY,CAAC,mDAAmD,CAAC,CAAA;QAEjE,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAChD,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAA;QAEvC,IAAI,CAAC,mBAAmB,EAAE;YACxB,YAAY,CAAC,wCAAwC,EAAE,IAAI,CAAC,CAAA;SAC7D;QAED,aAAa,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAA;IAClD,CAAC;CAAA;AAED,MAAM,CAAC,OAAO,GAAG,MAAM,CAAA"}
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/commands/logout.ts"],"names":[],"mappings":";;;;;;;;;;AAEA,MAAM,aAAa,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAC1D,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAC5D,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAErC,SAAS,iBAAiB;IACzB,MAAM,cAAc,GAAG,aAAa,CAAC,oBAAoB,EAAE,CAAC;IAE5D,OAAO;QACN;YACC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,qDAAqD;YAC9D,OAAO,EAAE,cAAc;SACvB;QACD;YACC,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,4DAA4D;YACrE,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,mBAAmB;SACnD;KACD,CAAC;AACH,CAAC;AAED,SAAe,MAAM;;QACpB,MAAM,SAAS,GAAG,iBAAiB,EAAE,CAAC;QAEtC,YAAY,CAAC,mDAAmD,CAAC,CAAC;QAElE,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACjD,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC;QAExC,IAAI,CAAC,mBAAmB,EAAE;YACzB,YAAY,CAAC,wCAAwC,EAAE,IAAI,CAAC,CAAC;SAC7D;QAED,aAAa,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;IAClD,CAAC;CAAA;AAED,iBAAS,MAAM,CAAC"}
app-cli/built/commands/serversetup.js
+52 -51
View File
@@ -1,4 +1,5 @@
#!/usr/bin/env node
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -7,39 +8,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
const MachineHelper = require("../helpers/MachineHelper");
const SystemApi = require("../api/SystemApi");
const LoginApi = require("../api/LoginApi");
const inquirer = require("inquirer");
const { findDefaultCaptainName } = require("../utils/loginHelpers");
const { isIpAddress } = require("../utils/validationsHandler");
const { SAMPLE_IP, DEFAULT_PASSWORD } = require("../utils/constants");
const { printMessage, printError, printMessageAndExit, errorHandler } = require("../utils/messageHandler");
const validationsHandler_1 = require("../utils/validationsHandler");
const SystemApi = require('../api/SystemApi');
const LoginApi = require('../api/LoginApi');
const inquirer = require('inquirer');
const { findDefaultCaptainName } = require('../utils/loginHelpers');
const { SAMPLE_IP, DEFAULT_PASSWORD } = require('../utils/constants');
const { printMessage, printError, printMessageAndExit, errorHandler } = require('../utils/messageHandler');
const MachineHelper_1 = require("../helpers/MachineHelper");
let newPasswordFirstTry = undefined;
const questions = [
{
type: "list",
name: "hasInstalledCaptain",
message: "Have you already installed Captain on your server by running the following line:" +
"\nmkdir /captain && docker run -p 80:80 -p 443:443 -p 3000:3000 -v /var/run/docker.sock:/var/run/docker.sock dockersaturn/captainduckduck ?",
default: "Yes",
choices: ["Yes", "No"],
filter: value => {
type: 'list',
name: 'hasInstalledCaptain',
message: 'Have you already installed Captain on your server by running the following line:' +
'\nmkdir /captain && docker run -p 80:80 -p 443:443 -p 3000:3000 -v /var/run/docker.sock:/var/run/docker.sock dockersaturn/captainduckduck ?',
default: 'Yes',
choices: ['Yes', 'No'],
filter: (value) => {
const answerFromUser = value.trim();
if (answerFromUser === "Yes")
if (answerFromUser === 'Yes')
return answerFromUser;
printMessage("\n\nCannot start the setup process if Captain is not installed.");
printMessageAndExit("Please read tutorial on CaptainDuckDuck.com to learn how to install CaptainDuckDuck on a server.");
printMessage('\n\nCannot start the setup process if Captain is not installed.');
printMessageAndExit('Please read tutorial on CaptainDuckDuck.com to learn how to install CaptainDuckDuck on a server.');
}
},
{
type: "input",
type: 'input',
default: SAMPLE_IP,
name: "captainAddress",
message: "Enter IP address of your captain server:",
name: 'captainAddress',
message: 'Enter IP address of your captain server:',
filter: (value) => __awaiter(this, void 0, void 0, function* () {
const ipFromUser = value.trim();
if (ipFromUser === SAMPLE_IP || !isIpAddress(ipFromUser)) {
if (ipFromUser === SAMPLE_IP || !validationsHandler_1.isIpAddress(ipFromUser)) {
printError(`\nThis is an invalid IP Address: ${ipFromUser}`, true);
}
try {
@@ -56,9 +57,9 @@ const questions = [
})
},
{
type: "password",
name: "captainOriginalPassword",
message: "Enter your current password:",
type: 'password',
name: 'captainOriginalPassword',
message: 'Enter your current password:',
when: () => !LoginApi.token,
filter: (value) => __awaiter(this, void 0, void 0, function* () {
try {
@@ -75,11 +76,11 @@ const questions = [
})
},
{
type: "input",
name: "captainRootDomain",
message: "Enter a root domain for this Captain server. For example, enter test.yourdomain.com if you" +
" setup your DNS to point *.test.yourdomain.com to ip address of your server" +
": ",
type: 'input',
name: 'captainRootDomain',
message: 'Enter a root domain for this Captain server. For example, enter test.yourdomain.com if you' +
' setup your DNS to point *.test.yourdomain.com to ip address of your server' +
': ',
filter: (value) => __awaiter(this, void 0, void 0, function* () {
try {
const captainRootDomainFromUser = value.trim();
@@ -96,8 +97,8 @@ const questions = [
})
},
{
type: "input",
name: "emailAddress",
type: 'input',
name: 'emailAddress',
message: "Enter your 'valid' email address to enable HTTPS: ",
filter: (value) => __awaiter(this, void 0, void 0, function* () {
try {
@@ -114,25 +115,25 @@ const questions = [
})
},
{
type: "password",
name: "newPasswordFirstTry",
message: "Enter a new password:",
filter: value => {
type: 'password',
name: 'newPasswordFirstTry',
message: 'Enter a new password:',
filter: (value) => {
newPasswordFirstTry = value;
return value;
}
},
{
type: "password",
name: "newPassword",
message: "Enter a new password:",
type: 'password',
name: 'newPassword',
message: 'Enter a new password:',
filter: (value) => __awaiter(this, void 0, void 0, function* () {
const { customDomainFromUser } = SystemApi;
try {
const confirmPasswordValueFromUser = value;
const machineUrl = `https://${customDomainFromUser}`;
if (newPasswordFirstTry !== confirmPasswordValueFromUser) {
printError("Passwords do not match", true);
printError('Passwords do not match', true);
}
const changePassData = yield LoginApi.changePass(machineUrl, confirmPasswordValueFromUser);
if (changePassData) {
@@ -142,32 +143,32 @@ const questions = [
}
}
catch (e) {
printError("\nIMPORTANT!! Server setup is completed by password is not changed.");
printError("\nYou CANNOT use serversetup anymore. To continue:");
printError('\nIMPORTANT!! Server setup is completed by password is not changed.');
printError('\nYou CANNOT use serversetup anymore. To continue:');
printError(`\n- Go to https://${customDomainFromUser} login with default password and change the password in settings.`);
printError(`\n- In terminal (here), type captainduckduck login and enter this as your root domain: ${customDomainFromUser}`, true);
}
})
},
{
type: "input",
name: "captainName",
message: "Enter a name for this Captain machine:",
type: 'input',
name: 'captainName',
message: 'Enter a name for this Captain machine:',
default: findDefaultCaptainName(),
validate: value => {
validate: (value) => {
const newMachineName = value.trim();
MachineHelper.machines.map(machine => machine.name === newMachineName &&
MachineHelper_1.default.getMachines().map((machine) => machine.name === newMachineName &&
`${newMachineName} already exist. If you want to replace the existing entry, you have to first use <logout> command, and then re-login.`);
if (value.match(/^[-\d\w]+$/i)) {
return true;
}
return "Please enter a Captain Name.";
return 'Please enter a Captain Name.';
}
}
];
function serversetup() {
return __awaiter(this, void 0, void 0, function* () {
printMessage("\nSetup your Captain server\n");
printMessage('\nSetup your Captain server\n');
const answers = yield inquirer.prompt(questions);
const captainAddress = `https://${SystemApi.customDomainFromUser}`;
const newMachine = {
@@ -175,9 +176,9 @@ function serversetup() {
baseUrl: captainAddress,
name: answers.captainName
};
MachineHelper.addMachine(newMachine);
MachineHelper_1.default.addMachine(newMachine);
printMessage(`\n\nCaptain is available at ${captainAddress}`);
printMessage("\nFor more details and docs see http://www.captainduckduck.com\n\n");
printMessage('\nFor more details and docs see http://www.captainduckduck.com\n\n');
});
}
module.exports = serversetup;
app-cli/built/commands/serversetup.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"serversetup.js","sourceRoot":"","sources":["../../src/commands/serversetup.js"],"names":[],"mappings":"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"}
{"version":3,"file":"serversetup.js","sourceRoot":"","sources":["../../src/commands/serversetup.ts"],"names":[],"mappings":"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"}
app-cli/built/helpers/MachineHelper.js
+5 -1
View File
@@ -28,6 +28,9 @@ class MachineHelper {
});
return [...firstItemInOption, ...listOfMachines];
}
getMachines() {
return this.machines;
}
setMachines(newMachines) {
this.machines = newMachines;
configs.set('captainMachines', newMachines);
@@ -73,5 +76,6 @@ class MachineHelper {
printMessage(`You are now logged out from ${removedMachine.name} at ${removedMachine.baseUrl}...\n`);
}
}
module.exports = new MachineHelper();
const instance = new MachineHelper();
exports.default = instance;
//# sourceMappingURL=MachineHelper.js.map
app-cli/built/helpers/MachineHelper.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"MachineHelper.js","sourceRoot":"","sources":["../../src/helpers/MachineHelper.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"MachineHelper.js","sourceRoot":"","sources":["../../src/helpers/MachineHelper.ts"],"names":[],"mappings":"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"}
app-cli/built/utils/fileHelper.js
-1
View File
@@ -7,7 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
Object.defineProperty(exports, "__esModule", { value: true });
const { printMessage, printError, printGreenMessage, printMagentaMessage } = require('./messageHandler');
const SpinnerHelper = require('../helpers/SpinnerHelper');
const child_process_1 = require("child_process");
app-cli/built/utils/fileHelper.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"fileHelper.js","sourceRoot":"","sources":["../../src/utils/fileHelper.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AACzG,MAAM,aAAa,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAC1D,iDAAqC;AACrC,+BAA+B;AAC/B,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACxC,MAAM,SAAS,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9C,MAAM,EAAE,yBAAyB,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AACvE,IAAI,qBAAqB,GAAG,CAAC,KAAK,CAAC,CAAC,2CAA2C;AAW/E,SAAS,cAAc,CAAC,eAAuB,EAAE,YAAoB;IACpE,oBAAI,CAAC,sCAAsC,eAAe,KAAK,YAAY,EAAE,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;QACtG,IAAI,GAAG,EAAE;YACR,UAAU,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;YAExC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;YAE/B,OAAO;SACP;QAED,oBAAI,CAAC,iBAAiB,YAAY,EAAE,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YAC7D,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAEtC,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC3C,UAAU,CAAC,mDAAmD,YAAY,KAAK,OAAO,KAAK,GAAG,IAAI,CAAC,CAAC;gBAEpG,OAAO;aACP;YAED,YAAY,CAAC,0BAA0B,YAAY,KAAK,OAAO,EAAE,CAAC,CAAC;YAEnE,UAAU,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,IAAc;IACrC,IAAI,IAAI,EAAE;QACT,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAC9B,MAAM,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;QACxD,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAE1B,IAAI,qBAAqB,GAAG,qBAAqB,EAAE;YAClD,IAAI,qBAAqB,GAAG,CAAC,EAAE;gBAC9B,6EAA6E;gBAC7E,iBAAiB,GAAG,CAAC,qBAAqB,CAAC;aAC3C;iBAAM;gBACN,YAAY,CAAC,iBAAiB,CAAC,CAAC;aAChC;SACD;aAAM;YACN,iBAAiB,GAAG,qBAAqB,GAAG,qBAAqB,CAAC;SAClE;QAED,qBAAqB,GAAG,qBAAqB,GAAG,KAAK,CAAC,MAAM,CAAC;QAE7D,KAAK,IAAI,CAAC,GAAG,iBAAiB,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtD,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACtC;KACD;IAED,MAAM,gBAAgB,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC;IAErD,IAAI,gBAAgB,EAAE;QACrB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACxB,iBAAiB,CAAC,0BAA0B,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;YAEjE,mBAAmB,CAAC,uBAAuB,SAAS,CAAC,MAAM,IAAI,EAAE,IAAI,CAAC,CAAC;SACvE;aAAM;YACN,UAAU,CAAC,4CAA4C,SAAS,CAAC,OAAO,KAAK,EAAE,IAAI,CAAC,CAAC;SACrF;KACD;IAED,UAAU,CAAC,GAAG,EAAE;QACf,sBAAsB,EAAE,CAAC;IAC1B,CAAC,EAAE,IAAI,CAAC,CAAC;AACV,CAAC;AAED,SAAe,sBAAsB;;QACpC,IAAI;YACH,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,cAAc,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAElC,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;aACnD;YACD,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SAC9B;QAAC,OAAO,KAAK,EAAE;YACf,UAAU,CAAC,iDAAiD,KAAK,IAAI,CAAC,CAAC;YAEvE,kDAAkD;SAClD;IACF,CAAC;CAAA;AAED,SAAS,aAAa,CAAC,eAAuB;IAC7C,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC;IACnD,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG;QACf,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,IAAI;KACX,CAAC;IACF,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,yCAAyC,EAAE,OAAO,CAAC,CAAC;IAEhF,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;QACzB,YAAY,CAAC,uDAAuD,CAAC,CAAC;QAEtE,aAAa,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAEpD,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACnB,CAAC;AAED,SAAe,UAAU,CAAC,QAAgB,EAAE,OAAe;;QAC1D,IAAI;YACH,YAAY,CAAC,qBAAqB,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YAEvE,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAClC,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM,KAAK,GAAG,CAAC;YACtE,MAAM,qBAAqB,GAAG,IAAI,CAAC,MAAM,KAAK,GAAG,CAAC;YAClD,MAAM,sBAAsB,GAAG,IAAI,CAAC,MAAM,KAAK,GAAG,CAAC;YAEnD,IAAI,kBAAkB,EAAE;gBACvB,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;aAC/C;YAED,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,iBAAiB;YAE/C,4BAA4B;YAC5B,yBAAyB,EAAE,CAAC;YAE5B,IAAI,qBAAqB,EAAE;gBAC1B,sBAAsB,EAAE,CAAC;aACzB;YAED,IAAI,sBAAsB,EAAE;gBAC3B,iBAAiB,CAAC,0BAA0B,SAAS,CAAC,OAAO,IAAI,EAAE,IAAI,CAAC,CAAC;aACzE;SACD;QAAC,OAAO,CAAC,EAAE;YACX,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;SAC5B;IACF,CAAC;CAAA;AAED,SAAS,kBAAkB,CAAC,QAAgB;IAC3C,IAAI,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE;QAChC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;KACxB;AACF,CAAC;AAED,MAAM,CAAC,OAAO,GAAG;IAChB,cAAc;IACd,aAAa;IACb,UAAU;IACV,sBAAsB;CACtB,CAAC"}
{"version":3,"file":"fileHelper.js","sourceRoot":"","sources":["../../src/utils/fileHelper.ts"],"names":[],"mappings":"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"}
app-cli/built/utils/loginHelpers.js
+3 -4
View File
@@ -1,6 +1,5 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const MachineHelper = require('../helpers/MachineHelper');
const MachineHelper_1 = require("../helpers/MachineHelper");
function cleanUpUrl(url) {
if (!url || !url.length)
return null;
@@ -13,7 +12,7 @@ function cleanUpUrl(url) {
return cleanedUrl.replace('http://', '').replace('https://', '').trim();
}
function findDefaultCaptainName() {
let currentSuffix = MachineHelper.machines.length + 1;
let currentSuffix = MachineHelper_1.default.getMachines().length + 1;
while (!isSuffixValid(currentSuffix)) {
currentSuffix++;
}
@@ -23,7 +22,7 @@ function getCaptainFullName(suffix) {
const formatSuffix = suffix < 10 ? `0${suffix}` : suffix;
return `captain-${formatSuffix}`;
}
const isSuffixValid = (suffixNumber) => MachineHelper.machines.map((machine) => {
const isSuffixValid = (suffixNumber) => MachineHelper_1.default.getMachines().map((machine) => {
machine.name !== getCaptainFullName(suffixNumber);
});
module.exports = {
app-cli/built/utils/loginHelpers.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"loginHelpers.js","sourceRoot":"","sources":["../../src/utils/loginHelpers.ts"],"names":[],"mappings":";;AAEA,MAAM,aAAa,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAE1D,SAAS,UAAU,CAAC,GAAW;IAC9B,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAErC,IAAI,UAAU,GAAG,GAAG,CAAC;IACrB,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC;IAE/D,IAAI,gBAAgB,EAAE;QACrB,8BAA8B;QAC9B,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;KAC3C;IAED,OAAO,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AACzE,CAAC;AAED,SAAS,sBAAsB;IAC9B,IAAI,aAAa,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IAEtD,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE;QACrC,aAAa,EAAE,CAAC;KAChB;IAED,OAAO,kBAAkB,CAAC,aAAa,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAc;IACzC,MAAM,YAAY,GAAG,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IAEzD,OAAO,WAAW,YAAY,EAAE,CAAC;AAClC,CAAC;AAED,MAAM,aAAa,GAAG,CAAC,YAAoB,EAAE,EAAE,CAC9C,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAiB,EAAE,EAAE;IAChD,OAAO,CAAC,IAAI,KAAK,kBAAkB,CAAC,YAAY,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,OAAO,GAAG;IAChB,UAAU;IACV,sBAAsB;IACtB,aAAa;IACb,kBAAkB;CAClB,CAAC"}
{"version":3,"file":"loginHelpers.js","sourceRoot":"","sources":["../../src/utils/loginHelpers.ts"],"names":[],"mappings":";AACA,4DAAqD;AAErD,SAAS,UAAU,CAAC,GAAW;IAC9B,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAErC,IAAI,UAAU,GAAG,GAAG,CAAC;IACrB,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC;IAE/D,IAAI,gBAAgB,EAAE;QACrB,8BAA8B;QAC9B,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;KAC3C;IAED,OAAO,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AACzE,CAAC;AAED,SAAS,sBAAsB;IAC9B,IAAI,aAAa,GAAG,uBAAa,CAAC,WAAW,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;IAE3D,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE;QACrC,aAAa,EAAE,CAAC;KAChB;IAED,OAAO,kBAAkB,CAAC,aAAa,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAc;IACzC,MAAM,YAAY,GAAG,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IAEzD,OAAO,WAAW,YAAY,EAAE,CAAC;AAClC,CAAC;AAED,MAAM,aAAa,GAAG,CAAC,YAAoB,EAAE,EAAE,CAC9C,uBAAa,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,OAAiB,EAAE,EAAE;IACrD,OAAO,CAAC,IAAI,KAAK,kBAAkB,CAAC,YAAY,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC;AAEJ,iBAAS;IACR,UAAU;IACV,sBAAsB;IACtB,aAAa;IACb,kBAAkB;CAClB,CAAC"}
app-cli/built/utils/machineUtils.js
-1
View File
@@ -1,5 +1,4 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const DeployApi = require('../api/DeployApi');
const MachineHelper = require('../helpers/MachineHelper');
function initMachineFromLocalStorage() {
app-cli/built/utils/machineUtils.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"machineUtils.js","sourceRoot":"","sources":["../../src/utils/machineUtils.ts"],"names":[],"mappings":";;AAEA,MAAM,SAAS,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9C,MAAM,aAAa,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAE1D,SAAS,2BAA2B;IACnC,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAS,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAEtF,IAAI,WAAW,EAAE;QAChB,SAAS,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QAE1D,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAE1C,SAAS,CAAC,eAAe,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;KACpD;AACF,CAAC;AAED,6CAA6C;AAC7C,SAAS,yBAAyB;IACjC,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;IAChC,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACvC,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,aAAa;IACb,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAS,EAAE,EAAE;QAC1C,IAAI,GAAG,CAAC,GAAG,KAAK,gBAAgB,EAAE;YACjC,SAAS,GAAG,IAAI,CAAC;YAEjB,OAAO;gBACN,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,OAAO,EAAE,SAAS,CAAC,OAAO;gBAC1B,YAAY,EAAE,SAAS,CAAC,YAAY;gBACpC,eAAe,EAAE,SAAS,CAAC,eAAe;aAC1C,CAAC;SACF;QAED,OAAO,GAAG,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAEnC,IAAI,CAAC,SAAS,EAAE;QACf,MAAM,MAAM,GAAG;YACd,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;YAClB,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,YAAY,EAAE,SAAS,CAAC,YAAY;YACpC,eAAe,EAAE,SAAS,CAAC,eAAe;SAC1C,CAAC;QAEF,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEzB,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KAC5B;AACF,CAAC;AAED,MAAM,CAAC,OAAO,GAAG;IAChB,2BAA2B;IAC3B,yBAAyB;CACzB,CAAC"}
{"version":3,"file":"machineUtils.js","sourceRoot":"","sources":["../../src/utils/machineUtils.ts"],"names":[],"mappings":";AAEA,MAAM,SAAS,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9C,MAAM,aAAa,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAE1D,SAAS,2BAA2B;IACnC,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAS,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAEtF,IAAI,WAAW,EAAE;QAChB,SAAS,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QAE1D,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAE1C,SAAS,CAAC,eAAe,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;KACpD;AACF,CAAC;AAED,6CAA6C;AAC7C,SAAS,yBAAyB;IACjC,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;IAChC,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACvC,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,aAAa;IACb,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAS,EAAE,EAAE;QAC1C,IAAI,GAAG,CAAC,GAAG,KAAK,gBAAgB,EAAE;YACjC,SAAS,GAAG,IAAI,CAAC;YAEjB,OAAO;gBACN,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,OAAO,EAAE,SAAS,CAAC,OAAO;gBAC1B,YAAY,EAAE,SAAS,CAAC,YAAY;gBACpC,eAAe,EAAE,SAAS,CAAC,eAAe;aAC1C,CAAC;SACF;QAED,OAAO,GAAG,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAEnC,IAAI,CAAC,SAAS,EAAE;QACf,MAAM,MAAM,GAAG;YACd,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;YAClB,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,YAAY,EAAE,SAAS,CAAC,YAAY;YACpC,eAAe,EAAE,SAAS,CAAC,eAAe;SAC1C,CAAC;QAEF,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEzB,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KAC5B;AACF,CAAC;AAED,iBAAS;IACR,2BAA2B;IAC3B,yBAAyB;CACzB,CAAC"}
app-cli/built/utils/validationsHandler.js
+7 -7
View File
@@ -1,3 +1,4 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -6,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
Object.defineProperty(exports, "__esModule", { value: true });
const fs = require('fs-extra');
const DeployApi = require('../api/DeployApi');
const { printError } = require('./messageHandler');
@@ -17,6 +19,7 @@ function validateIsGitRepository() {
printError('\n**** ERROR: You are not in a git root directory. This command will only deploys the current directory ****\n', true);
}
}
exports.validateIsGitRepository = validateIsGitRepository;
function validateDefinitionFile() {
const captainDefinitionExists = fs.pathExistsSync('./captain-definition');
if (!captainDefinitionExists) {
@@ -42,6 +45,7 @@ function validateDefinitionFile() {
}
}
}
exports.validateDefinitionFile = validateDefinitionFile;
// Only show that question if there is no option given as argument
function optionIsNotGiven(allOptions, option) {
// console.log(allOptions)
@@ -50,12 +54,14 @@ function optionIsNotGiven(allOptions, option) {
}
return true;
}
exports.optionIsNotGiven = optionIsNotGiven;
function isIpAddress(ipaddress) {
if (/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(ipaddress)) {
return true;
}
return false;
}
exports.isIpAddress = isIpAddress;
function validateAuthentication() {
return __awaiter(this, void 0, void 0, function* () {
// 1. Check if valid auth
@@ -74,11 +80,5 @@ function validateAuthentication() {
}
});
}
module.exports = {
validateAuthentication,
validateIsGitRepository,
validateDefinitionFile,
isIpAddress,
optionIsNotGiven
};
exports.validateAuthentication = validateAuthentication;
//# sourceMappingURL=validationsHandler.js.map
app-cli/built/utils/validationsHandler.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"validationsHandler.js","sourceRoot":"","sources":["../../src/utils/validationsHandler.ts"],"names":[],"mappings":";;;;;;;;AAAA,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9C,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AACnD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACtD,MAAM,EAAE,2BAA2B,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAEzE,SAAS,uBAAuB;IAC/B,MAAM,eAAe,GAAG,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAEpD,IAAI,CAAC,eAAe,EAAE;QACrB,UAAU,CACT,gHAAgH,EAChH,IAAI,CACJ,CAAC;KACF;AACF,CAAC;AAED,SAAS,sBAAsB;IAC9B,MAAM,uBAAuB,GAAG,EAAE,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAC;IAE1E,IAAI,CAAC,uBAAuB,EAAE;QAC7B,UAAU,CAAC,gFAAgF,EAAE,IAAI,CAAC,CAAC;KACnG;IAED,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;IACjE,IAAI,YAAY,GAAG,IAAI,CAAC;IAExB,IAAI;QACH,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;KACpC;IAAC,OAAO,CAAC,EAAE;QACX,UAAU,CAAC,yEAAyE,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;KAC/F;IAED,IAAI,YAAY,EAAE;QACjB,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE;YAChC,UAAU,CAAC,2EAA2E,EAAE,IAAI,CAAC,CAAC;SAC9F;QAED,IAAI,CAAC,YAAY,CAAC,UAAU,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE;YAC9D,UAAU,CACT,2FAA2F,EAC3F,IAAI,CACJ,CAAC;SACF;QAED,IAAI,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,eAAe,EAAE;YAC5D,UAAU,CACT,qGAAqG,EACrG,IAAI,CACJ,CAAC;SACF;KACD;AACF,CAAC;AAED,kEAAkE;AAClE,SAAS,gBAAgB,CAAC,UAAiC,EAAE,MAAc;IAC1E,0BAA0B;IAC1B,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE;QACvB,OAAO,KAAK,CAAC;KACb;IAED,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAS,WAAW,CAAC,SAAiB;IACrC,IACC,kKAAkK,CAAC,IAAI,CACtK,SAAS,CACT,EACA;QACD,OAAO,IAAI,CAAC;KACZ;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAe,sBAAsB;;QACpC,yBAAyB;QACzB,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAE3D,mBAAmB;QACnB,WAAW;QACX,kBAAkB;QAClB,IAAI,CAAC,eAAe,EAAE;YACrB,MAAM,cAAc,GAAG,MAAM,YAAY,EAAE,CAAC;YAE5C,6BAA6B;YAC7B,2BAA2B,EAAE,CAAC;YAE9B,OAAO,cAAc,CAAC;SACtB;aAAM;YACN,OAAO,OAAO,CAAC,eAAe,CAAC,CAAC;SAChC;IACF,CAAC;CAAA;AAED,MAAM,CAAC,OAAO,GAAG;IAChB,sBAAsB;IACtB,uBAAuB;IACvB,sBAAsB;IACtB,WAAW;IACX,gBAAgB;CAChB,CAAC"}
{"version":3,"file":"validationsHandler.js","sourceRoot":"","sources":["../../src/utils/validationsHandler.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9C,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AACnD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACtD,MAAM,EAAE,2BAA2B,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAEzE,SAAgB,uBAAuB;IACtC,MAAM,eAAe,GAAG,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAEpD,IAAI,CAAC,eAAe,EAAE;QACrB,UAAU,CACT,gHAAgH,EAChH,IAAI,CACJ,CAAC;KACF;AACF,CAAC;AATD,0DASC;AAED,SAAgB,sBAAsB;IACrC,MAAM,uBAAuB,GAAG,EAAE,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAC;IAE1E,IAAI,CAAC,uBAAuB,EAAE;QAC7B,UAAU,CAAC,gFAAgF,EAAE,IAAI,CAAC,CAAC;KACnG;IAED,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;IACjE,IAAI,YAAY,GAAG,IAAI,CAAC;IAExB,IAAI;QACH,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;KACpC;IAAC,OAAO,CAAC,EAAE;QACX,UAAU,CAAC,yEAAyE,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;KAC/F;IAED,IAAI,YAAY,EAAE;QACjB,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE;YAChC,UAAU,CAAC,2EAA2E,EAAE,IAAI,CAAC,CAAC;SAC9F;QAED,IAAI,CAAC,YAAY,CAAC,UAAU,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE;YAC9D,UAAU,CACT,2FAA2F,EAC3F,IAAI,CACJ,CAAC;SACF;QAED,IAAI,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,eAAe,EAAE;YAC5D,UAAU,CACT,qGAAqG,EACrG,IAAI,CACJ,CAAC;SACF;KACD;AACF,CAAC;AAnCD,wDAmCC;AAED,kEAAkE;AAClE,SAAgB,gBAAgB,CAAC,UAAiC,EAAE,MAAc;IACjF,0BAA0B;IAC1B,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE;QACvB,OAAO,KAAK,CAAC;KACb;IAED,OAAO,IAAI,CAAC;AACb,CAAC;AAPD,4CAOC;AAED,SAAgB,WAAW,CAAC,SAAiB;IAC5C,IACC,kKAAkK,CAAC,IAAI,CACtK,SAAS,CACT,EACA;QACD,OAAO,IAAI,CAAC;KACZ;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAVD,kCAUC;AAED,SAAsB,sBAAsB;;QAC3C,yBAAyB;QACzB,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAE3D,mBAAmB;QACnB,WAAW;QACX,kBAAkB;QAClB,IAAI,CAAC,eAAe,EAAE;YACrB,MAAM,cAAc,GAAG,MAAM,YAAY,EAAE,CAAC;YAE5C,6BAA6B;YAC7B,2BAA2B,EAAE,CAAC;YAE9B,OAAO,cAAc,CAAC;SACtB;aAAM;YACN,OAAO,OAAO,CAAC,eAAe,CAAC,CAAC;SAChC;IACF,CAAC;CAAA;AAjBD,wDAiBC"}
app-cli/src/commands/captainduckduck.js
-87
View File
@@ -1,87 +0,0 @@
#!/usr/bin/env node
const { printError } = require("../utils/messageHandler")
const packagejson = require("../../package.json")
const updateNotifier = require("update-notifier")
const program = require("commander")
updateNotifier({ pkg: packagejson }).notify({ isGlobal: true })
// Command actions
const serversetup = require("./serversetup")
const { login } = require("./login")
const logout = require("./logout")
const list = require("./list")
const deploy = require("./deploy")
// Setup
program.version(packagejson.version).description(packagejson.description)
// Commands
program
.command("serversetup")
.description("Performs necessary actions and prepares your Captain server.")
.action(() => {
serversetup()
})
program
.command("login")
.description(
"Login to a CaptainDuckDuck machine. You can be logged in to multiple machines simultaneously."
)
.action(() => {
login()
})
program
.command("logout")
.description("Logout from a specific Captain machine.")
.action(() => {
logout()
})
program
.command("list")
.alias("ls")
.description("List all Captain machines currently logged in.")
.action(() => {
list()
})
program
.command("deploy")
.description(
"Deploy your app (current directory) to a specific Captain machine. You'll be prompted to choose your Captain machine."
)
.option(
"-t, --tarFile <value>",
"Specify file to be uploaded (rather than using git archive)"
)
.option("-d, --default", "Run with default options")
.option("-s, --stateless", "Run deploy stateless")
.option(
"-h, --host <value>",
"Only for stateless mode: Host of the captain machine"
)
.option("-a, --appName <value>", "Only for stateless mode: Name of the app")
.option("-p, --pass <value>", "Only for stateless mode: Password for Captain")
.option(
"-b, --branch <value>",
"Only for stateless mode: Branch name (default master)"
)
.action(options => {
deploy(options)
})
// Error on unknown commands
program.on("command:*", () => {
const wrongCommands = program.args.join(" ")
printError(
`\nInvalid command: ${wrongCommands}\nSee --help for a list of available commands.`,
true
)
})
program.parse(process.argv)
app-cli/src/commands/captainduckduck.ts
Executable
+67
View File
@@ -0,0 +1,67 @@
#!/usr/bin/env node
import logout = require("./logout");
const { printError } = require('../utils/messageHandler');
const packagejson = require('../../package.json');
const updateNotifier = require('update-notifier');
const program = require('commander');
updateNotifier({ pkg: packagejson }).notify({ isGlobal: true });
// Command actions
const serversetup = require('./serversetup');
const { login } = require('./login');
const list = require('./list');
const deploy = require('./deploy');
// Setup
program.version(packagejson.version).description(packagejson.description);
// Commands
program
.command('serversetup')
.description('Performs necessary actions and prepares your Captain server.')
.action(() => {
serversetup();
});
program
.command('login')
.description('Login to a CaptainDuckDuck machine. You can be logged in to multiple machines simultaneously.')
.action(() => {
login();
});
program.command('logout').description('Logout from a specific Captain machine.').action(() => {
logout();
});
program.command('list').alias('ls').description('List all Captain machines currently logged in.').action(() => {
list();
});
program
.command('deploy')
.description(
"Deploy your app (current directory) to a specific Captain machine. You'll be prompted to choose your Captain machine."
)
.option('-t, --tarFile <value>', 'Specify file to be uploaded (rather than using git archive)')
.option('-d, --default', 'Run with default options')
.option('-s, --stateless', 'Run deploy stateless')
.option('-h, --host <value>', 'Only for stateless mode: Host of the captain machine')
.option('-a, --appName <value>', 'Only for stateless mode: Name of the app')
.option('-p, --pass <value>', 'Only for stateless mode: Password for Captain')
.option('-b, --branch <value>', 'Only for stateless mode: Branch name (default master)')
.action((options: any) => {
deploy(options);
});
// Error on unknown commands
program.on('command:*', () => {
const wrongCommands = program.args.join(' ');
printError(`\nInvalid command: ${wrongCommands}\nSee --help for a list of available commands.`, true);
});
program.parse(process.argv);
app-cli/src/commands/deploy.js
-216
View File
@@ -1,216 +0,0 @@
#!/usr/bin/env node
const MachineHelper = require("../helpers/MachineHelper")
const DeployApi = require("../api/DeployApi")
const LoginApi = require("../api/LoginApi")
const { printError, printMessage } = require("../utils/messageHandler")
const {
validateIsGitRepository,
validateDefinitionFile,
optionIsNotGiven,
validateAuthentication
} = require("../utils/validationsHandler")
const { uploadFile } = require("../utils/fileHelper")
const { gitArchiveFile } = require("../utils/fileHelper")
const fs = require("fs-extra")
const path = require("path")
const inquirer = require("inquirer")
const commandExistsSync = require("command-exists").sync
const { initMachineFromLocalStorage } = require("../utils/machineUtils")
async function deployAsDefaultValues() {
try {
const isValidAuthentication = await validateAuthentication()
if (isValidAuthentication) {
const { appName, branchToPush, machineToDeploy } = DeployApi
if (!appName || !branchToPush || !machineToDeploy) {
printError(
"Default deploy failed. There are no default options selected.",
true
)
}
printMessage(`Deploying to ${machineToDeploy.name}`)
deployFromGitProject()
} else {
printError("Incorrect login details", true)
}
} catch (e) {
printError(e.message, true)
}
}
async function deployAsStateless(host, appName, branch, pass) {
const isStateless = host && appName && branch && pass
if (isStateless) {
// login first
printMessage(`Trying to login to ${host}\n`)
const { name } = DeployApi.machineToDeploy
const response = await LoginApi.loginMachine(host, pass)
const data = JSON.parse(response)
const newToken = data.token
// Update the token to the machine that corresponds (if needed)
MachineHelper.updateMachineAuthToken(name, newToken)
if (data) {
printMessage(
`Starting stateless deploy to\n${host}\n${branch}\n${appName}`
)
deployFromGitProject()
}
} else {
printError(
"You are missing parameters for deploying on stateless. <host> <password> <app name> <branch>"
)
}
}
async function deployFromTarFile(tarFile) {
try {
const isValidAuthentication = await validateAuthentication()
if (isValidAuthentication) {
// Send from tar file
const filePath = tarFile
const gitHash = "sendviatarfile"
await uploadFile(filePath, gitHash)
} else {
printError("Incorrect login details", true)
}
} catch (e) {
printError(e.message, true)
}
}
function deployFromGitProject() {
if (!commandExistsSync("git")) {
printError("'git' command not found...")
printError(
"Captain needs 'git' to create tar file of your source files...",
true
)
}
const zipFileNameToDeploy = "temporary-captain-to-deploy.tar"
const zipFileFullPath = path.join(process.cwd(), zipFileNameToDeploy)
printMessage(`Saving tar file to:\n${zipFileFullPath}\n`)
// Removes the temporarly file created
try {
const tempFileExists = fs.pathExistsSync(zipFileFullPath)
if (tempFileExists) {
fs.removeSync(zipFileFullPath)
}
} catch (e) {
// IgnoreError
}
gitArchiveFile(zipFileFullPath, DeployApi.branchToPush)
}
async function deploy(options) {
// Reads local storage and sets the machine if found
initMachineFromLocalStorage()
if (!options.tarFile || !options.stateless) {
validateIsGitRepository()
validateDefinitionFile()
}
printMessage("Preparing deployment to Captain...\n")
if (options.default) {
deployAsDefaultValues()
} else if (options.stateless) {
deployAsStateless(
options.host,
options.appName,
options.branch,
options.pass
)
} else if (options.tarFile) {
deployFromTarFile(options.tarFile)
} else {
const questions = [
{
type: "list",
name: "captainNameToDeploy",
default: DeployApi.machineToDeploy.name || "",
message: "Select the Captain Machine you want to deploy to:",
choices: MachineHelper.getMachinesAsOptions(),
when: () => optionIsNotGiven(options, "host")
},
{
type: "input",
default: DeployApi.branchToPush || "master",
name: "branchToPush",
message: "Enter the 'git' branch you would like to deploy:",
when: () => optionIsNotGiven(options, "branch")
},
{
type: "input",
default: DeployApi.appName,
name: "appName",
message:
"Enter the Captain app name this directory will be deployed to:",
when: () => optionIsNotGiven(options, "appName")
},
{
type: "confirm",
name: "confirmedToDeploy",
message:
"Note that uncommitted files and files in gitignore (if any) will not be pushed to server. Please confirm so that deployment process can start.",
default: true,
when: () => optionIsNotGiven(options, "stateless")
}
]
const answers = await inquirer.prompt(questions)
if (!answers.confirmedToDeploy && !options.stateless) {
printMessage("\nOperation cancelled by the user...\n")
process.exit(0)
}
const captainNameToDeploy = answers.captainNameToDeploy
const branchToPush = answers.branchToPush || options.branch
const appName = answers.appName || options.appName
DeployApi.updateMachineToDeploy(captainNameToDeploy || options.host)
DeployApi.setBranchToPush(branchToPush)
DeployApi.setAppName(appName)
printMessage(`Deploying to ${DeployApi.machineToDeploy.name}`)
// Normal deploy
if (answers.confirmedToDeploy) {
try {
const isValidAuthentication = await validateAuthentication()
if (isValidAuthentication) {
deployFromGitProject()
} else {
printError("Incorrect login details", true)
}
} catch (e) {
printError(e.message, true)
}
}
}
}
module.exports = deploy
app-cli/src/commands/deploy.ts
+200
View File
@@ -0,0 +1,200 @@
#!/usr/bin/env node
import MachineHelper from '../helpers/MachineHelper';
const inquirer = require('inquirer');
const DeployApi = require('../api/DeployApi');
const LoginApi = require('../api/LoginApi');
const { printError, printMessage } = require('../utils/messageHandler');
const {
validateIsGitRepository,
validateDefinitionFile,
optionIsNotGiven,
validateAuthentication
} = require('../utils/validationsHandler');
const { uploadFile } = require('../utils/fileHelper');
const { gitArchiveFile } = require('../utils/fileHelper');
const fs = require('fs-extra');
const path = require('path');
const commandExistsSync = require('command-exists').sync;
const { initMachineFromLocalStorage } = require('../utils/machineUtils');
async function deployAsDefaultValues() {
try {
const isValidAuthentication = await validateAuthentication();
if (isValidAuthentication) {
const { appName, branchToPush, machineToDeploy } = DeployApi;
if (!appName || !branchToPush || !machineToDeploy) {
printError('Default deploy failed. There are no default options selected.', true);
}
printMessage(`Deploying to ${machineToDeploy.name}`);
deployFromGitProject();
} else {
printError('Incorrect login details', true);
}
} catch (e) {
printError(e.message, true);
}
}
async function deployAsStateless(host: string, appName: string, branch: string, pass: string) {
const isStateless = host && appName && branch && pass;
if (isStateless) {
// login first
printMessage(`Trying to login to ${host}\n`);
const { name } = DeployApi.machineToDeploy;
const response = await LoginApi.loginMachine(host, pass);
const data = JSON.parse(response);
const newToken = data.token;
// Update the token to the machine that corresponds (if needed)
MachineHelper.updateMachineAuthToken(name, newToken);
if (data) {
printMessage(`Starting stateless deploy to\n${host}\n${branch}\n${appName}`);
deployFromGitProject();
}
} else {
printError('You are missing parameters for deploying on stateless. <host> <password> <app name> <branch>');
}
}
async function deployFromTarFile(tarFile: string) {
try {
const isValidAuthentication = await validateAuthentication();
if (isValidAuthentication) {
// Send from tar file
const filePath = tarFile;
const gitHash = 'sendviatarfile';
await uploadFile(filePath, gitHash);
} else {
printError('Incorrect login details', true);
}
} catch (e) {
printError(e.message, true);
}
}
function deployFromGitProject() {
if (!commandExistsSync('git')) {
printError("'git' command not found...");
printError("Captain needs 'git' to create tar file of your source files...", true);
}
const zipFileNameToDeploy = 'temporary-captain-to-deploy.tar';
const zipFileFullPath = path.join(process.cwd(), zipFileNameToDeploy);
printMessage(`Saving tar file to:\n${zipFileFullPath}\n`);
// Removes the temporarly file created
try {
const tempFileExists = fs.pathExistsSync(zipFileFullPath);
if (tempFileExists) {
fs.removeSync(zipFileFullPath);
}
} catch (e) {
// IgnoreError
}
gitArchiveFile(zipFileFullPath, DeployApi.branchToPush);
}
async function deploy(options: any) {
// Reads local storage and sets the machine if found
initMachineFromLocalStorage();
if (!options.tarFile || !options.stateless) {
validateIsGitRepository();
validateDefinitionFile();
}
printMessage('Preparing deployment to Captain...\n');
if (options.default) {
deployAsDefaultValues();
} else if (options.stateless) {
deployAsStateless(options.host, options.appName, options.branch, options.pass);
} else if (options.tarFile) {
deployFromTarFile(options.tarFile);
} else {
const questions = [
{
type: 'list',
name: 'captainNameToDeploy',
default: DeployApi.machineToDeploy.name || '',
message: 'Select the Captain Machine you want to deploy to:',
choices: MachineHelper.getMachinesAsOptions(),
when: () => optionIsNotGiven(options, 'host')
},
{
type: 'input',
default: DeployApi.branchToPush || 'master',
name: 'branchToPush',
message: "Enter the 'git' branch you would like to deploy:",
when: () => optionIsNotGiven(options, 'branch')
},
{
type: 'input',
default: DeployApi.appName,
name: 'appName',
message: 'Enter the Captain app name this directory will be deployed to:',
when: () => optionIsNotGiven(options, 'appName')
},
{
type: 'confirm',
name: 'confirmedToDeploy',
message:
'Note that uncommitted files and files in gitignore (if any) will not be pushed to server. Please confirm so that deployment process can start.',
default: true,
when: () => optionIsNotGiven(options, 'stateless')
}
];
const answers = await inquirer.prompt(questions);
if (!answers.confirmedToDeploy && !options.stateless) {
printMessage('\nOperation cancelled by the user...\n');
process.exit(0);
}
const captainNameToDeploy = answers.captainNameToDeploy;
const branchToPush = answers.branchToPush || options.branch;
const appName = answers.appName || options.appName;
DeployApi.updateMachineToDeploy(captainNameToDeploy || options.host);
DeployApi.setBranchToPush(branchToPush);
DeployApi.setAppName(appName);
printMessage(`Deploying to ${DeployApi.machineToDeploy.name}`);
// Normal deploy
if (answers.confirmedToDeploy) {
try {
const isValidAuthentication = await validateAuthentication();
if (isValidAuthentication) {
deployFromGitProject();
} else {
printError('Incorrect login details', true);
}
} catch (e) {
printError(e.message, true);
}
}
}
}
export = deploy;
app-cli/src/commands/list.js
-26
View File
@@ -1,26 +0,0 @@
#!/usr/bin/env node
const chalk = require("chalk")
const MachineHelper = require("../helpers/MachineHelper")
const { printMessage } = require("../utils/messageHandler")
function _displayMachine(machine) {
console.log(
">> " +
chalk.greenBright(machine.name) +
" at " +
chalk.cyan(machine.baseUrl)
)
}
function list() {
printMessage("\nLogged in Captain Machines:\n")
MachineHelper.machines.map(machine => {
_displayMachine(machine)
})
printMessage("")
}
module.exports = list
app-cli/src/commands/list.ts
+22
View File
@@ -0,0 +1,22 @@
#!/usr/bin/env node
const chalk = require('chalk');
import MachineHelper from '../helpers/MachineHelper';
import { IMachine } from '../models/IModels';
const { printMessage } = require('../utils/messageHandler');
function _displayMachine(machine: IMachine) {
console.log('>> ' + chalk.greenBright(machine.name) + ' at ' + chalk.cyan(machine.baseUrl));
}
function list() {
printMessage('\nLogged in Captain Machines:\n');
MachineHelper.getMachines().map((machine) => {
_displayMachine(machine);
});
printMessage('');
}
export = list;
app-cli/src/commands/login.js
-158
View File
@@ -1,158 +0,0 @@
#!/usr/bin/env node
const MachineHelper = require("../helpers/MachineHelper")
const {
printMessage,
printGreenMessage,
printError
} = require("../utils/messageHandler")
const inquirer = require("inquirer")
const DeployApi = require("../api/DeployApi")
const { cleanUpUrl, findDefaultCaptainName } = require("../utils/loginHelpers")
const { SAMPLE_DOMAIN } = require("../utils/constants")
const LoginApi = require("../api/LoginApi")
// In case the token is expired
async function requestLogin() {
const { baseUrl, name } = DeployApi.machineToDeploy
printMessage("Your auth token is not valid anymore. Try to login again.")
const questions = [
{
type: "password",
name: "captainPassword",
message: "Please enter your password for " + baseUrl,
validate: function(value) {
if (value && value.trim()) {
return true
}
return "Please enter your password for " + baseUrl
}
}
]
const loginPassword = await inquirer.prompt(questions)
const password = loginPassword.captainPassword
const response = await LoginApi.loginMachine(baseUrl, password)
const data = JSON.parse(response)
const newToken = data.token
if (!newToken) return false
// Update the token to the machine that corresponds
MachineHelper.updateMachineAuthToken(name, newToken)
return true
}
async function login() {
printMessage("Login to a Captain Machine")
const questions = [
{
type: "input",
default: SAMPLE_DOMAIN,
name: "captainAddress",
message:
"\nEnter address of the Captain machine. \nIt is captain.[your-captain-root-domain] :",
validate: value => {
if (value === SAMPLE_DOMAIN) {
return "Enter a valid URL"
}
if (!cleanUpUrl(value)) return "This is an invalid URL: " + value
MachineHelper.machines.map(machine => {
if (cleanUpUrl(machine.baseUrl) === cleanUpUrl(value)) {
return `${value} already exist as ${
machine.name
}. If you want to replace the existing entry, you have to first use <logout> command, and then re-login.`
}
})
if (value && value.trim()) {
return true
}
return "Please enter a valid address."
}
},
{
type: "confirm",
name: "captainHasRootSsl",
message: "Is HTTPS activated for this Captain machine?",
default: true
},
{
type: "password",
name: "captainPassword",
message: "Enter your password:",
validate: value => {
if (value && value.trim()) {
return true
}
return "Please enter your password."
}
},
{
type: "input",
name: "captainName",
message: "Enter a name for this Captain machine:",
default: findDefaultCaptainName(),
validate: value => {
MachineHelper.machines.map(machine => {
if (machine.name === value) {
return `${value} already exist. If you want to replace the existing entry, you have to first use <logout> command, and then re-login.`
}
})
if (value.match(/^[-\d\w]+$/i)) {
return true
}
return "Please enter a Captain Name."
}
}
]
const answers = await inquirer.prompt(questions)
const {
captainHasRootSsl,
captainPassword,
captainAddress,
captainName
} = answers
const handleHttp = captainHasRootSsl ? "https://" : "http://"
const baseUrl = `${handleHttp}${cleanUpUrl(captainAddress)}`
try {
const data = await LoginApi.loginMachine(baseUrl, captainPassword)
const response = JSON.parse(data)
// TODO - This status should be 200 maybe?
if (response.status !== 100) {
throw new Error(JSON.stringify(response, null, 2))
}
const newMachine = {
authToken: response.token,
baseUrl,
name: captainName
}
MachineHelper.addMachine(newMachine)
printGreenMessage(`Logged in successfully to ${baseUrl}`)
printGreenMessage(`Authorization token is now saved as ${captainName} \n`)
} catch (error) {
const errorMessage = error.message ? error.message : error
printError(
`Something bad happened. Cannot save "${captainName}" \n${errorMessage}`
)
}
}
module.exports = { login, requestLogin }
app-cli/src/commands/login.ts
+145
View File
@@ -0,0 +1,145 @@
#!/usr/bin/env node
import MachineHelper from '../helpers/MachineHelper';
const { printMessage, printGreenMessage, printError } = require('../utils/messageHandler');
const inquirer = require('inquirer');
const DeployApi = require('../api/DeployApi');
const { cleanUpUrl, findDefaultCaptainName } = require('../utils/loginHelpers');
const { SAMPLE_DOMAIN } = require('../utils/constants');
const LoginApi = require('../api/LoginApi');
// In case the token is expired
async function requestLogin() {
const { baseUrl, name } = DeployApi.machineToDeploy;
printMessage('Your auth token is not valid anymore. Try to login again.');
const questions = [
{
type: 'password',
name: 'captainPassword',
message: 'Please enter your password for ' + baseUrl,
validate: (value: string) => {
if (value && value.trim()) {
return true;
}
return 'Please enter your password for ' + baseUrl;
}
}
];
const loginPassword = await inquirer.prompt(questions);
const password = loginPassword.captainPassword;
const response = await LoginApi.loginMachine(baseUrl, password);
const data = JSON.parse(response);
const newToken = data.token;
if (!newToken) return false;
// Update the token to the machine that corresponds
MachineHelper.updateMachineAuthToken(name, newToken);
return true;
}
async function login() {
printMessage('Login to a Captain Machine');
const questions = [
{
type: 'input',
default: SAMPLE_DOMAIN,
name: 'captainAddress',
message: '\nEnter address of the Captain machine. \nIt is captain.[your-captain-root-domain] :',
validate: (value: string) => {
if (value === SAMPLE_DOMAIN) {
return 'Enter a valid URL';
}
if (!cleanUpUrl(value)) return 'This is an invalid URL: ' + value;
MachineHelper.getMachines().map((machine) => {
if (cleanUpUrl(machine.baseUrl) === cleanUpUrl(value)) {
return `${value} already exist as ${machine.name}. If you want to replace the existing entry, you have to first use <logout> command, and then re-login.`;
}
});
if (value && value.trim()) {
return true;
}
return 'Please enter a valid address.';
}
},
{
type: 'confirm',
name: 'captainHasRootSsl',
message: 'Is HTTPS activated for this Captain machine?',
default: true
},
{
type: 'password',
name: 'captainPassword',
message: 'Enter your password:',
validate: (value: string) => {
if (value && value.trim()) {
return true;
}
return 'Please enter your password.';
}
},
{
type: 'input',
name: 'captainName',
message: 'Enter a name for this Captain machine:',
default: findDefaultCaptainName(),
validate: (value: string) => {
MachineHelper.getMachines().map((machine) => {
if (machine.name === value) {
return `${value} already exist. If you want to replace the existing entry, you have to first use <logout> command, and then re-login.`;
}
});
if (value.match(/^[-\d\w]+$/i)) {
return true;
}
return 'Please enter a Captain Name.';
}
}
];
const answers = await inquirer.prompt(questions);
const { captainHasRootSsl, captainPassword, captainAddress, captainName } = answers;
const handleHttp = captainHasRootSsl ? 'https://' : 'http://';
const baseUrl = `${handleHttp}${cleanUpUrl(captainAddress)}`;
try {
const data = await LoginApi.loginMachine(baseUrl, captainPassword);
const response = JSON.parse(data);
// TODO - This status should be 200 maybe?
if (response.status !== 100) {
throw new Error(JSON.stringify(response, null, 2));
}
const newMachine = {
authToken: response.token,
baseUrl,
name: captainName
};
MachineHelper.addMachine(newMachine);
printGreenMessage(`Logged in successfully to ${baseUrl}`);
printGreenMessage(`Authorization token is now saved as ${captainName} \n`);
} catch (error) {
const errorMessage = error.message ? error.message : error;
printError(`Something bad happened. Cannot save "${captainName}" \n${errorMessage}`);
}
}
export = { login, requestLogin };
app-cli/src/commands/logout.js
-42
View File
@@ -1,42 +0,0 @@
#!/usr/bin/env node
const MachineHelper = require("../helpers/MachineHelper")
const { printMessage } = require("../utils/messageHandler")
const inquirer = require("inquirer")
function generateQuestions() {
const listOfMachines = MachineHelper.getMachinesAsOptions()
return [
{
type: "list",
name: "captainNameToLogout",
message: "Select the Captain Machine you want to logout from:",
choices: listOfMachines
},
{
type: "confirm",
name: "confirmedToLogout",
message: "Are you sure you want to logout from this Captain machine?",
default: false,
when: answers => answers.captainNameToLogout
}
]
}
async function logout() {
const questions = generateQuestions()
printMessage("Logout from a Captain Machine and clear auth info")
const answers = await inquirer.prompt(questions)
const { captainNameToLogout } = answers
if (!captainNameToLogout) {
printMessage("\nOperation cancelled by the user...\n", true)
}
MachineHelper.logoutMachine(captainNameToLogout)
}
module.exports = logout
app-cli/src/commands/logout.ts
+42
View File
@@ -0,0 +1,42 @@
#!/usr/bin/env node
const MachineHelper = require('../helpers/MachineHelper');
const { printMessage } = require('../utils/messageHandler');
const inquirer = require('inquirer');
function generateQuestions() {
const listOfMachines = MachineHelper.getMachinesAsOptions();
return [
{
type: 'list',
name: 'captainNameToLogout',
message: 'Select the Captain Machine you want to logout from:',
choices: listOfMachines
},
{
type: 'confirm',
name: 'confirmedToLogout',
message: 'Are you sure you want to logout from this Captain machine?',
default: false,
when: (answers: any) => answers.captainNameToLogout
}
];
}
async function logout() {
const questions = generateQuestions();
printMessage('Logout from a Captain Machine and clear auth info');
const answers = await inquirer.prompt(questions);
const { captainNameToLogout } = answers;
if (!captainNameToLogout) {
printMessage('\nOperation cancelled by the user...\n', true);
}
MachineHelper.logoutMachine(captainNameToLogout);
}
export = logout;
app-cli/src/commands/serversetup.js
-241
View File
@@ -1,241 +0,0 @@
#!/usr/bin/env node
const MachineHelper = require("../helpers/MachineHelper")
const SystemApi = require("../api/SystemApi")
const LoginApi = require("../api/LoginApi")
const inquirer = require("inquirer")
const { findDefaultCaptainName } = require("../utils/loginHelpers")
const { isIpAddress } = require("../utils/validationsHandler")
const { SAMPLE_IP, DEFAULT_PASSWORD } = require("../utils/constants")
const {
printMessage,
printError,
printMessageAndExit,
errorHandler
} = require("../utils/messageHandler")
let newPasswordFirstTry = undefined
const questions = [
{
type: "list",
name: "hasInstalledCaptain",
message:
"Have you already installed Captain on your server by running the following line:" +
"\nmkdir /captain && docker run -p 80:80 -p 443:443 -p 3000:3000 -v /var/run/docker.sock:/var/run/docker.sock dockersaturn/captainduckduck ?",
default: "Yes",
choices: ["Yes", "No"],
filter: value => {
const answerFromUser = value.trim()
if (answerFromUser === "Yes") return answerFromUser
printMessage(
"\n\nCannot start the setup process if Captain is not installed."
)
printMessageAndExit(
"Please read tutorial on CaptainDuckDuck.com to learn how to install CaptainDuckDuck on a server."
)
}
},
{
type: "input",
default: SAMPLE_IP,
name: "captainAddress",
message: "Enter IP address of your captain server:",
filter: async value => {
const ipFromUser = value.trim()
if (ipFromUser === SAMPLE_IP || !isIpAddress(ipFromUser)) {
printError(`\nThis is an invalid IP Address: ${ipFromUser}`, true)
}
try {
// login using captain42. and set the ipAddressToServer
const data = await LoginApi.loginMachine(
`http://${ipFromUser}:3000`,
DEFAULT_PASSWORD
)
SystemApi.setIpAddressOfServer(ipFromUser)
// All went well
if (data) return ipFromUser
} catch (e) {
errorHandler(e)
}
}
},
{
type: "password",
name: "captainOriginalPassword",
message: "Enter your current password:",
when: () => !LoginApi.token,
filter: async value => {
try {
const captainPasswordFromUser = value.trim()
const data = await LoginApi.loginMachine(
`http://${SystemApi.ipAddressOfServer}:3000`,
captainPasswordFromUser
)
if (data) {
SystemApi.setIpAddressOfServer(captainPasswordFromUser)
LoginApi.setOldPassword(captainPasswordFromUser)
}
} catch (e) {
errorHandler(e)
}
}
},
{
type: "input",
name: "captainRootDomain",
message:
"Enter a root domain for this Captain server. For example, enter test.yourdomain.com if you" +
" setup your DNS to point *.test.yourdomain.com to ip address of your server" +
": ",
filter: async value => {
try {
const captainRootDomainFromUser = value.trim()
const data = await SystemApi.setCustomDomain(
`http://${SystemApi.ipAddressOfServer}:3000`,
captainRootDomainFromUser
)
if (data) {
const newCustomDomainFromUser = `captain.${captainRootDomainFromUser}`
SystemApi.setCustomDomainFromUser(newCustomDomainFromUser)
return captainRootDomainFromUser
}
} catch (e) {
errorHandler(e)
}
}
},
{
type: "input",
name: "emailAddress",
message: "Enter your 'valid' email address to enable HTTPS: ",
filter: async value => {
try {
const emailAddressFromUser = value.trim()
const { customDomainFromUser } = SystemApi
await SystemApi.enableHttps(
`http://${customDomainFromUser}`,
emailAddressFromUser
)
const data = await SystemApi.forceHttps(
`https://${customDomainFromUser}`
)
if (data) return emailAddressFromUser
} catch (e) {
errorHandler(e)
}
}
},
{
type: "password",
name: "newPasswordFirstTry",
message: "Enter a new password:",
filter: value => {
newPasswordFirstTry = value
return value
}
},
{
type: "password",
name: "newPassword",
message: "Enter a new password:",
filter: async value => {
const { customDomainFromUser } = SystemApi
try {
const confirmPasswordValueFromUser = value
const machineUrl = `https://${customDomainFromUser}`
if (newPasswordFirstTry !== confirmPasswordValueFromUser) {
printError("Passwords do not match", true)
}
const changePassData = await LoginApi.changePass(
machineUrl,
confirmPasswordValueFromUser
)
if (changePassData) {
const loginData = await LoginApi.login(
machineUrl,
confirmPasswordValueFromUser
)
if (loginData) return
}
} catch (e) {
printError(
"\nIMPORTANT!! Server setup is completed by password is not changed."
)
printError("\nYou CANNOT use serversetup anymore. To continue:")
printError(
`\n- Go to https://${customDomainFromUser} login with default password and change the password in settings.`
)
printError(
`\n- In terminal (here), type captainduckduck login and enter this as your root domain: ${customDomainFromUser}`,
true
)
}
}
},
{
type: "input",
name: "captainName",
message: "Enter a name for this Captain machine:",
default: findDefaultCaptainName(),
validate: value => {
const newMachineName = value.trim()
MachineHelper.machines.map(
machine =>
machine.name === newMachineName &&
`${newMachineName} already exist. If you want to replace the existing entry, you have to first use <logout> command, and then re-login.`
)
if (value.match(/^[-\d\w]+$/i)) {
return true
}
return "Please enter a Captain Name."
}
}
]
async function serversetup() {
printMessage("\nSetup your Captain server\n")
const answers = await inquirer.prompt(questions)
const captainAddress = `https://${SystemApi.customDomainFromUser}`
const newMachine = {
authToken: LoginApi.token,
baseUrl: captainAddress,
name: answers.captainName
}
MachineHelper.addMachine(newMachine)
printMessage(`\n\nCaptain is available at ${captainAddress}`)
printMessage(
"\nFor more details and docs see http://www.captainduckduck.com\n\n"
)
}
module.exports = serversetup
app-cli/src/commands/serversetup.ts
+218
View File
@@ -0,0 +1,218 @@
#!/usr/bin/env node
import { isIpAddress } from '../utils/validationsHandler';
const SystemApi = require('../api/SystemApi');
const LoginApi = require('../api/LoginApi');
const inquirer = require('inquirer');
const { findDefaultCaptainName } = require('../utils/loginHelpers');
const { SAMPLE_IP, DEFAULT_PASSWORD } = require('../utils/constants');
const { printMessage, printError, printMessageAndExit, errorHandler } = require('../utils/messageHandler');
import MachineHelper from '../helpers/MachineHelper';
let newPasswordFirstTry: string | undefined = undefined;
const questions = [
{
type: 'list',
name: 'hasInstalledCaptain',
message:
'Have you already installed Captain on your server by running the following line:' +
'\nmkdir /captain && docker run -p 80:80 -p 443:443 -p 3000:3000 -v /var/run/docker.sock:/var/run/docker.sock dockersaturn/captainduckduck ?',
default: 'Yes',
choices: [ 'Yes', 'No' ],
filter: (value: string) => {
const answerFromUser = value.trim();
if (answerFromUser === 'Yes') return answerFromUser;
printMessage('\n\nCannot start the setup process if Captain is not installed.');
printMessageAndExit(
'Please read tutorial on CaptainDuckDuck.com to learn how to install CaptainDuckDuck on a server.'
);
}
},
{
type: 'input',
default: SAMPLE_IP,
name: 'captainAddress',
message: 'Enter IP address of your captain server:',
filter: async (value: string) => {
const ipFromUser = value.trim();
if (ipFromUser === SAMPLE_IP || !isIpAddress(ipFromUser)) {
printError(`\nThis is an invalid IP Address: ${ipFromUser}`, true);
}
try {
// login using captain42. and set the ipAddressToServer
const data = await LoginApi.loginMachine(`http://${ipFromUser}:3000`, DEFAULT_PASSWORD);
SystemApi.setIpAddressOfServer(ipFromUser);
// All went well
if (data) return ipFromUser;
} catch (e) {
errorHandler(e);
}
}
},
{
type: 'password',
name: 'captainOriginalPassword',
message: 'Enter your current password:',
when: () => !LoginApi.token,
filter: async (value: string) => {
try {
const captainPasswordFromUser = value.trim();
const data = await LoginApi.loginMachine(
`http://${SystemApi.ipAddressOfServer}:3000`,
captainPasswordFromUser
);
if (data) {
SystemApi.setIpAddressOfServer(captainPasswordFromUser);
LoginApi.setOldPassword(captainPasswordFromUser);
}
} catch (e) {
errorHandler(e);
}
}
},
{
type: 'input',
name: 'captainRootDomain',
message:
'Enter a root domain for this Captain server. For example, enter test.yourdomain.com if you' +
' setup your DNS to point *.test.yourdomain.com to ip address of your server' +
': ',
filter: async (value: string) => {
try {
const captainRootDomainFromUser = value.trim();
const data = await SystemApi.setCustomDomain(
`http://${SystemApi.ipAddressOfServer}:3000`,
captainRootDomainFromUser
);
if (data) {
const newCustomDomainFromUser = `captain.${captainRootDomainFromUser}`;
SystemApi.setCustomDomainFromUser(newCustomDomainFromUser);
return captainRootDomainFromUser;
}
} catch (e) {
errorHandler(e);
}
}
},
{
type: 'input',
name: 'emailAddress',
message: "Enter your 'valid' email address to enable HTTPS: ",
filter: async (value: string) => {
try {
const emailAddressFromUser = value.trim();
const { customDomainFromUser } = SystemApi;
await SystemApi.enableHttps(`http://${customDomainFromUser}`, emailAddressFromUser);
const data = await SystemApi.forceHttps(`https://${customDomainFromUser}`);
if (data) return emailAddressFromUser;
} catch (e) {
errorHandler(e);
}
}
},
{
type: 'password',
name: 'newPasswordFirstTry',
message: 'Enter a new password:',
filter: (value: string) => {
newPasswordFirstTry = value;
return value;
}
},
{
type: 'password',
name: 'newPassword',
message: 'Enter a new password:',
filter: async (value: string) => {
const { customDomainFromUser } = SystemApi;
try {
const confirmPasswordValueFromUser = value;
const machineUrl = `https://${customDomainFromUser}`;
if (newPasswordFirstTry !== confirmPasswordValueFromUser) {
printError('Passwords do not match', true);
}
const changePassData = await LoginApi.changePass(machineUrl, confirmPasswordValueFromUser);
if (changePassData) {
const loginData = await LoginApi.login(machineUrl, confirmPasswordValueFromUser);
if (loginData) return;
}
} catch (e) {
printError('\nIMPORTANT!! Server setup is completed by password is not changed.');
printError('\nYou CANNOT use serversetup anymore. To continue:');
printError(
`\n- Go to https://${customDomainFromUser} login with default password and change the password in settings.`
);
printError(
`\n- In terminal (here), type captainduckduck login and enter this as your root domain: ${customDomainFromUser}`,
true
);
}
}
},
{
type: 'input',
name: 'captainName',
message: 'Enter a name for this Captain machine:',
default: findDefaultCaptainName(),
validate: (value: string) => {
const newMachineName = value.trim();
MachineHelper.getMachines().map(
(machine) =>
machine.name === newMachineName &&
`${newMachineName} already exist. If you want to replace the existing entry, you have to first use <logout> command, and then re-login.`
);
if (value.match(/^[-\d\w]+$/i)) {
return true;
}
return 'Please enter a Captain Name.';
}
}
];
async function serversetup() {
printMessage('\nSetup your Captain server\n');
const answers = await inquirer.prompt(questions);
const captainAddress = `https://${SystemApi.customDomainFromUser}`;
const newMachine = {
authToken: LoginApi.token,
baseUrl: captainAddress,
name: answers.captainName
};
MachineHelper.addMachine(newMachine);
printMessage(`\n\nCaptain is available at ${captainAddress}`);
printMessage('\nFor more details and docs see http://www.captainduckduck.com\n\n');
}
export = serversetup;
app-cli/src/helpers/MachineHelper.ts
+7 -1
View File
@@ -35,6 +35,10 @@ class MachineHelper {
return [ ...firstItemInOption, ...listOfMachines ];
}
getMachines() {
return this.machines;
}
setMachines(newMachines: IMachine[]) {
this.machines = newMachines;
@@ -104,4 +108,6 @@ class MachineHelper {
}
}
module.exports = new MachineHelper();
const instance = new MachineHelper();
export default instance;
app-cli/src/utils/fileHelper.ts
+1 -2
View File
@@ -161,8 +161,7 @@ function deleteFileFromDisk(filePath: string) {
fs.removeSync(filePath);
}
}
module.exports = {
export = {
gitArchiveFile,
getFileStream,
uploadFile,
app-cli/src/utils/loginHelpers.ts
+4 -5
View File
@@ -1,6 +1,5 @@
import { IMachine } from '../models/IModels';
const MachineHelper = require('../helpers/MachineHelper');
import MachineHelper from '../helpers/MachineHelper';
function cleanUpUrl(url: string) {
if (!url || !url.length) return null;
@@ -17,7 +16,7 @@ function cleanUpUrl(url: string) {
}
function findDefaultCaptainName() {
let currentSuffix = MachineHelper.machines.length + 1;
let currentSuffix = MachineHelper.getMachines().length + 1;
while (!isSuffixValid(currentSuffix)) {
currentSuffix++;
@@ -33,11 +32,11 @@ function getCaptainFullName(suffix: number) {
}
const isSuffixValid = (suffixNumber: number) =>
MachineHelper.machines.map((machine: IMachine) => {
MachineHelper.getMachines().map((machine: IMachine) => {
machine.name !== getCaptainFullName(suffixNumber);
});
module.exports = {
export = {
cleanUpUrl,
findDefaultCaptainName,
isSuffixValid,
app-cli/src/utils/machineUtils.ts
+1 -1
View File
@@ -52,7 +52,7 @@ function saveMachineToLocalStorage() {
}
}
module.exports = {
export = {
initMachineFromLocalStorage,
saveMachineToLocalStorage
};
app-cli/src/utils/validationsHandler.ts
+5 -13
View File
@@ -4,7 +4,7 @@ const { printError } = require('./messageHandler');
const { requestLogin } = require('../commands/login');
const { initMachineFromLocalStorage } = require('../utils/machineUtils');
function validateIsGitRepository() {
export function validateIsGitRepository() {
const gitFolderExists = fs.pathExistsSync('./.git');
if (!gitFolderExists) {
@@ -15,7 +15,7 @@ function validateIsGitRepository() {
}
}
function validateDefinitionFile() {
export function validateDefinitionFile() {
const captainDefinitionExists = fs.pathExistsSync('./captain-definition');
if (!captainDefinitionExists) {
@@ -53,7 +53,7 @@ function validateDefinitionFile() {
}
// Only show that question if there is no option given as argument
function optionIsNotGiven(allOptions: { [id: string]: any }, option: string) {
export function optionIsNotGiven(allOptions: { [id: string]: any }, option: string) {
// console.log(allOptions)
if (allOptions[option]) {
return false;
@@ -62,7 +62,7 @@ function optionIsNotGiven(allOptions: { [id: string]: any }, option: string) {
return true;
}
function isIpAddress(ipaddress: string) {
export function isIpAddress(ipaddress: string) {
if (
/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(
ipaddress
@@ -74,7 +74,7 @@ function isIpAddress(ipaddress: string) {
return false;
}
async function validateAuthentication() {
export async function validateAuthentication() {
// 1. Check if valid auth
const isAuthenticated = await DeployApi.isAuthTokenValid();
@@ -92,11 +92,3 @@ async function validateAuthentication() {
return Boolean(isAuthenticated);
}
}
module.exports = {
validateAuthentication,
validateIsGitRepository,
validateDefinitionFile,
isIpAddress,
optionIsNotGiven
};