try add: mips64 mips64le support

fix: ipv6地址分割问题
支持直接传入未经修剪的URL
2025-08-12 06:26:39 +00:00 · 2023-02-13 09:00:13 +08:00 · 2023-02-11 01:53:30 +08:00 · 2023-02-11 01:03:02 +08:00 · 2023-02-10 00:53:53 +08:00 · 2023-02-06 23:44:31 +08:00
14 changed files with 356 additions and 105 deletions
--- a/.cross_compile.sh
+++ b/.cross_compile.sh
@@ -5,7 +5,7 @@ set -e
 DIST_PREFIX="nexttrace"
 DEBUG_MODE=${2}
 TARGET_DIR="dist"
-PLATFORMS="darwin/amd64 darwin/arm64 linux/386 linux/amd64 linux/arm64 linux/mips windows/amd64 windows/arm64 openbsd/amd64 openbsd/arm64 freebsd/amd64 freebsd/arm64"
+PLATFORMS="darwin/amd64 darwin/arm64 linux/386 linux/amd64 linux/arm64 linux/mips linux/mips64 linux/mipsle linux/mips64le windows/amd64 windows/arm64 openbsd/amd64 openbsd/arm64 freebsd/amd64 freebsd/arm64"

 BUILD_VERSION="$(git describe --tags --always)"
 BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,7 +64,7 @@ jobs:
          git config --global user.name "${{ secrets.git_name }}"
      - name: Clone repo
        run: |
-          git clone https://github.com/sjlleo/homebrew-nexttrace.git
+          git clone https://github.com/xgadget-lab/homebrew-nexttrace.git
      - name: Exec scipt
        run: |
          cd homebrew-nexttrace
@@ -81,7 +81,7 @@ jobs:
        run: |
          cd homebrew-nexttrace
          git commit -am 'Publish a new version with Formula' || true
-          git remote set-url origin https://${{ secrets.gt_token }}@github.com/sjlleo/homebrew-nexttrace.git
+          git remote set-url origin https://${{ secrets.gt_token }}@github.com/xgadget-lab/homebrew-nexttrace.git
          git push
        # env:
        #   SSH_AUTH_SOCK: /tmp/ssh_agent.sock
--- a/README.md
+++ b/README.md
@@ -18,11 +18,11 @@ Document Language: English | [简体中文](README_zh_CN.md)
 # Linux one-click install script
 bash <(curl -Ls https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh)

-# GHPROXY 镜像（国内使用）
-bash -c "$(curl -Ls https://ghproxy.com/https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh)"
-
 # macOS brew install command
 brew tap xgadget-lab/nexttrace && brew install nexttrace
+
+# GHProxy Mirror (For China Mainland User)
+bash -c "$(curl -Ls https://ghproxy.com/https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh)"
 ```

 Windows users please go to [Release Page](https://github.com/sjlleo/nexttrace/releases/latest) directly and download exe file.
@@ -44,8 +44,8 @@ nexttrace --table 1.0.0.1
 # IPv6 ICMP Trace
 nexttrace 2606:4700:4700::1111

-# Path Visualization With the -M parameter, a map URL is returned
-nexttrace --map koreacentral.blob.core.windows.net
+# Disable Path Visualization With the -M parameter
+nexttrace koreacentral.blob.core.windows.net
 # MapTrace URL: https://api.leo.moe/tracemap/html/c14e439e-3250-5310-8965-42a1e3545266.html
 ```

