@lead-routing/cli 0.1.2 → 0.1.3

package/dist/index.js

@@ -744,18 +744,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
@@ -986,7 +1009,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 +1019,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 +1078,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) {
@@ -1479,7 +1535,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,

package/package.json

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