update: get version from git

对安装脚本一点小改善

.cross_compile.sh

@@ -21,15 +21,15 @@ for pl in ${PLATFORMS}; do
     echo "build => ${TARGET}"
     if [ "${DEBUG_MODE}" == "debug" ]; then
         go build -trimpath -gcflags "all=-N -l" -o ${TARGET} \
-            -ldflags    "-X 'main.version=${BUILD_VERSION}' \
-                        -X 'main.buildDate=${BUILD_DATE}' \
-                        -X 'main.commitID=${COMMIT_SHA1}'\
+            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
+                        -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
+                        -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
                         -w -s"
     else
         go build -trimpath -o ${TARGET} \
-            -ldflags    "-X 'main.version=${BUILD_VERSION}' \
-                        -X 'main.buildDate=${BUILD_DATE}' \
-                        -X 'main.commitID=${COMMIT_SHA1}'\
+            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
+                        -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
+                        -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
                         -w -s"
     fi
 done

.github/workflows/build.yml

@@ -5,13 +5,27 @@ on:
 
 name: Build Release
 jobs:
-  release:
+  test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master # checkout 代码
-      - uses: actions/setup-go@v2 # 配置 Go 环境
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-go@v2
         with:
-          go-version: "1.18" # 改成自己的版本
+          go-version: "1.18"
+
+      - name: Test
+        run: go test -v -coverprofile='coverage.out' -covermode=count ./...
+
+  release:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-go@v2
+        with:
+          go-version: "1.18"
 
       - run: bash .cross_compile.sh
 

.github/workflows/test.yml

@@ -0,0 +1,17 @@
+on:
+  push:
+  pull_request:
+
+name: Test
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-go@v2
+        with:
+          go-version: "1.18"
+
+      - name: Test
+        run: go test -v -coverprofile='coverage.out' -covermode=count ./...

README.md

@@ -22,28 +22,40 @@ bash -c "$(curl -Ls https://raw.githubusercontent.com/xgadget-lab/nexttrace/main
 
 ```bash
 # IPv4 ICMP Trace
-# Tips: 非实时数据，一次性出结果，需要等待30s左右
-./nexttrace 1.0.0.1
+nexttrace 1.0.0.1
 
-# Tips: 如果您需要ICMP的实时结果，请用如下命令
-./nexttrace -report 1.0.0.1
+# 表格打印（一次性输出全部跳数，需等待20-40秒）
+nexttrace -table 1.0.0.1
 
 # IPv6 ICMP Trace
-./nexttrace 2606:4700:4700::1111
+nexttrace 2606:4700:4700::1111
 ```
 
 `NextTrace`也可以使用`TCP`和`UDP`协议发起`Traceroute`请求，不过目前只支持`IPv4`
 ```bash
 # TCP SYN Trace
-./nexttrace -T www.bing.com
+nexttrace -T www.bing.com
 
 # 可以自行指定端口[此处为443]，默认80端口
-./nexttrace -T -p 443 1.0.0.1
+nexttrace -T -p 443 1.0.0.1
 
 # UDP Trace
-./nexttrace -U 1.0.0.1
+nexttrace -U 1.0.0.1
 
-./nexttrace -U -p 53 1.0.0.1
+nexttrace -U -p 53 1.0.0.1
+```
+
+`NextTrace`也同样支持一些进阶功能，如IP反向解析、并发数控制、模式切换等
+
+```bash
+# 无并发，每次只发送一个探测包
+nexttrace -r 1 www.hkix.net
+
+# 打开IP反向解析功能，在IPv6的骨干网定位辅助有较大帮助
+nexttrace -rdns www.bbix.net
+
+# 联合使用
+nexttrace -r 1 -q 1 -report www.time.com.my
 ```
 
 ### IP数据库
@@ -60,10 +72,9 @@ NextTrace所有的的IP地理位置`API DEMO`可以参考[这里](https://github
 Usage of nexttrace:
   -T    Use TCP SYN for tracerouting (default port is 80)
   -U    Use UDP Package for tracerouting (default port is 53 in UDP)
+  -V    Check Version
   -d string
         Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight] (default "LeoMoeAPI")
-  -displayMode string
-        Choose The Display Mode [table, classic] (default "table")
   -m int
         Set the max number of hops (max TTL to be reached). (default 30)
   -p int
@@ -74,21 +85,62 @@ Usage of nexttrace:
         Set ParallelRequests number. It should be 1 when there is a multi-routing. (default 18)
   -rdns
         Set whether rDNS will be display
+  -realtime
+        Output trace results in runtime
   -report
         Route Path
