From 12f29617723158609298893aa48b0d8b6595e10f Mon Sep 17 00:00:00 2001
From: GuanM <1-GuanM@users.noreply.gitlab.54sxh.cn>
Date: Wed, 19 Jun 2024 14:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=A1=86=E6=9E=B6=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.go    |  4 +--
 task/ip.go | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/main.go b/main.go
index 4dd8ca3..3f61db8 100644
--- a/main.go
+++ b/main.go
@@ -38,7 +38,7 @@ func init() {
 	flag.StringVar(&task.IPFile, "f", "ip.txt", "IP段数据文件")
 	flag.StringVar(&task.IPText, "ip", "", "指定IP段数据")
 	flag.StringVar(&utils.Output, "o", "result.csv", "输出结果文件")
-
+	flag.BoolVar(&task.IsOff, "om", false, "关闭在线读取列表")
 	flag.BoolVar(&task.Disable, "dd", false, "禁用下载测速")
 	flag.BoolVar(&task.TestAll, "allip", false, "测速全部 IP")
 
@@ -91,7 +91,7 @@ func endPrint() {
 	}
 	if runtime.GOOS == "windows" { // 如果是 Windows 系统，则需要按下 回车键 或 Ctrl+C 退出（避免通过双击运行时，测速完毕后直接关闭）
 		fmt.Printf("按下 回车键 或 Ctrl+C 退出。")
-		fmt.Scanln()
+		_, _ = fmt.Scanln()
 	}
 }
 
diff --git a/task/ip.go b/task/ip.go
index 768fda0..d34a3dc 100644
--- a/task/ip.go
+++ b/task/ip.go
@@ -2,9 +2,13 @@ package task
 
 import (
 	"bufio"
+	"encoding/json"
+	"fmt"
+	"io"
 	"log"
 	"math/rand"
 	"net"
+	"net/http"
 	"os"
 	"strconv"
 	"strings"
@@ -14,12 +18,31 @@ import (
 const defaultInputFile = "ip.txt"
 
 var (
+	IPCidrApi = "https://api.cloudflare.com/client/v4/ips"
+	Ipv4Cidr  = []string{
+		"173.245.48.0/20",
+		"103.21.244.0/22",
+		"103.22.200.0/22",
+		"103.31.4.0/22",
+		"141.101.64.0/18",
+		"108.162.192.0/18",
+		"190.93.240.0/20",
+		"188.114.96.0/20",
+		"197.234.240.0/22",
+		"198.41.128.0/17",
+		"162.158.0.0/15",
+		"104.16.0.0/13",
+		"104.24.0.0/14",
+		"172.64.0.0/13",
+		"131.0.72.0/22",
+	}
 	// TestAll test all ip
 	TestAll = false
 	// IPFile is the filename of IP Rangs
 	IPFile  = defaultInputFile
 	IPText  string
 	randGen *rand.Rand
+	IsOff   bool
 )
 
 func InitRandSeed() {
@@ -166,7 +189,7 @@ func loadIPRanges() []*net.IPAddr {
 		}
 	} else { // 从文件中获取 IP 段数据
 		if IPFile == "" {
-			IPFile = defaultInputFile
+			return ToNetAddr()
 		}
 		file, err := os.Open(IPFile)
 		if err != nil {
@@ -194,3 +217,67 @@ func loadIPRanges() []*net.IPAddr {
 	}
 	return ranges.ips
 }
+
+func ToNetAddr() []*net.IPAddr {
+	ranges := newIPRanges()
+	for _, v := range Ipv4Cidr {
+		line := strings.TrimSpace(v)
+		if line == "" {
+			continue
+		}
+		ranges.parseCIDR(line)
+		if isIPv4(line) {
+			ranges.chooseIPv4()
+		} else {
+			ranges.chooseIPv6()
+		}
+	}
+	if IsOff {
+		return ranges.ips
+	}
+	// 获取在线IPv4 CIDR列表
+	resp, err := http.Get(IPCidrApi)
+	if err != nil {
+		fmt.Println("获取在线列表失败，正在使用内置列表")
+		return ranges.ips
+	}
+	defer func(Body io.ReadCloser) {
+		_ = Body.Close()
+	}(resp.Body)
+
+	// 读取响应主体
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println("获取在线列表失败，正在使用内置列表")
+		return ranges.ips
+	}
+
+	// 解析JSON数据
+	var data struct {
+		Result struct {
+			IPv4CIDRs []string `json:"ipv4_cidrs"`
+		} `json:"result"`
+		Success bool `json:"success"`
+	}
+
+	if err = json.Unmarshal(body, &data); err != nil || !data.Success {
+		fmt.Println("获取在线列表失败，正在使用内置列表")
+		return ranges.ips
+	}
+
+	fmt.Println("获取在线列表成功，正在使用在线列表")
+	ranges = newIPRanges()
+	for _, v := range data.Result.IPv4CIDRs {
+		line := strings.TrimSpace(v)
+		if line == "" {
+			continue
+		}
+		ranges.parseCIDR(line)
+		if isIPv4(line) {
+			ranges.chooseIPv4()
+		} else {
+			ranges.chooseIPv6()
+		}
+	}
+	return ranges.ips
+}