bindler 1.7.0 → 1.8.0

package/dist/cli.js

@@ -103,14 +103,31 @@ function getProject(name) {
   const config = readConfig();
   return config.projects.find((p) => p.name === name);
 }
-function addProject(project) {
+function canAddProject(project) {
   const config = readConfig();
   if (config.projects.some((p) => p.name === project.name)) {
-    throw new Error(`Project "${project.name}" already exists`);
+    return { valid: false, error: `Project "${project.name}" already exists` };
   }
-  if (config.projects.some((p) => p.hostname === project.hostname)) {
-    throw new Error(`Hostname "${project.hostname}" is already in use`);
+  const conflictingProject = config.projects.find(
+    (p) => p.hostname === project.hostname && (p.basePath || "/") === (project.basePath || "/")
+  );
+  if (conflictingProject) {
+    if (project.basePath || conflictingProject.basePath) {
+      return {
+        valid: false,
+        error: `Hostname "${project.hostname}" with base path "${project.basePath || "/"}" conflicts with project "${conflictingProject.name}"`
+      };
+    }
+    return { valid: false, error: `Hostname "${project.hostname}" is already in use by project "${conflictingProject.name}"` };
+  }
+  return { valid: true };
+}
+function addProject(project) {
+  const check = canAddProject(project);
+  if (!check.valid) {
+    throw new Error(check.error);
   }
+  const config = readConfig();
   config.projects.push(project);
   writeConfig(config);
 }
@@ -1412,11 +1429,16 @@ async function newCommand(options) {
     }
   }
   if (!validateProjectName(project.name)) {
-    console.error(chalk3.red("Error: Invalid project name"));
+    console.error(chalk3.red("Error: Invalid project name. Use alphanumeric characters, dashes, and underscores only."));
     process.exit(1);
   }
   if (!validateHostname(project.hostname)) {
-    console.error(chalk3.red("Error: Invalid hostname"));
+    console.error(chalk3.red("Error: Invalid hostname format"));
+    process.exit(1);
+  }
+  const conflictCheck = canAddProject(project);
+  if (!conflictCheck.valid) {
+    console.error(chalk3.red(`Error: ${conflictCheck.error}`));
     process.exit(1);
   }
   if (!existsSync7(project.path)) {
@@ -1486,13 +1508,42 @@ Configuration saved. Run ${chalk3.cyan("sudo bindler apply")} to update nginx an
 // src/commands/list.ts
 import chalk4 from "chalk";
 import Table from "cli-table3";
-async function listCommand() {
+async function listCommand(options = {}) {
   const projects = listProjects();
   if (projects.length === 0) {
+    if (options.json) {
+      console.log("[]");
+      return;
+    }
     console.log(chalk4.yellow("No projects registered."));
     console.log(chalk4.dim(`Run ${chalk4.cyan("bindler new")} to create one.`));
     return;
   }
+  if (options.json) {
+    const output = projects.map((project) => {
+      let status = "n/a";
+      if (project.type === "npm") {
+        const process2 = getProcessByName(project.name);
+        status = process2?.status || "not_started";
+      } else {
+        status = project.enabled !== false ? "serving" : "disabled";
+      }
+      if (project.enabled === false) status = "disabled";
+      return {
+        name: project.name,
+        type: project.type,
+        hostname: project.hostname,
+        basePath: project.basePath,
+        port: project.port,
+        path: project.path,
+        status,
+        local: project.local,
+        enabled: project.enabled !== false
+      };
+    });
+    console.log(JSON.stringify(output, null, 2));
+    return;
+  }
   const table = new Table({
     head: [
       chalk4.cyan("Name"),
@@ -1873,7 +1924,11 @@ async function updateCommand(name, options) {
     process.exit(1);
   }
   const updates = {};
-  if (options.hostname) {
+  if (options.hostname !== void 0) {
+    if (!options.hostname || options.hostname.trim() === "") {
+      console.error(chalk10.red("Error: Hostname cannot be empty"));
+      process.exit(1);
+    }
     if (!validateHostname(options.hostname)) {
       console.error(chalk10.red("Error: Invalid hostname format"));
       process.exit(1);
@@ -2394,7 +2449,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.7.0"));
+  console.log(chalk15.dim("  Version:  ") + chalk15.white("1.8.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"));
@@ -4001,9 +4056,12 @@ Note: Add to /etc/hosts if not already:`));
     console.log(chalk28.cyan(`  echo "127.0.0.1  ${project.hostname}" | sudo tee -a /etc/hosts`));
   }
   const defaults = getDefaults();
-  const listenPort = defaults.nginxListen.split(":")[1] || "8080";
+  const listenParts = defaults.nginxListen.split(":");
+  const listenPort = listenParts.length > 1 ? listenParts[1] : listenParts[0];
+  const isDefaultPort = listenPort === "80" || listenPort === "443";
+  const accessUrl = isDefaultPort ? `http://${project.hostname}` : `http://${project.hostname}:${listenPort}`;
   console.log(chalk28.green(`
-Access at: http://${project.hostname}:${listenPort}`));
+Access at: ${accessUrl}`));
   console.log(chalk28.dim("Press Ctrl+C to stop\n"));
   console.log(chalk28.dim("---"));
   const env = {
@@ -4174,28 +4232,28 @@ async function checkForUpdates() {
   const cache = readCache();
   const now = Date.now();
   if (now - cache.lastCheck < CHECK_INTERVAL) {
-    if (cache.latestVersion && compareVersions("1.7.0", cache.latestVersion) > 0) {
+    if (cache.latestVersion && compareVersions("1.8.0", cache.latestVersion) > 0) {
       showUpdateMessage(cache.latestVersion);
     }
     return;
   }
   fetchLatestVersion().then((latestVersion) => {
     writeCache({ lastCheck: now, latestVersion });
-    if (latestVersion && compareVersions("1.7.0", latestVersion) > 0) {
+    if (latestVersion && compareVersions("1.8.0", latestVersion) > 0) {
       showUpdateMessage(latestVersion);
     }
   });
 }
 function showUpdateMessage(latestVersion) {
   console.log("");
-  console.log(chalk30.yellow(`  Update available: ${"1.7.0"} \u2192 ${latestVersion}`));
+  console.log(chalk30.yellow(`  Update available: ${"1.8.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.7.0");
+program.name("bindler").description("Manage multiple projects behind Cloudflare Tunnel with Nginx and PM2").version("1.8.0");
 program.hook("preAction", async () => {
   try {
     initConfig();
@@ -4206,8 +4264,8 @@ program.hook("preAction", async () => {
 program.command("new").description("Create and register a new project").option("-n, --name <name>", "Project name").option("-t, --type <type>", "Project type (static or npm)", "static").option("-p, --path <path>", "Project directory path").option("-h, --hostname <hostname>", "Hostname for the project").option("-b, --base-path <path>", "Base path for path-based routing (e.g., /api)").option("--port <port>", "Port number (npm projects only)").option("-s, --start <command>", "Start command (npm projects only)").option("-l, --local", "Local project (skip Cloudflare, use .local hostname)").option("--apply", "Apply nginx config after creating").action(async (options) => {
   await newCommand(options);
 });
-program.command("list").alias("ls").description("List all registered projects").action(async () => {
-  await listCommand();
+program.command("list").alias("ls").description("List all registered projects").option("--json", "Output as JSON (for scripting)").action(async (options) => {
+  await listCommand(options);
 });
 program.command("status").description("Show detailed status of all projects").action(async () => {
   await statusCommand();