@maka/maka-cli 5.1.23 → 5.1.24

package/bundle/typescript/src/commands/profile.js

@@ -0,0 +1,277 @@
+import fs from 'fs';
+import path from 'path';
+import { format } from 'date-fns';
+import { exec } from 'child_process';
+// import Table from 'cli-table';
+import { Command } from '../command.js';
+import { Log } from '../tools/log/log.class.js';
+import { Actions } from '../tools/actions/actions.class.js';
+const profileCommandOptions = {
+    name: 'profile',
+    aliases: [],
+    usage: 'maka profile',
+    validOpts: [
+        { name: 'url', description: 'URL of the Meteor app' },
+        { name: 'port', description: 'Port of the Meteor app' },
+        { name: 'users', description: 'Number of concurrent users', regex: /^\d+$/ },
+        { name: 'duration', description: 'Duration of the test in seconds', regex: /^\d+$/ },
+    ],
+    mustBeInMakaProject: true,
+    shortDesc: 'Profile a Meteor app for performance',
+    description: 'Run a performance test on a Meteor app with specified concurrent users and duration',
+    examples: [
+        'maka profile --url http://localhost:3000 --users 1000 --duration 60',
+    ],
+    experimental: true
+};
+function extractRoutePaths(routesFileContent) {
+    const routePattern = /<Route path="([^"]+)"/g;
+    const paths = [];
+    let match;
+    while ((match = routePattern.exec(routesFileContent)) !== null) {
+        if (match[1] !== "*") {
+            paths.push({ method: 'get', path: match[1] });
+        }
+    }
+    return paths;
+}
+function extractApiRoutes(apiDirectoryPath) {
+    const apiRoutes = [];
+    function exploreDirectory(directoryPath) {
+        const entries = fs.readdirSync(directoryPath, { withFileTypes: true });
+        for (const entry of entries) {
+            const fullPath = path.join(directoryPath, entry.name);
+            if (entry.isDirectory()) {
+                exploreDirectory(fullPath);
+            }
+            else if (entry.isFile()) {
+                const fileContent = fs.readFileSync(fullPath, 'utf8');
+                const routePattern = /addRoute\('([^']+)'.*?{[\s\S]*?(\bget\b|\bpost\b|\bput\b|\bdelete\b)/g;
+                let match;
+                while ((match = routePattern.exec(fileContent)) !== null) {
+                    const routePath = match[1];
+                    const httpMethod = match[2].trim().toLowerCase();
+                    const relativePath = fullPath.substring(apiDirectoryPath.length).replace(/\\/g, '/');
+                    const fullRoute = path.dirname(relativePath) + '/' + routePath;
+                    apiRoutes.push({
+                        method: httpMethod,
+                        path: '/api' + fullRoute
+                    });
+                }
+            }
+        }
+    }
+    exploreDirectory(apiDirectoryPath);
+    return apiRoutes;
+}
+function createArtilleryConfig(url, users, duration, routes, perEndpoint) {
+    const scenarios = routes.map(route => ({
+        flow: [{ [route.method]: { url: `${url}${route.path}` } }]
+    }));
+    const config = {
+        config: {
+            target: url,
+            phases: [{ duration: duration, arrivalRate: Math.round(users / duration) }]
+        },
+        scenarios: scenarios
+    };
+    if (perEndpoint) {
+        config.config.plugins = { 'metrics-by-endpoint': {} };
+    }
+    return JSON.stringify(config, null, 2); // Serialize the configuration to JSON
+}
+// function formatPerformanceResults(results: string): string {
+//   const lines = results.split('\n');
+//   const endpointMetrics: Record<string, IEndpointMetrics> = {};
+//
+//   lines.forEach(line => {
+//     if (line.includes('plugins.metrics-by-endpoint')) {
+//       const endpointMatch = /plugins\.metrics-by-endpoint\.(.+?)\./.exec(line);
+//       const metricMatch = /codes\.(\d+):\s+(\d+)|response_time\.(.+?):\s+([\d\.]+)/.exec(line);
+//
+//       if (endpointMatch && metricMatch) {
+//         const endpoint = endpointMatch[1];
+//         if (!endpointMetrics[endpoint]) {
+//           endpointMetrics[endpoint] = {
+//             endpoint,
+//             codes: {},
+//             responseTimes: { min: null, max: null, mean: null, median: null, p95: null, p99: null }
+//           };
+//         }
+//
+//         if (metricMatch[1]) {
+//           // Status code metrics
+//           endpointMetrics[endpoint].codes[metricMatch[1]] = parseInt(metricMatch[2], 10);
+//         } else {
+//           // Response time metrics
+//           endpointMetrics[endpoint].responseTimes[metricMatch[3] as keyof IEndpointMetrics['responseTimes']] = parseFloat(metricMatch[4]);
+//         }
+//       }
+//     }
+//   });
+//
+//   const table = new Table({
+//     head: ['Endpoint', 'Status Codes', 'Min Time', 'Max Time', 'Mean Time', 'Median Time', '95th Percentile', '99th Percentile'],
+//     colWidths: [30, 20, 10, 10, 10, 10, 15, 15]
+//   });
+//
+//   Object.values(endpointMetrics).forEach(metric => {
+//     const responseTimes = metric.responseTimes;
+//     table.push([
+//       metric.endpoint,
+//       JSON.stringify(metric.codes),
+//       responseTimes.min?.toFixed(2) || 'N/A',
+//       responseTimes.max?.toFixed(2) || 'N/A',
+//       responseTimes.mean?.toFixed(2) || 'N/A',
+//       responseTimes.median?.toFixed(2) || 'N/A',
+//       responseTimes.p95?.toFixed(2) || 'N/A',
+//       responseTimes.p99?.toFixed(2) || 'N/A'
+//     ]);
+//   });
+//
+//   return `Performance Test Summary:\n${table.toString()}`;
+// }
+function parseArtilleryResultsToJson(filePath) {
+    const content = fs.readFileSync(filePath, 'utf8');
+    const lines = content.split('\n');
+    const endpointMetrics = {};
+    lines.forEach(line => {
+        let match;
+        // Status code pattern
+        match = line.match(/plugins\.metrics-by-endpoint\.(.+)\.codes\.(\d+):\s*(\d+)/);
+        if (match) {
+            const endpoint = match[1];
+            const statusCode = match[2];
+            const count = parseInt(match[3], 10);
+            if (!endpointMetrics[endpoint]) {
+                endpointMetrics[endpoint] = {
+                    codes: {},
+                    responseTimes: { min: null, max: null, mean: null, median: null, p95: null, p99: null }
+                };
+            }
+            endpointMetrics[endpoint].codes[statusCode] = count;
+        }
+        // Response time pattern
+        match = line.match(/plugins\.metrics-by-endpoint\.(.+)\.response_time\.(min|max|mean|median|p95|p99):\s*(\d+(\.\d+)?)/);
+        if (match) {
+            const endpoint = match[1];
+            const metric = match[2];
+            const value = parseFloat(match[3]);
+            if (!endpointMetrics[endpoint]) {
+                endpointMetrics[endpoint] = {
+                    codes: {},
+                    responseTimes: { min: null, max: null, mean: null, median: null, p95: null, p99: null }
+                };
+            }
+            endpointMetrics[endpoint].responseTimes[metric] = value;
+        }
+    });
+    return endpointMetrics;
+}
+async function runPerformanceTest(configFilePath, resultsFilePath) {
+    // Ensure the directory for the results file exists
+    const resultsDir = path.dirname(resultsFilePath);
+    if (!fs.existsSync(resultsDir)) {
+        fs.mkdirSync(resultsDir, { recursive: true });
+    }
+    const spinHandle = Log.withSpinner();
+    return new Promise((resolve, reject) => {
+        spinHandle.start('Running performance test');
+        exec(`npx artillery run ${configFilePath} > ${resultsFilePath}`, async (error, stdout, stderr) => {
+            if (error) {
+                spinHandle.failure();
+                reject(`Execution error: ${error}`);
+                return;
+            }
+            if (stderr) {
+                spinHandle.failure();
+                reject(`Error: ${stderr}`);
+                return;
+            }
+            try {
+                const resultsJson = parseArtilleryResultsToJson(resultsFilePath);
+                console.log(JSON.stringify(resultsJson, null, 2));
+                // Read the results file and format the contents
+                //const results = fs.readFileSync(resultsFilePath, 'utf8');
+                // const formattedResults = formatPerformanceResults(results);
+                // Log.notice(formattedResults);
+                Log.notice(`Test results saved to ${resultsFilePath}`);
+            }
+            catch (readError) {
+                Log.error(`Error reading results file: ${readError}`);
+            }
+            spinHandle.success('\n');
+            resolve();
+        });
+    });
+}
+Command.create(profileCommandOptions, async function (args, opts) {
+    try {
+        // Set default URL to localhost (0.0.0.0) and prompt for port if not provided
+        let port = opts.port;
+        if (!port && !opts.url) {
+            port = await Actions.ask('Enter the port of the Meteor app [3000]:') || '3000';
+        }
+        opts.url = (opts.url) ? opts.url : `http://0.0.0.0:${port}`;
+        // Check and prompt for duration if not provided
+        if (!opts.duration) {
+            const durationInput = await Actions.ask('Enter the duration for the test in seconds:');
+            opts.duration = parseInt(durationInput);
+            if (isNaN(opts.duration)) {
+                throw new Error('Invalid duration. Please enter a numeric value.');
+            }
+        }
+        // Check and prompt for users if not provided
+        if (!opts.users) {
+            const usersInput = await Actions.ask('Enter the number of users (arrival rate per second):');
+            opts.users = parseInt(usersInput);
+            if (isNaN(opts.users)) {
+                throw new Error('Invalid number of users. Please enter a numeric value.');
+            }
+        }
+        const projectPath = this.fsi.findProjectDirectory();
+        const projectConfig = this.cfg.getMakaProjectConfig();
+        const isSsr = projectConfig.engines.ssr === 'meteor';
+        const jsEngine = projectConfig.engines.js;
+        const routesPath = (isSsr) ? `/imports/startup/lib` : '/imports/startup/client';
+        const pathToRoutesFile = this.scaffold.pathFromApp({
+            pathParts: [routesPath, '', `routes.${jsEngine}`]
+        });
+        // Read the routes file and extract route paths
+        const routesFileContent = fs.readFileSync(pathToRoutesFile, 'utf8');
+        const appRoutePaths = extractRoutePaths(routesFileContent);
+        // Attempt to extract API routes
+        let apiRoutePaths = [];
+        try {
+            const apiDirectoryPath = this.scaffold.pathFromApp({
+                pathParts: ['imports', 'api']
+            });
+            apiRoutePaths = extractApiRoutes(apiDirectoryPath);
+        }
+        catch (error) {
+            Log.warn('No API routes detected. Proceeding without profiling API routes.');
+        }
+        // Combine application and API routes
+        const combinedRoutePaths = [...appRoutePaths, ...apiRoutePaths];
+        // I'd like this to always be enabled.
+        const perEndpoint = true;
+        const config = createArtilleryConfig(opts.url, opts.users, opts.duration, combinedRoutePaths, perEndpoint);
+        // Call the profile handler with the path to the created config file
+        const dateStr = format(new Date(), 'yyyy-MM-dd_HH-mm-ss');
+        const resultsDir = path.join(projectPath, 'profile-tests', 'results');
+        const configFilePath = path.join(projectPath, 'profile-tests', 'artilleryConfig.yml');
+        const resultsFilePath = path.join(resultsDir, `results_${dateStr}.txt`);
+        // Use FSI's createFile to save the configuration
+        await this.fsi.createFile({
+            filePath: configFilePath,
+            data: config,
+            opts: { force: true } // Overwrite if exists
+        });
+        await runPerformanceTest(configFilePath, resultsFilePath);
+    }
+    catch (e) {
+        Log.error(e);
+        process.exit(1);
+    }
+});
+//# sourceMappingURL=profile.js.map

