cfpilot-scanner 0.4.0 → 0.4.1

package/dist/cli.js

@@ -406,69 +406,6 @@ function readIpFile(text) {
   return out;
 }
 
-// src/candidates.ts
-var DEFAULT_CANDIDATE_SAMPLE = 2e4;
-var DEFAULT_CANDIDATE_SEED = 24301;
-var DEFAULT_BRIDGE_SAMPLE = 6556;
-function normalizeCidrInput(cidr) {
-  if (cidr === void 0) return [];
-  const list = Array.isArray(cidr) ? cidr : [cidr];
-  const out = [];
-  for (const item of list) {
-    if (typeof item !== "string") continue;
-    for (const part of item.split(/[\n,]+/)) {
-      const value = part.trim();
-      if (value) out.push(value);
-    }
-  }
-  return out;
-}
-function isIpv6Cidr(cidr) {
-  return cidr.includes(":");
-}
-function filterByFamily(cidrs, family) {
-  if (family === "both") return cidrs;
-  const wantIpv6 = family === "v6";
-  return cidrs.filter((cidr) => isIpv6Cidr(cidr) === wantIpv6);
-}
-async function loadCloudflareCidrs(family) {
-  let ipv4 = BUILTIN_IPV4_CIDRS;
-  let ipv6 = BUILTIN_IPV6_CIDRS;
-  try {
-    const ranges = await fetchCloudflareCidrs();
-    if (ranges.ipv4.length > 0) ipv4 = ranges.ipv4;
-    if (ranges.ipv6.length > 0) ipv6 = ranges.ipv6;
-  } catch {
-  }
-  if (family === "v4") return [...ipv4];
-  if (family === "v6") return [...ipv6];
-  return [...ipv4, ...ipv6];
-}
-async function resolveCandidates(opts = {}) {
-  const sample = opts.sample ?? DEFAULT_CANDIDATE_SAMPLE;
-  const seed = opts.seed ?? DEFAULT_CANDIDATE_SEED;
-  const family = opts.family ?? "both";
-  const customCidrs = normalizeCidrInput(opts.cidr);
-  if (customCidrs.length > 0) {
-    return expandCidrs(filterByFamily(customCidrs, family), { sample, seed });
-  }
-  const cidrs = await loadCloudflareCidrs(family);
-  return expandCidrs(cidrs, { sample, seed });
-}
-function normalizeCandidateList(input) {
-  if (!Array.isArray(input) || input.length === 0) return [];
-  const lines = input.filter((item) => typeof item === "string");
-  if (lines.length === 0) return [];
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  for (const ip of readIpFile(lines.join("\n"))) {
-    if (seen.has(ip)) continue;
-    seen.add(ip);
-    out.push(ip);
-  }
-  return out;
-}
-
 // src/net-env.ts
 import * as net from "node:net";
 import { execFile } from "node:child_process";
@@ -532,6 +469,44 @@ function isFakeIp(ip) {
   const [a, b] = parts;
   return a === 198 && (b === 18 || b === 19);
 }
