api变更

更新一键安装脚本SSL
update readme
2025-08-12 06:26:39 +00:00 · 2023-12-01 16:32:44 +08:00 · 2023-12-01 11:15:17 +08:00 · 2023-11-30 17:14:50 +08:00 · 2023-11-30 17:11:14 +08:00 · 2023-11-30 16:12:47 +08:00
22 changed files with 292 additions and 151 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -17,6 +17,11 @@ copyright: [v2fly](https://github.com/v2fly)
 除非特殊情况，请完整填写所有问题。不按模板发的 issue 将直接被关闭。
 如果你遇到的问题不是 nexttrace 的 bug，比如你不清楚如何配置，请在 https://github.com/nxtrace/NTrace-core/discussions 进行讨论。
 -->
+## 本项目是基于Linux/macOS的，请确认您遇到的问题是否在Linux或macOS上存在。
+
+<!-- 是/否 -->
+<!-- 对于只出现在Windows上的问题，本项目有时无法解决，请知悉 -->
+

 ## 你正在使用哪个版本的 nexttrace？

@@ -39,6 +44,8 @@ copyright: [v2fly](https://github.com/v2fly)

 ## 请附上出错时软件输出的错误信息

+<!-- 是/否 -->
+
 ## 是否查询过本仓库wiki有没有类似错误

-<!-- wiki: https://github.com/sjlleo/nexttrace/wiki -->
+<!-- wiki: https://github.com/nxtrace/NTrace-core/wiki -->
--- a/1
+++ b/1
@@ -1 +0,0 @@
-mtr.moe
--- a/README.md
+++ b/README.md
@@ -39,9 +39,13 @@
    <a href="https://skywolf.cloud" >
        <img src="https://hk.skywolf.cloud/assets/img/skywolf.svg" width="170.7" height="62.9">
    </a>
+    &nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="https://portal.saltyfish.io" >
+        <img src="https://snapstack-static.vnc.xyz/static/logo.svg" width="170.7" height="62.9">
+    </a>
 </div>

-We are extremely grateful to [DMIT](https://dmit.io) and [Misaka](https://misaka.io) and [Skywolf](https://skywolf.cloud) for providing the network infrastructure that powers this project.
+We are extremely grateful to [DMIT](https://dmit.io), [Misaka](https://misaka.io), [Skywolf](https://skywolf.cloud) and [SnapStack](https://portal.saltyfish.io) for providing the network infrastructure that powers this project.

 ## How To Use

@@ -58,7 +62,7 @@ Please note, there are exceptions to this synchronization. If a version of NTrac
    * One-click installation script

      ```shell
-      bash -c "$(curl http://nexttrace-io-leomoe-api-a0.shop/nt_install_v1.sh)"
+      curl nxtrace.org/nt |bash
      ```
    * Arch Linux AUR installation command
        * Directly download bin package (only supports amd64)
@@ -120,10 +124,15 @@ Please note, there are exceptions to this synchronization. If a version of NTrac
    After installing Go >= 1.20 yourself, you can use the following command to install

    ```shell
-    go install github.com/nxtrace/Ntrace-V1@latest
+    go install github.com/nxtrace/NTrace-core@latest
    ```
+    *because of the version constraints conflict, you can not install  `NTrace-V1` by this*
    After installation, the executable is in the `$GOPATH/bin` directory. If you have not set `GOPATH`, it is in the `$HOME/go/bin` directory.
-
+    The binary file name is consistent with the project name. You need to replace the `nexttrace` command below with `NTrace-core`.
+     If you want to be consistent with the commands below, you can rename the binary after executing the `go install` command
+    ```shell
+    mv  $GOPATH/bin/NTrace-core $GOPATH/bin/nexttrace
+    ``` 

 ### Get Started

@@ -151,7 +160,7 @@ nexttrace 2606:4700:4700::1111

 # 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
+# MapTrace URL: https://api.nxtrace.org/tracemap/html/c14e439e-3250-5310-8965-42a1e3545266.html

 # Disable MPLS display using the --disable-mpls / -e parameter or the NEXTTRACE_DISABLEMPLS environment variable
 nexttrace --disable-mpls example.com
@@ -222,6 +231,8 @@ nexttrace --parallel-requests 1 www.hkix.net

 # Start Trace with TTL of 5, end at TTL of 10
 nexttrace --first 5 --max-hops 10 www.decix.net
+# In addition, an ENV is provided to set whether to hide the destination IP
+export NEXTTRACE_ENABLEHIDDENDSTIP=1

 # Turn off the IP reverse parsing function
 nexttrace --no-rdns www.bbix.net
@@ -239,6 +250,11 @@ nexttrace --psize 1024 example.com
 #  ╭╯
 #  ╰AS37963 Aliyun「ALIDNS.COM『ALIDNS.COM』」
 nexttrace --route-path www.time.com.my
+
+# Disable color output
+nexttrace --nocolor 1.1.1.1
+# or use ENV
+export NO_COLOR=1
 ```

 `NextTrace` supports users to select their own IP API (currently supports: `LeoMoeAPI`, `IP.SB`, `IPInfo`, `IPInsight`, `IPAPI.com`, `Ip2region`, `IPInfoLocal`, `CHUNZHEN`)
@@ -270,8 +286,8 @@ nexttrace --data-provider IPAPI.com --max-hops 20 --tcp --port 443 --queries 5 -
 nexttrace -tcp --queries 2 --parallel-requests 1 --table --route-path 2001:4860:4860::8888

 Equivalent to:
-nexttrace -d IPAPI.com -m 20 -T -p 443 -q 5 -n 1.1.1.1
-nexttrace -T -q 2 --parallel-requests 1 -t -R 2001:4860:4860::8888
+nexttrace -d ip-api.com -m 20 -T -p 443 -q 5 -n 1.1.1.1
+nexttrace -T -q 2 --parallel-requests 1 -t -P 2001:4860:4860::8888
 ```

 ### IP Database
@@ -297,15 +313,16 @@ Usage: nexttrace [-h|--help] [-4|--ipv4] [-6|--ipv6] [-T|--tcp] [-U|--udp]
                 <integer>] [--parallel-requests <integer>] [-m|--max-hops
                 <integer>] [-d|--data-provider
                 (Ip2region|ip2region|IP.SB|ip.sb|IPInfo|ipinfo|IPInsight|ipinsight|IPAPI.com|ip-api.com|IPInfoLocal|ipinfolocal|chunzhen|LeoMoeAPI|leomoeapi|disable-geoip)]
-                 [-n|--no-rdns] [-a|--always-rdns] [-P|--route-path]
-                 [-r|--report] [--dn42] [-o|--output] [-t|--table] [--raw]
-                 [-j|--json] [-c|--classic] [-f|--first <integer>] [-M|--map]
+                 [--pow-provider (api.nxtrace.org|sakura)] [-n|--no-rdns]
+                 [-a|--always-rdns] [-P|--route-path] [-r|--report] [--dn42]
+                 [-o|--output] [-t|--table] [--raw] [-j|--json] [-c|--classic]
+                 [-f|--first <integer>] [-M|--map] [-e|--disable-mpls]
                 [-v|--version] [-s|--source "<value>"] [-D|--dev "<value>"]
-                 [-R|--route] [-z|--send-time <integer>] [-i|--ttl-time
-                 <integer>] [--timeout <integer>] [--psize <integer>]
-                 [_positionalArg_nexttrace_31 "<value>"] [--dot-server
+                 [-z|--send-time <integer>] [-i|--ttl-time <integer>]
+                 [--timeout <integer>] [--psize <integer>]
+                 [_positionalArg_nexttrace_32 "<value>"] [--dot-server
                 (dnssb|aliyun|dnspod|google|cloudflare)] [-g|--language
-                 (en|cn)]
+                 (en|cn)] [--file "<value>"] [-C|--nocolor]

 Arguments:

@@ -336,9 +353,9 @@ Arguments:
                                     IPInfo, IPInsight, IP-API.com, Ip2region,
                                     IPInfoLocal, CHUNZHEN, disable-geoip].
                                     Default: LeoMoeAPI
-      --pow-provider                 Choose PoW Provider [api.leo.moe, sakura]
+      --pow-provider                 Choose PoW Provider [api.nxtrace.org, sakura]
                                     For China mainland users, please use
-                                     sakura. Default: api.leo.moe
+                                     sakura. Default: api.nxtrace.org
  -n  --no-rdns                      Do not resolve IP addresses to their
                                     domain names
  -a  --always-rdns                  Always resolve IP addresses to their
@@ -362,7 +379,6 @@ Arguments:
  -s  --source                       Use source src_addr for outgoing packets
  -D  --dev                          Use the following Network Devices as the
                                     source address in outgoing packets
-  -R  --route                        Show Routing Table [Provided By BGP.Tools]
  -z  --send-time                    Set how many [milliseconds] between
                                     sending each packet.. Useful when some
                                     routers use rate-limit for ICMP messages.
@@ -376,12 +392,13 @@ Arguments:
                                     connection.. Default: 1000
      --psize                        Set the packet size (payload size).
                                     Default: 52
-      --_positionalArg_nexttrace_31  IP Address or domain name
+      --_positionalArg_nexttrace_32  IP Address or domain name
      --dot-server                   Use DoT Server for DNS Parse [dnssb,
                                     aliyun, dnspod, google, cloudflare]
  -g  --language                     Choose the language for displaying [en,
                                     cn]. Default: cn
      --file                         Read IP Address or domain name from file
+  -C  --nocolor                      Disable Colorful Output
 ```

 ## Project screenshot
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -40,11 +40,15 @@
    <a href="https://skywolf.cloud" >
        <img src="https://hk.skywolf.cloud/assets/img/skywolf.svg" width="170.7" height="62.9">
    </a>
+    &nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="https://portal.saltyfish.io" >
+        <img src="https://snapstack-static.vnc.xyz/static/logo.svg" width="170.7" height="62.9">
+    </a>
 </div>



-我们非常感谢 [DMIT](https://dmit.io) 和 [Misaka](https://misaka.io) 和 [Skywolf](https://skywolf.cloud) 提供了支持本项目所需的网络基础设施。
+我们非常感谢 [DMIT](https://dmit.io)、 [Misaka](https://misaka.io)、 [Skywolf](https://skywolf.cloud) 和 [SnapStack](https://portal.saltyfish.io) 提供了支持本项目所需的网络基础设施。

 ## How To Use

@@ -67,7 +71,7 @@ Document Language: [English](README.md) | 简体中文
  * 一键安装脚本

    ```shell
-    bash -c "$(curl http://nexttrace-io-leomoe-api-a0.shop/nt_install_v1.sh)"
+    curl nxtrace.org/nt | bash
    ```
    
  * Arch Linux AUR 安装命令
@@ -131,9 +135,16 @@ Document Language: [English](README.md) | 简体中文
    您可在自行安装Go >= 1.20后，使用以下命令安装

    ```shell
-    go install github.com/nxtrace/Ntrace-V1@latest
+    go install github.com/nxtrace/NTrace-core@latest
    ```
-    安装后可执行文件在`$GOPATH/bin`目录下，如果您没有设置`GOPATH`，则在`$HOME/go/bin`目录下。
+    *由于go.mod文件声明和文件目录冲突的问题，你不能用go install命令安装  `NTrace-V1` 版本*
+    安装后可执行文件在`$GOPATH/bin`目录下，如果您没有设置`GOPATH`，则在`$HOME/go/bin`目录下。 
+    安装后二进制文件名称与项目名称保持一致，你需要将下文中的 `nexttrace` 命令替换为 `NTrace-core` 使用
+    如果你希望与下文命令保持一致，可以在执行 `go install` 命令后重命名二进制文件
+
+    ```shell
+    mv  $GOPATH/bin/NTrace-core $GOPATH/bin/nexttrace
+    ``` 


 ### Get Started
@@ -162,7 +173,7 @@ nexttrace 2606:4700:4700::1111

 # 禁用路径可视化 使用 --map / -M 参数
 nexttrace koreacentral.blob.core.windows.net
-# MapTrace URL: https://api.leo.moe/tracemap/html/c14e439e-3250-5310-8965-42a1e3545266.html
+# MapTrace URL: https://api.nxtrace.org/tracemap/html/c14e439e-3250-5310-8965-42a1e3545266.html

 # 禁用MPLS显示 使用 --disable-mpls / -e 参数 或 NEXTTRACE_DISABLEMPLS 环境变量
 nexttrace --disable-mpls example.com
@@ -236,6 +247,8 @@ nexttrace --parallel-requests 1 www.hkix.net

 # 从TTL为5开始发送探测包，直到TTL为10结束
 nexttrace --first 5 --max-hops 10 www.decix.net
+# 此外还提供了一个ENV，可以设置是否隐匿目的IP
+export NEXTTRACE_ENABLEHIDDENDSTIP=1

 # 关闭IP反向解析功能
 nexttrace --no-rdns www.bbix.net
@@ -253,6 +266,10 @@ nexttrace --psize 1024 example.com
 #  ╭╯
 #  ╰AS37963 阿里云「ALIDNS.COM『ALIDNS.COM』」
 nexttrace --route-path www.time.com.my
+# 禁止色彩输出
+nexttrace --nocolor 1.1.1.1
+# 或者使用环境变量
+export NO_COLOR=1
 ```

 `NextTrace`支持用户自主选择 IP 数据库（目前支持：`LeoMoeAPI`, `IP.SB`, `IPInfo`, `IPInsight`, `IPAPI.com`, `Ip2region`, `IPInfoLocal`, `CHUNZHEN`)
@@ -284,7 +301,7 @@ nexttrace -tcp --queries 2 --parallel-requests 1 --table --route-path 2001:4860:

 Equivalent to:
 nexttrace -d ip-api.com -m 20 -T -p 443 -q 5 -n 1.1.1.1
-nexttrace -T -q 2 --parallel-requests 1 -t -R 2001:4860:4860::8888
+nexttrace -T -q 2 --parallel-requests 1 -t -P 2001:4860:4860::8888
 ```

 ### 全部用法详见 Usage 菜单
@@ -295,15 +312,16 @@ Usage: nexttrace [-h|--help] [-4|--ipv4] [-6|--ipv6] [-T|--tcp] [-U|--udp]
                 <integer>] [--parallel-requests <integer>] [-m|--max-hops
                 <integer>] [-d|--data-provider
                 (Ip2region|ip2region|IP.SB|ip.sb|IPInfo|ipinfo|IPInsight|ipinsight|IPAPI.com|ip-api.com|IPInfoLocal|ipinfolocal|chunzhen|LeoMoeAPI|leomoeapi|disable-geoip)]
-                 [-n|--no-rdns] [-a|--always-rdns] [-P|--route-path]
-                 [-r|--report] [--dn42] [-o|--output] [-t|--table] [--raw]
-                 [-j|--json] [-c|--classic] [-f|--first <integer>] [-M|--map]
+                 [--pow-provider (api.nxtrace.org|sakura)] [-n|--no-rdns]
+                 [-a|--always-rdns] [-P|--route-path] [-r|--report] [--dn42]
+                 [-o|--output] [-t|--table] [--raw] [-j|--json] [-c|--classic]
+                 [-f|--first <integer>] [-M|--map] [-e|--disable-mpls]
                 [-v|--version] [-s|--source "<value>"] [-D|--dev "<value>"]
-                 [-R|--route] [-z|--send-time <integer>] [-i|--ttl-time
-                 <integer>] [--timeout <integer>] [--psize <integer>]
-                 [_positionalArg_nexttrace_31 "<value>"] [--dot-server
+                 [-z|--send-time <integer>] [-i|--ttl-time <integer>]
+                 [--timeout <integer>] [--psize <integer>]
+                 [_positionalArg_nexttrace_32 "<value>"] [--dot-server
                 (dnssb|aliyun|dnspod|google|cloudflare)] [-g|--language
-                 (en|cn)]
+                 (en|cn)] [--file "<value>"] [-C|--nocolor]

 Arguments:

@@ -334,9 +352,9 @@ Arguments:
                                     IPInfo, IPInsight, IP-API.com, Ip2region,
                                     IPInfoLocal, CHUNZHEN, disable-geoip].
                                     Default: LeoMoeAPI
-      --pow-provider                 Choose PoW Provider [api.leo.moe, sakura]
+      --pow-provider                 Choose PoW Provider [api.nxtrace.org, sakura]
                                     For China mainland users, please use
-                                     sakura. Default: api.leo.moe
+                                     sakura. Default: api.nxtrace.org
  -n  --no-rdns                      Do not resolve IP addresses to their
                                     domain names
  -a  --always-rdns                  Always resolve IP addresses to their
@@ -360,7 +378,6 @@ Arguments:
  -s  --source                       Use source src_addr for outgoing packets
  -D  --dev                          Use the following Network Devices as the
                                     source address in outgoing packets
-  -R  --route                        Show Routing Table [Provided By BGP.Tools]
  -z  --send-time                    Set how many [milliseconds] between
                                     sending each packet.. Useful when some
                                     routers use rate-limit for ICMP messages.
@@ -374,12 +391,13 @@ Arguments:
                                     connection.. Default: 1000
      --psize                        Set the packet size (payload size).
                                     Default: 52
-      --_positionalArg_nexttrace_31  IP Address or domain name
+      --_positionalArg_nexttrace_32  IP Address or domain name
      --dot-server                   Use DoT Server for DNS Parse [dnssb,
                                     aliyun, dnspod, google, cloudflare]
  -g  --language                     Choose the language for displaying [en,
                                     cn]. Default: cn
      --file                         Read IP Address or domain name from file
+  -C  --nocolor                      Disable Colorful Output
 ```

 ## 项目截图
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/fatih/color"
 	"log"
 	"net"
 	"os"
@@ -41,8 +42,8 @@ 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{"Ip2region", "ip2region", "IP.SB", "ip.sb", "IPInfo", "ipinfo", "IPInsight", "ipinsight", "IPAPI.com", "ip-api.com", "IPInfoLocal", "ipinfolocal", "chunzhen", "LeoMoeAPI", "leomoeapi", "disable-geoip"}, &argparse.Options{Default: "LeoMoeAPI",
 		Help: "Choose IP Geograph Data Provider [IP.SB, IPInfo, IPInsight, IP-API.com, Ip2region, IPInfoLocal, CHUNZHEN, disable-geoip]"})
