bindler 1.6.2 → 1.7.0

package/dist/cli.js

@@ -741,14 +741,30 @@ function isProtectedPath(path) {
     (protected_) => normalizedPath === protected_ || normalizedPath.startsWith(protected_ + "/")
   );
 }
-function checkPortAvailable(port) {
+function checkPortAvailable(port, projectName) {
   const result = execCommandSafe(`lsof -i :${port} -P -n 2>/dev/null | grep LISTEN | head -1`);
   if (!result.success || !result.output) {
     return { available: true };
   }
   const parts = result.output.trim().split(/\s+/);
   const processName = parts[0] || "unknown";
-  return { available: false, usedBy: processName };
+  const pid = parts[1] || "";
+  if (projectName && pid) {
+    const pm2Check = execCommandSafe(`pm2 jlist 2>/dev/null`);
+    if (pm2Check.success && pm2Check.output) {
+      try {
+        const processes = JSON.parse(pm2Check.output);
+        const bindlerProcess = processes.find(
+          (p) => p.name === `bindler:${projectName}` && String(p.pid) === pid
+        );
+        if (bindlerProcess) {
+          return { available: false, usedBy: processName, isOwnProcess: true };
+        }
+      } catch {
+      }
+    }
+  }
+  return { available: false, usedBy: processName, isOwnProcess: false };
 }
 function validateProject(project) {
   const errors = [];
@@ -762,8 +778,8 @@ function validateProject(project) {
     );
   }
   if (project.type === "npm" && project.port) {
-    const portCheck = checkPortAvailable(project.port);
-    if (!portCheck.available) {
+    const portCheck = checkPortAvailable(project.port, project.name);
+    if (!portCheck.available && !portCheck.isOwnProcess) {
       warnings.push(`Port ${project.port} is in use by ${portCheck.usedBy}`);
     }
   }
@@ -1745,6 +1761,15 @@ ${succeeded}/${results.length} stopped successfully`));
     console.log(chalk7.yellow(`Project "${name}" is a static site - no process to stop.`));
     return;
   }
+  const processStatus = getProcessByName(name);
+  if (!processStatus) {
+    console.log(chalk7.yellow(`${name} is not managed by PM2 (never started)`));
+    return;
+  }
+  if (processStatus.status === "stopped") {
+    console.log(chalk7.yellow(`${name} is already stopped`));
+    return;
+  }
   console.log(chalk7.blue(`Stopping ${name}...`));
   const result = stopProject(name);
   if (result.success) {
@@ -2369,7 +2394,7 @@ async function infoCommand() {
   `));
   console.log(chalk15.white("  Manage multiple projects behind Cloudflare Tunnel"));
   console.log(chalk15.white("  with Nginx and PM2\n"));
-  console.log(chalk15.dim("  Version:  ") + chalk15.white("1.6.2"));
+  console.log(chalk15.dim("  Version:  ") + chalk15.white("1.7.0"));
   console.log(chalk15.dim("  Author:   ") + chalk15.white("alfaoz"));
   console.log(chalk15.dim("  License:  ") + chalk15.white("MIT"));
   console.log(chalk15.dim("  GitHub:   ") + chalk15.cyan("https://github.com/alfaoz/bindler"));
@@ -2426,8 +2451,9 @@ async function checkDns(hostname) {
   }
   return result;
 }
-async function checkHttp(hostname, path = "/") {
-  const url = `https://${hostname}${path}`;
+async function checkHttp(hostname, path = "/", useHttp = false) {
+  const protocol = useHttp ? "http" : "https";
+  const url = `${protocol}://${hostname}${path}`;
   const startTime = Date.now();
   try {
     const controller = new AbortController();
@@ -2443,12 +2469,14 @@ async function checkHttp(hostname, path = "/") {
       reachable: true,
       statusCode: response.status,
       redirectUrl: response.headers.get("location") || void 0,
-      responseTime
+      responseTime,
+      protocol
     };
   } catch (error) {
     return {
       reachable: false,
-      error: error instanceof Error ? error.message : String(error)
+      error: error instanceof Error ? error.message : String(error),
+      protocol
     };
   }
 }
@@ -2488,8 +2516,9 @@ Checking ${hostname}...
     console.log(chalk16.green("  \u2713 AAAA (IPv6): ") + dns.ipv6.join(", "));
   }
   console.log("");