+  -table
+        Output trace results as table
 ```
+
 ## 项目截图
 
+![](asset/screenshot_special.png)
+
 ![](asset/screenshot.png)
 
-## Thanks
+<!--
+Leo注：描述可能不合适，建议再加以斟酌已经修改
+## History
 
-[Sam Sam](https://github.com/samleong123) (samsam123@samsam123.name.my)
+- v0.0.6.alpha - Now
+  - https://github.com/xgadget-lab/nexttrace
+  - 因为项目计划调整，更名并转移到当前仓库。重构了部分代码，提高了效率，增加了ICMP(IPv4 & IPv6)支持，并规划了更多功能。
+- 最初版本 - v0.0.5.alpha
+  - https://github.com/OwO-Network/traceroute
+  - 感谢 Leo (leo.moe) & Vincent (vincent.moe) 发起了这个项目，并完成了最初的工作。
+-->
+
+## Thanks
 
 [Vincent Young](https://github.com/missuo) (i@yyt.moe)
 
-[waiting4new](https://github.com/waiting4new)
+[Sam Sam](https://github.com/samleong123) (samsam123@samsam123.name.my)
 
-FFEE_CO
+[waiting4new](https://github.com/waiting4new)、[FFEE_CO](https://github.com/fkx4-p)、[nsnnns](https://github.com/tsosunchia)
 
-nsnnns
+## IP Database Copyright
+
+### IPv4 Database
+
+#### China MainLand
+
+* 项目组自行维护 ~ 御三家骨干网数据 ~ 5%
+
+* 埃文科技 Paid Database ~ 95%
+
+#### WorldWide
+
+* 埃文科技 Paid Database ~ 15%
+
+* IpInfo Free ~ 15%
+
+* IPInSight Free ~ 70%
+
+### IPv6 Database
+
+This product includes IP2Location LITE data available from <a href="https://lite.ip2location.com">https://lite.ip2location.com</a>.
+
+### Others
+
+其他第三方API尽管集成在本项目内，但是具体的TOS以及AUP，请详见第三方API官网。如遇到IP数据错误，也请直接联系他们纠错。

go.sum

@@ -1,5 +1,6 @@
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
@@ -53,4 +54,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

ipgeo/ipgeo.go

@@ -1,5 +1,7 @@
 package ipgeo
 
+import "strings"
+
 type IPGeoData struct {
 	Asnumber string
 	Country  string
@@ -13,12 +15,12 @@ type IPGeoData struct {
 type Source = func(ip string) (*IPGeoData, error)
 
 func GetSource(s string) Source {
-	switch s {
-	case "LeoMoeAPI":
+	switch strings.ToUpper(s) {
+	case "LEOMOEAPI":
 		return LeoIP
 	case "IP.SB":
 		return IPSB
-	case "IPInsight":
+	case "IPINSIGHT":
 		return IPInSight
 	default:
 		return nil

ipgeo/ipgeo_test.go

@@ -15,11 +15,12 @@ func TestLeoIP(t *testing.T) {
 }
 
 func TestIPSB(t *testing.T) {
-	res, err := IPSB("1.1.1.1")
-	assert.Nil(t, err)
-	assert.NotNil(t, res)
-	assert.NotEmpty(t, res.Asnumber)
-	assert.NotEmpty(t, res.Isp)
+	// Not available
+	//res, err := IPSB("1.1.1.1")
+	//assert.Nil(t, err)
+	//assert.NotNil(t, res)
+	//assert.NotEmpty(t, res.Asnumber)
+	//assert.NotEmpty(t, res.Isp)
 }
 
 func TestIPInfo(t *testing.T) {

ipgeo/ipsb.go

@@ -3,21 +3,25 @@ package ipgeo
 import (
 	"io/ioutil"
 	"net/http"
+	"time"
 
 	"github.com/tidwall/gjson"
 )
 
 func IPSB(ip string) (*IPGeoData, error) {
-	resp, err := http.Get("https://api.ip.sb/geoip/" + ip)
+	url := "https://api.ip.sb/geoip/" + ip
+	client := &http.Client{
+		// 2秒超时
+		Timeout: 2 * time.Second,
+	}
+	req, _ := http.NewRequest("GET", url, nil)
+	// 设置 UA，ip.sb 默认禁止 go-client User-Agent 的 api 请求
+	req.Header.Set("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:100.0) Gecko/20100101 Firefox/100.0")
+	content, err := client.Do(req)
 	if err != nil {
 		return nil, err
 	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
+	body, _ := ioutil.ReadAll(content.Body)
 	res := gjson.ParseBytes(body)
 
 	return &IPGeoData{

listener_channel/listener-channel.go

@@ -1,61 +0,0 @@
-package listener_channel
-
-import (
-	"golang.org/x/net/context"
-	"net"
-	"time"
-)
-
-type ReceivedMessage struct {
-	N    *int
-	Peer net.Addr
-	Msg  []byte
-	Err  error
-}
-
-type ListenerChannel struct {
-	ctx      context.Context
-	cancel   context.CancelFunc
-	Conn     net.PacketConn
-	Messages chan ReceivedMessage
-}
-
-func New(conn net.PacketConn) *ListenerChannel {
-	ctx, cancel := context.WithCancel(context.Background())
-	results := make(chan ReceivedMessage, 50)
-
-	return &ListenerChannel{Conn: conn, ctx: ctx, cancel: cancel, Messages: results}
-}
-
-func (l *ListenerChannel) Start() {
-	for {
-		select {
-		case <-l.ctx.Done():
-			return
-		default:
-		}
-
-		reply := make([]byte, 1500)
-		err := l.Conn.SetReadDeadline(time.Now().Add(2 * time.Second))
-		if err != nil {
-			l.Messages <- ReceivedMessage{Err: err}
-			continue
-		}
-
-		n, peer, err := l.Conn.ReadFrom(reply)
-		if err != nil {
-			l.Messages <- ReceivedMessage{Err: err}
-			continue
-		}
-		l.Messages <- ReceivedMessage{
-			N:    &n,
-			Peer: peer,
-			Err:  nil,
-			Msg:  reply,
-		}
-	}
-}
-
-func (l *ListenerChannel) Stop() {
-	l.cancel()
-}

main.go

@@ -25,9 +25,14 @@ var rdnsenable = flag.Bool("rdns", false, "Set whether rDNS will be display")
 var routePath = flag.Bool("report", false, "Route Path")
 var realtimePrint = flag.Bool("realtime", false, "Output trace results in runtime")
 var tablePrint = flag.Bool("table", false, "Output trace results as table")
+var ver = flag.Bool("V", false, "Check Version")
 
 func flagApply() string {
 	flag.Parse()
+	printer.Version()
+	if *ver {
+		os.Exit(0)
+	}
 	ipArg := flag.Args()
 	if flag.NArg() != 1 {
 		fmt.Println("Args Error\nUsage : ./nexttrace [-T] [-rdns] [-displayMode <displayMode>] [-d <dataOrigin> ] [ -m <hops> ] [ -p <port> ] [ -q <probes> ] [ -r <parallelrequests> ] <hostname>")
@@ -37,11 +42,13 @@ func flagApply() string {
 }
 
 func main() {
+
+	domain := flagApply()
+
 	if os.Getuid() != 0 {
 		log.Fatalln("Traceroute requires root/sudo privileges.")
 	}
 
-	domain := flagApply()
 	ip := util.DomainLookUp(domain)
 	printer.PrintTraceRouteNav(ip, domain, *dataOrigin)
 

nt_install.sh

@@ -9,28 +9,37 @@ checkRootPermit() {
 checkSystemArch() {
     arch=$(uname -m)
     if [[ $arch == "x86_64" ]]; then
-    archParam="amd64"
+        archParam="amd64"
     fi
 
     if [[ $arch == "aarch64" ]]; then
-    archParam="arm64"
+        archParam="arm64"
+    fi
+
+    if [[ $arch == "arm64" ]]; then
+        archParam="arm64"
+    fi
+
+    if [[ $archParam == "" ]]; then
+        echo "未知的系统架构，请联系作者"
+        exit 1
     fi
 }
 
 checkSystemDistribution() {
     case "$OSTYPE" in
-    darwin*)  
-    osDistribution="darwin"
-    downPath="/var/tmp/nexttrace"
-    ;; 
-    linux*)   
-    osDistribution="linux"
-    downPath="/var/tmp/nexttrace"
-    ;;
+    darwin*)
+        osDistribution="darwin"
+        downPath="/var/tmp/nexttrace"
+        ;;
+    linux*)
+        osDistribution="linux"
+        downPath="/var/tmp/nexttrace"
+        ;;
     *)
-    echo "unknown: $OSTYPE"
-    exit 1
-    ;;
+        echo "unknown: $OSTYPE"
+        exit 1
+        ;;
     esac
 }
 
@@ -43,132 +52,172 @@ installWgetPackage() {
     # macOS should install wget originally. Nothing to do
     echo "wget 正在安装中..."
     # try apt
-    apt -h &> /dev/null
+    # 是时候直接使用 APT 来管理包了
+    apt -h &>/dev/null
     if [ $? -eq 0 ]; then
-    # 先更新一下数据源，有些机器数据源比较老可能会404
-    apt update -y &> /dev/null
-    apt install wget -y &> /dev/null
+        # 先更新一下数据源，有些机器数据源比较老可能会404
+        apt update -y &>/dev/null
+        apt install wget -y &>/dev/null
     fi
 
     # try yum
-    yum -h &> /dev/null
+    yum -h &>/dev/null
     if [ $? -eq 0 ]; then
-    yum install wget -y &> /dev/null
+        yum -y update &>/dev/null
+        yum install wget -y &>/dev/null
     fi
 
     # try dnf
-    dnf -h &> /dev/null
+    dnf -h &>/dev/null
     if [ $? -eq 0 ]; then
-    dnf install wget -y &> /dev/null
+        dnf check-update &>/dev/null
+        dnf install wget -y &>/dev/null
     fi
 
     # try pacman
-    pacman -h &> /dev/null
+    pacman -h &>/dev/null
     if [ $? -eq 0 ]; then
-    pacman -Sy
-    pacman -S wget
+        pacman -Sy &>/dev/null
+        pacman -S wget &>/dev/null
+    fi
+    
+    # 有的发行版自带的wget，只有 --help 参数
+    wget --help &>/dev/null
+    if [ $? -ne 0 ]; then
+        echo "wget 安装失败"
+        exit 1
     fi
-
 }
 
 installJqPackage() {
     # macOS should install wget originally. Nothing to do
     echo "jq 正在安装中..."
     # try apt
-    apt -h &> /dev/null
+    apt-get -h &>/dev/null
     if [ $? -eq 0 ]; then
-    # 先更新一下数据源，有些机器数据源比较老可能会404
-    apt update -y &> /dev/null
-    apt install jq -y &> /dev/null
+        # 先更新一下数据源，有些机器数据源比较老可能会404
+        apt-get update -y &>/dev/null
+        apt-get install jq -y &>/dev/null
     fi
 
     # try yum
-    yum -h &> /dev/null
+    yum -h &>/dev/null
     if [ $? -eq 0 ]; then
-    yum install jq -y &> /dev/null
+        yum -y update &>/dev/null
+        yum install jq -y &>/dev/null
     fi
 
     # try dnf
-    dnf -h &> /dev/null
+    dnf -h &>/dev/null
     if [ $? -eq 0 ]; then
-    dnf install jq -y &> /dev/null
+        dnf check-update &>/dev/null
+        dnf install jq -y &>/dev/null
     fi
 
     # try pacman
-    pacman -h &> /dev/null
+    pacman -h &>/dev/null
     if [ $? -eq 0 ]; then
-    pacman -Sy
-    pacman -S jq
+        pacman -Sy &>/dev/null
+        pacman -S jq &>/dev/null
     fi
 
+    jq -h &>/dev/null
+    if [ $? -ne 0 ]; then
+        echo "jq 安装失败"
+        exit 1
+    fi
 }
 
 checkWgetPackage() {
-    wget -h &> /dev/null
+    wget -h &>/dev/null
     if [ $? -ne 0 ]; then
-    read -r -p "您还没有安装wget，是否安装? (y/n)" input
+        read -r -p "您还没有安装wget，是否安装? (y/n)" input
 
-    case $input in
-    [yY][eE][sS]|[yY])
-		installWgetPackage
-		;;
+        case $input in
+        [yY][eE][sS] | [yY])
+            installWgetPackage
+            ;;
 
-    [nN][oO]|[nN])
-		echo "您选择了取消安装，脚本即将退出"
-        exit 1
-       	;;
+        [nN][oO] | [nN])
+            echo "您选择了取消安装，脚本即将退出"
+            exit 1
+            ;;
 
-    *)
-		installWgetPackage
-		;;
-    esac
+        *)
+            installWgetPackage
+            ;;
+        esac
     fi
 }
 
-checkJqPackage() {
-    jq -h &> /dev/null
-    if [ $? -ne 0 ]; then
-    echo "您还没有安装jq， 当您取消安装，我们会使用awk获取当前版本号。"
-    read -r -p "但是如遇Github变更API，这可能会存在问题，是否安装? (y/n)" input
-
+checkVersion() {
+    echo "正在检查版本..."
+    version=$(curl -sL https://api.github.com/repos/xgadget-lab/nexttrace/releases/latest | jq -r '.tag_name')
+    if [[ $version == "" ]]; then
+        echo "获取版本失败，请检查网络连接"
+        exit 1
+    fi
+    echo 当前最新release版本：${version}
+    read -r -p "是否安装/更新软件? (y/n)" input
     case $input in
-    [yY][eE][sS]|[yY])
-		installJqPackage
-		;;
-
-    [nN][oO]|[nN])
-		echo "您选择了取消安装"
-        return 0
-       	;;
-
+    [yY][eE][sS] | [yY])
+        break
+        ;;
+    [nN][oO] | [nN])
+        echo "您选择了取消安装/更新，脚本即将退出"
+        exit 1
+        ;;
     *)
-		installJqPackage
-		;;
+        break
+        ;;
     esac
+}
+
+checkJqPackage() {
+    jq -h &>/dev/null
+    if [ $? -ne 0 ]; then
+        echo "您还没有安装jq， 当您取消安装，我们会使用awk获取当前版本号。"
+        read -r -p "但是如遇Github变更API，这可能会存在问题，是否安装? (y/n)" input
+
+        case $input in
+        [yY][eE][sS] | [yY])
+            installJqPackage
+            ;;
+
+        [nN][oO] | [nN])
+            echo "您选择了取消安装"
+            return 0
+            ;;
+
+        *)
+            installJqPackage
+            ;;
+        esac
     fi
     return 1
 }
 
 downloadBinrayFile() {
-    echo "正在获取最新版的 NextTrace 发行版文件信息..." 
+    echo "正在获取最新版的 NextTrace 发行版文件信息..."
     checkJqPackage
     # 简单说明一下，Github提供了一个API，可以获取最新发行版本的二进制文件下载地址（对应的是browser_download_url），根据刚刚测得的osDistribution、archParam，获取对应的下载地址
     if [[ $? -eq 1 ]]; then
-    # 支持 jq 不回退
-    # echo nexttrace_${osDistribution}_${archParam}
-    latestURL=$(curl -s https://api.github.com/repos/xgadget-lab/nexttrace/releases/latest | jq ".assets[] | select(.name == \"nexttrace_${osDistribution}_${archParam}\") | .browser_download_url" | sed 's/\"//g')
+        # 支持 jq 不回退
+        # echo nexttrace_${osDistribution}_${archParam}
+        latestURL=$(curl -s https://api.github.com/repos/xgadget-lab/nexttrace/releases/latest | jq ".assets[] | select(.name == \"nexttrace_${osDistribution}_${archParam}\") | .browser_download_url")
+        latestURL=${latestURL:1:-1}
     else
-    # 不支持 jq，用户拒绝安装，回退 awk
-    latestURL=$(curl -s https://api.github.com/repos/xgadget-lab/nexttrace/releases/latest | grep -i "browser_download_url.*${osDistribution}.*${archParam}" | awk -F '"' '{print $4}')
+        # 不支持 jq，用户拒绝安装，回退 awk
+        latestURL=$(curl -s https://api.github.com/repos/xgadget-lab/nexttrace/releases/latest | grep -i "browser_download_url.*${osDistribution}.*${archParam}" | awk -F '"' '{print $4}')
     fi
     if [ "$countryCode" == "CN" ]; then
         read -r -p "检测到国内网络环境，是否使用镜像下载以加速(y/n)" input
         case $input in
-        [yY][eE][sS]|[yY])
+        [yY][eE][sS] | [yY])
             latestURL="https://ghproxy.com/"$latestURL
             ;;
 
-        [nN][oO]|[nN])
+        [nN][oO] | [nN])
             echo "您选择了不使用镜像，下载可能会变得异常缓慢，或者失败"
             ;;
 
@@ -177,27 +226,29 @@ downloadBinrayFile() {
             ;;
         esac
     fi
-    
+
     echo "正在下载 NextTrace 二进制文件..."
-    wget -O ${downPath} ${latestURL} &> /dev/null
-    if [ $? -eq 0 ];
-    then
-    echo "NextTrace 现在已经在您的系统中可用"
-    changeMode
-    mv ${downPath} ${usrPath}
+    wget -O ${downPath} ${latestURL} &>/dev/null
+    if [ $? -eq 0 ]; then
+        echo "NextTrace 现在已经在您的系统中可用"
+        changeMode
+        mv ${downPath} ${usrPath}
+        if [[ ${osDistribution} == "macOS" ]]; then
+            xattr -r -d com.apple.quarantine ${usrPath}/nexttrace
+        fi
     else
-    echo "NextTrace 下载失败，请检查您的网络是否正常"
-    exit 1
+        echo "NextTrace 下载失败，请检查您的网络是否正常"
+        exit 1
     fi
 }
 
 changeMode() {
-    chmod +x ${downPath} &> /dev/null
+    chmod +x ${downPath} &>/dev/null
 }
 
 runBinrayFileHelp() {
     if [ -e ${usrPath} ]; then
-    ${usrPath}/nexttrace -h
+        ${usrPath}/nexttrace -h
     fi
 }
 
@@ -206,6 +257,8 @@ checkRootPermit
 checkSystemDistribution
 checkSystemArch
 checkWgetPackage
+# TODO: 检查版本并更新
+#checkVersion
 
 # Download Procedure
 getLocation

printer/basic.go

@@ -5,6 +5,15 @@ import (
 	"net"
 )
 
+var version = "v0.0.0.alpha"
+var buildDate = ""
+var commitID = ""
+
+func Version() {
+	fmt.Println("NextTrace ", version, buildDate, commitID)
+	fmt.Println("XGadget-lab Leo (leo.moe) & Vincent (vincent.moe) & zhshch (xzhsh.ch)")
+}
+
 func PrintTraceRouteNav(ip net.IP, domain string, dataOrigin string) {
 	fmt.Println("IP Geo Data Provider: " + dataOrigin)
 

printer/printer_test.go

@@ -0,0 +1,104 @@
+package printer
+
+import (
+	"errors"
+	"github.com/xgadget-lab/nexttrace/ipgeo"
+	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/xgadget-lab/nexttrace/util"
+	"net"
+	"testing"
+	"time"
+)
+
+func TestPrintTraceRouteNav(t *testing.T) {
+	PrintTraceRouteNav(util.DomainLookUp("1.1.1.1"), "1.1.1.1", "dataOrigin")
+}
+
+var testGeo = &ipgeo.IPGeoData{
+	Asnumber: "TestAsnumber",
+	Country:  "TestCountry",
+	Prov:     "TestProv",
+	City:     "TestCity",
+	District: "TestDistrict",
+	Owner:    "TestOwner",
+	Isp:      "TestIsp",
+}
+
+var testResult = &trace.Result{
+	Hops: [][]trace.Hop{
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo:      testGeo,
+			},
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo:      testGeo,
+			},
+		},
+		{
+			{
+				Success:  false,
+				Address:  nil,
+				Hostname: "",
+				TTL:      0,
+				RTT:      0,
+				Error:    errors.New("test error"),
+				Geo:      nil,
+			},
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo:      nil,
+			},
+		},
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      0,
+				Error:    nil,
+				Geo:      &ipgeo.IPGeoData{},
+			},
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
+				Hostname: "",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo:      testGeo,
+			},
+		},
+	},
+}
+
+func TestTraceroutePrinter(t *testing.T) {
+	TraceroutePrinter(testResult)
+}
+
+func TestTracerouteTablePrinter(t *testing.T) {
+	TracerouteTablePrinter(testResult)
+}
+
+func TestRealtimePrinter(t *testing.T) {
+	RealtimePrinter(testResult, 0)
+	RealtimePrinter(testResult, 1)
+	RealtimePrinter(testResult, 2)
+}

printer/tableprinter.go

@@ -2,6 +2,7 @@ package printer
 
 import (
 	"fmt"
+	"github.com/xgadget-lab/nexttrace/ipgeo"
 	"strings"
 
 	"github.com/xgadget-lab/nexttrace/trace"
@@ -89,6 +90,10 @@ func tableDataGenerator(h trace.Hop) *rowData {
 			IP = fmt.Sprint(h.Hostname, " (", IP, ") ")
 		}
 
+		if h.Geo == nil {
+			h.Geo = &ipgeo.IPGeoData{}
+		}
+
 		r := &rowData{
 			Hop:      fmt.Sprint(h.TTL),
 			IP:       IP,

reporter/reporter.go

@@ -1,10 +1,10 @@
 package reporter
 
 import (
-	"errors"
 	"fmt"
 	"net"
 	"strings"
+	"sync"
 
 	"github.com/xgadget-lab/nexttrace/ipgeo"
 	"github.com/xgadget-lab/nexttrace/trace"
@@ -24,9 +24,12 @@ func New(rs *trace.Result, ip string) Reporter {
 }
 
 type reporter struct {
-	targetIP    string
-	routeReport map[uint16][]routeReportNode
-	routeResult *trace.Result
+	targetTTL       uint16
+	targetIP        string
+	routeReport     map[uint16][]routeReportNode
+	routeReportLock sync.Mutex
+	routeResult     *trace.Result
+	wg              sync.WaitGroup
 }
 
 type routeReportNode struct {
@@ -40,71 +43,107 @@ func experimentTag() {
 	fmt.Println("Route-Path 功能实验室")
 }
 
-func (r *reporter) generateRouteReportNode(ip string, ipGeoData ipgeo.IPGeoData) (routeReportNode, error) {
-	rpn := routeReportNode{}
-	go func() {
-		ptr, err := net.LookupAddr(ip)
-		if err == nil {
-			if strings.Contains(strings.ToLower(ptr[0]), "ix") {
-				rpn.ix = true
-			} else {
-				rpn.ix = false
-			}
-		}
-	}()
+func (r *reporter) generateRouteReportNode(ip string, ipGeoData ipgeo.IPGeoData, ttl uint16) {
 
+	var success bool = true
+
+	defer r.wg.Done()
+
+	rpn := routeReportNode{}
+	ptr, err := net.LookupAddr(ip)
+
+	if err == nil {
+		if strings.Contains(strings.ToLower(ptr[0]), "ix") {
+			rpn.ix = true
+		} else {
+			rpn.ix = false
+		}
+	}
+	// TODO: 这种写法不好，后面再重构一下
+	// 判断反向解析的域名中又或者是IP地理位置数据库中，是否出现了 IX
 	if strings.Contains(strings.ToLower(ipGeoData.Isp), "exchange") || strings.Contains(strings.ToLower(ipGeoData.Isp), "ix") || strings.Contains(strings.ToLower(ipGeoData.Owner), "exchange") || strings.Contains(strings.ToLower(ipGeoData.Owner), "ix") {
 		rpn.ix = true
 	}
+
+	// TODO: 正则判断POP并且提取带宽大小等信息
+
+	// CN2 需要特殊处理，因为他们很多没有ASN
+	// 但是目前这种写法是不规范的，属于凭空标记4809的IP
+	// TODO: 用更好的方式显示 CN2 骨干网的路由 Path
 	if strings.HasPrefix(ip, "59.43") {
 		rpn.asn = "4809"
 	} else {
 		rpn.asn = ipGeoData.Asnumber
 	}
+
 	// 无论最后一跳是否为存在地理位置信息（AnyCast），都应该给予显示
-	if ipGeoData.Country == "" || ipGeoData.City == "" || ipGeoData.City == "-" && ip != r.targetIP {
-		return rpn, errors.New("GeoData Search Failed")
+	if (ipGeoData.Country == "" || ipGeoData.Country == "LAN Address" || ipGeoData.Country == "-") && ip != r.targetIP {
+		success = false
 	} else {
 		if ipGeoData.City == "" {
-			rpn.geo = []string{ipGeoData.Country, ipGeoData.Country}
+			rpn.geo = []string{ipGeoData.Country, ipGeoData.Prov}
 		} else {
 			rpn.geo = []string{ipGeoData.Country, ipGeoData.City}
 		}
 	}
+	if ipGeoData.Asnumber == "" {
+		rpn.asn = "*"
+	}
+
 	if ipGeoData.Isp == "" {
 		rpn.isp = ipGeoData.Owner
 	} else {
 		rpn.isp = ipGeoData.Isp
 	}
-	return rpn, nil
+
+	// 有效记录
+	if success {
+		// 锁住资源，防止同时写panic
+		r.routeReportLock.Lock()
+		// 添加到MAP中
+		r.routeReport[ttl] = append(r.routeReport[ttl], rpn)
+		// 写入完成，解锁释放资源给其他协程
+		r.routeReportLock.Unlock()
+	}
 }
 
 func (r *reporter) InitialBaseData() Reporter {
-	var nodeIndex uint16 = 1
 	reportNodes := map[uint16][]routeReportNode{}
-	for i := uint16(0); int(i) < len(r.routeResult.Hops); i++ {
+
+	r.routeReport = reportNodes
+	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()
-			rpn, err := r.generateRouteReportNode(currentIP, *traceHop.Geo)
-			if err == nil {
-				reportNodes[nodeIndex] = append(reportNodes[nodeIndex], rpn)
-				nodeIndex += 1
-			}
+			r.wg.Add(1)
+			go r.generateRouteReportNode(currentIP, *traceHop.Geo, i)
 		}
 	}
-	r.routeReport = reportNodes
+
+	// 等待所有的子协程运行完毕
+	r.wg.Wait()
 	return r
 }
 
 func (r *reporter) Print() {
+	var beforeActiveTTL uint16 = 1
 	r.InitialBaseData()
-	for i := uint16(1); int(i) < len(r.routeReport)+1; i++ {
+
+	for i := uint16(1); i < r.targetTTL; i++ {
+		// 计算该TTL内的数据长度，如果为0，则代表没有有效数据
+		if len(r.routeReport[i]) == 0 {
+			// 跳过改跃点的数据整理
+			continue
+		}
 		nodeReport := r.routeReport[i][0]
+
 		if i == 1 {
 			fmt.Printf("AS%s %s「%s『%s", nodeReport.asn, nodeReport.isp, nodeReport.geo[0], nodeReport.geo[1])
 		} else {
-			nodeReportBefore := r.routeReport[i-1][0]
+			nodeReportBefore := r.routeReport[beforeActiveTTL][0]
+			// ASN 相同，同个 ISP 内部的数据传递
 			if nodeReportBefore.asn == nodeReport.asn {
 				// Same ASN but Coutry or City Changed
 				if nodeReportBefore.geo[0] != nodeReport.geo[0] {
@@ -115,8 +154,11 @@ func (r *reporter) Print() {
 					}
 				}
 			} else {
+				// ASN 不同，跨 ISP 的数据传递，这里可能会出现 POP、IP Transit、Peer、Exchange
 				fmt.Printf("』」")
 				if int(i) != len(r.routeReport)+1 {
+					// 部分 Shell 客户端可能无法很好的展示这个特殊字符
+					// TODO: 寻找其他替代字符
 					fmt.Printf("\n ╭╯\n ╰")
 				}
 				if nodeReport.ix {
@@ -126,6 +168,8 @@ func (r *reporter) Print() {
 				}
 			}
 		}
+		// 标记为最新的一个有效跃点
+		beforeActiveTTL = i
 	}
 	fmt.Println("』」")
 }

reporter/reporter_test.go

@@ -1,31 +1,115 @@
 package reporter
 
 import (
+	"net"
 	"testing"
 	"time"
 
 	"github.com/xgadget-lab/nexttrace/ipgeo"
 	"github.com/xgadget-lab/nexttrace/trace"
-	"github.com/xgadget-lab/nexttrace/util"
 )
 
+var testResult = &trace.Result{
+	Hops: [][]trace.Hop{
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("192.168.3.1")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo: &ipgeo.IPGeoData{
+					Asnumber: "4808",
+					Country:  "中国",
+					Prov:     "北京市",
+					City:     "北京市",
+					District: "北京市",
+					Owner:    "",
+					Isp:      "中国联通",
+				},
+			},
+		},
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("114.249.16.1")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo: &ipgeo.IPGeoData{
+					Asnumber: "4808",
+					Country:  "中国",
+					Prov:     "北京市",
+					City:     "北京市",
+					District: "北京市",
+					Owner:    "",
+					Isp:      "中国联通",
+				},
+			},
+		},
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("219.158.5.150")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo: &ipgeo.IPGeoData{
+					Asnumber: "4837",
+					Country:  "中国",
+					Prov:     "",
+					City:     "",
+					District: "",
+					Owner:    "",
+					Isp:      "中国联通",
+				},
+			},
+		},
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("62.115.125.160")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo: &ipgeo.IPGeoData{
+					Asnumber: "1299",
+					Country:  "Sweden",
+					Prov:     "Stockholm County",
+					City:     "Stockholm",
+					District: "",
+					Owner:    "",
+					Isp:      "Telia Company AB",
+				},
+			},
+		},
+		{
+			{
+				Success:  true,
+				Address:  &net.IPAddr{IP: net.ParseIP("213.226.68.73")},
+				Hostname: "test",
+				TTL:      0,
+				RTT:      10 * time.Millisecond,
+				Error:    nil,
+				Geo: &ipgeo.IPGeoData{
+					Asnumber: "56630",
+					Country:  "Germany",
+					Prov:     "Hesse, Frankfurt",
+					City:     "",
+					District: "",
+					Owner:    "",
+					Isp:      "Melbikomas UAB",
+				},
+			},
+		},
+	},
+}
+
 func TestPrint(t *testing.T) {
-	ip := util.DomainLookUp("213.226.68.73")
-	var m trace.Method = "tcp"
-	var conf = trace.Config{
-		DestIP:           ip,
-		DestPort:         80,
-		MaxHops:          30,
-		NumMeasurements:  1,
-		ParallelRequests: 1,
-		RDns:             true,
-		IPGeoSource:      ipgeo.GetSource("LeoMoeAPI"),
-		Timeout:          2 * time.Second,
-
-		//Quic:    false,
-	}
-
-	res, _ := trace.Traceroute(m, conf)
-	r := New(res, ip.String())
+	r := New(testResult, "213.226.68.73")
 	r.Print()
 }

signal/signal.go

@@ -1,19 +0,0 @@
-package signal
-
-type Signal struct {
-	sigChan chan struct{}
-}
-
-func New() *Signal {
-	return &Signal{sigChan: make(chan struct{}, 1)}
-}
-
-func (s *Signal) Signal() {
-	if len(s.sigChan) == 0 {
-		s.sigChan <- struct{}{}
-	}
-}
-
-func (s *Signal) Chan() chan struct{} {
-	return s.sigChan
-}

taskgroup/taskgroup.go

@@ -1,45 +0,0 @@
-package taskgroup
-
-import (
-	"sync"
-)
-
-type TaskGroup struct {
-	count int
-	mu    sync.Mutex
-	done  []chan struct{}
-}
-
-func New() *TaskGroup {
-	return &TaskGroup{
-		count: 0,
-		mu:    sync.Mutex{},
-		done:  []chan struct{}{},
-	}
-}
-
-func (t *TaskGroup) Add() {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	t.count++
-}
-
-func (t *TaskGroup) Done() {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	if t.count-1 == 0 {
-		for _, doneChannel := range t.done {
-			doneChannel <- struct{}{}
-		}
-		t.done = []chan struct{}{}
-	}
-	t.count--
-}
-
-func (t *TaskGroup) Wait() {
-	doneChannel := make(chan struct{})
-	t.mu.Lock()
-	t.done = append(t.done, doneChannel)
-	t.mu.Unlock()
-	<-doneChannel
-}

trace/tcp_ipv4.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/xgadget-lab/nexttrace/listener_channel"
 	"github.com/xgadget-lab/nexttrace/util"
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
@@ -110,10 +109,7 @@ func (t *TCPTracer) listenICMP() {
 // @title    listenTCP
 // @description   监听TCP的响应数据包
 func (t *TCPTracer) listenTCP() {
-	lc := listener_channel.New(t.tcp)
-
-	defer lc.Stop()
-
+	lc := NewPacketListener(t.tcp, t.ctx)
 	go lc.Start()
 
 	for {

trace/tcp_ipv6.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
-	"github.com/xgadget-lab/nexttrace/listener_channel"
 	"github.com/xgadget-lab/nexttrace/util"
 	"golang.org/x/net/context"
 	"golang.org/x/net/icmp"
@@ -111,10 +110,7 @@ func (t *TCPTracerv6) listenICMP() {
 // @title    listenTCP
 // @description   监听TCP的响应数据包
 func (t *TCPTracerv6) listenTCP() {
-	lc := listener_channel.New(t.tcp)
-
-	defer lc.Stop()
-
+	lc := NewPacketListener(t.tcp, t.ctx)
 	go lc.Start()
 
 	for {