@lead-routing/cli 0.1.3 → 0.1.5

package/dist/index.js

@@ -4,7 +4,8 @@
 import { Command } from "commander";
 
 // src/commands/init.ts
-import { intro, outro, note as note4, log as log8 } from "@clack/prompts";
+import { promises as dns } from "dns";
+import { intro, outro, note as note4, log as log8, confirm as confirm3, cancel as cancel3, isCancel as isCancel4, password as promptPassword } from "@clack/prompts";
 import chalk2 from "chalk";
 
 // src/steps/prerequisites.ts
@@ -189,7 +190,8 @@ async function collectConfig() {
     validate: (v) => {
       if (!v) return "Required";
       try {
-        new URL(v);
+        const u = new URL(v);
+        if (u.protocol !== "https:") return "Must be an HTTPS URL (required for Salesforce OAuth)";
       } catch {
         return "Must be a valid URL (e.g. https://routing.acme.com)";
       }
@@ -211,16 +213,16 @@ async function collectConfig() {
     }
   });
   if (isCancel2(engineUrl)) bail2(engineUrl);
-  const callbackUrl = `${appUrl}/api/auth/callback`;
+  const callbackUrl = `${appUrl.trim().replace(/\/+$/, "")}/api/auth/sfdc/callback`;
   note2(
     `You need a Salesforce Connected App. If you haven't created one yet:
 
   1. Go to Salesforce Setup \u2192 App Manager \u2192 New Connected App
   2. Connected App Name: Lead Routing
   3. Check "Enable OAuth Settings"
-  4. Callback URL:
+  4. Callback URL (copy exactly \u2014 must match):
        ${callbackUrl}
-  5. Selected Scopes: api  \u2022  refresh_token, offline_access  \u2022  openid
+  5. Selected Scopes: api  \u2022  refresh_token, offline_access
   6. Check "Require Secret for Web Server Flow"
   7. Save \u2014 wait ~2 min, then click "Manage Consumer Details"
   8. Copy the Consumer Key (Client ID) and Consumer Secret below`,
@@ -342,8 +344,8 @@ async function collectConfig() {
   return {
     appUrl: appUrl.trim().replace(/\/+$/, ""),
     engineUrl: engineUrl.trim().replace(/\/+$/, ""),
-    sfdcClientId,
-    sfdcClientSecret,
+    sfdcClientId: sfdcClientId.trim(),
+    sfdcClientSecret: sfdcClientSecret.trim(),
     sfdcLoginUrl,
     orgAlias,
     managedDb,
@@ -362,8 +364,9 @@ async function collectConfig() {
 }
 
 // src/steps/generate-files.ts
-import { mkdirSync, writeFileSync as writeFileSync2 } from "fs";
-import { join as join2 } from "path";
+import { mkdirSync, writeFileSync as writeFileSync2, readFileSync as readFileSync2 } from "fs";
+import { join as join2, dirname } from "path";
+import { fileURLToPath } from "url";
 import { log as log2 } from "@clack/prompts";
 
 // src/templates/docker-compose.ts
@@ -618,6 +621,15 @@ function findInstallDir(startDir = process.cwd()) {
 }
 
 // src/steps/generate-files.ts
+var __dirname = dirname(fileURLToPath(import.meta.url));
+function getCliVersion() {
+  try {
+    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 = join2(process.cwd(), "lead-routing");
   mkdirSync(dir, { recursive: true });
@@ -681,7 +693,7 @@ function generateFiles(cfg, sshCfg) {
     sfdcClientId: cfg.sfdcClientId,
     sfdcLoginUrl: cfg.sfdcLoginUrl,
     installedAt: (/* @__PURE__ */ new Date()).toISOString(),
-    version: "0.1.0"
+    version: getCliVersion()
   });
   log2.success("Generated lead-routing.json");
   return { dir, composeFile, envWeb, envEngine, adminSecret: cfg.adminSecret };
@@ -905,11 +917,11 @@ function sleep(ms) {
 import * as fs from "fs";
 import * as path from "path";
 import * as crypto from "crypto";
-import { fileURLToPath } from "url";
+import { fileURLToPath as fileURLToPath2 } from "url";
 import { execa as execa2 } from "execa";
 import { spinner as spinner4 } from "@clack/prompts";
-var __filename = fileURLToPath(import.meta.url);
-var __dirname = path.dirname(__filename);
+var __filename = fileURLToPath2(import.meta.url);
+var __dirname2 = path.dirname(__filename);
 function readEnvVar(envFile, key) {
   const content = fs.readFileSync(envFile, "utf8");
   const match = content.match(new RegExp(`^${key}=(.+)$`, "m"));
@@ -928,11 +940,11 @@ function findPrismaBin() {
     // npx / npm global install: @lead-routing/cli is nested under the scope dir,
     // so prisma lands 3 levels above dist/ in node_modules/.bin/
     // e.g. ~/.npm/_npx/HASH/node_modules/.bin/prisma
-    path.join(__dirname, "../../../.bin/prisma"),
-    path.join(__dirname, "../../../prisma/bin/prisma.js"),
+    path.join(__dirname2, "../../../.bin/prisma"),
+    path.join(__dirname2, "../../../prisma/bin/prisma.js"),
     // Fallback: prisma nested inside the package's own node_modules (hoisted install)
-    path.join(__dirname, "../node_modules/.bin/prisma"),
-    path.join(__dirname, "../node_modules/prisma/bin/prisma.js"),
+    path.join(__dirname2, "../node_modules/.bin/prisma"),
+    path.join(__dirname2, "../node_modules/prisma/bin/prisma.js"),
     // Monorepo dev paths
     path.resolve("packages/db/node_modules/.bin/prisma"),
     path.resolve("node_modules/.bin/prisma"),
@@ -951,7 +963,9 @@ async function runMigrations(ssh, localDir, adminEmail, adminPassword) {
     tunnelClose = close;
     s.stop(`Database tunnel open (local port ${localPort})`);
     await applyMigrations(localDir, localPort);
-    await seedAdminUser(localDir, localPort, adminEmail, adminPassword);
+    if (adminEmail && adminPassword) {
+      await seedAdminUser(localDir, localPort, adminEmail, adminPassword);
+    }
   } finally {
     tunnelClose?.();
   }
@@ -962,7 +976,7 @@ async function applyMigrations(localDir, localPort) {
   try {
     const DATABASE_URL = getTunneledDbUrl(localDir, localPort);
     const prismaBin = findPrismaBin();
-    const bundledSchema = path.join(__dirname, "prisma/schema.prisma");
+    const bundledSchema = path.join(__dirname2, "prisma/schema.prisma");
     const monoSchema = path.resolve("packages/db/prisma/schema.prisma");
     const schemaPath = fs.existsSync(bundledSchema) ? bundledSchema : monoSchema;
     await execa2(prismaBin, ["migrate", "deploy", "--schema", schemaPath], {
@@ -1086,13 +1100,13 @@ function sleep2(ms) {
 }
 
 // src/steps/sfdc-deploy-inline.ts
-import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, existsSync as existsSync4, cpSync, rmSync } from "fs";
-import { join as join5, dirname as dirname2 } from "path";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync3, existsSync as existsSync4, cpSync, rmSync } from "fs";
+import { join as join5, dirname as dirname3 } from "path";
 import { tmpdir } from "os";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { fileURLToPath as fileURLToPath3 } from "url";
 import { spinner as spinner6, log as log6 } from "@clack/prompts";
 import { execa as execa3 } from "execa";
-var __dirname2 = dirname2(fileURLToPath2(import.meta.url));
+var __dirname3 = dirname3(fileURLToPath3(import.meta.url));
 function patchXml(content, tag, value) {
   const re = new RegExp(`(<${tag}>)[^<]*(</\\s*${tag}>)`, "g");
   return content.replace(re, `$1${value}$2`);
@@ -1118,8 +1132,8 @@ async function sfdcDeployInline(params) {
     }
   }
   s.start("Copying Salesforce package\u2026");
-  const inDist = join5(__dirname2, "sfdc-package");
-  const nextToDist = join5(__dirname2, "..", "sfdc-package");
+  const inDist = join5(__dirname3, "sfdc-package");
+  const nextToDist = join5(__dirname3, "..", "sfdc-package");
   const bundledPkg = existsSync4(inDist) ? inDist : nextToDist;
   const destPkg = join5(installDir ?? tmpdir(), "lead-routing-sfdc-package");
   if (!existsSync4(bundledPkg)) {
@@ -1141,7 +1155,7 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
     "RoutingEngine.namedCredential-meta.xml"
   );
   if (existsSync4(ncPath)) {
-    const nc = patchXml(readFileSync3(ncPath, "utf8"), "endpoint", engineUrl);
+    const nc = patchXml(readFileSync4(ncPath, "utf8"), "endpoint", engineUrl);
     writeFileSync3(ncPath, nc, "utf8");
   }
   const rssEnginePath = join5(
@@ -1153,7 +1167,7 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
     "LeadRouterEngine.remoteSite-meta.xml"
   );
   if (existsSync4(rssEnginePath)) {
-    let rss = patchXml(readFileSync3(rssEnginePath, "utf8"), "url", engineUrl);
+    let rss = patchXml(readFileSync4(rssEnginePath, "utf8"), "url", engineUrl);
     rss = patchXml(rss, "description", "Lead Router Engine endpoint");
     writeFileSync3(rssEnginePath, rss, "utf8");
   }
@@ -1166,7 +1180,7 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
     "LeadRouterApp.remoteSite-meta.xml"
   );
   if (existsSync4(rssAppPath)) {
-    let rss = patchXml(readFileSync3(rssAppPath, "utf8"), "url", appUrl);
+    let rss = patchXml(readFileSync4(rssAppPath, "utf8"), "url", appUrl);
     rss = patchXml(rss, "description", "Lead Router App URL");
     writeFileSync3(rssAppPath, rss, "utf8");
   }
@@ -1494,13 +1508,97 @@ ${result.stderr || result.stdout}`
 };
 
 // src/commands/init.ts
+async function checkDnsResolvable(appUrl, engineUrl) {
+  let hosts;
+  try {
+    hosts = [.../* @__PURE__ */ new Set([new URL(appUrl).hostname, new URL(engineUrl).hostname])];
+  } catch {
+    return;
+  }
+  for (const host of hosts) {
+    try {
+      await dns.lookup(host);
+    } catch {
+      log8.warn(
+        `${chalk2.yellow(host)} does not resolve in DNS yet.
+  Check for typos \u2014 a bad domain will cause a 2-minute timeout at step 8.`
+      );
+      const go = await confirm3({ message: "Continue anyway?", initialValue: true });
+      if (isCancel4(go) || !go) {
+        cancel3("Setup cancelled.");
+        process.exit(0);
+      }
+    }
+  }
+}
 async function runInit(options = {}) {
   const dryRun = options.dryRun ?? false;
+  const resume = options.resume ?? false;
   console.log();
   intro(
-    chalk2.bold.cyan("Lead Routing \u2014 Self-Hosted Setup") + (dryRun ? chalk2.yellow("  [dry run]") : "")
+    chalk2.bold.cyan("Lead Routing \u2014 Self-Hosted Setup") + (dryRun ? chalk2.yellow("  [dry run]") : "") + (resume ? chalk2.yellow("  [resume]") : "")
   );
   const ssh = new SshConnection();
+  if (resume) {
+    try {
+      const dir = findInstallDir();
+      if (!dir) {
+        log8.error("No lead-routing.json found \u2014 run `lead-routing init` first.");
+        process.exit(1);
+      }
+      const saved = readConfig(dir);
+      let sshPassword;
+      if (!saved.ssh.privateKeyPath) {
+        const pw = await promptPassword({
+          message: `SSH password for ${saved.ssh.username}@${saved.ssh.host}`
+        });
+        if (typeof pw === "symbol") process.exit(0);
+        sshPassword = pw;
+      }
+      log8.step("Connecting to server");
+      await ssh.connect({
+        host: saved.ssh.host,
+        port: saved.ssh.port,
+        username: saved.ssh.username,
+        privateKeyPath: saved.ssh.privateKeyPath,
+        password: sshPassword,
+        remoteDir: saved.remoteDir
+      });
+      log8.success(`Connected to ${saved.ssh.host}`);
+      const remoteDir = await ssh.resolveHome(saved.remoteDir);
+      log8.step("Step 8/9  Verifying health");
+      await verifyHealth(saved.appUrl, saved.engineUrl, ssh, remoteDir);
+      log8.step("Step 9/9  Deploying Salesforce package");
+      await sfdcDeployInline({
+        appUrl: saved.appUrl,
+        engineUrl: saved.engineUrl,
+        orgAlias: "lead-routing",
+        sfdcClientId: saved.sfdcClientId ?? "",
+        sfdcLoginUrl: saved.sfdcLoginUrl ?? "https://login.salesforce.com",
+        installDir: dir
+      });
+      await guideAppLauncherSetup(saved.appUrl);
+      outro(
+        chalk2.green("\u2714  You're live!") + `
+
+  Dashboard:      ${chalk2.cyan(saved.appUrl)}
+  Routing engine: ${chalk2.cyan(saved.engineUrl)}
+
+` + chalk2.bold("  Next steps:\n") + `  ${chalk2.cyan("1.")} Open ${chalk2.cyan(saved.appUrl)} and log in
+  ${chalk2.cyan("2.")} Create your first routing rule to start routing leads
+
+  Run ${chalk2.cyan("lead-routing doctor")} to check service health at any time.
+  Run ${chalk2.cyan("lead-routing deploy")} to update to a new version.`
+      );
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      log8.error(`Resume failed: ${message}`);
+      process.exit(1);
+    } finally {
+      await ssh.disconnect();
+    }
+    return;
+  }
   try {
     log8.step("Step 1/9  Checking local prerequisites");
     await checkPrerequisites();
@@ -1508,6 +1606,7 @@ async function runInit(options = {}) {
     const sshCfg = await collectSshConfig();
     log8.step("Step 3/9  Configuration");
     const cfg = await collectConfig();
+    await checkDnsResolvable(cfg.appUrl, cfg.engineUrl);
     log8.step("Step 4/9  Generating config files");
     const { dir, adminSecret } = generateFiles(cfg, sshCfg);
     note4(
@@ -1575,7 +1674,7 @@ Files created: docker-compose.yml, Caddyfile, .env.web, .env.engine, lead-routin
 import { writeFileSync as writeFileSync4, unlinkSync } from "fs";
 import { join as join6 } from "path";
 import { tmpdir as tmpdir2 } from "os";
-import { intro as intro2, outro as outro2, log as log9, password as promptPassword } from "@clack/prompts";
+import { intro as intro2, outro as outro2, log as log9, password as promptPassword2 } from "@clack/prompts";
 import chalk3 from "chalk";
 async function runDeploy() {
   console.log();
@@ -1591,7 +1690,7 @@ async function runDeploy() {
   const ssh = new SshConnection();
   let sshPassword;
   if (!cfg.ssh.privateKeyPath) {
-    const pw = await promptPassword({
+    const pw = await promptPassword2({
       message: `SSH password for ${cfg.ssh.username}@${cfg.ssh.host}`
     });
     if (typeof pw === "symbol") process.exit(0);
@@ -1628,7 +1727,7 @@ async function runDeploy() {
     await ssh.exec("docker compose up -d --remove-orphans", remoteDir);
     log9.success("Services restarted");
     log9.step("Running database migrations");
-    await runMigrations(ssh, dir, "", "");
+    await runMigrations(ssh, dir);
     outro2(
       chalk3.green("\u2714  Deployment complete!") + `
 
@@ -1780,7 +1879,7 @@ async function runStatus() {
 }
 
 // src/commands/config.ts
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync5, existsSync as existsSync5 } from "fs";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync5, existsSync as existsSync5 } from "fs";
 import { join as join7 } from "path";
 import { intro as intro4, outro as outro4, text as text3, password as password3, spinner as spinner7, log as log13 } from "@clack/prompts";
 import chalk5 from "chalk";
@@ -1788,7 +1887,7 @@ import { execa as execa7 } from "execa";
 function parseEnv(filePath) {
   const map = /* @__PURE__ */ new Map();
   if (!existsSync5(filePath)) return map;
-  for (const line of readFileSync4(filePath, "utf8").split("\n")) {
+  for (const line of readFileSync5(filePath, "utf8").split("\n")) {
     const trimmed = line.trim();
     if (!trimmed || trimmed.startsWith("#")) continue;
     const eq = trimmed.indexOf("=");
@@ -1798,7 +1897,7 @@ function parseEnv(filePath) {
   return map;
 }
 function writeEnv(filePath, updates) {
-  const lines = existsSync5(filePath) ? readFileSync4(filePath, "utf8").split("\n") : [];
+  const lines = existsSync5(filePath) ? readFileSync5(filePath, "utf8").split("\n") : [];
   const updated = /* @__PURE__ */ new Set();
   const result = lines.map((line) => {
     const trimmed = line.trim();
@@ -1956,14 +2055,10 @@ async function runSfdcDeploy() {
     log14.error(err instanceof Error ? err.message : String(err));
     process.exit(1);
   }
+  await guideAppLauncherSetup(appUrl);
   outro5(
     chalk6.green("\u2714  Salesforce package deployed!") + `
 
-  Next steps:
-  1. In Salesforce, open App Launcher \u2192 search "Lead Router Setup"
-  2. Click "Connect to Lead Router" to authorise the OAuth connection
-  3. Follow the 4-step wizard to activate triggers and sync field schema
-
   Your Lead Router dashboard: ${chalk6.cyan(appUrl)}`
   );
 }
@@ -1971,7 +2066,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.0");
-program.command("init").description("Interactive setup wizard \u2014 configure and deploy the full Lead Routing stack").option("--dry-run", "Run the wizard and generate config files without starting Docker services").action((opts) => runInit({ dryRun: opts.dryRun }));
+program.command("init").description("Interactive setup wizard \u2014 configure and deploy the full Lead Routing stack").option("--dry-run", "Run the wizard and generate config files without starting Docker services").option("--resume", "Skip steps 1-7 and resume from health check using existing lead-routing.json").action((opts) => runInit({ dryRun: opts.dryRun, resume: opts.resume }));
 program.command("deploy").description("Pull latest images, restart services, and run any pending migrations").action(runDeploy);
 program.command("doctor").description("Check the health of all services in your installation").action(runDoctor);
 program.command("logs [service]").description("Stream logs from a service (web, engine, postgres, redis). Defaults to engine.").action((service) => runLogs(service));

package/package.json

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