@@ -154,15 +154,19 @@ All NextTrace IP geolocation `API DEMO` can refer to [here](https://github.com/x
 ### For full usage list, please refer to the usage menu

 ```shell
-Usage: nexttrace [-h|--help] [-T|--tcp] [-U|--udp] [-F|--fast-trace] [-p|--port
+usage: nexttrace [-h|--help] [-T|--tcp] [-U|--udp] [-F|--fast-trace] [-p|--port
                 <integer>] [-q|--queries <integer>] [--parallel-requests
                 <integer>] [-m|--max-hops <integer>] [-d|--data-provider
                 (IP.SB|IPInfo|IPInsight|IPAPI.com)] [-n|--no-rdns]
-                 [-r|--route-path] [-o|--output] [-t|--table] [-c|--classic]
-                 [-f|--first <integer>] [-M|--map] [-v|--version] [-s|--source
-                 "<value>"] [-D|--dev "<value>"] [-R|--route] [-z|--send-time
-                 <integer>] [-i|--ttl-time <integer>]
-                 [IP Address or Domain name]
+                 [-a|--always-rdns] [-P|--route-path] [-r|--report]
+                 [-o|--output] [-t|--table] [-c|--classic] [-f|--first
+                 <integer>] [-M|--map] [-v|--version] [-s|--source "<value>"]
+                 [-D|--dev "<value>"] [-R|--route] [-z|--send-time <integer>]
+                 [-i|--ttl-time <integer>] [-g|--language (en|cn)] [IP Address
+                 or Domain]
+
+                 An open source visual route tracking CLI tool
+
 Arguments:

  -h  --help                         Print help information
@@ -189,10 +193,13 @@ Arguments:
  -d  --data-provider                Choose IP Geograph Data Provider
                                     [LeoMoeAPI,IP.SB, IPInfo, IPInsight,
                                     IPAPI.com]. Default: LeoMoeAPI
-  -n  --no-rdns                       Do not resolve IP addresses to their
+  -n  --no-rdns                      Do not resolve IP addresses to their
                                     domain names
-  -r  --route-path                   Print traceroute hop path by ASN and
+  -a  --always-rdns                  Always resolve IP addresses to their
+                                     domain names
+  -P  --route-path                   Print traceroute hop path by ASN and
                                     location
+  -r  --report                       output using report mode
  -o  --output                       Write trace result to file
                                     (RealTimePrinter ONLY)
  -t  --table                        Output trace results as table
@@ -200,8 +207,7 @@ Arguments:
                                     BestTrace
  -f  --first                        Start from the first_ttl hop (instead from
                                     1). Default: 1
-  -M  --map                          Print Trace Map. This will return a Trace
-                                     Map URL
+  -M  --map                          Disable Print Trace Map Function
  -v  --version                      Print version info and exit
  -s  --source                       Use source src_addr for outgoing packets
  -D  --dev                          Use the following Network Devices as the
@@ -209,57 +215,31 @@ Arguments:
  -R  --route                        Show Routing Table [Provided By BGP.Tools]
  -z  --send-time                    Set the time interval for sending every
                                     packet. Useful when some routers use
-                                     rate-limit for ICMP messages.. Default: 0
+                                     rate-limit for ICMP messages. Default: 100
  -i  --ttl-time                     Set the time interval for sending packets
                                     groups by TTL. Useful when some routers
-                                     use rate-limit for ICMP messages..
-                                     Default: 500
+                                     use rate-limit for ICMP messages. Default:
+                                     500
+  -g  --language                     Choose the language for displaying [en,
+                                     cn]. Default: cn
 ```

 ## Project screenshot

-![image](https://user-images.githubusercontent.com/13616352/208289553-7f633f9c-7356-40d1-bbc4-cc2687419cca.png)
-
-![image](https://user-images.githubusercontent.com/13616352/208289568-2a135c2d-ae4a-4a3e-8a43-f5a9a87ade4a.png)
+![image](https://user-images.githubusercontent.com/13616352/216064486-5e0a4ad5-01d6-4b3c-85e9-2e6d2519dc5d.png)

+![image](https://user-images.githubusercontent.com/13616352/216064557-cd5adab7-e34b-4ee6-9042-8287025f22d3.png)

 ## NextTrace Enhanced

 `NextTrace Enhanced` is an enhanced version for enthusiasts, `Enhanced` provides trace route calls in the form of Web API and a simple Looking Glass webpage with built-in visualization.

-The `Enhanced` version supports many functions that the `lite` version does not have, such as the ability to customize the timeout period, and the ability to specify TTL as the starting point for route tracking, etc. For ordinary users, the `lite` version is usually enough.
+Please Notice that `NextTrace Enhanced` is currently not supported in English.

 https://github.com/OwO-Network/nexttrace-enhanced

-## 公告
-
-我今天看到了一些非常难过的事情，一些用户在 BestTrace 和 WorstTrace 下面宣传 NextTrace 的完全可替代性。
-
-这么做是不正确的，NextTrace 从来都不是一个从零开始的软件，NextTrace 之所以能够拥有某些功能特性，是因为吸取了 BestTrace 、WorstTrace 的一些想法。
-
-我们希望您在使用的时候知晓这一点，**我们是站在巨人的肩膀上，而尊重其他软件作者，向他们或者是我们提交 Bug 或贡献代码，才是推动整个 traceroute 工具的软件多样化发展的最好方式**。
-
-NextTrace 并不追求成为一个替代者，同类软件越多样化，才能满足更多人的需求，这才是我们希望看到的，而去诋毁其他软件，这违背了我们对于开发 NextTrace 的初衷。
-
-我们希望看到这条公告的朋友应该主动删除自己过激的言论，如果您有任何问题或建议，请随时在我们的社区中发表。
-
 ## LeoMoeAPI Credit

-NextTrace 重点在于研究 Go 语言 Traceroute 的实现，其 LeoMoeAPI 的地理位置信息并没有原始数据的支撑，故也不可能有商用版本。
-
-LeoMoeAPI 存在部分社区贡献者校准的数据，也包含了部分其他第三方数据库的数据，这些数据的所有权归校准者、第三方数据库所有，**仅供路由跟踪地理位置的展示参考使用**，我们不对数据提供准度做任何保证，请尊重他们的成果，如用于其他用途后果自负，特此告知。
-
-1. 对于辛勤提供马来西亚地区节点的 samleong123、全球节点的 TOHUNET Looking Glass 以及来自 Misaka 的 Ping.sx 表示感谢，目前 80% 以上的可靠校准数据出自这些节点的 ping / mtr 报告。
-
-2. 同时感谢 isyekong 在基于 rDNS 校准上思路以及数据上做出的贡献，LeoMoeAPI 正在加快对 rDNS 的解析功能研发，目前已经做到部分骨干网的地理位置自动化解析，但存在一定误判。
-我们希望 NextTrace 在未来能成为对 One-Man ISP 友好的 Traceroute 工具，我们也在尽可能完善对这些 ASN 的微型骨干网的校准。
-
-3. 在开发上，我要由衷感谢 missuo 以及 zhshch 在 Go 交叉编译、设计理念以及 TCP/UDP Traceroute 重构上的帮助、tsosunchia 在 TraceMap 上的倾力支持。
-
-4. 我还要感谢 FFEE_CO、TheresaQWQ、stydxm 和其他朋友的帮助。LeoMoeAPI自首次发布以来得到了很多各方面的支持，所以我想把他们都归功于此。
-
-我们希望您能够在使用时尽可能多多反馈 IP 地理位置错误（详见 issue），这样它就能够在第一时间得到校准，他人也会因此而受益。
-
 NextTrace focuses on Golang Traceroute implementations, and its LeoMoeAPI geolocation information is not supported by raw data, so a commercial version is not possible.

 The LeoMoeAPI data is subject to copyright restrictions from multiple data sources, and is only used for the purpose of displaying the geolocation of route tracing.
@@ -274,14 +254,6 @@ The LeoMoeAPI data is subject to copyright restrictions from multiple data sourc

 We hope you can give us as much feedback as possible on IP geolocation errors (see issue) so that it can be calibrated in the first place and others can benefit from it.

-## FAQ Frequently Asked Questions
-
-If you encounter problems while installing or using it, we do not recommend you to choose creating an `issue` as a preference
-
-Here is our recommended troubleshooting process:
-
-1. Check if it is already in FAQ -> [Go to Github Wiki](https://github.com/xgadget-lab/nexttrace/wiki/FAQ---%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98%E8%A7%A3%E7%AD%94)
-2. Suspected bug or feature suggestion -> [Go to Github Issues](https://github.com/xgadget-lab/nexttrace/issues)

 ## JetBrain Support

@@ -309,4 +281,4 @@ Although other third-party APIs are integrated in this project, please refer to

 ## Star History

-[![Star History Chart](https://api.star-history.com/svg?repos=xgadget-lab/nexttrace&type=Date)](https://star-history.com/#xgadget-lab/nexttrace&Date)
+[![Star History Chart](https://api.star-history.com/svg?repos=sjlleo/nexttrace&type=Date)](https://star-history.com/#sjlleo/nexttrace&Date)
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -62,8 +62,8 @@ nexttrace --table 1.0.0.1
 # IPv6 ICMP Trace
 nexttrace 2606:4700:4700::1111

-# 路径可视化 使用 --map / -M 参数，将返回一个地图 URL
-nexttrace --map koreacentral.blob.core.windows.net
+# 禁用路径可视化 使用 --map / -M 参数
+nexttrace koreacentral.blob.core.windows.net
 # MapTrace URL: https://api.leo.moe/tracemap/html/c14e439e-3250-5310-8965-42a1e3545266.html
 ```

@@ -212,8 +212,7 @@ Arguments:
                                     BestTrace
  -f  --first                        Start from the first_ttl hop (instead from
                                     1). Default: 1
-  -M  --map                          Print Trace Map. This will return a Trace
-                                     Map URL
+  -M  --map                          Disable Print Trace Map Function
  -v  --version                      Print version info and exit
  -s  --source                       Use source src_addr for outgoing packets
  -D  --dev                          Use the following Network Devices as the
@@ -226,6 +225,8 @@ Arguments:
                                     groups by TTL. Useful when some routers
                                     use rate-limit for ICMP messages..
                                     Default: 500
+  -g  --language                     Choose the language for displaying [en,
+                                     cn]. Default: cn
 ```

 ## 项目截图
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -38,21 +38,24 @@ func Excute() {
 	maxHops := parser.Int("m", "max-hops", &argparse.Options{Default: 30, Help: "Set the max number of hops (max TTL to be reached)"})
 	dataOrigin := parser.Selector("d", "data-provider", []string{"IP.SB", "IPInfo", "IPInsight", "IPAPI.com"}, &argparse.Options{Default: "LeoMoeAPI",
 		Help: "Choose IP Geograph Data Provider [LeoMoeAPI,IP.SB, IPInfo, IPInsight, IPAPI.com]"})
-	noRdns := parser.Flag("n", "no-rdns", &argparse.Options{Help: " Do not resolve IP addresses to their domain names"})
+	noRdns := parser.Flag("n", "no-rdns", &argparse.Options{Help: "Do not resolve IP addresses to their domain names"})
+	alwaysRdns := parser.Flag("a", "always-rdns", &argparse.Options{Help: "Always resolve IP addresses to their domain names"})
 	routePath := parser.Flag("P", "route-path", &argparse.Options{Help: "Print traceroute hop path by ASN and location"})
 	report := parser.Flag("r", "report", &argparse.Options{Help: "output using report mode"})
 	output := parser.Flag("o", "output", &argparse.Options{Help: "Write trace result to file (RealTimePrinter ONLY)"})
 	tablePrint := parser.Flag("t", "table", &argparse.Options{Help: "Output trace results as table"})
 	classicPrint := parser.Flag("c", "classic", &argparse.Options{Help: "Classic Output trace results like BestTrace"})
 	beginHop := parser.Int("f", "first", &argparse.Options{Default: 1, Help: "Start from the first_ttl hop (instead from 1)"})
-	maptrace := parser.Flag("M", "map", &argparse.Options{Help: "Print Trace Map. This will return a Trace Map URL"})
+	maptrace := parser.Flag("M", "map", &argparse.Options{Help: "Disable Print Trace Map"})
 	ver := parser.Flag("v", "version", &argparse.Options{Help: "Print version info and exit"})
 	src_addr := parser.String("s", "source", &argparse.Options{Help: "Use source src_addr for outgoing packets"})
 	src_dev := parser.String("D", "dev", &argparse.Options{Help: "Use the following Network Devices as the source address in outgoing packets"})
 	router := parser.Flag("R", "route", &argparse.Options{Help: "Show Routing Table [Provided By BGP.Tools]"})
-	packet_interval := parser.Int("z", "send-time", &argparse.Options{Default: 100, Help: "Set the time interval for sending every packet. Useful when some routers use rate-limit for ICMP messages."})
-	ttl_interval := parser.Int("i", "ttl-time", &argparse.Options{Default: 500, Help: "Set the time interval for sending packets groups by TTL. Useful when some routers use rate-limit for ICMP messages."})
+	packet_interval := parser.Int("z", "send-time", &argparse.Options{Default: 100, Help: "Set the time interval for sending every packet. Useful when some routers use rate-limit for ICMP messages"})
+	ttl_interval := parser.Int("i", "ttl-time", &argparse.Options{Default: 500, Help: "Set the time interval for sending packets groups by TTL. Useful when some routers use rate-limit for ICMP messages"})
 	str := parser.StringPositional(&argparse.Options{Help: "IP Address or domain name"})
+	lang := parser.Selector("g", "language", []string{"en", "cn"}, &argparse.Options{Default: "cn",
+		Help: "Choose the language for displaying [en, cn]"})

 	err := parser.Parse(os.Args)
 	if err != nil {
@@ -86,6 +89,18 @@ func Excute() {
 		fmt.Print(parser.Usage(err))
 		return
 	}
+	
+	if strings.Contains(domain, "/") {
+		domain = strings.Split(domain, "/")[2]
+	}
+	
+	if strings.Contains(domain, "]") {
+		domain = strings.Split(strings.Split(domain, "]")[0], "[")[1]
+	} else if strings.Contains(domain, ":") {
+		if strings.Count(domain, ":") == 1 {
+			domain = strings.Split(domain, ":")[0]
+		}
+	}

 	capabilities_check()
 	// return
@@ -150,7 +165,9 @@ func Excute() {
 		TTLInterval:      *ttl_interval,
 		NumMeasurements:  *numMeasurements,
 		ParallelRequests: *parallelRequests,
+		Lang:             *lang,
 		RDns:             !*noRdns,
+		AlwaysWaitRDNS:   *alwaysRdns,
 		IPGeoSource:      ipgeo.GetSource(*dataOrigin),
 		Timeout:          1 * time.Second,
 	}
@@ -189,7 +206,7 @@ func Excute() {
 		r.Print()
 	}

-	if *maptrace {
+	if !*maptrace {
 		r, _ := json.Marshal(res)
 		tracemap.GetMapUrl(string(r))
 	}
@@ -221,7 +238,12 @@ func capabilities_check() {
 	// NewPid 已经被废弃了，这里改用 NewPid2 方法
 	caps, err := capability.NewPid2(0)
 	if err != nil {
-		fmt.Println(err)
+		// 判断是否为macOS
+		if runtime.GOOS == "darwin" {
+			// macOS下报错有问题
+		} else {
+			fmt.Println(err)
+		}
 		return
 	}

@@ -238,8 +260,8 @@ func capabilities_check() {
 		return
 	} else {
 		// 没权限啦
-		log.Println("您正在以普通用户权限运行 NextTrace，但 NextTrace 未被赋予监听网络套接字的ICMP消息包、修改IP头信息（TTL）等路由跟踪所需的权限")
-		log.Println("请使用管理员用户执行 `sudo setcap cap_net_raw,cap_net_admin+eip ${your_nexttrace_path}/nexttrace` 命令，赋予相关权限后再运行~")
-		log.Fatalln("什么？为什么 ping 普通用户执行不要 root 权限？因为这些工具在管理员安装时就已经被赋予了一些必要的权限，具体请使用 `getcap /usr/bin/ping` 查看")
+		fmt.Println("您正在以普通用户权限运行 NextTrace，但 NextTrace 未被赋予监听网络套接字的ICMP消息包、修改IP头信息（TTL）等路由跟踪所需的权限")
+		fmt.Println("请使用管理员用户执行 `sudo setcap cap_net_raw,cap_net_admin+eip ${your_nexttrace_path}/nexttrace` 命令，赋予相关权限后再运行~")
+		fmt.Println("什么？为什么 ping 普通用户执行不要 root 权限？因为这些工具在管理员安装时就已经被赋予了一些必要的权限，具体请使用 `getcap /usr/bin/ping` 查看")
 	}
 }
--- a/fast_trace/basic.go
+++ b/fast_trace/basic.go
@@ -16,6 +16,7 @@ type BackBoneCollection struct {
 	CU169    ISPCollection
 	CU9929   ISPCollection
 	CM       ISPCollection
+	CMIN2    ISPCollection
 	EDU      ISPCollection
 	CST      ISPCollection
 }
@@ -32,6 +33,7 @@ const (
 	CU169  string = "联通 169 AS4837"
 	CU9929 string = "联通 A网 AS9929"
 	CM     string = "移动 骨干网 AS9808"
+	CMIN2  string = "移动 CMIN2 AS58807"
 	EDU    string = "教育网 CERNET AS4538"
 )

@@ -57,12 +59,22 @@ var Beijing = BackBoneCollection{
 		IPv6:    "2408:8000:1010:2::10",
 	},

+	CU9929: ISPCollection{
+		ISPName: CU9929,
+		IP:      "218.105.131.125",
+	},
+
 	CM: ISPCollection{
 		ISPName: CM,
 		IP:      "211.136.25.153",
 		IPv6:    "2409:8000:3800:8::3",
 	},

+	CMIN2: ISPCollection{
+		ISPName: CMIN2,
+		IP:      "223.70.155.55",
+	},
+
 	EDU: ISPCollection{
 		ISPName: EDU,
 		IP:      "101.6.15.130",
@@ -101,6 +113,11 @@ var Shanghai = BackBoneCollection{
 		IPv6:    "2409:801e:f0:1::4e1",
 	},

+	CMIN2: ISPCollection{
+		ISPName: CMIN2,
+		IP:      "183.194.134.1",
+	},
+
 	EDU: ISPCollection{
 		ISPName: EDU,
 		IP:      "202.120.58.155",
--- a/fast_trace/fast_trace.go
+++ b/fast_trace/fast_trace.go
@@ -83,6 +83,7 @@ func (f *FastTracer) testCT() {

 func (f *FastTracer) testCU() {
 	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU169)
+	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU9929)
 	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CU169)
 	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CU9929)
 	f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CU169)
@@ -91,7 +92,9 @@ func (f *FastTracer) testCU() {

 func (f *FastTracer) testCM() {
 	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CM)
+	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CMIN2)
 	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CM)
+	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CMIN2)
 	f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CM)
 	f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CM)
 }
--- a/printer/basic.go
+++ b/printer/basic.go
@@ -21,7 +21,44 @@ func Version() {
 }

 func CopyRight() {
-	fmt.Println("XGadget-lab Leo (leo.moe) & Tso (tsosunchia@gmail.com) & Vincent (vincent.moe)  & zhshch (xzhsh.ch)")
+	fmt.Fprintf(color.Output, "\n%s\n%s\n%s %s\n\n%s\n%s %s\n%s %s\n%s %s\n\n%s\n%s\n%s %s\n\n",
+		color.New(color.FgCyan, color.Bold).Sprintf("%s", "NextTrace CopyRight"),
+		color.New(color.FgGreen, color.Bold).Sprintf("%s", "NextTrace Project Creator"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Leo"),
+		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@leo.moe"),
+		color.New(color.FgGreen, color.Bold).Sprintf("%s", "NextTrace Project Maintainer"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Tso"),
+		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "tsosunchia@gmail.com"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Vincent"),
+		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@vincent.moe"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Leo"),
+		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@leo.moe"),
+		color.New(color.FgCyan, color.Bold).Sprintf("%s", "Special Acknowledgement List"),
+		color.New(color.FgGreen, color.Bold).Sprintf("%s", "NextTrace Major Contributor"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "zhshch"),
+		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "zhshch@athorx.com"),
+	)
+
+	MoeQingOrgCopyRight()
+	PluginCopyRight()
+}
+
+func MoeQingOrgCopyRight() {
+	fmt.Fprintf(color.Output, "%s\n%s %s\n%s %s\n\n",
+		color.New(color.FgHiYellow, color.Bold).Sprintf("%s", "MoeQing Network"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "YekongTAT"),
+		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "yekongtat@gmail.com"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Haima"),
+		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "haima@peers.cloud"),
+	)
+}
+
+func PluginCopyRight() {
+	fmt.Fprintf(color.Output, "%s\n%s %s\n\n",
+		color.New(color.FgGreen, color.Bold).Sprintf("%s", "NextTrace Map Plugin Author"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Tso"),
+		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "tsosunchia@gmail.com"),
+	)
 }

 func PrintTraceRouteNav(ip net.IP, domain string, dataOrigin string) {
--- a/printer/realtime_printer.go
+++ b/printer/realtime_printer.go
@@ -120,8 +120,30 @@ func RealtimePrinter(res *trace.Result, ttl int) {
 				fmt.Fprintf(color.Output, " %s", color.New(color.FgHiGreen, color.Bold).Sprintf("%-16s", whoisFormat[0]))
 			}
 		}
+
 		if len(res.Hops[ttl][i].Geo.Country) <= 1 {
-			res.Hops[ttl][i].Geo.Country = "LAN Address"
+			res.Hops[ttl][i].Geo.Country = "局域网"
+			res.Hops[ttl][i].Geo.CountryEn = "LAN Address"
+		}
+
+		if res.Hops[ttl][i].Lang == "en" {
+			if res.Hops[ttl][i].Geo.Country == "Anycast" {
+
+			} else if res.Hops[ttl][i].Geo.Prov == "骨干网" {
+				res.Hops[ttl][i].Geo.Prov = "BackBone"
+			} else if res.Hops[ttl][i].Geo.ProvEn == "" {
+				res.Hops[ttl][i].Geo.Country = res.Hops[ttl][i].Geo.CountryEn
+			} else {
+				if res.Hops[ttl][i].Geo.CityEn == "" {
+					res.Hops[ttl][i].Geo.Country = res.Hops[ttl][i].Geo.ProvEn
+					res.Hops[ttl][i].Geo.Prov = res.Hops[ttl][i].Geo.CountryEn
+					res.Hops[ttl][i].Geo.City = ""
+				} else {
+					res.Hops[ttl][i].Geo.Country = res.Hops[ttl][i].Geo.CityEn
+					res.Hops[ttl][i].Geo.Prov = res.Hops[ttl][i].Geo.ProvEn
+					res.Hops[ttl][i].Geo.City = res.Hops[ttl][i].Geo.CountryEn
+				}
+			}
 		}

 		if net.ParseIP(ip).To4() != nil {
--- a/trace/trace.go
+++ b/trace/trace.go
@@ -27,8 +27,10 @@ type Config struct {
 	Quic             bool
 	IPGeoSource      ipgeo.Source
 	RDns             bool
+	AlwaysWaitRDNS   bool
 	PacketInterval   int
 	TTLInterval      int
+	Lang             string
 	RealtimePrinter  func(res *Result, ttl int)
 	AsyncPrinter     func(res *Result)
 }
@@ -115,36 +117,77 @@ type Hop struct {
 	RTT      time.Duration
 	Error    error
 	Geo      *ipgeo.IPGeoData
+	Lang     string
 }

 func (h *Hop) fetchIPData(c Config) (err error) {
-	timeout := time.Millisecond * 800
+	// Debug Area
+	// c.AlwaysWaitRDNS = true
+
+	// Initialize a rDNS Channel
+	rDNSChan := make(chan []string)
+	fetchDoneChan := make(chan bool)
+
 	if c.RDns && h.Hostname == "" {
-		result := make(chan []string)
+		// Create a rDNS Query go-routine
 		go func() {
 			r, err := net.LookupAddr(h.Address.String())
 			if err != nil {
-				result <- nil
+				// No PTR Record
+				rDNSChan <- nil
 			} else {
-				result <- r
+				// One PTR Record is found
+				rDNSChan <- r
 			}
 		}()
+	}
+
+	// Create Data Fetcher go-routine
+	go func() {
+		// Start to fetch IP Geolocation data
+		if c.IPGeoSource != nil && h.Geo == nil {
+			res := false
+			h.Lang = c.Lang
+			h.Geo, res = ipgeo.Filter(h.Address.String())
+			if !res {
+				h.Geo, err = c.IPGeoSource(h.Address.String())
+			}
+		}
+		// Fetch Done
+		fetchDoneChan <- true
+	}()
+
+	// Select Close Flag
+	var selectClose bool
+	if !c.AlwaysWaitRDNS {
 		select {
-		case ptr := <-result:
+		case <-fetchDoneChan:
+			// When fetch done signal recieved, stop waiting PTR record
+		case ptr := <-rDNSChan:
+			// process result
+			if err == nil && len(ptr) > 0 {
+				h.Hostname = ptr[0][:len(ptr[0])-1]
+			}
+			selectClose = true
+		}
+	} else {
+		select {
+		case ptr := <-rDNSChan:
 			// process result
 			if err == nil && len(ptr) > 0 {
 				h.Hostname = ptr[0]
 			}
-		case <-time.After(timeout):
-			// handle timeout
+		// 1 second timeout
+		case <-time.After(time.Second * 1):
 		}
+		selectClose = true
 	}
-	if c.IPGeoSource != nil && h.Geo == nil {
-		res := false
-		h.Geo, res = ipgeo.Filter(h.Address.String())
-		if !res {
-			h.Geo, err = c.IPGeoSource(h.Address.String())
-		}
+
+	// When Select Close, fetchDoneChan Reciever will also be closed
+	if selectClose {
+		// New a reciever to prevent channel congestion
+		<-fetchDoneChan
 	}
+
 	return
 }
--- a/util/util.go
+++ b/util/util.go
@@ -77,3 +77,11 @@ func DomainLookUp(host string, ipv4Only bool) net.IP {
 		return ipSlice[index]
 	}
 }
+
+func GetenvDefault(key, defVal string) string {
+	val, ok := os.LookupEnv(key)
+	if ok {
+		return val
+	}
+	return defVal
+}
--- a/wshandle/client.go
+++ b/wshandle/client.go
@@ -1,14 +1,19 @@
 package wshandle

 import (
+	"crypto/tls"
 	"log"
+	"net"
+	"net/http"
 	"net/url"
 	"os"
 	"os/signal"
+	"strings"
 	"sync"
 	"time"

 	"github.com/gorilla/websocket"
+	"github.com/xgadget-lab/nexttrace/util"
 )

 type WsConn struct {
@@ -24,7 +29,8 @@ type WsConn struct {
 }

 var wsconn *WsConn
-var hostP = GetenvDefault("NEXTTRACE_HOSTPORT", "api.leo.moe")
+var hostP = util.GetenvDefault("NEXTTRACE_HOSTPORT", "api.leo.moe")
+var host, port, fast_ip string

 func (c *WsConn) keepAlive() {
 	go func() {
@@ -32,7 +38,12 @@ func (c *WsConn) keepAlive() {
 		for {
 			<-time.After(time.Second * 54)
 			if c.Connected {
-				c.Conn.WriteMessage(websocket.TextMessage, []byte("ping"))
+				err := c.Conn.WriteMessage(websocket.TextMessage, []byte("ping"))
+				if err != nil {
+					log.Println(err)
+					c.Connected = false
+					return
+				}
 			}
 		}
 	}()
@@ -71,12 +82,12 @@ func (c *WsConn) messageSendHandler() {
 		// 循环监听发送
 		select {
 		case <-c.Done:
-			log.Println("发送协程已经退出")
+			log.Println("go-routine has been returned")
 			return
 		case t := <-c.MsgSendCh:
 			// log.Println(t)
 			if !c.Connected {
-				c.MsgReceiveCh <- `{"ip":"` + t + `", "asnumber":"API服务端异常"}`
+				c.MsgReceiveCh <- `{"ip":"` + t + `", "asnumber":"API Server Error"}`
 			} else {
 				err := c.Conn.WriteMessage(websocket.TextMessage, []byte(t))
 				if err != nil {
@@ -105,10 +116,16 @@ func (c *WsConn) messageSendHandler() {
 }

 func (c *WsConn) recreateWsConn() {
-	u := url.URL{Scheme: "wss", Host: hostP, Path: "/v2/ipGeoWs"}
+	u := url.URL{Scheme: "wss", Host: fast_ip + ":" + port, Path: "/v2/ipGeoWs"}
 	// log.Printf("connecting to %s", u.String())
-
-	ws, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
+	requestHeader := http.Header{
+		"Host": []string{host},
+	}
+	dialer := websocket.DefaultDialer
+	dialer.TLSClientConfig = &tls.Config{
+		ServerName: host,
+	}
+	ws, _, err := websocket.DefaultDialer.Dial(u.String(), requestHeader)
 	c.Conn = ws
 	if err != nil {
 		log.Println("dial:", err)
@@ -129,11 +146,47 @@ func createWsConn() *WsConn {
 	// 设置终端中断通道
 	interrupt := make(chan os.Signal, 1)
 	signal.Notify(interrupt, os.Interrupt)
+	// 解析域名
+	hostArr := strings.Split(hostP, ":")
+	// 判断是否有指定端口
+	if len(hostArr) > 1 {
+		// 判断是否为 IPv6
+		if strings.HasPrefix(hostP, "[") {
+			tmp := strings.Split(hostP, "]")
+			host = tmp[0]
+			host = host[1:]
+			if port = tmp[1]; port != "" {
+				port = port[1:]
+			}
+		} else {
+			host, port = hostArr[0], hostArr[1]
+		}
+	} else {
+		host = hostP
+	}
+	if port == "" {
+		// 默认端口
+		port = "443"
+	}
+	// 默认配置完成，开始寻找最优 IP
+	fast_ip = GetFastIP(host, port)

-	u := url.URL{Scheme: "wss", Host: hostP, Path: "/v2/ipGeoWs"}
+	// 如果 host 是一个 IP 使用默认域名
+	if valid := net.ParseIP(host); valid != nil {
+		host = "api.leo.moe"
+	}
+	// 判断是否是一个 IP
+	requestHeader := http.Header{
+		"Host": []string{host},
+	}
+	dialer := websocket.DefaultDialer
+	dialer.TLSClientConfig = &tls.Config{
+		ServerName: host,
+	}
+	u := url.URL{Scheme: "wss", Host: fast_ip + ":" + port, Path: "/v2/ipGeoWs"}
 	// log.Printf("connecting to %s", u.String())

-	c, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
+	c, _, err := websocket.DefaultDialer.Dial(u.String(), requestHeader)

 	wsconn = &WsConn{
 		Conn:         c,
@@ -168,10 +221,3 @@ func New() *WsConn {
 func GetWsConn() *WsConn {
 	return wsconn
 }
-func GetenvDefault(key, defVal string) string {
- 	val, ok := os.LookupEnv(key)
- 	if ok {
- 		return val
- 	}
- 	return defVal
- }
--- a/wshandle/latency.go
+++ b/wshandle/latency.go
@@ -0,0 +1,71 @@
+package wshandle
+
+import (
+	"fmt"
+	"log"
+	"net"
+	"strings"
+	"time"
+
+	"github.com/fatih/color"
+)
+
+var (
+	result  string
+	results = make(chan string)
+)
+
+func GetFastIP(domain string, port string) string {
+
+	ips, err := net.LookupIP(domain)
+	if err != nil {
+		log.Fatal("DNS resolution failed, please check your system DNS Settings")
+		return ""
+	}
+
+	for _, ip := range ips {
+		go checkLatency(ip.String(), port)
+	}
+
+	select {
+	case result = <-results:
+	case <-time.After(1 * time.Second):
+
+	}
+	if result == "" {
+		log.Fatal("IP connection has been timeout, please check your network")
+	}
+	res := strings.Split(result, "-")
+
+	if len(ips) > 1 {
+		_, _ = fmt.Fprintf(color.Output, "%s prefered API IP - %s - %s\n",
+			color.New(color.FgWhite, color.Bold).Sprintf("[NextTrace API]"),
+			color.New(color.FgGreen, color.Bold).Sprintf("%s", res[0]),
+			color.New(color.FgCyan, color.Bold).Sprintf("%sms", res[1]),
+		)
+	}
+
+	return res[0]
+}
+
+func checkLatency(ip string, port string) {
+	start := time.Now()
+	if !strings.Contains(ip, ".") {
+		ip = "[" + ip + "]"
+	}
+	conn, err := net.DialTimeout("tcp", ip+":"+port, time.Second*1)
+	if err != nil {
+		return
+	}
+	defer func(conn net.Conn) {
+		err := conn.Close()
+		if err != nil {
+			return
+		}
+	}(conn)
+	if result == "" {
+		result = fmt.Sprintf("%s-%.2f", ip, float64(time.Since(start))/float64(time.Millisecond))
+		results <- result
+		return
+	}
+}
--- a/wshandle/latency_test.go
+++ b/wshandle/latency_test.go
@@ -0,0 +1,9 @@
+package wshandle
+
+import (
+	"testing"
+)
+
+func TestGetFastIP(t *testing.T) {
+	GetFastIP("api.leo.moe", "443")
+}
Author	SHA1	Message	Date
sjlleo	805e827e45	try add: mips64 mips64le support	2023-02-13 09:00:13 +08:00
tsosunchia	ed2250f811	fix: ipv6地址分割问题	2023-02-11 01:53:30 +08:00
tsosunchia	fe18c80f83	支持直接传入未经修剪的URL	2023-02-11 01:03:02 +08:00
tsosunchia	d1c9fd6c3a	小修改	2023-02-10 00:53:53 +08:00
tsosunchia	c67e2d6384	更新MapTrace在readme的指引	2023-02-06 23:44:31 +08:00
tsosunchia	309ae9d74a	fix:macOS下报错异常	2023-02-06 09:22:27 +08:00
sjlleo	cf65ff5e7e	chore: translation	2023-02-01 22:12:54 +08:00
sjlleo	eae92ebfae	chore: update English doc	2023-02-01 22:10:39 +08:00
Leo	afe18fc4c0	feat: add English support	2023-02-01 21:34:33 +08:00
Leo	cc1d6177ca	重构关于地理位置以及 PTR 记录获取的模块，大幅提升路由跟踪性能	2023-02-01 18:22:02 +08:00
tsosunchia	c8077919ce	优化rdns体验，默认开启traceMap	2023-02-01 15:56:12 +08:00
tsosunchia	cfc79489d4	fix: fmt error	2023-02-01 12:45:06 +08:00
Leo	f60e6fbc99	feat: LeoMoeAPI 优选 IP	2023-01-31 11:58:55 +08:00
Leo	de0f49d01b	fix: homebrew git fail	2023-01-30 10:19:37 +08:00