cfpilot 0.9.4 → 0.9.6
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/assets/control.js +10 -10
- package/assets/dataplane.js +5 -5
- package/assets/worker.js +14 -14
- package/dist/cli.js +52 -29
- package/package.json +1 -1
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.
|
|
90
|
+
VERSION = "0.9.6";
|
|
91
91
|
NAME = "cfpilot";
|
|
92
92
|
}
|
|
93
93
|
});
|
|
@@ -2831,7 +2831,11 @@ async function runDeployCommand(args) {
|
|
|
2831
2831
|
trojanPassword,
|
|
2832
2832
|
wsPath,
|
|
2833
2833
|
enableTrojan: true,
|
|
2834
|
-
|
|
2834
|
+
// XHTTP 默认开启(2026-10-28 用户要求):
|
|
2835
|
+
// 数据面上它只是多一条「必须带合法 VLESS 头」的 POST 路由,开了不影响安全;
|
|
2836
|
+
// 想关在面板「入站配置 → 启用服务端 XHTTP 入站监听」关即可
|
|
2837
|
+
//(KV 配置优先级高于环境变量,面板开关会覆盖这里的默认值)。
|
|
2838
|
+
enableXhttp: true,
|
|
2835
2839
|
mode,
|
|
2836
2840
|
keepCredentials,
|
|
2837
2841
|
skipSameVersion,
|
|
@@ -4103,7 +4107,7 @@ async function runScan(options) {
|
|
|
4103
4107
|
sniHost: parsedUrl.host,
|
|
4104
4108
|
requestHost: parsedUrl.host,
|
|
4105
4109
|
path: requestPath,
|
|
4106
|
-
connections: options.speedConnections ??
|
|
4110
|
+
connections: options.speedConnections ?? 8,
|
|
4107
4111
|
durationMs: options.speedDurationMs ?? 6e3,
|
|
4108
4112
|
timeoutMs: options.speedTimeoutMs ?? 2e4
|
|
4109
4113
|
});
|
|
@@ -4113,7 +4117,7 @@ async function runScan(options) {
|
|
|
4113
4117
|
stage: 3,
|
|
4114
4118
|
done: speedDone,
|
|
4115
4119
|
total: stage2.length,
|
|
4116
|
-
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`
|
|
4117
4121
|
});
|
|
4118
4122
|
return { ...item, speed: result.ok ? result.steadyMBps : 0 };
|
|
4119
4123
|
});
|
|
@@ -4127,7 +4131,7 @@ async function runScan(options) {
|
|
|
4127
4131
|
host: options.host,
|
|
4128
4132
|
bytes: speedBytes,
|
|
4129
4133
|
path: strictProbePath,
|
|
4130
|
-
connections: options.speedConnections ??
|
|
4134
|
+
connections: options.speedConnections ?? 8,
|
|
4131
4135
|
durationMs: options.speedDurationMs ?? 6e3,
|
|
4132
4136
|
timeoutMs: speedTimeoutMs
|
|
4133
4137
|
});
|
|
@@ -4137,7 +4141,7 @@ async function runScan(options) {
|
|
|
4137
4141
|
stage: 3,
|
|
4138
4142
|
done: speedDone,
|
|
4139
4143
|
total: stage2.length,
|
|
4140
|
-
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`
|
|
4141
4145
|
});
|
|
4142
4146
|
return { ...item, speed: result.ok ? result.steadyMBps : 0 };
|
|
4143
4147
|
});
|
|
@@ -4581,17 +4585,22 @@ var init_ip_ranges = __esm({
|
|
|
4581
4585
|
"131.0.72.0/22"
|
|
4582
4586
|
];
|
|
4583
4587
|
IPV4_CIDR_WEIGHTS = {
|
|
4584
|
-
"104.16.0.0/13":
|
|
4585
|
-
//
|
|
4586
|
-
"104.24.0.0/14": 0.
|
|
4587
|
-
//
|
|
4588
|
-
"
|
|
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
|
|
4589
4598
|
"103.31.4.0/22": 0.3,
|
|
4590
|
-
|
|
4591
|
-
"
|
|
4592
|
-
|
|
4593
|
-
"162.158.0.0/16": 0.
|
|
4594
|
-
// 162.158.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 为边缘节点,可用)
|
|
4595
4604
|
// 162.159.x.x 是 Cloudflare 的管理 / API 网段,真机实测**多数**返回
|
|
4596
4605
|
// HTTP 403(反爬风控),但**并非全部**——用户实测 162.159.237.59 可用
|
|
4597
4606
|
// (2.8 MB/s),本地复测同样通过(SJC)。
|
|
@@ -4602,14 +4611,17 @@ var init_ip_ranges = __esm({
|
|
|
4602
4611
|
// ⚠️ 教训:权重粒度为 /16,但实际可用性可能细到单个 IP。
|
|
4603
4612
|
// 实测样本只有 9 个就下「完全不可用」的结论过于草率。
|
|
4604
4613
|
"162.159.0.0/16": 0.05,
|
|
4605
|
-
"
|
|
4606
|
-
//
|
|
4607
|
-
"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 层不可达** —— 不采样
|
|
4608
4619
|
"103.22.200.0/22": 0,
|
|
4609
|
-
"108.162.192.0/18": 0,
|
|
4610
4620
|
"197.234.240.0/22": 0,
|
|
4611
4621
|
"198.41.128.0/17": 0,
|
|
4612
|
-
"131.0.72.0/22": 0
|
|
4622
|
+
"131.0.72.0/22": 0,
|
|
4623
|
+
// TCP 可连但 TLS/HTTP 不应答(区域 / 租户专用分配,对普通站点没有配置)
|
|
4624
|
+
"108.162.192.0/18": 0
|
|
4613
4625
|
};
|
|
4614
4626
|
DEFAULT_CIDR_WEIGHT = 0.2;
|
|
4615
4627
|
WEIGHT_TABLE = (() => {
|
|
@@ -4819,7 +4831,7 @@ async function loadCloudflareCidrs(family) {
|
|
|
4819
4831
|
}
|
|
4820
4832
|
async function resolveCandidates(opts = {}) {
|
|
4821
4833
|
const sample = opts.sample ?? DEFAULT_CANDIDATE_SAMPLE;
|
|
4822
|
-
const seed = opts.seed ??
|
|
4834
|
+
const seed = opts.seed ?? randomSeed();
|
|
4823
4835
|
const family = opts.family ?? "both";
|
|
4824
4836
|
const customCidrs = normalizeCidrInput(opts.cidr);
|
|
4825
4837
|
if (customCidrs.length > 0) {
|
|
@@ -4828,6 +4840,9 @@ async function resolveCandidates(opts = {}) {
|
|
|
4828
4840
|
const cidrs = await loadCloudflareCidrs(family);
|
|
4829
4841
|
return expandCidrs(cidrs, { sample, seed });
|
|
4830
4842
|
}
|
|
4843
|
+
function randomSeed() {
|
|
4844
|
+
return (Date.now() ^ Math.floor(Math.random() * 4294967296)) >>> 0;
|
|
4845
|
+
}
|
|
4831
4846
|
function normalizeCandidateList(input) {
|
|
4832
4847
|
if (!Array.isArray(input) || input.length === 0) return [];
|
|
4833
4848
|
const lines = input.filter((item) => typeof item === "string");
|
|
@@ -4846,14 +4861,13 @@ function normalizeCandidateList(input) {
|
|
|
4846
4861
|
}
|
|
4847
4862
|
return out;
|
|
4848
4863
|
}
|
|
4849
|
-
var DEFAULT_CANDIDATE_SAMPLE,
|
|
4864
|
+
var DEFAULT_CANDIDATE_SAMPLE, DEFAULT_BRIDGE_SAMPLE;
|
|
4850
4865
|
var init_candidates = __esm({
|
|
4851
4866
|
"src/scan/candidates.ts"() {
|
|
4852
4867
|
"use strict";
|
|
4853
4868
|
init_ip_ranges();
|
|
4854
4869
|
init_net_env();
|
|
4855
4870
|
DEFAULT_CANDIDATE_SAMPLE = 2e4;
|
|
4856
|
-
DEFAULT_CANDIDATE_SEED = 24301;
|
|
4857
4871
|
DEFAULT_BRIDGE_SAMPLE = 6556;
|
|
4858
4872
|
}
|
|
4859
4873
|
});
|
|
@@ -5250,8 +5264,10 @@ scan \u9009\u9879:
|
|
|
5250
5264
|
url = \u53EA\u7528\u516C\u5F00\u6D4B\u901F\u5730\u5740\uFF08\u4EFB\u4F55\u9879\u76EE\u90FD\u80FD\u6D4B\uFF09
|
|
5251
5265
|
--speed-url <url> \u516C\u5F00\u6D4B\u901F\u5730\u5740\uFF0C\u9ED8\u8BA4 ${DEFAULT_SPEED_URL}
|
|
5252
5266
|
\u53EF\u6362\u6210\u4EFB\u610F\u8FD4\u56DE\u5927\u6587\u4EF6\u7684\u5730\u5740
|
|
5253
|
-
--speed-conns <n> \u6D4B\u901F\u5E76\u53D1\u8FDE\u63A5\u6570\uFF0C\u9ED8\u8BA4
|
|
5254
|
-
|
|
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
|
|
5255
5271
|
--speed-duration <ms> \u6D4B\u901F\u65F6\u957F\uFF0C\u9ED8\u8BA4 6000
|
|
5256
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
|
|
5257
5273
|
\u26A0\uFE0F \u6D41\u91CF\u5F00\u9500 \u2248 \u65F6\u957F \xD7 \u94FE\u8DEF\u901F\u7387 \xD7 \u8FDE\u63A5\u6570\uFF1A
|
|
@@ -5291,7 +5307,9 @@ scan \u9009\u9879:
|
|
|
5291
5307
|
--speed-limit <n> \u8FDB\u5165\u6D4B\u901F\u7684\u5019\u9009\u6570\uFF0C\u9ED8\u8BA4 30
|
|
5292
5308
|
--speed-bytes <n> \u6D4B\u901F\u5B57\u8282\u6570\uFF0C\u9ED8\u8BA4 5242880
|
|
5293
5309
|
--timeout <ms> \u9636\u6BB5\u4E00\u8D85\u65F6\uFF0C\u9ED8\u8BA4 1200
|
|
5294
|
-
--seed <n> \u91C7\u6837\u968F\u673A\u79CD\u5B50\
|
|
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
|
|
5295
5313
|
--json \u4EE5 JSON \u8F93\u51FA\u7ED3\u679C
|
|
5296
5314
|
--quiet \u4EC5\u8F93\u51FA\u7ED3\u679C
|
|
5297
5315
|
|
|
@@ -5350,7 +5368,9 @@ async function resolveCandidatesFromArgs(args) {
|
|
|
5350
5368
|
return resolveCandidates({
|
|
5351
5369
|
sample: flagNumber(args, "sample", 6556),
|
|
5352
5370
|
cidr: flagList(args, "cidr"),
|
|
5353
|
-
seed
|
|
5371
|
+
// ⚠️ 不传 seed = 每次随机(默认)。只有用户显式给了 --seed 才固定,
|
|
5372
|
+
// 否则「每次跑都测同一批 IP」——那批落在劣质路由段上时永远测不出好 IP。
|
|
5373
|
+
seed: args.flags["seed"] !== void 0 ? flagNumber(args, "seed", 24301) : void 0
|
|
5354
5374
|
});
|
|
5355
5375
|
}
|
|
5356
5376
|
function printProgress(event, quiet) {
|
|
@@ -5599,7 +5619,10 @@ ${NAME} v${VERSION}
|
|
|
5599
5619
|
speedUrl,
|
|
5600
5620
|
// 默认串行:带宽是共享资源,并行测多个候选会互相抢带宽(见 scan.ts 的 speedConcurrency 注释)
|
|
5601
5621
|
speedConcurrency: flagNumber(args, "speed-concurrency", 1),
|
|
5602
|
-
|
|
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),
|
|
5603
5626
|
speedDurationMs: flagNumber(args, "speed-duration", 6e3),
|
|
5604
5627
|
top,
|
|
5605
5628
|
onProgress: (event) => printProgress(event, quiet)
|