package/bundle/typescript/src/commands/profile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../../../src/commands/profile.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/proxy.d.ts

@@ -0,0 +1 @@
+export {};

package/bundle/typescript/src/commands/proxy.js

@@ -0,0 +1,163 @@
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { execSync } from 'child_process';
+import httpProxy from 'http-proxy';
+import { Command } from '../command.js';
+import { Log } from '../tools/log/log.class.js';
+import { UsageError } from '../error.js';
+import { SSL } from '../tools/ssl/ssl.class.js';
+import { Actions } from '../tools/actions/actions.class.js';
+import MakaGen from '../generators/maka.gen.js';
+Command.create({
+    name: 'proxy',
+    usage: 'maka proxy',
+    mustBeInMakaProject: true,
+    validOpts: ['help', 'targetPort', 'listenPort', 'targetHost'],
+    maxArgLength: 1,
+    shortDesc: 'Proxy HTTPS requests to another Server',
+    description: `
+  If you're running your Meteor service, and need to stand up an SSL
+  Proxy, this command will automatically create a key pair for use in an HTTPS
+  proxy.
+
+  For example, you're running http://localhost:3000 with "maka run" then open a new
+  terminal and run "maka proxy" to standup https://localhost:3443.
+  Then open your browser to that URL (you may need to trust the certificates
+  because they are self-signed) and you'll have an SSL connection to your
+  http://localhost:3000.
+
+  To avoid possibly overwriting PKI files in higher environments, "maka proxy"
+  will try to only generate / store PKI keys in the development environment.
+  `,
+    examples: [
+        'maka proxy',
+        'maka proxy --target-port 3000 --listen-port 4000',
+        'maka proxy --target-host http://192.168.1.20'
+    ]
+}, async function (args, opts) {
+    const config = this.cfg.getMakaProjectConfig();
+    const env = 'local';
+    const configPath = this.cfg.getAppConfigPath(env);
+    const keyDir = this.fsi.mkKeysDir({ configPath });
+    const targetPort = (opts.targetPort) ? Number(opts.targetPort) : 3000;
+    const listenPort = (opts.listenPort) ? Number(opts.listenPort) : 3443;
+    const targetHost = (opts.targetHost) ? opts.targetHost : '0.0.0.0';
+    const keyPath = path.join(keyDir, config.appName + '.key');
+    const certPath = path.join(keyDir, config.appName + '.crt');
+    if (!this.fsi.isFile(keyPath) || !this.fsi.isFile(certPath)) {
+        await MakaGen.processAndRunGenerator('service:sslconfig', [], { env });
+        SSL.genCSR({ keyName: config.appName + '.key', csrName: config.appName + '.csr', cwd: keyDir, useConfig: true });
+        // log out if the file was created correctly
+        if (this.fsi.isFile(path.join(keyDir, config.appName + '.csr'))) {
+            Log.info(`CSR file created: ${path.join(keyDir, config.appName + '.csr')}`);
+        }
+        SSL.genSSC({ keyName: config.appName + '.key', crtName: config.appName + '.crt', cwd: keyDir, useConfig: true });
+        // log out if the file was created correctly
+        if (this.fsi.isFile(path.join(keyDir, config.appName + '.crt'))) {
+            Log.info(`SSC file created: ${path.join(keyDir, config.appName + '.crt')}`);
+        }
+        Log.info(`Key file created: ${keyPath}`);
+        const shouldTrust = await Actions.confirm(`Would you like to add this certificate to your system trust store?`, false);
+        if (shouldTrust) {
+            const platform = os.platform();
+            try {
+                if (platform === 'darwin') {
+                    // macOS - use security command
+                    execSync(`sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain "${certPath}"`, { stdio: 'inherit' });
+                    Log.success('Certificate added to macOS system trust store.');
+                }
+                else if (platform === 'win32') {
+                    // Windows - use certutil (requires admin)
+                    execSync(`certutil -addstore -f "Root" "${certPath}"`, { stdio: 'inherit' });
+                    Log.success('Certificate added to Windows trusted root certification authorities.');
+                }
+                else {
+                    Log.warn(`Auto-trusting the certificate is not yet supported on ${platform}.`);
+                }
+            }
+            catch (err) {
+                Log.error(`Failed to add certificate to trust store: ${err.message}`);
+            }
+        }
+    }
+    if (targetPort === listenPort) {
+        Log.error(`Target and Listen ports cannot be the same.`);
+        throw new UsageError();
+    }
+    const options = {
+        ssl: {
+            key: fs.readFileSync(keyPath, 'utf8'),
+            cert: fs.readFileSync(certPath, 'utf8'),
+            // Uncomment the below line if you decide to use a custom CA
+            // ca: fs.readFileSync(path.join(configPath, '_keys', config.appName + '.crt'), 'utf8')
+        },
+        target: {
+            host: targetHost,
+            port: Number(targetPort)
+        },
+        ws: true,
+        xfwd: true
+    };
+    const proxy = httpProxy.createProxyServer(options);
+    proxy.on('error', (error, req, res) => {
+        if ('writeHead' in res) { // Type guard
+            Log.error(`Proxy error: ${error.message}`);
+            if (!res.headersSent) {
+                res.writeHead(500, { 'content-type': 'text/plain' });
+                res.end('Internal server error.');
+            }
+        }
+    });
+    proxy.on('proxyRes', (proxyRes, req) => {
+        const timestamp = new Date().toISOString();
+        const method = req.method;
+        const url = req.url;
+        const host = req.headers.host;
+        const statusCode = proxyRes.statusCode;
+        const statusMessage = proxyRes.statusMessage;
+        Log.warn(`[${timestamp}] => ${method} ${url} from ${host} responded with ${statusCode} ${statusMessage}`);
+    });
+    proxy.on('proxyReq', (proxyReq) => {
+        const timestamp = new Date().toISOString();
+        const method = proxyReq.method;
+        const url = proxyReq.path;
+        const host = proxyReq.getHeader('host');
+        Log.info(`[${timestamp}] <= Sending ${method} request to ${url} on ${host}`);
+    });
+    // Log when a WebSocket request is received
+    proxy.on('proxyReqWs', (proxyReq, req) => {
+        const timestamp = new Date().toISOString();
+        const method = req.method;
+        const url = req.url;
+        const host = req.headers.host;
+        Log.success(`[${timestamp}] WS ${method} ${url} from ${host} - Starting WebSocket handshake`);
+    });
+    // Log when the WebSocket tunnel is established
+    proxy.on('open', () => {
+        const timestamp = new Date().toISOString();
+        Log.success(`[${timestamp}] WebSocket connection established`);
+    });
+    // This is optional but useful: log when the WebSocket connection is closed
+    proxy.on('close', () => {
+        const timestamp = new Date().toISOString();
+        Log.error(`[${timestamp}] WebSocket connection closed`);
+    });
+    proxy.listen(Number(listenPort));
+    Log.bright(`=> SSL Proxy forwarding ${listenPort} to ${targetPort}`);
+    const SHUTDOWN_TIMEOUT = 2000; // 2 seconds
+    process.on('SIGINT', () => {
+        const handler = Log.withSpinner();
+        handler.start('Shutting down proxy server...');
+        const shutdownTimer = setTimeout(() => {
+            handler.success();
+            process.exit(1);
+        }, SHUTDOWN_TIMEOUT);
+        proxy.close(() => {
+            clearTimeout(shutdownTimer);
+            Log.info('Proxy server closed.');
+            process.exit(0);
+        });
+    });
+});
+//# sourceMappingURL=proxy.js.map

