mslxdff 0.1.244 → 0.1.245

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mslxdff",
-  "version": "0.1.244",
+  "version": "0.1.245",
   "description": "测试项目，请勿使用。",
   "type": "module",
   "bin": {

package/src/cli/commands/multi-ip-pool-fetch.js

@@ -50,8 +50,8 @@ export async function ensureRows(cfg, t) {
     return cache.rows;
   }
   t.say("缓存没有或已过期 ⇒ 逐源取表（每源失败原因都会列出来）");
-  const got = await fetchNodes({ sources: cfg.sources, dir: cfg.dir, timeoutMs: cfg.probeTimeoutMs, log: (m) => t.say(m) });
-  t.say(`取到：${got.source} → ${got.rows.length} 个节点`);
+  const got = await fetchNodes({ sources: cfg.sources, dir: cfg.dir, timeoutMs: cfg.probeTimeoutMs, maxAgeMs: cfg.maxTableAgeMs, log: (m) => t.say(m) });
+  t.say(`取到：${got.source} → ${got.rows.length} 个节点${got.stale ? "（⚠ 这张表已过期：节点多半早下线，别拿它当唯一来源）" : ""}`);
   return got.rows;
 }
 
@@ -155,9 +155,9 @@ export async function runFetch(args = []) {
   t.step("逐源取表（失败原因逐条列出）");
   t.say(`源列表：${cfg.sources.join(" → ")}`);
   try {
-    const got = await fetchNodesToFile({ sources: cfg.sources, out, timeoutMs: cfg.probeTimeoutMs, log: (m) => t.say(m) });
+    const got = await fetchNodesToFile({ sources: cfg.sources, out, timeoutMs: cfg.probeTimeoutMs, maxAgeMs: cfg.maxTableAgeMs, log: (m) => t.say(m) });
     const usable = got.rows.filter((r) => r.config).length;
-    t.say(`✅ ${got.rows.length} 个节点（${usable} 个配置可解码）→ ${out}`);
+    t.say(`✅ ${got.rows.length} 个节点（${usable} 个配置可解码）→ ${out}${got.stale ? "　⚠ 这份表已过期，只能应急" : ""}`);
     console.log("");
     console.log("  带到受限网络的机器上：");
     console.log(`     scp ${out} root@<组长机>:/root/.config/mslxdff/multi-ip-pool/vpngate.csv`);

package/src/multi-ip-pool/config.js

@@ -30,6 +30,7 @@ export const DEFAULTS = {
   cooldownMs: 600_000, // 槽失败冷却
   rotate: true, // 撞额度信号时换槽
   nodesTtlMs: 30 * 60_000, // 节点表缓存有效期（VPNGate 免费节点掉得快）
+  maxTableAgeMs: 24 * 60 * 60_000, // 表龄告警阈值：镜像表超过它就 ⚠（旧表 = 一堆早下线的 IP，白拨几分钟）
   openvpnBin: "openvpn",
   authUser: "vpn", // VPNGate 公共账号（非私人凭据）
   authPass: "vpn",
@@ -38,16 +39,16 @@ export const DEFAULTS = {
 };
 
 /**
- * VPNGate 节点源：**官方永远在前**，第三方镜像只作兜墙的最后一条。
- * 镜像 `aimili-vpngate` 仓库内 `mirror/vpngate.csv` 由它的 GitHub Actions **每 15 分钟**从官方表刷新
- * （cron `7,22,37,52 * * * *`），实测 2026-10-25 与官方**同 15 列同 schema**、99 节点全部可解码 ⇒ 解析器零改动。
- * 注意：它自己配的那条 GitHub Pages 镜像 `baoweise-bot.github.io/...` 已 404 死（实测），故不采用。
- * 表内容只是**公开节点的连接配置 + VPNGate 公共账号（vpn/vpn）**，不含任何私人凭据；仍不信任镜像就用
- * `MSLXDFF_MULTI_IP_SOURCES` 只留官方，或 `MSLXDFF_MULTI_IP_NODES_FILE` 自带一份本地表。
+ * VPNGate 节点源：**官方永远在前**，第三方镜像只作兜墙。
+ * 纠错（2026-10-26 实测）：`aimili-vpngate` 的 Actions 只把新鲜快照发到 **GitHub Pages**（`openmili.github.io/aimili-vpngate/`），
+ * **不往仓库里写表**；仓库内 `mirror/vpngate.csv` 是手工提交的死快照（2026-08-26 后未变）——此前当「每 15 分钟刷新」用 =
+ * 拿两个月前的死 IP 白拨，真机症状与被墙一模一样。
+ * 表只是公开节点配置 + VPNGate 公共账号（vpn/vpn）；不信任镜像就 `_SOURCES` 只留官方或 `_NODES_FILE` 自带。
  */
 export const NODE_SOURCES = [
   "https://www.vpngate.net/api/iphone/",
   "http://www.vpngate.net/api/iphone/",
+  "https://openmili.github.io/aimili-vpngate/vpngate.csv",
   "https://raw.githubusercontent.com/OpenMili/aimili-vpngate/main/mirror/vpngate.csv",
 ];
 
@@ -124,6 +125,7 @@ export function resolveMultiIpConfig(env = process.env, { logDirFn = logDir } =
     cooldownMs: envInt(env, "MSLXDFF_MULTI_IP_COOLDOWN_MS", DEFAULTS.cooldownMs),
     rotate: envBool(env, "MSLXDFF_MULTI_IP_ROTATE", DEFAULTS.rotate),
     nodesTtlMs: envInt(env, "MSLXDFF_MULTI_IP_NODES_TTL_MS", DEFAULTS.nodesTtlMs),
+    maxTableAgeMs: envInt(env, "MSLXDFF_MULTI_IP_MAX_TABLE_AGE_MS", DEFAULTS.maxTableAgeMs),
     openvpnBin: envStr(env, "MSLXDFF_MULTI_IP_OPENVPN", DEFAULTS.openvpnBin),
     authUser: envStr(env, "MSLXDFF_MULTI_IP_AUTH_USER", DEFAULTS.authUser),
     authPass: envStr(env, "MSLXDFF_MULTI_IP_AUTH_PASS", DEFAULTS.authPass),

package/src/multi-ip-pool/dial.js

@@ -86,7 +86,7 @@ export function createDialer({ cfg, baseUrl = "https://opencode.ai", log = () =>
       }
     }
     if (!rows.length) {
-      const got = await (deps.fetchNodes || fetchNodes)({ sources: cfg.sources, dir: cfg.dir, timeoutMs: cfg.probeTimeoutMs, log });
+      const got = await (deps.fetchNodes || fetchNodes)({ sources: cfg.sources, dir: cfg.dir, timeoutMs: cfg.probeTimeoutMs, maxAgeMs: cfg.maxTableAgeMs, log });
       rows = got.rows;
       source = got.source;
     }

package/src/multi-ip-pool/nodes-fetch.js

@@ -48,11 +48,11 @@ export function sourceToLocalPath(url) {
 }
 
 /**
- * 逐源尝试取表；任一源返回可解析的 CSV 即成功（并顺手写缓存）。
+ * 逐源尝试取表；任一源返回可解析的 CSV 即成功（顺手写缓存 + 问一句表龄：`maxAgeMs`）。
  * 全失败时**逐源原因都进异常**（受限网络下「为什么取不到」就是用户唯一的线索）。
- * @returns {Promise<{ source: string, rows: object[], text: string }>} text 是原始 CSV，供 `fetchNodesToFile` 落盘
+ * @returns {Promise<{ source: string, rows: object[], text: string, meta: object|null, stale: boolean }>} text 供 `fetchNodesToFile` 落盘
  */
-export async function fetchNodes({ sources = [], dir = "", fetchImpl, timeoutMs = 20_000, now = () => Date.now(), log = () => {} } = {}) {
+export async function fetchNodes({ sources = [], dir = "", fetchImpl, timeoutMs = 20_000, now = () => Date.now(), maxAgeMs = 0, log = () => {} } = {}) {
   const f = fetchImpl || getUndici().fetch || compatFetch;
   const fails = [];
   for (const url of sources) {
@@ -68,9 +68,9 @@ export async function fetchNodes({ sources = [], dir = "", fetchImpl, timeoutMs
       }
       const rows = parseVpnGateCsv(text);
       if (!rows.length) throw new Error("返回体不是可解析的 VPNGate CSV");
-      log(`[multi-ip-pool] 节点表取自 ${url}（${rows.length} 个节点）`);
-      if (dir) saveNodeCache({ dir, source: url, rows, now });
-      return { source: url, rows, text };
+      const meta = await fetchTableMeta({ source: url, fetchImpl: f, timeoutMs: Math.min(5_000, timeoutMs), now });
+      const stale = noteTable({ url, rows, meta, maxAgeMs, dir, now, log });
+      return { source: url, rows, text, meta, stale };
     } catch (e) {
       const why = errorWhy(e);
       fails.push(`${url}：${why}`);
@@ -84,8 +84,8 @@ export async function fetchNodes({ sources = [], dir = "", fetchImpl, timeoutMs
  * 取表并原样落一份 CSV（`-multi-ip-pool fetch` 的实现）：在能连的机器上抓，scp 进受限网络的组长机，
  * 那边 `MSLXDFF_MULTI_IP_NODES_FILE=<路径>` 即可零网络取表。0600：表里是节点凭据，不该给同机用户读。
  */
-export async function fetchNodesToFile({ sources = [], out, fetchImpl, timeoutMs = 20_000, log } = {}) {
-  const got = await fetchNodes({ sources, fetchImpl, timeoutMs, log });
+export async function fetchNodesToFile({ sources = [], out, fetchImpl, timeoutMs = 20_000, maxAgeMs = 0, log } = {}) {
+  const got = await fetchNodes({ sources, fetchImpl, timeoutMs, maxAgeMs, log });
   mkdirSync(dirname(out), { recursive: true });
   writeFileSync(out, got.text, { mode: 0o600 });
   return { ...got, out, file: out };
@@ -108,3 +108,53 @@ export async function probeExitIp({ agent, fetchImpl, timeoutMs = 12_000 } = {})
     return { ok: false, ip: "", ms: Date.now() - t0, error: errorWhy(e) };
   }
 }
+
+/** 镜像表的同源元数据文件名（上游 `build_vpngate_mirror.py` 固定产出，含 `generated_at_iso`）。 */
+const TABLE_META_NAME = "vpngate.meta.json";
+
+/** 表 URL → 同目录元数据 URL：只认 `.../vpngate.csv` 这类镜像表（官方 `api/iphone/`、本地表文件都没有 meta）。 */
+export function metaUrlFor(url) {
+  const m = /^(https?:\/\/\S*\/)vpngate\.csv$/i.exec(String(url || "").trim());
+  return m ? `${m[1]}${TABLE_META_NAME}` : "";
+}
+
+/** 表龄的人话（分钟/小时/天）。 */
+export function humanAge(ms) {
+  const mins = Math.round(Number(ms) / 60_000);
+  if (!Number.isFinite(mins) || mins < 0) return "未知";
+  if (mins < 60) return `${mins} 分钟`;
+  const hours = mins / 60;
+  return hours < 48 ? `${hours.toFixed(1)} 小时` : `${Math.round(hours / 24)} 天`;
+}
+
+/**
+ * 问一句「这份表是什么时候生成的」——镜像源长得一模一样（同样 15 列、同样能解析），
+ * 但可能是**几个月前的手工快照**：真机 2026-10-26 实测，参照实现仓库内那份 2026-08-26 生成、
+ * 而它的活表在 GitHub Pages（2026-10-24 生成）⇒ 拿旧表就是拿一堆早已下线的 IP 白拨几分钟，
+ * 症状与被墙完全一样。拿不到 meta（官方源/本地表/网络失败）就返回 null，绝不猜。
+ * @returns {Promise<{ ageMs: number, generatedAtIso: string } | null>}
+ */
+export async function fetchTableMeta({ source = "", fetchImpl, timeoutMs = 5_000, now = () => Date.now() } = {}) {
+  const url = metaUrlFor(source);
+  if (!url) return null;
+  try {
+    const f = fetchImpl || getUndici().fetch || compatFetch;
+    const res = await f(url, { signal: timeoutSignal(timeoutMs) });
+    if (!res.ok) return null;
+    const meta = JSON.parse(await res.text());
+    const at = Number(meta?.generated_at) * 1000 || Date.parse(String(meta?.generated_at_iso || ""));
+    if (!Number.isFinite(at) || at <= 0) return null;
+    return { ageMs: Math.max(0, now() - at), generatedAtIso: String(meta.generated_at_iso || new Date(at).toISOString()) };
+  } catch {
+    return null;
+  }
+}
+
+/** 取到表后的一次性记账：打「表龄」行、过期就 ⚠、按需写缓存，返回是否过期。 */
+function noteTable({ url = "", rows = [], meta = null, maxAgeMs = 0, dir = "", now = () => Date.now(), log = () => {} } = {}) {
+  const stale = Boolean(meta && maxAgeMs > 0 && meta.ageMs > maxAgeMs);
+  log(`[multi-ip-pool] 节点表取自 ${url}（${rows.length} 个节点${meta ? `，${humanAge(meta.ageMs)}前生成` : ""}）${stale ? " ⚠ 表已过期" : ""}`);
+  if (stale) log(`[multi-ip-pool] ⚠ 这张表已 ${humanAge(meta.ageMs)}没更新 ⇒ 节点多半早已下线（免费节点掉得快），拿它拨号就是白等几分钟：换源 MSLXDFF_MULTI_IP_SOURCES，或自带表 MSLXDFF_MULTI_IP_NODES_FILE`);
+  if (dir) saveNodeCache({ dir, source: url, rows, now });
+  return stale;
+}

package/src/multi-ip-pool/selftest.js

@@ -62,7 +62,7 @@ export async function runMultiIpCompare({ env = process.env, count = MITEST_DEFA
   let source = cache?.source || "(本地缓存)";
   if (!rows.length) {
     try {
-      const got = await (deps.fetchNodes || fetchNodes)({ sources: cfg.sources, dir: cfg.dir, timeoutMs: cfg.probeTimeoutMs, log });
+      const got = await (deps.fetchNodes || fetchNodes)({ sources: cfg.sources, dir: cfg.dir, timeoutMs: cfg.probeTimeoutMs, maxAgeMs: cfg.maxTableAgeMs, log });
       rows = got.rows;
       source = got.source;
     } catch (e) {