+function isPublicAddress(ip) {
+  const value = ip.trim();
+  if (!value) return false;
+  if (!value.includes(":")) {
+    const parts = value.split(".");
+    if (parts.length !== 4) return false;
+    const nums = [];
+    for (const p of parts) {
+      if (!/^\d{1,3}$/.test(p)) return false;
+      const n = Number(p);
+      if (n > 255) return false;
+      nums.push(n);
+    }
+    const [a, b] = nums;
+    if (a === 0) return false;
+    if (a === 10) return false;
+    if (a === 127) return false;
+    if (a >= 224) return false;
+    if (a === 169 && b === 254) return false;
+    if (a === 172 && b >= 16 && b <= 31) return false;
+    if (a === 192 && b === 168) return false;
+    if (a === 100 && b >= 64 && b <= 127) return false;
+    if (a === 198 && (b === 18 || b === 19)) return false;
+    return true;
+  }
+  const lower = value.toLowerCase();
+  if (lower.startsWith("::ffff:") && lower.includes(".")) {
+    return isPublicAddress(lower.slice(7));
+  }
+  const groups = lower.split(":");
+  if (groups.length < 3) return false;
+  const first = groups[0];
+  if (!/^[0-9a-f]{1,4}$/.test(first)) return false;
+  const firstByte = Number.parseInt(first.slice(0, 2).padEnd(2, "0"), 16);
+  if (firstByte < 32 || firstByte > 63) return false;
+  if (lower.startsWith("2001:db8:")) return false;
+  return true;
+}
 async function detectProxyInterference(host) {
   const findings = [];
   const listening = [];
@@ -574,6 +549,74 @@ function isMsysPollutedPath(value) {
   return looksWindows || hasMsysHint;
 }
 
+// src/candidates.ts
+var DEFAULT_CANDIDATE_SAMPLE = 2e4;
+var DEFAULT_CANDIDATE_SEED = 24301;
+var DEFAULT_BRIDGE_SAMPLE = 6556;
+function normalizeCidrInput(cidr) {
+  if (cidr === void 0) return [];
+  const list = Array.isArray(cidr) ? cidr : [cidr];
+  const out = [];
+  for (const item of list) {
+    if (typeof item !== "string") continue;
+    for (const part of item.split(/[\n,]+/)) {
+      const value = part.trim();
+      if (value) out.push(value);
+    }
+  }
+  return out;
+}
+function isIpv6Cidr(cidr) {
+  return cidr.includes(":");
+}
+function filterByFamily(cidrs, family) {
+  if (family === "both") return cidrs;
+  const wantIpv6 = family === "v6";
+  return cidrs.filter((cidr) => isIpv6Cidr(cidr) === wantIpv6);
+}
+async function loadCloudflareCidrs(family) {
+  let ipv4 = BUILTIN_IPV4_CIDRS;
+  let ipv6 = BUILTIN_IPV6_CIDRS;
+  try {
+    const ranges = await fetchCloudflareCidrs();
+    if (ranges.ipv4.length > 0) ipv4 = ranges.ipv4;
+    if (ranges.ipv6.length > 0) ipv6 = ranges.ipv6;
+  } catch {
+  }
+  if (family === "v4") return [...ipv4];
+  if (family === "v6") return [...ipv6];
+  return [...ipv4, ...ipv6];
+}
+async function resolveCandidates(opts = {}) {
+  const sample = opts.sample ?? DEFAULT_CANDIDATE_SAMPLE;
+  const seed = opts.seed ?? DEFAULT_CANDIDATE_SEED;
+  const family = opts.family ?? "both";
+  const customCidrs = normalizeCidrInput(opts.cidr);
+  if (customCidrs.length > 0) {
+    return expandCidrs(filterByFamily(customCidrs, family), { sample, seed });
+  }
+  const cidrs = await loadCloudflareCidrs(family);
+  return expandCidrs(cidrs, { sample, seed });
+}
+function normalizeCandidateList(input) {
+  if (!Array.isArray(input) || input.length === 0) return [];
+  const lines = input.filter((item) => typeof item === "string");
+  if (lines.length === 0) return [];
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const ip of readIpFile(lines.join("\n"))) {
+    if (seen.has(ip)) continue;
+    seen.add(ip);
+    const isIpv4Literal = /^\d{1,3}(\.\d{1,3}){3}$/.test(ip);
+    const isIpv6Literal = ip.includes(":");
+    if (isIpv4Literal || isIpv6Literal) {
+      if (!isPublicAddress(ip)) continue;
+    }
+    out.push(ip);
+  }
+  return out;
+}
+
 // src/speed-url.ts
 import * as tls from "node:tls";
 var SPEED_URL_PRESETS = [
@@ -1307,10 +1350,20 @@ async function pool(items, concurrency, worker) {
   await Promise.all(runners);
   return out;
 }
+async function withRetry(attempts, fn, isOk = (r) => r.ok === true) {
+  const total = Math.max(1, Math.floor(attempts));
+  let last;
+  for (let i = 0; i < total; i++) {
+    last = await fn();
+    if (isOk(last)) return last;
+  }
+  return last;
+}
 async function runScan(options) {
   const started = Date.now();
   const concurrency = options.concurrency ?? 300;
   const tcpTimeoutMs = options.tcpTimeoutMs ?? 1200;
+  const retries = options.retries ?? 2;
   const tlsConcurrency = options.tlsConcurrency ?? 64;
   const tlsTimeoutMs = options.tlsTimeoutMs ?? 4e3;
   const maxLatencyMs = options.maxLatencyMs ?? 0;
@@ -1328,7 +1381,7 @@ async function runScan(options) {
   report({ type: "stage", stage: 1, name: "TCP \u63E1\u624B\u521D\u7B5B", total: candidates.length });
   let done = 0;
   const tcpResults = await pool(candidates, concurrency, async (ip) => {
-    const result = await tcpPing(ip, options.port, tcpTimeoutMs);
+    const result = await withRetry(retries, () => tcpPing(ip, options.port, tcpTimeoutMs));
     done++;
     if (done % 500 === 0 || done === candidates.length) {
       report({
@@ -1346,7 +1399,11 @@ async function runScan(options) {
   report({ type: "stage", stage: 1, name: "TLS \u63E1\u624B\u7B5B\u9009", total: filtered.length });
   let tlsDone = 0;
   const tlsResults = await pool(filtered, tlsConcurrency, async (item) => {
-    const probe = await probeTlsHandshake(item.ip, options.port, options.host, tlsTimeoutMs);
+    const probe = await withRetry(
+      retries,
+      () => probeTlsHandshake(item.ip, options.port, options.host, tlsTimeoutMs),
+      (r) => r.tlsMs > 0
+    );
     tlsDone++;
     if (tlsDone % 200 === 0 || tlsDone === filtered.length) {
       report({
@@ -1374,12 +1431,9 @@ async function runScan(options) {
   const probeResults = await pool(stage1, probeConcurrency, async (item) => {
     const probeFn = strictProbe ? probeWsPing : probeWs101;
     const probePath = strictProbe ? strictProbePath : options.wsPath ?? "/__edge_probe";
-    const result = await probeFn(
-      item.ip,
-      options.port,
-      options.host,
-      probeTimeoutMs,
-      probePath
+    const result = await withRetry(
+      retries,
+      () => probeFn(item.ip, options.port, options.host, probeTimeoutMs, probePath)
     );
     probeDone++;
     if (result.pongVerified) verifiedCount++;
@@ -1804,7 +1858,7 @@ async function handleRequest(req, res) {
 }
 
 // src/version.ts
-var VERSION = "0.4.0";
+var VERSION = "0.4.1";
 var NAME = "cfpilot-scanner";
 
 // src/cli.ts
@@ -1838,6 +1892,8 @@ scan \u9009\u9879:
   --speed-conns <n>      \u6D4B\u901F\u5E76\u53D1\u8FDE\u63A5\u6570\uFF0C\u9ED8\u8BA4 3
                          \u5355\u6761 TCP \u8FDE\u63A5\u53D7\u62E5\u585E\u7A97\u53E3\u9650\u5236\uFF0C\u591A\u8FDE\u63A5\u66F4\u63A5\u8FD1\u771F\u5B9E\u5E26\u5BBD
   --speed-duration <ms>  \u6D4B\u901F\u65F6\u957F\uFF0C\u9ED8\u8BA4 6000
+  --retries <n>           \u6BCF\u4E2A\u63A2\u6D4B\u7684\u5C1D\u8BD5\u6B21\u6570\uFF08\u542B\u9996\u6B21\uFF09\uFF0C\u9ED8\u8BA4 2
+                          \u771F\u673A\u5076\u53D1\u5931\u8D25\u7387 3~5%\uFF0C\u91CD\u8BD5\u53D6\u7B2C\u4E00\u6B21\u6210\u529F\u7684\u7ED3\u679C
   --no-verify            \u9636\u6BB5\u4E8C\u53EA\u505A 101 \u63E1\u624B\uFF0C\u8DF3\u8FC7\u54CD\u5E94\u4F53\u6821\u9A8C
                           \uFF08\u9ED8\u8BA4\u6821\u9A8C\uFF1A\u53D1 PING \u5E76\u9A8C\u8BC1\u6570\u636E\u9762\u56DE {"pong":true}\uFF09
   --no-speed             \u8DF3\u8FC7\u6D4B\u901F\uFF0C\u53EA\u6309\u5EF6\u8FDF\u6392\u5E8F
@@ -2121,6 +2177,7 @@ ${NAME} v${VERSION}
     skipSpeed,
     verifyPayload,
     concurrency: flagNumber(args, "concurrency", 300),
+    retries: flagNumber(args, "retries", 2),
     tcpTimeoutMs: flagNumber(args, "timeout", 1200),
     tlsConcurrency: flagNumber(args, "tls-concurrency", 64),
     tlsTimeoutMs: flagNumber(args, "tls-timeout", 4e3),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfpilot-scanner",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "CFPilot 优选器：用你自己的域名做 WebSocket 101 真连接校验，只保留真正可用的 Cloudflare IP；兼容任意 VLESS-WS 项目",
   "license": "MIT",
   "author": "CFPilot Contributors",