baton-host 0.1.6 → 0.1.8

package/bin/baton-host.js

@@ -2,8 +2,10 @@
 
 const { spawn, spawnSync } = require("node:child_process");
 const fs = require("node:fs");
+const net = require("node:net");
 const os = require("node:os");
 const path = require("node:path");
+const { createInterface } = require("node:readline/promises");
 
 const mapping = {
   "darwin-arm64": "baton-host-darwin-arm64",
@@ -17,6 +19,7 @@ const INSTALL_ROOT = path.join(os.homedir(), ".baton-host");
 const INSTALL_BIN_DIR = path.join(INSTALL_ROOT, "bin");
 const INSTALL_LOG_DIR = path.join(INSTALL_ROOT, "logs");
 const ENV_FILE_PATH = path.join(INSTALL_ROOT, ".env");
+const BRIDGE_INFO_PATH = path.join(INSTALL_ROOT, "bridge-info.json");
 const WRAPPER_PATH = path.join(INSTALL_ROOT, "run.sh");
 const INSTALL_META_PATH = path.join(INSTALL_ROOT, "install.json");
 
@@ -109,9 +112,9 @@ function ensureDefaultEnvFile() {
 
   const defaultContent = [
     "# Baton Host 服务环境变量",
-    "BATON_BRIDGE_MODE=lan",
+    "BATON_BRIDGE_MODE=cloudflare",
     "BRIDGE_LOG_PROFILE=core",
-    "PORT=9966",
+    "PORT=9977",
     ""
   ].join("\n");
 
@@ -141,6 +144,183 @@ function readEnvFile() {
   return result;
 }
 
+function writeEnvFile(envVars) {
+  const existingContent = fs.existsSync(ENV_FILE_PATH)
+    ? fs.readFileSync(ENV_FILE_PATH, "utf8")
+    : "# Baton Host 服务环境变量\n";
+  const lines = existingContent.split(/\r?\n/);
+  const keysToWrite = new Set(Object.keys(envVars));
+  const seenKeys = new Set();
+  const nextLines = lines.map((rawLine) => {
+    const trimmed = rawLine.trim();
+    if (!trimmed || trimmed.startsWith("#")) {
+      return rawLine;
+    }
+    const separatorIndex = rawLine.indexOf("=");
+    if (separatorIndex <= 0) {
+      return rawLine;
+    }
+    const key = rawLine.slice(0, separatorIndex).trim();
+    if (!keysToWrite.has(key)) {
+      return rawLine;
+    }
+    seenKeys.add(key);
+    return `${key}=${envVars[key]}`;
+  });
+
+  for (const key of keysToWrite) {
+    if (!seenKeys.has(key)) {
+      nextLines.push(`${key}=${envVars[key]}`);
+    }
+  }
+
+  const content = `${nextLines.filter((line, index, array) => !(index === array.length - 1 && line === "")).join("\n")}\n`;
+  fs.writeFileSync(ENV_FILE_PATH, content, "utf8");
+}
+
+function isInteractiveTerminal() {
+  return Boolean(process.stdin.isTTY && process.stdout.isTTY);
+}
+
+function pickAvailablePort() {
+  return new Promise((resolve, reject) => {
+    const server = net.createServer();
+    server.unref();
+    server.on("error", reject);
+    server.listen(0, "127.0.0.1", () => {
+      const address = server.address();
+      if (!address || typeof address === "string") {
+        server.close(() => reject(new Error("随机端口分配失败")));
+        return;
+      }
+      resolve(address.port);
+      server.close();
+    });
+  });
+}
+
+function isValidPort(value) {
+  const port = Number(value);
+  return Number.isInteger(port) && port >= 1 && port <= 65535;
+}
+
+async function ensurePortAvailable(port) {
+  await new Promise((resolve, reject) => {
+    const server = net.createServer();
+    server.unref();
+    server.once("error", reject);
+    server.listen(port, "127.0.0.1", () => {
+      server.close((error) => {
+        if (error) {
+          reject(error);
+          return;
+        }
+        resolve();
+      });
+    });
+  });
+  return port;
+}
+
+async function promptBridgeModeForInstall() {
+  if (!isInteractiveTerminal()) {
+    return "cloudflare";
+  }
+
+  const rl = createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  try {
+    while (true) {
+      console.log("请选择连接方式：");
+      console.log("1) 局域网（同一 Wi‑Fi 下用）");
+      console.log("2) Cloudflare（推荐，直接回车也选这个）");
+      console.log("3) Tailscale");
+      const answer = (await rl.question("输入 1 / 2 / 3，直接回车默认 Cloudflare: ")).trim();
+      if (!answer || answer === "2") {
+        return "cloudflare";
+      }
+      if (answer === "1") {
+        return "lan";
+      }
+      if (answer === "3") {
+        return "tailscale";
+      }
+      console.log("⚠️ 请输入 1、2、3，或直接回车。\n");
+    }
+  } finally {
+    rl.close();
+  }
+}
+
+async function promptPortForInstall() {
+  const randomPort = await pickAvailablePort();
+  if (!isInteractiveTerminal()) {
+    return randomPort;
+  }
+
+  const rl = createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  try {
+    while (true) {
+      console.log("\n请选择端口：");
+      console.log(`直接回车：自动分配随机端口（推荐，当前候选 ${randomPort}）`);
+      console.log("输入端口号：使用自定义端口");
+      const answer = (await rl.question("输入端口号，或直接回车使用随机端口: ")).trim();
+      if (!answer) {
+        return randomPort;
+      }
+      if (isValidPort(answer)) {
+        try {
+          return await ensurePortAvailable(Number(answer));
+        } catch {
+          console.log("⚠️ 这个端口当前不可用，请换一个。\n");
+          continue;
+        }
+      }
+      console.log("⚠️ 请输入 1-65535 的有效端口号，或直接回车。\n");
+    }
+  } finally {
+    rl.close();
+  }
+}
+
+function printBridgeInfoFromCache() {
+  if (!fs.existsSync(BRIDGE_INFO_PATH)) {
+    throw new Error("未找到已保存的连接信息，请稍后重试");
+  }
+
+  const envVars = readEnvFile();
+  const env = {
+    ...process.env,
+    ...envVars,
+    BATON_CLOUDFLARED_BIN: path.join(INSTALL_BIN_DIR, "cloudflared")
+  };
+
+  runInheritedCommand(path.join(INSTALL_BIN_DIR, "baton-host"), ["--print-bridge-info"], { env });
+}
+
+async function waitForBridgeInfo(timeoutMs = 15000) {
+  const start = Date.now();
+  while (Date.now() - start < timeoutMs) {
+    if (fs.existsSync(BRIDGE_INFO_PATH)) {
+      return;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 250));
+  }
+  throw new Error("等待连接信息生成超时，请稍后执行 service restart 再试");
+}
+
+async function runBridgePrintCommand() {
+  await waitForBridgeInfo();
+  printBridgeInfoFromCache();
+}
+
 function buildWrapperScript() {
   return `#!/bin/sh
 set -eu
@@ -278,6 +458,26 @@ function runCommand(command, args, options = {}) {
   return result;
 }
 
+function runInheritedCommand(command, args, options = {}) {
+  const result = spawnSync(command, args, {
+    stdio: "inherit",
+    env: options.env || process.env
+  });
+
+  if (result.error) {
+    if (options.allowFailure) {
+      return result;
+    }
+    throw result.error;
+  }
+
+  if (!options.allowFailure && result.status !== 0) {
+    throw new Error(`${command} ${args.join(" ")} 失败，退出码 ${result.status}`);
+  }
+
+  return result;
+}
+
 function installLinuxService() {
   const unitPath = getLinuxUnitPath();
   ensureDir(path.dirname(unitPath));
@@ -442,37 +642,50 @@ function ensureSupportedServicePlatform() {
   }
 }
 
-function handleServiceInstall() {
+async function handleServiceInstall(options = {}) {
   ensureSupportedServicePlatform();
 
+  const { preserveConfig = false } = options;
   const previousVersion = readInstallMeta()?.version || null;
   const { binaryPath, cloudflaredPath, version } = resolveBundledAssets();
 
   ensureDir(INSTALL_ROOT);
   ensureDir(INSTALL_BIN_DIR);
   ensureDir(INSTALL_LOG_DIR);
+  ensureDefaultEnvFile();
+
+  if (preserveConfig) {
+    const envVars = readEnvFile();
+    if (!envVars.BATON_BRIDGE_MODE || !envVars.PORT) {
+      fail("现有配置不完整，无法直接 upgrade。请先执行 npx baton-host@latest service install");
+    }
+  } else {
+    const mode = await promptBridgeModeForInstall();
+    const port = await promptPortForInstall();
+    writeEnvFile({
+      BATON_BRIDGE_MODE: mode,
+      PORT: String(port)
+    });
+  }
 
   copyExecutable(binaryPath, path.join(INSTALL_BIN_DIR, "baton-host"));
   copyExecutable(cloudflaredPath, path.join(INSTALL_BIN_DIR, "cloudflared"));
-  ensureDefaultEnvFile();
   writeWrapperScript();
   writeInstallMeta(version);
 
   const serviceFile = process.platform === "linux" ? installLinuxService() : installMacService();
-  const action = previousVersion && previousVersion !== version
-    ? "升级并重启"
-    : previousVersion
-      ? "覆盖并重启"
-      : "安装并启动";
+  const action = preserveConfig
+    ? (previousVersion && previousVersion !== version ? "升级并重启" : "覆盖并重启")
+    : (previousVersion ? "覆盖并重启" : "安装并启动");
 
   console.log(`✅ Baton Host 服务已${action}`);
   console.log(`Version: ${version}`);
-  console.log(`Binary: ${path.join(INSTALL_BIN_DIR, "baton-host")}`);
   console.log(`Env file: ${ENV_FILE_PATH}`);
   console.log(`Service file: ${serviceFile}`);
+  await runBridgePrintCommand();
 }
 
-function handleServiceRestart() {
+async function handleServiceRestart() {
   ensureSupportedServicePlatform();
   if (process.platform === "linux") {
     restartLinuxService();
@@ -480,6 +693,7 @@ function handleServiceRestart() {
     restartMacService();
   }
   console.log("✅ Baton Host 服务已重启");
+  await runBridgePrintCommand();
 }
 
 function handleServiceUninstall() {
@@ -507,19 +721,24 @@ function printServiceUsage() {
   console.log("  BATON_BRIDGE_MODE=lan|tailscale|cloudflare");
   console.log("  PORT=9966");
   console.log("");
-  console.log("说明: install/upgrade 都会覆盖二进制并重启服务");
+  console.log("说明: install 会进入模式/端口向导；upgrade 复用现有配置并重启服务");
 }
 
-function handleServiceCommand(args) {
+async function handleServiceCommand(args) {
   const command = args[0] || "install";
 
-  if (command === "install" || command === "upgrade") {
-    handleServiceInstall();
+  if (command === "install") {
+    await handleServiceInstall();
+    return;
+  }
+
+  if (command === "upgrade") {
+    await handleServiceInstall({ preserveConfig: true });
     return;
   }
 
   if (command === "restart") {
-    handleServiceRestart();
+    await handleServiceRestart();
     return;
   }
 
@@ -561,17 +780,15 @@ function spawnHostBinary(args) {
   });
 }
 
-function main() {
+async function main() {
   const args = process.argv.slice(2);
   if (args[0] === "service") {
-    handleServiceCommand(args.slice(1));
+    await handleServiceCommand(args.slice(1));
     return;
   }
   spawnHostBinary(args);
 }
 
-try {
-  main();
-} catch (error) {
+void main().catch((error) => {
   fail(error instanceof Error ? error.message : String(error));
-}
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baton-host",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Baton Bridge Host CLI（二进制分发入口）",
   "license": "MIT",
   "bin": {
@@ -10,9 +10,9 @@
     "bin"
   ],
   "optionalDependencies": {
-    "baton-host-darwin-arm64": "0.1.6",
-    "baton-host-darwin-x64": "0.1.6",
-    "baton-host-linux-arm64": "0.1.6",
-    "baton-host-linux-x64": "0.1.6"
+    "baton-host-darwin-arm64": "0.1.8",
+    "baton-host-darwin-x64": "0.1.8",
+    "baton-host-linux-arm64": "0.1.8",
+    "baton-host-linux-x64": "0.1.8"
   }
 }