package/bundle/typescript/src/commands/proxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/commands/proxy.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/reconfig.d.ts

@@ -0,0 +1 @@
+export {};

package/bundle/typescript/src/commands/reconfig.js

@@ -0,0 +1,69 @@
+import fs from 'fs';
+import path from 'path';
+import { Command } from '../command.js';
+import { Log } from '../tools/log/log.class.js';
+import { SSH } from '../tools/ssh/ssh.class.js';
+Command.create({
+    name: 'reconfigure',
+    aliases: ['reconfig'],
+    validOpts: [''],
+    requiredOpts: ['env'],
+    mustBeInMakaProject: true,
+    usage: 'maka reconfig',
+    shortDesc: 'Reconfigure your deployed applications w/o rebuild or redploy',
+    description: `
+  If using a remote server (Ubuntu), send up the settings.json
+  and pm2.config.js files and reloads the PM2 service.
+
+  This does not restart the nginx server and is much faster than deploying
+  a new build.
+  `,
+    examples: [
+        'maka reconfig --env prod',
+    ]
+}, async function (args, opts) {
+    try {
+        const env = this.cfg.getEnvFromShorthand(opts.env);
+        const envConfigPath = this.cfg.getAppConfigPath(env);
+        const sshConfigPath = path.join(envConfigPath, 'ssh.json');
+        const sshConfigFile = fs.readFileSync(sshConfigPath).toString();
+        const sshConfig = JSON.parse(sshConfigFile);
+        Object.assign(sshConfig, { env: envConfigPath });
+        Log.notice(`Checking remote host availability`);
+        const resp = SSH.ping('uname -a', sshConfig);
+        if (!resp)
+            throw 'Could not connect to remote host. Please check your ssh.json config file.';
+        if (resp)
+            Log.success('Remote host connection successful');
+        const sesConfig = path.join(envConfigPath, '_keys', 'ses.json');
+        if (fs.existsSync(sesConfig)) {
+            const sesConfigSCP = { source: sesConfig, dest: '~/ses.json', verbose: true };
+            SSH.scp(sesConfigSCP, { ...sshConfig });
+        }
+        const pm2ConfPath = path.join(envConfigPath, 'pm2.config.js');
+        SSH.scp({
+            source: pm2ConfPath,
+            dest: '~/pm2.config.js',
+            verbose: true
+        }, {
+            ...sshConfig
+        });
+        const settingsPath = path.join(envConfigPath, 'settings.json');
+        SSH.scp({
+            source: settingsPath,
+            dest: '~/settings.json',
+            verbose: true
+        }, {
+            ...sshConfig
+        });
+        SSH.sshSync('pm2 delete all', sshConfig);
+        await SSH.ssh('echo "" && pm2 start pm2.config.js && echo "" || echo "Cound not find PM2, have you deployed the app yet?"', {
+            ...sshConfig
+        }, { verbose: true });
+    }
+    catch (e) {
+        console.error(e);
+        process.exit(0);
+    }
+});
+//# sourceMappingURL=reconfig.js.map

