opentunnel-cli 1.0.31 → 1.0.33

package/dist/cli/index.js

@@ -238,7 +238,7 @@ program
     .name("opentunnel")
     .alias("ot")
     .description("Expose local ports to the internet via custom domains, ngrok, or Cloudflare Tunnel")
-    .version("1.0.31");
+    .version("1.0.33");
 // Helper function to build WebSocket URL from domain
 // User only provides base domain (e.g., fjrg2007.com), system handles the rest
 // Note: --insecure flag only affects certificate verification, not the protocol
@@ -651,9 +651,9 @@ program
     .option("--streaming", "Enable streaming mode (longer timeouts for video/large files)")
     .option("--timeout <ms>", "Custom request timeout in milliseconds")
     .option("--ngrok", "Use ngrok instead of OpenTunnel server")
-    .option("--region <region>", "Ngrok region (us, eu, ap, au, sa, jp, in)", "us")
+    .option("--region <region>", "Region (ngrok: us, eu, ap, au, sa, jp, in)", "us")
     .option("--cloudflare, --cf", "Use Cloudflare Tunnel instead of OpenTunnel server")
-    .option("--cf-hostname <hostname>", "Custom hostname for Cloudflare Tunnel")
+    .option("--hostname <hostname>", "Custom hostname for tunnel (cloudflare named tunnels)")
     .option("--provider <provider>", "Tunnel provider (opentunnel, ngrok, cloudflare)")
     .action(async (port, options) => {
     // Determine provider
@@ -666,8 +666,8 @@ program
             protocol: options.https ? "https" : "http",
             localHost: options.host,
             localPort: parseInt(port),
-            hostname: options.cfHostname,
-            tunnelName: options.subdomain, // -n works as tunnel name for CF
+            hostname: options.hostname,
+            tunnelName: options.subdomain, // -n works as tunnel name
             noTlsVerify: options.insecure,
         });
         return;
@@ -721,9 +721,9 @@ program
     .option("-h, --host <host>", "Local host", "localhost")
     .option("--insecure", "Skip SSL verification (for self-signed certs)")
     .option("--ngrok", "Use ngrok instead of OpenTunnel server")
-    .option("--region <region>", "Ngrok region (us, eu, ap, au, sa, jp, in)", "us")
+    .option("--region <region>", "Region (ngrok: us, eu, ap, au, sa, jp, in)", "us")
     .option("--cloudflare, --cf", "Use Cloudflare Tunnel (TCP requires named tunnel)")
-    .option("--cf-hostname <hostname>", "Custom hostname for Cloudflare Tunnel")
+    .option("--hostname <hostname>", "Custom hostname for tunnel")
     .option("--provider <provider>", "Tunnel provider (opentunnel, ngrok, cloudflare)")
     .action(async (port, options) => {
     // Determine provider
@@ -741,7 +741,7 @@ program
             protocol: "tcp",
             localHost: options.host,
             localPort: parseInt(port),
-            hostname: options.cfHostname,
+            hostname: options.hostname,
             tunnelName: options.subdomain,
             noTlsVerify: options.insecure,
         });
