@zerothreatai/cli 6.0.3 → 6.0.4

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

@@ -57,6 +57,23 @@ async function runCompose(args) {
         child.on("close", code => (code === 0 ? resolve() : reject(new Error("compose failed"))));
     });
 }
+async function checkSqlSuccess() {
+    const containerName = 'a01-archive';
+    const timeout = 10 * 60 * 1000; // 10 minutes
+    const startTime = Date.now();
+    while (Date.now() - startTime < timeout) {
+        const containers = await docker.listContainers({ all: true, filters: { name: [containerName] } });
+        const container = containers.find(c => c.Names.some(n => n.includes(containerName)));
+        if (container && container.State === 'exited') {
+            const containerObj = docker.getContainer(container.Id);
+            const logs = await containerObj.logs({ stdout: true, stderr: true });
+            const logString = logs.toString();
+            return logString.includes('published successfully');
+        }
+        await new Promise(resolve => setTimeout(resolve, 3000));
+    }
+    return false;
+}
 async function firstIgnition(licenseKey, emailId) {
     let token = '';
     const acrTokenService = new acr_token_service_1.default();
@@ -76,7 +93,10 @@ async function firstIgnition(licenseKey, emailId) {
         await runCompose(["up", "-d"]);
         //sleep for 30 seconds to allow sql server to start
         console.log("Waiting for SQL Server to start...");
-        await new Promise(resolve => setTimeout(resolve, 30000));
+        const SqlSuccess = await checkSqlSuccess();
+        if (!SqlSuccess) {
+            throw new Error("Unable to complete database setup. Please try again later.");
+        }
     }
     catch (error) {
         if (spinner.isSpinning)

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

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanupContainersFromCompose = cleanupContainersFromCompose;
 exports.restartService = restartService;
 const child_process_1 = require("child_process");
 const util_1 = require("util");
@@ -10,29 +11,110 @@ const license_api_service_1 = __importDefault(require("../services/license-api-s
 const app_constants_1 = require("../constants/app-constants");
 const child_process_2 = require("child_process");
 const chalk_1 = __importDefault(require("chalk"));
+const ora_1 = __importDefault(require("ora"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const js_yaml_1 = __importDefault(require("js-yaml"));
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 const PROJECT = "zerothreat";
-async function runCompose(args) {
+async function cleanupContainersFromCompose(composeFilePath) {
+    const absPath = path_1.default.resolve(composeFilePath);
+    if (!fs_1.default.existsSync(absPath)) {
+        throw new Error(`Compose file not found: ${absPath}`);
+    }
+    const raw = fs_1.default.readFileSync(absPath, "utf8");
+    const compose = js_yaml_1.default.load(raw);
+    if (!compose.services)
+        return;
+    const containerNames = Object.values(compose.services)
+        .map(s => s.container_name)
+        .filter(Boolean);
+    for (const name of containerNames) {
+        try {
+            await execAsync(`docker rm -f ${name}`);
+        }
+        catch {
+        }
+    }
+}
+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, "-p", PROJECT, ...args], {
-            stdio: "inherit",
+        const child = (0, child_process_2.spawn)("docker", ["compose", "-f", app_constants_1.dockerComposeAcr, "up", "-d"], {
+            stdio: ["ignore", "ignore", "pipe"],
         });
         child.on("close", code => (code === 0 ? resolve() : reject(new Error("compose failed"))));
     });
 }
+async function containerExists(name) {
+    try {
+        await execAsync(`docker inspect ${name}`);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 async function restartService() {
     // Start docker image a02-conduit
-    await execAsync('docker start a02-conduit');
-    // Call getSystemUp from license api service
+    const primaryContainer = 'a02-conduit';
+    const pCointainerExiste = await containerExists(primaryContainer);
+    try {
+        if (pCointainerExiste) {
+            await execAsync(`docker start ${primaryContainer}`);
+        }
+        else {
+            await execAsync(`docker run -d  --restart unless-stopped  -p 3201:3201  --name ${primaryContainer}  --network zerothreat-onprem-nw  -v /var/run/docker.sock:/var/run/docker.sock  -v zt-license-data:/app/projects/api/administration/zt-license-db  ztonpremacr-abhbbthkbyh5e8hu.azurecr.io/${primaryContainer}`);
+        }
+        await new Promise(r => setTimeout(r, 5000));
+    }
+    catch (err) {
+        console.log(chalk_1.default.red(err));
+        return;
+    }
+    const varifySpinner = (0, ora_1.default)('Verifying your system …');
+    const dockerUpSpinner = (0, ora_1.default)('Spinning up containers… 🐳');
     const licenseService = new license_api_service_1.default();
-    await licenseService.getSystemUp();
+    varifySpinner.start();
+    // Call getSystemUp from license api service
+    try {
+        await licenseService.getSystemUp();
+    }
+    catch (error) {
+        if (varifySpinner.isSpinning)
+            varifySpinner.fail(chalk_1.default.red('Verification failed. Please check your system.'));
+        console.log(chalk_1.default.red(error));
+        return;
+    }
+    // verifying signature
     try {
         await licenseService.verifySignature(app_constants_1.fingerPrint);
-        await runCompose(["up", "-d"]);
+        varifySpinner.succeed('System verified.');
     }
     catch (error) {
+        if (varifySpinner.isSpinning)
+            varifySpinner.fail(chalk_1.default.red('Verification failed. Please check your system.'));
         console.error(chalk_1.default.red(error));
         return;
     }
+    // Up the docker images
+    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. 🐳💥'));
+        console.log(chalk_1.default.red(error));
+    }
+    return;
 }
 ;

package/dist/src/utils/execute-js.js

@@ -5,11 +5,13 @@ const child_process_1 = require("child_process");
 async function executeJS(jsSource) {
     return new Promise((resolve, reject) => {
         const child = (0, child_process_1.spawn)(process.execPath, // node
-        ["-e", jsSource], { stdio: ["ignore", "pipe", "pipe"] });
+        ["-"], { stdio: ["pipe", "pipe", "pipe"] });
         let stdout = "";
         let stderr = "";
         child.stdout.on("data", d => (stdout += d.toString()));
         child.stderr.on("data", d => (stderr += d.toString()));
+        child.stdin.write(jsSource);
+        child.stdin.end();
         child.on("close", code => {
             if (code !== 0) {
                 reject(new Error(stderr || `JS exited with code ${code}`));

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

@@ -51,5 +51,5 @@ function displayLicenseTable(response) {
     console.log(chalk_1.default.bold.blue('\n📊 LICENSE DETAILS'));
     console.log(table.toString());
     console.log(chalk_1.default.gray('➤ You can now start using ZeroThreat on this url : '));
-    console.log(chalk_1.default.bold.blue('http://localhost:5173'));
+    console.log(chalk_1.default.bold.blue('http://localhost:3203'));
 }

package/package.json

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