@trim21/personal-pi-extensions 0.1.437 → 0.1.439

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.1.437",
+  "version": "0.1.439",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [
@@ -23,7 +23,6 @@
     "format": "prettier --write .",
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
-    "build:holder": "esbuild src/bwrap/holder.ts --format=esm --target=node24 --outfile=src/bwrap/holder.js",
     "prepare": "husky"
   },
   "peerDependencies": {
@@ -42,7 +41,6 @@
     "@types/turndown": "^5.0.6",
     "@typescript/native": "npm:typescript@^7.0.2",
     "@vitest/coverage-v8": "^4.1.10",
-    "esbuild": "^0.28.2",
     "eslint": "^10.8.1",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-erasable-syntax-only": "0.7.1",

package/src/bwrap/mihomo-config.ts

@@ -1,5 +1,6 @@
 const FAKEIP_RANGE = "198.18.0.1/16";
-const TUN_MTU = 1500;
+/** TUN 与 slirp4netns tap0 共用；不对齐时大包会在 slirp NAT 后 PMTU blackhole。 */
+export const TUN_MTU = 1500;
 
 export interface MihomoConfigOptions {
   /** 允许直连的条目列表（域名 / IP / CIDR，可带 :port；空列表 = 默认拒绝一切出网）。 */
@@ -158,6 +159,7 @@ function buildRules(allowlist: readonly string[]): BuiltRules {
  *
  * - auto-detect-interface 让 mihomo 出站绑定 slirp4netns 的 tap0，否则它自己的
  *   DNS 查询会被 auto_route 送回 TUN 形成环；
+ * - TUN mtu 与 slirp4netns `--mtu` 共用 TUN_MTU，避免依赖各自默认值；
  * - allowlist 域名走 fake-ip-filter 真实解析（见 buildRules 注释）。
  */
 export function generateMihomoConfig(options: MihomoConfigOptions): MihomoConfig {

package/src/bwrap/network-stack.ts

@@ -4,7 +4,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
 
-import { generateMihomoConfig } from "./mihomo-config.js";
+import { generateMihomoConfig, TUN_MTU } from "./mihomo-config.js";
 
 /** 命令超时错误：name=TimeoutError（对齐标准错误分类），message 保留 timeout:N 格式。 */
 export class TimeoutError extends Error {
@@ -37,7 +37,7 @@ export interface NetworkStackExecOptions {
 }
 
 const NAMESERVER_PATTERN = /^\s*nameserver\s+(\S+)/;
-const HOLDER_PATH = fileURLToPath(new URL("holder.js", import.meta.url));
+const HOLDER_PATH = fileURLToPath(new URL("holder.ts", import.meta.url));
 // ip 通常位于 /usr/sbin 或 /sbin，进程默认 PATH 不含它们；node 则依赖宿主完整 PATH
 const SBIN_PATH_SUFFIX = "/usr/local/sbin:/usr/sbin:/sbin";
 
@@ -169,6 +169,7 @@ export async function startNetworkStack(options: NetworkStackOptions): Promise<N
     slirp4netnsPath,
     [
       "-c",
+      `--mtu=${TUN_MTU}`,
       `--userns-path=/proc/${holderPid}/ns/user`,
       "--netns-type=pid",
       String(holderPid),

package/src/bwrap/runtime.ts

@@ -226,7 +226,6 @@ class BashOutput {
     });
   }
 
-  // eslint-disable-next-line unicorn/no-nonstandard-builtin-properties -- ES2024 标准（Node 24 原生支持）
   async [Symbol.asyncDispose](): Promise<void> {
     await this.close();
   }
@@ -394,7 +393,6 @@ export class BwrapRuntime {
     // 每次命令现建网络栈（启动约 140ms），作用域结束自动停栈；allowlist 变化即时生效
     const networkStack = local ? undefined : await createNetworkStack(runtime);
     await using _stack = {
-      // eslint-disable-next-line unicorn/no-nonstandard-builtin-properties -- ES2024 标准（Node 24 原生支持）
       async [Symbol.asyncDispose]() {
         try {
           await networkStack?.stop();

package/src/bwrap/holder.js

@@ -1,47 +0,0 @@
-import { spawn } from "node:child_process";
-import { dirname } from "node:path";
-import { setTimeout as sleep } from "node:timers/promises";
-const args = process.argv.slice(2);
-const configPath = args[0];
-const mihomoPath = args[1];
-if (!configPath || !mihomoPath) {
-  process.exit(2);
-}
-function tap0Exists() {
-  return new Promise((resolve) => {
-    const child = spawn("ip", ["link", "show", "tap0"], { stdio: "ignore" });
-    child.once("exit", (code) => resolve(code === 0));
-    child.once("error", () => resolve(false));
-  });
-}
-async function waitFor(attempts, delayMs, predicate) {
-  for (let i = 0; i < attempts; i++) {
-    if (await predicate()) return true;
-    await sleep(delayMs);
-  }
-  return false;
-}
-async function main() {
-  await waitFor(100, 100, tap0Exists);
-  const mihomo = spawn(mihomoPath, ["-d", dirname(configPath), "-f", configPath], {
-    stdio: ["ignore", "inherit", "inherit"]
-  });
-  const stop = () => {
-    mihomo.kill("SIGTERM");
-  };
-  process.on("SIGTERM", () => {
-    stop();
-    process.exit(0);
-  });
-  process.on("SIGINT", () => {
-    stop();
-    process.exit(0);
-  });
-  await new Promise((resolve) => mihomo.once("exit", () => resolve()));
-}
-try {
-  await main();
-} catch (error) {
-  console.error(error);
-  process.exit(1);
-}