@lead-routing/cli 0.1.8 → 0.1.10

package/dist/index.js

@@ -593,14 +593,15 @@ function generateFiles(cfg, sshCfg) {
 }
 
 // src/steps/check-remote-prerequisites.ts
-import { log as log4 } from "@clack/prompts";
+import { log as log4, spinner as spinner2 } from "@clack/prompts";
 async function checkRemotePrerequisites(ssh) {
-  const results = await Promise.all([
-    checkRemoteDocker(ssh),
-    checkRemoteDockerCompose(ssh),
+  const dockerResult = await checkOrInstallDocker(ssh);
+  const composeResult = await checkRemoteDockerCompose(ssh);
+  const portResults = await Promise.all([
     checkRemotePort(ssh, 80),
     checkRemotePort(ssh, 443)
   ]);
+  const results = [dockerResult, composeResult, ...portResults];
   const failed = results.filter((r) => !r.ok && !r.warn);
   const warnings = results.filter((r) => !r.ok && r.warn);
   for (const r of results) {
@@ -620,30 +621,65 @@ async function checkRemotePrerequisites(ssh) {
       `Remote server is missing required software:
 ` + failed.map((r) => `  \u2022 ${r.label}`).join("\n") + `
 
-Install the missing software on your server and re-run lead-routing init.`
+Fix the issues above and re-run lead-routing init.`
     );
   }
 }
-async function checkRemoteDocker(ssh) {
-  const { stdout, code } = await ssh.execSilent("docker --version");
-  if (code !== 0 || !stdout) {
+async function checkOrInstallDocker(ssh) {
+  const { stdout, code } = await ssh.execSilent("docker --version 2>/dev/null");
+  if (code === 0 && stdout) {
+    const match = stdout.match(/Docker version (\d+)/);
+    if (match && parseInt(match[1], 10) < 24) {
+      return { ok: false, label: `Docker ${stdout.trim()} \u2014 version 24+ required` };
+    }
+    return { ok: true, label: `Docker \u2014 ${stdout.trim()}` };
+  }
+  const s = spinner2();
+  s.start("Docker not found \u2014 installing via get.docker.com (~2 min)\u2026");
+  try {
+    const { code: curlCode } = await ssh.execSilent("command -v curl 2>/dev/null");
+    if (curlCode !== 0) {
+      await ssh.execSilent(
+        "apt-get install -y curl 2>/dev/null || yum install -y curl 2>/dev/null"
+      );
+    }
+    const { code: installCode } = await ssh.execSilent(
+      "curl -fsSL https://get.docker.com | sh 2>&1"
+    );
+    if (installCode !== 0) {
+      s.stop("Docker auto-install failed");
+      return {
+        ok: false,
+        label: "Docker \u2014 auto-install failed.\n  SSH in and run manually: curl -fsSL https://get.docker.com | sh"
+      };
+    }
+    await ssh.execSilent(
+      "systemctl start docker 2>/dev/null; systemctl enable docker 2>/dev/null"
+    );
+    const { stdout: ver, code: verCode } = await ssh.execSilent("docker --version 2>/dev/null");
+    if (verCode !== 0 || !ver) {
+      s.stop("Docker installed but not responding");
+      return {
+        ok: false,
+        label: "Docker \u2014 installed but daemon not responding. Try rebooting the server."
+      };
+    }
+    s.stop(`Docker installed \u2014 ${ver.trim()}`);
+    return { ok: true, label: `Docker \u2014 installed ${ver.trim()}` };
+  } catch (err) {
+    s.stop("Docker auto-install failed");
     return {
       ok: false,
-      label: "Docker \u2014 not found on server (install Docker Engine 24+)"
+      label: `Docker \u2014 auto-install failed: ${err instanceof Error ? err.message : String(err)}`
     };
   }
-  const match = stdout.match(/Docker version (\d+)/);
-  if (match && parseInt(match[1], 10) < 24) {
-    return { ok: false, label: `Docker ${stdout.trim()} \u2014 version 24+ required` };
-  }
-  return { ok: true, label: `Docker \u2014 ${stdout.trim()}` };
 }
 async function checkRemoteDockerCompose(ssh) {
-  const { stdout, code } = await ssh.execSilent("docker compose version");
+  const { stdout, code } = await ssh.execSilent("docker compose version 2>/dev/null");
   if (code !== 0 || !stdout) {
     return {
       ok: false,
-      label: "Docker Compose \u2014 not found on server (update Docker to include Compose v2)"
+      label: "Docker Compose \u2014 not found (update Docker to include Compose v2)"
     };
   }
   return { ok: true, label: `Docker Compose \u2014 ${stdout.trim()}` };
@@ -697,9 +733,9 @@ async function checkRemotePort(ssh, port) {
 
 // src/steps/upload-files.ts
 import { join as join4 } from "path";
-import { spinner as spinner2 } from "@clack/prompts";
+import { spinner as spinner3 } from "@clack/prompts";
 async function uploadFiles(ssh, localDir, remoteDir) {
-  const s = spinner2();
+  const s = spinner3();
   s.start("Uploading config files to server");
   try {
     await ssh.mkdir(remoteDir);
@@ -724,7 +760,7 @@ async function uploadFiles(ssh, localDir, remoteDir) {
 }
 
 // src/steps/start-services.ts
-import { spinner as spinner3, log as log5 } from "@clack/prompts";
+import { spinner as spinner4, log as log5 } from "@clack/prompts";
 async function startServices(ssh, remoteDir) {
   await wipeStalePostgresVolume(ssh, remoteDir);
   await pullImages(ssh, remoteDir);
@@ -738,7 +774,7 @@ async function wipeStalePostgresVolume(ssh, remoteDir) {
   if (code !== 0) {
     return;
   }
-  const s = spinner3();
+  const s = spinner4();
   s.start("Removing existing database volume for clean install");
   try {
     await ssh.exec("docker compose down -v --remove-orphans", remoteDir);
@@ -752,7 +788,7 @@ async function wipeStalePostgresVolume(ssh, remoteDir) {
   }
 }
 async function pullImages(ssh, remoteDir) {
-  const s = spinner3();
+  const s = spinner4();
   s.start("Pulling Docker images on server (this may take a few minutes)");
   try {
     await ssh.exec("docker compose pull", remoteDir);
@@ -765,7 +801,7 @@ async function pullImages(ssh, remoteDir) {
   }
 }
 async function startContainers(ssh, remoteDir) {
-  const s = spinner3();
+  const s = spinner4();
   s.start("Starting services");
   try {
     await ssh.exec("docker compose up -d --remove-orphans", remoteDir);
@@ -776,7 +812,7 @@ async function startContainers(ssh, remoteDir) {
   }
 }
 async function waitForPostgres(ssh, remoteDir) {
-  const s = spinner3();
+  const s = spinner4();
   s.start("Waiting for PostgreSQL to be ready");
   const maxAttempts = 24;
   let containerReady = false;
@@ -821,7 +857,7 @@ import * as path from "path";
 import * as crypto from "crypto";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { execa as execa2 } from "execa";
-import { spinner as spinner4 } from "@clack/prompts";
+import { spinner as spinner5 } from "@clack/prompts";
 var __filename = fileURLToPath2(import.meta.url);
 var __dirname2 = path.dirname(__filename);
 function readEnvVar(envFile, key) {
@@ -857,7 +893,7 @@ function findPrismaBin() {
   return found;
 }
 async function runMigrations(ssh, localDir, adminEmail, adminPassword) {
-  const s = spinner4();
+  const s = spinner5();
   s.start("Opening secure tunnel to database");
   let tunnelClose;
   try {
@@ -873,7 +909,7 @@ async function runMigrations(ssh, localDir, adminEmail, adminPassword) {
   }
 }
 async function applyMigrations(localDir, localPort) {
-  const s = spinner4();
+  const s = spinner5();
   s.start("Running database migrations");
   try {
     const DATABASE_URL = getTunneledDbUrl(localDir, localPort);
@@ -891,7 +927,7 @@ async function applyMigrations(localDir, localPort) {
   }
 }
 async function seedAdminUser(localDir, localPort, adminEmail, adminPassword) {
-  const s = spinner4();
+  const s = spinner5();
   s.start("Creating admin user");
   try {
     const DATABASE_URL = getTunneledDbUrl(localDir, localPort);
@@ -902,9 +938,9 @@ async function seedAdminUser(localDir, localPort, adminEmail, adminPassword) {
     const safeEmail = adminEmail.replace(/'/g, "''");
     const safeWebhookSecret = webhookSecret.replace(/'/g, "''");
     const sql = `
--- Create initial organisation if none exists (self-hosted defaults: PAID plan, unlimited seats/quota)
-INSERT INTO organizations (id, "webhookSecret", plan, "seatsPurchased", "routingQuota", "isActive", "createdAt", "updatedAt")
-SELECT gen_random_uuid(), '${safeWebhookSecret}', 'PAID', 9999, 999999, true, NOW(), NOW()
+-- Create initial organisation if none exists (self-hosted defaults: PAID plan, unlimited seats)
+INSERT INTO organizations (id, "webhookSecret", plan, "seatsPurchased", "isActive", "createdAt", "updatedAt")
+SELECT gen_random_uuid(), '${safeWebhookSecret}', 'PAID', 9999, true, NOW(), NOW()
 WHERE NOT EXISTS (SELECT 1 FROM organizations);
 
 -- Create admin AppUser under the first org (idempotent)
@@ -924,7 +960,7 @@ ON CONFLICT ("orgId", email) DO NOTHING;
 }
 
 // src/steps/verify-health.ts
-import { spinner as spinner5, log as log6 } from "@clack/prompts";
+import { spinner as spinner6, log as log6 } from "@clack/prompts";
 async function verifyHealth(appUrl, engineUrl, ssh, remoteDir) {
   const checks = [
     { service: "Web app", url: `${appUrl}/api/health` },
@@ -973,7 +1009,7 @@ To resume once fixed:
   );
 }
 async function pollHealth(service, url, maxAttempts = 24, intervalMs = 5e3) {
-  const s = spinner5();
+  const s = spinner6();
   s.start(`Waiting for ${service}`);
   for (let i = 0; i < maxAttempts; i++) {
     try {
@@ -1006,7 +1042,7 @@ import { readFileSync as readFileSync4, writeFileSync as writeFileSync3, existsS
 import { join as join6, dirname as dirname3 } from "path";
 import { tmpdir } from "os";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { spinner as spinner6, log as log7 } from "@clack/prompts";
+import { spinner as spinner7, log as log7 } from "@clack/prompts";
 import { execa as execa3 } from "execa";
 var __dirname3 = dirname3(fileURLToPath3(import.meta.url));
 function patchXml(content, tag, value) {
@@ -1015,7 +1051,7 @@ function patchXml(content, tag, value) {
 }
 async function sfdcDeployInline(params) {
   const { appUrl, engineUrl, orgAlias, installDir } = params;
-  const s = spinner6();
+  const s = spinner7();
   const { code: authCheck } = await execa3(
     "sf",
     ["org", "display", "--target-org", orgAlias, "--json"],
@@ -1175,7 +1211,7 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
 }
 async function loginViaAppBridge(rawAppUrl, orgAlias) {
   const appUrl = rawAppUrl.replace(/\/+$/, "");
-  const s = spinner6();
+  const s = spinner7();
   s.start("Starting Salesforce authentication via your Lead Router app\u2026");
   let sessionId;
   let authUrl;
@@ -1823,7 +1859,7 @@ async function runStatus() {
 // src/commands/config.ts
 import { readFileSync as readFileSync5, writeFileSync as writeFileSync5, existsSync as existsSync5 } from "fs";
 import { join as join8 } from "path";
-import { intro as intro4, outro as outro4, text as text3, password as password3, spinner as spinner7, log as log14 } from "@clack/prompts";
+import { intro as intro4, outro as outro4, text as text3, password as password3, spinner as spinner8, log as log14 } from "@clack/prompts";
 import chalk5 from "chalk";
 import { execa as execa7 } from "execa";
 function parseEnv(filePath) {
@@ -1899,7 +1935,7 @@ Callback URL for your Connected App: ${callbackUrl}`
   writeEnv(envWeb, updates);
   writeEnv(envEngine, updates);
   log14.success("Updated .env.web and .env.engine");
-  const s = spinner7();
+  const s = spinner8();
   s.start("Restarting web and engine containers\u2026");
   try {
     await execa7("docker", ["compose", "up", "-d", "--force-recreate", "web", "engine"], {
@@ -1936,7 +1972,7 @@ function runConfigShow() {
 }
 
 // src/commands/sfdc.ts
-import { intro as intro5, outro as outro5, text as text4, spinner as spinner8, log as log15 } from "@clack/prompts";
+import { intro as intro5, outro as outro5, text as text4, spinner as spinner9, log as log15 } from "@clack/prompts";
 import chalk6 from "chalk";
 import { execa as execa8 } from "execa";
 async function runSfdcDeploy() {
@@ -1964,7 +2000,7 @@ async function runSfdcDeploy() {
     if (typeof rawEngine === "symbol") process.exit(0);
     engineUrl = rawEngine.trim();
   }
-  const s = spinner8();
+  const s = spinner9();
   s.start("Checking Salesforce CLI\u2026");
   try {
     await execa8("sf", ["--version"], { all: true });
@@ -2007,7 +2043,7 @@ async function runSfdcDeploy() {
 
 // src/index.ts
 var program = new Command();
-program.name("lead-routing").description("Self-hosted Lead Routing \u2014 scaffold, deploy, and manage your installation").version("0.1.8");
+program.name("lead-routing").description("Self-hosted Lead Routing \u2014 scaffold, deploy, and manage your installation").version("0.1.10");
 program.command("init").description("Interactive setup wizard \u2014 configure and deploy the full Lead Routing stack").option("--dry-run", "Generate config files without connecting or deploying").option("--resume", "Skip to health check using existing lead-routing.json (post-timeout recovery)").option("--sandbox", "Use Salesforce sandbox (test.salesforce.com) instead of production").option("--ssh-port <port>", "SSH port (default: 22)", parseInt).option("--ssh-user <user>", "SSH username (default: root)").option("--ssh-key <path>", "Path to SSH private key (overrides auto-detection)").option("--remote-dir <path>", "Remote install directory (default: ~/lead-routing)").option("--external-db <url>", "Use external PostgreSQL URL instead of managed Docker container").option("--external-redis <url>", "Use external Redis URL instead of managed Docker container").action((opts) => runInit({
   dryRun: opts.dryRun,
   resume: opts.resume,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lead-routing/cli",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Self-hosted deployment CLI for Lead Routing",
   "homepage": "https://github.com/lead-routing/lead-routing",
   "keywords": ["salesforce", "lead-routing", "self-hosted", "deployment", "cli"],