@fengye404/termpilot 0.1.8 → 0.1.9

package/dist/cli.js

@@ -849,11 +849,7 @@ function isLocalRelayHost(hostname) {
 }
 function normalizeRelayUrl(rawHost, rawPort) {
   const hostInput = rawHost.trim();
-  const portInput = rawPort.trim() || "8787";
-  const normalizedPort = Number(portInput);
-  if (!Number.isFinite(normalizedPort) || normalizedPort <= 0 || normalizedPort > 65535) {
-    throw new Error("\u7AEF\u53E3\u65E0\u6548\uFF0C\u8BF7\u8F93\u5165 1 \u5230 65535 \u4E4B\u95F4\u7684\u6570\u5B57\u3002");
-  }
+  const portInput = rawPort.trim();
   if (hostInput.includes("://")) {
     const parsed = new URL(hostInput);
     if (parsed.protocol === "http:") {
@@ -861,8 +857,14 @@ function normalizeRelayUrl(rawHost, rawPort) {
     } else if (parsed.protocol === "https:") {
       parsed.protocol = "wss:";
     }
-    if (!parsed.port) {
-      parsed.port = String(normalizedPort);
+    if (portInput) {
+      const normalizedPort2 = Number(portInput);
+      if (!Number.isFinite(normalizedPort2) || normalizedPort2 <= 0 || normalizedPort2 > 65535) {
+        throw new Error("\u7AEF\u53E3\u65E0\u6548\uFF0C\u8BF7\u8F93\u5165 1 \u5230 65535 \u4E4B\u95F4\u7684\u6570\u5B57\u3002");
+      }
+      parsed.port = String(normalizedPort2);
+    } else if (!parsed.port && parsed.protocol === "ws:" && isLocalRelayHost(parsed.hostname)) {
+      parsed.port = "8787";
     }
     if (!parsed.pathname || parsed.pathname === "/") {
       parsed.pathname = "/ws";
@@ -872,6 +874,16 @@ function normalizeRelayUrl(rawHost, rawPort) {
     return parsed.toString();
   }
   const protocol = isLocalRelayHost(hostInput) ? "ws:" : "wss:";
+  if (!portInput) {
+    if (protocol === "ws:") {
+      return `${protocol}//${hostInput}:8787/ws`;
+    }
+    return `${protocol}//${hostInput}/ws`;
+  }
+  const normalizedPort = Number(portInput);
+  if (!Number.isFinite(normalizedPort) || normalizedPort <= 0 || normalizedPort > 65535) {
+    throw new Error("\u7AEF\u53E3\u65E0\u6548\uFF0C\u8BF7\u8F93\u5165 1 \u5230 65535 \u4E4B\u95F4\u7684\u6570\u5B57\u3002");
+  }
   return `${protocol}//${hostInput}:${normalizedPort}/ws`;
 }
 async function promptForAgentConfig(deviceId) {
@@ -885,7 +897,7 @@ async function promptForAgentConfig(deviceId) {
     if (!host) {
       throw new Error("\u672A\u8F93\u5165 relay \u57DF\u540D\u6216 IP\uFF0C\u5DF2\u53D6\u6D88\u3002");
     }
-    const port = await rl.question("\u8BF7\u8F93\u5165 relay \u7AEF\u53E3\uFF08\u76F4\u63A5\u56DE\u8F66\u9ED8\u8BA4 8787\uFF09: ");
+    const port = await rl.question("\u8BF7\u8F93\u5165 relay \u7AEF\u53E3\uFF08\u53CD\u4EE3\u57DF\u540D\u53EF\u76F4\u63A5\u56DE\u8F66\uFF1B\u672C\u5730 IP \u9ED8\u8BA4 8787\uFF09: ");
     const relayUrl = normalizeRelayUrl(host, port);
     console.log(`\u5C06\u4F7F\u7528 relay: ${relayUrl}`);
     return { relayUrl, deviceId };
@@ -1324,7 +1336,8 @@ function loadRelayRuntime() {
       pid: parsed.pid,
       host: parsed.host,
       port: parsed.port,
-      startedAt: parsed.startedAt
+      startedAt: parsed.startedAt,
+      cliPath: typeof parsed.cliPath === "string" ? parsed.cliPath : void 0
     };
   } catch {
     return null;
@@ -2344,26 +2357,14 @@ function readRuntimeStatus2() {
   }
   return { runtime, alive };
 }
-function printRuntime(runtime = readRuntimeStatus2().runtime) {
-  if (!runtime) {
-    console.log("\u540E\u53F0 relay \u5F53\u524D\u672A\u8FD0\u884C\u3002");
-    console.log(`\u8FD0\u884C\u65F6\u6587\u4EF6: ${getRelayRuntimeFilePath()}`);
-    console.log(`\u65E5\u5FD7: ${getRelayLogFilePath()}`);
-    return;
-  }
-  console.log("\u540E\u53F0 relay \u6B63\u5728\u8FD0\u884C\u3002");
-  console.log(`PID: ${runtime.pid}`);
-  console.log(`\u76D1\u542C: http://${runtime.host}:${runtime.port}`);
-  console.log(`\u542F\u52A8\u65F6\u95F4: ${runtime.startedAt}`);
-  console.log(`\u65E5\u5FD7: ${getRelayLogFilePath()}`);
-}
 async function runForeground() {
   const config = loadConfig();
   saveRelayRuntime({
     pid: process.pid,
     host: config.host,
     port: config.port,
-    startedAt: (/* @__PURE__ */ new Date()).toISOString()
+    startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    cliPath: process.argv[1]
   });
   process.on("exit", () => {
     clearRelayRuntime(process.pid);
@@ -2377,11 +2378,14 @@ async function runStart2() {
   const existing = readRuntimeStatus2();
   if (existing.runtime && existing.alive) {
     const sameConfig = existing.runtime.host === config.host && existing.runtime.port === config.port;
-    if (sameConfig) {
-      printRuntime(existing.runtime);
-      return;
+    const sameCliPath = existing.runtime.cliPath === process.argv[1];
+    if (sameConfig && sameCliPath) {
+      console.log("\u68C0\u6D4B\u5230\u540E\u53F0 relay \u5DF2\u5728\u8FD0\u884C\uFF0C\u6B63\u5728\u91CD\u542F\u5230\u5F53\u524D\u914D\u7F6E\u3002");
+    } else if (!sameCliPath) {
+      console.log("\u68C0\u6D4B\u5230\u540E\u53F0 relay \u6B63\u5728\u8FD0\u884C\uFF0C\u4F46\u5B89\u88C5\u7248\u672C\u6216\u5165\u53E3\u5DF2\u53D8\u5316\uFF0C\u6B63\u5728\u91CD\u542F\u5230\u5F53\u524D\u7248\u672C\u3002");
+    } else {
+      console.log("\u68C0\u6D4B\u5230\u540E\u53F0 relay \u5DF2\u5728\u8FD0\u884C\uFF0C\u4F46\u76D1\u542C\u914D\u7F6E\u548C\u5F53\u524D\u547D\u4EE4\u4E0D\u4E00\u81F4\uFF0C\u6B63\u5728\u91CD\u542F\u3002");
     }
-    console.log("\u68C0\u6D4B\u5230\u540E\u53F0 relay \u5DF2\u5728\u8FD0\u884C\uFF0C\u4F46\u76D1\u542C\u914D\u7F6E\u548C\u5F53\u524D\u547D\u4EE4\u4E0D\u4E00\u81F4\uFF0C\u6B63\u5728\u91CD\u542F\u3002");
     await runStop2();
   }
   clearRelayRuntime();
@@ -2400,7 +2404,8 @@ async function runStart2() {
     pid: child.pid,
     host: config.host,
     port: config.port,
-    startedAt: (/* @__PURE__ */ new Date()).toISOString()
+    startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    cliPath: process.argv[1]
   });
   console.log(`\u540E\u53F0 relay \u5DF2\u542F\u52A8\uFF0CPID: ${child.pid}`);
   console.log(`\u76D1\u542C: http://${config.host}:${config.port}`);

package/package.json

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