@tunnelbox/core 0.1.17 → 0.1.18

package/dist/index.js

@@ -1804,6 +1804,52 @@ var MessagesCache = class {
   }
 };
 var messagesCache = new MessagesCache();
+
+// src/cli.ts
+import { spawnSync } from "child_process";
+import { existsSync as existsSync2 } from "fs";
+import { join as join2 } from "path";
+function needsCmdQuote(s) {
+  return s === "" || /[ \t&|<>^"%]/.test(s);
+}
+function cmdLineFor(shimPath, args) {
+  const parts = [`"${shimPath}"`, ...args.map((a) => needsCmdQuote(a) ? `"${a}"` : a)];
+  return parts.join(" ");
+}
+function findWinShim(name) {
+  if (name.includes("/") || name.includes("\\")) return null;
+  const dirs = (process.env.PATH || "").split(";").filter(Boolean);
+  for (const dir of dirs) {
+    for (const ext of [".cmd", ".bat"]) {
+      const p = join2(dir, name + ext);
+      if (existsSync2(p)) return p;
+    }
+  }
+  return null;
+}
+function killCliTree(child) {
+  if (!child || child.exitCode !== null) return;
+  if (process.platform === "win32") {
+    const pid = child.pid;
+    if (pid) {
+      try {
+        spawnSync("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
+      } catch {
+      }
+    }
+    return;
+  }
+  try {
+    child.kill("SIGTERM");
+  } catch {
+  }
+  setTimeout(() => {
+    try {
+      if (child.exitCode === null) child.kill("SIGKILL");
+    } catch {
+    }
+  }, 1500);
+}
 export {
   DEFAULT_LANG,
   DEFAULT_PAGE_SIZE,
@@ -1815,12 +1861,16 @@ export {
   RelayClient,
   capMessage,
   capMessages,
+  cmdLineFor,
   detectSystemLang,
   envelope,
+  findWinShim,
   injectedRelayUrl,
+  killCliTree,
   loadState,
   makeT,
   messagesCache,
+  needsCmdQuote,
   normalizeLang,
   printPairing,
   renderPairingQrText,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tunnelbox/core",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "tunnelbox 共享核心：协议类型、中继客户端、状态持久化、二维码配对",
   "type": "module",
   "main": "./dist/index.js",

package/src/cli.ts

@@ -0,0 +1,63 @@
+/**
+ * CLI 子进程辅助：Windows `.cmd/.bat` shim 解析与进程树终止。
+ * 供各适配器驱动本机 CLI 时复用（Linux/macOS 直接 spawn 可执行文件）。
+ */
+import { spawnSync, type ChildProcess } from "node:child_process";
+import { existsSync } from "node:fs";
+import { join } from "node:path";
+
+/** 参数是否需要 cmd 引号（含空格或 cmd 元字符）。 */
+export function needsCmdQuote(s: string): boolean {
+  return s === "" || /[ \t&|<>^"%]/.test(s);
+}
+
+/** 拼接一条 `cmd /c` 命令行：路径恒引号，参数按需引号。 */
+export function cmdLineFor(shimPath: string, args: string[]): string {
+  const parts = [`"${shimPath}"`, ...args.map((a) => (needsCmdQuote(a) ? `"${a}"` : a))];
+  return parts.join(" ");
+}
+
+/** 在 PATH 中查找 `<name>.cmd/.bat`（Windows shim）；name 含路径分隔符时返回 null。 */
+export function findWinShim(name: string): string | null {
+  if (name.includes("/") || name.includes("\\")) return null;
+  const dirs = (process.env.PATH || "").split(";").filter(Boolean);
+  for (const dir of dirs) {
+    for (const ext of [".cmd", ".bat"]) {
+      const p = join(dir, name + ext);
+      if (existsSync(p)) return p;
+    }
+  }
+  return null;
+}
+
+/**
+ * 终止子进程：
+ * - Windows：`taskkill /PID <pid> /T /F` 杀整棵进程树（经 shell 启动时只杀 cmd.exe 不够）；
+ * - 其余平台：SIGTERM，1.5s 后仍存活再 SIGKILL。
+ */
+export function killCliTree(child: ChildProcess | null | undefined): void {
+  if (!child || child.exitCode !== null) return;
+  if (process.platform === "win32") {
+    const pid = child.pid;
+    if (pid) {
+      try {
+        spawnSync("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
+      } catch {
+        /* ignore */
+      }
+    }
+    return;
+  }
+  try {
+    child.kill("SIGTERM");
+  } catch {
+    /* ignore */
+  }
+  setTimeout(() => {
+    try {
+      if (child.exitCode === null) child.kill("SIGKILL");
+    } catch {
+      /* ignore */
+    }
+  }, 1500);
+}

package/src/index.ts

@@ -10,3 +10,4 @@ export * from "./env";
 export * from "./qr";
 export * from "./i18n";
 export * from "./messages";
+export * from "./cli";