cfpilot 0.9.5 → 0.9.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/cli.js CHANGED
@@ -87,7 +87,7 @@ var VERSION, NAME;
87
87
  var init_version = __esm({
88
88
  "src/shared/version.ts"() {
89
89
  "use strict";
90
- VERSION = "0.9.5";
90
+ VERSION = "0.9.7";
91
91
  NAME = "cfpilot";
92
92
  }
93
93
  });
@@ -4107,7 +4107,7 @@ async function runScan(options) {
4107
4107
  sniHost: parsedUrl.host,
4108
4108
  requestHost: parsedUrl.host,
4109
4109
  path: requestPath,
4110
- connections: options.speedConnections ?? 3,
4110
+ connections: options.speedConnections ?? 8,
4111
4111
  durationMs: options.speedDurationMs ?? 6e3,
4112
4112
  timeoutMs: options.speedTimeoutMs ?? 2e4
4113
4113
  });
@@ -4117,7 +4117,7 @@ async function runScan(options) {
4117
4117
  stage: 3,
4118
4118
  done: speedDone,
4119
4119
  total: stage2.length,
4120
- message: `\u6D4B\u901F ${speedDone}/${stage2.length} ${result.steadyMBps.toFixed(1)} MB/s`
4120
+ message: `\u6D4B\u901F ${speedDone}/${stage2.length} [${item.probe.colo || "UNK"}] ${result.steadyMBps.toFixed(1)} MB/s`
4121
4121
  });
4122
4122
  return { ...item, speed: result.ok ? result.steadyMBps : 0 };
4123
4123
  });
@@ -4131,7 +4131,7 @@ async function runScan(options) {
4131
4131
  host: options.host,
4132
4132
  bytes: speedBytes,
4133
4133
  path: strictProbePath,
4134
- connections: options.speedConnections ?? 3,
4134
+ connections: options.speedConnections ?? 8,
4135
4135
  durationMs: options.speedDurationMs ?? 6e3,
4136
4136
  timeoutMs: speedTimeoutMs
4137
4137
  });
@@ -4141,7 +4141,7 @@ async function runScan(options) {
4141
4141
  stage: 3,
4142
4142
  done: speedDone,
4143
4143
  total: stage2.length,
4144
- message: `\u6D4B\u901F ${speedDone}/${stage2.length} ${result.steadyMBps.toFixed(1)} MB/s`
4144
+ message: `\u6D4B\u901F ${speedDone}/${stage2.length} [${item.probe.colo || "UNK"}] ${result.steadyMBps.toFixed(1)} MB/s`
4145
4145
  });
4146
4146
  return { ...item, speed: result.ok ? result.steadyMBps : 0 };
4147
4147
  });
