baton-host 0.1.7 → 0.1.9

package/bin/baton-host.js

@@ -290,48 +290,19 @@ async function promptPortForInstall() {
   }
 }
 
-async function printBridgeInfoFromCache() {
+function printBridgeInfoFromCache() {
   if (!fs.existsSync(BRIDGE_INFO_PATH)) {
     throw new Error("未找到已保存的连接信息，请稍后重试");
   }
 
-  let cached;
-  try {
-    cached = JSON.parse(fs.readFileSync(BRIDGE_INFO_PATH, "utf8"));
-  } catch {
-    throw new Error("已保存的连接信息损坏，请重新执行 service restart");
-  }
-
-  if (!cached?.bridgeUrl || !cached?.displayLabel) {
-    throw new Error("已保存的连接信息不完整，请稍后重试");
-  }
-
-  const payload = JSON.stringify({ bridgeUrl: cached.bridgeUrl });
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
-  const qrcode = require("qrcode-terminal");
-
-  console.log("\n✅ Baton Bridge 已启动");
-  console.log(`模式: ${cached.displayLabel}`);
-  console.log(`主连接地址: ${cached.bridgeUrl}`);
-  if (cached.lanBridgeUrl && cached.lanBridgeUrl !== cached.bridgeUrl) {
-    console.log(`局域网地址: ${cached.lanBridgeUrl}`);
-  }
-  if (cached.note) {
-    console.log(`说明: ${cached.note}`);
-  }
-  console.log("\n请使用 Baton App 扫描下方二维码连接：\n");
-
-  await new Promise((resolve) => {
-    qrcode.generate(payload, { small: true }, (qrText) => {
-      for (const line of qrText.split("\n")) {
-        console.log(line);
-      }
-      resolve();
-    });
-  });
+  const envVars = readEnvFile();
+  const env = {
+    ...process.env,
+    ...envVars,
+    BATON_CLOUDFLARED_BIN: path.join(INSTALL_BIN_DIR, "cloudflared")
+  };
 
-  console.log("\n在 Baton App → 设置 → Bridge 服务器 → 扫码连接");
-  console.log("现在可以关闭终端，服务会继续在后台运行。\n");
+  runInheritedCommand(path.join(INSTALL_BIN_DIR, "baton-host"), ["--print-bridge-info"], { env });
 }
 
 async function waitForBridgeInfo(timeoutMs = 15000) {
@@ -347,7 +318,7 @@ async function waitForBridgeInfo(timeoutMs = 15000) {
 
 async function runBridgePrintCommand() {
   await waitForBridgeInfo();
-  await printBridgeInfoFromCache();
+  printBridgeInfoFromCache();
 }
 
 function buildWrapperScript() {
@@ -487,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));
@@ -573,6 +564,7 @@ function cleanupInstallArtifacts() {
   removePathIfExists(WRAPPER_PATH);
   removePathIfExists(INSTALL_META_PATH);
   removePathIfExists(INSTALL_LOG_DIR);
+  removePathIfExists(BRIDGE_INFO_PATH);
 
   try {
     const remaining = fs.existsSync(INSTALL_ROOT) ? fs.readdirSync(INSTALL_ROOT) : [];
@@ -682,6 +674,9 @@ async function handleServiceInstall(options = {}) {
   writeWrapperScript();
   writeInstallMeta(version);
 
+  // 清除旧的 bridge-info，以便 runBridgePrintCommand 可以等待新的文件生成
+  removePathIfExists(BRIDGE_INFO_PATH);
+
   const serviceFile = process.platform === "linux" ? installLinuxService() : installMacService();
   const action = preserveConfig
     ? (previousVersion && previousVersion !== version ? "升级并重启" : "覆盖并重启")
@@ -696,6 +691,7 @@ async function handleServiceInstall(options = {}) {
 
 async function handleServiceRestart() {
   ensureSupportedServicePlatform();
+  removePathIfExists(BRIDGE_INFO_PATH);
   if (process.platform === "linux") {
     restartLinuxService();
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baton-host",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Baton Bridge Host CLI（二进制分发入口）",
   "license": "MIT",
   "bin": {
@@ -10,9 +10,9 @@
     "bin"
   ],
   "optionalDependencies": {
-    "baton-host-darwin-arm64": "0.1.7",
-    "baton-host-darwin-x64": "0.1.7",
-    "baton-host-linux-arm64": "0.1.7",
-    "baton-host-linux-x64": "0.1.7"
+    "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"
   }
 }