@chenpu17/tcpmapping 2.1.1 → 2.4.1

package/bin/tcpmapping.js

@@ -1,269 +1,538 @@
 #!/usr/bin/env node
 
-const { spawn, execSync } = require('child_process');
+const { spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
+const http = require('http');
+const net = require('net');
 
 const APP_NAME = 'tcpmapping';
-const DATA_DIR = path.join(os.homedir(), '.tcpmapping');
+const DATA_DIR = process.env.TCPMAPPING_DATA_DIR || path.join(os.homedir(), '.tcpmapping');
 const PID_FILE = path.join(DATA_DIR, 'tcpmapping.pid');
 const LOG_FILE = path.join(DATA_DIR, 'tcpmapping.log');
 const SERVER_FILE = path.join(__dirname, '..', 'server.js');
 const SETUP_PASSWORD_FILE = path.join(__dirname, '..', 'setup-password.js');
 
-// 获取命令行参数
-const args = process.argv.slice(2);
+// 解析命令行参数
+function parseArgs(argv) {
+  const options = { port: null, host: null };
+  const positional = [];
+
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i];
+
+    if (arg === '--port' || arg === '-p') {
+      options.port = argv[++i];
+    } else if (arg.startsWith('--port=')) {
+      options.port = arg.slice('--port='.length);
+    } else if (arg === '--host' || arg === '-H' || arg === '--listen') {
+      options.host = argv[++i];
+    } else if (arg.startsWith('--host=')) {
+      options.host = arg.slice('--host='.length);
+    } else if (arg.startsWith('--listen=')) {
+      options.host = arg.slice('--listen='.length);
+    } else {
+      positional.push(arg);
+    }
+  }
+
+  return { options, positional };
+}
+
+const { options: webuiOptions, positional: args } = parseArgs(process.argv.slice(2));
 const command = args[0] || 'help';
 
-// 颜色输出
+if (webuiOptions.port !== null && !isValidPort(webuiOptions.port)) {
+  console.error(`无效的端口: ${webuiOptions.port}（应为 1-65535）`);
+  process.exit(1);
+}
+
+if (webuiOptions.host !== null && !isValidHost(webuiOptions.host)) {
+  console.error(`无效的监听地址: ${webuiOptions.host}`);
+  process.exit(1);
+}
+
+// 颜色输出（非 TTY 或设置了 NO_COLOR 时自动关闭）
+const useColor = Boolean(process.stdout.isTTY) && !process.env.NO_COLOR;
+const colorize = (code) => (text) => useColor ? `\x1b[${code}m${text}\x1b[0m` : String(text);
+
 const colors = {
-  green: (text) => `\x1b[32m${text}\x1b[0m`,
-  red: (text) => `\x1b[31m${text}\x1b[0m`,
-  yellow: (text) => `\x1b[33m${text}\x1b[0m`,
-  blue: (text) => `\x1b[34m${text}\x1b[0m`,
-  cyan: (text) => `\x1b[36m${text}\x1b[0m`,
-  gray: (text) => `\x1b[90m${text}\x1b[0m`
+  green: colorize(32),
+  red: colorize(31),
+  yellow: colorize(33),
+  blue: colorize(34),
+  cyan: colorize(36),
+  gray: colorize(90)
 };
 
