API接口不稳定，不需要进行测试

update: IPv6 默认使用 LeoMoeAPI
Add: Some Tips
2025-08-12 06:26:39 +00:00 · 2022-07-02 02:43:01 +02:00 · 2022-07-02 02:35:16 +02:00 · 2022-06-24 13:51:41 +08:00 · 2022-06-21 09:53:29 +08:00 · 2022-06-20 22:51:15 +08:00
34 changed files with 1469 additions and 694 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/amd64 linux/arm64 linux/mips"
+PLATFORMS="darwin/amd64 darwin/arm64 linux/386 linux/amd64 linux/arm64 linux/mips openbsd/amd64 openbsd/arm64 freebsd/amd64 freebsd/arm64"

 BUILD_VERSION="$(git describe --tags --always)"
 BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
@@ -38,3 +38,23 @@ for pl in ${PLATFORMS}; do
    fi
 done

+    export GOOS='linux'
+    export GOARCH='arm'
+    export GOARM='7'
+    export TARGET=${TARGET_DIR}/${DIST_PREFIX}_${GOOS}_${GOARCH}v7
+    echo "build => ${TARGET}"
+    if [ "${DEBUG_MODE}" == "debug" ]; then
+        go build -trimpath -gcflags "all=-N -l" -o ${TARGET} \
+            -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 '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
+
+
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
          go-version: "1.18"

      - name: Test
-        run: go test -v -coverprofile='coverage.out' -covermode=count ./...
+        run: sudo go test -v -coverprofile='coverage.out' -covermode=count ./...

  Build:
    needs: test
@@ -36,8 +36,49 @@ jobs:
          files: |
            dist/nexttrace_darwin_amd64
            dist/nexttrace_darwin_arm64
+            dist/nexttrace_linux_386
            dist/nexttrace_linux_amd64
            dist/nexttrace_linux_arm64
+            dist/nexttrace_linux_armv7
            dist/nexttrace_linux_mips
+            dist/nexttrace_openbsd_amd64
+            dist/nexttrace_openbsd_arm64
+            dist/nexttrace_freebsd_amd64
+            dist/nexttrace_freebsd_arm64
        env:
          GITHUB_TOKEN: ${{ secrets.GT_Token }}
+  publish-new-formula:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/v')
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Runs a single command using the runners shell
+      - name: config git
+        run: |
+          git config --global user.email "${{ secrets.git_mail }}"
+          git config --global user.name "${{ secrets.git_name }}"
+      - name: Clone repo
+        run: |
+          git clone https://github.com/xgadget-lab/homebrew-nexttrace.git
+      - name: Exec scipt
+        run: |
+          cd homebrew-nexttrace
+          bash genFormula.sh
+      # - name: setup SSH keys and known_hosts
+      #   run: |
+      #     mkdir -p ~/.ssh
+      #     ssh-keyscan github.com >> ~/.ssh/known_hosts
+      #     ssh-agent -a $SSH_AUTH_SOCK > /dev/null
+      #     ssh-add - <<< "${{ secrets.ID_RSA }}"
+      #   env:
+      #     SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+      - name: Git Push
+        run: |
+          cd homebrew-nexttrace
+          git commit -am 'Publish a new version with Formula'
+          git remote set-url origin https://${{ secrets.gt_token }}@github.com/xgadget-lab/homebrew-nexttrace.git
+          git push || 1
+        # env:
+        #   SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+      - run: echo "🍏 This job's status is ${{ job.status }}."
--- a/.github/workflows/publishNewFormula.yml
+++ b/.github/workflows/publishNewFormula.yml
@@ -0,0 +1,45 @@
+name: Publish New Formula
+
+# Controls when the action will run. Workflow runs when manually triggered using the UI
+# or API.
+on:
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "greet"
+  publish-new-formula:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Runs a single command using the runners shell
+      - name: config git
+        run: |
+          git config --global user.email "${{ secrets.git_mail }}"
+          git config --global user.name "${{ secrets.git_name }}"
+      - name: Clone repo
+        run: |
+          git clone https://github.com/xgadget-lab/homebrew-nexttrace.git
+      - name: Exec scipt
+        run: |
+          cd homebrew-nexttrace
+          bash genFormula.sh
+      # - name: setup SSH keys and known_hosts
+      #   run: |
+      #     mkdir -p ~/.ssh
+      #     ssh-keyscan github.com >> ~/.ssh/known_hosts
+      #     ssh-agent -a $SSH_AUTH_SOCK > /dev/null
+      #     ssh-add - <<< "${{ secrets.ID_RSA }}"
+      #   env:
+      #     SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+      - name: Git Push
+        run: |
+          cd homebrew-nexttrace
+          git commit -am 'Publish a new version with Formula'
+          git remote set-url origin https://${{ secrets.gt_token }}@github.com/xgadget-lab/homebrew-nexttrace.git
+          git push || 1
+        # env:
+        #   SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+      - run: echo "🍏 This job's status is ${{ job.status }}."
--- a/1
+++ b/1
@@ -0,0 +1 @@
+trace.ac
--- a/README.md
+++ b/README.md
@@ -4,43 +4,63 @@

 </div>

-# NextTrace
+## NextTrace Lite

