@lead-routing/cli 0.1.2 → 0.1.4

package/dist/index.js

@@ -189,7 +189,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 +212,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 +343,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 +363,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 +620,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 +692,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 };
@@ -744,18 +755,41 @@ async function checkRemoteDockerCompose(ssh) {
   return { ok: true, label: `Docker Compose \u2014 ${stdout.trim()}` };
 }
 async function checkRemotePort(ssh, port) {
-  const { stdout } = await ssh.execSilent(
-    `ss -tlnp 2>/dev/null | grep ':${port} ' || netstat -tlnp 2>/dev/null | grep ':${port} ' || echo "free"`
-  );
-  const isBound = stdout.trim() !== "free" && stdout.trim() !== "";
-  if (isBound) {
-    return {
-      ok: false,
-      warn: true,
-      label: `Port ${port} \u2014 already in use on server (Caddy needs it for HTTPS \u2014 ensure nothing else is binding it)`
-    };
+  const portCheckCmd = `ss -tlnp 2>/dev/null | grep ':${port} ' || netstat -tlnp 2>/dev/null | grep ':${port} ' || echo "free"`;
+  const { stdout: initial } = await ssh.execSilent(portCheckCmd);
+  const isBound = initial.trim() !== "free" && initial.trim() !== "";
+  if (!isBound) {
+    return { ok: true, label: `Port ${port} \u2014 available` };
+  }
+  const knownServices = ["nginx", "apache2", "httpd", "lighttpd", "caddy"];
+  for (const svc of knownServices) {
+    const { code: activeCode } = await ssh.execSilent(
+      `systemctl is-active --quiet ${svc} 2>/dev/null`
+    );
+    if (activeCode === 0) {
+      await ssh.execSilent(
+        `systemctl stop ${svc} 2>/dev/null; systemctl disable ${svc} 2>/dev/null`
+      );
+      const { stdout: recheck } = await ssh.execSilent(portCheckCmd);
+      if (recheck.trim() === "free" || !recheck.trim()) {
+        return {
+          ok: true,
+          label: `Port ${port} \u2014 freed (stopped and disabled system ${svc} service)`
+        };
+      }
+    }
   }
-  return { ok: true, label: `Port ${port} \u2014 available` };
+  const { stdout: occupant } = await ssh.execSilent(
+    `ss -tlnp 2>/dev/null | grep ':${port} ' | head -1 || echo "unknown process"`
+  );
+  return {
+    ok: false,
+    // Hard error — Caddy cannot get TLS certs without these ports
+    label: `Port ${port} is occupied and could not be freed automatically.
+  Occupant: ${occupant.trim()}
+  Stop the conflicting process on the server, then re-run:
+    lead-routing init`
+  };
 }
 
 // src/steps/upload-files.ts
@@ -882,11 +916,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"));
@@ -905,11 +939,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"),
@@ -928,7 +962,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?.();
   }
@@ -939,7 +975,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], {
@@ -986,7 +1022,7 @@ ON CONFLICT ("orgId", email) DO NOTHING;
 
 // src/steps/verify-health.ts
 import { spinner as spinner5, log as log5 } from "@clack/prompts";
-async function verifyHealth(appUrl, engineUrl) {
+async function verifyHealth(appUrl, engineUrl, ssh, remoteDir) {
   const checks = [
     { service: "Web app", url: `${appUrl}/api/health` },
     { service: "Routing engine", url: `${engineUrl}/health` }
@@ -996,9 +1032,42 @@ async function verifyHealth(appUrl, engineUrl) {
     if (r.ok) {
       log5.success(`${r.service} \u2014 ${r.url}`);
     } else {
-      log5.warn(`${r.service} not responding yet \u2014 ${r.detail}`);
+      log5.warn(`${r.service} \u2014 did not respond after ${r.detail}`);
     }
   }
+  const failed = results.filter((r) => !r.ok);
+  if (failed.length === 0) return;
+  log5.info("Fetching remote diagnostics\u2026");
+  try {
+    const { stdout: ps } = await ssh.execSilent("docker compose ps --format table", remoteDir);
+    if (ps.trim()) log5.info(`Container status:
+${ps.trim()}`);
+  } catch {
+  }
+  try {
+    const { stdout: caddyLogs } = await ssh.execSilent(
+      "docker compose logs caddy --tail 30 --no-color 2>&1",
+      remoteDir
+    );
+    if (caddyLogs.trim()) log5.info(`Caddy logs (last 30 lines):
+${caddyLogs.trim()}`);
+  } catch {
+  }
+  const failedNames = failed.map((r) => r.service).join(" and ");
+  throw new Error(
+    `${failedNames} did not respond after 2 minutes.
+
+Common causes (check Caddy logs above):
+  \u2022 Let's Encrypt rate limit \u2014 wait until tomorrow and re-run
+  \u2022 Port 80/443 still blocked by another process
+  \u2022 Container crashed \u2014 check container status above
+
+To resume once fixed:
+  1. SSH into your server:
+       cd ${remoteDir} && docker compose restart caddy
+  2. Then re-run Salesforce setup:
+       lead-routing sfdc deploy`
+  );
 }
 async function pollHealth(service, url, maxAttempts = 24, intervalMs = 5e3) {
   const s = spinner5();
@@ -1022,7 +1091,7 @@ async function pollHealth(service, url, maxAttempts = 24, intervalMs = 5e3) {
     service,
     url,
     ok: false,
-    detail: `timed out after ${maxAttempts * intervalMs / 1e3}s`
+    detail: `${maxAttempts * intervalMs / 1e3}s`
   };
 }
 function sleep2(ms) {
@@ -1030,13 +1099,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`);
@@ -1062,8 +1131,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)) {
@@ -1085,7 +1154,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(
@@ -1097,7 +1166,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");
   }
@@ -1110,7 +1179,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");
   }
@@ -1479,7 +1548,7 @@ Files created: docker-compose.yml, Caddyfile, .env.web, .env.engine, lead-routin
     log8.step("Step 7/9  Database migrations");
     await runMigrations(ssh, dir, cfg.adminEmail, cfg.adminPassword);
     log8.step("Step 8/9  Verifying health");
-    await verifyHealth(cfg.appUrl, cfg.engineUrl);
+    await verifyHealth(cfg.appUrl, cfg.engineUrl, ssh, remoteDir);
     log8.step("Step 9/9  Deploying Salesforce package");
     await sfdcDeployInline({
       appUrl: cfg.appUrl,
@@ -1572,7 +1641,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!") + `
 
@@ -1724,7 +1793,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";
@@ -1732,7 +1801,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("=");
@@ -1742,7 +1811,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();

package/package.json

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