@lead-routing/cli 0.1.1 → 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) {
@@ -1050,18 +1106,26 @@ async function sfdcDeployInline(params) {
     { reject: false }
   );
   const alreadyAuthed = authCheck === 0;
+  let sfCredEnv = {};
+  let targetOrgArgs = ["--target-org", orgAlias];
   if (alreadyAuthed) {
     log6.success("Using existing Salesforce authentication");
   } else {
-    await loginViaAppBridge(appUrl, orgAlias);
+    const { accessToken, instanceUrl, aliasStored } = await loginViaAppBridge(appUrl, orgAlias);
+    sfCredEnv = { SF_ACCESS_TOKEN: accessToken, SF_ORG_INSTANCE_URL: instanceUrl };
+    if (!aliasStored) {
+      targetOrgArgs = [];
+    }
   }
   s.start("Copying Salesforce package\u2026");
-  const bundledPkg = join5(__dirname2, "..", "sfdc-package");
+  const inDist = join5(__dirname2, "sfdc-package");
+  const nextToDist = join5(__dirname2, "..", "sfdc-package");
+  const bundledPkg = existsSync4(inDist) ? inDist : nextToDist;
   const destPkg = join5(installDir ?? tmpdir(), "lead-routing-sfdc-package");
   if (!existsSync4(bundledPkg)) {
     s.stop("sfdc-package not found in CLI bundle");
     throw new Error(
-      `Expected bundle at: ${bundledPkg}
+      `Expected bundle at: ${inDist}
 The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
     );
   }
@@ -1111,8 +1175,8 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
   try {
     await execa3(
       "sf",
-      ["project", "deploy", "start", "--target-org", orgAlias, "--source-dir", "force-app"],
-      { cwd: destPkg, stdio: "inherit" }
+      ["project", "deploy", "start", ...targetOrgArgs, "--source-dir", "force-app"],
+      { cwd: destPkg, stdio: "inherit", env: { ...process.env, ...sfCredEnv } }
     );
     s.stop("Package deployed");
   } catch (err) {
@@ -1129,8 +1193,8 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
   try {
     await execa3(
       "sf",
-      ["org", "assign", "permset", "--name", "LeadRouterAdmin", "--target-org", orgAlias],
-      { stdio: "inherit" }
+      ["org", "assign", "permset", "--name", "LeadRouterAdmin", ...targetOrgArgs],
+      { stdio: "inherit", env: { ...process.env, ...sfCredEnv } }
     );
     s.stop("Permission set assigned \u2014 Lead Router Setup will appear in the App Launcher");
   } catch (err) {
@@ -1152,12 +1216,11 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
       const qr = await execa3("sf", [
         "data",
         "query",
-        "--target-org",
-        orgAlias,
+        ...targetOrgArgs,
         "--query",
         "SELECT Id FROM Routing_Settings__c LIMIT 1",
         "--json"
-      ]);
+      ], { env: { ...process.env, ...sfCredEnv } });
       const parsed = JSON.parse(qr.stdout);
       existingId = parsed?.result?.records?.[0]?.Id;
     } catch {
@@ -1167,27 +1230,25 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
         "data",
         "update",
         "record",
-        "--target-org",
-        orgAlias,
+        ...targetOrgArgs,
         "--sobject",
         "Routing_Settings__c",
         "--record-id",
         existingId,
         "--values",
         `App_Url__c='${appUrl}' Engine_Endpoint__c='${engineUrl}'`
-      ], { stdio: "inherit" });
+      ], { stdio: "inherit", env: { ...process.env, ...sfCredEnv } });
     } else {
       await execa3("sf", [
         "data",
         "create",
         "record",
-        "--target-org",
-        orgAlias,
+        ...targetOrgArgs,
         "--sobject",
         "Routing_Settings__c",
         "--values",
         `App_Url__c='${appUrl}' Engine_Endpoint__c='${engineUrl}'`
-      ], { stdio: "inherit" });
+      ], { stdio: "inherit", env: { ...process.env, ...sfCredEnv } });
     }
     s.stop("Org settings written");
   } catch (err) {
@@ -1259,17 +1320,20 @@ Ensure the app is running and the URL is correct.`
     );
   }
   s.stop("Authenticated with Salesforce");
+  let aliasStored = false;
   try {
     await execa3(
       "sf",
       ["org", "login", "access-token", "--instance-url", instanceUrl, "--alias", orgAlias, "--no-prompt"],
-      { input: accessToken + "\n" }
+      { env: { ...process.env, SFDX_ACCESS_TOKEN: accessToken } }
     );
     log6.success(`Salesforce org saved as "${orgAlias}"`);
+    aliasStored = true;
   } catch (err) {
-    log6.warn(`Could not store sf CLI credentials: ${String(err)}`);
-    log6.info("Re-authenticate manually if deploy commands fail: sf org login web");
+    log6.warn(`Could not persist sf CLI credentials: ${String(err)}`);
+    log6.info("Continuing with direct token auth for this session.");
   }
+  return { accessToken, instanceUrl, aliasStored };
 }
 
 // src/steps/app-launcher-guide.ts
@@ -1471,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/dist/sfdc-package/force-app/main/default/remoteSiteSettings/LeadRouterApp.remoteSite-meta.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RemoteSiteSetting xmlns="http://soap.sforce.com/2006/04/metadata">
+    <description>Lead Router App URL — patched by lead-routing sfdc deploy</description>
+    <disableProtocolSecurity>false</disableProtocolSecurity>
+    <isActive>true</isActive>
+    <url>https://app.example.com</url>
+</RemoteSiteSetting>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lead-routing/cli",
-  "version": "0.1.1",
+  "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"],