+function delay(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
 // 确保数据目录存在
 function ensureDataDir() {
   if (!fs.existsSync(DATA_DIR)) {
-    fs.mkdirSync(DATA_DIR, { recursive: true });
+    fs.mkdirSync(DATA_DIR, { recursive: true, mode: 0o700 });
   }
 }
 
+// 读取配置文件
+function readConfig() {
+  const candidates = [
+    path.join(process.cwd(), 'config.json'),
+    path.join(DATA_DIR, 'config.json')
+  ];
+
+  for (const configPath of candidates) {
+    try {
+      if (fs.existsSync(configPath)) {
+        return { path: configPath, data: JSON.parse(fs.readFileSync(configPath, 'utf8')) };
+      }
+    } catch (error) {
+      console.warn(colors.yellow(`警告: 配置文件解析失败 (${configPath}): ${error.message}`));
+    }
+  }
+
+  return { path: null, data: null };
+}
+
 // 获取配置文件路径（按优先级）
 function getConfigPath() {
-  // 优先级1: 当前工作目录
-  const cwdPath = path.join(process.cwd(), 'config.json');
-  if (fs.existsSync(cwdPath)) {
-    return cwdPath;
-  }
+  return readConfig().path;
+}
 
-  // 优先级2: 用户数据目录
-  const dataPath = path.join(DATA_DIR, 'config.json');
-  if (fs.existsSync(dataPath)) {
-    return dataPath;
+// 获取认证配置文件路径
+function getAuthConfigPath() {
+  const candidates = [
+    path.join(process.cwd(), 'auth-config.json'),
+    path.join(DATA_DIR, 'auth-config.json')
+  ];
+
+  for (const authPath of candidates) {
+    if (fs.existsSync(authPath)) {
+      return authPath;
+    }
   }
 
   return null;
 }
 
-// 获取认证配置文件路径
-function getAuthConfigPath() {
-  const cwdPath = path.join(process.cwd(), 'auth-config.json');
-  if (fs.existsSync(cwdPath)) {
-    return cwdPath;
+// 验证端口
+function isValidPort(port) {
+  const p = Number(port);
+  return Number.isInteger(p) && p >= 1 && p <= 65535;
+}
+
+// 验证 IP 地址或主机名（与 server.js 保持一致）
+function isValidHost(host) {
+  if (!host || typeof host !== 'string') return false;
+
+  const value = host.trim();
+  if (!value || value.length > 253) return false;
+  if (net.isIP(value)) return true;
+
+  const hostnamePattern = /^[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
+  return hostnamePattern.test(value);
+}
+
+// 获取 WebUI 访问信息（优先级：命令行参数 > 环境变量 > 配置文件）
+function getWebuiInfo() {
+  const config = readConfig().data;
+  const webui = (config && config.webui) || {};
+
+  let host = webui.host || '127.0.0.1';
+  let port = Number(webui.port) || 9999;
+
+  if (process.env.WEBUI_PORT && isValidPort(process.env.WEBUI_PORT)) {
+    port = Number(process.env.WEBUI_PORT);
+  }
+  if (process.env.WEBUI_HOST && isValidHost(process.env.WEBUI_HOST)) {
+    host = process.env.WEBUI_HOST.trim();
   }
 
-  const dataPath = path.join(DATA_DIR, 'auth-config.json');
-  if (fs.existsSync(dataPath)) {
-    return dataPath;
+  // 命令行参数优先级最高
+  if (webuiOptions.port !== null) {
+    port = Number(webuiOptions.port);
+  }
+  if (webuiOptions.host !== null) {
+    host = webuiOptions.host.trim();
   }
 
-  return null;
+  return {
+    enabled: webui.enabled !== false,
+    host,
+    port
+  };
+}
+
+// 将监听地址转换为可访问地址
+function getAccessHost(host) {
+  if (host === '0.0.0.0' || host === '::' || !host) {
+    return 'localhost';
+  }
+  if (host.includes(':')) {
+    return `[${host}]`;
+  }
+  return host;
+}
+
+// 列出可访问地址（监听所有网卡时包含本机局域网 IP，便于远程访问）
+function getAccessHosts(host) {
+  if (host !== '0.0.0.0' && host !== '::') {
+    return [getAccessHost(host)];
+  }
+
+  const hosts = ['localhost'];
+  const interfaces = os.networkInterfaces();
+  for (const entries of Object.values(interfaces)) {
+    for (const entry of entries || []) {
+      if (entry.family === 'IPv4' && !entry.internal) {
+        hosts.push(entry.address);
+      }
+    }
+  }
+  return hosts;
+}
+
+// 检查进程是否存在
+function isAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    // 无权限说明进程存在（属于其他用户）
+    return error.code === 'EPERM';
+  }
 }
 
 // 检查进程是否运行
 function isRunning() {
   ensureDataDir();
+
   if (!fs.existsSync(PID_FILE)) {
-    return false;
+    return null;
   }
 
-  const pid = fs.readFileSync(PID_FILE, 'utf8').trim();
+  const pid = parseInt(fs.readFileSync(PID_FILE, 'utf8').trim(), 10);
+
+  if (Number.isInteger(pid) && pid > 0 && isAlive(pid)) {
+    return pid;
+  }
 
+  // 进程不存在，清理过期的 PID 文件
   try {
-    process.kill(parseInt(pid), 0);
-    return parseInt(pid);
-  } catch (e) {
-    // 进程不存在，清理PID文件
     fs.unlinkSync(PID_FILE);
-    return false;
+  } catch (error) {
+    // 忽略清理失败
+  }
+  return null;
+}
+
+// 读取日志末尾内容
+function readLogTail(lineCount) {
+  try {
+    if (!fs.existsSync(LOG_FILE)) {
+      return null;
+    }
+
+    const stat = fs.statSync(LOG_FILE);
+    const maxBytes = 64 * 1024;
+    const size = Math.min(stat.size, maxBytes);
+    if (size === 0) {
+      return '';
+    }
+
+    const buffer = Buffer.alloc(size);
+    const fd = fs.openSync(LOG_FILE, 'r');
+    try {
+      fs.readSync(fd, buffer, 0, size, stat.size - size);
+    } finally {
+      fs.closeSync(fd);
+    }
+
+    return buffer.toString('utf8').split('\n').slice(-lineCount).join('\n');
+  } catch (error) {
+    return null;
   }
 }
 
 // 启动服务
-function start() {
+async function start() {
   const pid = isRunning();
   if (pid) {
-    console.log(colors.yellow(`${APP_NAME} is already running (PID: ${pid})`));
+    console.log(colors.yellow(`${APP_NAME} 已在运行 (PID: ${pid})`));
+    console.log(colors.gray('如需修改端口或监听地址，请使用: tcpmapping restart --port <port> --host <host>'));
     return;
   }
 
-  // 检查是否已初始化
-  const configPath = getConfigPath();
-  const authPath = getAuthConfigPath();
-
-  if (!authPath) {
+  if (!getAuthConfigPath()) {
     console.log(colors.yellow('未设置管理员密码，请先运行:'));
     console.log(colors.cyan('  tcpmapping setup-password'));
     return;
   }
 
   ensureDataDir();
-  console.log(colors.blue(`Starting ${APP_NAME}...`));
+  console.log(colors.blue(`正在启动 ${APP_NAME}...`));
+
+  // 将生效的 WebUI 地址显式传给子进程，确保实际监听与提示一致
+  const webui = getWebuiInfo();
 
   const out = fs.openSync(LOG_FILE, 'a');
   const err = fs.openSync(LOG_FILE, 'a');
 
-  const child = spawn('node', [SERVER_FILE], {
-    detached: true,
-    stdio: ['ignore', out, err],
-    cwd: process.cwd() // 使用当前目录，以便server可以找到当前目录的config
-  });
+  let child;
+  try {
+    child = spawn(process.execPath, [SERVER_FILE], {
+      detached: true,
+      stdio: ['ignore', out, err],
+      // 使用当前目录，以便 server 可以找到当前目录的 config.json
+      cwd: process.cwd(),
+      env: {
+        ...process.env,
+        WEBUI_HOST: webui.host,
+        WEBUI_PORT: String(webui.port)
+      }
+    });
+  } finally {
+    // 子进程已继承文件描述符，父进程可以关闭
+    fs.closeSync(out);
+    fs.closeSync(err);
+  }
 
-  fs.writeFileSync(PID_FILE, child.pid.toString());
+  fs.writeFileSync(PID_FILE, String(child.pid));
   child.unref();
 
-  console.log(colors.green(`${APP_NAME} started successfully (PID: ${child.pid})`));
-  console.log(colors.cyan(`WebUI: http://localhost:9999`));
-  console.log(colors.gray(`Log file: ${LOG_FILE}`));
+  // 短暂等待，捕获启动即失败的情况（如端口被占用、配置错误）
+  await delay(500);
+
+  if (!isAlive(child.pid)) {
+    try {
+      fs.unlinkSync(PID_FILE);
+    } catch (error) {
+      // 忽略
+    }
+    console.log(colors.red(`${APP_NAME} 启动失败`));
+    const tail = readLogTail(15);
+    if (tail) {
+      console.log(colors.gray('最近日志:'));
+      console.log(tail);
+    }
+    console.log(colors.gray(`完整日志: ${LOG_FILE}`));
+    process.exitCode = 1;
+    return;
+  }
+
+  console.log(colors.green(`${APP_NAME} 启动成功 (PID: ${child.pid})`));
+  if (webui.enabled) {
+    const urls = getAccessHosts(webui.host).map(host => `http://${host}:${webui.port}`);
+    console.log(colors.cyan(`WebUI: ${urls.join('\n       ')}`));
+    if (webui.host === '0.0.0.0' || webui.host === '::') {
+      console.log(colors.yellow('提示: WebUI 监听在所有网卡上，请确保使用强密码'));
+    }
+  }
+  console.log(colors.gray(`日志文件: ${LOG_FILE}`));
+  const configPath = getConfigPath();
   if (configPath) {
-    console.log(colors.gray(`Config: ${configPath}`));
+    console.log(colors.gray(`配置文件: ${configPath}`));
   }
 }
 
 // 停止服务
-function stop() {
+async function stop() {
   const pid = isRunning();
   if (!pid) {
-    console.log(colors.yellow(`${APP_NAME} is not running`));
+    console.log(colors.yellow(`${APP_NAME} 未在运行`));
     return;
   }
 
-  console.log(colors.blue(`Stopping ${APP_NAME} (PID: ${pid})...`));
+  console.log(colors.blue(`正在停止 ${APP_NAME} (PID: ${pid})...`));
 
   try {
     process.kill(pid, 'SIGTERM');
 
-    // 等待进程退出
+    // 最多等待 5 秒，让服务优雅退出
     let attempts = 0;
-    while (attempts < 10) {
+    while (attempts < 20 && isAlive(pid)) {
+      await delay(250);
+      attempts++;
+    }
+
+    // 仍未退出则强制终止
+    if (isAlive(pid)) {
+      console.log(colors.yellow('服务未在预期时间内退出，正在强制终止...'));
       try {
-        process.kill(pid, 0);
-        // 进程仍在运行
-        require('child_process').execSync('sleep 0.5');
-        attempts++;
-      } catch (e) {
-        // 进程已退出
-        break;
+        process.kill(pid, 'SIGKILL');
+      } catch (error) {
+        // 进程可能已退出
       }
+      await delay(200);
     }
 
-    // 如果进程仍在运行，强制终止
     try {
-      process.kill(pid, 0);
-      process.kill(pid, 'SIGKILL');
-    } catch (e) {
-      // 进程已退出
-    }
-
-    if (fs.existsSync(PID_FILE)) {
       fs.unlinkSync(PID_FILE);
+    } catch (error) {
+      // 忽略
     }
 
-    console.log(colors.green(`${APP_NAME} stopped successfully`));
-  } catch (e) {
-    console.log(colors.red(`Failed to stop ${APP_NAME}: ${e.message}`));
+    console.log(colors.green(`${APP_NAME} 已停止`));
+  } catch (error) {
+    console.log(colors.red(`停止 ${APP_NAME} 失败: ${error.message}`));
   }
 }
 
 // 重启服务
-function restart() {
-  console.log(colors.blue(`Restarting ${APP_NAME}...`));
-  stop();
-  setTimeout(() => {
-    start();
-  }, 1000);
+async function restart() {
+  console.log(colors.blue(`正在重启 ${APP_NAME}...`));
+  await stop();
+  await delay(300);
+  await start();
+}
+
+// 请求健康检查接口
+function fetchHealth(host, port) {
+  return new Promise((resolve) => {
+    const request = http.get({
+      host: host,
+      port: port,
+      path: '/api/health',
+      timeout: 2000
+    }, (res) => {
+      let data = '';
+      res.on('data', chunk => data += chunk);
+      res.on('end', () => {
+        try {
+          resolve(JSON.parse(data));
+        } catch (error) {
+          resolve(null);
+        }
+      });
+    });
+
+    request.on('error', () => resolve(null));
+    request.on('timeout', () => {
+      request.destroy();
+      resolve(null);
+    });
+  });
 }
 
 // 查看状态
-function status() {
+async function status() {
   const pid = isRunning();
   const configPath = getConfigPath();
   const authPath = getAuthConfigPath();
+  const webui = getWebuiInfo();
 
   console.log(colors.cyan('=== TcpMapping Status ===\n'));
 
-  // 服务状态
   if (pid) {
-    console.log(colors.green(`Service: Running (PID: ${pid})`));
-
-    // 尝试获取健康状态
-    try {
-      const http = require('http');
-      const req = http.get('http://localhost:9999/api/health', { timeout: 2000 }, (res) => {
-        let data = '';
-        res.on('data', chunk => data += chunk);
-        res.on('end', () => {
-          try {
-            const health = JSON.parse(data);
-            console.log(`  Uptime: ${Math.floor(health.uptime / 60)} minutes`);
-            console.log(`  Active Mappings: ${health.activeMappings}`);
-            console.log(`  Active Connections: ${health.activeConnections}`);
-          } catch (e) {}
-          showPaths();
-        });
-      });
-      req.on('error', () => showPaths());
-      req.on('timeout', () => { req.destroy(); showPaths(); });
-    } catch (e) {
-      showPaths();
+    console.log(colors.green(`服务状态: 运行中 (PID: ${pid})`));
+
+    if (webui.enabled) {
+      const host = webui.host === '0.0.0.0' || webui.host === '::' ? '127.0.0.1' : webui.host;
+      const health = await fetchHealth(host, webui.port);
+
+      if (health) {
+        console.log(`  WebUI: ${getAccessHosts(webui.host).map(item => `http://${item}:${webui.port}`).join('  ')}`);
+        console.log(`  运行时间: ${Math.floor(health.uptime / 60)} 分钟`);
+        console.log(`  活跃映射: ${health.activeMappings}`);
+        console.log(`  活跃连接: ${health.activeConnections}`);
+      } else {
+        console.log(colors.yellow(`  健康检查失败: http://${getAccessHost(webui.host)}:${webui.port}/api/health`));
+      }
+    } else {
+      console.log(colors.gray('  WebUI: 已禁用'));
     }
   } else {
-    console.log(colors.red('Service: Stopped'));
-    showPaths();
+    console.log(colors.red('服务状态: 已停止'));
   }
 
-  function showPaths() {
-    console.log('');
-    console.log(colors.cyan('=== Configuration ===\n'));
-    console.log(`Data Dir: ${DATA_DIR}`);
-    console.log(`Config: ${configPath || colors.yellow('Not found (run: tcpmapping init)')}`);
-    console.log(`Auth: ${authPath || colors.yellow('Not found (run: tcpmapping setup-password)')}`);
-    console.log(`Log: ${LOG_FILE}`);
-  }
+  console.log('');
+  console.log(colors.cyan('=== Configuration ===\n'));
+  console.log(`数据目录: ${DATA_DIR}`);
+  console.log(`配置文件: ${configPath || colors.yellow('未找到 (运行: tcpmapping init)')}`);
+  console.log(`认证配置: ${authPath || colors.yellow('未找到 (运行: tcpmapping setup-password)')}`);
+  console.log(`日志文件: ${LOG_FILE}`);
 }
 
 // 查看日志
 function logs(follow = false) {
   ensureDataDir();
+
   if (!fs.existsSync(LOG_FILE)) {
-    console.log(colors.yellow('No log file found'));
+    console.log(colors.yellow('未找到日志文件'));
     return;
   }
 
-  if (follow) {
-    console.log(colors.blue(`Tailing ${LOG_FILE}... (Ctrl+C to exit)`));
-    const tail = spawn('tail', ['-f', LOG_FILE], { stdio: 'inherit' });
-    process.on('SIGINT', () => {
-      tail.kill();
-      process.exit(0);
-    });
-  } else {
-    const content = fs.readFileSync(LOG_FILE, 'utf8');
-    const lines = content.split('\n').slice(-50);
-    console.log(lines.join('\n'));
+  if (!follow) {
+    const tail = readLogTail(50);
+    if (tail !== null) {
+      console.log(tail);
+    }
+    return;
   }
+
+  console.log(colors.blue(`正在跟踪 ${LOG_FILE}... (Ctrl+C 退出)`));
+
+  const tail = readLogTail(20);
+  if (tail) {
+    console.log(tail);
+  }
+
+  let offset = fs.statSync(LOG_FILE).size;
+
+  // 使用轮询方式，兼容 Windows / macOS / Linux
+  const watcher = (current) => {
+    if (current.size < offset) {
+      // 文件被截断（例如日志轮转）
+      offset = 0;
+    }
+
+    if (current.size > offset) {
+      try {
+        const length = current.size - offset;
+        const buffer = Buffer.alloc(length);
+        const fd = fs.openSync(LOG_FILE, 'r');
+        try {
+          fs.readSync(fd, buffer, 0, length, offset);
+        } finally {
+          fs.closeSync(fd);
+        }
+        process.stdout.write(buffer);
+        offset = current.size;
+      } catch (error) {
+        // 文件可能在读取过程中被轮转，忽略本次读取
+      }
+    }
+  };
+
+  fs.watchFile(LOG_FILE, { interval: 500 }, watcher);
+
+  const cleanup = () => {
+    fs.unwatchFile(LOG_FILE, watcher);
+    process.exit(0);
+  };
+
+  process.on('SIGINT', cleanup);
+  process.on('SIGTERM', cleanup);
 }
 
 // 设置密码
 function setupPassword() {
   ensureDataDir();
-  console.log(colors.blue('Setting up password...'));
-  console.log(colors.gray(`Config will be saved to: ${DATA_DIR}`));
+  console.log(colors.blue('正在设置管理员密码...'));
+  console.log(colors.gray(`配置将保存到: ${DATA_DIR}`));
   console.log('');
 
-  const child = spawn('node', [SETUP_PASSWORD_FILE], {
+  const child = spawn(process.execPath, [SETUP_PASSWORD_FILE], {
     stdio: 'inherit',
-    cwd: DATA_DIR, // 在数据目录运行，使auth-config.json保存到数据目录
+    cwd: DATA_DIR, // 在数据目录运行，使 auth-config.json 保存到数据目录
     env: { ...process.env, TCPMAPPING_DATA_DIR: DATA_DIR }
   });
 
   child.on('exit', (code) => {
-    process.exit(code);
+    process.exit(code === null ? 1 : code);
   });
 }
 
@@ -271,39 +540,47 @@ function setupPassword() {
 function init() {
   ensureDataDir();
 
-  // 检查当前目录和数据目录是否已有配置
   const cwdConfig = path.join(process.cwd(), 'config.json');
   const dataConfig = path.join(DATA_DIR, 'config.json');
 
   if (fs.existsSync(cwdConfig)) {
-    console.log(colors.yellow(`config.json already exists in current directory`));
+    console.log(colors.yellow('当前目录已存在 config.json'));
     console.log(colors.gray(`  ${cwdConfig}`));
     return;
   }
 
   if (fs.existsSync(dataConfig)) {
-    console.log(colors.yellow(`config.json already exists in data directory`));
+    console.log(colors.yellow('数据目录已存在 config.json'));
     console.log(colors.gray(`  ${dataConfig}`));
     console.log('');
-    console.log('To create a local config, copy it to current directory:');
+    console.log('如需为当前项目创建独立配置，可复制一份:');
     console.log(colors.cyan(`  cp ${dataConfig} ./config.json`));
     return;
   }
 
   const defaultConfig = {
     mappings: [],
-    webui: { port: 9999 },
-    logging: { level: "info" }
+    webui: {
+      enabled: true,
+      // 默认只监听本机；如需远程访问管理面板，请使用 --host 0.0.0.0 并配置防火墙
+      host: webuiOptions.host ? webuiOptions.host.trim() : '127.0.0.1',
+      port: webuiOptions.port !== null ? Number(webuiOptions.port) : 9999
+    },
+    logging: {
+      enabled: true,
+      level: 'info'
+    },
+    timeouts: {
+      connect: 30000,
+      idle: 300000
+    }
   };
 
-  // 保存到数据目录
   fs.writeFileSync(dataConfig, JSON.stringify(defaultConfig, null, 2));
-  console.log(colors.green('Created config.json'));
+  console.log(colors.green('已创建 config.json'));
   console.log(colors.gray(`  ${dataConfig}`));
   console.log('');
-  console.log('Edit the config file to add your port mappings.');
-  console.log('Or copy it to current directory for project-specific config:');
-  console.log(colors.cyan(`  cp ${dataConfig} ./config.json`));
+  console.log('请编辑配置文件添加端口映射，或启动后通过 WebUI 添加。');
 }
 
 // 显示版本
@@ -317,52 +594,75 @@ function help() {
   console.log(`
 ${colors.cyan('TCP Mapping Server')} - TCP端口转发服务器
 
-${colors.yellow('Usage:')}
-  tcpmapping <command>
-
-${colors.yellow('Commands:')}
-  ${colors.green('start')}           Start the server in background
-  ${colors.green('stop')}            Stop the server
-  ${colors.green('restart')}         Restart the server
-  ${colors.green('status')}          Show server status and config paths
-  ${colors.green('logs')}            Show recent logs
-  ${colors.green('logs -f')}         Follow logs in real-time
-  ${colors.green('setup-password')}  Set up admin password
-  ${colors.green('init')}            Create default config.json
-  ${colors.green('version')}         Show version
-  ${colors.green('help')}            Show this help message
-
-${colors.yellow('Config Paths (priority order):')}
-  1. ./config.json       (current directory - project config)
-  2. ~/.tcpmapping/      (user data directory - global config)
-
-${colors.yellow('Examples:')}
-  tcpmapping init             # Create config file
-  tcpmapping setup-password   # Set admin password
-  tcpmapping start            # Start server
-  tcpmapping status           # Check status and config paths
+${colors.yellow('用法:')}
+  tcpmapping <command> [options]
+
+${colors.yellow('命令:')}
+  ${colors.green('start')}           后台启动服务
+  ${colors.green('stop')}            停止服务
+  ${colors.green('restart')}         重启服务
+  ${colors.green('status')}          查看服务状态和配置路径
+  ${colors.green('logs')}            查看最近日志
+  ${colors.green('logs -f')}         实时跟踪日志
+  ${colors.green('setup-password')}  设置管理员密码
+  ${colors.green('init')}            创建默认 config.json
+  ${colors.green('version')}         显示版本
+  ${colors.green('help')}            显示帮助
+
+${colors.yellow('选项:')}
+  ${colors.green('-p, --port <port>')}   WebUI 端口（默认 9999）
+  ${colors.green('-H, --host <host>')}   监听地址（默认 127.0.0.1；公网访问用 0.0.0.0，别名 --listen）
+
+  选项对 start / restart / status / init 生效，优先级高于环境变量和配置文件。
+
+${colors.yellow('配置路径（按优先级）:')}
+  1. ./config.json       当前目录（项目配置）
+  2. ~/.tcpmapping/      用户数据目录（全局配置）
+
+${colors.yellow('环境变量:')}
+  WEBUI_PORT / WEBUI_HOST  等效于 --port / --host
+
+${colors.yellow('示例:')}
+  tcpmapping init --host 0.0.0.0 --port 5000   # 初始化并允许远程访问
+  tcpmapping setup-password                    # 设置管理员密码
+  tcpmapping start --host 0.0.0.0 --port 5000  # 对外监听 5000 端口
+  tcpmapping status --port 5000                # 查看 5000 端口上的服务状态
+  tcpmapping restart --port 5000               # 以新端口重启
 
 ${colors.yellow('WebUI:')}
-  After starting, visit http://localhost:9999
+  默认访问 http://localhost:9999；使用 --host 0.0.0.0 后可通过公网 IP 访问，
+  请务必设置强密码，并建议配合防火墙或 HTTPS 反向代理使用。
 `);
 }
 
 // 执行命令
 switch (command) {
   case 'start':
-    start();
+    start().catch(error => {
+      console.error(colors.red(`启动失败: ${error.message}`));
+      process.exitCode = 1;
+    });
     break;
   case 'stop':
-    stop();
+    stop().catch(error => {
+      console.error(colors.red(`停止失败: ${error.message}`));
+      process.exitCode = 1;
+    });
     break;
   case 'restart':
-    restart();
+    restart().catch(error => {
+      console.error(colors.red(`重启失败: ${error.message}`));
+      process.exitCode = 1;
+    });
     break;
   case 'status':
-    status();
+    status().catch(error => {
+      console.error(colors.red(`获取状态失败: ${error.message}`));
+      process.exitCode = 1;
+    });
     break;
   case 'logs':
-    logs(args[1] === '-f');
+    logs(args[1] === '-f' || args[1] === '--follow');
     break;
   case 'setup-password':
   case 'passwd':