auvezy-terminal-remote 0.3.0 → 0.3.1

package/dist/cli.js

@@ -4215,18 +4215,30 @@ ${hint}
     if (isHeadless) {
       startPty("immediate");
     } else if (mustWaitEnter) {
-      void waitForUserConfirm().then(() => startPty("enter")).catch((err) => {
+      const wait = waitForUserConfirm();
+      void wait.promise.then((r) => {
+        if (r.done === "enter")
+          startPty("enter");
+      }).catch((err) => {
         logger.error({ err }, "\u7B49\u5F85 Enter \u5931\u8D25");
         shutdown(1);
       });
     } else {
+      const wait = waitForUserConfirm({ silent: true });
+      const triggerSpawn = (reason) => {
+        wait.cancel();
+        startPty(reason);
+      };
       ws.onConnect((_ws, type) => {
         if (type === "webapp")
-          startPty("webapp");
+          triggerSpawn("webapp");
+      });
+      void wait.promise.then((r) => {
+        if (r.done === "enter")
+          triggerSpawn("enter");
       });
-      void waitForUserConfirm({ silent: true }).then(() => startPty("enter"));
       if (cfg.spawnTimeoutSec > 0) {
-        setTimeout(() => startPty("timeout"), cfg.spawnTimeoutSec * 1e3).unref();
+        setTimeout(() => triggerSpawn("timeout"), cfg.spawnTimeoutSec * 1e3).unref();
       }
     }
     void registry.register({
@@ -4308,28 +4320,52 @@ function collectLocalHostnames() {
   return set;
 }
 function waitForUserConfirm(opts = {}) {
-  if (!process.stdin.isTTY)
-    return Promise.resolve();
+  if (!process.stdin.isTTY) {
+    return {
+      promise: Promise.resolve({ done: "enter" }),
+      cancel: () => {
+      }
+    };
+  }
   if (!opts.silent) {
     process.stderr.write("  \u6309 Enter \u542F\u52A8\u5B50\u8FDB\u7A0B\uFF08\u6216 Ctrl+C \u9000\u51FA backend\uFF09...");
   }
-  return new Promise((resolve9) => {
-    const onData = (chunk) => {
+  let cancelled = false;
+  let onData = null;
+  let resolveFn = null;
+  const detach = () => {
+    if (onData) {
+      process.stdin.removeListener("data", onData);
+      onData = null;
+    }
+  };
+  const promise = new Promise((resolve9) => {
+    resolveFn = resolve9;
+    onData = (chunk) => {
+      if (cancelled)
+        return;
       if (chunk.length === 0)
         return;
-      cleanup();
-      if (!opts.silent) {
+      detach();
+      if (!opts.silent)
         process.stderr.write("\r\x1B[K");
-      }
-      resolve9();
-    };
-    const cleanup = () => {
-      process.stdin.removeListener("data", onData);
-      process.stdin.pause();
+      resolve9({ done: "enter" });
     };
     process.stdin.resume();
     process.stdin.on("data", onData);
   });
+  return {
+    promise,
+    cancel: () => {
+      if (cancelled)
+        return;
+      cancelled = true;
+      detach();
+      if (!opts.silent)
+        process.stderr.write("\r\x1B[K");
+      resolveFn?.({ done: "cancelled" });
+    }
+  };
 }
 var BUILTIN_FULL_ALT_TUIS;
 var init_index = __esm({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auvezy-terminal-remote",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "type": "module",
   "description": "Auvezy Terminal Remote — 局域网内通过手机/平板浏览器远程控制 PC 终端：atr <program>，多终端多实例自动出现在浏览器 tab 切换",
   "license": "UNLICENSED",