bindler 1.4.1 → 1.6.0

package/dist/cli.js

@@ -8,7 +8,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 
 // src/cli.ts
 import { Command } from "commander";
-import chalk30 from "chalk";
+import chalk31 from "chalk";
 
 // src/commands/new.ts
 import { existsSync as existsSync6, mkdirSync as mkdirSync3 } from "fs";
@@ -284,6 +284,25 @@ function isPortAvailable(port) {
   const usedPorts = new Set(getUsedPorts());
   return !usedPorts.has(port);
 }
+function checkPortInUse(port) {
+  const lsofResult = execCommandSafe(`lsof -i :${port} -P -n 2>/dev/null | grep LISTEN`);
+  if (lsofResult.success && lsofResult.output) {
+    const match = lsofResult.output.match(/^(\S+)\s+(\d+)/);
+    if (match) {
+      return { inUse: true, process: `${match[1]} (PID ${match[2]})` };
+    }
+    return { inUse: true };
+  }
+  const ssResult = execCommandSafe(`ss -tlnp 2>/dev/null | grep ":${port} "`);
+  if (ssResult.success && ssResult.output) {
+    const match = ssResult.output.match(/users:\(\("([^"]+)",pid=(\d+)/);
+    if (match) {
+      return { inUse: true, process: `${match[1]} (PID ${match[2]})` };
+    }
+    return { inUse: true };
+  }
+  return { inUse: false };
+}
 function getPortsTable() {
   const config = readConfig();
   return config.projects.filter((p) => p.type === "npm" && p.port).map((p) => ({
@@ -570,18 +589,17 @@ function startProject(project) {
   }
   const pm2Name = getPm2ProcessName(project.name);
   const existingProcess = getProcessByName(project.name);
-  const envVars = [];
-  if (project.env) {
-    for (const [key, value] of Object.entries(project.env)) {
-      envVars.push(`${key}=${value}`);
-    }
-  }
   let command;
   if (existingProcess) {
     command = `pm2 restart "${pm2Name}"`;
   } else {
-    const envFlags = envVars.length > 0 ? envVars.map((e) => `--env ${e}`).join(" ") : "";
-    command = `pm2 start --name "${pm2Name}" --cwd "${project.path}" ${envFlags} -- bash -lc "${project.start}"`;
+    let startCmd = project.start;
+    if (project.env && Object.keys(project.env).length > 0) {
+      const envPrefix = Object.entries(project.env).map(([key, value]) => `${key}=${escapeShellArg(value)}`).join(" ");
+      startCmd = `${envPrefix} ${project.start}`;
+    }
+    const escapedCmd = startCmd.replace(/'/g, "'\\''");
+    command = `pm2 start 'bash -c "${escapedCmd}"' --name "${pm2Name}" --cwd "${project.path}"`;
   }
   const result = execCommandSafe(command);
   if (!result.success) {
@@ -590,6 +608,12 @@ function startProject(project) {
   execCommandSafe("pm2 save");
   return { success: true };
 }
+function escapeShellArg(arg) {
+  if (/[^a-zA-Z0-9_\-=]/.test(arg)) {
+    return `'${arg.replace(/'/g, "'\\''")}'`;
+  }
+  return arg;
+}
 function stopProject(name) {
   const pm2Name = getPm2ProcessName(name);
   const result = execCommandSafe(`pm2 stop "${pm2Name}"`);
@@ -981,7 +1005,17 @@ async function newCommand(options) {
     if (yamlDefaults.environments) project.environments = yamlDefaults.environments;
     if (answers.type === "npm") {
       const scripts = existsSync6(answers.path) ? getPackageJsonScripts(answers.path) : [];
-      const suggestedPort = yamlDefaults.port || findAvailablePort();
+      let suggestedPort = yamlDefaults.port || findAvailablePort();
+      const portCheck = checkPortInUse(suggestedPort);
+      if (portCheck.inUse) {
+        for (let p = suggestedPort + 1; p <= 9e3; p++) {
+          const check = checkPortInUse(p);
+          if (!check.inUse) {
+            suggestedPort = p;
+            break;
+          }
+        }
+      }
       const npmAnswers = await inquirer.prompt([
         {
           type: "input",
@@ -993,6 +1027,11 @@ async function newCommand(options) {
             if (!validatePort(port)) {
               return "Invalid port. Use a number between 1024 and 65535.";
             }
+            const inUseCheck = checkPortInUse(port);
+            if (inUseCheck.inUse) {
+              const processInfo = inUseCheck.process ? ` by ${inUseCheck.process}` : "";
+              return `Port ${port} is already in use${processInfo}. Choose another port.`;
+            }
             return true;
           },
           filter: (input) => parseInt(input, 10)
@@ -1048,7 +1087,23 @@ async function newCommand(options) {
       project.local = true;
     }
     if (project.type === "npm") {
-      project.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(chalk2.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(chalk2.dim(`  Using port ${port} instead`));
+              break;
+            }
+          }
+        }
+      }
+      project.port = port;
       project.start = options.start || "npm start";
       project.env = { PORT: String(project.port) };
     }
@@ -1876,6 +1931,26 @@ Try running with sudo: ${chalk12.cyan("sudo bindler apply")}`));
       process.exit(1);
     }
     console.log(chalk12.green("  \u2713 Nginx reloaded successfully"));
+    const listenPort = parseInt(defaults.nginxListen.split(":").pop() || "80", 10);
+    const portCheck = execCommandSafe(`lsof -i :${listenPort} -P -n 2>/dev/null | grep LISTEN | grep nginx`);
+    if (!portCheck.success || !portCheck.output) {
+      const isPrivilegedPort = listenPort < 1024;
+      console.log(chalk12.yellow(`
+\u26A0 Nginx is not listening on port ${listenPort}`));
+      if (isPrivilegedPort) {
+        console.log(chalk12.dim(`  Port ${listenPort} requires root privileges.
+`));
+        console.log(chalk12.cyan("  Solutions:\n"));
+        console.log(chalk12.white("  Option 1: Restart nginx with sudo (recommended for port 80)"));
+        console.log(chalk12.dim("    sudo pkill nginx && sudo nginx\n"));
+        console.log(chalk12.white("  Option 2: Use a non-privileged port (no sudo needed)"));
+        console.log(chalk12.dim("    bindler config set nginxListen 8080"));
+        console.log(chalk12.dim("    bindler apply"));
+        console.log(chalk12.dim("    # Then access via http://hostname:8080\n"));
+      } else {
+        console.log(chalk12.dim("  Try restarting nginx: brew services restart nginx"));
+      }
+    }
   } else {
     console.log(chalk12.yellow("  - Skipped nginx reload (--no-reload)"));
   }
@@ -2258,7 +2333,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.4.1"));
+  console.log(chalk15.dim("  Version:  ") + chalk15.white("1.6.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"));
@@ -2723,12 +2798,18 @@ async function initCommand() {
     }
   }
   console.log(chalk18.bold("\n1. Choose your setup:\n"));
+  const hasCloudflared = isCloudflaredInstalled();
+  const defaultMode = hasCloudflared ? "tunnel" : "direct";
+  if (!hasCloudflared) {
+    console.log(chalk18.dim("  cloudflared not detected - suggesting direct mode for VPS\n"));
+  }
   const { mode } = await inquirer4.prompt([
     {
       type: "list",
       name: "mode",
       message: "How will you expose your projects?",
-      choices: [
+      default: defaultMode,
+      choices: hasCloudflared ? [
         {
           name: "Cloudflare Tunnel (recommended for home servers)",
           value: "tunnel"
@@ -2741,6 +2822,19 @@ async function initCommand() {
           name: "Local only (development, no internet access)",
           value: "local"
         }
+      ] : [
+        {
+          name: "Direct (VPS with public IP, port 80/443) - recommended",
+          value: "direct"
+        },
+        {
+          name: "Cloudflare Tunnel (requires cloudflared)",
+          value: "tunnel"
+        },
+        {
+          name: "Local only (development, no internet access)",
+          value: "local"
+        }
       ]
     }
   ]);
@@ -3846,8 +3940,89 @@ Process exited with code ${code}`));
   });
 }
 
-// src/lib/update-check.ts
+// src/commands/config.ts
 import chalk29 from "chalk";
+var VALID_KEYS = [
+  "nginxListen",
+  "projectsRoot",
+  "tunnelName",
+  "mode",
+  "applyCloudflareDnsRoutes",
+  "sslEnabled",
+  "sslEmail"
+];
+async function configCommand(action, key, value) {
+  if (!action || action === "list") {
+    const defaults = getDefaults();
+    console.log(chalk29.blue("Current configuration:\n"));
+    for (const [k, v] of Object.entries(defaults)) {
+      console.log(`  ${chalk29.cyan(k)}: ${chalk29.white(String(v))}`);
+    }
+    console.log(chalk29.dim("\nUse `bindler config set <key> <value>` to change a setting."));
+    return;
+  }
+  if (action === "get") {
+    if (!key) {
+      console.error(chalk29.red("Usage: bindler config get <key>"));
+      console.log(chalk29.dim(`
+Available keys: ${VALID_KEYS.join(", ")}`));
+      process.exit(1);
+    }
+    const defaults = getDefaults();
+    const configKey = key;
+    if (!(configKey in defaults)) {
+      console.error(chalk29.red(`Unknown config key: ${key}`));
+      console.log(chalk29.dim(`
+Available keys: ${VALID_KEYS.join(", ")}`));
+      process.exit(1);
+    }
+    console.log(defaults[configKey]);
+    return;
+  }
+  if (action === "set") {
+    if (!key || value === void 0) {
+      console.error(chalk29.red("Usage: bindler config set <key> <value>"));
+      console.log(chalk29.dim(`
+Available keys: ${VALID_KEYS.join(", ")}`));
+      console.log(chalk29.dim("\nExamples:"));
+      console.log(chalk29.dim("  bindler config set nginxListen 8080"));
+      console.log(chalk29.dim("  bindler config set mode tunnel"));
+      process.exit(1);
+    }
+    const configKey = key;
+    if (!VALID_KEYS.includes(configKey)) {
+      console.error(chalk29.red(`Unknown config key: ${key}`));
+      console.log(chalk29.dim(`
+Available keys: ${VALID_KEYS.join(", ")}`));
+      process.exit(1);
+    }
+    const config = readConfig();
+    let parsedValue = value;
+    if (configKey === "applyCloudflareDnsRoutes" || configKey === "sslEnabled") {
+      parsedValue = value === "true" || value === "1";
+    } else if (configKey === "mode") {
+      if (value !== "tunnel" && value !== "direct") {
+        console.error(chalk29.red('Mode must be "tunnel" or "direct"'));
+        process.exit(1);
+      }
+      parsedValue = value;
+    }
+    config.defaults[configKey] = parsedValue;
+    writeConfig(config);
+    console.log(chalk29.green(`\u2713 Set ${key} = ${parsedValue}`));
+    console.log(chalk29.dim("\nRun `bindler apply` to apply changes."));
+    return;
+  }
+  console.error(chalk29.red(`Unknown action: ${action}`));
+  console.log(chalk29.dim("\nUsage:"));
+  console.log(chalk29.dim("  bindler config              # list all settings"));
+  console.log(chalk29.dim("  bindler config get <key>    # get a setting"));
+  console.log(chalk29.dim("  bindler config set <key> <value>  # set a setting"));
+  process.exit(1);
+}
+
+// src/lib/update-check.ts
+import chalk30 from "chalk";
 import { existsSync as existsSync14, readFileSync as readFileSync8, writeFileSync as writeFileSync6, mkdirSync as mkdirSync5 } from "fs";
 import { join as join9 } from "path";
 import { homedir as homedir4 } from "os";
@@ -3900,28 +4075,28 @@ async function checkForUpdates() {
   const cache = readCache();
   const now = Date.now();
   if (now - cache.lastCheck < CHECK_INTERVAL) {
-    if (cache.latestVersion && compareVersions("1.4.1", cache.latestVersion) < 0) {
+    if (cache.latestVersion && compareVersions("1.6.0", cache.latestVersion) < 0) {
       showUpdateMessage(cache.latestVersion);
     }
     return;
   }
   fetchLatestVersion().then((latestVersion) => {
     writeCache({ lastCheck: now, latestVersion });
-    if (latestVersion && compareVersions("1.4.1", latestVersion) < 0) {
+    if (latestVersion && compareVersions("1.6.0", latestVersion) < 0) {
       showUpdateMessage(latestVersion);
     }
   });
 }
 function showUpdateMessage(latestVersion) {
   console.log("");
-  console.log(chalk29.yellow(`  Update available: ${"1.4.1"} \u2192 ${latestVersion}`));
-  console.log(chalk29.dim(`  Run: npm update -g bindler`));
+  console.log(chalk30.yellow(`  Update available: ${"1.6.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.4.1");
+program.name("bindler").description("Manage multiple projects behind Cloudflare Tunnel with Nginx and PM2").version("1.6.0");
 program.hook("preAction", async () => {
   try {
     initConfig();
@@ -3940,73 +4115,73 @@ program.command("status").description("Show detailed status of all projects").ac
 });
 program.command("start [name]").description("Start an npm project with PM2").option("-a, --all", "Start all npm projects").action(async (name, options) => {
   if (!name && !options.all) {
-    console.log(chalk30.red("Usage: bindler start <name> or bindler start --all"));
-    console.log(chalk30.dim("\nExamples:"));
-    console.log(chalk30.dim("  bindler start myapp"));
-    console.log(chalk30.dim("  bindler start --all    # start all npm projects"));
+    console.log(chalk31.red("Usage: bindler start <name> or bindler start --all"));
+    console.log(chalk31.dim("\nExamples:"));
+    console.log(chalk31.dim("  bindler start myapp"));
+    console.log(chalk31.dim("  bindler start --all    # start all npm projects"));
     process.exit(1);
   }
   await startCommand(name, options);
 });
 program.command("stop [name]").description("Stop an npm project").option("-a, --all", "Stop all npm projects").action(async (name, options) => {
   if (!name && !options.all) {
-    console.log(chalk30.red("Usage: bindler stop <name> or bindler stop --all"));
-    console.log(chalk30.dim("\nExamples:"));
-    console.log(chalk30.dim("  bindler stop myapp"));
-    console.log(chalk30.dim("  bindler stop --all    # stop all npm projects"));
+    console.log(chalk31.red("Usage: bindler stop <name> or bindler stop --all"));
+    console.log(chalk31.dim("\nExamples:"));
+    console.log(chalk31.dim("  bindler stop myapp"));
+    console.log(chalk31.dim("  bindler stop --all    # stop all npm projects"));
     process.exit(1);
   }
   await stopCommand(name, options);
 });
 program.command("restart [name]").description("Restart an npm project").option("-a, --all", "Restart all npm projects").action(async (name, options) => {
   if (!name && !options.all) {
-    console.log(chalk30.red("Usage: bindler restart <name> or bindler restart --all"));
-    console.log(chalk30.dim("\nExamples:"));
-    console.log(chalk30.dim("  bindler restart myapp"));
-    console.log(chalk30.dim("  bindler restart --all    # restart all npm projects"));
+    console.log(chalk31.red("Usage: bindler restart <name> or bindler restart --all"));
+    console.log(chalk31.dim("\nExamples:"));
+    console.log(chalk31.dim("  bindler restart myapp"));
+    console.log(chalk31.dim("  bindler restart --all    # restart all npm projects"));
     process.exit(1);
   }
   await restartCommand(name, options);
 });
 program.command("logs [name]").description("Show logs for an npm project").option("-f, --follow", "Follow log output").option("-l, --lines <n>", "Number of lines to show", "200").action(async (name, options) => {
   if (!name) {
-    console.log(chalk30.red("Usage: bindler logs <name>"));
-    console.log(chalk30.dim("\nExamples:"));
-    console.log(chalk30.dim("  bindler logs myapp"));
-    console.log(chalk30.dim("  bindler logs myapp --follow"));
-    console.log(chalk30.dim("  bindler logs myapp --lines 500"));
+    console.log(chalk31.red("Usage: bindler logs <name>"));
+    console.log(chalk31.dim("\nExamples:"));
+    console.log(chalk31.dim("  bindler logs myapp"));
+    console.log(chalk31.dim("  bindler logs myapp --follow"));
+    console.log(chalk31.dim("  bindler logs myapp --lines 500"));
     process.exit(1);
   }
   await logsCommand(name, { ...options, lines: parseInt(options.lines, 10) });
 });
 program.command("update [name]").description("Update project configuration").option("-h, --hostname <hostname>", "New hostname").option("--port <port>", "New port number").option("-s, --start <command>", "New start command").option("-p, --path <path>", "New project path").option("-e, --env <vars...>", "Environment variables (KEY=value)").option("--enable", "Enable the project").option("--disable", "Disable the project").action(async (name, options) => {
   if (!name) {
-    console.log(chalk30.red("Usage: bindler update <name> [options]"));
-    console.log(chalk30.dim("\nExamples:"));
-    console.log(chalk30.dim("  bindler update myapp --hostname newapp.example.com"));
-    console.log(chalk30.dim("  bindler update myapp --port 4000"));
-    console.log(chalk30.dim("  bindler update myapp --disable"));
+    console.log(chalk31.red("Usage: bindler update <name> [options]"));
+    console.log(chalk31.dim("\nExamples:"));
+    console.log(chalk31.dim("  bindler update myapp --hostname newapp.example.com"));
+    console.log(chalk31.dim("  bindler update myapp --port 4000"));
+    console.log(chalk31.dim("  bindler update myapp --disable"));
     process.exit(1);
   }
   await updateCommand(name, options);
 });
 program.command("edit [name]").description("Edit project configuration in $EDITOR").action(async (name) => {
   if (!name) {
-    console.log(chalk30.red("Usage: bindler edit <name>"));
-    console.log(chalk30.dim("\nOpens the project config in your $EDITOR"));
-    console.log(chalk30.dim("\nExample:"));
-    console.log(chalk30.dim("  bindler edit myapp"));
+    console.log(chalk31.red("Usage: bindler edit <name>"));
+    console.log(chalk31.dim("\nOpens the project config in your $EDITOR"));
+    console.log(chalk31.dim("\nExample:"));
+    console.log(chalk31.dim("  bindler edit myapp"));
     process.exit(1);
   }
   await editCommand(name);
 });
 program.command("remove [name]").alias("rm").description("Remove a project from registry").option("-f, --force", "Skip confirmation").option("--apply", "Apply nginx config after removing").action(async (name, options) => {
   if (!name) {
-    console.log(chalk30.red("Usage: bindler remove <name>"));
-    console.log(chalk30.dim("\nExamples:"));
-    console.log(chalk30.dim("  bindler remove myapp"));
-    console.log(chalk30.dim("  bindler remove myapp --force    # skip confirmation"));
-    console.log(chalk30.dim("  bindler rm myapp                # alias"));
+    console.log(chalk31.red("Usage: bindler remove <name>"));
+    console.log(chalk31.dim("\nExamples:"));
+    console.log(chalk31.dim("  bindler remove myapp"));
+    console.log(chalk31.dim("  bindler remove myapp --force    # skip confirmation"));
+    console.log(chalk31.dim("  bindler rm myapp                # alias"));
     process.exit(1);
   }
   await removeCommand(name, options);
@@ -4025,10 +4200,10 @@ program.command("info").description("Show bindler information and stats").action
 });
 program.command("check [hostname]").description("Check DNS propagation and HTTP accessibility for a hostname").option("-v, --verbose", "Show verbose output").action(async (hostname, options) => {
   if (!hostname) {
-    console.log(chalk30.red("Usage: bindler check <hostname>"));
-    console.log(chalk30.dim("\nExamples:"));
-    console.log(chalk30.dim("  bindler check myapp.example.com"));
-    console.log(chalk30.dim("  bindler check myapp          # uses project name"));
+    console.log(chalk31.red("Usage: bindler check <hostname>"));
+    console.log(chalk31.dim("\nExamples:"));
+    console.log(chalk31.dim("  bindler check myapp.example.com"));
+    console.log(chalk31.dim("  bindler check myapp          # uses project name"));
     process.exit(1);
   }
   await checkCommand(hostname, options);
@@ -4072,5 +4247,8 @@ program.command("clone [source] [new-name]").description("Clone a project config
 program.command("dev [name]").description("Start a project in development mode with hot reload").option("-p, --port <port>", "Override port number").option("-h, --hostname <hostname>", "Override hostname").action(async (name, options) => {
   await devCommand(name, options);
 });
+program.command("config [action] [key] [value]").description("View or modify bindler configuration").action(async (action, key, value) => {
+  await configCommand(action, key, value);
+});
 program.parse();
 //# sourceMappingURL=cli.js.map