@@ -4585,17 +4585,22 @@ var init_ip_ranges = __esm({
4585
4585
  "131.0.72.0/22"
4586
4586
  ];
4587
4587
  IPV4_CIDR_WEIGHTS = {
4588
- "104.16.0.0/13": 1,
4589
- // 实测 8/12
4590
- "104.24.0.0/14": 0.9,
4591
- // 实测 7/12
4592
- "103.21.244.0/22": 0.3,
4588
+ "104.16.0.0/13": 0.9,
4589
+ // 复测 7/12(旧表按 8/12 给 1.0)
4590
+ "104.24.0.0/14": 0.95,
4591
+ // 复测 11/12,最好的一段(旧表 0.9)
4592
+ "188.114.96.0/20": 0.75,
4593
+ // 复测 9/12(旧表 0.3 —— 被低估 3 倍)
4594
+ "172.64.0.0/13": 0.4,
4595
+ // 复测 5/12(旧表 0.1 —— 被低估 5 倍)
4596
+ "103.21.244.0/22": 0.35,
4597
+ // 复测 4/12
4593
4598
  "103.31.4.0/22": 0.3,
4594
- "190.93.240.0/20": 0.3,
4595
- "188.114.96.0/20": 0.3,
4596
- "141.101.64.0/18": 0.2,
4597
- "162.158.0.0/16": 0.2,
4598
- // 162.158.x.x:边缘节点,部分可用
4599
+ // 复测 3/12
4600
+ "190.93.240.0/20": 0.25,
4601
+ // 复测 2/12
4602
+ "162.158.0.0/16": 0.3,
4603
+ // 复测 4/12(162.158.x 为边缘节点,可用)
4599
4604
  // 162.159.x.x 是 Cloudflare 的管理 / API 网段,真机实测**多数**返回
4600
4605
  // HTTP 403(反爬风控),但**并非全部**——用户实测 162.159.237.59 可用
4601
4606
  // (2.8 MB/s),本地复测同样通过(SJC)。
@@ -4606,14 +4611,17 @@ var init_ip_ranges = __esm({
4606
4611
  // ⚠️ 教训:权重粒度为 /16,但实际可用性可能细到单个 IP。
4607
4612
  // 实测样本只有 9 个就下「完全不可用」的结论过于草率。
4608
4613
  "162.159.0.0/16": 0.05,
4609
- "172.64.0.0/13": 0.1,
4610
- // 实测 0/12 —— 不采样
4611
- "173.245.48.0/20": 0,
4614
+ "141.101.64.0/18": 0.05,
4615
+ // 复测 0/12(旧表 0.2 —— 高估了;样本小,留一点探针)
4616
+ "173.245.48.0/20": 0.05,
4617
+ // 复测 1/12(旧表 0 —— 至少还能出个把可用 IP)
4618
+ // 实测 0/12 且 **TCP 层不可达** —— 不采样
4612
4619
  "103.22.200.0/22": 0,
4613
- "108.162.192.0/18": 0,
4614
4620
  "197.234.240.0/22": 0,
4615
4621
  "198.41.128.0/17": 0,
4616
- "131.0.72.0/22": 0
4622
+ "131.0.72.0/22": 0,
4623
+ // TCP 可连但 TLS/HTTP 不应答(区域 / 租户专用分配,对普通站点没有配置)
4624
+ "108.162.192.0/18": 0
4617
4625
  };
4618
4626
  DEFAULT_CIDR_WEIGHT = 0.2;
4619
4627
  WEIGHT_TABLE = (() => {
@@ -4823,7 +4831,7 @@ async function loadCloudflareCidrs(family) {
4823
4831
  }
4824
4832
  async function resolveCandidates(opts = {}) {
4825
4833
  const sample = opts.sample ?? DEFAULT_CANDIDATE_SAMPLE;
4826
- const seed = opts.seed ?? DEFAULT_CANDIDATE_SEED;
4834
+ const seed = opts.seed ?? randomSeed();
4827
4835
  const family = opts.family ?? "both";
4828
4836
  const customCidrs = normalizeCidrInput(opts.cidr);
4829
4837
  if (customCidrs.length > 0) {
@@ -4832,6 +4840,9 @@ async function resolveCandidates(opts = {}) {
4832
4840
  const cidrs = await loadCloudflareCidrs(family);
4833
4841
  return expandCidrs(cidrs, { sample, seed });
4834
4842
  }
4843
+ function randomSeed() {
4844
+ return (Date.now() ^ Math.floor(Math.random() * 4294967296)) >>> 0;
4845
+ }
4835
4846
  function normalizeCandidateList(input) {
4836
4847
  if (!Array.isArray(input) || input.length === 0) return [];
4837
4848
  const lines = input.filter((item) => typeof item === "string");
@@ -4850,14 +4861,13 @@ function normalizeCandidateList(input) {
4850
4861
  }
4851
4862
  return out;
4852
4863
  }
4853
- var DEFAULT_CANDIDATE_SAMPLE, DEFAULT_CANDIDATE_SEED, DEFAULT_BRIDGE_SAMPLE;
4864
+ var DEFAULT_CANDIDATE_SAMPLE, DEFAULT_BRIDGE_SAMPLE;
4854
4865
  var init_candidates = __esm({
4855
4866
  "src/scan/candidates.ts"() {
4856
4867
  "use strict";
4857
4868
  init_ip_ranges();
4858
4869
  init_net_env();
4859
4870
  DEFAULT_CANDIDATE_SAMPLE = 2e4;
4860
- DEFAULT_CANDIDATE_SEED = 24301;
4861
4871
  DEFAULT_BRIDGE_SAMPLE = 6556;
4862
4872
  }
4863
4873
  });
@@ -5254,8 +5264,10 @@ scan \u9009\u9879:
5254
5264
  url = \u53EA\u7528\u516C\u5F00\u6D4B\u901F\u5730\u5740\uFF08\u4EFB\u4F55\u9879\u76EE\u90FD\u80FD\u6D4B\uFF09
5255
5265
  --speed-url <url> \u516C\u5F00\u6D4B\u901F\u5730\u5740\uFF0C\u9ED8\u8BA4 ${DEFAULT_SPEED_URL}
5256
5266
  \u53EF\u6362\u6210\u4EFB\u610F\u8FD4\u56DE\u5927\u6587\u4EF6\u7684\u5730\u5740
5257
- --speed-conns <n> \u6D4B\u901F\u5E76\u53D1\u8FDE\u63A5\u6570\uFF0C\u9ED8\u8BA4 3
5258
- \u5355\u6761 TCP \u8FDE\u63A5\u53D7\u62E5\u585E\u7A97\u53E3\u9650\u5236\uFF0C\u591A\u8FDE\u63A5\u66F4\u63A5\u8FD1\u771F\u5B9E\u5E26\u5BBD
5267
+ --speed-conns <n> \u6D4B\u901F\u5E76\u53D1\u8FDE\u63A5\u6570\uFF0C\u9ED8\u8BA4 8
5268
+ \u8DE8\u5883\u94FE\u8DEF\u5355\u6761 TCP \u53D7\u4E22\u5305 / \u62E5\u585E\u7A97\u53E3\u9650\u5236\u3002\u5B9E\u6D4B\u540C\u4E00\u4E2A IP\uFF1A
5269
+ 1 \u6761 0.12 MB/s\u30013 \u6761 0.47\u30018 \u6761 1.15\u300116 \u6761 2.22 \u2014\u2014
5270
+ \u7528 1~3 \u6761\u4F1A\u7CFB\u7EDF\u6027\u4F4E\u4F30 2~4 \u500D\uFF1B8 \u6761\u66F4\u8D34\u8FD1\u6D4F\u89C8\u5668\u771F\u5B9E\u884C\u4E3A
5259
5271
  --speed-duration <ms> \u6D4B\u901F\u65F6\u957F\uFF0C\u9ED8\u8BA4 6000
5260
5272
  \u524D 1 \u79D2\u7684\u6162\u542F\u52A8\u6837\u672C\u4F1A\u88AB\u4E22\u5F03\uFF0C\u53EA\u7EDF\u8BA1\u4E4B\u540E\u7684\u7A33\u6001\u541E\u5410
5261
5273
  \u26A0\uFE0F \u6D41\u91CF\u5F00\u9500 \u2248 \u65F6\u957F \xD7 \u94FE\u8DEF\u901F\u7387 \xD7 \u8FDE\u63A5\u6570\uFF1A
@@ -5295,7 +5307,9 @@ scan \u9009\u9879:
5295
5307
  --speed-limit <n> \u8FDB\u5165\u6D4B\u901F\u7684\u5019\u9009\u6570\uFF0C\u9ED8\u8BA4 30
5296
5308
  --speed-bytes <n> \u6D4B\u901F\u5B57\u8282\u6570\uFF0C\u9ED8\u8BA4 5242880
5297
5309
  --timeout <ms> \u9636\u6BB5\u4E00\u8D85\u65F6\uFF0C\u9ED8\u8BA4 1200
5298
- --seed <n> \u91C7\u6837\u968F\u673A\u79CD\u5B50\uFF0C\u9ED8\u8BA4 24301
5310
+ --seed <n> \u91C7\u6837\u968F\u673A\u79CD\u5B50\u3002\u9ED8\u8BA4\u6BCF\u6B21\u968F\u673A \u2014\u2014 \u4FDD\u8BC1\u6BCF\u6B21\u63A2\u7D22\u4E0D\u540C\u7684 IP \u5B50\u96C6
5311
+ \uFF08\u5199\u6B7B\u79CD\u5B50\u4F1A\u8BA9\u6BCF\u6B21\u8DD1\u90FD\u6D4B\u540C\u4E00\u6279 IP\uFF0C\u62BD\u5230\u52A3\u8D28\u6BB5\u5C31\u6C38\u8FDC\u6D4B\u4E0D\u51FA\u597D IP\uFF09
5312
+ \u663E\u5F0F\u6307\u5B9A\u5219\u56FA\u5B9A\u3001\u7ED3\u679C\u53EF\u590D\u73B0\uFF08\u6392\u67E5 / \u5BF9\u6BD4\u65F6\u7528\uFF09
5299
5313
  --json \u4EE5 JSON \u8F93\u51FA\u7ED3\u679C
5300
5314
  --quiet \u4EC5\u8F93\u51FA\u7ED3\u679C
5301
5315
 
@@ -5354,7 +5368,9 @@ async function resolveCandidatesFromArgs(args) {
5354
5368
  return resolveCandidates({
5355
5369
  sample: flagNumber(args, "sample", 6556),
5356
5370
  cidr: flagList(args, "cidr"),
5357
- seed: flagNumber(args, "seed", 24301)
5371
+ // ⚠️ 不传 seed = 每次随机(默认)。只有用户显式给了 --seed 才固定,
5372
+ // 否则「每次跑都测同一批 IP」——那批落在劣质路由段上时永远测不出好 IP。
5373
+ seed: args.flags["seed"] !== void 0 ? flagNumber(args, "seed", 24301) : void 0
5358
5374
  });
5359
5375
  }
5360
5376
  function printProgress(event, quiet) {
@@ -5603,7 +5619,10 @@ ${NAME} v${VERSION}
5603
5619
  speedUrl,
5604
5620
  // 默认串行:带宽是共享资源,并行测多个候选会互相抢带宽(见 scan.ts 的 speedConcurrency 注释)
5605
5621
  speedConcurrency: flagNumber(args, "speed-concurrency", 1),
5606
- speedConnections: flagNumber(args, "speed-conns", 3),
5622
+ // 并发连接数:跨境链路上单条 TCP 受丢包 / 拥塞窗口限制。
5623
+ // 2026-10-28 直连实测同一个 IP:1 条 0.12 MB/s、3 条 0.47、8 条 1.15、16 条 2.22 ——
5624
+ // 用 3 条会系统性低估 2~4 倍。默认 8 条,贴近浏览器/客户端的真实多连接行为。
5625
+ speedConnections: flagNumber(args, "speed-conns", 8),
5607
5626
  speedDurationMs: flagNumber(args, "speed-duration", 6e3),
5608
5627
  top,
5609
5628
  onProgress: (event) => printProgress(event, quiet)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cfpilot",
3
- "version": "0.9.5",
3
+ "version": "0.9.7",
4
4
  "description": "CFPilot —— Cloudflare Pages 代理部署与优选工具(交互菜单 + 子命令)",
5
5
  "type": "module",
6
6
  "license": "MIT",