whistle.easy-proxy 1.1.0 → 1.2.0

package/README.md

@@ -61,6 +61,7 @@ open http://local.whistlejs.com/plugin.easy-proxy/
 | `easy-proxy accel dns` | 刷新 DNS 缓存 |
 | `easy-proxy host add <域名> <IP>` | 添加手动 IP 覆盖 |
 | `easy-proxy health` | 综合健康检查 |
+| `easy-proxy mirror` | 开发镜像源加速（npm/pip/go，302 重定向到国内镜像） |
 | `easy-proxy status` | 查看整体状态 |
 
 **完整命令参考** → [docs/cli.md](docs/cli.md)

package/lib/cert-check.js

@@ -126,10 +126,8 @@ function fixCertCompliance(certPath) {
     ]);
     cert.sign(key, forge.md.sha256.create());
     fs.writeFileSync(certPath, forge.pki.certificateToPem(cert));
-    // 证书变了，合并 CA 包作废，下次运行重新生成
-    try {
-      fs.unlinkSync(MERGED_CA_PATH);
-    } catch (_e) {}
+    // 不删合并 CA 包：重签后 root.crt 的 mtime 更新，ensureMergedCaBundle 的
+    // staleness 检查会自动重建（直接 unlink 会让环境变量悬空指向不存在的文件）
     return true;
   } catch (_e) {
     return false;
@@ -218,7 +216,10 @@ function ensureMergedCaBundle(certPath) {
     // whistle 生成的 root.crt 是 CRLF 行尾，Node/NODE_EXTRA_CA_CERTS 加载器会拒收混入的 CRLF 证书
     var whistlePem = fs.readFileSync(certPath, 'utf-8').replace(/\r/g, '');
     fs.mkdirSync(path.dirname(merged), { recursive: true });
-    fs.writeFileSync(merged, base + '\n' + whistlePem);
+    // 原子写：先写临时文件再 rename，避免写一半崩溃留下坏文件
+    var tmp = merged + '.tmp-' + process.pid;
+    fs.writeFileSync(tmp, base + '\n' + whistlePem);
+    fs.renameSync(tmp, merged);
     return merged;
   } catch (_e) {
     return null;

package/lib/cli/commands/index.js

@@ -8,6 +8,7 @@ const { registerStatus } = require('./status');
 const { registerConfig } = require('./config-cmd');
 const { registerIntercept } = require('./intercept');
 const { registerNetwork } = require('./network');
+const { registerMirror } = require('./mirror');
 
 function registerAllCommands(program) {
   registerStart(program);
@@ -22,6 +23,7 @@ function registerAllCommands(program) {
   registerConfig(program);
   registerIntercept(program);
   registerNetwork(program);
+  registerMirror(program);
 }
 
 module.exports = {

package/lib/cli/commands/mirror.js

@@ -0,0 +1,101 @@
+const { readConfig, writeConfig, c, info, ok, err, title, sep } = require('../helpers');
+
+// 镜像开关状态存在主配置 config.json 的 mirrors 字段: { npm: true, pip: false, ... }
+function loadMirrorState() {
+  const cfg = readConfig();
+  return cfg.mirrors || {};
+}
+
+function saveMirrorState(state) {
+  const cfg = readConfig();
+  cfg.mirrors = state;
+  writeConfig(cfg);
+}
+
+function registerMirror(program) {
+  const mirrorCmd = program.command('mirror').description('开发镜像源加速（npm/pip/go 等，302 重定向到国内镜像）');
+
+  mirrorCmd
+    .command('status')
+    .description('查看镜像源状态')
+    .action(() => {
+      const { MIRROR_RULESETS } = require('../mirror-rulesets');
+      const state = loadMirrorState();
+      title('镜像源加速');
+      sep();
+      for (const name of Object.keys(MIRROR_RULESETS)) {
+        const on = state[name] === true;
+        info(`${on ? `${c.green}✓ 开启` : `${c.red}✗ 关闭`}${c.reset}  ${name}`);
+      }
+      sep();
+      info('开关立即同步到 whistle（需 whistle 运行中）');
+    });
+
+  mirrorCmd
+    .command('list')
+    .description('查看镜像规则内容')
+    .action(() => {
+      const { MIRROR_RULESETS } = require('../mirror-rulesets');
+      title('内置镜像规则');
+      sep();
+      for (const [name, rule] of Object.entries(MIRROR_RULESETS)) {
+        info(`${c.bold}${name}${c.reset}`);
+        rule
+          .split('\n')
+          .filter((l) => !l.startsWith('#'))
+          .forEach((l) => info(`  ${l}`));
+      }
+      sep();
+    });
+
+  mirrorCmd
+    .command('on [name]')
+    .description('启用镜像（无参数=全部启用）')
+    .action(async (name) => {
+      const { MIRROR_RULESETS } = require('../mirror-rulesets');
+      if (name && !MIRROR_RULESETS[name]) {
+        err(`未知镜像: ${name}（可用: ${Object.keys(MIRROR_RULESETS).join(', ')}）`);
+        return;
+      }
+      const state = loadMirrorState();
+      if (name) state[name] = true;
+      else for (const k of Object.keys(MIRROR_RULESETS)) state[k] = true;
+      saveMirrorState(state);
+
+      const { syncMirrors } = require('../mirror-sync');
+      try {
+        await syncMirrors();
+        ok(name ? `镜像 ${name} 已开启` : '所有镜像已开启');
+      } catch (e) {
+        info('whistle 未运行，配置已保存，下次 start 自动生效');
+      }
+    });
+
+  mirrorCmd
+    .command('off [name]')
+    .description('关闭镜像（无参数=全部关闭）')
+    .action(async (name) => {
+      const { MIRROR_RULESETS } = require('../mirror-rulesets');
+      if (name && !MIRROR_RULESETS[name]) {
+        err(`未知镜像: ${name}（可用: ${Object.keys(MIRROR_RULESETS).join(', ')}）`);
+        return;
+      }
+      const state = loadMirrorState();
+      if (name) delete state[name];
+      else for (const k of Object.keys(MIRROR_RULESETS)) delete state[k];
+      saveMirrorState(state);
+
+      const { syncMirrors } = require('../mirror-sync');
+      try {
+        await syncMirrors();
+        ok(name ? `镜像 ${name} 已关闭` : '所有镜像已关闭');
+      } catch (_e) {
+        info('whistle 未运行，配置已保存，下次 start 自动生效');
+      }
+    });
+}
+
+module.exports = {
+  registerMirror,
+  loadMirrorState,
+};

package/lib/cli/commands/proxy.js

@@ -194,98 +194,65 @@ function registerProxy(program) {
     });
 
   // ---- proxy bypass ----
-  const bypassCmd = proxyCmd.command('bypass').description('管理跳过代理的域名');
-
-  bypassCmd
-    .command('show')
-    .description('查看当前跳过列表')
+  // 一行一个域名，# 注释；全删 = 恢复默认列表
+  const bypassCmd = proxyCmd
+    .command('bypass')
+    .description('编辑跳过代理的域名列表（打开 $EDITOR，一行一个域名）')
     .action(() => {
       const proxyConfig = require('../proxy-config');
-      const config = proxyConfig.loadConfig();
-      const domains = config.bypassDomains || proxyConfig.getDefaultBypass();
-      title('跳过代理的域名');
-      sep();
-      if (domains.length === 0) {
-        info('(空)');
-      } else {
-        domains.forEach((d) => {
-          info(`  ${d}`);
-        });
-      }
-      if (!config.bypassDomains) {
-        info(`${c.gray}(使用默认列表)${c.reset}`);
-      }
-      sep();
-    });
+      const oldList = proxyConfig.getEffectiveBypass();
 
-  bypassCmd
-    .command('set <domains>')
-    .description('设置跳过列表（逗号分隔，如: 127.0.0.1,localhost,*.local）')
-    .action((domains) => {
-      const proxyConfig = require('../proxy-config');
-      const list = domains
-        .split(',')
-        .map((d) => d.trim())
-        .filter(Boolean);
-      if (list.length === 0) {
-        err('请提供至少一个域名');
-        return;
-      }
-      proxyConfig.saveConfig({ bypassDomains: list });
-      ok(`已设置跳过列表: ${list.join(', ')}`);
-      info('重新开启系统代理后生效: easy-proxy proxy on');
-    });
+      const buildContent = (domains) =>
+        [
+          '# 跳过代理的域名（一行一个，# 开头为注释）',
+          '# 清空所有域名 = 恢复默认列表；保存后需重新 proxy on 生效',
+          '',
+          ...domains,
+        ].join('\n');
 
-  bypassCmd
-    .command('add <domain>')
-    .description('添加一个跳过域名')
-    .action((domain) => {
-      const proxyConfig = require('../proxy-config');
-      const config = proxyConfig.loadConfig();
-      const list = config.bypassDomains
-        ? config.bypassDomains.slice()
-        : proxyConfig.getDefaultBypass().slice();
-      if (list.indexOf(domain) >= 0) {
-        warn(`已存在: ${domain}`);
-        return;
+      let content = buildContent(oldList);
+      let newList;
+      while (true) {
+        let editedText;
+        try {
+          editedText = editInEditor(content, 'bypass');
+        } catch (_e) {
+          // 编辑器非零退出码（如 vi :q!）视为用户取消
+          info('已取消');
+          return;
+        }
+        const list = [];
+        const seen = new Set();
+        for (const raw of editedText.replace(/\r/g, '').split('\n')) {
+          const line = raw.trim();
+          if (!line || line.startsWith('#')) continue;
+          const key = line.toLowerCase();
+          if (seen.has(key)) continue;
+          seen.add(key);
+          list.push(line);
+        }
+        // 清空 = 恢复默认列表
+        if (list.length === 0) {
+          proxyConfig.saveConfig({ bypassDomains: null });
+          ok(`已清空，恢复默认列表（${proxyConfig.getEffectiveBypass().length} 个域名）`);
+          return;
+        }
+        if (list.some((d) => /^https?:\/\//i.test(d))) {
+          err('域名不应包含 http:// 或 https:// 前缀，请修正后重新保存...');
+          content = editedText;
+          continue;
+        }
+        newList = list;
+        break;
       }
-      list.push(domain);
-      proxyConfig.saveConfig({ bypassDomains: list });
-      ok(`已添加: ${domain}`);
-      info('重新开启系统代理后生效: easy-proxy proxy on');
-    });
 
-  bypassCmd
-    .command('remove <domain>')
-    .description('移除一个跳过域名')
-    .action((domain) => {
-      const proxyConfig = require('../proxy-config');
-      const config = proxyConfig.loadConfig();
-      if (!config.bypassDomains) {
-        warn('未自定义跳过列表，当前使用默认列表');
-        return;
-      }
-      const index = config.bypassDomains.indexOf(domain);
-      if (index < 0) {
-        warn(`未找到: ${domain}`);
+      if (JSON.stringify(oldList) === JSON.stringify(newList)) {
+        info('无改动');
         return;
       }
-      config.bypassDomains.splice(index, 1);
-      proxyConfig.saveConfig({ bypassDomains: config.bypassDomains });
-      ok(`已移除: ${domain}`);
-      info('重新开启系统代理后生效: easy-proxy proxy on');
-    });
 
-  bypassCmd
-    .command('reset')
-    .description('重置为默认跳过列表')
-    .action(() => {
-      const proxyConfig = require('../proxy-config');
-      proxyConfig.saveConfig({ bypassDomains: null });
-      ok('已重置为默认列表');
-      proxyConfig.getDefaultBypass().forEach((d) => {
-        info(`  ${d}`);
-      });
+      proxyConfig.saveConfig({ bypassDomains: newList });
+      ok(`已保存跳过列表（${newList.length} 个域名）`);
       info('重新开启系统代理后生效: easy-proxy proxy on');
     });
 }

package/lib/cli/commands/start.js

@@ -15,7 +15,8 @@ function registerStart(program) {
         if (certPath) ensureMergedCaBundle(certPath);
 
         const args = opts.init ? 'start --init' : 'start';
-        execSync(`"${localW2Path}" ${args}`, { stdio: 'inherit' });
+        // --dnsServer 绕过系统 DNS（ISP DNS 可能被污染，如 nodejs.org 解析到假 IP 导致 502 socket hang up）
+        execSync(`"${localW2Path}" ${args} --dnsServer 223.5.5.5`, { stdio: 'inherit' });
         ok('whistle 已启动');
 
         try {
@@ -66,6 +67,15 @@ function registerStart(program) {
           }
           if (count > 0) ok(`已同步 ${count} 个自定义规则`);
         }
+
+        // 内置镜像规则集（按开关状态同步，默认 npm/pip/go 开启）
+        try {
+          const { syncMirrors } = require('../mirror-sync');
+          const { added } = await syncMirrors();
+          if (added.length > 0) ok(`已同步 ${added.length} 个镜像规则集`);
+        } catch (e) {
+          debug('Mirror sync failed:', e.message);
+        }
       } catch (e) {
         err(`启动 whistle 失败: ${e.message}`);
         process.exit(1);

package/lib/cli/mirror-rulesets.js

@@ -0,0 +1,58 @@
+/**
+ * 内置镜像源规则集
+ * 每个 Key 是一个规则集名（easy-proxy mirror on/off <name>），value 是 whistle 规则文本。
+ *
+ * 原理：whistle 302 重定向。工具仍请求官方源，whistle 把请求重定向到国内镜像，
+ * 包管理器自动跟随重定向，无需改 .npmrc / pip.conf / GOPROXY 等工具配置。
+ *
+ * 已实测验证的链路：npm（302→npmmirror→tarball 下载成功）、pip（simple 页 + files.pythonhosted
+ * 文件下载成功）、go（proxy.golang.org → goproxy.cn）。Homebrew 的 formulae.brew.sh
+ * 重定向到清华镜像目录结构对不上，且 brew 本身走 GitHub（由 GitHub 加速覆盖），不内置。
+ */
+
+const MIRROR_RULESETS = {
+  npm: [
+    '# npm registry → npmmirror（npmpack/tarball 均跟随 302）',
+    '# 仅重定向 GET：npm publish（PUT/POST）直达官方源，不发镜像',
+    '^registry.npmjs.org/*** redirect://https://registry.npmmirror.com/$1 includeFilter://m:get',
+    '^registry.yarnpkg.com/*** redirect://https://registry.npmmirror.com/$1 includeFilter://m:get',
+  ].join('\n'),
+
+  pip: [
+    '# pip → 清华 TUNA 镜像',
+    '# index 页（/simple/）和包文件（files.pythonhosted.org/packages/...）都要重定向，',
+    '# 否则 index 能拿到但下载 whl 还是走官方源',
+    '^pypi.org/simple/*** redirect://https://pypi.tuna.tsinghua.edu.cn/simple/$1',
+    '^files.pythonhosted.org/*** redirect://https://pypi.tuna.tsinghua.edu.cn/packages/$1',
+  ].join('\n'),
+
+  go: [
+    '# Go module proxy → goproxy.cn',
+    '^proxy.golang.org/*** redirect://https://goproxy.cn/$1',
+  ].join('\n'),
+
+  node: [
+    '# Node.js 二进制分发 → 清华镜像（fnm/nvm/n/volta 通用，工具自动跟随 302，无需设 FNM_NODE_DIST_MIRROR）',
+    '^nodejs.org/dist/*** redirect://https://mirrors.tuna.tsinghua.edu.cn/nodejs-release/$1',
+  ].join('\n'),
+
+  conda: [
+    '# conda → 清华 anaconda 镜像',
+    '# 需配合工具配置 conda config --add channels 后再用，纯重定向只覆盖 repo.anaconda.com 主源',
+    '^repo.anaconda.com/pkgs/main/*** redirect://https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/main/$1',
+    '^conda.anaconda.org/*** redirect://https://mirrors.tuna.tsinghua.edu.cn/anaconda-cloud/$1',
+  ].join('\n'),
+
+  huggingface: [
+    '# HuggingFace → hf-mirror.com（模型/数据集下载）',
+    '^huggingface.co/*** redirect://https://hf-mirror.com/$1',
+  ].join('\n'),
+};
+
+// 默认启用的镜像规则集（easy-proxy start 同步时自动 select）
+const DEFAULT_ENABLED = ['npm', 'pip', 'go'];
+
+module.exports = {
+  MIRROR_RULESETS,
+  DEFAULT_ENABLED,
+};

package/lib/cli/mirror-sync.js

@@ -0,0 +1,48 @@
+/**
+ * 镜像规则集 → whistle 同步
+ * 规则集名统一加 "mirror-" 前缀放独立分组，关闭 = 从 whistle 删除规则集，
+ * 不污染用户的自定义规则空间。
+ */
+
+const MIRROR_GROUP = '\rEasyProxy 镜像加速';
+const RULESET_PREFIX = 'mirror-';
+
+/**
+ * 把当前开关状态同步到 whistle（规则集存在性 = 开关状态）
+ * @returns {Promise<{added: string[], removed: string[]}>}
+ */
+async function syncMirrors() {
+  const api = require('./rule-api');
+  const { MIRROR_RULESETS } = require('./mirror-rulesets');
+  const { loadMirrorState } = require('./commands/mirror');
+  const state = loadMirrorState();
+
+  await api.createGroup(MIRROR_GROUP);
+  const added = [];
+  const removed = [];
+
+  for (const [name, rule] of Object.entries(MIRROR_RULESETS)) {
+    const rulesetName = RULESET_PREFIX + name;
+    if (state[name] === true) {
+      await api.addRuleset(rulesetName, rule, MIRROR_GROUP);
+      await api.selectRuleset(rulesetName, rule);
+      added.push(rulesetName);
+    } else {
+      // 关闭 = 删除规则集（不存在时 remove 返回错误，忽略）
+      try {
+        await api.removeRuleset(rulesetName);
+        removed.push(rulesetName);
+      } catch (_e) {
+        // 本来就没开，跳过
+      }
+    }
+  }
+
+  return { added, removed };
+}
+
+module.exports = {
+  syncMirrors,
+  MIRROR_GROUP,
+  RULESET_PREFIX,
+};

package/lib/cli/proxy-config.js

@@ -28,14 +28,9 @@ function getEffectiveBypass() {
   return bypassDomains?.length > 0 ? bypassDomains : DEFAULT_BYPASS_DOMAINS;
 }
 
-function getDefaultBypass() {
-  return DEFAULT_BYPASS_DOMAINS;
-}
-
 module.exports = {
   DEFAULT_BYPASS_DOMAINS,
   loadConfig: loadProxyConfig,
   saveConfig: saveProxyConfig,
   getEffectiveBypass,
-  getDefaultBypass,
 };

package/lib/config.js

@@ -21,6 +21,8 @@ const DEFAULT_CONFIG = {
   hosts: [],
   upstreamProxies: [],
   proxyBypassDomains: null,
+  // 内置镜像源开关（默认启用，见 lib/cli/mirror-rulesets.js）
+  mirrors: { npm: true, pip: true, go: true, node: true },
 };
 
 function ensureDir() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whistle.easy-proxy",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "EasyProxy whistle plugin — GitHub acceleration, SNI rewrite, hosts management",
   "main": "index.js",
   "homepage": "https://github.com/sqlwwx/easy-proxy",
@@ -13,6 +13,7 @@
   },
   "author": "sqlwwx",
   "license": "MIT",
+  "packageManager": "pnpm@11.18.0",
   "files": [
     "index.js",
     "bin/",
@@ -51,9 +52,6 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "devDependencies": {
-    "@biomejs/biome": "^2.5.14"
-  },
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "start": "easy-proxy start",
@@ -61,6 +59,10 @@
     "test": "node --test",
     "health": "easy-proxy health",
     "format": "biome format . --write",
-    "format:check": "biome format ."
+    "format:check": "biome format .",
+    "prepublishOnly": "npm test"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "^2.5.14"
   }
-}
+}