@fengye404/termpilot 0.2.2 → 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;
 }
@@ -1076,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) {

package/package.json

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