@lead-routing/cli 0.1.10 → 0.1.12

package/dist/index.js

@@ -69,16 +69,7 @@ async function checkSalesforceCLI() {
 // src/steps/collect-ssh-config.ts
 import { existsSync } from "fs";
 import { homedir } from "os";
-import { join } from "path";
 import { text, password, note, log as log2, cancel, isCancel } from "@clack/prompts";
-var DEFAULT_KEYS = [
-  join(homedir(), ".ssh", "id_ed25519"),
-  join(homedir(), ".ssh", "id_rsa"),
-  join(homedir(), ".ssh", "id_ecdsa")
-];
-function detectDefaultKey() {
-  return DEFAULT_KEYS.find(existsSync);
-}
 function bail(value) {
   if (isCancel(value)) {
     cancel("Setup cancelled.");
@@ -88,7 +79,7 @@ function bail(value) {
 }
 async function collectSshConfig(opts = {}) {
   note(
-    "The CLI will SSH into your server to deploy the full stack.\nYou will need:\n  \u2022 Server hostname or IP address\n  \u2022 SSH access (key auto-detected, or password)\n  \u2022 Docker 24+ already installed on the server",
+    "The CLI will SSH into your server to deploy the full stack.\nYou will need:\n  \u2022 Server hostname or IP address\n  \u2022 SSH password for your server (root access)\n  \u2022 A fresh Linux VPS (Ubuntu/Debian/CentOS) \u2014 Docker installed automatically",
     "Server connection"
   );
   const host = await text({
@@ -108,19 +99,12 @@ async function collectSshConfig(opts = {}) {
     privateKeyPath = resolved;
     log2.info(`Using SSH key: ${opts.sshKey}`);
   } else {
-    const detected = detectDefaultKey();
-    if (detected) {
-      privateKeyPath = detected;
-      log2.info(`Using SSH key: ${detected.replace(homedir(), "~")}`);
-    } else {
-      log2.warn("No SSH key found at ~/.ssh/id_ed25519, ~/.ssh/id_rsa, or ~/.ssh/id_ecdsa");
-      const p = await password({
-        message: `SSH password for ${opts.sshUser ?? "root"}@${host}`,
-        validate: (v) => !v ? "Required" : void 0
-      });
-      if (isCancel(p)) bail(p);
-      pwd = p;
-    }
+    const p = await password({
+      message: `SSH password for ${opts.sshUser ?? "root"}@${host}`,
+      validate: (v) => !v ? "Required" : void 0
+    });
+    if (isCancel(p)) bail(p);
+    pwd = p;
   }
   return {
     host,
@@ -258,7 +242,7 @@ async function collectConfig(opts = {}) {
 
 // src/steps/generate-files.ts
 import { mkdirSync, writeFileSync as writeFileSync2, readFileSync as readFileSync2 } from "fs";
-import { join as join3, dirname } from "path";
+import { join as join2, dirname } from "path";
 import { fileURLToPath } from "url";
 import { log as log3 } from "@clack/prompts";
 
@@ -385,6 +369,7 @@ function renderEnvWeb(c) {
     ``,
     `# Engine`,
     `ENGINE_URL=${c.engineUrl}`,
+    `PUBLIC_ENGINE_URL=${c.publicEngineUrl}`,
     `ENGINE_WEBHOOK_SECRET=${c.engineWebhookSecret}`,
     ``,
     `# Database`,
@@ -489,9 +474,9 @@ function renderCaddyfile(appUrl, engineUrl) {
 
 // src/utils/config.ts
 import { readFileSync, writeFileSync, existsSync as existsSync2 } from "fs";
-import { join as join2 } from "path";
+import { join } from "path";
 function getConfigPath(dir) {
-  return join2(dir, "lead-routing.json");
+  return join(dir, "lead-routing.json");
 }
 function readConfig(dir) {
   const path2 = getConfigPath(dir);
@@ -506,10 +491,10 @@ function writeConfig(dir, config2) {
   writeFileSync(getConfigPath(dir), JSON.stringify(config2, null, 2), "utf8");
 }
 function findInstallDir(startDir = process.cwd()) {
-  const candidate = join2(startDir, "lead-routing.json");
+  const candidate = join(startDir, "lead-routing.json");
   if (existsSync2(candidate)) return startDir;
-  const nested = join2(startDir, "lead-routing", "lead-routing.json");
-  if (existsSync2(nested)) return join2(startDir, "lead-routing");
+  const nested = join(startDir, "lead-routing", "lead-routing.json");
+  if (existsSync2(nested)) return join(startDir, "lead-routing");
   return null;
 }
 
@@ -517,14 +502,14 @@ function findInstallDir(startDir = process.cwd()) {
 var __dirname = dirname(fileURLToPath(import.meta.url));
 function getCliVersion() {
   try {
-    const pkg = JSON.parse(readFileSync2(join3(__dirname, "../../package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync2(join2(__dirname, "../../package.json"), "utf8"));
     return pkg.version ?? "0.1.0";
   } catch {
     return "0.1.0";
   }
 }
 function generateFiles(cfg, sshCfg) {
-  const dir = join3(process.cwd(), "lead-routing");
+  const dir = join2(process.cwd(), "lead-routing");
   mkdirSync(dir, { recursive: true });
   const dockerEngineUrl = `http://engine:3001`;
   const composeContent = renderDockerCompose({
@@ -532,15 +517,16 @@ function generateFiles(cfg, sshCfg) {
     managedRedis: cfg.managedRedis,
     dbPassword: cfg.dbPassword
   });
-  const composeFile = join3(dir, "docker-compose.yml");
+  const composeFile = join2(dir, "docker-compose.yml");
   writeFileSync2(composeFile, composeContent, "utf8");
   log3.success("Generated docker-compose.yml");
   const caddyfileContent = renderCaddyfile(cfg.appUrl, cfg.engineUrl);
-  writeFileSync2(join3(dir, "Caddyfile"), caddyfileContent, "utf8");
+  writeFileSync2(join2(dir, "Caddyfile"), caddyfileContent, "utf8");
   log3.success("Generated Caddyfile");
   const envWebContent = renderEnvWeb({
     appUrl: cfg.appUrl,
     engineUrl: dockerEngineUrl,
+    publicEngineUrl: cfg.engineUrl,
     databaseUrl: cfg.databaseUrl,
     redisUrl: cfg.redisUrl,
     sfdcClientId: cfg.sfdcClientId,
@@ -552,7 +538,7 @@ function generateFiles(cfg, sshCfg) {
     resendApiKey: cfg.resendApiKey || void 0,
     feedbackToEmail: cfg.feedbackToEmail || void 0
   });
-  const envWeb = join3(dir, ".env.web");
+  const envWeb = join2(dir, ".env.web");
   writeFileSync2(envWeb, envWebContent, "utf8");
   log3.success("Generated .env.web");
   const envEngineContent = renderEnvEngine({
@@ -563,7 +549,7 @@ function generateFiles(cfg, sshCfg) {
     sfdcLoginUrl: cfg.sfdcLoginUrl,
     engineWebhookSecret: cfg.engineWebhookSecret
   });
-  const envEngine = join3(dir, ".env.engine");
+  const envEngine = join2(dir, ".env.engine");
   writeFileSync2(envEngine, envEngineContent, "utf8");
   log3.success("Generated .env.engine");
   writeConfig(dir, {
@@ -732,7 +718,7 @@ async function checkRemotePort(ssh, port) {
 }
 
 // src/steps/upload-files.ts
-import { join as join4 } from "path";
+import { join as join3 } from "path";
 import { spinner as spinner3 } from "@clack/prompts";
 async function uploadFiles(ssh, localDir, remoteDir) {
   const s = spinner3();
@@ -748,7 +734,7 @@ async function uploadFiles(ssh, localDir, remoteDir) {
     ];
     await ssh.upload(
       filenames.map((f) => ({
-        local: join4(localDir, f),
+        local: join3(localDir, f),
         remote: `${remoteDir}/${f}`
       }))
     );
@@ -1039,7 +1025,7 @@ function sleep2(ms) {
 
 // src/steps/sfdc-deploy-inline.ts
 import { readFileSync as readFileSync4, writeFileSync as writeFileSync3, existsSync as existsSync4, cpSync, rmSync } from "fs";
-import { join as join6, dirname as dirname3 } from "path";
+import { join as join5, dirname as dirname3 } from "path";
 import { tmpdir } from "os";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { spinner as spinner7, log as log7 } from "@clack/prompts";
@@ -1070,10 +1056,10 @@ async function sfdcDeployInline(params) {
     }
   }
   s.start("Copying Salesforce package\u2026");
-  const inDist = join6(__dirname3, "sfdc-package");
-  const nextToDist = join6(__dirname3, "..", "sfdc-package");
+  const inDist = join5(__dirname3, "sfdc-package");
+  const nextToDist = join5(__dirname3, "..", "sfdc-package");
   const bundledPkg = existsSync4(inDist) ? inDist : nextToDist;
-  const destPkg = join6(installDir ?? tmpdir(), "lead-routing-sfdc-package");
+  const destPkg = join5(installDir ?? tmpdir(), "lead-routing-sfdc-package");
   if (!existsSync4(bundledPkg)) {
     s.stop("sfdc-package not found in CLI bundle");
     throw new Error(
@@ -1084,7 +1070,7 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
   if (existsSync4(destPkg)) rmSync(destPkg, { recursive: true, force: true });
   cpSync(bundledPkg, destPkg, { recursive: true });
   s.stop("Package copied");
-  const ncPath = join6(
+  const ncPath = join5(
     destPkg,
     "force-app",
     "main",
@@ -1096,7 +1082,7 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
     const nc = patchXml(readFileSync4(ncPath, "utf8"), "endpoint", engineUrl);
     writeFileSync3(ncPath, nc, "utf8");
   }
-  const rssEnginePath = join6(
+  const rssEnginePath = join5(
     destPkg,
     "force-app",
     "main",
@@ -1109,7 +1095,7 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
     rss = patchXml(rss, "description", "Lead Router Engine endpoint");
     writeFileSync3(rssEnginePath, rss, "utf8");
   }
-  const rssAppPath = join6(
+  const rssAppPath = join5(
     destPkg,
     "force-app",
     "main",
@@ -1541,7 +1527,7 @@ async function runInit(options = {}) {
     log9.step("Step 1/9  Checking local prerequisites");
     await checkPrerequisites();
     log9.step("Step 2/9  SSH connection");
-    let sshCfg = await collectSshConfig({
+    const sshCfg = await collectSshConfig({
       sshPort: options.sshPort,
       sshUser: options.sshUser,
       sshKey: options.sshKey,
@@ -1552,31 +1538,9 @@ async function runInit(options = {}) {
         await ssh.connect(sshCfg);
         log9.success(`Connected to ${sshCfg.host}`);
       } catch (err) {
-        if (sshCfg.privateKeyPath && !sshCfg.password) {
-          log9.warn(`Key auth failed \u2014 the server rejected the SSH key`);
-          log9.info("Falling back to password auth\u2026");
-          const pw = await promptPassword({
-            message: `SSH password for ${sshCfg.username}@${sshCfg.host}`,
-            validate: (v) => !v ? "Required" : void 0
-          });
-          if (isCancel4(pw)) {
-            cancel3("Setup cancelled.");
-            process.exit(0);
-          }
-          sshCfg = { ...sshCfg, privateKeyPath: void 0, password: pw };
-          try {
-            await ssh.connect(sshCfg);
-            log9.success(`Connected to ${sshCfg.host}`);
-          } catch (err2) {
-            log9.error(`SSH connection failed: ${String(err2)}`);
-            log9.info("Fix your SSH credentials and re-run `lead-routing init`.");
-            process.exit(1);
-          }
-        } else {
-          log9.error(`SSH connection failed: ${String(err)}`);
-          log9.info("Fix your SSH credentials and re-run `lead-routing init`.");
-          process.exit(1);
-        }
+        log9.error(`SSH connection failed: ${String(err)}`);
+        log9.info("Check your password and re-run `lead-routing init`.");
+        process.exit(1);
       }
     }
     log9.step("Step 3/9  Configuration");
@@ -1650,7 +1614,7 @@ Files created: docker-compose.yml, Caddyfile, .env.web, .env.engine, lead-routin
 
 // src/commands/deploy.ts
 import { writeFileSync as writeFileSync4, unlinkSync } from "fs";
-import { join as join7 } from "path";
+import { join as join6 } from "path";
 import { tmpdir as tmpdir2 } from "os";
 import { intro as intro2, outro as outro2, log as log10, password as promptPassword2 } from "@clack/prompts";
 import chalk3 from "chalk";
@@ -1692,7 +1656,7 @@ async function runDeploy() {
     const remoteDir = await ssh.resolveHome(cfg.remoteDir);
     log10.step("Syncing Caddyfile");
     const caddyContent = renderCaddyfile(cfg.appUrl, cfg.engineUrl);
-    const tmpCaddy = join7(tmpdir2(), "lead-routing-Caddyfile");
+    const tmpCaddy = join6(tmpdir2(), "lead-routing-Caddyfile");
     writeFileSync4(tmpCaddy, caddyContent, "utf8");
     await ssh.upload([{ local: tmpCaddy, remote: `${remoteDir}/Caddyfile` }]);
     unlinkSync(tmpCaddy);
@@ -1858,7 +1822,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 { join as join7 } from "path";
 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";
@@ -1902,8 +1866,8 @@ async function runConfigSfdc() {
     log14.info("Run `lead-routing init` first, or cd into your installation directory.");
     process.exit(1);
   }
-  const envWeb = join8(dir, ".env.web");
-  const envEngine = join8(dir, ".env.engine");
+  const envWeb = join7(dir, ".env.web");
+  const envEngine = join7(dir, ".env.engine");
   const currentWeb = parseEnv(envWeb);
   const currentClientId = currentWeb.get("SFDC_CLIENT_ID") ?? "";
   const currentLoginUrl = currentWeb.get("SFDC_LOGIN_URL") ?? "https://login.salesforce.com";
@@ -1956,7 +1920,7 @@ function runConfigShow() {
     console.error("No lead-routing installation found in the current directory.");
     process.exit(1);
   }
-  const envWeb = join8(dir, ".env.web");
+  const envWeb = join7(dir, ".env.web");
   const cfg = parseEnv(envWeb);
   const adminSecret = cfg.get("ADMIN_SECRET") ?? "(not found)";
   const appUrl = cfg.get("APP_URL") ?? "(not found)";
@@ -2043,7 +2007,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.10");
+program.name("lead-routing").description("Self-hosted Lead Routing \u2014 scaffold, deploy, and manage your installation").version("0.1.12");
 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.10",
+  "version": "0.1.12",
   "description": "Self-hosted deployment CLI for Lead Routing",
   "homepage": "https://github.com/lead-routing/lead-routing",
   "keywords": ["salesforce", "lead-routing", "self-hosted", "deployment", "cli"],