package/bundle/typescript/src/commands/reconfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reconfig.js","sourceRoot":"","sources":["../../../../src/commands/reconfig.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/register.d.ts

@@ -0,0 +1 @@
+export {};

package/bundle/typescript/src/commands/register.js

@@ -0,0 +1,101 @@
+import { Command } from '../command.js';
+import { Log } from '../tools/log/log.class.js';
+import { Actions } from '../tools/actions/actions.class.js';
+import { HTTPS } from '../tools/https/https.class.js';
+import MakaCmd from './maka.cmd.js';
+function validateEmail(email) {
+    const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    return re.test(String(email).toLowerCase());
+}
+const hostname = process.env.MAKA_DEV === 'True' ? 'localhost' : 'www.maka-cli.com';
+Command.create({
+    name: 'register',
+    validOpts: ['help', 'cacert'],
+    usage: 'maka register',
+    maxArgLength: 3,
+    disableAuthCheck: true,
+    shortDesc: 'Registers a new user on www.maka-cli.com',
+    examples: [
+        'maka register',
+    ]
+}, async function (args, opts) {
+    const spinHandle = Log.withSpinner();
+    try {
+        let caCertPath = '';
+        if (opts.cacert) {
+            if (this.fsi.isFile(opts.cacert)) {
+                caCertPath = opts.cacert;
+                Log.notice(`Using CA Cert ${caCertPath}`);
+            }
+            else {
+                Log.error(`CA Cert file could not be found at ${caCertPath}`);
+            }
+        }
+        const globalConfig = await this.cfg.getGlobalConfig();
+        if (globalConfig.cert) {
+            if (this.fsi.isFile(globalConfig.cert)) {
+                caCertPath = globalConfig.cert;
+            }
+            else {
+                Log.error(`CA Cert is configured in ~/.maka/global-config.json, but cert file cannot be located ${caCertPath}`);
+                return;
+            }
+        }
+        // Preflight check
+        Log.header(`Securing connection to https://${hostname}`);
+        const preflightGet = { url: `https://${hostname}/api/v1/status` };
+        if (opts.cacert) {
+            Object.assign(preflightGet, { cert: caCertPath });
+        }
+        spinHandle.start('Preflight Check');
+        const { statusCode: preflightSC } = await HTTPS.get(preflightGet);
+        if (preflightSC === 408) {
+            spinHandle.failure();
+            throw 'Could not make a secure connection.\nPlease ensure you are able to access https://www.maka-cli.com';
+        }
+        if (preflightSC !== 200) {
+            spinHandle.failure();
+            throw `https://${hostname} seems to be having a problem.  Please report a bug at: https://github.com/maka-io/maka-cli`;
+        }
+        spinHandle.success();
+        const email = await Actions.ask('Email:');
+        if (!validateEmail(email)) {
+            Log.error('Invalid email address');
+            process.exit(1);
+        }
+        const password = await Actions.ask('Password: ', true);
+        const passwordConfirm = await Actions.ask('Confirm Password: ', true);
+        if (password !== passwordConfirm) {
+            Log.error('Passwords do not match');
+            process.exit(1);
+        }
+        const postRegisterBody = {
+            hostname,
+            path: '/api/v1/register',
+            data: {
+                email,
+                password,
+            }
+        };
+        if (opts.cacert) {
+            Object.assign(postRegisterBody, { cert: caCertPath });
+        }
+        spinHandle.start('Registering');
+        const { statusCode: registerSC, data: registerBody } = await HTTPS.post(postRegisterBody);
+        if (registerSC !== 200) {
+            spinHandle.failure();
+            throw JSON.parse(registerBody);
+        }
+        spinHandle.success();
+        Log.notice('Registration successful');
+        MakaCmd.processAndRunCommand('login', [], { email, password });
+    }
+    catch (err) {
+        if (err === 'Too many requests') {
+            Log.majestic('Bruv... Too many requests, register slower...');
+        }
+        Log.error(err.message);
+        process.exit(1);
+    }
+});
+//# sourceMappingURL=register.js.map