@fengye404/termpilot 0.2.1 → 0.2.3

package/dist/cli.js

@@ -652,8 +652,7 @@ function createDaemonFromEnv() {
 function isLocalRelayHost(hostname) {
   return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1" || /^10\./.test(hostname) || /^192\.168\./.test(hostname) || /^172\.(1[6-9]|2\d|3[0-1])\./.test(hostname);
 }
-function getRelayBaseCandidates() {
-  const relayUrl = process.env.TERMPILOT_RELAY_URL ?? "ws://127.0.0.1:8787/ws";
+function getRelayBaseCandidates(relayUrl = process.env.TERMPILOT_RELAY_URL ?? "ws://127.0.0.1:8787/ws") {
   let url;
   try {
     url = new URL(relayUrl);
@@ -686,6 +685,32 @@ function getRelayBaseCandidates() {
   }
   return candidates;
 }
+async function isRelayReachable(baseUrl) {
+  try {
+    const response = await fetch(new URL("/health", baseUrl), {
+      signal: AbortSignal.timeout(2e3)
+    });
+    return response.ok;
+  } catch {
+    return false;
+  }
+}
+async function resolvePreferredRelayUrl(relayUrl) {
+  const candidates = getRelayBaseCandidates(relayUrl);
+  if (candidates.length === 1) {
+    return candidates[0].relayUrl;
+  }
+  const primary = candidates[0];
+  if (await isRelayReachable(primary.baseUrl)) {
+    return primary.relayUrl;
+  }
+  for (const candidate of candidates.slice(1)) {
+    if (await isRelayReachable(candidate.baseUrl)) {
+      return candidate.relayUrl;
+    }
+  }
+  return primary.relayUrl;
+}
 function getAgentToken() {
   return process.env.TERMPILOT_AGENT_TOKEN ?? DEFAULT_AGENT_TOKEN;
 }
@@ -712,11 +737,10 @@ async function fetchJson(input, init, message) {
       lastError = error;
       continue;
     }
-    const payload = await readJsonOrThrow(response, message);
     if (process.env.TERMPILOT_RELAY_URL !== candidate.relayUrl) {
       process.env.TERMPILOT_RELAY_URL = candidate.relayUrl;
     }
-    return payload;
+    return readJsonOrThrow(response, message);
   }
   const detail = lastError instanceof Error ? lastError.message : "\u672A\u77E5\u7F51\u7EDC\u9519\u8BEF";
   throw new Error(`${message}: \u65E0\u6CD5\u8FDE\u63A5 relay (${lastOrigin})\uFF0C${detail}`);
@@ -996,8 +1020,9 @@ function applyAgentConfig(config) {
 function persistMigratedRelayUrl(deviceId) {
   const migratedRelayUrl = process.env.TERMPILOT_RELAY_URL?.trim();
   if (!migratedRelayUrl) {
-    return;
+    return false;
   }
+  let changed = false;
   const saved = loadAgentConfig();
   if (saved && saved.deviceId === deviceId && saved.relayUrl !== migratedRelayUrl) {
     saveAgentConfig({
@@ -1005,6 +1030,7 @@ function persistMigratedRelayUrl(deviceId) {
       deviceId
     });
     console.log(`\u5DF2\u81EA\u52A8\u66F4\u65B0 relay \u5730\u5740\u4E3A: ${migratedRelayUrl}`);
+    changed = true;
   }
   const runtime = loadAgentRuntime();
   if (runtime && runtime.deviceId === deviceId && runtime.relayUrl !== migratedRelayUrl) {
@@ -1012,7 +1038,9 @@ function persistMigratedRelayUrl(deviceId) {
       ...runtime,
       relayUrl: migratedRelayUrl
     });
+    changed = true;
   }
+  return changed;
 }
 function printRuntimeStatus(runtime = readRuntimeStatus().runtime) {
   if (!runtime) {
@@ -1061,6 +1089,7 @@ async function waitForPairingCode(deviceId) {
       return payload;
     } catch (error) {
       lastError = error;
+      persistMigratedRelayUrl(deviceId);
       await delay2(500);
     }
   }
@@ -1072,9 +1101,19 @@ async function waitForPairingCode(deviceId) {
 async function runStart(argv) {
   const args = parseArgs(argv);
   const shouldPair = Boolean(args.pair);
-  const { config, source } = await ensureConfigured(argv);
+  const resolved = await ensureConfigured(argv);
+  let { config } = resolved;
+  const { source } = resolved;
+  const preferredRelayUrl = await resolvePreferredRelayUrl(config.relayUrl);
+  if (preferredRelayUrl !== config.relayUrl) {
+    config = {
+      ...config,
+      relayUrl: preferredRelayUrl
+    };
+    console.log(`\u5DF2\u81EA\u52A8\u4FEE\u6B63 relay \u5730\u5740\u4E3A: ${preferredRelayUrl}`);
+  }
   applyAgentConfig(config);
-  if (source === "cli" || source === "prompt") {
+  if (source === "cli" || source === "prompt" || source === "saved") {
     saveAgentConfig(config);
   }
   if (args.foreground) {
@@ -1096,6 +1135,14 @@ async function runStart(argv) {
         if (pairing) {
           console.log(`\u914D\u5BF9\u7801: ${pairing.pairingCode}`);
           console.log(`\u6709\u6548\u671F\u81F3: ${pairing.expiresAt}`);
+        } else {
+          const migrated = loadAgentConfig();
+          if (migrated && migrated.deviceId === deviceId && migrated.relayUrl !== existing.runtime.relayUrl) {
+            console.log("\u68C0\u6D4B\u5230\u540E\u53F0 agent \u4ECD\u5728\u4F7F\u7528\u65E7 relay \u5730\u5740\uFF0C\u6B63\u5728\u81EA\u52A8\u91CD\u542F\u540E\u91CD\u8BD5\u3002");
+            await runStop();
+            await runStart(argv);
+            return;
+          }
         }
       } else {
         console.log("\u5982\u9700\u91CD\u65B0\u7ED9\u624B\u673A\u914D\u5BF9\uFF0C\u8BF7\u6267\u884C\uFF1Atermpilot agent --pair");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fengye404/termpilot",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "type": "module",
   "packageManager": "pnpm@10.31.0",
   "description": "一个基于 tmux 的终端会话跨端查看与控制原型。",