@zerothreatai/cli 6.0.4 → 6.0.6

package/dist/src/actions/license-service.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstIgnition = firstIgnition;
 exports.licenseDeactivate = licenseDeactivate;
+exports.updateSystemService = updateSystemService;
 const get_mac_1 = require("../utils/get-mac");
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
@@ -51,7 +52,7 @@ async function pullImages() {
 }
 async function runCompose(args) {
     return new Promise((resolve, reject) => {
-        const child = (0, child_process_1.spawn)("docker", ["compose", "-f", COMPOSE_FILE, "-p", PROJECT, ...args], {
+        const child = (0, child_process_1.spawn)("docker", ["compose", "--profile", "tools", "-f", COMPOSE_FILE, "-p", PROJECT, ...args], {
             stdio: "inherit",
         });
         child.on("close", code => (code === 0 ? resolve() : reject(new Error("compose failed"))));
@@ -91,12 +92,14 @@ async function firstIgnition(licenseKey, emailId) {
         await ensureNetwork();
         await pullImages();
         await runCompose(["up", "-d"]);
-        //sleep for 30 seconds to allow sql server to start
-        console.log("Waiting for SQL Server to start...");
+        //Wait for 10 minutes to allow sql server to start
+        const sqlContainerWaitSpinner = (0, ora_1.default)('Waiting for SQL Server to start...').start();
         const SqlSuccess = await checkSqlSuccess();
         if (!SqlSuccess) {
-            throw new Error("Unable to complete database setup. Please try again later.");
+            sqlContainerWaitSpinner.fail("Unable to complete database setup.");
+            throw new Error("Please try again later.");
         }
+        sqlContainerWaitSpinner.succeed("connected to database.");
     }
     catch (error) {
         if (spinner.isSpinning)
@@ -104,9 +107,16 @@ async function firstIgnition(licenseKey, emailId) {
         throw error;
     }
     finally {
+        COMPOSE_FILE = "";
+        auth = {
+            username: "",
+            password: "",
+            serveraddress: "",
+        };
         if (app_constants_1.dockerComposeAcr) {
             const tempDir = path_1.default.dirname(app_constants_1.dockerComposeAcr);
             fs_1.default.rmSync(tempDir, { recursive: true, force: true });
+            (0, app_constants_1.setDockerComposeAcr)('');
         }
     }
     return token;
@@ -155,3 +165,48 @@ async function licenseDeactivate() {
         console.log(chalk_1.default.redBright(`DeactivateLicense error: ${err.message}`));
     }
 }
+async function updateSystemService() {
+    const licenseApi = new license_api_service_1.default();
+    const spinner = (0, ora_1.default)('Verifying your subscription…').start();
+    try {
+        // Fetch update from compose file
+        await licenseApi.getSystemUpdate();
+        // verify system and get update token (acr token)
+        const dockerAuth = await licenseApi.verifySystemForUpdate(app_constants_1.fingerPrint);
+        spinner.succeed('Subscription verified.');
+        auth = dockerAuth;
+        if (app_constants_1.dockerComposeAcr) {
+            COMPOSE_FILE = app_constants_1.dockerComposeAcr;
+        }
+        console.log(">> Setting up application ...");
+        await ensureNetwork();
+        await pullImages();
+        await runCompose(["up", "-d"]);
+        //Wait for 10 minutes to allow sql server to start
+        const sqlContainerWaitSpinner = (0, ora_1.default)('Waiting for SQL Server to start...').start();
+        const SqlSuccess = await checkSqlSuccess();
+        if (!SqlSuccess) {
+            sqlContainerWaitSpinner.fail("Unable to complete database setup.");
+            throw new Error("Unable to complete database setup. Please try again later.");
+        }
+        sqlContainerWaitSpinner.succeed("connected to database.");
+    }
+    catch (error) {
+        if (spinner.isSpinning)
+            spinner.fail(chalk_1.default.red('Verification failed. Please check your details.'));
+        throw error;
+    }
+    finally {
+        COMPOSE_FILE = "";
+        auth = {
+            username: "",
+            password: "",
+            serveraddress: "",
+        };
+        if (app_constants_1.dockerComposeAcr) {
+            const tempDir = path_1.default.dirname(app_constants_1.dockerComposeAcr);
+            fs_1.default.rmSync(tempDir, { recursive: true, force: true });
+            (0, app_constants_1.setDockerComposeAcr)('');
+        }
+    }
+}

package/dist/src/commands/restart-service.js

@@ -40,7 +40,7 @@ async function cleanupContainersFromCompose(composeFilePath) {
 async function runCompose() {
     await cleanupContainersFromCompose(app_constants_1.dockerComposeAcr);
     return new Promise((resolve, reject) => {
-        const child = (0, child_process_2.spawn)("docker", ["compose", "-f", app_constants_1.dockerComposeAcr, "up", "-d"], {
+        const child = (0, child_process_2.spawn)("docker", ["compose", "-f", app_constants_1.dockerComposeAcr, "-p", PROJECT, "up", "-d"], {
             stdio: ["ignore", "ignore", "pipe"],
         });
         child.on("close", code => (code === 0 ? resolve() : reject(new Error("compose failed"))));
@@ -98,23 +98,30 @@ async function restartService() {
         return;
     }
     // Up the docker images
+    const TIMEOUT_MS = 2 * 60 * 1000;
+    const containerTimeout = setTimeout(() => {
+        throw new Error('TIMEOUT: Taking more time to restart, Please try again later');
+    }, TIMEOUT_MS);
     try {
-        const TIMEOUT_MS = 2 * 60 * 1000;
-        const containerTimeout = setTimeout(() => {
-            throw new Error('TIMEOUT: Taking more time to restart, Please try again later');
-        }, TIMEOUT_MS);
         dockerUpSpinner.start();
         await runCompose();
-        clearTimeout(containerTimeout);
         dockerUpSpinner.succeed('Containers are up and running. 🐳🚀');
         console.log(chalk_1.default.gray('➤ You can now continue using ZeroThreat on this url : '));
         console.log(chalk_1.default.bold.blue('http://localhost:3203'));
     }
     catch (error) {
         if (dockerUpSpinner.isSpinning)
-            dockerUpSpinner.fail(chalk_1.default.red('Container spin-up failed. 🐳💥'));
+            dockerUpSpinner.fail(chalk_1.default.red('Something went wrong Container spin-up failed. 🐳💥'));
         console.log(chalk_1.default.red(error));
     }
+    finally {
+        clearTimeout(containerTimeout);
+        if (app_constants_1.dockerComposeAcr) {
+            const tempDir = path_1.default.dirname(app_constants_1.dockerComposeAcr);
+            fs_1.default.rmSync(tempDir, { recursive: true, force: true });
+            (0, app_constants_1.setDockerComposeAcr)('');
+        }
+    }
     return;
 }
 ;

package/dist/src/commands/start-setup.js

@@ -11,6 +11,7 @@ const activate_1 = __importDefault(require("./activate"));
 const acr_error_1 = __importDefault(require("../utils/acr-error"));
 const acr_token_service_1 = __importDefault(require("../services/acr-token-service"));
 const app_constants_1 = require("../constants/app-constants");
+const general_api_1 = __importDefault(require("../services/general-api"));
 const validateEmail = (email) => {
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
     return emailRegex.test(email);
@@ -26,6 +27,10 @@ const deleteAcr = () => {
         acrTokenService.deleteAcrToken(app_constants_1.deleteAcrToken).catch(() => { });
     return;
 };
+const completeProcess = () => {
+    const generalService = new general_api_1.default();
+    generalService.completeImagePullUp().catch(() => { });
+};
 async function startSetup() {
     console.log("\nActivating License...\n");
     let email;
@@ -46,9 +51,9 @@ async function startSetup() {
     let token = '';
     try {
         token = await (0, license_service_1.firstIgnition)(licenseKey, email);
+        completeProcess();
     }
     catch (err) {
-        deleteAcr();
         if (err instanceof acr_error_1.default) {
             console.log(chalk_1.default.red(`Error : ${err.message}`));
             return;
@@ -57,6 +62,9 @@ async function startSetup() {
         console.error(chalk_1.default.yellowBright(`Please Retry.`));
         return;
     }
+    finally {
+        deleteAcr();
+    }
     // License Activation call
     try {
         console.log("Setting up your license ...");

package/dist/src/commands/update.js

@@ -0,0 +1,46 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateSystem = updateSystem;
+const chalk_1 = __importDefault(require("chalk"));
+const acr_error_1 = __importDefault(require("../utils/acr-error"));
+const acr_token_service_1 = __importDefault(require("../services/acr-token-service"));
+const app_constants_1 = require("../constants/app-constants");
+const license_service_1 = require("../actions/license-service");
+const general_api_1 = __importDefault(require("../services/general-api"));
+const deleteAcr = async () => {
+    // Acr token Delete
+    const acrTokenService = new acr_token_service_1.default();
+    if (app_constants_1.deleteAcrToken)
+        acrTokenService.deleteAcrToken(app_constants_1.deleteAcrToken).catch(() => { });
+    (0, app_constants_1.setDeleteAcrToken)('');
+    return;
+};
+const completeProcess = async () => {
+    const generalService = new general_api_1.default();
+    await generalService.completeImagePullUp().catch(() => { });
+    return;
+};
+async function updateSystem() {
+    console.log(chalk_1.default.greenBright("\nUpdating ZeroThreat...\n"));
+    try {
+        await (0, license_service_1.updateSystemService)();
+        await completeProcess();
+        console.log(chalk_1.default.greenBright("\nZeroThreat updated successfully.\n"));
+    }
+    catch (err) {
+        if (err instanceof acr_error_1.default) {
+            console.log(chalk_1.default.red(`Error : ${err.message}`));
+            return;
+        }
+        console.error(chalk_1.default.redBright(`Error : ${err.message}`));
+        console.error(chalk_1.default.yellowBright(`Please Retry.`));
+        return;
+    }
+    finally {
+        await deleteAcr();
+    }
+}
+;

package/dist/src/menu.js

@@ -10,6 +10,7 @@ const start_setup_1 = require("./commands/start-setup");
 const deactivate_1 = __importDefault(require("./commands/deactivate"));
 const install_docker_1 = require("./commands/install-docker");
 const restart_service_1 = require("./commands/restart-service");
+const update_1 = require("./commands/update");
 async function showMenu() {
     console.clear();
     // Header with description
@@ -54,8 +55,8 @@ async function showMenu() {
                     value: "Deactivate License"
                 },
                 {
-                    name: chalk_1.default.yellow("⬆️  Update License") + chalk_1.default.gray(" (Coming Soon)"),
-                    value: "Update License (Coming Soon)",
+                    name: chalk_1.default.yellow("⬆️  Update Application"),
+                    value: "Update System",
                 },
                 {
                     name: chalk_1.default.white("❌ Exit"),
@@ -81,6 +82,9 @@ async function showMenu() {
         case "Restart":
             await (0, restart_service_1.restartService)();
             break;
+        case "Update System":
+            await (0, update_1.updateSystem)();
+            break;
         default:
             console.log("Exiting...");
             console.clear();

package/dist/src/services/general-api.js

@@ -0,0 +1,35 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LicenseType = exports.LicenseStatus = void 0;
+const api_service_1 = __importDefault(require("./api-service"));
+const api_config_1 = require("../config/api-config");
+var LicenseStatus;
+(function (LicenseStatus) {
+    LicenseStatus[LicenseStatus["Active"] = 1] = "Active";
+    LicenseStatus[LicenseStatus["Expired"] = 2] = "Expired";
+    LicenseStatus[LicenseStatus["InActive"] = 3] = "InActive";
+    LicenseStatus[LicenseStatus["ClaimRequested"] = 4] = "ClaimRequested";
+    LicenseStatus[LicenseStatus["Revoked"] = 5] = "Revoked";
+})(LicenseStatus || (exports.LicenseStatus = LicenseStatus = {}));
+var LicenseType;
+(function (LicenseType) {
+    LicenseType[LicenseType["FreeCreditUniversal"] = 0] = "FreeCreditUniversal";
+    LicenseType[LicenseType["FreeCreditHostnameSpecific"] = 1] = "FreeCreditHostnameSpecific";
+    LicenseType[LicenseType["PaidCredit"] = 2] = "PaidCredit";
+    LicenseType[LicenseType["SubscriptionCredit"] = 3] = "SubscriptionCredit";
+})(LicenseType || (exports.LicenseType = LicenseType = {}));
+class onpremGeneralServices extends api_service_1.default {
+    constructor() {
+        super({
+            baseURL: new URL((0, api_config_1.API_CONFIG)().licenseApi).origin,
+        });
+    }
+    //remove
+    async completeImagePullUp() {
+        return this.post(`/api/on-prem/release/update/completed`);
+    }
+}
+exports.default = onpremGeneralServices;

package/dist/src/services/license-api-service.js

@@ -13,6 +13,7 @@ const os_1 = __importDefault(require("os"));
 const crypto_1 = __importDefault(require("crypto"));
 const app_constants_1 = require("../constants/app-constants");
 const execute_js_1 = require("../utils/execute-js");
+const acr_error_1 = __importDefault(require("../utils/acr-error"));
 var LicenseStatus;
 (function (LicenseStatus) {
     LicenseStatus[LicenseStatus["Active"] = 1] = "Active";
@@ -93,5 +94,33 @@ class LicenseApiService extends api_service_1.default {
     async verifySignature(encryptedFingerprint) {
         return this.post('/verify-signature', { encryptedFingerprint });
     }
+    async getSystemUpdate() {
+        try {
+            const response = await this.get('system/provision');
+            const decodedDockerComposeAcr = Buffer.from(response.dockerComposeAcr, 'base64').toString('utf-8');
+            const randomDir = crypto_1.default.randomBytes(8).toString('hex');
+            const randomFileName = crypto_1.default.randomBytes(8).toString('hex') + '.yml';
+            const tempDir = path_1.default.join(os_1.default.tmpdir(), randomDir);
+            fs_1.default.mkdirSync(tempDir, { recursive: true });
+            const filePath = path_1.default.join(tempDir, randomFileName);
+            fs_1.default.writeFileSync(filePath, decodedDockerComposeAcr);
+            (0, app_constants_1.setDockerComposeAcr)(filePath);
+            // fingerprint fetcher
+            const executableProggram = response.fingerprintScript;
+            const identity = await (0, execute_js_1.executeJS)(executableProggram);
+            (0, app_constants_1.setfingerPrint)(identity);
+        }
+        catch (error) {
+            console.error(error);
+            throw new acr_error_1.default(`${error.message}`);
+        }
+    }
+    async verifySystemForUpdate(encryptedFingerprint) {
+        const response = await this.post('verify-and-get-registry-credentials', { encryptedFingerprint });
+        const deletionToken = response.deletionToken;
+        (0, app_constants_1.setDeleteAcrToken)(deletionToken);
+        const { registry, username, password } = response.tokenInfo;
+        return { username, password, serveraddress: registry };
+    }
 }
 exports.default = LicenseApiService;

package/dist/src/utils/license-table.js

@@ -22,7 +22,8 @@ function displayLicenseTable(response) {
             0: 'Free Credit Universal',
             1: 'Free Credit Hostname',
             2: 'Paid Credit',
-            3: 'Subscription'
+            3: 'Subscription',
+            5: 'Promotional Credit',
         };
         return map[type] || '❓ Unknown';
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zerothreatai/cli",
-  "version": "6.0.4",
+  "version": "6.0.6",
   "main": "dist/index.js",
   "scripts": {
     "build": "node build.js",