-	powProvider := parser.Selector("", "pow-provider", []string{"api.leo.moe", "sakura"}, &argparse.Options{Default: "api.leo.moe",
-		Help: "Choose PoW Provider [api.leo.moe, sakura] For China mainland users, please use sakura"})
+	powProvider := parser.Selector("", "pow-provider", []string{"api.nxtrace.org", "sakura"}, &argparse.Options{Default: "api.nxtrace.org",
+		Help: "Choose PoW Provider [api.nxtrace.org, sakura] For China mainland users, please use sakura"})
 	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"})
@@ -59,7 +60,7 @@ func Excute() {
 	ver := parser.Flag("v", "version", &argparse.Options{Help: "Print version info and exit"})
 	srcAddr := parser.String("s", "source", &argparse.Options{Help: "Use source src_addr for outgoing packets"})
 	srcDev := 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]"})
+	//router := parser.Flag("R", "route", &argparse.Options{Help: "Show Routing Table [Provided By BGP.Tools]"})
 	packetInterval := parser.Int("z", "send-time", &argparse.Options{Default: 100, Help: "Set how many [milliseconds] between sending each packet.. Useful when some routers use rate-limit for ICMP messages"})
 	ttlInterval := parser.Int("i", "ttl-time", &argparse.Options{Default: 500, Help: "Set how many [milliseconds] between sending packets groups by TTL. Useful when some routers use rate-limit for ICMP messages"})
 	timeout := parser.Int("", "timeout", &argparse.Options{Default: 1000, Help: "The number of [milliseconds] to keep probe sockets open before giving up on the connection."})