@@ -2661,8 +2661,8 @@ async function startTunnelsFromConfig(tunnels, serverUrl, token, insecure, globa
     const ngrokTunnels = tunnelsByProvider.get("ngrok") || [];
     for (const tunnel of ngrokTunnels) {
         const spinner = (0, ora_1.default)(`Creating ngrok tunnel: ${tunnel.name}...`).start();
-        const ngrokToken = tunnel.ngrokToken || globalConfig?.ngrok?.token;
-        const ngrokRegion = tunnel.ngrokRegion || globalConfig?.ngrok?.region || "us";
+        const ngrokToken = tunnel.token || globalConfig?.token;
+        const ngrokRegion = tunnel.region || globalConfig?.region || "us";
         // Merge IP access config: tunnel-specific > global security > none
         const { IpFilter } = await Promise.resolve().then(() => __importStar(require("../shared/ip-filter")));
         const ipAccess = IpFilter.mergeConfigs(globalConfig?.security?.ipAccess, tunnel.ipAccess);
@@ -2693,31 +2693,31 @@ async function startTunnelsFromConfig(tunnels, serverUrl, token, insecure, globa
     const cloudflareTunnels = tunnelsByProvider.get("cloudflare") || [];
     for (const tunnel of cloudflareTunnels) {
         const spinner = (0, ora_1.default)(`Creating Cloudflare tunnel: ${tunnel.name}...`).start();
-        const cfHostname = tunnel.cfHostname || globalConfig?.cloudflare?.hostname;
-        // For Cloudflare: subdomain = tunnel name (for named tunnels)
-        const cfTunnelName = tunnel.subdomain || globalConfig?.cloudflare?.tunnelName;
-        // Validate: named tunnels require cfHostname for public access
-        if (cfTunnelName && !cfHostname) {
-            spinner.fail(`${tunnel.name}: Named tunnel '${cfTunnelName}' requires cfHostname`);
+        const tunnelHostname = tunnel.hostname || globalConfig?.hostname;
+        // tunnelName takes priority, subdomain as fallback for compatibility
+        const namedTunnel = tunnel.tunnelName || tunnel.subdomain || globalConfig?.tunnelName;
+        // Validate: named tunnels require hostname for public access
+        if (namedTunnel && !tunnelHostname) {
+            spinner.fail(`${tunnel.name}: Named tunnel '${namedTunnel}' requires hostname`);
             console.log(chalk_1.default.gray(`  Add to your config:`));
-            console.log(chalk_1.default.white(`    cfHostname: ${cfTunnelName}.yourdomain.com`));
-            console.log(chalk_1.default.gray(`  Or remove 'subdomain' for a quick tunnel with random URL`));
+            console.log(chalk_1.default.white(`    hostname: ${namedTunnel}.yourdomain.com`));
+            console.log(chalk_1.default.gray(`  Or remove 'tunnelName' for a quick tunnel with random URL`));
             continue;
         }
         // Merge IP access config: tunnel-specific > global security > none
         const { IpFilter } = await Promise.resolve().then(() => __importStar(require("../shared/ip-filter")));
         const ipAccess = IpFilter.mergeConfigs(globalConfig?.security?.ipAccess, tunnel.ipAccess);
         const client = new CloudflareTunnelClient_1.CloudflareTunnelClient({
-            hostname: cfHostname,
-            tunnelName: cfTunnelName,
+            hostname: tunnelHostname,
+            tunnelName: namedTunnel,
             protocol: tunnel.protocol === "https" ? "https" : "http",
             ipAccess,
         });
         try {
             await client.connect();
             // Auto-route DNS if using named tunnel with hostname
-            if (cfTunnelName && cfHostname) {
-                const routeResult = await CloudflareTunnelClient_1.CloudflareTunnelClient.routeDns(cfTunnelName, cfHostname);
+            if (namedTunnel && tunnelHostname) {
+                const routeResult = await CloudflareTunnelClient_1.CloudflareTunnelClient.routeDns(namedTunnel, tunnelHostname);
                 if (!routeResult.success && !routeResult.error?.includes("already exists")) {
                     spinner.warn(`${tunnel.name}: DNS routing failed: ${routeResult.error}`);
                 }
@@ -2729,7 +2729,7 @@ async function startTunnelsFromConfig(tunnels, serverUrl, token, insecure, globa
             });
             activeTunnels.push({ name: tunnel.name, tunnelId, publicUrl, provider: "cloudflare", client });
             clients.push({ provider: "cloudflare", client });
-            const tunnelMode = cfTunnelName ? ` [${cfTunnelName}]` : "";
+            const tunnelMode = namedTunnel ? ` [${namedTunnel}]` : "";
             spinner.succeed(`${tunnel.name}: ${publicUrl}${tunnelMode} (cloudflare)`);
         }
         catch (err) {
@@ -3426,5 +3426,174 @@ configCommand
     console.log(chalk_1.default.gray("  " + "─".repeat(40)));
     console.log(chalk_1.default.gray(`\n  Config file: ${credentials_1.CredentialsManager.getCredentialsFile()}\n`));
 });
+// =============================================================================
+// Diagnose command - Generate troubleshooting report
+// =============================================================================
+program
+    .command("diagnose")
+    .description("Generate a diagnostic report for troubleshooting")
+    .option("-o, --output <file>", "Output file name", "opentunnel-diagnostic.txt")
+    .action(async (options) => {
+    const os = await Promise.resolve().then(() => __importStar(require("os")));
+    const { execSync } = await Promise.resolve().then(() => __importStar(require("child_process")));
+    const lines = [];
+    const addSection = (title) => {
+        lines.push("");
+        lines.push("=".repeat(60));
+        lines.push(title);
+        lines.push("=".repeat(60));
+    };
+    const addLine = (label, value) => {
+        lines.push(`${label.padEnd(25)}: ${value}`);
+    };
+    const runCommand = (cmd) => {
+        try {
+            return execSync(cmd, { encoding: "utf-8", timeout: 5000 }).trim();
+        }
+        catch {
+            return "(not available)";
+        }
+    };
+    lines.push("OpenTunnel Diagnostic Report");
+    lines.push(`Generated: ${new Date().toISOString()}`);
+    // System Information
+    addSection("SYSTEM INFORMATION");
+    addLine("OpenTunnel Version", program.version() || "unknown");
+    addLine("Node.js Version", process.version);
+    addLine("Platform", `${os.platform()} (${os.arch()})`);
+    addLine("OS Release", os.release());
+    addLine("OS Type", os.type());
+    addLine("Hostname", os.hostname());
+    addLine("Working Directory", process.cwd());
+    addLine("Home Directory", os.homedir());
+    addLine("Total Memory", `${Math.round(os.totalmem() / 1024 / 1024 / 1024)} GB`);
+    addLine("Free Memory", `${Math.round(os.freemem() / 1024 / 1024 / 1024)} GB`);
+    // Provider Status
+    addSection("PROVIDER STATUS");
+    // Check cloudflared
+    const cloudflaredVersion = runCommand("cloudflared --version");
+    addLine("cloudflared", cloudflaredVersion.includes("cloudflared") ? cloudflaredVersion.split("\n")[0] : "(not installed)");
+    // Check ngrok
+    const ngrokVersion = runCommand("ngrok version");
+    addLine("ngrok", ngrokVersion.includes("ngrok") ? ngrokVersion : "(not installed)");
+    // Configuration
+    addSection("CONFIGURATION");
+    const configPath = path.join(process.cwd(), CONFIG_FILE);
+    if (fs.existsSync(configPath)) {
+        addLine("Config File", configPath);
+        try {
+            const config = loadConfig(configPath);
+            if (config) {
+                addLine("Provider", config.provider || "opentunnel");
+                addLine("Mode", config.mode || "auto");
+                addLine("Tunnel Name", config.tunnelName || "(not set)");
+                addLine("Hostname", config.hostname || "(not set)");
+                addLine("Region", config.region || "(not set)");
+                addLine("Tunnels Count", config.tunnels?.length?.toString() || "0");
+                if (config.tunnels) {
+                    lines.push("");
+                    lines.push("Configured Tunnels:");
+                    for (const t of config.tunnels) {
+                        lines.push(`  - ${t.name}: ${t.protocol}://localhost:${t.port} (provider: ${t.provider || config.provider || "opentunnel"})`);
+                    }
+                }
+            }
+        }
+        catch (err) {
+            addLine("Config Parse Error", err.message);
+        }
+    }
+    else {
+        addLine("Config File", "(not found)");
+    }
+    // Credentials
+    addSection("CREDENTIALS STATUS");
+    const credsFile = credentials_1.CredentialsManager.getCredentialsFile();
+    addLine("Credentials File", fs.existsSync(credsFile) ? "exists" : "not found");
+    try {
+        const credsMgr = new credentials_1.CredentialsManager();
+        const creds = credsMgr.getAll();
+        addLine("ngrok Token", creds.ngrok?.token ? "configured" : "not set");
+        addLine("Cloudflare Auth", creds.cloudflare ? "configured" : "not set");
+    }
+    catch {
+        addLine("Credentials", "(error reading)");
+    }
+    // Running Instances
+    addSection("RUNNING INSTANCES");
+    const runDir = path.join(os.homedir(), ".opentunnel", "run");
+    if (fs.existsSync(runDir)) {
+        const pidFiles = fs.readdirSync(runDir).filter(f => f.endsWith(".pid"));
+        if (pidFiles.length > 0) {
+            for (const pidFile of pidFiles) {
+                const name = pidFile.replace(".pid", "");
+                const pidPath = path.join(runDir, pidFile);
+                try {
+                    const pid = fs.readFileSync(pidPath, "utf-8").trim();
+                    addLine(`Instance: ${name}`, `PID ${pid}`);
+                }
+                catch {
+                    addLine(`Instance: ${name}`, "(error reading PID)");
+                }
+            }
+        }
+        else {
+            lines.push("No running instances found");
+        }
+    }
+    else {
+        lines.push("No running instances found");
+    }
+    // Recent Logs
+    addSection("RECENT LOGS (last 50 lines)");
+    const logsDir = path.join(os.homedir(), ".opentunnel", "logs");
+    if (fs.existsSync(logsDir)) {
+        const logFiles = fs.readdirSync(logsDir)
+            .filter(f => f.endsWith(".log"))
+            .map(f => ({ name: f, mtime: fs.statSync(path.join(logsDir, f)).mtime }))
+            .sort((a, b) => b.mtime.getTime() - a.mtime.getTime());
+        if (logFiles.length > 0) {
+            const latestLog = logFiles[0];
+            lines.push(`Log file: ${latestLog.name}`);
+            lines.push("-".repeat(40));
+            try {
+                const logContent = fs.readFileSync(path.join(logsDir, latestLog.name), "utf-8");
+                const logLines = logContent.split("\n").slice(-50);
+                lines.push(...logLines);
+            }
+            catch {
+                lines.push("(error reading log file)");
+            }
+        }
+        else {
+            lines.push("No log files found");
+        }
+    }
+    else {
+        lines.push("No logs directory found");
+    }
+    // Environment Variables (relevant ones only)
+    addSection("ENVIRONMENT");
+    const relevantEnvVars = [
+        "OPENTUNNEL_TOKEN",
+        "NGROK_AUTHTOKEN",
+        "CLOUDFLARE_TUNNEL_TOKEN",
+        "TUNNEL_TOKEN",
+        "HTTP_PROXY",
+        "HTTPS_PROXY",
+        "NO_PROXY"
+    ];
+    for (const envVar of relevantEnvVars) {
+        const value = process.env[envVar];
+        addLine(envVar, value ? "(set)" : "(not set)");
+    }
+    // Write report
+    const reportContent = lines.join("\n");
+    const outputFile = options.output;
+    fs.writeFileSync(outputFile, reportContent, "utf-8");
+    console.log(chalk_1.default.green(`\n✓ Diagnostic report generated: ${outputFile}`));
+    console.log(chalk_1.default.gray(`\nInclude this file when reporting issues at:`));
+    console.log(chalk_1.default.cyan("  https://github.com/anthropics/opentunnel/issues\n"));
+});
 program.parse();
 //# sourceMappingURL=index.js.map