@zerothreatai/cli 6.0.5 → 6.0.7

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

@@ -19,6 +19,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const app_constants_1 = require("../constants/app-constants");
 const ora_1 = __importDefault(require("ora"));
+const acr_error_1 = __importDefault(require("../utils/acr-error"));
 let COMPOSE_FILE = "";
 const PROJECT = "zerothreat";
 const NETWORK = "zerothreat-onprem-nw";
@@ -91,13 +92,15 @@ async function firstIgnition(licenseKey, emailId) {
         console.log(">> Setting up application ...");
         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...");
+        await runCompose(["up", "-d", "--pull", "never"]);
+        //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)
@@ -179,18 +182,25 @@ async function updateSystemService() {
         console.log(">> Setting up application ...");
         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...");
+        await runCompose(["up", "-d", "--pull", "never"]);
+        //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.");
+        console.log(chalk_1.default.greenBright("\nZeroThreat updated successfully.\n"));
     }
     catch (error) {
         if (spinner.isSpinning)
-            spinner.fail(chalk_1.default.red('Verification failed. Please check your details.'));
-        throw error;
+            spinner.fail(chalk_1.default.red('Verification failed. Please check details.'));
+        if (error instanceof acr_error_1.default) {
+            console.log(chalk_1.default.red(`Error : ${error.message}`));
+            return;
+        }
+        throw new Error(chalk_1.default.red(error));
     }
     finally {
         COMPOSE_FILE = "";

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,14 +98,13 @@ 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'));
@@ -116,6 +115,7 @@ async function restartService() {
         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 });

package/dist/src/commands/update.js

@@ -4,12 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateSystem = updateSystem;
+const fs_1 = __importDefault(require("fs"));
 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 path_1 = __importDefault(require("path"));
 const deleteAcr = async () => {
     // Acr token Delete
     const acrTokenService = new acr_token_service_1.default();
@@ -24,22 +25,23 @@ const completeProcess = async () => {
     return;
 };
 async function updateSystem() {
-    console.log(chalk_1.default.greenBright("\nUpdating Zero Threat...\n"));
+    console.log(chalk_1.default.greenBright("\nUpdating ZeroThreat...\n"));
     try {
         await (0, license_service_1.updateSystemService)();
         await completeProcess();
     }
     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();
+        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/config/api-config.js

@@ -5,7 +5,7 @@ const API_CONFIG = () => {
     if (!process.env.WORKING_ENVIRONMENT) {
         return {
             licenseApi: `http://localhost:3201/api/license`,
-            onPremLicenseCloudeApi: `https://zt-rc1-1-app-containerapps.agreeablestone-ae5e635a.centralus.azurecontainerapps.io/api/on-prem/license`,
+            onPremLicenseCloudeApi: `https://zt-stage-app-containerapps.agreeablestone-ae5e635a.centralus.azurecontainerapps.io/api/on-prem/license`,
         };
     }
     else {

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

@@ -111,7 +111,6 @@ class LicenseApiService extends api_service_1.default {
             (0, app_constants_1.setfingerPrint)(identity);
         }
         catch (error) {
-            console.error(error);
             throw new acr_error_1.default(`${error.message}`);
         }
     }

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.5",
+  "version": "6.0.7",
   "main": "dist/index.js",
   "scripts": {
     "build": "node build.js",