@@ -70,6 +71,7 @@ func Excute() {
 	lang := parser.Selector("g", "language", []string{"en", "cn"}, &argparse.Options{Default: "cn",
 		Help: "Choose the language for displaying [en, cn]"})
 	file := parser.String("", "file", &argparse.Options{Help: "Read IP Address or domain name from file"})
+	nocolor := parser.Flag("C", "nocolor", &argparse.Options{Help: "Disable Colorful Output"})

 	err := parser.Parse(os.Args)
 	if err != nil {
@@ -86,6 +88,12 @@ func Excute() {
 		os.Exit(0)
 	}

+	if *nocolor {
+		color.NoColor = true
+	} else {
+		color.NoColor = false
+	}
+
 	domain := *str

 	if *port == 0 {
@@ -121,7 +129,12 @@ func Excute() {
 	}

 	if strings.Contains(domain, "/") {
-		domain = strings.Split(domain, "/")[2]
+		parts := strings.Split(domain, "/")
+		if len(parts) < 3 {
+			fmt.Println("Invalid input")
+			return
+		}
+		domain = parts[2]
 	}

 	if strings.Contains(domain, "]") {
@@ -160,7 +173,7 @@ func Excute() {
 	//	defer wg.Done()
 	if strings.ToUpper(*dataOrigin) == "LEOMOEAPI" {
 		val, ok := os.LookupEnv("NEXTTRACE_DATAPROVIDER")
-		if strings.ToUpper(*powProvider) != "API.LEO.MOE" {
+		if strings.ToUpper(*powProvider) != "API.NXTRACE.ORG" {
 			util.PowProviderParam = *powProvider
 		}
 		if ok {
@@ -240,6 +253,7 @@ func Excute() {
 		*port = 53
 	}

+	util.DestIP = ip.String()
 	var conf = trace.Config{
 		DN42:             *dn42,
 		SrcAddr:          *srcAddr,
@@ -259,6 +273,9 @@ func Excute() {
 		PktSize:          *packetSize,
 	}

+	// 暂时弃用
+	router := new(bool)
+	*router = false
 	if !*tablePrint {
 		if *classicPrint {
 			conf.RealtimePrinter = printer.ClassicPrinter
--- a/fast_trace/basic.go
+++ b/fast_trace/basic.go
@@ -49,36 +49,36 @@ var Beijing = BackBoneCollection{
 	Location: "北京",
 	CT163: ISPCollection{
 		ISPName: CT163,
-		IP:      "ipv4.pek-4134.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.pek-4134.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.pek-4134.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.pek-4134.endpoint.nxtrace.org.",
 	},

 	CU169: ISPCollection{
 		ISPName: CU169,
-		IP:      "ipv4.pek-4837.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.pek-4837.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.pek-4837.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.pek-4837.endpoint.nxtrace.org.",
 	},

 	CU9929: ISPCollection{
 		ISPName: CU9929,
-		IP:      "ipv4.pek-9929.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.pek-9929.endpoint.nxtrace.org.",
 	},

 	CM: ISPCollection{
 		ISPName: CM,
-		IP:      "ipv4.pek-9808.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.pek-9808.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.pek-9808.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.pek-9808.endpoint.nxtrace.org.",
 	},

 	CMIN2: ISPCollection{
 		ISPName: CMIN2,
-		IP:      "ipv4.pek-58807.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.pek-58807.endpoint.nxtrace.org.",
 	},

 	EDU: ISPCollection{
 		ISPName: EDU,
-		IP:      "ipv4.pek-4538.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.pek-4538.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.pek-4538.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.pek-4538.endpoint.nxtrace.org.",
 	},
 }

@@ -86,42 +86,42 @@ var Shanghai = BackBoneCollection{
 	Location: "上海",
 	CT163: ISPCollection{
 		ISPName: CT163,
-		IP:      "ipv4.sha-4134.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.sha-4134.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.sha-4134.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.sha-4134.endpoint.nxtrace.org.",
 	},

 	CTCN2: ISPCollection{
 		ISPName: CTCN2,
-		IP:      "ipv4.sha-4809.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.sha-4809.endpoint.nxtrace.org.",
 	},

 	CU169: ISPCollection{
 		ISPName: CU169,
-		IP:      "ipv4.sha-4837.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.sha-4837.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.sha-4837.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.sha-4837.endpoint.nxtrace.org.",
 	},

 	CU9929: ISPCollection{
 		ISPName: CU9929,
-		IP:      "ipv4.sha-9929.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.sha-9929.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.sha-9929.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.sha-9929.endpoint.nxtrace.org.",
 	},

 	CM: ISPCollection{
 		ISPName: CM,
-		IP:      "ipv4.sha-9808.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.sha-9808.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.sha-9808.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.sha-9808.endpoint.nxtrace.org.",
 	},

 	CMIN2: ISPCollection{
 		ISPName: CMIN2,
-		IP:      "ipv4.sha-58807.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.sha-58807.endpoint.nxtrace.org.",
 	},

 	EDU: ISPCollection{
 		ISPName: EDU,
-		IP:      "ipv4.sha-4538.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.sha-4538.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.sha-4538.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.sha-4538.endpoint.nxtrace.org.",
 	},
 }

@@ -129,20 +129,20 @@ var Guangzhou = BackBoneCollection{
 	Location: "广州",
 	CT163: ISPCollection{
 		ISPName: CT163,
-		IP:      "ipv4.can-4134.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.can-4134.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.can-4134.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.can-4134.endpoint.nxtrace.org.",
 	},

 	CU169: ISPCollection{
 		ISPName: CU169,
-		IP:      "ipv4.can-4837.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.can-4837.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.can-4837.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.can-4837.endpoint.nxtrace.org.",
 	},

 	CM: ISPCollection{
 		ISPName: CM,
-		IP:      "ipv4.can-9808.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.can-9808.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.can-9808.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.can-9808.endpoint.nxtrace.org.",
 	},
 }

@@ -150,23 +150,23 @@ var Hangzhou = BackBoneCollection{
 	Location: "杭州",
 	CT163: ISPCollection{
 		ISPName: CT163,
-		IP:      "ipv4.hgh-4134.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.hgh-4134.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.hgh-4134.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.hgh-4134.endpoint.nxtrace.org.",
 	},
 	CU169: ISPCollection{
 		ISPName: CU169,
-		IP:      "ipv4.hgh-4837.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.hgh-4837.endpoint.nxtrace.org.",
 	},
 	CM: ISPCollection{
 		ISPName: CM,
-		IP:      "ipv4.hgh-9808.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.hgh-9808.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.hgh-9808.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.hgh-9808.endpoint.nxtrace.org.",
 	},
 	// 浙江大学 教育网
 	EDU: ISPCollection{
 		ISPName: EDU,
-		IP:      "ipv4.hgh-4538.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.hgh-4538.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.hgh-4538.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.hgh-4538.endpoint.nxtrace.org.",
 	},
 }

@@ -175,12 +175,12 @@ var Hefei = BackBoneCollection{
 	// 中国科学技术大学 教育网
 	EDU: ISPCollection{
 		ISPName: EDU,
-		IP:      "ipv4.hfe-4538.nexttrace-io-fasttrace-endpoint.win.",
-		IPv6:    "ipv6.hfe-4538.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.hfe-4538.endpoint.nxtrace.org.",
+		IPv6:    "ipv6.hfe-4538.endpoint.nxtrace.org.",
 	},
 	// 中国科学技术大学 科技网
 	CST: ISPCollection{
 		ISPName: "中国科学技术大学 科技网 AS7497",
-		IP:      "ipv4.hfe-7497.nexttrace-io-fasttrace-endpoint.win.",
+		IP:      "ipv4.hfe-7497.endpoint.nxtrace.org.",
 	},
 }
--- a/go.mod
+++ b/go.mod
@@ -10,8 +10,8 @@ require (
 	github.com/stretchr/testify v1.8.4
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
 	github.com/tsosunchia/powclient v0.1.4
-	golang.org/x/net v0.17.0
-	golang.org/x/sync v0.4.0
+	golang.org/x/net v0.18.0
+	golang.org/x/sync v0.5.0
 )

 require (
@@ -32,19 +32,19 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
+	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )

 require (
-	github.com/fatih/color v1.15.0
-	github.com/gorilla/websocket v1.5.0
+	github.com/fatih/color v1.16.0
+	github.com/gorilla/websocket v1.5.1
 	github.com/lionsoul2014/ip2region v2.11.2+incompatible
 	github.com/rodaine/table v1.1.0
 	github.com/tidwall/gjson v1.17.0
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
-	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -58,8 +58,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
-github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
+github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
 github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
@@ -125,8 +125,8 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
+github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
@@ -239,8 +239,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
+golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -296,8 +296,8 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
+golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -317,8 +317,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
-golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -356,8 +356,8 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -367,8 +367,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
--- a/pow/pow_test.go
+++ b/pow/pow_test.go
@@ -10,7 +10,7 @@ import (
 func TestGetToken(t *testing.T) {
 	// 计时开始
 	start := time.Now()
-	token, err := GetToken("api.leo.moe", "api.leo.moe", "443")
+	token, err := GetToken("origin-fallback.nxtrace.org", "origin-fallback.nxtrace.org", "443")
 	// 计时结束
 	end := time.Now()
 	fmt.Println("耗时：", end.Sub(start))
--- a/printer/basic.go
+++ b/printer/basic.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/nxtrace/NTrace-core/config"
 	"github.com/nxtrace/NTrace-core/trace"
+	"github.com/nxtrace/NTrace-core/util"
 	"net"

 	"github.com/fatih/color"
@@ -24,16 +25,18 @@ func Version() {

 func CopyRight() {
 	sponsor()
-	fmt.Fprintf(color.Output, "\n%s\n%s %s\n%s %s, %s, %s, %s\n%s %s\n\n",
+	fmt.Fprintf(color.Output, "\n%s\n%s %s\n%s %s\n%s %s, %s, %s, %s\n%s %s\n",
 		color.New(color.FgCyan, color.Bold).Sprintf("%s", "NextTrace CopyRight"),
 		//color.New(color.FgGreen, color.Bold).Sprintf("%s", "Contact Us"),
 		//color.New(color.FgWhite, color.Bold).Sprintf("%s", "Feedback Email:"),
 		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "nt@moeqing.com"),
 		//color.New(color.FgWhite, color.Bold).Sprintf("%s", "HomePage:"),
 		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "github.com/nxtrace"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Creator:"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Honorary Founder:"),
 		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Leo"),
 		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@leo.moe"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Project Chair:"),
+		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Tso"),
 		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Core-Developer:"),
 		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Leo"),
 		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "i@leo.moe"),
@@ -43,35 +46,25 @@ func CopyRight() {
 		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "zhshch@athorx.com"),
 		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Tso"),
 		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "tsosunchia@gmail.com"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Maintainer:"),
+		color.New(color.FgWhite, color.Bold).Sprintf("%s", "Infra Maintainer:"),
 		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Tso"),
+		//color.New(color.FgWhite, color.Bold).Sprintf("%s", "NOC Manager:"),
+		//color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "YekongTAT"),
 		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "tsosunchia@gmail.com"),
 	)
-
-	moeQingOrgCopyRight()
 	//PluginCopyRight()
 }

-func moeQingOrgCopyRight() {
-	fmt.Fprintf(color.Output, "%s\n%s %s, %s\n\n",
-		color.New(color.FgCyan, color.Bold).Sprintf("%s", "NextTrace Project NOC"),
-		color.New(color.FgWhite, color.Bold).Sprintf("%s", "MoeQing.io:"),
-		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "YekongTAT"),
-		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "yekongtat@gmail.com"),
-		color.New(color.FgHiBlue, color.Bold).Sprintf("%s", "Haima"),
-		//color.New(color.FgHiBlack, color.Bold).Sprintf("%s", "haima@peers.cloud"),
-	)
-}
-
 func sponsor() {
 	italic := "\x1b[3m%s\x1b[0m"
 	formatted := fmt.Sprintf(italic, "(Listed in no particular order)")

-	fmt.Fprintf(color.Output, "%s\n%s\n%s\n%s\n%s\n",
+	fmt.Fprintf(color.Output, "%s\n%s\n%s\n%s\n%s\n%s\n",
 		color.New(color.FgCyan, color.Bold).Sprintf("%s", "NextTrace Sponsored by"),
 		color.New(color.FgHiYellow, color.Bold).Sprintf("%s", "· DMIT.io"),
 		color.New(color.FgHiYellow, color.Bold).Sprintf("%s", "· Misaka.io"),
 		color.New(color.FgHiYellow, color.Bold).Sprintf("%s", "· Skywolf.cloud"),
+		color.New(color.FgHiYellow, color.Bold).Sprintf("%s", "· Saltyfish.io"),
 		color.New(color.FgHiBlack, color.Bold).Sprintf("%s", formatted),
 	)
 }
@@ -86,11 +79,14 @@ func sponsor() {

 func PrintTraceRouteNav(ip net.IP, domain string, dataOrigin string, maxHops int, packetSize int) {
 	fmt.Println("IP Geo Data Provider: " + dataOrigin)
-
-	if ip.String() == domain {
-		fmt.Printf("traceroute to %s, %d hops max, %d bytes packets\n", ip.String(), maxHops, packetSize)
+	if util.EnableHidDstIP == "" {
+		if ip.String() == domain {
+			fmt.Printf("traceroute to %s, %d hops max, %d bytes packets\n", ip.String(), maxHops, packetSize)
+		} else {
+			fmt.Printf("traceroute to %s (%s), %d hops max, %d bytes packets\n", ip.String(), domain, maxHops, packetSize)
+		}
 	} else {
-		fmt.Printf("traceroute to %s (%s), %d hops max, %d bytes packets\n", ip.String(), domain, maxHops, packetSize)
+		fmt.Printf("traceroute to %s, %d hops max, %d bytes packets\n", util.HideIPPart(ip.String()), maxHops, packetSize)
 	}
 }

--- a/printer/realtime_printer.go
+++ b/printer/realtime_printer.go
@@ -2,6 +2,7 @@ package printer

 import (
 	"fmt"
+	"github.com/nxtrace/NTrace-core/util"
 	"net"
 	"strconv"
 	"strings"
@@ -12,7 +13,6 @@ import (

 func RealtimePrinter(res *trace.Result, ttl int) {
 	fmt.Printf("%s  ", color.New(color.FgHiYellow, color.Bold).Sprintf("%-2d", ttl+1))
-
 	// 去重
 	var latestIP string
 	tmpMap := make(map[string][]string)
@@ -51,13 +51,25 @@ func RealtimePrinter(res *trace.Result, ttl int) {
 			fmt.Printf("%4s", "")
 		}
 		if net.ParseIP(ip).To4() == nil {
-			fmt.Fprintf(color.Output, "%s",
-				color.New(color.FgWhite, color.Bold).Sprintf("%-25s", ip),
-			)
+			if util.EnableHidDstIP == "" || ip != util.DestIP {
+				fmt.Fprintf(color.Output, "%s",
+					color.New(color.FgWhite, color.Bold).Sprintf("%-25s", ip),
+				)
+			} else {
+				fmt.Fprintf(color.Output, "%s",
+					color.New(color.FgWhite, color.Bold).Sprintf("%-25s", util.HideIPPart(ip)),
+				)
+			}
 		} else {
-			fmt.Fprintf(color.Output, "%s",
-				color.New(color.FgWhite, color.Bold).Sprintf("%-15s", ip),
-			)
+			if util.EnableHidDstIP == "" || ip != util.DestIP {
+				fmt.Fprintf(color.Output, "%s",
+					color.New(color.FgWhite, color.Bold).Sprintf("%-15s", ip),
+				)
+			} else {
+				fmt.Fprintf(color.Output, "%s",
+					color.New(color.FgWhite, color.Bold).Sprintf("%-15s", util.HideIPPart(ip)),
+				)
+			}
 		}

 		i, _ := strconv.Atoi(v[0])
--- a/reporter/reporter.go
+++ b/reporter/reporter.go
@@ -114,11 +114,13 @@ func (r *reporter) InitialBaseData() Reporter {
 	r.targetTTL = uint16(len(r.routeResult.Hops))

 	for i := uint16(0); i < r.targetTTL; i++ {
-		traceHop := r.routeResult.Hops[i][0]
-		if traceHop.Success {
-			currentIP := traceHop.Address.String()
-			r.wg.Add(1)
-			go r.generateRouteReportNode(currentIP, *traceHop.Geo, i)
+		if i < uint16(len(r.routeResult.Hops)) && len(r.routeResult.Hops[i]) > 0 {
+			traceHop := r.routeResult.Hops[i][0]
+			if traceHop.Success {
+				currentIP := traceHop.Address.String()
+				r.wg.Add(1)
+				go r.generateRouteReportNode(currentIP, *traceHop.Geo, i)
+			}
 		}
 	}

--- a/trace/icmp_ipv4.go
+++ b/trace/icmp_ipv4.go
@@ -15,6 +15,8 @@ import (
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv4"
+
+	"github.com/nxtrace/NTrace-core/trace/internal"
 )

 type ICMPTracer struct {
@@ -67,7 +69,7 @@ func (t *ICMPTracer) Execute() (*Result, error) {

 	var err error

-	t.icmpListen, err = net.ListenPacket("ip4:1", t.SrcAddr)
+	t.icmpListen, err = internal.ListenICMP("ip4:1", t.SrcAddr)
 	if err != nil {
 		return &t.res, err
 	}
--- a/trace/icmp_ipv6.go
+++ b/trace/icmp_ipv6.go
@@ -13,6 +13,8 @@ import (
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv6"
+
+	"github.com/nxtrace/NTrace-core/trace/internal"
 )

 type ICMPTracerv6 struct {
@@ -65,7 +67,7 @@ func (t *ICMPTracerv6) Execute() (*Result, error) {

 	var err error

-	t.icmpListen, err = net.ListenPacket("ip6:58", t.SrcAddr)
+	t.icmpListen, err = internal.ListenICMP("ip6:58", t.SrcAddr)
 	if err != nil {
 		return &t.res, err
 	}
--- a/trace/internal/icmp_darwin.go
+++ b/trace/internal/icmp_darwin.go
@@ -12,13 +12,14 @@ import (
 )

 //go:linkname internetSocket net.internetSocket
-func internetSocket(ctx context.Context, net string, laddr, raddr interface{}, sotype, proto int, mode string, ctrlCtxFn func(context.Context, string, string, syscall.RawConn) error) (fd unsafe.Pointer, err error)
+func internetSocket(ctx context.Context, net string, laddr, raddr any, sotype, proto int, mode string, ctrlCtxFn func(context.Context, string, string, syscall.RawConn) error) (fd unsafe.Pointer, err error)

 //go:linkname newIPConn net.newIPConn
 func newIPConn(fd unsafe.Pointer) *net.IPConn

 var (
 	errUnknownNetwork = errors.New("unknown network type")
+	errUnknownIface   = errors.New("unknown network interface")

 	networkMap = map[string]string{
 		"ip4:icmp": "udp4",
@@ -28,7 +29,6 @@ var (
 	}
 )

-// ListenICMP 会造成指定出口IP功能不可使用
 func ListenICMP(network string, laddr string) (net.PacketConn, error) {
 	if os.Getuid() == 0 { // root
 		return net.ListenPacket(network, laddr)
@@ -38,7 +38,48 @@ func ListenICMP(network string, laddr string) (net.PacketConn, error) {
 			if nw == "udp6" {
 				proto = syscall.IPPROTO_ICMPV6
 			}
-			isock, err := internetSocket(context.Background(), nw, nil, nil, syscall.SOCK_DGRAM, proto, "listen", nil)
+
+			var ifIndex int = -1
+			if laddr != "" {
+				la := net.ParseIP(laddr)
+				if ifaces, err := net.Interfaces(); err == nil {
+					for _, iface := range ifaces {
+						addrs, err := iface.Addrs()
+						if err != nil {
+							continue
+						}
+						for _, addr := range addrs {
+							if ipnet, ok := addr.(*net.IPNet); ok {
+								if ipnet.IP.Equal(la) {
+									ifIndex = iface.Index
+									break
+								}
+							}
+						}
+					}
+					if ifIndex == -1 {
+						return nil, errUnknownIface
+					}
+				} else {
+					return nil, err
+				}
+			}
+
+			isock, err := internetSocket(context.Background(), nw, nil, nil, syscall.SOCK_DGRAM, proto, "listen",
+				func(ctx context.Context, network, address string, c syscall.RawConn) error {
+					if ifIndex != -1 {
+						if proto == syscall.IPPROTO_ICMP {
+							return c.Control(func(fd uintptr) {
+								syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, ifIndex)
+							})
+						} else {
+							return c.Control(func(fd uintptr) {
+								syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, ifIndex)
+							})
+						}
+					}
+					return nil
+				})
 			if err != nil {
 				panic(err)
 			}
--- a/trace/trace.go
+++ b/trace/trace.go
@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"syscall"
 	"time"

 	"github.com/nxtrace/NTrace-core/ipgeo"
@@ -92,7 +93,11 @@ func Traceroute(method Method, config Config) (*Result, error) {
 	default:
 		return &Result{}, ErrInvalidMethod
 	}
-	return tracer.Execute()
+	result, err := tracer.Execute()
+	if err != nil && errors.Is(err, syscall.EPERM) {
+		err = fmt.Errorf("%w, please run as root", err)
+	}
+	return result, err
 }

 type Result struct {
--- a/tracemap/tracemap.go
+++ b/tracemap/tracemap.go
@@ -16,14 +16,14 @@ import (

 func GetMapUrl(r string) (string, error) {
 	host, port := util.GetHostAndPort()
-	fastIp := "api.leo.moe"
+	fastIp := "origin-fallback.nxtrace.org"
 	// 如果 host 是一个 IP 使用默认域名
 	if valid := net.ParseIP(host); valid != nil {
 		fastIp = host
 		if len(strings.Split(fastIp, ":")) > 1 {
 			fastIp = "[" + fastIp + "]"
 		}
-		host = "api.leo.moe"
+		host = "origin-fallback.nxtrace.org"
 	} else {
 		// 默认配置完成，开始寻找最优 IP
 		fastIp = util.GetFastIP(host, port, false)
--- a/util/dns_test.go
+++ b/util/dns_test.go
@@ -13,8 +13,8 @@ func TestDNS(t *testing.T) {
 }

 func TestDomainLookUp(t *testing.T) {
-	ips, _ := DomainLookUp("pek-4134.nexttrace-io-fasttrace-endpoint.win.", "all", "", false)
+	ips, _ := DomainLookUp("pek-4134.endpoint.nxtrace.org.", "all", "", false)
 	fmt.Println(ips)
-	ips, _ = DomainLookUp("pek-4134.nexttrace-io-fasttrace-endpoint.win.", "4", "", false)
+	ips, _ = DomainLookUp("pek-4134.endpoint.nxtrace.org.", "4", "", false)
 	fmt.Println(ips)
 }
--- a/util/latency.go
+++ b/util/latency.go
@@ -28,13 +28,20 @@ var FastIpCache = ""
 func GetFastIP(domain string, port string, enableOutput bool) string {
 	proxyUrl := GetProxy()
 	if proxyUrl != nil {
-		return "api.leo.moe"
+		return "origin-fallback.nxtrace.org"
 	}
 	if FastIpCache != "" {
 		return FastIpCache
 	}

-	ips, err := net.LookupIP(domain)
+	var ips []net.IP
+	var err error
+	if domain == "origin-fallback.nxtrace.org" {
+		ips, err = net.LookupIP("api.nxtrace.org")
+	} else {
+		ips, err = net.LookupIP(domain)
+	}
+
 	if err != nil {
 		log.Fatal("DNS resolution failed, please check your system DNS Settings")
 	}
--- a/util/latency_test.go
+++ b/util/latency_test.go
@@ -2,5 +2,5 @@ package util

 //github action test 不支持v6 这里会报错
 //func TestGetFastIP(t *testing.T) {
-//	GetFastIP("api.leo.moe", "443", true)
+//	GetFastIP("origin-fallback.nxtrace.org", "443", true)
 //}
--- a/util/util.go
+++ b/util/util.go
@@ -22,6 +22,8 @@ var UserAgent = fmt.Sprintf("NextTrace %s/%s/%s", config.Version, runtime.GOOS,
 var RdnsCache sync.Map
 var PowProviderParam = ""
 var DisableMPLS = GetenvDefault("NEXTTRACE_DISABLEMPLS", "")
+var EnableHidDstIP = GetenvDefault("NEXTTRACE_ENABLEHIDDENDSTIP", "")
+var DestIP string

 func LookupAddr(addr string) ([]string, error) {
 	// 如果在缓存中找到，直接返回
@@ -166,7 +168,7 @@ func GetenvDefault(key, defVal string) string {
 }

 func GetHostAndPort() (host string, port string) {
-	var hostP = GetenvDefault("NEXTTRACE_HOSTPORT", "api.leo.moe")
+	var hostP = GetenvDefault("NEXTTRACE_HOSTPORT", "origin-fallback.nxtrace.org")
 	// 解析域名
 	hostArr := strings.Split(hostP, ":")
 	// 判断是否有指定端口
@@ -208,7 +210,7 @@ func GetProxy() *url.URL {
 func GetPowProvider() string {
 	var powProvider = ""
 	if PowProviderParam == "" {
-		powProvider = GetenvDefault("NEXTTRACE_POWPROVIDER", "api.leo.moe")
+		powProvider = GetenvDefault("NEXTTRACE_POWPROVIDER", "api.nxtrace.org")
 	} else {
 		powProvider = PowProviderParam
 	}
@@ -226,3 +228,17 @@ func StringInSlice(val string, list []string) bool {
 	}
 	return false
 }
+
+func HideIPPart(ip string) string {
+	parsedIP := net.ParseIP(ip)
+	if parsedIP == nil {
+		return ""
+	}
+
+	if parsedIP.To4() != nil {
+		// IPv4: 隐藏后16位
+		return strings.Join(strings.Split(ip, ".")[:2], ".") + ".0.0/16"
+	}
+	// IPv6: 隐藏后96位
+	return parsedIP.Mask(net.CIDRMask(32, 128)).String() + "/32"
+}
--- a/wshandle/client.go
+++ b/wshandle/client.go
@@ -192,7 +192,7 @@ func createWsConn() *WsConn {
 		if len(strings.Split(fastIp, ":")) > 1 {
 			fastIp = "[" + fastIp + "]"
 		}
-		host = "api.leo.moe"
+		host = "origin-fallback.nxtrace.org"
 	} else {
 		// 默认配置完成，开始寻找最优 IP
 		fastIp = util.GetFastIP(host, port, true)
Author	SHA1	Message	Date
tsosunchia	c0455ca8e7	api变更	2023-12-01 16:32:44 +08:00
tsosunchia	faa3daa0c4	更新一键安装脚本SSL	2023-12-01 11:15:17 +08:00
tsosunchia	fc88c9be5c	update readme	2023-11-30 17:14:50 +08:00
tsosunchia	f5d1a606b3	add param: support disable color output	2023-11-30 17:11:14 +08:00
tsosunchia	b32947a824	update credit	2023-11-30 16:12:47 +08:00
tsosunchia	36507ad3b5	reporter.go 未检查造成的越界	2023-11-23 10:23:30 +08:00
tsosunchia	9a3f250b9b	Merge pull request #199 from nxtrace/main update credit	2023-11-21 17:42:18 +08:00
tsosunchia	8adceb8d77	update credit	2023-11-21 17:37:46 +08:00
tsosunchia	7912af8481	Merge pull request #197 from nxtrace/main fix bug: nil pointer dereference	2023-11-17 19:08:00 +08:00
tsosunchia	4bef8b918a	fix bug: nil pointer dereference	2023-11-17 19:00:34 +08:00
tsosunchia	690f7346d0	Merge pull request #195 from nxtrace/main chore: SYNC	2023-11-17 17:29:46 +08:00
tsosunchia	d82a521954	Update bug_report.md	2023-11-17 17:26:23 +08:00
tsosunchia	0b7d01fb21	移除route参数	2023-11-15 10:19:00 +08:00
tsosunchia	2fed1d152f	chore: 更新依赖	2023-11-13 17:19:05 +08:00
tsosunchia	98c0fa38ca	可设置是否隐匿目的IP	2023-11-13 11:23:07 +08:00
tsosunchia	cb63e9b61c	Merge pull request #22 from fakeboboliu/main add source ip support to macOS rootless solution	2023-11-12 00:20:18 +08:00
bobo liu	e4626c4f82	notice silver-bullet of permission issue	2023-11-12 00:11:11 +08:00
bobo liu	47698be2ed	add source ip support for macOS rootless solution do you guys not have macos devices?	2023-11-11 21:38:28 +08:00
tsosunchia	ee0ebb126c	Delete CNAME	2023-11-10 09:53:54 +08:00
tsosunchia	1b59210eb1	Merge pull request #191 from nxtrace/main chore: SYNC	2023-11-09 16:31:25 +08:00
tsosunchia	ed518d175b	Merge pull request #21 from huiming23344/main docs: Clarify the steps in the installation guide	2023-11-09 16:29:07 +08:00
Huiming	9f67ea5e9b	docs: Clarify the steps in the installation guide	2023-11-09 15:33:47 +08:00
tsosunchia	d98d2f7ee5	chore(deps): bump golang.org/x/text from 0.13.0 to 0.14.0	2023-11-08 16:17:07 +08:00
tsosunchia	e0b874a687	增加异常处理，在用户输入错误时	2023-11-08 16:13:59 +08:00
tsosunchia	b39657ca5b	Merge pull request #20 from nxtrace/dependabot/go_modules/github.com/fatih/color-1.16.0 chore(deps): bump github.com/fatih/color from 1.15.0 to 1.16.0	2023-11-07 08:28:47 +08:00
dependabot[bot]	c79387ff75	chore(deps): bump github.com/fatih/color from 1.15.0 to 1.16.0 Bumps [github.com/fatih/color](https://github.com/fatih/color) from 1.15.0 to 1.16.0. - [Release notes](https://github.com/fatih/color/releases) - [Commits](https://github.com/fatih/color/compare/v1.15.0...v1.16.0) --- updated-dependencies: - dependency-name: github.com/fatih/color dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-11-07 00:25:23 +00:00
tsosunchia	e6b2d975b4	Merge pull request #19 from nxtrace/dependabot/go_modules/github.com/gorilla/websocket-1.5.1 chore(deps): bump github.com/gorilla/websocket from 1.5.0 to 1.5.1	2023-11-07 08:24:45 +08:00
tsosunchia	33c1af9f50	Merge pull request #18 from nxtrace/dependabot/go_modules/golang.org/x/sync-0.5.0 chore(deps): bump golang.org/x/sync from 0.4.0 to 0.5.0	2023-11-07 08:23:38 +08:00
dependabot[bot]	da825c18cc	chore(deps): bump github.com/gorilla/websocket from 1.5.0 to 1.5.1 Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.5.0 to 1.5.1. - [Release notes](https://github.com/gorilla/websocket/releases) - [Commits](https://github.com/gorilla/websocket/compare/v1.5.0...v1.5.1) --- updated-dependencies: - dependency-name: github.com/gorilla/websocket dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-11-06 14:57:48 +00:00
dependabot[bot]	4adba2b59d	chore(deps): bump golang.org/x/sync from 0.4.0 to 0.5.0 Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.4.0 to 0.5.0. - [Commits](https://github.com/golang/sync/compare/v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-11-06 14:57:44 +00:00
tsosunchia	65d8ac5c14	修改credit	2023-11-05 16:16:59 +08:00
tsosunchia	7472398c26	Merge pull request #186 from nxtrace/main chore: 同步	2023-11-05 15:41:12 +08:00