cfpilot 0.42.0 → 0.43.0
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/cfpilot-kernel-VERSION +2 -2
- package/assets/control.js +40 -19
- package/assets/dataplane.js +27 -7
- package/assets/relay-ip-builtin.txt +20 -0
- package/assets/worker.js +43 -22
- package/dist/cli.js +11 -3
- 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.
|
|
90
|
+
VERSION = "0.43.0";
|
|
91
91
|
NAME = "cfpilot";
|
|
92
92
|
}
|
|
93
93
|
});
|
|
@@ -9185,6 +9185,10 @@ async function resolveVerifyHosts(userRaw, quiet) {
|
|
|
9185
9185
|
}
|
|
9186
9186
|
return out2;
|
|
9187
9187
|
}
|
|
9188
|
+
function isWafBlockPage(status2, body) {
|
|
9189
|
+
if (status2 !== 403 || body.length > 64) return false;
|
|
9190
|
+
return WAF_BLOCK_MARKS.has(body.trim());
|
|
9191
|
+
}
|
|
9188
9192
|
async function verifyOne(opts, ip, verifyHost, timeoutMs) {
|
|
9189
9193
|
let ws;
|
|
9190
9194
|
let socket;
|
|
@@ -9204,14 +9208,16 @@ async function verifyOne(opts, ip, verifyHost, timeoutMs) {
|
|
|
9204
9208
|
s.once("error", reject);
|
|
9205
9209
|
});
|
|
9206
9210
|
socket.write(
|
|
9207
|
-
`
|
|
9211
|
+
`POST / HTTP/1.1\r
|
|
9208
9212
|
Host: ${verifyHost}\r
|
|
9213
|
+
Content-Length: 0\r
|
|
9209
9214
|
User-Agent: cfpilot-relay-verify\r
|
|
9210
9215
|
Connection: close\r
|
|
9211
9216
|
\r
|
|
9212
9217
|
`
|
|
9213
9218
|
);
|
|
9214
9219
|
const res = await readHttp(socket, timeoutMs);
|
|
9220
|
+
if (isWafBlockPage(res.status, res.body)) return false;
|
|
9215
9221
|
return res.status > 0;
|
|
9216
9222
|
} catch {
|
|
9217
9223
|
return false;
|
|
@@ -9470,7 +9476,7 @@ async function runRelayCommand(args) {
|
|
|
9470
9476
|
}
|
|
9471
9477
|
process.stdout.write("\n\u63D0\u793A\uFF1A\u628A\u901A\u8FC7\u7387\u9AD8\u7684\u524D\u51E0\u6761\u586B\u5165\u9762\u677F\u300C\u5165\u7AD9\u914D\u7F6E \u2192 ProxyIP \u6C60\u300D\uFF08\u6BCF\u884C\u4E00\u6761\uFF09\u3002\n");
|
|
9472
9478
|
}
|
|
9473
|
-
var CONCURRENCY, DEFAULT_TIMEOUT_MS2, BUILTIN_VERIFY_HOSTS, CF_RANGES, resolve4Async;
|
|
9479
|
+
var CONCURRENCY, DEFAULT_TIMEOUT_MS2, BUILTIN_VERIFY_HOSTS, CF_RANGES, resolve4Async, WAF_BLOCK_MARKS;
|
|
9474
9480
|
var init_relay = __esm({
|
|
9475
9481
|
"src/scan/relay.ts"() {
|
|
9476
9482
|
"use strict";
|
|
@@ -9483,6 +9489,7 @@ var init_relay = __esm({
|
|
|
9483
9489
|
CONCURRENCY = 8;
|
|
9484
9490
|
DEFAULT_TIMEOUT_MS2 = 12e3;
|
|
9485
9491
|
BUILTIN_VERIFY_HOSTS = [
|
|
9492
|
+
"api.x.com",
|
|
9486
9493
|
"cloudflare.com",
|
|
9487
9494
|
"chatgpt.com",
|
|
9488
9495
|
"canva.com",
|
|
@@ -9513,6 +9520,7 @@ var init_relay = __esm({
|
|
|
9513
9520
|
dns.resolve4(host, (err, addrs) => err ? reject(err) : resolve4(addrs));
|
|
9514
9521
|
});
|
|
9515
9522
|
};
|
|
9523
|
+
WAF_BLOCK_MARKS = /* @__PURE__ */ new Set(["IPv6"]);
|
|
9516
9524
|
}
|
|
9517
9525
|
});
|
|
9518
9526
|
|