auvezy-terminal-remote 0.7.2 → 0.7.3

package/dist/cli.js

@@ -14,7 +14,7 @@ var DEFAULT_PORT, DEFAULT_SESSION_TTL_MS, DEFAULT_AUTH_RATE_LIMIT, DEFAULT_MAX_B
 var init_constants = __esm({
   "shared/dist/constants.js"() {
     "use strict";
-    DEFAULT_PORT = 3e3;
+    DEFAULT_PORT = 3737;
     DEFAULT_SESSION_TTL_MS = 24 * 60 * 60 * 1e3;
     DEFAULT_AUTH_RATE_LIMIT = 20;
     DEFAULT_MAX_BUFFER_LINES = 1e4;
@@ -608,6 +608,9 @@ function assignFlag(out, key, value) {
     case "--strict-port":
       out.strictPort = value === true || value === "true";
       return;
+    case "--foreground":
+      out.foreground = value === true || value === "true";
+      return;
     case "--help":
       out.help = true;
       return;
@@ -719,7 +722,8 @@ var init_cli_utils = __esm({
       "--version",
       "--no-open",
       "--wait-confirm",
-      "--strict-port"
+      "--strict-port",
+      "--foreground"
     ]);
     KNOWN_FLAGS_VALUE = /* @__PURE__ */ new Set([
       "--port",
@@ -774,8 +778,9 @@ Usage:
   atr <subcommand> [...]           manage the broker / instances (see below)
 
 Subcommands:
-  start [--port n] [--host ip]     start the background service (broker) in the foreground
-                                   (Ctrl+C to quit). --port / --host override 3000 / 0.0.0.0.
+  start [--port n] [--host ip]     start the background service (broker); the command
+                                   returns immediately once the broker is healthy.
+                                   add --foreground to keep it attached (systemd / Docker).
   stop                             stop the background service
   status                           one-shot view: process, token, entry URLs, instances
   list                             list all live instances
@@ -804,7 +809,7 @@ Strict argument order:
     atr -- --weird                   '--' forces split; default shell with '--weird'
 
 Run options (for atr [program]):
-  -p, --port <n>        Background service (broker) port (default 3000). If broker is
+  -p, --port <n>        Background service (broker) port (default 3737). If broker is
                         already running and on a different port, atr will refuse to
                         start \u2014 run 'atr stop' first if you want to switch.
                         Worker ports are internal and auto-assigned; you don't set them.
@@ -842,7 +847,7 @@ Run options (for atr [program]):
                         passes through automatically)
 
 Multi-instance:
-  The background service (broker) runs once on port 3000 and is shared by all
+  The background service (broker) runs once on port 3737 and is shared by all
   instances. Running atr [program] in different terminals all connect to the
   same service; PTY children are independent. Click the tab bar in the browser
   to switch between them. If the service isn't running, the first atr will
@@ -4437,7 +4442,7 @@ async function renderQrCode(url, opts = {}) {
   try {
     return await QRCode.toString(url, {
       type: "utf8",
-      errorCorrectionLevel: opts.errorCorrectionLevel ?? "L",
+      errorCorrectionLevel: opts.errorCorrectionLevel ?? "M",
       // utf8 模式本身就是半字符垂直压缩，体积约 qrcode-terminal small=true 的 1/2。
       // margin: utf8 渲染器在 margin=1 时有"Invalid array length" bug，避开它；
       // margin=2 视觉上仍然紧凑，且扫码识别率更高
@@ -5512,7 +5517,7 @@ var init_broker_server = __esm({
     init_instance_router();
     init_router();
     init_port_finder();
-    DEFAULT_BROKER_PORT = 3e3;
+    DEFAULT_BROKER_PORT = 3737;
     DEFAULT_BROKER_HOST = "0.0.0.0";
   }
 });
@@ -5691,6 +5696,41 @@ var init_broker = __esm({
   }
 });
 
+// backend/dist/utils/wsl-detect.js
+import { readFileSync as readFileSync9 } from "node:fs";
+function isWsl(deps) {
+  if (cached !== void 0 && deps === void 0)
+    return cached;
+  const platform2 = deps?.platform ?? process.platform;
+  if (platform2 !== "linux") {
+    if (deps === void 0)
+      cached = false;
+    return false;
+  }
+  let content;
+  try {
+    content = (deps?.readProcVersion ?? defaultReadProcVersion)();
+  } catch {
+    if (deps === void 0)
+      cached = false;
+    return false;
+  }
+  const lower = content.toLowerCase();
+  const result = lower.includes("microsoft") || lower.includes("wsl");
+  if (deps === void 0)
+    cached = result;
+  return result;
+}
+function defaultReadProcVersion() {
+  return readFileSync9("/proc/version", "utf-8");
+}
+var cached;
+var init_wsl_detect = __esm({
+  "backend/dist/utils/wsl-detect.js"() {
+    "use strict";
+  }
+});
+
 // backend/dist/broker/entry-discovery.js
 var entry_discovery_exports = {};
 __export(entry_discovery_exports, {
@@ -5737,13 +5777,8 @@ function discoverEntries(opts) {
       url: buildEntryUrl("127.0.0.1", brokerPort, instanceId, urlOpts)
     });
   }
-  const order = {
-    tailscale: 0,
-    lan: 1,
-    ipv6: 2,
-    other: 3,
-    loopback: 4
-  };
+  const wsl = isWsl();
+  const order = wsl ? { lan: 0, ipv6: 1, tailscale: 2, other: 3, loopback: 4 } : { tailscale: 0, lan: 1, ipv6: 2, other: 3, loopback: 4 };
   out.sort((a, b) => {
     if (a.kind !== b.kind)
       return order[a.kind] - order[b.kind];
@@ -5804,6 +5839,7 @@ var init_entry_discovery = __esm({
   "backend/dist/broker/entry-discovery.js"() {
     "use strict";
     init_network();
+    init_wsl_detect();
   }
 });
 
@@ -6301,17 +6337,17 @@ hint: check whether ~/.atr/broker.json is held by a stale process; set ATR_DEBUG
         setTimeout(() => triggerSpawn("timeout"), cfg.spawnTimeoutSec * 1e3).unref();
       }
     }
+    const brokerHost = brokerState.host === "0.0.0.0" || brokerState.host === "::" ? displayIp : brokerState.host;
     void registry.register({
       instanceId,
       name: cfg.instanceName,
-      // 0.7.0：host 改为 worker 实际监听地址（loopback）。broker 阶段 3 反代时
-      // 直接用这个 host:port 连 worker。displayIp 已不参与 worker 注册
       host: "127.0.0.1",
       port: cfg.port,
       pid: process.pid,
       cwd: cfg.claudeCwd,
       startedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      headless: cfg.noTerminal
+      headless: cfg.noTerminal,
+      ...brokerHost ? { brokerHost } : {}
     }).catch((err) => logger.warn({ err }, "\u6CE8\u518C\u5B9E\u4F8B\u5931\u8D25"));
     logger.info({
       port: cfg.port,
@@ -7386,7 +7422,7 @@ __export(service_installer_exports, {
   renderSystemdUnit: () => renderSystemdUnit,
   uninstall: () => uninstall
 });
-import { existsSync as existsSync15, mkdirSync as mkdirSync12, readFileSync as readFileSync9, rmSync as rmSync3, writeFileSync as writeFileSync5 } from "node:fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync12, readFileSync as readFileSync10, rmSync as rmSync3, writeFileSync as writeFileSync5 } from "node:fs";
 import { resolve as resolve15, dirname as dirname8 } from "node:path";
 import { homedir as homedir9, platform } from "node:os";
 function detectPlatform(env = process.env, plat = platform()) {
@@ -7408,7 +7444,7 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart=${opts.nodeBin} ${opts.cliPath} start
+ExecStart=${opts.nodeBin} ${opts.cliPath} start --foreground
 Restart=on-failure
 RestartSec=5s
 ${portEnv}[Install]
@@ -7433,6 +7469,7 @@ function renderLaunchdPlist(opts) {
     <string>${opts.nodeBin}</string>
     <string>${opts.cliPath}</string>
     <string>start</string>
+    <string>--foreground</string>
   </array>
   <key>RunAtLoad</key><true/>
   <key>KeepAlive</key><true/>
@@ -7548,7 +7585,7 @@ var init_service_installer = __esm({
         mkdirSync12(p, o);
       },
       writeFileSync: (p, d, o) => writeFileSync5(p, d, { encoding: "utf-8", ...o ?? {} }),
-      readFileSync: (p) => readFileSync9(p, "utf-8"),
+      readFileSync: (p) => readFileSync10(p, "utf-8"),
       rmSync: rmSync3
     };
     ServicePlatformUnsupportedError = class extends AppError {
@@ -7605,8 +7642,8 @@ var cli_exports = {};
 __export(cli_exports, {
   runServiceCli: () => runServiceCli
 });
-import { execSync as execSync2 } from "node:child_process";
-import { readFileSync as readFileSync10 } from "node:fs";
+import { execSync as execSync2, spawn as spawn4 } from "node:child_process";
+import { existsSync as existsSync16, openSync as openSync3, readFileSync as readFileSync11 } from "node:fs";
 import { resolve as resolve16, dirname as dirname9 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 import { homedir as homedir10 } from "node:os";
@@ -7619,7 +7656,7 @@ function getBrokerVersion() {
   ];
   for (const pkgPath of candidates) {
     try {
-      const pkg = JSON.parse(readFileSync10(pkgPath, "utf-8"));
+      const pkg = JSON.parse(readFileSync11(pkgPath, "utf-8"));
       if (pkg.name === "auvezy-terminal-remote" && typeof pkg.version === "string") {
         return pkg.version;
       }
@@ -7631,18 +7668,19 @@ function getBrokerVersion() {
 }
 function getCliPath() {
   const __dirname2 = dirname9(fileURLToPath3(import.meta.url));
-  const candidates = [
-    resolve16(__dirname2, "cli.js"),
-    resolve16(__dirname2, "..", "cli.js")
-  ];
-  for (const p of candidates) {
-    try {
-      readFileSync10(p);
-      return p;
-    } catch {
-    }
+  const parentDir = resolve16(__dirname2, "..", "cli.js");
+  const sameDir = resolve16(__dirname2, "cli.js");
+  try {
+    readFileSync11(parentDir);
+    return parentDir;
+  } catch {
   }
-  return candidates[0];
+  try {
+    readFileSync11(sameDir);
+    return sameDir;
+  } catch {
+  }
+  return parentDir;
 }
 async function runServiceCli(action, cli) {
   switch (action) {
@@ -7663,6 +7701,10 @@ async function runServiceCli(action, cli) {
   }
 }
 async function runBrokerStart(cli) {
+  const wantForeground = cli.foreground === true || process.env["ATR_BROKER_FOREGROUND"] === "1";
+  if (!wantForeground) {
+    return runBrokerStartDaemonize(cli);
+  }
   const port = cli.port ?? parseEnvPort(process.env["ATR_BROKER_PORT"]) ?? DEFAULT_BROKER_PORT;
   const host = cli.host ?? process.env["ATR_BROKER_HOST"] ?? DEFAULT_BROKER_HOST;
   const brokerVersion = getBrokerVersion();
@@ -7705,7 +7747,7 @@ async function runBrokerStart(cli) {
   const pushService = new PushService();
   await pushService.init();
   startInstanceWatcher(registry.filePath);
-  const cliJsPath = resolve16(__dirname2, "cli.js");
+  const cliJsPath = getCliPath();
   const workdirAllow = currentUserConfig.workdirAllow;
   const workdirDeny = currentUserConfig.workdirDeny;
   const spawner = new DefaultInstanceSpawner({
@@ -7780,6 +7822,83 @@ function installBrokerLogRotator() {
   });
   return rotator;
 }
+async function runBrokerStartDaemonize(cli) {
+  const tag = c.cyan("[atr]");
+  const port = cli.port ?? parseEnvPort(process.env["ATR_BROKER_PORT"]) ?? DEFAULT_BROKER_PORT;
+  const existing = readBrokerState();
+  if (existing && isBrokerAlive(existing)) {
+    process.stderr.write(`${tag} broker already running on ${existing.host}:${existing.port} (pid=${existing.pid})
+`);
+    return 0;
+  }
+  const cliJsPath = getCliPath();
+  const entry = resolveDaemonEntry(cliJsPath);
+  const logFd = process.env["ATR_DEBUG_SPAWN"] ? openSync3(`/tmp/atr-broker-${Date.now()}.log`, "a") : "ignore";
+  const childEnv = {
+    ...process.env,
+    ATR_BROKER_FOREGROUND: "1"
+  };
+  if (cli.port !== void 0)
+    childEnv["ATR_BROKER_PORT"] = String(cli.port);
+  if (cli.host !== void 0)
+    childEnv["ATR_BROKER_HOST"] = cli.host;
+  if (cli.strictPort)
+    childEnv["ATR_BROKER_STRICT_PORT"] = "1";
+  const child = spawn4(entry.execPath, [...entry.args, "start", "--foreground"], {
+    env: childEnv,
+    detached: true,
+    stdio: ["ignore", logFd, logFd]
+  });
+  if (typeof child.pid !== "number") {
+    process.stderr.write(`${tag} failed to spawn broker subprocess (no pid)
+`);
+    return 1;
+  }
+  const earlyExit = [];
+  const earlyError = [];
+  child.once("error", (e) => {
+    earlyError.push(e);
+  });
+  child.once("exit", (code, signal) => {
+    earlyExit.push({ code, signal });
+  });
+  child.unref();
+  const t0 = Date.now();
+  const statePath = defaultBrokerStatePath();
+  while (Date.now() - t0 < DAEMONIZE_TIMEOUT_MS) {
+    const st = readBrokerState(statePath);
+    if (st && isBrokerAlive(st) && st.pid === child.pid) {
+      process.stdout.write(`${tag} broker started on ${c.green(`${st.host}:${st.port}`)} (pid=${st.pid})
+`);
+      return 0;
+    }
+    await sleep4(DAEMONIZE_POLL_INTERVAL_MS);
+  }
+  let detail = "";
+  if (earlyError[0]) {
+    detail = `
+  - spawn error: ${earlyError[0].message}`;
+  } else if (earlyExit[0]) {
+    detail = `
+  - child exited early (code=${earlyExit[0].code}, signal=${earlyExit[0].signal})`;
+  }
+  process.stderr.write(`${tag} broker did not become ready within ${DAEMONIZE_TIMEOUT_MS}ms.${detail}
+  - check ~/.auvezy/terminal-remote/broker-*.log for errors
+  - or set ATR_DEBUG_SPAWN=1 and retry to capture /tmp/atr-broker-*.log
+  - port ${port} may be busy; try '--port <other>' or '--strict-port' to fail fast
+`);
+  return 1;
+}
+function resolveDaemonEntry(cliJsPath) {
+  if (existsSync16(cliJsPath)) {
+    return { execPath: process.execPath, args: [cliJsPath] };
+  }
+  const tsPath = cliJsPath.replace(/\.js$/, ".ts");
+  if (existsSync16(tsPath)) {
+    return { execPath: process.execPath, args: ["--import", "tsx", tsPath] };
+  }
+  return { execPath: process.execPath, args: [cliJsPath] };
+}
 async function runBrokerStop() {
   const tag = c.cyan("[atr]");
   const state = readBrokerState();
@@ -7937,12 +8056,12 @@ function writeServiceInstallSection() {
 async function writeTokenSection() {
   process.stdout.write(c.bold("=== Token ===\n"));
   try {
-    const { readFileSync: readFileSync11, statSync: statSync6 } = await import("node:fs");
+    const { readFileSync: readFileSync12, statSync: statSync6 } = await import("node:fs");
     const { resolve: pathResolve2 } = await import("node:path");
     const { homedir: homedir11 } = await import("node:os");
     const path = pathResolve2(homedir11(), ".atrrc");
     const stat = statSync6(path);
-    const cfg = JSON.parse(readFileSync11(path, "utf-8"));
+    const cfg = JSON.parse(readFileSync12(path, "utf-8"));
     if (typeof cfg.token === "string" && cfg.token.length > 0) {
       process.stdout.write(`  token:   ${cfg.token}
 `);
@@ -7964,10 +8083,10 @@ async function writeEntriesSection(brokerPort) {
     const { discoverEntries: discoverEntries2, kindLabel: kindLabel2 } = await Promise.resolve().then(() => (init_entry_discovery(), entry_discovery_exports));
     let token;
     try {
-      const { readFileSync: readFileSync11 } = await import("node:fs");
+      const { readFileSync: readFileSync12 } = await import("node:fs");
       const { resolve: pathResolve2 } = await import("node:path");
       const { homedir: homedir11 } = await import("node:os");
-      const cfg = JSON.parse(readFileSync11(pathResolve2(homedir11(), ".atrrc"), "utf-8"));
+      const cfg = JSON.parse(readFileSync12(pathResolve2(homedir11(), ".atrrc"), "utf-8"));
       if (typeof cfg.token === "string" && cfg.token.length > 0)
         token = cfg.token;
     } catch {
@@ -8026,12 +8145,12 @@ async function runListInstances() {
 async function runShowLogs() {
   const { homedir: homedir11 } = await import("node:os");
   const { resolve: pathResolve2 } = await import("node:path");
-  const { existsSync: existsSync16 } = await import("node:fs");
-  const { spawn: spawn4 } = await import("node:child_process");
+  const { existsSync: existsSync17 } = await import("node:fs");
+  const { spawn: spawn5 } = await import("node:child_process");
   const today = /* @__PURE__ */ new Date();
   const day = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, "0")}-${String(today.getDate()).padStart(2, "0")}`;
   const logPath = pathResolve2(homedir11(), ".atr", `broker-${day}.log`);
-  if (!existsSync16(logPath)) {
+  if (!existsSync17(logPath)) {
     process.stderr.write(`[atr] today's log not found: ${logPath}
 hint: is the service running? try atr status, or atr start to launch.
 `);
@@ -8039,14 +8158,14 @@ hint: is the service running? try atr status, or atr start to launch.
   }
   process.stderr.write(`[atr] tail -F ${logPath} (Ctrl+C to quit)
 `);
-  const tail = spawn4("tail", ["-F", logPath], { stdio: "inherit" });
+  const tail = spawn5("tail", ["-F", logPath], { stdio: "inherit" });
   return new Promise((resolveExit) => {
     tail.on("error", (err) => {
       process.stderr.write(`[atr] cannot spawn tail (${err.message}); falling back to one-shot output:
 `);
-      void import("node:fs").then(({ readFileSync: readFileSync11 }) => {
+      void import("node:fs").then(({ readFileSync: readFileSync12 }) => {
         try {
-          process.stdout.write(readFileSync11(logPath, "utf-8"));
+          process.stdout.write(readFileSync12(logPath, "utf-8"));
           resolveExit(0);
         } catch (e) {
           process.stderr.write(`[atr] failed to read log: ${e.message}
@@ -8132,7 +8251,7 @@ function parseEnvPort(raw) {
 function sleep4(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
-var STOP_GRACE_MS, STOP_POLL_INTERVAL_MS;
+var DAEMONIZE_TIMEOUT_MS, DAEMONIZE_POLL_INTERVAL_MS, STOP_GRACE_MS, STOP_POLL_INTERVAL_MS;
 var init_cli = __esm({
   "backend/dist/broker/cli.js"() {
     "use strict";
@@ -8154,6 +8273,8 @@ var init_cli = __esm({
     init_broker_state();
     init_service_installer();
     init_colors();
+    DAEMONIZE_TIMEOUT_MS = 8e3;
+    DAEMONIZE_POLL_INTERVAL_MS = 100;
     STOP_GRACE_MS = 5e3;
     STOP_POLL_INTERVAL_MS = 100;
   }
@@ -8222,11 +8343,11 @@ void (async () => {
     process.exit(0);
   }
   if (cli.version) {
-    const { readFileSync: readFileSync11 } = await import("node:fs");
+    const { readFileSync: readFileSync12 } = await import("node:fs");
     const { resolve: resolve17, dirname: dirname10 } = await import("node:path");
     const { fileURLToPath: fileURLToPath4 } = await import("node:url");
     const __dirname2 = dirname10(fileURLToPath4(import.meta.url));
-    const pkg = JSON.parse(readFileSync11(resolve17(__dirname2, "..", "package.json"), "utf-8"));
+    const pkg = JSON.parse(readFileSync12(resolve17(__dirname2, "..", "package.json"), "utf-8"));
     process.stdout.write(`${pkg.version}
 `);
     process.exit(0);