-一款开源的可视化路由跟踪工具，使用 Golang 开发。
+Document Language: English | [简体中文](README_zh_CN.md)
+
+An open source visual routing tool that pursues light weight, developed using Golang.
+
+NextTrace has a total of 2 versions, the Lite version focusing on lightweight and the [Enhanced version](#nexttrace-enhanced) which is more enthusiast-oriented.
+
+PS: Our Lite version does not provide OSM based geolocation visualization, we provide this parameter in the enhanced version if needed.

 ## How To Use

-### Install
+### Automated Installation

 ```bash
-#下载nt_install.sh
-curl -Ls https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh -O
-#执行nt_install.sh
-sudo bash nt_install.sh
+# Linux one-click install script
+bash <(curl -Ls https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh)
+
+# macOS brew install command
+brew tap xgadget-lab/nexttrace && brew install nexttrace
 ```

+- `Release` provides compiled executables for many systems and architectures, if not, you can compile it yourself.
+- Some of the necessary dependencies of this project are not fully implemented in `Golang` on `Windows`, so currently `NextTrace` is not available on `Windows` platform.
+
 ### Get Started

-`NextTrace`默认使用`icmp`协议发起`TraceRoute`请求，该协议同时支持`IPv4`和`IPv6`
+`NextTrace` uses the `ICMP` protocol to perform TraceRoute requests by default, which supports both `IPv4` and `IPv6`

 ```bash
 # IPv4 ICMP Trace
 nexttrace 1.0.0.1

-# 表格打印（一次性输出全部跳数，需等待20-40秒）
+# Form printing (output all hops at one time, wait 20-40 seconds)
 nexttrace -table 1.0.0.1

 # IPv6 ICMP Trace
 nexttrace 2606:4700:4700::1111
 ```

-`NextTrace`也可以使用`TCP`和`UDP`协议发起`Traceroute`请求，不过目前只支持`IPv4`
+`NextTrace` now supports quick testing, and friends who have a one-time backhaul routing test requirement can use it
+
+```bash
+# IPv4 ICMP Fast Test (Beijing + Shanghai + Guangzhou + Hangzhou) in China Telecom / Unicom / Mobile / Education Network
+nexttrace -f
+
+# You can also use TCP SYN for testing
+nexttrace -f -T
+```
+
+`NextTrace` can also use `TCP` and `UDP` protocols to perform `Traceroute` requests, but these protocols only supports `IPv4` now

 ```bash
 # TCP SYN Trace
 nexttrace -T www.bing.com

-# 可以自行指定端口[此处为443]，默认80端口
+# You can specify the port by yourself [here is 443], the default port is 80
 nexttrace -T -p 443 1.0.0.1

 # UDP Trace
@@ -49,115 +69,169 @@ nexttrace -U 1.0.0.1
 nexttrace -U -p 53 1.0.0.1
 ```

-`NextTrace`也同样支持一些进阶功能，如 IP 反向解析、并发数控制、模式切换等
+`NextTrace` also supports some advanced functions, such as ttl control, concurrent probe packet count control, mode switching, etc.

 ```bash
-# 无并发，每次只发送一个探测包
+# Send 2 probe packets per hop
+nexttrace -q 2 www.hkix.net
+
+# No concurrent probe packets, only one probe packet is sent at a time
 nexttrace -r 1 www.hkix.net

-# 打开IP反向解析功能，在IPv6的骨干网定位辅助有较大帮助
-nexttrace -rdns www.bbix.net
+# Start Trace with TTL of 5, end at TTL of 10
+nexttrace -b 5 -m 10 www.decix.net

-# 联合使用
-nexttrace -r 1 -q 1 -report www.time.com.my
+# Turn off the IP reverse parsing function
+nexttrace -n www.bbix.net
+
+# Feature: print Route-Path diagram
+# Route-Path diagram example:
+# AS6453 Tata Communication「Singapore『Singapore』」
+#  ╭╯
+#  ╰AS9299 Philippine Long Distance Telephone Co.「Philippines『Metro Manila』」
+#  ╭╯
+#  ╰AS36776 Five9 Inc.「Philippines『Metro Manila』」
+#  ╭╯
+#  ╰AS37963 Aliyun「ALIDNS.COM『ALIDNS.COM』」
+nexttrace -report www.time.com.my
 ```

-### For Beginner
-
-如果你实在不想去了解这些参数如何使用，或目的只是为了快速测试服务器的到中国内地的线路，那么建议你使用本仓库的 `quicklytest.sh`
-
-使用此脚本前请先按照 [Install](#Install) 中的提示进行安装，才可使用，并按照提示进行操作即可。
+`NextTrace` supports users to select their own IP API (currently supports: `LeoMoeAPI`, `IP.SB`, `IPInfo`, `IPInsight`, `IPAPI.com`)

 ```bash
-#下载quicklytest.sh
-curl -Ls https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh -O
-#执行quicklytest.sh
-sudo bash quicklytest.sh
+# You can specify the IP database by yourself [IP.SB here], if not specified, LeoMoeAPI will be used
+nexttrace -d IP.SB
+## Note that the ipinfo API needs users to purchase services from ipinfo. If necessary, you can clone this project, add the token provided by ipinfo and compile it yourself
+## Fill the token to: ipgeo/tokens.go
+## Please be aware: Due to the serious abuse of IP.SB, you will often be not able to query IP data from this source
+## IPAPI.com has a stricter restiction on API calls, if you can't query IP data from this source, please try again in a few minutes.
 ```

-### IP 数据库
+`NextTrace` supports mixed parameters

-目前使用的 IP 数据库默认为我们自己搭建的 API 服务，如果后期遇到滥用，我们可能会选择关闭。
+```bash
+Example:
+nexttrace -d IPInsight -m 20 -p 443 -q 5 -r 20 -rdns 1.1.1.1
+nexttrace -T -q 2 -r 1 -table -report 2001:4860:4860::8888
+```

-我们也会在后期开放服务端源代码，您也可以根据该项目的源码自行搭建属于您的 API 服务器。
+### IP Database

-NextTrace 所有的的 IP 地理位置`API DEMO`可以参考[这里](https://github.com/xgadget-lab/nexttrace/blob/main/ipgeo/)
+NextTrace BackEnd is now open-source.

-### 全部用法详见 Usage 菜单
+https://github.com/sjlleo/nexttrace-backend
+
+All NextTrace IP geolocation `API DEMO` can refer to [here](https://github.com/xgadget-lab/nexttrace/blob/main/ipgeo/)
+
+### For full usage list, please refer to the usage menu

 ```shell
 Usage of nexttrace:
+      'nexttrace [options] <hostname>' or 'nexttrace <hostname> [option...]'
+Options:
  -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
+  -V    Print Version
+  -b int
+        Set The Begin TTL (default 1)
  -d string
-        Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight] (default "LeoMoeAPI")
+        Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight, IPAPI.com] (default "LeoMoeAPI")
+  -f    One-Key Fast Traceroute
  -m int
        Set the max number of hops (max TTL to be reached). (default 30)
+  -n    Disable IP Reverse DNS lookup
  -p int
        Set SYN Traceroute Port (default 80)
  -q int
        Set the number of probes per each hop. (default 3)
  -r int
        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
 ```

-## 项目截图
+## Project screenshot

-![NextTrace Screenshot](asset/screenshot.png)
+![NextTrace Screenshot](asset/screenshot.png)  

-## FAQ 常见问题
+## NextTrace Enhanced

-如果你在安装或者使用的时候遇到了问题，我们建议你不要把新建一个 `issue` 作为首选项
+`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.

-或许可以在这里找到答案 -> [前往 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)
+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.

-## Thanks
+https://github.com/OwO-Network/nexttrace-enhanced
+
+## 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
+
+### This Project uses [JetBrain Open-Source Project License](https://jb.gg/OpenSourceSupport). We Proudly Develop By Goland.
+
+![GoLand logo](https://resources.jetbrains.com/storage/products/company/brand/logos/GoLand.png)
+
+## Credits

 [Vincent Young](https://github.com/missuo) (i@yyt.moe)

 [Sam Sam](https://github.com/samleong123) (samsam123@samsam123.name.my)

-[waiting4new](https://github.com/waiting4new)、[FFEE_CO](https://github.com/fkx4-p)、[nsnnns](https://github.com/tsosunchia)
+[tsosunchia](https://github.com/tsosunchia)
+
+[waiting4new](https://github.com/waiting4new)
+
+[FFEE_CO](https://github.com/fkx4-p)

 ## IP Database Copyright

 ### IPv4 Database

-#### China MainLand
+#### China

- 项目组自行维护 ~ 御三家骨干网数据 ~ 5%
-
- 埃文科技 Paid Database ~ 95%
-
-**这里有朋友就要问了，为什么不全部使用埃文的付费库？**
-
-埃文的库一直都不是最优选择，IPIP.NET 才是，但是因为他们不对私，所以我们只能选择价格更便宜的埃文库。
-
-埃文家的数据库，在骨干网这块，准度可以说是非常糟糕，作为一款可视化的路由跟踪工具，骨干网的数据库准度非常重要。
-
-所以我们选择了尝试自行去校准一部分骨干网数据，但是由于我们缺乏检测节点以及志愿者，所以这项工作可能会进展的尤其缓慢。
+| ISP                         | Type     | Data Source          | Proportion |
+|:---------------------------:|:--------:|:--------------------:|:----------:|
+| China Telecom/Unicom/Mobile | Backbone | Internet Enthusiasts | 10%        |
+| China Telecom/Unicom/Mobile | Local    | Avon Technology      | 90%        |

 #### WorldWide

- 埃文科技 Paid Database ~ 15%
+##### Tier 1

- IpInfo Free ~ 15%
+| ISP    | Type     | Data Source     | Proportion |
+|:------:|:--------:|:---------------:|:----------:|
+| Tier 1 | Backbone | IPInfo          | 2%         |
+| Tier 1 | Backbone | Avon Technology | 3%         |
+| Tier 1 | Backbone | IPInSight       | 5%         |
+| Tier 1 | Local    | IPInSight       | 90%        |

- IPInSight Free ~ 70%
+##### General
+
+| ISP     | Type     | Data Source | Proportion |
+|:-------:|:--------:|:-----------:|:----------:|
+| General | Backbone | IPInSight   | 5%         |
+| General | Local    | IPInSight   | 95%        |

 ### IPv6 Database

+| ISP | Type | Data Source      | Proportion |
+|:---:|:----:|:----------------:|:----------:|
+| All | All  | IP2Location Lite | 100%       |
+
 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 数据错误，也请直接联系他们纠错。
+Although other third-party APIs are integrated in this project, please refer to the official website of the third-party APIs for specific TOS and AUP. If you encounter IP data errors, please contact them directly to correct them.
+
+## 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)
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -0,0 +1,231 @@
+<div align="center">
+
+<img src="asset/logo.png" height="200px" alt="NextTrace Logo"/>
+
+</div>
+
+## NextTrace Lite
+
+一款追求轻量的开源可视化路由跟踪工具，使用 Golang 开发。
+
+NextTrace 一共有2个版本，专注于轻量的 Lite 版本以及更面向发烧友的 [Enhanced 版本](#nexttrace-enhanced)。
+
+PS: Lite 版本追求轻量化，并不提供基于高德地图 / OpenStreetMap 的路由可视化功能，如有需要，请使用 Enhanced 版本。
+
+## How To Use
+
+### Automated Install
+
+```bash
+# Linux 一键安装脚本
+bash <(curl -Ls https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh)
+
+# GHPROXY 镜像（国内使用）
+bash <(curl -Ls https://ghproxy.com/https://raw.githubusercontent.com/xgadget-lab/nexttrace/main/nt_install.sh)
+
+# macOS brew 安装命令
+brew tap xgadget-lab/nexttrace && brew install nexttrace
+```
+
+- `Release`里面为很多系统以及不同架构提供了编译好的二进制可执行文件，如果没有可以自行编译。
+- 一些本项目的必要依赖在`Windows`上`Golang`底层实现不完全，所以目前`NextTrace`在`Windows`平台不可用。
+
+### Get Started
+
+`NextTrace` 默认使用`ICMP`协议发起`TraceRoute`请求，该协议同时支持`IPv4`和`IPv6`
+
+```bash
+# IPv4 ICMP Trace
+nexttrace 1.0.0.1
+
+# 表格打印（一次性输出全部跳数，需等待20-40秒）
+nexttrace -table 1.0.0.1
+
+# IPv6 ICMP Trace
+nexttrace 2606:4700:4700::1111
+```
+
+`NextTrace` 现已经支持快速测试，有一次性测试回程路由需求的朋友可以使用
+
+```bash
+# 北上广（电信+联通+移动+教育网）IPv4 ICMP 快速测试
+nexttrace -f
+
+# 也可以使用 TCP SYN 而非 ICMP 进行测试
+nexttrace -f -T
+```
+
+`NextTrace` 也可以使用`TCP`和`UDP`协议发起`Traceroute`请求，不过目前只支持`IPv4`
+
+```bash
+# TCP SYN Trace
+nexttrace -T www.bing.com
+
+# 可以自行指定端口[此处为443]，默认80端口
+nexttrace -T -p 443 1.0.0.1
+
+# UDP Trace
+nexttrace -U 1.0.0.1
+
+nexttrace -U -p 53 1.0.0.1
+```
+
+`NextTrace`也同样支持一些进阶功能，如 TTL 控制、并发数控制、模式切换等
+
+```bash
+# 每一跳发送2个探测包
+nexttrace -q 2 www.hkix.net
+
+# 无并发，每次只发送一个探测包
+nexttrace -r 1 www.hkix.net
+
+# 从TTL为5开始发送探测包，直到TTL为10结束
+nexttrace -b 5 -m 10 www.decix.net
+
+# 关闭IP反向解析功能
+nexttrace -n www.bbix.net
+
+# 特色功能：打印Route-Path图
+# Route-Path图示例：
+# AS6453 塔塔通信「Singapore『Singapore』」
+#  ╭╯
+#  ╰AS9299 Philippine Long Distance Telephone Co.「Philippines『Metro Manila』」
+#  ╭╯
+#  ╰AS36776 Five9 Inc.「Philippines『Metro Manila』」
+#  ╭╯
+#  ╰AS37963 阿里云「ALIDNS.COM『ALIDNS.COM』」
+nexttrace -report www.time.com.my
+```
+
+`NextTrace`支持用户自主选择 IP 数据库（目前支持：`LeoMoeAPI`, `IP.SB`, `IPInfo`, `IPInsight`, `IPAPI.com`）
+
+```bash
+# 可以自行指定IP数据库[此处为IP.SB]，不指定则默认为LeoMoeAPI
+nexttrace -d IP.SB
+## 特别的：其中 ipinfo API 需要从ipinfo自行购买服务，如有需要可以clone本项目添加其提供的token自行编译
+##        TOKEN填写路径：ipgeo/tokens.go
+## 另外：由于IP.SB被滥用比较严重，会经常出现无法查询的问题，请知悉。
+##      IPAPI.com限制调用较为严格，如有查询不到的情况，请几分钟后再试。
+```
+
+`NextTrace`支持参数混合使用
+
+```bash
+Example:
+nexttrace -d IPInsight -m 20 -p 443 -q 5 -r 20 -rdns 1.1.1.1
+nexttrace -T -q 2 -r 1 -table -report 2001:4860:4860::8888
+```
+
+### IP 数据库
+
+✨NextTrace `LeoMoeAPI` 的后端也开源啦
+
+[GitHub - sjlleo/nexttrace-backend: NextTrace BackEnd](https://github.com/sjlleo/nexttrace-backend)
+
+NextTrace 所有的的 IP 地理位置`API DEMO`可以参考[这里](https://github.com/xgadget-lab/nexttrace/blob/main/ipgeo/)
+
+### 全部用法详见 Usage 菜单
+
+```shell
+Usage of nexttrace:
+      'nexttrace [options] <hostname>' or 'nexttrace <hostname> [option...]'
+Options:
+  -T    Use TCP SYN for tracerouting (default port is 80)
+  -U    Use UDP Package for tracerouting (default port is 53 in UDP)
+  -V    Print Version
+  -b int
+        Set The Begin TTL (default 1)
+  -d string
+        Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight, IPAPI.com] (default "LeoMoeAPI")
+  -f    One-Key Fast Traceroute
+  -m int
+        Set the max number of hops (max TTL to be reached). (default 30)
+  -n    Disable IP Reverse DNS lookup
+  -p int
+        Set SYN Traceroute Port (default 80)
+  -q int
+        Set the number of probes per each hop. (default 3)
+  -r int
+        Set ParallelRequests number. It should be 1 when there is a multi-routing. (default 18)
+  -report
+        Route Path
+  -table
+        Output trace results as table
+```
+
+## 项目截图
+
+![NextTrace Screenshot](asset/screenshot.png)  
+
+## NextTrace Enhanced
+
+`NextTrace Enhanced` 是面向发烧友的增强版，`Enhanced`提供Web API形式的路由跟踪调用，以及一个简单的自带可视化的Looking Glass网页。
+
+`Enhanced` 版本支持很多`lite`版本没有的功能，如能够自定义设置超时时间，也能指定TTL作为起点进行路由跟踪等，对于普通用户来说，通常`lite`版本已经足够完成大部分需要。
+
+https://github.com/OwO-Network/nexttrace-enhanced
+
+## FAQ 常见问题
+
+如果你在安装或者使用的时候遇到了问题，我们建议你不要把新建一个 `issue` 作为首选项
+
+以下是我们推荐的排错流程：
+
+1. 查看是否为常见问题 -> [前往 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. 疑似 BUG、或者功能建议 -> [前往 Github Issues](https://github.com/xgadget-lab/nexttrace/issues)
+
+## Thanks
+
+[Vincent Young](https://github.com/missuo) (i@yyt.moe)
+
+[Sam Sam](https://github.com/samleong123) (samsam123@samsam123.name.my)
+
+[tsosunchia](https://github.com/tsosunchia)
+
+[waiting4new](https://github.com/waiting4new)
+
+[FFEE_CO](https://github.com/fkx4-p)
+
+## IP Database Copyright
+
+### IPv4 Database
+
+#### China
+
+| ISP      | 类型  | 数据源   | 占比  |
+|:--------:|:---:|:-----:|:---:|
+| 电信/联通/移动 | 骨干网 | 网络爱好者 | 10% |
+| 电信/联通/移动 | 城域网 | 埃文科技  | 90% |
+
+- 参与骨干网维护的朋友都是网络爱好者群体，尽管我们多名志愿者通过自己的网络进行了大量的勘测，但是由于信息不足，依旧存在很多错误。
+- 对于更高精度的朋友，我们依旧强烈推荐IPIP.NET，他们开发的Besttrace是目前质量最好的路由可视化软件，我们多数爱好者能有今天这样的骨干网初步认知都是归功于他们，在此特表感谢。
+
+#### WorldWide
+
+##### Tier 01
+
+| ISP     | 类型  | 数据源       | 占比  |
+|:-------:|:---:|:---------:|:---:|
+| Tier-01 | 骨干网 | IPInfo    | 2%  |
+| Tier-01 | 骨干网 | 埃文科技      | 3%  |
+| Tier-01 | 骨干网 | IPInSight | 5%  |
+| Tier-01 | 城域网 | IPInSight | 90% |
+
+##### Other ISP
+
+| ISP    | 类型  | 数据源       | 占比  |
+|:------:|:---:|:---------:|:---:|
+| Others | 骨干网 | IPInSight | 5%  |
+| Others | 城域网 | IPInSight | 95% |
+
+### IPv6 Database
+
+| ISP | 类型  | 数据源              | 占比   |
+|:---:|:---:|:----------------:|:----:|
+| All | 全部  | IP2Location Lite | 100% |
+
+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 数据错误，也请直接联系他们纠错。
--- a/_config.yml
+++ b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
--- a/asset/screenshot.png
+++ b/asset/screenshot.png
--- a/fast_trace/basic.go
+++ b/fast_trace/basic.go
@@ -0,0 +1,152 @@
+package fastTrace
+
+type AllLocationCollection struct {
+	Beijing   BackBoneCollection
+	Shanghai  BackBoneCollection
+	Guangzhou BackBoneCollection
+	Hangzhou  BackBoneCollection
+	Hefei     BackBoneCollection
+	Changsha  BackBoneCollection
+}
+
+type BackBoneCollection struct {
+	Location string
+	CT163    ISPCollection
+	CTCN2    ISPCollection
+	CU169    ISPCollection
+	CU9929   ISPCollection
+	CM       ISPCollection
+	EDU      ISPCollection
+	CST      ISPCollection
+}
+
+type ISPCollection struct {
+	ISPName string
+	IP      string
+}
+
+const (
+	CT163  string = "电信 163 AS4134"
+	CTCN2  string = "电信 CN2 AS4809"
+	CU169  string = "联通 169 AS4837"
+	CU9929 string = "联通 A网 AS9929"
+	CM     string = "移动 骨干网 AS9808"
+	EDU    string = "教育网 CERNET AS4538"
+)
+
+var TestIPsCollection = AllLocationCollection{
+	Beijing:   Beijing,
+	Shanghai:  Shanghai,
+	Guangzhou: Guangzhou,
+	Hangzhou:  Hangzhou,
+	Hefei:     Hefei,
+}
+
+var Beijing = BackBoneCollection{
+	Location: "北京",
+	CT163: ISPCollection{
+		ISPName: CT163,
+		IP:      "106.37.67.1",
+	},
+
+	CU169: ISPCollection{
+		ISPName: CU169,
+		IP:      "123.125.96.156",
+	},
+
+	CM: ISPCollection{
+		ISPName: CM,
+		IP:      "211.136.25.153",
+	},
+
+	EDU: ISPCollection{
+		ISPName: EDU,
+		IP:      "101.6.15.130",
+	},
+}
+
+var Shanghai = BackBoneCollection{
+	Location: "上海",
+	CT163: ISPCollection{
+		ISPName: CT163,
+		IP:      "101.226.28.198",
+	},
+
+	CTCN2: ISPCollection{
+		ISPName: CTCN2,
+		IP:      "58.32.4.1",
+	},
+
+	CU169: ISPCollection{
+		ISPName: CU169,
+		IP:      "139.226.206.150",
+	},
+
+	CU9929: ISPCollection{
+		ISPName: CU9929,
+		IP:      "210.13.86.1",
+	},
+
+	CM: ISPCollection{
+		ISPName: CM,
+		IP:      "120.204.34.85",
+	},
+
+	EDU: ISPCollection{
+		ISPName: EDU,
+		IP:      "202.120.58.155",
+	},
+}
+
+var Guangzhou = BackBoneCollection{
+	Location: "广州",
+	CT163: ISPCollection{
+		ISPName: CT163,
+		IP:      "106.37.67.1",
+	},
+
+	CU169: ISPCollection{
+		ISPName: CU169,
+		IP:      "157.18.0.22",
+	},
+
+	CM: ISPCollection{
+		ISPName: CM,
+		IP:      "120.198.26.254",
+	},
+}
+
+var Hangzhou = BackBoneCollection{
+	Location: "杭州",
+	CT163: ISPCollection{
+		ISPName: CT163,
+		IP:      "61.164.23.196",
+	},
+	CU169: ISPCollection{
+		ISPName: CU169,
+		IP:      "60.12.244.1",
+	},
+	CM: ISPCollection{
+		ISPName: CM,
+		IP:      "112.17.224.98",
+	},
+	// 浙江大学 教育网
+	EDU: ISPCollection{
+		ISPName: EDU,
+		IP:      "210.32.2.1",
+	},
+}
+
+var Hefei = BackBoneCollection{
+	Location: "合肥",
+	// 中国科学技术大学 教育网
+	EDU: ISPCollection{
+		ISPName: EDU,
+		IP:      "202.38.64.1",
+	},
+	// 中国科学技术大学 科技网
+	CST: ISPCollection{
+		ISPName: "中国科学技术大学 科技网 AS7497",
+		IP:      "210.72.22.2",
+	},
+}
--- a/fast_trace/fast_trace.go
+++ b/fast_trace/fast_trace.go
@@ -0,0 +1,134 @@
+package fastTrace
+
+import (
+	"fmt"
+	"log"
+	"net"
+	"os"
+	"os/signal"
+	"time"
+
+	"github.com/xgadget-lab/nexttrace/ipgeo"
+	"github.com/xgadget-lab/nexttrace/printer"
+	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/xgadget-lab/nexttrace/wshandle"
+)
+
+type FastTracer struct {
+	TracerouteMethod trace.Method
+}
+
+func (f *FastTracer) tracert(location string, ispCollection ISPCollection) {
+	fmt.Printf("%s『%s %s 』%s\n", printer.YELLOW_PREFIX, location, ispCollection.ISPName, printer.RESET_PREFIX)
+	fmt.Printf("traceroute to %s, 30 hops max, 32 byte packets\n", ispCollection.IP)
+	ip := net.ParseIP(ispCollection.IP)
+	var conf = trace.Config{
+		BeginHop:         1,
+		DestIP:           ip,
+		DestPort:         80,
+		MaxHops:          30,
+		NumMeasurements:  3,
+		ParallelRequests: 18,
+		RDns:             true,
+		IPGeoSource:      ipgeo.GetSource("LeoMoeAPI"),
+		Timeout:          1 * time.Second,
+	}
+
+	if f.TracerouteMethod == trace.ICMPTrace {
+		conf.RealtimePrinter = printer.RealtimePrinter
+	}
+
+	res, err := trace.Traceroute(f.TracerouteMethod, conf)
+
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	if f.TracerouteMethod == trace.TCPTrace {
+		printer.TracerouteTablePrinter(res)
+		// 单次测试结束阻塞 3 秒，仅阻塞 TCP
+		<-time.After(time.Second * 3)
+	}
+	println()
+}
+
+func (f *FastTracer) testAll() {
+	f.testCT()
+	println()
+	f.testCU()
+	println()
+	f.testCM()
+	println()
+	f.testEDU()
+}
+
+func (f *FastTracer) testCT() {
+	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CT163)
+	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CT163)
+	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CTCN2)
+	f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CT163)
+	f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CT163)
+}
+
+func (f *FastTracer) testCU() {
+	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CU169)
+	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CU169)
+	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CU9929)
+	f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CU169)
+	f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CU169)
+}
+
+func (f *FastTracer) testCM() {
+	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.CM)
+	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.CM)
+	f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.CM)
+	f.tracert(TestIPsCollection.Guangzhou.Location, TestIPsCollection.Guangzhou.CM)
+}
+
+func (f *FastTracer) testEDU() {
+	f.tracert(TestIPsCollection.Beijing.Location, TestIPsCollection.Beijing.EDU)
+	f.tracert(TestIPsCollection.Shanghai.Location, TestIPsCollection.Shanghai.EDU)
+	f.tracert(TestIPsCollection.Hangzhou.Location, TestIPsCollection.Hangzhou.EDU)
+	// 科技网暂时算在EDU里面，等拿到了足够多的数据再分离出去，单独用于测试
+	f.tracert(TestIPsCollection.Hefei.Location, TestIPsCollection.Hefei.CST)
+}
+
+func FastTest(tm bool) {
+	var c string
+
+	fmt.Println("您想测试哪些ISP的路由？\n1. 国内四网\n2. 电信\n3. 联通\n4. 移动\n5. 教育网")
+	fmt.Print("请选择选项：")
+	fmt.Scanln(&c)
+
+	ft := FastTracer{}
+
+	// 建立 WebSocket 连接
+	w := wshandle.New()
+	w.Interrupt = make(chan os.Signal, 1)
+	signal.Notify(w.Interrupt, os.Interrupt)
+	defer func() {
+		w.Conn.Close()
+	}()
+
+	if !tm {
+		ft.TracerouteMethod = trace.ICMPTrace
+		fmt.Println("您将默认使用ICMP协议进行路由跟踪，如果您想使用TCP SYN进行路由跟踪，可以加入 -T 参数")
+	} else {
+		ft.TracerouteMethod = trace.TCPTrace
+	}
+
+	switch c {
+	case "1":
+		ft.testAll()
+	case "2":
+		ft.testCT()
+	case "3":
+		ft.testCU()
+	case "4":
+		ft.testCM()
+	case "5":
+		ft.testEDU()
+	default:
+		ft.testAll()
+	}
+}
--- a/fast_trace/fast_trace_test.go
+++ b/fast_trace/fast_trace_test.go
@@ -0,0 +1,25 @@
+package fastTrace
+
+import (
+	"os"
+	"os/signal"
+	"testing"
+
+	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/xgadget-lab/nexttrace/wshandle"
+)
+
+// ICMP Use Too Many Time to Wait So we don't test it.
+func TestTCPTrace(t *testing.T) {
+	ft := FastTracer{}
+	// 建立 WebSocket 连接
+	w := wshandle.New()
+	w.Interrupt = make(chan os.Signal, 1)
+	signal.Notify(w.Interrupt, os.Interrupt)
+	defer func() {
+		w.Conn.Close()
+	}()
+	ft.TracerouteMethod = trace.TCPTrace
+	ft.testCM()
+	ft.testEDU()
+}
--- a/go.mod
+++ b/go.mod
@@ -11,12 +11,12 @@ require (
 require (
 	github.com/mattn/go-colorable v0.1.9 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/panjf2000/ants/v2 v2.5.0 // indirect
 )

 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.13.0
+	github.com/gorilla/websocket v1.5.0
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rodaine/table v1.0.1
 	github.com/stretchr/testify v1.7.1
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,3 @@
-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=
@@ -6,6 +5,8 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
 github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
+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/mattn/go-colorable v0.1.9 h1:sqDoxXbdeALODt0DAeJCVp38ps9ZogZEAXjus69YV3U=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
@@ -13,8 +14,6 @@ github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/panjf2000/ants/v2 v2.5.0 h1:1rWGWSnxCsQBga+nQbA4/iY6VMeNoOIAM0ZWh9u3q2Q=
-github.com/panjf2000/ants/v2 v2.5.0/go.mod h1:cU93usDlihJZ5CfRGNDYsiBYvoilLvBF5Qp/BT2GNRE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rodaine/table v1.0.1 h1:U/VwCnUxlVYxw8+NJiLIuCxA/xa6jL38MY3FYysVWWQ=
@@ -52,7 +51,6 @@ golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapK
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 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=
--- a/ipgeo/ipapicom.go
+++ b/ipgeo/ipapicom.go
@@ -0,0 +1,43 @@
+package ipgeo
+
+import (
+	"errors"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"regexp"
+	"time"
+
+	"github.com/tidwall/gjson"
+)
+
+func IPApiCom(ip string) (*IPGeoData, error) {
+	url := "http://ip-api.com/json/" + ip + "?fields=status,message,country,regionName,city,isp,as"
+	client := &http.Client{
+		// 2 秒超时
+		Timeout: 2 * time.Second,
+	}
+	req, _ := http.NewRequest("GET", url, nil)
+	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 {
+		log.Println("ip-api.com 请求超时(2s)，请切换其他API使用")
+		return nil, err
+	}
+	body, _ := ioutil.ReadAll(content.Body)
+	res := gjson.ParseBytes(body)
+
+	if res.Get("status").String() != "success" {
+		return &IPGeoData{}, errors.New("超过API阈值")
+	}
+
+	re := regexp.MustCompile("[0-9]+")
+
+	return &IPGeoData{
+		Asnumber: re.FindString(res.Get("as").String()),
+		Country:  res.Get("country").String(),
+		City:     res.Get("city").String(),
+		Prov:     res.Get("regionName").String(),
+		Isp:      res.Get("isp").String(),
+	}, nil
+}
--- a/ipgeo/ipgeo.go
+++ b/ipgeo/ipgeo.go
@@ -24,7 +24,11 @@ func GetSource(s string) Source {
 		return IPSB
 	case "IPINSIGHT":
 		return IPInSight
+	case "IPAPI.COM":
+		return IPApiCom
+	case "IPINFO":
+		return IPInfo
 	default:
-		return nil
+		return LeoIP
 	}
 }
--- a/ipgeo/ipgeo_test.go
+++ b/ipgeo/ipgeo_test.go
@@ -1,43 +1,52 @@
 package ipgeo

-import (
-	"testing"
+// import (
+// 	"testing"

-	"github.com/stretchr/testify/assert"
-)
+// 	"github.com/stretchr/testify/assert"
+// )

-func TestLeoIP(t *testing.T) {
-	res, err := LeoIP("1.1.1.1")
-	assert.Nil(t, err)
-	assert.NotNil(t, res)
-	assert.NotEmpty(t, res.Asnumber)
-	assert.NotEmpty(t, res.Isp)
-}
+// func TestLeoIP(t *testing.T) {
+// 	// res, err := LeoIP("1.1.1.1")
+// 	// assert.Nil(t, err)
+// 	// assert.NotNil(t, res)
+// 	// assert.NotEmpty(t, res.Asnumber)
+// 	// assert.NotEmpty(t, res.Isp)
+// }

-func TestIPSB(t *testing.T) {
-	// 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 TestIPSB(t *testing.T) {
+// 	// 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) {
-	res, err := IPInfo("1.1.1.1")
-	assert.Nil(t, err)
-	assert.NotNil(t, res)
-	assert.NotEmpty(t, res.Country)
-	assert.NotEmpty(t, res.City)
-	assert.NotEmpty(t, res.Prov)
-}
+// func TestIPInfo(t *testing.T) {
+// 	res, err := IPInfo("1.1.1.1")
+// 	assert.Nil(t, err)
+// 	assert.NotNil(t, res)
+// 	// assert.NotEmpty(t, res.Country)
+// 	assert.NotEmpty(t, res.City)
+// 	assert.NotEmpty(t, res.Prov)
+// }

-func TestIPInSight(t *testing.T) {
-	res, err := IPInSight("1.1.1.1")
-	assert.Nil(t, err)
-	assert.NotNil(t, res)
-	assert.NotEmpty(t, res.Country)
-	assert.NotEmpty(t, res.Prov)
-	// 这个库有时候不提供城市信息，返回值为""
-	//assert.NotEmpty(t, res.City)
-}
+// func TestIPInSight(t *testing.T) {
+// 	// res, err := IPInSight("1.1.1.1")
+// 	// assert.Nil(t, err)
+// 	// assert.NotNil(t, res)
+// 	// assert.NotEmpty(t, res.Country)
+// 	// assert.NotEmpty(t, res.Prov)
+// 	// 这个库有时候不提供城市信息，返回值为""
+// 	//assert.NotEmpty(t, res.City)
+// }
+
+// func TestIPApiCom(t *testing.T) {
+// 	res, err := IPApiCom("1.1.1.1")
+// 	assert.Nil(t, err)
+// 	assert.NotNil(t, res)
+// 	assert.NotEmpty(t, res.Country)
+// 	assert.NotEmpty(t, res.City)
+// 	assert.NotEmpty(t, res.Prov)
+// }
--- a/ipgeo/ipinfo.go
+++ b/ipgeo/ipinfo.go
@@ -8,7 +8,6 @@ import (
 )

 func IPInfo(ip string) (*IPGeoData, error) {
-
 	resp, err := http.Get("https://ipinfo.io/" + ip + "?token=" + token.ipinfo)
 	if err != nil {
 		return nil, err
@@ -21,9 +20,17 @@ func IPInfo(ip string) (*IPGeoData, error) {

 	res := gjson.ParseBytes(body)

+	var country string
+
+	if res.Get("country").String() == "HK" || res.Get("country").String() == "TW" {
+		country = "CN"
+	}
+
 	return &IPGeoData{
-		Country: res.Get("country").String(),
-		City:    res.Get("city").String(),
-		Prov:    res.Get("region").String(),
+		Asnumber: res.Get("asn").Get("asn").String(),
+		Country:  country,
+		City:     res.Get("city").String(),
+		Prov:     res.Get("region").String(),
+		Isp:      res.Get("asn").Get("domain").String(),
 	}, nil
 }
--- a/ipgeo/leo.go
+++ b/ipgeo/leo.go
@@ -1,31 +1,92 @@
 package ipgeo

 import (
-	"io/ioutil"
-	"net/http"
+	"errors"
+	"sync"
+	"time"

 	"github.com/tidwall/gjson"
+	"github.com/xgadget-lab/nexttrace/wshandle"
 )

-func LeoIP(ip string) (*IPGeoData, error) {
-	resp, err := http.Get("https://api.leo.moe/ip/?ip=" + ip + "&token=" + token.ipleo)
-	if err != nil {
-		return nil, err
+/***
+ * 原理介绍 By Leo
+ * WebSocket 一共开启了一个发送和一个接收协程，在 New 了一个连接的实例对象后，不给予关闭，持续化连接
+ * 当有新的IP请求时，一直在等待IP数据的发送协程接收到从 leo.go 的 sendIPRequest 函数发来的IP数据，向服务端发送数据
+ * 由于实际使用时有大量并发，但是 ws 在同一时刻每次有且只能处理一次发送一条数据，所以必须给 ws 连接上互斥锁，保证每次只有一个协程访问
+ * 运作模型可以理解为一个 Node 一直在等待数据，当获得一个新的任务后，转交给下一个协程，不再关注这个 Node 的下一步处理过程，并且回到空闲状态继续等待新的任务
+***/
+
+// IP 查询池 map - ip - ip channel
+type IPPool struct {
+	pool    map[string]chan IPGeoData
+	poolMux sync.Mutex
+}
+
+var IPPools = IPPool{
+	pool: make(map[string]chan IPGeoData),
+}
+
+func sendIPRequest(ip string) {
+	wsConn := wshandle.GetWsConn()
+	wsConn.MsgSendCh <- ip
+}
+
+func receiveParse() {
+	// 获得连接实例
+	wsConn := wshandle.GetWsConn()
+	// 防止多协程抢夺一个ws连接，导致死锁，当一个协程获得ws的控制权后上锁
+	wsConn.ConnMux.Lock()
+	// 函数退出时解锁，给其他协程使用
+	defer wsConn.ConnMux.Unlock()
+	for {
+		// 接收到了一条IP信息
+		data := <-wsConn.MsgReceiveCh
+
+		// json解析 -> data
+		res := gjson.Parse(data)
+		// 根据返回的IP信息，发送给对应等待回复的IP通道上
+		var domain string = res.Get("domain").String()
+
+		if res.Get("domain").String() == "" {
+			domain = res.Get("owner").String()
+		}
+
+		IPPools.pool[gjson.Parse(data).Get("ip").String()] <- IPGeoData{
+			Asnumber: res.Get("asnumber").String(),
+			Country:  res.Get("country").String(),
+			Prov:     res.Get("prov").String(),
+			City:     res.Get("city").String(),
+			District: res.Get("district").String(),
+			Owner:    domain,
+			Isp:      res.Get("isp").String(),
+		}
 	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
+}
+
+func LeoIP(ip string) (*IPGeoData, error) {
+	// 初始化通道 - 向池子里添加IP的Channel，返回IP数据是通过字典中对应键为IP的Channel来获取的
+	IPPools.poolMux.Lock()
+	defer IPPools.poolMux.Unlock()
+	// 如果之前已经被别的协程初始化过了就不用初始化了
+	if IPPools.pool[ip] == nil {
+		IPPools.pool[ip] = make(chan IPGeoData)
+	}
+
+	// 发送请求
+	sendIPRequest(ip)
+	// 同步开启监听
+	go receiveParse()
+
+	// 拥塞，等待数据返回
+	select {
+	case res := <-IPPools.pool[ip]:
+		return &res, nil
+	// 5秒后依旧没有接收到返回的IP数据，不再等待，超时异常处理
+	case <-time.After(5 * time.Second):
+		// default:
+		// 这里不可以返回一个 nil，否则在访问对象内部的键值的时候会报空指针的 Fatal Error
+		return &IPGeoData{}, errors.New("TimeOut")
 	}

-	res := gjson.ParseBytes(body)
-	return &IPGeoData{
-		Asnumber: res.Get("asnumber").String(),
-		Country:  res.Get("country").String(),
-		Prov:     res.Get("prov").String(),
-		City:     res.Get("city").String(),
-		District: res.Get("district").String(),
-		Owner:    res.Get("owner").String(),
-		Isp:      res.Get("isp").String(),
-	}, nil
 }
--- a/main.go
+++ b/main.go
@@ -4,41 +4,74 @@ import (
 	"flag"
 	"fmt"
 	"log"
+	"net"
 	"os"
+	"os/signal"
+	"strings"
 	"time"

+	fastTrace "github.com/xgadget-lab/nexttrace/fast_trace"
 	"github.com/xgadget-lab/nexttrace/ipgeo"
 	"github.com/xgadget-lab/nexttrace/printer"
 	"github.com/xgadget-lab/nexttrace/reporter"
 	"github.com/xgadget-lab/nexttrace/trace"
 	"github.com/xgadget-lab/nexttrace/util"
+	"github.com/xgadget-lab/nexttrace/wshandle"
 )

-var tcpSYNFlag = flag.Bool("T", false, "Use TCP SYN for tracerouting (default port is 80)")
-var udpPackageFlag = flag.Bool("U", false, "Use UDP Package for tracerouting (default port is 53 in UDP)")
-var port = flag.Int("p", 80, "Set SYN Traceroute Port")
-var numMeasurements = flag.Int("q", 3, "Set the number of probes per each hop.")
-var parallelRequests = flag.Int("r", 18, "Set ParallelRequests number. It should be 1 when there is a multi-routing.")
-var maxHops = flag.Int("m", 30, "Set the max number of hops (max TTL to be reached).")
-var dataOrigin = flag.String("d", "LeoMoeAPI", "Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight]")
-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")
+var fSet = flag.NewFlagSet("", flag.ExitOnError)
+var fastTest = fSet.Bool("f", false, "One-Key Fast Traceroute")
+var tcpSYNFlag = fSet.Bool("T", false, "Use TCP SYN for tracerouting (default port is 80)")
+var udpPackageFlag = fSet.Bool("U", false, "Use UDP Package for tracerouting (default port is 53 in UDP)")
+var port = fSet.Int("p", 80, "Set SYN Traceroute Port")
+var numMeasurements = fSet.Int("q", 3, "Set the number of probes per each hop.")
+var parallelRequests = fSet.Int("r", 18, "Set ParallelRequests number. It should be 1 when there is a multi-routing.")
+var maxHops = fSet.Int("m", 30, "Set the max number of hops (max TTL to be reached).")
+var dataOrigin = fSet.String("d", "LeoMoeAPI", "Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight, IPAPI.com]")
+var noRdns = fSet.Bool("n", false, "Disable IP Reverse DNS lookup")
+var routePath = fSet.Bool("report", false, "Route Path")
+var tablePrint = fSet.Bool("table", false, "Output trace results as table")
+var beginHop = fSet.Int("b", 1, "Set The Begin TTL")
+var ver = fSet.Bool("V", false, "Print Version")
+
+func printArgHelp() {
+	fmt.Println("\nArgs Error\nUsage : 'nexttrace [option...] HOSTNAME' or 'nexttrace HOSTNAME [option...]'\nOPTIONS: [-VTU] [-d DATAORIGIN.STR ] [ -m TTL ] [ -p PORT ] [ -q PROBES.COUNT ] [ -r PARALLELREQUESTS.COUNT ] [-rdns] [ -table ] -report")
+	fSet.PrintDefaults()
+	os.Exit(2)
+}

 func flagApply() string {
-	flag.Parse()
 	printer.Version()
+
+	target := ""
+	if len(os.Args) < 2 {
+		printArgHelp()
+	}
+
+	// flag parse
+	if !strings.HasPrefix(os.Args[1], "-") {
+		target = os.Args[1]
+		fSet.Parse(os.Args[2:])
+	} else {
+		fSet.Parse(os.Args[1:])
+		target = fSet.Arg(0)
+	}
+
+	// Print 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>")
-		os.Exit(2)
+
+	// -f Fast Test
+	if *fastTest {
+		fastTrace.FastTest(*tcpSYNFlag)
+		os.Exit(0)
 	}
-	return ipArg[0]
+
+	if target == "" {
+		printArgHelp()
+	}
+	return target
 }

 func main() {
@@ -49,7 +82,23 @@ func main() {
 		log.Fatalln("Traceroute requires root/sudo privileges.")
 	}

-	ip := util.DomainLookUp(domain)
+	var ip net.IP
+
+	if *tcpSYNFlag || *udpPackageFlag {
+		ip = util.DomainLookUp(domain, true)
+	} else {
+		ip = util.DomainLookUp(domain, false)
+	}
+
+	if strings.ToUpper(*dataOrigin) == "LEOMOEAPI" {
+		w := wshandle.New()
+		w.Interrupt = make(chan os.Signal, 1)
+		signal.Notify(w.Interrupt, os.Interrupt)
+		defer func() {
+			w.Conn.Close()
+		}()
+	}
+
 	printer.PrintTraceRouteNav(ip, domain, *dataOrigin)

 	var m trace.Method = ""
@@ -68,17 +117,18 @@ func main() {
 	}

 	var conf = trace.Config{
+		BeginHop:         *beginHop,
 		DestIP:           ip,
 		DestPort:         *port,
 		MaxHops:          *maxHops,
 		NumMeasurements:  *numMeasurements,
 		ParallelRequests: *parallelRequests,
-		RDns:             *rdnsenable,
+		RDns:             !*noRdns,
 		IPGeoSource:      ipgeo.GetSource(*dataOrigin),
-		Timeout:          2 * time.Second,
+		Timeout:          1 * time.Second,
 	}

-	if m == trace.ICMPTrace && !*tablePrint {
+	if !*tablePrint {
 		conf.RealtimePrinter = printer.RealtimePrinter
 	}

@@ -88,25 +138,12 @@ func main() {
 		log.Fatalln(err)
 	}

-	if *routePath {
-		// 如果为TCP SYN，也打印路由跟踪结果
-		if *tcpSYNFlag {
-			printer.TracerouteTablePrinter(res)
-		}
-		r := reporter.New(res, ip.String())
-		r.Print()
-		return
-	}
-
-	if m == trace.ICMPTrace && *tablePrint {
+	if *tablePrint {
 		printer.TracerouteTablePrinter(res)
 	}

-	if m == trace.TCPTrace || m == trace.UDPTrace {
-		if *realtimePrint {
-			printer.TraceroutePrinter(res)
-		} else {
-			printer.TracerouteTablePrinter(res)
-		}
+	if *routePath {
+		r := reporter.New(res, ip.String())
+		r.Print()
 	}
 }
--- a/nt_install.sh
+++ b/nt_install.sh
@@ -1,265 +1,123 @@
 #!/bin/bash

-auto=False
-#是否忽略一切警告，按默认执行
-if [[ $1 == "--auto" ]]; then
-    auto=True
-fi
-
-usrPath="/usr/local/bin"
-
-function red(){
-    echo -e "\e[1;31m$1\e[0m"
-}
+Green_font="\033[32m"
+Yellow_font="\033[33m"
+Red_font="\033[31m"
+Font_suffix="\033[0m"
+Info="${Green_font}[Info]${Font_suffix}"
+Error="${Red_font}[Error]${Font_suffix}"
+Tips="${Green_font}[Tips]${Font_suffix}"
+Temp_path="/var/tmp/nexttrace"

 checkRootPermit() {
-    [[ $EUID -ne 0 ]] && red "请使用sudo/root权限运行本脚本" && exit 1
-}
-ask_if()
-{
-    local choice=""
-    while [ "$choice" != "y" ] && [ "$choice" != "n" ]
-    do
-        echo -e "${Info} $1"
-        read choice
-    done
-    [ $choice == y ] && return 0
-    return 1
-}
-#检查脚本更新
-check_script_update()
-{
-    [ "$(md5sum "${BASH_SOURCE[0]}" | awk '{print $1}')" == "$(md5sum <(curl -sL "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh") | awk '{print $1}')" ] && return 1 || return 0
-}
-#更新脚本
-update_script()
-{
-    if curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh" || curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/nt_install.sh"; then
-        echo -e "${Info} 脚本更新完成，正在重启脚本..."
-        exec bash ${BASH_SOURCE[0]}
-    else
-        echo -e "${Info} 更新脚本失败！"
-        exit 1
-    fi
-}
-ask_update_script()
-{
-    if check_script_update; then
-        echo -e "${Info} 脚本可升级"
-        [[ $auto == True ]] && update_script
-        ask_if "是否升级脚本？(y/n)" && update_script
-    else
-        echo -e "${Info} 脚本已经是最新版本"
-    fi
+    [[ $EUID -ne 0 ]] && echo -e "${Error} 请使用sudo/root权限运行本脚本" && exit 1
 }
+
 checkSystemArch() {
    arch=$(uname -m)
-    case $arch in
-      'x86_64')
-        archParam='amd64'
-        ;;
-      'mips')
-        archParam='mips'
-        ;;
-      'arm64'|'aarch64')
-        archParam="arm64"
-        ;;
-      *)
-        red "未知的系统架构，请联系开发者."
-        exit 1
-        ;;
-    esac
+    if [[ $arch == "x86_64" ]]; then
+    archParam="amd64"
+    fi
+
+    if [[ $arch == "aarch64" ]]; then
+    archParam="arm64"
+    fi
 }

 checkSystemDistribution() {
    case "$OSTYPE" in
-    darwin*)
-        osDistribution="darwin"
-        downPath="/var/tmp/nexttrace"
-        ;;
-    linux*)
-        osDistribution="linux"
-        downPath="/var/tmp/nexttrace"
-        ;;
+    linux*)   
+    osDistribution="linux"
+    downPath="/usr/local/bin/nexttrace"
+    ;;
    *)
-        red "unknown: $OSTYPE"
-        exit 1
-        ;;
+    echo "unknown: $OSTYPE"
+    exit 1
+    ;;
    esac
 }

 getLocation() {
-    red "正在获取地理位置信息..."
    countryCode=$(curl -s "http://ip-api.com/line/?fields=countryCode")
 }

-checkPackageManger() {
-    if [[ "$(which brew)" ]]; then #务必将brew置于第一位,macOS的apt是假的
-    brew update
-      PACKAGE_MANAGEMENT_INSTALL='brew install'
-      PACKAGE_MANAGEMENT_REMOVE='brew uninstall'
-    elif [[ "$(which apt)" ]]; then
-       apt-get update
-      PACKAGE_MANAGEMENT_INSTALL='apt-get -y --no-install-recommends install'
-      PACKAGE_MANAGEMENT_REMOVE='apt-get purge'
-    elif [[ "$(which dnf)" ]]; then
-    dnf check-update
-      PACKAGE_MANAGEMENT_INSTALL='dnf -y install'
-      PACKAGE_MANAGEMENT_REMOVE='dnf remove'
-    elif [[ "$(which yum)" ]]; then
-      PACKAGE_MANAGEMENT_INSTALL='yum -y install'
-      PACKAGE_MANAGEMENT_REMOVE='yum remove'
-    elif [[ "$(which zypper)" ]]; then
-    zypper refresh
-      PACKAGE_MANAGEMENT_INSTALL='zypper install -y --no-recommends'
-      PACKAGE_MANAGEMENT_REMOVE='zypper remove'
-    elif [[ "$(which pacman)" ]]; then
-      PACKAGE_MANAGEMENT_INSTALL='pacman -Syu --noconfirm'
-      PACKAGE_MANAGEMENT_REMOVE='pacman -Rsn'
-    else
-      red "error: The script does not support the package manager in this operating system."
-      exit 1
+installWgetPackage() {
+    echo -e "${Info} wget 正在安装中..."
+    # try apt
+    apt -h &> /dev/null
+    if [ $? -eq 0 ]; then
+    # 先更新一下数据源，有些机器数据源比较老可能会404
+    apt update -y &> /dev/null
+    apt install wget -y &> /dev/null
    fi
+
+    # try yum
+    yum -h &> /dev/null
+    if [ $? -eq 0 ]; then
+    yum install wget -y &> /dev/null
+    fi
+
+    # try dnf
+    dnf -h &> /dev/null
+    if [ $? -eq 0 ]; then
+    dnf install wget -y &> /dev/null
+    fi
+
+    # try pacman
+    pacman -h &> /dev/null
+    if [ $? -eq 0 ]; then
+    pacman -Sy
+    pacman -S wget
+    fi
+
 }

-install_software() {
-  package_name="$1"
-  which "$package_name" > /dev/null 2>&1 && return
-  red "${package_name} 正在安装中...(此步骤时间可能较长，请耐心等待)"
-  if ${PACKAGE_MANAGEMENT_INSTALL} "$package_name"; then
-    red "info: $package_name is installed."
-  else
-    red "error: Installation of $package_name failed, please check your network."
-    exit 1
-  fi
-}
-
-checkVersion() {
-    nexttrace -h &>/dev/null
+checkWgetPackage() {
+    wget -h &> /dev/null
    if [ $? -ne 0 ]; then
-        return 0
+		installWgetPackage
    fi
-    red "正在检查版本..."
-    version=$(curl -sL https://api.github.com/repos/xgadget-lab/nexttrace/releases/latest | jq -r '.tag_name')
-    if [[ $version == "" ]]; then
-        red "获取版本失败，请检查网络连接"
-        exit 1
-    fi
-    currentVersion=$(nexttrace -V | head -n 1 | awk '{print $2}') &> /dev/null
-    if [[ $currentVersion == $version ]]; then
-        red "当前版本已是最新版本"
-        exit 0
-    fi
-    red 当前最新release版本：${version}
-    red 您当前的版本：${currentVersion}
-    if [[ $auto == True ]]; then
-        return 0
-    fi
-    read -r -p "是否更新软件? (y/n)" input
-    case $input in
-    [yY][eE][sS] | [yY])
-        return 0
-        ;;
-    [nN][oO] | [nN])
-        red "您选择了取消更新，脚本即将退出"
-        exit 1
-        ;;
-    *)
-        return 0
-        ;;
-    esac
 }

 downloadBinrayFile() {
-    red "正在获取最新版的 NextTrace 发行版文件信息..."
+    echo -e "${Info} 获取最新版的 NextTrace 发行版文件信息"
    # 简单说明一下，Github提供了一个API，可以获取最新发行版本的二进制文件下载地址（对应的是browser_download_url），根据刚刚测得的osDistribution、archParam，获取对应的下载地址
-        # red 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}
+    latestURL=$(curl -s https://api.github.com/repos/xgadget-lab/nexttrace/releases/latest | grep -i "browser_download_url.*${osDistribution}.*${archParam}" | awk -F '"' '{print $4}')
+    
    if [ "$countryCode" == "CN" ]; then
-        if [[ $auto == True ]]; then
-            latestURL="https://ghproxy.com/"$latestURL
-        else
-            read -r -p "检测到国内网络环境，是否使用镜像下载以加速(y/n)" input
-            case $input in
-            [yY][eE][sS] | [yY])
-                latestURL="https://ghproxy.com/"$latestURL
-                ;;
-
-            [nN][oO] | [nN])
-                red "您选择了不使用镜像，下载可能会变得异常缓慢，或者失败"
-                ;;
-
-            *)
-                latestURL="https://ghproxy.com/"$latestURL
-                ;;
-            esac
-        fi
+        echo -e "${Info} 检测到国内环境，正在使用镜像下载"
+        latestURL="https://ghproxy.com/"$latestURL
    fi
-
-    red "正在下载 NextTrace 二进制文件..."
-    wget -O ${downPath} ${latestURL} &>/dev/null
-    if [ $? -eq 0 ]; then
-        red "NextTrace 现在已经在您的系统中可用"
-        changeMode
-        mv ${downPath} ${usrPath}
+    
+    echo -e "${Info} 正在下载 NextTrace 二进制文件..."
+    wget -O ${Temp_path} ${latestURL} &> /dev/null
+    if [ $? -eq 0 ];
+    then
+    changeMode
+    mv ${Temp_path} ${downPath}
+    echo -e "${Info} NextTrace 现在已经在您的系统中可用"
    else
-        red "NextTrace 下载失败，请检查您的网络是否正常"
-        exit 1
+    echo -e "${Error} NextTrace 下载失败，请检查您的网络是否正常"
+    exit 1
    fi
 }

 changeMode() {
-    chmod +x ${downPath} &>/dev/null
-    [[ ${osDistribution} == "darwin" ]] && xattr -r -d com.apple.quarantine ${downPath}
+    chmod +x ${Temp_path} &> /dev/null
 }

 runBinrayFileHelp() {
-    if [ -e ${usrPath} ]; then
-        ${usrPath}/nexttrace -h
+    if [ -e ${downPath} ]; then
+    ${downPath} -V
+    echo -e "${Tips} 一切准备就绪！使用命令 nexttrace 1.1.1.1 开始您的第一次路由测试吧~ 更多进阶命令玩法可以用 nexttrace -h 查看哦\n       关于软件卸载，因为nexttrace是绿色版单文件，卸载只需输入命令 rm /usr/local/bin/nexttrace 即可"
    fi
-    red "You may need to execute a command to remove dependent software: $PACKAGE_MANAGEMENT_REMOVE wget jq"
-}
-
-addCronTask() {
-    if [[ $auto == True ]]; then
-        return 0
-    fi
-    read -r -p "是否添加自动更新任务？(y/n)" input
-    case $input in
-    [yY][eE][sS] | [yY])
-        if [[ ${osDistribution} == "darwin" ]]; then
-            crontab -l >crontab.bak 2>/dev/null
-            sed -i '' '/nt_install.sh/d' crontab.bak
-        elif [[ ${osDistribution} == "linux" ]]; then
-            crontab -l >crontab.bak 2>/dev/null
-            sed -i '/nt_install.sh/d' crontab.bak
-        else
-            red "暂不支持您的系统,无法自动添加crontab任务"
-            return 0
-        fi
-        echo "1 1 * * * $(dirname $(readlink -f "$0"))/nt_install.sh --auto >> /var/log/nt_install.log" >>crontab.bak
-        crontab crontab.bak
-        rm -f crontab.bak
-        ;;
-    [nN][oO] | [nN])
-        red "您选择了不添加自动更新任务，您也可以通过命令 再次执行此脚本 手动更新"
-        ;;
-    *)
-        red "您选择了不添加自动更新任务，您可以通过命令 再次执行此脚本 手动更新"
-        ;;
-    esac
 }

 # Check Procedure
 checkRootPermit
-ask_update_script
 checkSystemDistribution
 checkSystemArch
-checkPackageManger
-install_software wget
-install_software jq
-checkVersion
+checkWgetPackage

 # Download Procedure
 getLocation
@@ -267,4 +125,3 @@ downloadBinrayFile

 # Run Procedure
 runBinrayFileHelp
-addCronTask
--- a/printer/printer.go
+++ b/printer/printer.go
@@ -9,18 +9,27 @@ import (
 	"github.com/xgadget-lab/nexttrace/ipgeo"
 )

-var dataOrigin string
+// var dataOrigin string

-func TraceroutePrinter(res *trace.Result) {
-	for i, hop := range res.Hops {
-		fmt.Print(i + 1)
-		for _, h := range hop {
-			HopPrinter(h)
-		}
-	}
-}
+// func TraceroutePrinter(res *trace.Result) {
+// 	for i, hop := range res.Hops {
+// 		fmt.Print(i + 1)
+// 		for _, h := range hop {
+// 			HopPrinter(h)
+// 		}
+// 	}
+// }

-func HopPrinter(h trace.Hop) {
+const (
+	RED_PREFIX    = "\033[1;31m"
+	GREEN_PREFIX  = "\033[1;32m"
+	YELLOW_PREFIX = "\033[1;33m"
+	BLUE_PREFIX   = "\033[1;34m"
+	CYAN_PREFIX   = "\033[1;36m"
+	RESET_PREFIX  = "\033[0m"
+)
+
+func HopPrinter(h trace.Hop, info HopInfo) {
 	if h.Address == nil {
 		fmt.Println("\t*")
 	} else {
@@ -35,8 +44,22 @@ func HopPrinter(h trace.Hop) {
 		if h.Geo != nil {
 			txt += " " + formatIpGeoData(h.Address.String(), h.Geo)
 		}
+		switch info {
+		case IXP:
+			fmt.Print(CYAN_PREFIX)
+		case PoP:
+			fmt.Print(CYAN_PREFIX)
+		case Peer:
+			fmt.Print(YELLOW_PREFIX)
+		case Aboard:
+			fmt.Print(GREEN_PREFIX)
+		}

 		fmt.Println(txt)
+
+		if info != General {
+			fmt.Print(RESET_PREFIX)
+		}
 	}
 }

@@ -52,19 +75,16 @@ func formatIpGeoData(ip string, data *ipgeo.IPGeoData) string {
 	// TODO: 判断阿里云和腾讯云内网，数据不足，有待进一步完善
 	// TODO: 移动IDC判断到Hop.fetchIPData函数，减少API调用
 	if strings.HasPrefix(ip, "9.") {
-		res = append(res, "局域网", "腾讯云")
+		res = append(res, "LAN Address")
 	} else if strings.HasPrefix(ip, "11.") {
-		res = append(res, "局域网", "阿里云")
+		res = append(res, "LAN Address")
 	} else if data.Country == "" {
-		res = append(res, "局域网")
+		res = append(res, "LAN Address")
 	} else {
 		// 有些IP的归属信息为空，这个时候将ISP的信息填入
 		if data.Owner == "" {
 			data.Owner = data.Isp
 		}
-		if data.District != "" {
-			data.City = data.City + ", " + data.District
-		}
 		if data.Prov == "" && data.City == "" {
 			// anyCast或是骨干网数据不应该有国家信息
 			data.Owner = data.Owner + ", " + data.Owner
--- a/printer/printer_test.go
+++ b/printer/printer_test.go
@@ -2,16 +2,17 @@ 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"
+
+	"github.com/xgadget-lab/nexttrace/ipgeo"
+	"github.com/xgadget-lab/nexttrace/trace"
+	"github.com/xgadget-lab/nexttrace/util"
 )

 func TestPrintTraceRouteNav(t *testing.T) {
-	PrintTraceRouteNav(util.DomainLookUp("1.1.1.1"), "1.1.1.1", "dataOrigin")
+	PrintTraceRouteNav(util.DomainLookUp("1.1.1.1", false), "1.1.1.1", "dataOrigin")
 }

 var testGeo = &ipgeo.IPGeoData{
@@ -89,9 +90,9 @@ var testResult = &trace.Result{
 	},
 }

-func TestTraceroutePrinter(t *testing.T) {
-	TraceroutePrinter(testResult)
-}
+// func TestTraceroutePrinter(t *testing.T) {
+// 	TraceroutePrinter(testResult)
+// }

 func TestTracerouteTablePrinter(t *testing.T) {
 	TracerouteTablePrinter(testResult)
--- a/printer/realtime_printer.go
+++ b/printer/realtime_printer.go
@@ -2,14 +2,103 @@ package printer

 import (
 	"fmt"
+	"strings"

 	"github.com/xgadget-lab/nexttrace/trace"
 )

-func RealtimePrinter(res *trace.Result, ttl int) {
-	fmt.Print(ttl)
+type HopInfo int
+
+const (
+	General HopInfo = 0
+	IXP     HopInfo = 1
+	Peer    HopInfo = 2
+	PoP     HopInfo = 3
+	Aboard  HopInfo = 4
+)
+
+func findLatestAvailableHop(res *trace.Result, ttl int, probesIndex int) int {
+	for ttl > 0 {
+		// 查找上一个跃点是不是有效结果
+		ttl--
+		// 判断此TTL跃点是否有效并判断地理位置结构体是否已经初始化
+		if len(res.Hops[ttl]) != 0 && res.Hops[ttl][probesIndex].Success && res.Hops[ttl][probesIndex].Geo != nil {
+			// TTL虽有效，但地理位置API没有能够正确返回数据，依旧不能视为有效数据
+			if res.Hops[ttl][probesIndex].Geo.Country == "" {
+				// 跳过继续寻找上一个有效跃点
+				continue
+			}
+			return ttl
+		}
+	}
+	// 没找到
+	return -1
+}
+
+func unifyName(name string) string {
+	if name == "China" || name == "CN" {
+		return "中国"
+	} else if name == "Hong kong" || name == "香港" || name == "Central and Western" {
+		return "中国香港"
+	} else if name == "Taiwan" || name == "台湾" {
+		return "中国台湾"
+	} else {
+		return name
+	}
+}
+
+func chinaISPPeer(hostname string) bool {
+	var keyWords = []string{"china", "ct", "cu", "cm", "cnc", "4134", "4837", "4809", "9929"}
+	for _, k := range keyWords {
+		if strings.Contains(strings.ToLower(hostname), k) {
+			return true
+		}
+	}
+	return false
+}
+
+func chinaMainland(h trace.Hop) bool {
+	if unifyName(h.Geo.Country) == "中国" && unifyName(h.Geo.Prov) != "中国香港" && unifyName(h.Geo.Prov) != "中国台湾" {
+		return true
+	} else {
+		return false
+	}
+}
+
+func makeHopsType(res *trace.Result, ttl int) map[int]HopInfo {
+	// 创建一个字典，存放所有当前TTL的跃点类型集合
+	hopProbesMap := make(map[int]HopInfo)
 	for i := range res.Hops[ttl] {
-		HopPrinter(res.Hops[ttl][i])
+		// 判断是否res.Hops[ttl][i]是一个有效的跃点并且地理位置信息已经初始化
+		if res.Hops[ttl][i].Success && res.Hops[ttl][i].Geo != nil {
+			if availableTTL := findLatestAvailableHop(res, ttl, i); availableTTL != -1 {
+				switch {
+				case strings.Contains(res.Hops[ttl][i].Geo.District, "IXP") || strings.Contains(strings.ToLower(res.Hops[ttl][i].Hostname), "ix"):
+					hopProbesMap[i] = IXP
+				case strings.Contains(res.Hops[ttl][i].Geo.District, "Peer") || chinaISPPeer(res.Hops[ttl][i].Hostname):
+					hopProbesMap[i] = Peer
+				case strings.Contains(res.Hops[ttl][i].Geo.District, "PoP"):
+					hopProbesMap[i] = PoP
+				// 2个有效跃点必须都为有效数据，如果当前跳没有地理位置信息或者为局域网，不能视为有效节点
+				case res.Hops[availableTTL][i].Geo.Country != "LAN Address" && res.Hops[ttl][i].Geo.Country != "LAN Address" && res.Hops[ttl][i].Geo.Country != "" &&
+					// 一个跃点在中国大陆，另外一个跃点在其他地区，则可以推断出数据包跨境
+					chinaMainland(res.Hops[availableTTL][i]) != chinaMainland(res.Hops[ttl][i]):
+					// TODO: 将先后2跳跃点信息汇报给API，以完善相关数据
+					hopProbesMap[i] = Aboard
+				}
+			} else {
+				hopProbesMap[i] = General
+			}
+		}
 	}

+	return hopProbesMap
+}
+
+func RealtimePrinter(res *trace.Result, ttl int) {
+	fmt.Print(ttl + 1)
+	hopsTypeMap := makeHopsType(res, ttl)
+	for i := range res.Hops[ttl] {
+		HopPrinter(res.Hops[ttl][i], hopsTypeMap[i])
+	}
 }
--- a/printer/tableprinter.go
+++ b/printer/tableprinter.go
@@ -2,9 +2,10 @@ package printer

 import (
 	"fmt"
-	"github.com/xgadget-lab/nexttrace/ipgeo"
 	"strings"

+	"github.com/xgadget-lab/nexttrace/ipgeo"
+
 	"github.com/xgadget-lab/nexttrace/trace"

 	"github.com/fatih/color"
@@ -38,7 +39,7 @@ func TracerouteTablePrinter(res *trace.Result) {
 				if data.City != "" {
 					tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, data.Country+", "+data.Prov+", "+data.City, data.Owner)
 				} else {
-					tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, data.Country, data.Owner)
+					tbl.AddRow(data.Hop, data.IP, data.Latency, data.Asnumber, data.Country + ", " + data.Prov, data.Owner)
 				}

 			}
@@ -73,16 +74,18 @@ func tableDataGenerator(h trace.Hop) *rowData {
 				Hop:     fmt.Sprint(h.TTL),
 				IP:      IP,
 				Latency: lantency,
-				Country: "局域网",
-				Owner:   "腾讯云",
+				Country: "LAN Address",
+				Prov:    "LAN Address",
+				Owner:   "",
 			}
 		} else if strings.HasPrefix(IP, "11.") {
 			return &rowData{
 				Hop:     fmt.Sprint(h.TTL),
 				IP:      IP,
 				Latency: lantency,
-				Country: "局域网",
-				Owner:   "阿里云",
+				Country: "LAN Address",
+				Prov:    "LAN Address",
+				Owner:   "",
 			}
 		}

--- a/quicklytest.sh
+++ b/quicklytest.sh
@@ -1,232 +0,0 @@
-#!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
-export PATH
-Green_font="\033[32m" && Red_font="\033[31m" && Font_suffix="\033[0m"
-Info="${Green_font}[Info]${Font_suffix}"
-Error="${Red_font}[Error]${Font_suffix}"
-echo -e "${Green_font}
-#======================================
-# Project: NextTrace https://github.com/xgadget-lab/nexttrace
-# Copyright Notice:
-# This script is ported from @KANIKIG https://github.com/KANIKIG/
-# The developer team made some modifications to adapt to NextTrace under the GPL-3.0 LICENSE
-# NextTrace:
-#   XGadget-lab Leo (leo.moe) & Vincent (vincent.moe) & zhshch (xzhsh.ch)
-#   IP Geo Data Provider: LeoMoeAPI
-#======================================
-${Font_suffix}"
-
-check_root() {
-    [[ "$(id -u)" != "0" ]] && echo -e "${Error} must be root user !" && exit 1
-}
-ask_if()
-{
-    local choice=""
-    while [ "$choice" != "y" ] && [ "$choice" != "n" ]
-    do
-        echo -e "${Info} $1"
-        read choice
-    done
-    [ $choice == y ] && return 0
-    return 1
-}
-#检查脚本更新
-check_script_update()
-{
-    [ "$(md5sum "${BASH_SOURCE[0]}" | awk '{print $1}')" == "$(md5sum <(curl -sL "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh") | awk '{print $1}')" ] && return 1 || return 0
-}
-#更新脚本
-update_script()
-{
-    if curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh" || curl -sL -o "${BASH_SOURCE[0]}" "https://github.com/xgadget-lab/nexttrace/raw/main/quicklytest.sh"; then
-        echo -e "${Info} 脚本更新完成，正在重启脚本..."
-        exec bash ${BASH_SOURCE[0]}
-    else
-        echo -e "${Info} 更新脚本失败！"
-        exit 1
-    fi
-}
-ask_update_script()
-{
-    if check_script_update; then
-        echo -e "${Info} 脚本可升级"
-        ask_if "是否升级脚本？(y/n)" && update_script
-    else
-        echo -e "${Info} 脚本已经是最新版本"
-    fi
-}
-check_mode() {
-    echo -e "${Info} Nexttrace目前支持以下三种协议发起Traceroute请求:\n1.ICMP\n2.TCP(速度最快,但部分节点不支持)\n3.UDP\n(IPv6暂只支持ICMP模式)" && read -p "输入数字以选择:" node
-
-    while [[ ! "${node}" =~ ^[1-3]$ ]]; do
-        echo -e "${Error} 无效输入"
-        echo -e "${Info} 请重新选择" && read -p "输入数字以选择:" node
-    done
-
-    [[ "${node}" == "1" ]] && TRACECMD="nexttrace"
-    [[ "${node}" == "2" ]] && TRACECMD="nexttrace -T"
-    [[ "${node}" == "3" ]] && TRACECMD="nexttrace -U"
-
-
-    echo -e "${Info} 结果是否制表?(制表模式为非实时显示)" 
-    if ask_if "输入y/n以选择模式:" ; then
-                TRACECMD=${TRACECMD}" -rdns -table"
-    else
-                TRACECMD=${TRACECMD}" -rdns -realtime"
-    fi
-    
-    return 0
-    #未实现的功能:
-    ask_if "是否升级脚本？(y/n)" && update_script
-    echo -e "${Info} 是否输出Route-Path?" 
-    ask_if "输入y/n以选择模式:" && TRACECMD=${TRACECMD}" -report"
-}
-
-test_single() {
-    echo -e "${Info} 请输入你要测试的目标 ip :"
-    read -p "输入 ip 地址:" ip
-
-    while [[ -z "${ip}" ]]; do
-        echo -e "${Error} 无效输入"
-        echo -e "${Info} 请重新输入" && read -p "输入 ip 地址:" ip
-    done
-
-    ${TRACECMD} ${ip} | grep -v -E 'NextTrace|XGadget-lab|Data\ Provider'
-
-    repeat_test_single
-}
-repeat_test_single() {
-    echo -e "${Info} 是否继续测试其他目标 ip ?" 
-    if ask_if "输入y/n以选择:" ; then
-                test_single
-    else
-                echo -e "${Info} 退出脚本 ..." && exit 0
-    fi
-}
-
-test_alternative() {
-    select_alternative
-    set_alternative
-    result_alternative
-}
-select_alternative() {
-    echo -e "${Info} 选择需要测速的目标网络: \n1.中国电信\n2.中国联通\n3.中国移动\n4.教育网"
-    read -p "输入数字以选择:" ISP
-
-    while [[ ! "${ISP}" =~ ^[1-4]$ ]]; do
-        echo -e "${Error} 无效输入"
-        echo -e "${Info} 请重新选择" && read -p "输入数字以选择:" ISP
-    done
-}
-set_alternative() {
-    [[ "${ISP}" == "1" ]] && node_1
-    [[ "${ISP}" == "2" ]] && node_2
-    [[ "${ISP}" == "3" ]] && node_3
-    [[ "${ISP}" == "4" ]] && node_4
-}
-node_1() {
-    echo -e "1.上海电信(天翼云)\n2.厦门电信CN2\n3.北京电信\n4.江苏电信\n5.广东深圳电信\n6.广州电信(天翼云)\n7.浙江电信" && read -p "输入数字以选择:" node
-
-    while [[ ! "${node}" =~ ^[1-7]$ ]]; do
-        echo -e "${Error} 无效输入"
-        echo -e "${Info} 请重新选择" && read -p "输入数字以选择:" node
-    done
-
-    [[ "${node}" == "1" ]] && ISP_name="上海电信" && ip=101.89.132.9
-    [[ "${node}" == "2" ]] && ISP_name="厦门电信CN2" && ip=117.28.254.129
-    [[ "${node}" == "3" ]] && ISP_name="北京电信" && ip=120.92.180.135
-    [[ "${node}" == "4" ]] && ISP_name="江苏电信" && ip=221.229.173.233
-    [[ "${node}" == "5" ]] && ISP_name="广东深圳电信" && ip=116.6.211.41
-    [[ "${node}" == "6" ]] && ISP_name="广州电信(天翼云)" && ip=14.215.116.1
-    [[ "${node}" == "7" ]] && ISP_name="浙江电信" && ip=115.236.169.86
-}
-node_2() {
-    echo -e "1.上海联通\n2.重庆联通\n3.北京联通\n4.安徽合肥联通\n5.江苏南京联通\n6.浙江杭州联通\n7.广东联通" && read -p "输入数字以选择:" node
-
-    while [[ ! "${node}" =~ ^[1-7]$ ]]; do
-        echo -e "${Error} 无效输入"
-        echo -e "${Info} 请重新选择" && read -p "输入数字以选择:" node
-    done
-
-    [[ "${node}" == "1" ]] && ISP_name="上海联通" && ip=220.196.252.174
-    [[ "${node}" == "2" ]] && ISP_name="重庆联通" && ip=113.207.32.65
-    [[ "${node}" == "3" ]] && ISP_name="北京联通" && ip=202.106.54.150
-    [[ "${node}" == "4" ]] && ISP_name="安徽合肥联通" && ip=112.122.10.26
-    [[ "${node}" == "5" ]] && ISP_name="江苏联通" && ip=112.85.231.129
-    [[ "${node}" == "6" ]] && ISP_name="浙江联通" && ip=60.12.214.156
-    [[ "${node}" == "7" ]] && ISP_name="广东联通" && ip=58.252.2.194
-}
-node_3() {
-    echo -e "1.上海移动\n2.四川成都移动\n3.北京移动\n4.浙江杭州移动\n5.广东移动\n6.江苏移动\n7.浙江移动" && read -p "输入数字以选择:" node
-
-    while [[ ! "${node}" =~ ^[1-7]$ ]]; do
-        echo -e "${Error} 无效输入"
-        echo -e "${Info} 请重新选择" && read -p "输入数字以选择:" node
-    done
-
-    [[ "${node}" == "1" ]] && ISP_name="上海移动" && ip=117.184.42.114
-    [[ "${node}" == "2" ]] && ISP_name="四川成都移动" && ip=183.221.247.9
-    [[ "${node}" == "3" ]] && ISP_name="北京移动" && ip=111.13.217.125
-    [[ "${node}" == "4" ]] && ISP_name="浙江移动" && ip=183.246.69.139
-    [[ "${node}" == "5" ]] && ISP_name="广东移动" && ip=221.179.44.57
-    [[ "${node}" == "6" ]] && ISP_name="江苏移动" && ip=120.195.6.129
-    [[ "${node}" == "7" ]] && ISP_name="浙江移动" && ip=183.246.69.139
-}
-node_4() {
-    ISP_name="北京教育网" && ip=211.68.69.240
-}
-result_alternative() {
-    echo -e "${Info} 测试路由 到 ${ISP_name} 中 ..."
-    ${TRACECMD} ${ip} | grep -v -E 'NextTrace|XGadget-lab|Data\ Provider'
-    echo -e "${Info} 测试路由 到 ${ISP_name} 完成 ！"
-
-    repeat_test_alternative
-}
-repeat_test_alternative() {
-    echo -e "${Info} 是否继续测试其他节点?" 
-    if ask_if "输入y/n以选择:" ; then
-                test_alternative
-    else
-                echo -e "${Info} 退出脚本 ..." && exit 0
-    fi
-}
-
-test_all() {
-    result_all '116.6.211.41' '广东东莞CN2'
-
-    result_all '101.95.110.149' '上海电信'
-
-    result_all '112.85.231.129' '江苏徐州联通'
-
-    result_all '120.199.239.1' '浙江杭州移动'
-
-    result_all '211.68.69.240' '北京教育网'
-
-    echo -e "${Info} 四网路由快速测试 已完成 ！"
-}
-result_all() {
-    ISP_name=$2
-    echo -e "${Info} 测试路由 到 ${ISP_name} 中 ..."
-    ${TRACECMD} $1 | grep -v -E 'NextTrace|XGadget-lab|Data\ Provider'
-    echo -e "${Info} 测试路由 到 ${ISP_name} 完成 ！"
-}
-
-check_root
-ask_update_script
-check_mode
-echo -e "${Info} 选择你要使用的功能: "
-echo -e "1.选择一个节点进行测试\n2.四网路由快速测试\n3.手动输入 ip 进行测试"
-read -p "输入数字以选择:" function
-
-while [[ ! "${function}" =~ ^[1-3]$ ]]; do
-    echo -e "${Error} 缺少或无效输入"
-    echo -e "${Info} 请重新选择" && read -p "输入数字以选择:" function
-done
-
-if [[ "${function}" == "1" ]]; then
-    test_alternative
-elif [[ "${function}" == "2" ]]; then
-    test_all
-else
-    test_single
-fi
--- a/reporter/reporter.go
+++ b/reporter/reporter.go
@@ -128,10 +128,18 @@ func (r *reporter) InitialBaseData() Reporter {
 }

 func (r *reporter) Print() {
-	var beforeActiveTTL uint16 = 1
+	var beforeActiveTTL uint16 = 0
 	r.InitialBaseData()
+	// 尝试首个有效 TTL
+	for i := uint16(0); i < r.targetTTL; i++ {
+		if len(r.routeReport[i]) != 0 {
+			beforeActiveTTL = i
+			// 找到以后便不再循环
+			break
+		}
+	}

-	for i := uint16(1); i < r.targetTTL; i++ {
+	for i := beforeActiveTTL; i < r.targetTTL; i++ {
 		// 计算该TTL内的数据长度，如果为0，则代表没有有效数据
 		if len(r.routeReport[i]) == 0 {
 			// 跳过改跃点的数据整理
@@ -139,7 +147,7 @@ func (r *reporter) Print() {
 		}
 		nodeReport := r.routeReport[i][0]

-		if i == 1 {
+		if i == beforeActiveTTL {
 			fmt.Printf("AS%s %s「%s『%s", nodeReport.asn, nodeReport.isp, nodeReport.geo[0], nodeReport.geo[1])
 		} else {
 			nodeReportBefore := r.routeReport[beforeActiveTTL][0]
--- a/trace/icmp_ipv4.go
+++ b/trace/icmp_ipv4.go
@@ -1,6 +1,7 @@
 package trace

 import (
+	"encoding/binary"
 	"log"
 	"net"
 	"os"
@@ -44,7 +45,7 @@ func (t *ICMPTracer) Execute() (*Result, error) {

 	go t.listenICMP()

-	for ttl := 1; ttl <= t.MaxHops; ttl++ {
+	for ttl := t.BeginHop; ttl <= t.MaxHops; ttl++ {
 		if t.final != -1 && ttl > t.final {
 			break
 		}
@@ -74,19 +75,32 @@ func (t *ICMPTracer) listenICMP() {
 			if msg.N == nil {
 				continue
 			}
-			rm, err := icmp.ParseMessage(1, msg.Msg[:*msg.N])
-			if err != nil {
-				log.Println(err)
-				continue
+
+			if binary.BigEndian.Uint16(msg.Msg[32:34]) != uint16(os.Getpid()&0xffff) {
+				// 如果类型为应答消息，且应答消息包的进程ID与主进程相同时不跳过
+				if msg.Msg[0] != 0 || binary.BigEndian.Uint16(msg.Msg[4:6]) != uint16(os.Getpid()&0xffff) {
+					continue
+				}
 			}
-			switch rm.Type {
-			case ipv4.ICMPTypeTimeExceeded:
-				t.handleICMPMessage(msg, 0, rm.Body.(*icmp.TimeExceeded).Data)
-			case ipv4.ICMPTypeEchoReply:
-				t.handleICMPMessage(msg, 1, rm.Body.(*icmp.Echo).Data)
-			default:
-				// log.Println("received icmp message of unknown type", rm.Type)
+
+			dstip := net.IP(msg.Msg[24:28])
+			if dstip.Equal(t.DestIP) || dstip.Equal(net.IPv4zero) {
+				// 匹配再继续解析包，否则直接丢弃
+				rm, err := icmp.ParseMessage(1, msg.Msg[:*msg.N])
+				if err != nil {
+					log.Println(err)
+					continue
+				}
+				switch rm.Type {
+				case ipv4.ICMPTypeTimeExceeded:
+					t.handleICMPMessage(msg, 0, rm.Body.(*icmp.TimeExceeded).Data)
+				case ipv4.ICMPTypeEchoReply:
+					t.handleICMPMessage(msg, 1, rm.Body.(*icmp.Echo).Data)
+				default:
+					// log.Println("received icmp message of unknown type", rm.Type)
+				}
 			}
+
 		}
 	}

--- a/trace/icmp_ipv6.go
+++ b/trace/icmp_ipv6.go
@@ -44,7 +44,7 @@ func (t *ICMPTracerv6) Execute() (*Result, error) {

 	go t.listenICMP()

-	for ttl := 1; ttl <= t.MaxHops; ttl++ {
+	for ttl := t.BeginHop; ttl <= t.MaxHops; ttl++ {
 		if t.final != -1 && ttl > t.final {
 			break
 		}
--- a/trace/tcp_ipv4.go
+++ b/trace/tcp_ipv4.go
@@ -63,15 +63,27 @@ func (t *TCPTracer) Execute() (*Result, error) {

 	t.sem = semaphore.NewWeighted(int64(t.ParallelRequests))

-	for ttl := 1; ttl <= t.MaxHops; ttl++ {
+	for ttl := t.BeginHop; ttl <= t.MaxHops; ttl++ {
+		// 如果到达最终跳，则退出
+		if t.final != -1 && ttl > t.final {
+			break
+		}
 		for i := 0; i < t.NumMeasurements; i++ {
 			t.wg.Add(1)
 			go t.send(ttl)

 		}
+		if t.RealtimePrinter != nil {
+			// 对于实时模式，应该按照TTL进行并发请求
+			t.wg.Wait()
+			t.RealtimePrinter(&t.res, ttl-1)
+		}
 		time.Sleep(1 * time.Millisecond)
 	}
-	t.wg.Wait()
+	// 如果是表格模式，则一次性并发请求
+	if t.RealtimePrinter == nil {
+		t.wg.Wait()
+	}
 	t.res.reduce(t.final)

 	return &t.res, nil
@@ -88,18 +100,21 @@ func (t *TCPTracer) listenICMP() {
 			if msg.N == nil {
 				continue
 			}
-			rm, err := icmp.ParseMessage(1, msg.Msg[:*msg.N])
-			if err != nil {
-				log.Println(err)
-				continue
-			}
-			switch rm.Type {
-			case ipv4.ICMPTypeTimeExceeded:
-				t.handleICMPMessage(msg, rm.Body.(*icmp.TimeExceeded).Data)
-			case ipv4.ICMPTypeDestinationUnreachable:
-				t.handleICMPMessage(msg, rm.Body.(*icmp.DstUnreach).Data)
-			default:
-				//log.Println("received icmp message of unknown type", rm.Type)
+			dstip := net.IP(msg.Msg[24:28])
+			if dstip.Equal(t.DestIP) {
+				rm, err := icmp.ParseMessage(1, msg.Msg[:*msg.N])
+				if err != nil {
+					log.Println(err)
+					continue
+				}
+				switch rm.Type {
+				case ipv4.ICMPTypeTimeExceeded:
+					t.handleICMPMessage(msg, rm.Body.(*icmp.TimeExceeded).Data)
+				case ipv4.ICMPTypeDestinationUnreachable:
+					t.handleICMPMessage(msg, rm.Body.(*icmp.DstUnreach).Data)
+				default:
+					//log.Println("received icmp message of unknown type", rm.Type)
+				}
 			}
 		}
 	}
--- a/trace/temp_printer.go
+++ b/trace/temp_printer.go
@@ -39,11 +39,11 @@ func formatIpGeoData(ip string, data *ipgeo.IPGeoData) string {
 	// TODO: 判断阿里云和腾讯云内网，数据不足，有待进一步完善
 	// TODO: 移动IDC判断到Hop.fetchIPData函数，减少API调用
 	if strings.HasPrefix(ip, "9.") {
-		res = append(res, "局域网", "腾讯云")
+		res = append(res, "LAN Address", "")
 	} else if strings.HasPrefix(ip, "11.") {
-		res = append(res, "局域网", "阿里云")
+		res = append(res, "LAN Address", "")
 	} else if data.Country == "" {
-		res = append(res, "局域网")
+		res = append(res, "LAN Address")
 	} else {
 		// 有些IP的归属信息为空，这个时候将ISP的信息填入
 		if data.Owner == "" {
--- a/trace/trace.go
+++ b/trace/trace.go
@@ -16,6 +16,7 @@ var (
 )

 type Config struct {
+	BeginHop         int
 	MaxHops          int
 	NumMeasurements  int
 	ParallelRequests int
--- a/trace/udp.go
+++ b/trace/udp.go
@@ -53,13 +53,26 @@ func (t *UDPTracer) Execute() (*Result, error) {

 	t.sem = semaphore.NewWeighted(int64(t.ParallelRequests))
 	for ttl := 1; ttl <= t.MaxHops; ttl++ {
+		// 如果到达最终跳，则退出
+		if t.final != -1 && ttl > t.final {
+			break
+		}
 		for i := 0; i < t.NumMeasurements; i++ {
 			t.wg.Add(1)
 			go t.send(ttl)
-		}
-	}

-	t.wg.Wait()
+		}
+		if t.RealtimePrinter != nil {
+			// 对于实时模式，应该按照TTL进行并发请求
+			t.wg.Wait()
+			t.RealtimePrinter(&t.res, ttl-1)
+		}
+		time.Sleep(1 * time.Millisecond)
+	}
+	// 如果是表格模式，则一次性并发请求
+	if t.RealtimePrinter == nil {
+		t.wg.Wait()
+	}
 	t.res.reduce(t.final)

 	return &t.res, nil
--- a/util/util.go
+++ b/util/util.go
@@ -25,7 +25,7 @@ func LocalIPPort(dstip net.IP) (net.IP, int) {
 	return nil, -1
 }

-func DomainLookUp(host string) net.IP {
+func DomainLookUp(host string, ipv4Only bool) net.IP {
 	ips, err := net.LookupIP(host)
 	if err != nil {
 		fmt.Println("Domain " + host + " Lookup Fail.")
@@ -36,17 +36,20 @@ func DomainLookUp(host string) net.IP {
 	var ipv6Flag = false

 	for _, ip := range ips {
-		ipSlice = append(ipSlice, ip)
-		// 仅返回ipv4的ip
-		// if ip.To4() != nil {
-		// 	ipSlice = append(ipSlice, ip)
-		// } else {
-		// 	ipv6Flag = true
-		// }
+		if ipv4Only {
+			// 仅返回ipv4的ip
+			if ip.To4() != nil {
+				ipSlice = append(ipSlice, ip)
+			} else {
+				ipv6Flag = true
+			}
+		} else {
+			ipSlice = append(ipSlice, ip)
+		}
 	}

 	if ipv6Flag {
-		fmt.Println("[Info] IPv6 Traceroute is not supported right now.")
+		fmt.Println("[Info] IPv6 TCP/UDP Traceroute is not supported right now.")
 		if len(ipSlice) == 0 {
 			os.Exit(0)
 		}
--- a/wshandle/client.go
+++ b/wshandle/client.go
@@ -0,0 +1,100 @@
+package wshandle
+
+import (
+	"log"
+	"net/url"
+	"os"
+	"os/signal"
+	"sync"
+	"time"
+
+	"github.com/gorilla/websocket"
+)
+
+type WsConn struct {
+	MsgSendCh    chan string     // 消息发送通道
+	MsgReceiveCh chan string     // 消息接收通道
+	Done         chan struct{}   // 发送结束通道
+	Exit         chan bool       // 程序退出信号
+	Interrupt    chan os.Signal  // 终端中止信号
+	Conn         *websocket.Conn // 主连接
+	ConnMux      sync.Mutex      // 连接互斥锁
+}
+
+var wsconn *WsConn
+
+func (c *WsConn) messageReceiveHandler() {
+	defer close(c.Done)
+	for {
+		_, msg, err := c.Conn.ReadMessage()
+		if err != nil {
+			return
+		}
+		c.MsgReceiveCh <- string(msg)
+	}
+}
+
+func (c *WsConn) messageSendHandler() {
+	for {
+		// 循环监听发送
+		select {
+		case <-c.Done:
+			return
+		case t := <-c.MsgSendCh:
+			err := c.Conn.WriteMessage(websocket.TextMessage, []byte(t))
+			if err != nil {
+				log.Println("write:", err)
+				return
+			}
+		// 来自终端的中断运行请求
+		case <-c.Interrupt:
+			// 向 websocket 发起关闭连接任务
+			err := c.Conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+			if err != nil {
+				log.Println("write close:", err)
+				return
+			}
+			select {
+			// 等到了结果，直接退出
+			case <-c.Done:
+			// 如果等待 1s 还是拿不到结果，不再等待，超时退出
+			case <-time.After(time.Second):
+			}
+			os.Exit(1)
+			// return
+		}
+	}
+}
+
+func createWsConn() *WsConn {
+	// 设置终端中断通道
+	interrupt := make(chan os.Signal, 1)
+	signal.Notify(interrupt, os.Interrupt)
+
+	u := url.URL{Scheme: "wss", Host: "api.leo.moe", Path: "/v2/ipGeoWs"}
+	// log.Printf("connecting to %s", u.String())
+
+	c, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
+	if err != nil {
+		log.Fatal("dial:", err)
+	}
+	// defer c.Close()
+	// 将连接写入WsConn，方便随时可取
+	wsconn = &WsConn{
+		Conn:         c,
+		MsgSendCh:    make(chan string),
+		MsgReceiveCh: make(chan string),
+	}
+	wsconn.Done = make(chan struct{})
+	go wsconn.messageReceiveHandler()
+	go wsconn.messageSendHandler()
+	return wsconn
+}
+
+func New() *WsConn {
+	return createWsConn()
+}
+
+func GetWsConn() *WsConn {
+	return wsconn
+}
Author	SHA1	Message	Date
sjlleo	e2d778c34d	API接口不稳定，不需要进行测试	2022-07-02 02:43:01 +02:00
sjlleo	bf54b61eb8	update: IPv6 默认使用 LeoMoeAPI	2022-07-02 02:35:16 +02:00
sjlleo	9cec64b207	Add: Some Tips	2022-06-24 13:51:41 +08:00
sjlleo	23006acd9f	Add: 开源 LeoMoeAPI 后端	2022-06-21 09:53:29 +08:00
sjlleo	0210c94651	fix: ISP Domain display incorrectly	2022-06-20 22:51:15 +08:00
sjlleo	0ccdae851d	remove: LeoMoeAPI Test	2022-06-20 22:29:12 +08:00
sjlleo	ddffdb389a	fix: fast trace test	2022-06-20 22:25:58 +08:00
sjlleo	c533dd34ab	fix: fast trace crash	2022-06-20 22:17:38 +08:00
sjlleo	e690ad85d9	add: websocket module	2022-06-20 22:13:06 +08:00
sjlleo	00e4f9391e	refactor: using websocket	2022-06-20 22:12:55 +08:00
sjlleo	2084f2c316	update: now push status will be ignored.	2022-06-18 21:03:49 +08:00
sjlleo	c9ebf7465a	fix: #36 crash when beginTTL is specific.	2022-06-18 20:57:52 +08:00
sjlleo	f11f9c8234	update: 删除一些无效内容	2022-06-16 08:46:02 +08:00
sjlleo	36315c6d9d	update: 更正一些错误的描述	2022-06-15 21:27:43 +08:00
sjlleo	548839f564	add: JetBrain Support	2022-06-15 16:42:46 +08:00
sjlleo	28c2961490	update: improve fast test 增加了提示的颜色，排版略作改动	2022-06-15 14:29:03 +08:00
sjlleo	e5fe66b9ab	add: Star History	2022-06-15 13:17:16 +08:00
sjlleo	aca0ed10b8	update: 更精确的说法	2022-06-14 16:27:05 +08:00
sjlleo	a7fc2cd5d8	typo	2022-06-14 14:33:12 +08:00
sjlleo	a26318ff70	update: 补充一些细节	2022-06-14 14:29:53 +08:00
sjlleo	251c8aa2e8	update: generate only with new tag	2022-06-12 21:34:30 +08:00
sjlleo	89f52ca766	update: Format layout	2022-06-12 21:31:47 +08:00
sjlleo	dfabe225b9	typo: dictionary name incorrect	2022-06-12 21:03:34 +08:00
sjlleo	97172466ed	add: auto generate formula file with new tag	2022-06-12 21:02:05 +08:00
sjlleo	404f0a1c62	improve: 更详细的描述	2022-06-12 17:33:26 +08:00
sjlleo	c59e843495	fix: highlight func does not work	2022-06-12 14:04:32 +08:00
sjlleo	35bc15583e	update: no longer test with icmp	2022-06-12 13:07:15 +08:00
sjlleo	ee9111249c	try sudo I am not sure this can fix.	2022-06-12 12:59:30 +08:00
sjlleo	d7ab206e40	add: fast trace test	2022-06-12 12:44:50 +08:00
sjlleo	6d7eac1e16	fix: crash when geo struct is not initialized.	2022-06-12 12:38:38 +08:00
sjlleo	b8772d4cca	add: detect hop type & highlight	2022-06-12 12:18:43 +08:00
sjlleo	5c94a19944	improve: readme	2022-06-11 21:05:13 +08:00
sjlleo	b7d24d8779	fix: table cannot display	2022-06-11 16:02:34 +08:00
sjlleo	f882b87a18	English README	2022-06-11 15:56:03 +08:00
sjlleo	9412189a0c	Chinese(Simplified) README	2022-06-11 15:55:41 +08:00
sjlleo	fbda4fb4ad	fix: Image Deformation	2022-06-11 15:36:15 +08:00
sjlleo	eccc2d1a0b	update: readme fix	2022-06-11 15:24:09 +08:00
sjlleo	31f1947108	Create CNAME	2022-06-11 14:12:33 +08:00
sjlleo	d864313898	为Page适配	2022-06-11 12:21:14 +08:00
sjlleo	cc86712c23	Set theme jekyll-theme-cayman	2022-06-11 12:19:44 +08:00
sjlleo	668c46cf5a	typo fix	2022-06-11 10:27:08 +08:00
sjlleo	8a428c4fb9	update: How we calibrate BackBone IP Geographical Information	2022-06-11 10:17:07 +08:00
sjlleo	569cca02d9	add 注释	2022-06-10 22:45:13 +08:00
sjlleo	90e304cf22	add 注释	2022-06-10 22:43:21 +08:00
sjlleo	d6a154deb2	Prov -> Asnumber	2022-06-10 21:43:43 +08:00
sjlleo	e4cacc569e	update: API错误信息提醒	2022-06-10 21:34:40 +08:00
sjlleo	4035dd7183	Merge branch 'main' of https://github.com/xgadget-lab/nexttrace	2022-06-10 21:21:28 +08:00
sjlleo	1789448d6c	add: 新增起始TTL参数	2022-06-10 21:20:43 +08:00
sjlleo	9df6c2f23c	update: 频率超限显示	2022-06-10 21:20:09 +08:00
sjlleo	a37f31922c	add: nexttrace enhanced info	2022-06-10 17:03:41 +08:00
sjlleo	39917bb732	fix: IP 提供商显示为空	2022-06-08 20:23:10 +08:00
sjlleo	494f2ac819	remove: 过于具体的地区信息，此类信息往往精准度有待考察	2022-06-08 20:10:17 +08:00
sjlleo	0b09addd17	improve: 实时显示	2022-06-08 20:03:47 +08:00
sjlleo	99dffc959c	fix: 意外的Test错误警告	2022-06-08 20:03:29 +08:00
sjlleo	c30bcfee11	fix & improve: 测试节点的 IP 错误路由跟踪默认配置优化	2022-06-08 19:52:19 +08:00
sjlleo	1554565460	add: 支持 ipinfo 商业版，能够读取ASN信息	2022-06-08 19:51:19 +08:00
sjlleo	2a069d7afe	remove: Lite版本不再使用配置文件	2022-06-08 19:50:51 +08:00
sjlleo	e6db19f5fd	update: 改进TCP/UDP的实时模式	2022-06-08 19:49:42 +08:00
sjlleo	5603317fa3	add: 中南大学教育网测试节点	2022-06-06 21:09:58 +08:00
sjlleo	3e71926127	add: 杭州电信、联通、移动、浙江大学的教育网以及中国科学技术大学的科技网与教育网	2022-06-06 20:32:35 +08:00
sjlleo	e8f74c4ad3	update: 简化步骤，关闭 Discussion 板块	2022-06-06 15:48:50 +08:00
sjlleo	aad80205c3	add: 快速测试使用文档	2022-06-06 15:43:03 +08:00
sjlleo	50cc9858d4	No Longer Needed	2022-06-06 15:29:24 +08:00
sjlleo	27f49f9cd0	Merge pull request #34 from xgadget-lab/dev/fast-test add: 新功能，快速路由测试	2022-06-06 15:27:40 +08:00
sjlleo	e4320da08d	add: 新功能，快速路由测试	2022-06-06 15:27:09 +08:00
zhshch2002	7f16a27580	update: macOS brew 安装命令	2022-06-06 11:02:21 +08:00
zhshch2002	7db77024a3	revert: .macos_compil.sh	2022-06-06 10:59:28 +08:00
zhshch2002	c4ea506c35	update: .macos_compil.sh	2022-06-06 10:32:09 +08:00
zhshch2002	39e2471845	add: macOS homebrew 编译脚本	2022-06-06 10:18:11 +08:00
sjlleo	18a9eefec9	Revert "Revert "update: 脚本运行不需要保存在本地"" This reverts commit `3f0b14341a`.	2022-06-05 15:51:38 +08:00
sjlleo	1b743d1f17	Revert "update: 移除 wget 依赖" This reverts commit `8f77050fca`.	2022-06-05 15:51:10 +08:00
sjlleo	3f0b14341a	Revert "update: 脚本运行不需要保存在本地" This reverts commit `2ffd7fdb58`.	2022-06-05 15:50:45 +08:00
sjlleo	2ffd7fdb58	update: 脚本运行不需要保存在本地	2022-06-05 14:33:30 +08:00
sjlleo	8f77050fca	update: 移除 wget 依赖	2022-06-05 14:29:41 +08:00
sjlleo	65652bd4e2	fix: 小问题	2022-06-05 14:22:24 +08:00
sjlleo	4176407a8a	update: 精简安装脚本	2022-06-05 14:19:00 +08:00
sjlleo	6bc4abeaf8	update: TCP/UDP路由跟踪时，将不会再显示IPv6 IP	2022-06-04 21:42:44 +08:00
sjlleo	af0d886a02	update: yaml.v2 should direct.	2022-06-04 21:41:49 +08:00
sjlleo	09fdd2ac37	update: 现在偏好设置支持自定义数据源、自定义显示模式，以及对部分描述不当的参数说明进行了修正	2022-06-04 21:25:56 +08:00
sjlleo	2b9d8176d4	update: 现在默认无需配置即可使用，对于高阶用户，可以使用-c生成属于自己的偏好	2022-06-04 20:28:58 +08:00
tsosunchia	ed2f89310f	Update README.md	2022-06-04 17:15:23 +08:00
tsosunchia	bd5a8902d4	更改部分提示信息	2022-06-04 17:02:26 +08:00
tsosunchia	e2a1bfe8cf	把部分选项隐藏放进了--expert选项	2022-06-04 16:59:07 +08:00
zhshch2002	356b782b3d	update: screenshot	2022-06-04 11:04:42 +08:00
zhshch2002	40922ae13a	update: screenshot	2022-06-04 10:45:33 +08:00
tsosunchia	8e90795a54	Update nt_install.sh	2022-06-03 19:48:47 +08:00
sjlleo	bbbb2377e1	fix: 当有多个路由跟踪实例，且跟踪通一个IP的时候的干扰问题	2022-06-03 19:28:53 +08:00
sjlleo	efdfd9d612	fix: 修复一个多线程路由跟踪错乱的问题	2022-06-03 16:26:01 +08:00
sjlleo	016f06bafd	cleanup	2022-06-02 21:51:50 +08:00
sjlleo	1049986ebc	cleanup	2022-06-02 21:48:19 +08:00
tsosunchia	80a75288d2	由于9.0.0.0/8 以及11.0.0.0/8大量用于其他IDC业务，因此清除特殊标记	2022-06-02 20:38:43 +08:00
tsosunchia	986b8ce300	Merge remote-tracking branch 'refs/remotes/origin/main' fetch README	2022-05-31 21:00:07 +08:00
tsosunchia	ab774406ac	减少一处警告	2022-05-31 20:59:56 +08:00
sjlleo	9604b7befe	update: announcement	2022-05-31 20:48:39 +08:00
tsosunchia	dc6537005a	fix some bugs	2022-05-31 19:41:12 +08:00
tsosunchia	839d227770	fix some bugs	2022-05-31 19:15:39 +08:00
tsosunchia	84e989e71b	fix some bugs	2022-05-31 19:15:29 +08:00
tsosunchia	3b74b302cc	fix some bugs	2022-05-31 18:35:59 +08:00
tsosunchia	9b0e58359f	改善脚本在国内环境下的表现	2022-05-31 18:27:22 +08:00
tsosunchia	f0d7151144	Update README.md	2022-05-31 18:21:31 +08:00
tsosunchia	3c65c29eff	改善脚本在国内环境下的表现	2022-05-31 18:14:51 +08:00
sjlleo	3aa4696fa9	add: 新增配置文件模块	2022-05-30 21:15:22 +08:00
sjlleo	b4abaffc7c	update: 让截图大小适中	2022-05-28 11:09:45 +08:00
sjlleo	c96fb4efa3	update: IP Database Copyright的IP占比信息用表格显示	2022-05-28 10:47:03 +08:00
sjlleo	876de6bde1	update: 完善描述	2022-05-28 10:26:31 +08:00
tsosunchia	7dbec0c7a1	update README.md 增加提示	2022-05-28 02:52:27 +08:00
tsosunchia	d690f680f5	增加一些平台支持	2022-05-28 02:29:18 +08:00
tsosunchia	e96686013d	增加一些平台支持	2022-05-28 02:07:45 +08:00
tsosunchia	6726b55fc9	Update .cross_compile.sh	2022-05-28 01:58:23 +08:00
tsosunchia	9f29c75491	增加一些平台支持	2022-05-28 01:51:30 +08:00
tsosunchia	2f5bf3f195	优化提示	2022-05-28 00:40:37 +08:00
tsosunchia	5981e82ee3	fix some bugs	2022-05-28 00:31:58 +08:00
tsosunchia	80f7857a65	Merge pull request #30 from tsosunchia/main fix some bugs	2022-05-27 23:44:14 +08:00
tsosunchia	700d38de1c	fix some bugs	2022-05-27 23:43:21 +08:00
tsosunchia	2dbf3f04a4	Merge pull request #29 from tsosunchia/main fix some bugs	2022-05-27 23:10:46 +08:00
tsosunchia	45df06ea80	fix some bugs	2022-05-27 23:10:07 +08:00
tsosunchia	98953048ce	fix some bugs	2022-05-27 22:54:07 +08:00
tsosunchia	eddd4226b0	Merge pull request #28 from tsosunchia/main 修补BUG	2022-05-27 22:45:55 +08:00
tsosunchia	5afd9eb09e	Merge remote-tracking branch 'refs/remotes/origin/main'	2022-05-27 22:43:55 +08:00
tsosunchia	70006aaa13	优化逻辑结构	2022-05-27 22:43:28 +08:00
tsosunchia	497fb647c0	Merge pull request #27 from tsosunchia/main 优化逻辑结构	2022-05-27 22:31:44 +08:00
tsosunchia	be8552c3cd	优化逻辑结构	2022-05-27 22:30:54 +08:00
sjlleo	f320fd6202	update: 优化逻辑，废弃 realtime 参数	2022-05-27 21:27:26 +08:00
sjlleo	a42c5e3734	update: ttl 从 1 开始	2022-05-27 21:26:47 +08:00
sjlleo	e6480c84e0	Revert "update: 优化打印逻辑，废除 realtime 参数" This reverts commit `126115c04e`.	2022-05-27 21:14:16 +08:00
sjlleo	126115c04e	update: 优化打印逻辑，废除 realtime 参数	2022-05-27 21:08:30 +08:00
tsosunchia	ea7fd2af0f	Update quicklytest.sh	2022-05-27 19:55:54 +08:00
tsosunchia	3fc81f4e71	Merge pull request #26 from tsosunchia/main 修补之前再部分macOS设备出现的颜色显示问题：替换macOS中bash-3.1不支持的部分指令	2022-05-27 19:37:55 +08:00
tsosunchia	0c2b77bd81	Merge branch 'main' into main	2022-05-27 19:37:48 +08:00
tsosunchia	ac33c086c6	修补之前再部分macOS设备出现的颜色显示问题：替换macOS中bash-3.1不支持的部分指令	2022-05-27 19:34:35 +08:00
zhshch2002	fadfdc87d4	fix: nt_install.sh red color	2022-05-27 19:31:38 +08:00
tsosunchia	eb77a2b69b	Merge pull request #25 from tsosunchia/main 替换macOS中bash-3.1不支持的部分指令	2022-05-27 19:14:44 +08:00
tsosunchia	02e6c6e1bf	替换macOS中bash-3.1不支持的部分指令	2022-05-27 19:13:05 +08:00
tsosunchia	838af3b7a1	Merge pull request #24 from tsosunchia/main 替换macOS下bash-3.1不兼容的部分指令 issues#21	2022-05-27 19:10:10 +08:00
tsosunchia	7cd16036a6	替换macOS中bash-3.1不支持的部分指令	2022-05-27 19:08:04 +08:00
tsosunchia	2ef4f61d7b	Merge branch 'xgadget-lab:main' into main	2022-05-27 18:32:46 +08:00
tsosunchia	688622738f	整理排版	2022-05-27 18:32:23 +08:00
tsosunchia	83fe583f2a	Merge pull request #23 from tsosunchia/main fix some bugs	2022-05-27 18:30:49 +08:00
tsosunchia	4b32594c17	fix some bugs	2022-05-27 18:30:18 +08:00
tsosunchia	927b6d4035	Merge pull request #22 from tsosunchia/main 修正macOS下缺少md5sum导致的运行问题 issues#21	2022-05-27 18:16:59 +08:00
tsosunchia	aa651f30cc	Merge branch 'xgadget-lab:main' into main	2022-05-27 18:15:38 +08:00
tsosunchia	ffec9a93cd	update nt_install.sh 修正macOS下缺少md5sum导致的运行问题 issues#21	2022-05-27 18:15:10 +08:00
sjlleo	59a744b3b5	update: 修正文档里面有一个route-path错位的问题	2022-05-27 18:13:37 +08:00
sjlleo	9656dfe172	fix: 修复潜在数组越界的问题	2022-05-27 17:19:58 +08:00
sjlleo	84c48dae99	update: 完善一下 ipapicom	2022-05-27 17:18:31 +08:00
tsosunchia	4eaac372f6	Merge pull request #20 from tsosunchia/main add ip-api.com API	2022-05-27 13:11:26 +08:00
tsosunchia	c92d8a5172	add ip-api.com API	2022-05-27 13:09:06 +08:00
tsosunchia	acab410d4c	Update nt_install.sh	2022-05-27 11:14:31 +08:00
tsosunchia	858555fd86	Merge pull request #19 from tsosunchia/main update nt_install.sh 修正在macOS下可能出现的问题	2022-05-27 11:12:14 +08:00
tsosunchia	31e419b199	update nt_install.sh 修正在macOS下可能出现的问题	2022-05-27 11:11:51 +08:00
zhshch2002	1dddd43e67	fix: 错误默认端口号造成无法TCP Trace	2022-05-27 10:38:17 +08:00
tsosunchia	4148d0d4b1	Merge pull request #18 from tsosunchia/main 修改部分提示	2022-05-27 10:37:03 +08:00
tsosunchia	4f7977da8f	修改部分提示	2022-05-27 10:36:34 +08:00
zhshch2002	cfc8034cb4	update: 允许参数后置	2022-05-27 10:26:32 +08:00
tsosunchia	dbc0f87847	Merge pull request #17 from tsosunchia/main 修改部分提示内容	2022-05-27 10:20:57 +08:00
tsosunchia	74a320898f	Merge remote-tracking branch 'refs/remotes/origin/main'	2022-05-27 10:19:40 +08:00
tsosunchia	329b3fdd6b	修改部分提示内容	2022-05-27 10:19:25 +08:00
tsosunchia	3fb88f4cf4	Merge branch 'xgadget-lab:main' into main	2022-05-27 10:12:59 +08:00
tsosunchia	1de84cac71	修改部分提示内容	2022-05-27 10:12:14 +08:00
sjlleo	83d093f5aa	fix: 修复一个 report 奔溃的问题	2022-05-27 10:08:28 +08:00
sjlleo	8b03ca7a38	update mod	2022-05-27 09:58:23 +08:00
tsosunchia	7a847bf0d5	Merge pull request #16 from tsosunchia/main update README.md 增加说明	2022-05-27 09:43:28 +08:00
tsosunchia	11fe41611c	update README.md 增加说明	2022-05-27 09:43:09 +08:00
tsosunchia	71b24fb7a0	Update README.md	2022-05-27 00:45:27 +08:00
tsosunchia	0b08e4b4a4	Merge pull request #15 from tsosunchia/main update quicklytest.sh 增加部分模式下的Route-Path打印	2022-05-26 23:31:35 +08:00
tsosunchia	2608c05da1	Update quicklytest.sh	2022-05-26 23:24:03 +08:00
tsosunchia	314bdd0cce	Update quicklytest.sh 启用-report	2022-05-26 23:07:14 +08:00
tsosunchia	ea958059c6	Merge branch 'main' into main	2022-05-26 23:02:49 +08:00
tsosunchia	b59c349264	Update README.md	2022-05-26 22:55:21 +08:00
tsosunchia	030a487526	Update README.md	2022-05-26 22:45:48 +08:00
tsosunchia	cac6d33fde	Update quicklytest.sh	2022-05-26 22:38:14 +08:00
tsosunchia	1725a65827	Update nt_install.sh	2022-05-26 22:38:01 +08:00
tsosunchia	4d886066a3	Update quicklytest.sh	2022-05-26 22:35:25 +08:00
tsosunchia	156043730d	Update nt_install.sh	2022-05-26 22:17:40 +08:00
tsosunchia	91ad3bc539	Update nt_install.sh	2022-05-26 22:03:01 +08:00
tsosunchia	351da5f5a3	Update nt_install.sh	2022-05-26 21:57:42 +08:00
tsosunchia	f8fc90d7a5	Update quicklytest.sh	2022-05-26 21:50:15 +08:00
tsosunchia	9c75635acc	Update nt_install.sh	2022-05-26 21:31:14 +08:00
tsosunchia	c9a3916cd0	Update quicklytest.sh	2022-05-26 20:58:05 +08:00
tsosunchia	89d56c437e	Update quicklytest.sh	2022-05-26 20:43:06 +08:00
tsosunchia	6299dcd9a3	Update quicklytest.sh	2022-05-26 20:40:06 +08:00
tsosunchia	82f28a13f3	Update quicklytest.sh	2022-05-26 20:39:26 +08:00