-  console.log(chalk16.bold("HTTP Check:"));
-  const http = await checkHttp(hostname, basePath);
+  const useHttp = options.http ?? isLocal;
+  console.log(chalk16.bold(`HTTP Check (${useHttp ? "HTTP" : "HTTPS"}):`));
+  const http = await checkHttp(hostname, basePath, useHttp);
   if (!http.reachable) {
     console.log(chalk16.red("  \u2717 Not reachable"));
     const err = http.error || "";
@@ -3800,14 +3829,48 @@ async function cloneCommand(source, newName, options) {
       process.exit(1);
     }
   }
+  let targetPath = options.path;
+  if (!targetPath) {
+    const answer = await inquirer5.prompt([
+      {
+        type: "input",
+        name: "path",
+        message: "Path for new project:",
+        default: sourceProject.path.replace(source, targetName),
+        validate: (input) => {
+          if (!input || input.trim() === "") {
+            return "Path is required";
+          }
+          return true;
+        }
+      }
+    ]);
+    targetPath = answer.path;
+  }
   const newProject = {
     ...sourceProject,
     name: targetName,
     hostname: targetHostname,
-    path: options.path || sourceProject.path
+    path: targetPath
   };
   if (newProject.type === "npm") {
-    newProject.port = options.port || findAvailablePort();
+    let port = options.port || findAvailablePort();
+    const portCheck = checkPortInUse(port);
+    if (portCheck.inUse) {
+      const processInfo = portCheck.process ? ` by ${portCheck.process}` : "";
+      console.log(chalk27.yellow(`Warning: Port ${port} is already in use${processInfo}`));
+      if (!options.port) {
+        for (let p = port + 1; p <= 9e3; p++) {
+          const check = checkPortInUse(p);
+          if (!check.inUse) {
+            port = p;
+            console.log(chalk27.dim(`  Using port ${port} instead`));
+            break;
+          }
+        }
+      }
+    }
+    newProject.port = port;
     if (newProject.env?.PORT) {
       newProject.env = { ...newProject.env, PORT: String(newProject.port) };
     }
@@ -4111,28 +4174,28 @@ async function checkForUpdates() {
   const cache = readCache();
   const now = Date.now();
   if (now - cache.lastCheck < CHECK_INTERVAL) {
-    if (cache.latestVersion && compareVersions("1.6.2", cache.latestVersion) > 0) {
+    if (cache.latestVersion && compareVersions("1.7.0", cache.latestVersion) > 0) {
       showUpdateMessage(cache.latestVersion);
     }
     return;
   }
   fetchLatestVersion().then((latestVersion) => {
     writeCache({ lastCheck: now, latestVersion });
-    if (latestVersion && compareVersions("1.6.2", latestVersion) > 0) {
+    if (latestVersion && compareVersions("1.7.0", latestVersion) > 0) {
       showUpdateMessage(latestVersion);
     }
   });
 }
 function showUpdateMessage(latestVersion) {
   console.log("");
-  console.log(chalk30.yellow(`  Update available: ${"1.6.2"} \u2192 ${latestVersion}`));
+  console.log(chalk30.yellow(`  Update available: ${"1.7.0"} \u2192 ${latestVersion}`));
   console.log(chalk30.dim(`  Run: npm update -g bindler`));
   console.log("");
 }
 
 // src/cli.ts
 var program = new Command();
-program.name("bindler").description("Manage multiple projects behind Cloudflare Tunnel with Nginx and PM2").version("1.6.2");
+program.name("bindler").description("Manage multiple projects behind Cloudflare Tunnel with Nginx and PM2").version("1.7.0");
 program.hook("preAction", async () => {
   try {
     initConfig();
@@ -4234,7 +4297,7 @@ program.command("ports").description("Show allocated ports").action(async () =>
 program.command("info").description("Show bindler information and stats").action(async () => {
   await infoCommand();
 });
-program.command("check [hostname]").description("Check DNS propagation and HTTP accessibility for a hostname").option("-v, --verbose", "Show verbose output").action(async (hostname, options) => {
+program.command("check [hostname]").description("Check DNS propagation and HTTP accessibility for a hostname").option("-v, --verbose", "Show verbose output").option("--http", "Use HTTP instead of HTTPS (auto-enabled for .local hostnames)").action(async (hostname, options) => {
   if (!hostname) {
     console.log(chalk31.red("Usage: bindler check <hostname>"));
     console.log(chalk31.dim("\nExamples:"));